diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp
index 4b425a61b..cba2bda1e 100644
--- a/companion/src/apppreferencesdialog.cpp
+++ b/companion/src/apppreferencesdialog.cpp
@@ -14,7 +14,7 @@ appPreferencesDialog::appPreferencesDialog(QWidget *parent) :
ui(new Ui::appPreferencesDialog)
{
ui->setupUi(this);
- setWindowIcon(CompanionIcon("preferences.png"));
+ setWindowIcon(CompanionIcon("apppreferences.png"));
initSettings();
connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
#ifndef JOYSTICKS
@@ -56,6 +56,18 @@ void appPreferencesDialog::writeValues()
settings.remove("js_ctrl");
}
+ settings.setValue("default_channel_order", ui->channelorderCB->currentIndex());
+ settings.setValue("default_mode", ui->stickmodeCB->currentIndex());
+ settings.setValue("rename_firmware_files", ui->renameFirmware->isChecked());
+ settings.setValue("burnFirmware", ui->burnFirmware->isChecked());
+ settings.setValue("profileId", ui->ProfSlot_SB->value());
+ settings.setValue("sdPath", ui->sdPath->text());
+ settings.setValue("SplashFileName", ui->SplashFileName->text());
+ if (!ui->SplashFileName->text().isEmpty())
+ settings.setValue("SplashImage", "");
+
+ saveProfile();
+
MainWindow * mw = (MainWindow *)this->parent();
mw->unloadProfile();
}
@@ -75,6 +87,7 @@ void appPreferencesDialog::initSettings()
{
QSettings settings;
ui->snapshotClipboardCKB->setChecked(settings.value("snapshot_to_clipboard", false).toBool());
+ ui->burnFirmware->setChecked(settings.value("burnFirmware", true).toBool());
QString Path=settings.value("snapshotPath", "").toString();
if (QDir(Path).exists()) {
@@ -142,6 +155,24 @@ void appPreferencesDialog::initSettings()
ui->joystickcalButton->setDisabled(true);
}
#endif
+// Profile Tab Inits
+ ui->channelorderCB->setCurrentIndex(settings.value("default_channel_order", 0).toInt());
+ ui->stickmodeCB->setCurrentIndex(settings.value("default_mode", 1).toInt());
+ ui->renameFirmware->setChecked(settings.value("rename_firmware_files", false).toBool());
+ Path=settings.value("sdPath", "").toString();
+ if (QDir(Path).exists()) {
+ ui->sdPath->setText(Path);
+ }
+ ui->ProfSlot_SB->setValue(settings.value("profileId", 1).toInt());
+ on_ProfSlot_SB_valueChanged();
+ QString fileName=settings.value("SplashFileName","").toString();
+ if (!fileName.isEmpty()) {
+ QFile file(fileName);
+ if (file.exists()){
+ ui->SplashFileName->setText(fileName);
+ displayImage( fileName );
+ }
+ }
}
void appPreferencesDialog::on_libraryPathButton_clicked()
@@ -222,3 +253,129 @@ void appPreferencesDialog::on_joystickcalButton_clicked() {
}
#endif
+// ******** Profile tab functions
+
+void appPreferencesDialog::on_sdPathButton_clicked()
+{
+ QSettings settings;
+ QString fileName = QFileDialog::getExistingDirectory(this,tr("Select the folder replicating your SD structure"), settings.value("sdPath").toString());
+ if (!fileName.isEmpty()) {
+ ui->sdPath->setText(fileName);
+ }
+}
+
+void appPreferencesDialog::on_ProfSlot_SB_valueChanged()
+{
+ QSettings settings;
+ settings.beginGroup("Profiles");
+ QString profile=QString("profile%1").arg(ui->ProfSlot_SB->value());
+ settings.beginGroup(profile);
+ QString name=settings.value("Name","").toString();
+ ui->ProfName_LE->setText(name);
+/* if (!(name.isEmpty())) {
+ QString firmwarename=settings.value("firmware", default_firmware_id).toString();
+ FirmwareInfo * fw = getFirmware(firmwarename);
+ int i=0;
+ foreach(FirmwareInfo * firmware, firmwares) {
+ if (fw == firmware) {
+ qDebug() << fw->id;
+ qDebug() << firmware->id;
+ qDebug() << i;
+ ui->downloadVerCB->setCurrentIndex(i);
+ break;
+ }
+ i++;
+ }
+ baseFirmwareChanged();
+ populateFirmwareOptions(fw);
+ }*/
+ settings.endGroup();
+ settings.endGroup();
+}
+
+
+void appPreferencesDialog::saveProfile()
+{
+ QSettings settings;
+ QString profile=QString("profile%1").arg(ui->ProfSlot_SB->value());
+ QString name=ui->ProfName_LE->text();
+ if (name.isEmpty()) {
+ name = profile;
+ ui->ProfName_LE->setText(name);
+ }
+ settings.beginGroup("Profiles");
+ settings.beginGroup(profile);
+ settings.setValue("Name",name);
+ settings.setValue("default_channel_order", ui->channelorderCB->currentIndex());
+ settings.setValue("default_mode", ui->stickmodeCB->currentIndex());
+ settings.setValue("burnFirmware", ui->burnFirmware->isChecked());
+ settings.setValue("rename_firmware_files", ui->renameFirmware->isChecked());
+ settings.setValue("sdPath", ui->sdPath->text());
+ settings.setValue("SplashFileName", ui->SplashFileName->text());
+ settings.endGroup();
+ settings.endGroup();
+}
+
+void appPreferencesDialog::on_removeProfileButton_clicked()
+{
+ QSettings settings;
+ QString profile=QString("profile%1").arg(ui->ProfSlot_SB->value());
+ settings.remove(profile);
+}
+
+bool appPreferencesDialog::displayImage( QString fileName )
+{
+ QImage image(fileName);
+ if (image.isNull())
+ {
+ QMessageBox::critical(this, tr("Error"), tr("Cannot load %1.").arg(fileName));
+ return false;
+ }
+
+ int width=ui->imageLabel->width();
+ ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(width, 64)));
+ if (width==212) {
+ image=image.convertToFormat(QImage::Format_RGB32);
+ QRgb col;
+ int gray, height = image.height();
+ for (int i = 0; i < width; ++i) {
+ for (int j = 0; j < height; ++j) {
+ col = image.pixel(i, j);
+ gray = qGray(col);
+ image.setPixel(i, j, qRgb(gray, gray, gray));
+ }
+ }
+ ui->imageLabel->setPixmap(QPixmap::fromImage(image));
+ }
+ else {
+ ui->imageLabel->setPixmap(QPixmap::fromImage(image.convertToFormat(QImage::Format_Mono)));
+ }
+ return true;
+}
+
+void appPreferencesDialog::on_SplashSelect_clicked()
+{
+ QString supportedImageFormats;
+ for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) {
+ supportedImageFormats += QLatin1String(" *.") + QImageReader::supportedImageFormats()[formatIndex];
+ }
+
+ QSettings settings;
+ QString fileName = QFileDialog::getOpenFileName(this,
+ tr("Open Image to load"), settings.value("lastImagesDir").toString(), tr("Images (%1)").arg(supportedImageFormats));
+
+ if (!fileName.isEmpty()) {
+ settings.setValue("lastImagesDir", QFileInfo(fileName).dir().absolutePath());
+
+ if (displayImage(fileName))
+ ui->SplashFileName->setText(fileName);
+ }
+}
+
+void appPreferencesDialog::on_clearImageButton_clicked() {
+ ui->imageLabel->clear();
+ ui->SplashFileName->clear();
+}
+
+
+
diff --git a/companion/src/apppreferencesdialog.h b/companion/src/apppreferencesdialog.h
index d47682512..5934d79d2 100644
--- a/companion/src/apppreferencesdialog.h
+++ b/companion/src/apppreferencesdialog.h
@@ -23,6 +23,8 @@ public:
private:
Ui::appPreferencesDialog *ui;
void initSettings();
+ bool displayImage( QString fileName );
+ void saveProfile();
private slots:
void writeValues();
@@ -31,6 +33,13 @@ private slots:
void on_snapshotClipboardCKB_clicked();
void on_backupPathButton_clicked();
void on_ge_pathButton_clicked();
+
+ void on_sdPathButton_clicked();
+ void on_ProfSlot_SB_valueChanged();
+ void on_removeProfileButton_clicked();
+ void on_SplashSelect_clicked();
+ void on_clearImageButton_clicked();
+
#ifdef JOYSTICKS
void on_joystickChkB_clicked();
void on_joystickcalButton_clicked();
diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui
index dcf1e0ce3..73faa9bbd 100644
--- a/companion/src/apppreferencesdialog.ui
+++ b/companion/src/apppreferencesdialog.ui
@@ -7,7 +7,7 @@
0
0
685
- 431
+ 462
@@ -493,14 +493,14 @@
Radio Settings
- -
+
-
Qt::Horizontal
- -
+
-
@@ -534,7 +534,7 @@
- -
+
-
@@ -550,7 +550,7 @@
- -
+
-
true
@@ -566,7 +566,7 @@
- -
+
-
true
@@ -582,7 +582,7 @@
- -
+
-
Offer to write FW to Tx after download
@@ -599,35 +599,35 @@
- -
-
+
-
+
- Save Profile
+ Remove Profile
- -
+
-
Open Folder
- -
+
-
Clear Image
- -
+
-
Qt::Horizontal
- -
+
-
@@ -777,7 +777,7 @@ This is used by the templated to determine which channel goes to what number out
- -
+
-
@@ -793,7 +793,7 @@ This is used by the templated to determine which channel goes to what number out
- -
+
-
Qt::Horizontal
@@ -806,7 +806,7 @@ This is used by the templated to determine which channel goes to what number out
- -
+
-
@@ -860,7 +860,7 @@ Mode 4:
- -
+
-
@@ -873,7 +873,14 @@ Mode 4:
- -
+
-
+
+
+ Select Image
+
+
+
+ -
@@ -886,20 +893,13 @@ Mode 4:
- -
+
-
Append version number to FW file name
- -
-
-
- Edit Image
-
-
-
-
@@ -907,7 +907,7 @@ Mode 4:
- -
+
-
Qt::Vertical
@@ -920,6 +920,29 @@ Mode 4:
+ -
+
+
+
+ 50
+ 16777215
+
+
+
+ 1
+
+
+ 10
+
+
+
+ -
+
+
+ Profile Index
+
+
+
@@ -927,7 +950,41 @@ Mode 4:
+ tabWidget
+ ge_lineedit
+ ge_pathButton
+ historySize
+ showSplash
+ startupCheck_fw
+ startupCheck_companion9x
+ wizardEnable_ChkB
+ backupPath
+ backupPathButton
+ backupEnable
+ splashincludeCB
+ libraryPath
+ libraryPathButton
buttonBox
+ snapshotPath
+ snapshotPathButton
+ snapshotClipboardCKB
+ simuSW
+ backLightColor
+ joystickCB
+ joystickChkB
+ joystickcalButton
+ ProfName_LE
+ ProfSlot_SB
+ sdPath
+ sdPathButton
+ SplashFileName
+ SplashSelect
+ clearImageButton
+ stickmodeCB
+ channelorderCB
+ renameFirmware
+ burnFirmware
+ removeProfileButton
@@ -940,8 +997,8 @@ Mode 4:
accept()
- 376
- 596
+ 382
+ 455
157
@@ -956,8 +1013,8 @@ Mode 4:
reject()
- 396
- 596
+ 402
+ 455
286
diff --git a/companion/src/fwpreferencesdialog.cpp b/companion/src/fwpreferencesdialog.cpp
index 2dfce0e73..832262ef2 100644
--- a/companion/src/fwpreferencesdialog.cpp
+++ b/companion/src/fwpreferencesdialog.cpp
@@ -12,7 +12,7 @@ fwPreferencesDialog::fwPreferencesDialog(QWidget *parent) :
updateLock(false)
{
ui->setupUi(this);
- setWindowIcon(CompanionIcon("preferences.png"));
+ setWindowIcon(CompanionIcon("fwpreferences.png"));
QCheckBox * OptionCheckBox[]= {
ui->optionCheckBox_1, ui->optionCheckBox_2, ui->optionCheckBox_3, ui->optionCheckBox_4, ui->optionCheckBox_5, ui->optionCheckBox_6, ui->optionCheckBox_7,
@@ -38,7 +38,7 @@ fwPreferencesDialog::fwPreferencesDialog(QWidget *parent) :
connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged()));
connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
- resize(0,0);
+ shrink();
}
@@ -47,32 +47,43 @@ fwPreferencesDialog::~fwPreferencesDialog()
delete ui;
}
+void fwPreferencesDialog::showVoice(bool show)
+{
+ if (show)
+ showVoice();
+ else
+ hideVoice();
+}
+
+void fwPreferencesDialog::showVoice()
+{
+ ui->voiceLine->show();
+ ui->voiceLabel->show();
+ ui->voiceCombo->show();
+ ui->voice_dnld->show();
+}
+
+void fwPreferencesDialog::hideVoice()
+{
+ ui->voiceLine->hide();
+ ui->voiceLabel->hide();
+ ui->voiceCombo->hide();
+ ui->voice_dnld->hide();
+ QTimer::singleShot(0, this, SLOT(shrink()));
+}
+
+void fwPreferencesDialog::shrink()
+{
+ resize(0,0);
+}
+
void fwPreferencesDialog::baseFirmwareChanged()
{
QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
voice=NULL;
foreach(FirmwareInfo * firmware, firmwares) {
if (firmware->id == selected_firmware) {
- if (firmware->voice) {
- ui->voiceLabel->show();
- ui->voiceCombo->show();
- ui->voice_dnld->show();
- ui->sdPathButton->show();
- ui->sdPath->show();
- ui->sdPathLabel->show();
- ui->voiceLabel->setEnabled(true);
- ui->voiceCombo->setEnabled(true);
- ui->voice_dnld->setEnabled(true);
- ui->sdPathButton->setEnabled(true);
- ui->sdPath->setEnabled(true);
- } else {
- ui->voiceLabel->hide();
- ui->voiceCombo->hide();
- ui->voice_dnld->hide();
- ui->sdPathButton->hide();
- ui->sdPath->hide();
- ui->sdPathLabel->hide();
- }
+ showVoice(firmware->voice);
populateFirmwareOptions(firmware);
break;
}
@@ -109,11 +120,6 @@ FirmwareVariant fwPreferencesDialog::getFirmwareVariant()
return default_firmware_variant;
}
-void fwPreferencesDialog::firmwareLangChanged()
-{
- firmwareChanged();
-}
-
void fwPreferencesDialog::firmwareOptionChanged(bool state)
{
QCheckBox *cb = qobject_cast(sender());
@@ -134,19 +140,7 @@ void fwPreferencesDialog::firmwareOptionChanged(bool state)
}
}
if (voice) {
- if (voice->isChecked()) {
- ui->voiceLabel->setEnabled(true);
- ui->voiceCombo->setEnabled(true);
- ui->voice_dnld->setEnabled(true);
- ui->sdPathButton->setEnabled(true);
- ui->sdPath->setEnabled(true);
- } else {
- ui->voiceLabel->setDisabled(true);
- ui->voiceCombo->setDisabled(true);
- ui->voice_dnld->setDisabled(true);
- ui->sdPathButton->setDisabled(true);
- ui->sdPath->setDisabled(true);
- }
+ showVoice(voice->isChecked());
}
return firmwareChanged();
@@ -157,37 +151,24 @@ void fwPreferencesDialog::firmwareOptionChanged(bool state)
}
} else if (cb && !state) {
if (cb->text()=="voice") {
- ui->voiceLabel->setDisabled(true);
- ui->voiceCombo->setDisabled(true);
- ui->voice_dnld->setDisabled(true);
- ui->sdPathButton->setEnabled(true);
- ui->sdPath->setEnabled(true);
+ hideVoice();
}
}
- if (voice ) {
- if (voice->isChecked()) {
- ui->voiceLabel->setEnabled(true);
- ui->voiceCombo->setEnabled(true);
- ui->voice_dnld->setEnabled(true);
- } else {
- ui->voiceLabel->setDisabled(true);
- ui->voiceCombo->setDisabled(true);
- ui->voice_dnld->setDisabled(true);
- ui->sdPathButton->setDisabled(true);
- ui->sdPath->setDisabled(true);
- }
+ if (voice) {
+ showVoice(voice->isChecked());
} else if (firmware) {
if (firmware->voice) {
- ui->voiceLabel->setEnabled(true);
- ui->voiceCombo->setEnabled(true);
- ui->voice_dnld->setEnabled(true);
- ui->sdPathButton->setEnabled(true);
- ui->sdPath->setEnabled(true);
+ showVoice();
}
}
return firmwareChanged();
}
+void fwPreferencesDialog::firmwareLangChanged()
+{
+ firmwareChanged();
+}
+
void fwPreferencesDialog::firmwareChanged()
{
if (updateLock)
@@ -233,18 +214,10 @@ void fwPreferencesDialog::firmwareChanged()
void fwPreferencesDialog::writeValues()
{
QSettings settings;
- settings.setValue("default_channel_order", ui->channelorderCB->currentIndex());
- settings.setValue("default_mode", ui->stickmodeCB->currentIndex());
+
settings.setValue("cpu_id", ui->CPU_ID_LE->text());
- settings.setValue("rename_firmware_files", ui->renameFirmware->isChecked());
- settings.setValue("burnFirmware", ui->burnFirmware->isChecked());
current_firmware_variant = getFirmwareVariant();
settings.setValue("firmware", current_firmware_variant.id);
- settings.setValue("profileId", ui->ProfSlot_SB->value());
- settings.setValue("sdPath", ui->sdPath->text());
- settings.setValue("SplashFileName", ui->SplashFileName->text());
- if (!ui->SplashFileName->text().isEmpty())
- settings.setValue("SplashImage", "");
MainWindow * mw = (MainWindow *)this->parent();
mw->unloadProfile();
@@ -269,14 +242,7 @@ void fwPreferencesDialog::populateFirmwareOptions(const FirmwareInfo * firmware)
ui->voiceCombo->setCurrentIndex(ui->voiceCombo->count() - 1);
}
- if (ui->langCombo->count()) {
- ui->langCombo->show();
- ui->langLabel->show();
- }
- else {
- ui->langCombo->hide();
- ui->langLabel->hide();
- }
+ showVoice(ui->langCombo->count()!=0);
int index = 0;
foreach(QList
@@ -32,181 +32,13 @@
6
- -
-
-
- Download Voice
+
-
+
+
+ Qt::Horizontal
-
-
- -
-
-
- Offer to write FW to Tx after download
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- CheckBox
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- CheckBox
-
-
-
- -
-
-
- Download FW
-
-
-
- -
-
-
- Options
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- CheckBox
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- CheckBox
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- CheckBox
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- CheckBox
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- CheckBox
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- CheckBox
-
-
-
- -
-
-
- Processor ID
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- CheckBox
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- FwInfo
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- CheckBox
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
@@ -223,6 +55,19 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+ CheckBox
+
+
+
-
@@ -246,35 +91,6 @@
- -
-
-
-
- 0
- 0
-
-
-
- Default Stick Mode
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Channel Order
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
-
@@ -301,60 +117,6 @@
- -
-
-
-
- 190
- 16777215
-
-
-
- Mode selection:
-
-Mode 1:
- Left stick: Elevator, Rudder
- Right stick: Throttle, Aileron
-
-Mode 2:
- Left stick: Throttle, Rudder
- Right stick: Elevator, Aileron
-
-Mode 3:
- Left stick: Elevator, Aileron
- Right stick: Throttle, Rudder
-
-Mode 4:
- Left stick: Throttle, Aileron
- Right stick: Elevator, Rudder
-
-
-
-
- 1
-
-
-
-
- Mode 1 (RUD ELE THR AIL)
-
-
- -
-
- Mode 2 (RUD THR ELE AIL)
-
-
- -
-
- Mode 3 (AIL ELE THR RUD)
-
-
- -
-
- Mode 4 (AIL THR ELE RUD)
-
-
-
-
-
@@ -394,6 +156,9 @@ Mode 4:
+ -
+
+
-
@@ -410,8 +175,8 @@ Mode 4:
- -
-
+
-
+
-
@@ -436,159 +201,6 @@ Mode 4:
- -
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
-
- 75
- 16777215
-
-
-
- Channel order
-
-This is used by the templated to determine which channel goes to what number output.
-
-
- 0
-
-
-
-
- R E T A
-
-
- -
-
- R E A T
-
-
- -
-
- R T E A
-
-
- -
-
- R T A E
-
-
- -
-
- R A E T
-
-
- -
-
- R A T E
-
-
- -
-
- E R T A
-
-
- -
-
- E R A T
-
-
- -
-
- E T R A
-
-
- -
-
- E T A R
-
-
- -
-
- E A R T
-
-
- -
-
- E A T R
-
-
- -
-
- T R E A
-
-
- -
-
- T R A E
-
-
- -
-
- T E R A
-
-
- -
-
- T E A R
-
-
- -
-
- T A R E
-
-
- -
-
- T A E R
-
-
- -
-
- A R E T
-
-
- -
-
- A R T E
-
-
- -
-
- A E R T
-
-
- -
-
- A E T R
-
-
- -
-
- A T R E
-
-
- -
-
- A T E R
-
-
-
-
-
@@ -641,19 +253,6 @@ This is used by the templated to determine which channel goes to what number out
- -
-
-
-
- 0
- 0
-
-
-
- CheckBox
-
-
-
-
@@ -914,40 +513,6 @@ This is used by the templated to determine which channel goes to what number out
- -
-
-
- Append version number to FW file name
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
- -
-
-
-
- Sans Serif
- 75
- true
-
-
-
- Profile
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
-
@@ -961,37 +526,6 @@ This is used by the templated to determine which channel goes to what number out
- -
-
-
- true
-
-
- true
-
-
-
- -
-
-
-
- 50
- 16777215
-
-
-
- Set language of voice.
-May be different from firmware language
-
-
-
- -
-
-
- Open Image
-
-
-
-
@@ -1006,109 +540,202 @@ May be different from firmware language
- -
-
-
-
- 0
- 0
-
-
-
- Splash Screen
-
-
-
- -
-
-
- Clear Image
-
-
-
- -
-
-
- -
-
-
-
- 0
- 0
-
-
+
-
+
- 16777215
+ 50
16777215
-
- 1
-
-
- 10
+
+ Set language of voice.
+May be different from firmware language
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
+
-
+
- Open Folder
+ Download Voice
- -
-
-
- true
-
-
- true
-
-
-
- -
-
+
-
+
-
+
0
0
- SD Structure path
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+ CheckBox
- -
-
+
-
+
+
+
+ 0
+ 0
+
+
- Save Profile
+ CheckBox
+
+
+
+ -
+
+
+ Download FW
+
+
+
+ -
+
+
+ Options
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ CheckBox
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ CheckBox
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ CheckBox
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ CheckBox
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ CheckBox
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ CheckBox
+
+
+
+ -
+
+
+ Processor ID
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ CheckBox
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ FwInfo
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ CheckBox
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Qt::Horizontal
@@ -1161,10 +788,6 @@ May be different from firmware language
optionCheckBox_40
optionCheckBox_41
optionCheckBox_42
- stickmodeCB
- channelorderCB
- renameFirmware
- burnFirmware
diff --git a/companion/src/images/originals/classical icons/apppreferences.png b/companion/src/images/originals/classical icons/apppreferences.png
index 1f6613e40..d24ef0ad7 100644
Binary files a/companion/src/images/originals/classical icons/apppreferences.png and b/companion/src/images/originals/classical icons/apppreferences.png differ
diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index 6f40c7c2d..d9f00b7f2 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -1701,10 +1701,6 @@ void MainWindow::createActions()
logsAct->setStatusTip(tr("Open log file"));
connect(logsAct, SIGNAL(triggered()), this, SLOT(logFile()));
- preferencesAct = new QAction(tr("&Old Preferences Dialog..."), this);
- preferencesAct->setStatusTip(tr("Used the old Preferences Dialog"));
- connect(preferencesAct, SIGNAL(triggered()), this, SLOT(preferences()));
-
appPreferencesAct = new QAction(CompanionIcon("apppreferences.png"), tr("&Setting..."), this);
appPreferencesAct->setStatusTip(tr("Edit Settings"));
connect(appPreferencesAct, SIGNAL(triggered()), this, SLOT(appPreferences()));
@@ -1977,7 +1973,6 @@ void MainWindow::createMenus()
settingsMenu->addSeparator();
settingsMenu->addAction(appPreferencesAct);
settingsMenu->addAction(customizeSplashAct);
- settingsMenu->addAction(preferencesAct);
settingsMenu->addAction(burnConfigAct);
burnMenu = menuBar()->addMenu(tr("&Read/Write"));
diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h
index 34472d123..c39e8175a 100644
--- a/companion/src/mainwindow.h
+++ b/companion/src/mainwindow.h
@@ -224,7 +224,6 @@ private:
QAction *saveAct;
QAction *saveAsAct;
QAction *exitAct;
- QAction *preferencesAct;
QAction *appPreferencesAct;
QAction *fwPreferencesAct;
QAction *checkForUpdatesAct;
diff --git a/companion/src/themes/classic/16/apppreferences.png b/companion/src/themes/classic/16/apppreferences.png
index dae98ee8a..afcc0a532 100644
Binary files a/companion/src/themes/classic/16/apppreferences.png and b/companion/src/themes/classic/16/apppreferences.png differ
diff --git a/companion/src/themes/classic/24/apppreferences.png b/companion/src/themes/classic/24/apppreferences.png
index ebca2028c..f979f3c96 100644
Binary files a/companion/src/themes/classic/24/apppreferences.png and b/companion/src/themes/classic/24/apppreferences.png differ
diff --git a/companion/src/themes/classic/32/apppreferences.png b/companion/src/themes/classic/32/apppreferences.png
index a9cee976b..cdc052910 100644
Binary files a/companion/src/themes/classic/32/apppreferences.png and b/companion/src/themes/classic/32/apppreferences.png differ
diff --git a/companion/src/themes/classic/48/apppreferences.png b/companion/src/themes/classic/48/apppreferences.png
index 713e2cbeb..8a94b21f8 100644
Binary files a/companion/src/themes/classic/48/apppreferences.png and b/companion/src/themes/classic/48/apppreferences.png differ