Small code cleanup
This commit is contained in:
@@ -84,9 +84,8 @@ Curves::Curves(QWidget * parent, ModelData & model):
|
||||
QGraphicsScene *scene = new QGraphicsScene(ui->curvePreview);
|
||||
scene->setItemIndexMethod(QGraphicsScene::NoIndex);
|
||||
ui->curvePreview->setScene(scene);
|
||||
QString Theme=getTheme();
|
||||
QIcon ClearIcon;
|
||||
populate_icon(&ClearIcon,Theme,"clear.png");
|
||||
populate_icon(&ClearIcon,"clear.png");
|
||||
|
||||
for (int i=0; i<GetEepromInterface()->getCapability(NumCurves); i++) {
|
||||
visibleCurves[i] = false;
|
||||
|
||||
@@ -123,9 +123,8 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
|
||||
connect(fswtchParamArmT[i], SIGNAL(editTextChanged ( const QString)), this, SLOT(customFunctionEdited()));
|
||||
|
||||
#ifdef PHONON
|
||||
QString Theme=getTheme();
|
||||
QIcon PlayIcon;
|
||||
populate_icon(&PlayIcon,Theme,"play.png");
|
||||
populate_icon(&PlayIcon,"play.png");
|
||||
playBT[i] = new QPushButton(this);
|
||||
playBT[i]->setObjectName(QString("play_%1").arg(i));
|
||||
playBT[i]->setIcon(PlayIcon);
|
||||
@@ -163,9 +162,8 @@ void CustomFunctionsPanel::mediaPlayer_state(Phonon::State newState, Phonon::Sta
|
||||
{
|
||||
if (phononLock)
|
||||
return;
|
||||
QString Theme=getTheme();
|
||||
QIcon PlayIcon;
|
||||
populate_icon(&PlayIcon,Theme,"play.png");
|
||||
populate_icon(&PlayIcon,"play.png");
|
||||
|
||||
phononLock=true;
|
||||
if ((newState==Phonon::StoppedState || newState==Phonon::PausedState) && oldState==Phonon::PlayingState) {
|
||||
@@ -196,12 +194,11 @@ void CustomFunctionsPanel::playMusic()
|
||||
QPushButton *playButton = qobject_cast<QPushButton*>(sender());
|
||||
int index=playButton->objectName().mid(5,2).toInt();
|
||||
QString function=playButton->objectName().left(4);
|
||||
QString Theme=getTheme();
|
||||
QSettings settings("companion", "companion");
|
||||
QIcon PlayIcon;
|
||||
populate_icon(&PlayIcon,Theme,"play.png");
|
||||
populate_icon(&PlayIcon,"play.png");
|
||||
QIcon StopIcon;
|
||||
populate_icon(&StopIcon,Theme,"stop.png");
|
||||
populate_icon(&StopIcon,"stop.png");
|
||||
|
||||
QString path=settings.value("sdPath", ".").toString();
|
||||
QDir qd(path);
|
||||
@@ -470,15 +467,14 @@ void CustomFunctionsPanel::fsw_customContextMenuRequested(QPoint pos)
|
||||
{
|
||||
QLabel *label = (QLabel *)sender();
|
||||
selectedFunction = label->property("index").toInt();
|
||||
QString Theme=getTheme();
|
||||
QIcon ClearIcon;
|
||||
populate_icon(&ClearIcon,Theme,"clear.png");
|
||||
populate_icon(&ClearIcon,"clear.png");
|
||||
QIcon CopyIcon;
|
||||
populate_icon(&CopyIcon,Theme,"copy.png");
|
||||
populate_icon(&CopyIcon,"copy.png");
|
||||
QIcon CutIcon;
|
||||
populate_icon(&CutIcon,Theme,"cut.png");
|
||||
populate_icon(&CutIcon,"cut.png");
|
||||
QIcon PasteIcon;
|
||||
populate_icon(&PasteIcon,Theme,"paste.png");
|
||||
populate_icon(&PasteIcon,"paste.png");
|
||||
|
||||
QPoint globalPos = label->mapToGlobal(pos);
|
||||
|
||||
|
||||
@@ -382,15 +382,14 @@ void CustomSwitchesPanel::csw_customContextMenuRequested(QPoint pos)
|
||||
{
|
||||
QLabel *label = (QLabel *)sender();
|
||||
selectedSwitch = label->property("index").toInt();
|
||||
QString Theme=getTheme();
|
||||
QIcon ClearIcon;
|
||||
populate_icon(&ClearIcon,Theme,"clear.png");
|
||||
populate_icon(&ClearIcon,"clear.png");
|
||||
QIcon CopyIcon;
|
||||
populate_icon(&CopyIcon,Theme,"copy.png");
|
||||
populate_icon(&CopyIcon,"copy.png");
|
||||
QIcon CutIcon;
|
||||
populate_icon(&CutIcon,Theme,"cut.png");
|
||||
populate_icon(&CutIcon,"cut.png");
|
||||
QIcon PasteIcon;
|
||||
populate_icon(&PasteIcon,Theme,"paste.png");
|
||||
populate_icon(&PasteIcon,"paste.png");
|
||||
|
||||
QPoint globalPos = label->mapToGlobal(pos);
|
||||
|
||||
|
||||
@@ -17,17 +17,17 @@ InputsPanel::InputsPanel(QWidget *parent, ModelData & model, GeneralSettings & g
|
||||
QPushButton * qbDown = new QPushButton(this);
|
||||
QPushButton * qbClear = new QPushButton(this);
|
||||
QIcon qbUpIcon;
|
||||
populate_icon(&qbUpIcon,Theme,"moveup.png");
|
||||
populate_icon(&qbUpIcon,"moveup.png");
|
||||
qbUp->setText(tr("Move Up"));
|
||||
qbUp->setIcon(qbUpIcon);
|
||||
qbUp->setShortcut(QKeySequence(tr("Ctrl+Up")));
|
||||
QIcon qbDownIcon;
|
||||
populate_icon(&qbDownIcon,Theme,"movedown.png");
|
||||
populate_icon(&qbDownIcon,"movedown.png");
|
||||
qbDown->setText(tr("Move Down"));
|
||||
qbDown->setIcon(qbDownIcon);
|
||||
qbDown->setShortcut(QKeySequence(tr("Ctrl+Down")));
|
||||
QIcon qbClearIcon;
|
||||
populate_icon(&qbClearIcon,Theme,"clear.png");
|
||||
populate_icon(&qbClearIcon,"clear.png");
|
||||
qbClear->setText(tr("Clear Expo Settings"));
|
||||
qbClear->setIcon(qbClearIcon);
|
||||
|
||||
@@ -348,25 +348,24 @@ void InputsPanel::expoAdd()
|
||||
|
||||
void InputsPanel::expolistWidget_customContextMenuRequested(QPoint pos)
|
||||
{
|
||||
QString Theme=getTheme();
|
||||
QIcon AddIcon;
|
||||
populate_icon(&AddIcon,Theme,"add.png");
|
||||
populate_icon(&AddIcon,"add.png");
|
||||
QIcon EditIcon;
|
||||
populate_icon(&EditIcon,Theme,"edit.png");
|
||||
populate_icon(&EditIcon,"edit.png");
|
||||
QIcon ClearIcon;
|
||||
populate_icon(&ClearIcon,Theme,"clear.png");
|
||||
populate_icon(&ClearIcon,"clear.png");
|
||||
QIcon CopyIcon;
|
||||
populate_icon(&CopyIcon,Theme,"copy.png");
|
||||
populate_icon(&CopyIcon,"copy.png");
|
||||
QIcon CutIcon;
|
||||
populate_icon(&CutIcon,Theme,"cut.png");
|
||||
populate_icon(&CutIcon,"cut.png");
|
||||
QIcon PasteIcon;
|
||||
populate_icon(&PasteIcon,Theme,"paste.png");
|
||||
populate_icon(&PasteIcon,"paste.png");
|
||||
QIcon DuplicateIcon;
|
||||
populate_icon(&DuplicateIcon,Theme,"duplicate.png");
|
||||
populate_icon(&DuplicateIcon,"duplicate.png");
|
||||
QIcon MoveUpIcon;
|
||||
populate_icon(&MoveUpIcon,Theme,"moveup.png");
|
||||
populate_icon(&MoveUpIcon,"moveup.png");
|
||||
QIcon MoveDownIcon;
|
||||
populate_icon(&MoveDownIcon,Theme,"movedown.png");
|
||||
populate_icon(&MoveDownIcon,"movedown.png");
|
||||
QPoint globalPos = ExposlistWidget->mapToGlobal(pos);
|
||||
|
||||
const QClipboard *clipboard = QApplication::clipboard();
|
||||
|
||||
@@ -14,20 +14,18 @@ MixesPanel::MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
|
||||
QPushButton * qbUp = new QPushButton(this);
|
||||
QPushButton * qbDown = new QPushButton(this);
|
||||
QPushButton * qbClear = new QPushButton(this);
|
||||
|
||||
QString Theme=getTheme();
|
||||
QIcon qbUpIcon;
|
||||
populate_icon(&qbUpIcon,Theme,"moveup.png");
|
||||
populate_icon(&qbUpIcon,"moveup.png");
|
||||
qbUp->setText(tr("Move Up"));
|
||||
qbUp->setIcon(qbUpIcon);
|
||||
qbUp->setShortcut(QKeySequence(tr("Ctrl+Up")));
|
||||
QIcon qbDownIcon;
|
||||
populate_icon(&qbDownIcon,Theme,"movedown.png");
|
||||
populate_icon(&qbDownIcon,"movedown.png");
|
||||
qbDown->setText(tr("Move Down"));
|
||||
qbDown->setIcon(qbDownIcon);
|
||||
qbDown->setShortcut(QKeySequence(tr("Ctrl+Down")));
|
||||
QIcon qbClearIcon;
|
||||
populate_icon(&qbClearIcon,Theme,"clear.png");
|
||||
populate_icon(&qbClearIcon,"clear.png");
|
||||
qbClear->setText(tr("Clear Mixes"));
|
||||
qbClear->setIcon(qbClearIcon);
|
||||
|
||||
@@ -413,25 +411,24 @@ void MixesPanel::mixerAdd()
|
||||
|
||||
void MixesPanel::mixerlistWidget_customContextMenuRequested(QPoint pos)
|
||||
{
|
||||
QString Theme=getTheme();
|
||||
QIcon AddIcon;
|
||||
populate_icon(&AddIcon,Theme,"add.png");
|
||||
populate_icon(&AddIcon,"add.png");
|
||||
QIcon EditIcon;
|
||||
populate_icon(&EditIcon,Theme,"edit.png");
|
||||
populate_icon(&EditIcon,"edit.png");
|
||||
QIcon ClearIcon;
|
||||
populate_icon(&ClearIcon,Theme,"clear.png");
|
||||
populate_icon(&ClearIcon,"clear.png");
|
||||
QIcon CopyIcon;
|
||||
populate_icon(&CopyIcon,Theme,"copy.png");
|
||||
populate_icon(&CopyIcon,"copy.png");
|
||||
QIcon CutIcon;
|
||||
populate_icon(&CutIcon,Theme,"cut.png");
|
||||
populate_icon(&CutIcon,"cut.png");
|
||||
QIcon PasteIcon;
|
||||
populate_icon(&PasteIcon,Theme,"paste.png");
|
||||
populate_icon(&PasteIcon,"paste.png");
|
||||
QIcon DuplicateIcon;
|
||||
populate_icon(&DuplicateIcon,Theme,"duplicate.png");
|
||||
populate_icon(&DuplicateIcon,"duplicate.png");
|
||||
QIcon MoveUpIcon;
|
||||
populate_icon(&MoveUpIcon,Theme,"moveup.png");
|
||||
populate_icon(&MoveUpIcon,"moveup.png");
|
||||
QIcon MoveDownIcon;
|
||||
populate_icon(&MoveDownIcon,Theme,"movedown.png");
|
||||
populate_icon(&MoveDownIcon,"movedown.png");
|
||||
QPoint globalPos = MixerlistWidget->mapToGlobal(pos);
|
||||
|
||||
const QClipboard *clipboard = QApplication::clipboard();
|
||||
|
||||
@@ -21,11 +21,10 @@ ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool i
|
||||
generalSettings(generalSettings)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
QString Theme=getTheme();
|
||||
QSettings settings("companion", "companion");
|
||||
restoreGeometry(settings.value("modelEditGeometry").toByteArray());
|
||||
QIcon SimulateIcon;
|
||||
populate_icon(&SimulateIcon,Theme,"simulate.png");
|
||||
populate_icon(&SimulateIcon,"simulate.png");
|
||||
ui->pushButton->setIcon(SimulateIcon);
|
||||
addTab(new Setup(this, model), tr("Setup"));
|
||||
addTab(new HeliPanel(this, model), tr("Heli"));
|
||||
|
||||
Reference in New Issue
Block a user