From efd907de8e4fce1c415398957f3a0bf682c09acd Mon Sep 17 00:00:00 2001 From: elecpower Date: Fri, 12 Apr 2024 08:17:54 +1000 Subject: [PATCH] Remove Append version number to firmware file name option from profile settings --- companion/src/apppreferencesdialog.cpp | 2 - companion/src/apppreferencesdialog.ui | 656 ++++++++++++------------- companion/src/storage/appdata.h | 1 - 3 files changed, 321 insertions(+), 338 deletions(-) diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp index 85e55312068..43e16291470 100644 --- a/companion/src/apppreferencesdialog.cpp +++ b/companion/src/apppreferencesdialog.cpp @@ -157,7 +157,6 @@ void AppPreferencesDialog::accept() profile.externalModuleSize(ui->externalModuleSizeCB->currentData().toInt()); profile.channelOrder(ui->channelorderCB->currentIndex()); profile.defaultMode(ui->stickmodeCB->currentIndex()); - profile.renameFwFiles(ui->renameFirmware->isChecked()); profile.burnFirmware(ui->burnFirmware->isChecked()); profile.sdPath(ui->sdPath->text()); profile.pBackupDir(ui->profilebackupPath->text()); @@ -307,7 +306,6 @@ void AppPreferencesDialog::initSettings() ui->externalModuleSizeCB->setCurrentIndex(ui->externalModuleSizeCB->findData(profile.externalModuleSize())); ui->channelorderCB->setCurrentIndex(profile.channelOrder()); ui->stickmodeCB->setCurrentIndex(profile.defaultMode()); - ui->renameFirmware->setChecked(profile.renameFwFiles()); ui->sdPath->setText(profile.sdPath()); if (!profile.pBackupDir().isEmpty()) { if (QDir(profile.pBackupDir()).exists()) { diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui index 8813d7473d5..cce9a37394a 100644 --- a/companion/src/apppreferencesdialog.ui +++ b/companion/src/apppreferencesdialog.ui @@ -45,66 +45,50 @@ - 1 + 0 Radio Profile - - + + + + true + - + 0 0 - Options - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + General Settings Label - - + + + + + - + 0 0 - - - 75 - true - - - Radio Type + Options - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - true - - - - - - false + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 0 @@ -116,197 +100,41 @@ - - + + 0 0 - - <html><head/><body><p>Channel order</p><p><br/></p><p>Defines the order of the default mixes created on a new model.</p></body></html> - - - 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 - - - - - - - - Default Int. Module - - - - - - Select Folder + Prompt to write firmware to radio after update - - - - - 0 - 0 - - - - SD Structure path + + + + If set it will override the application general setting - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + false - - - - true - + + 0 0 - - General Settings Label - - - - - - - Prompt to run SD Sync after update - - - + + 0 @@ -314,24 +142,38 @@ - Default Channel Order - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + General Settings - - - - - + + - + 0 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 5 + + + 4 + + @@ -458,32 +300,227 @@ - - + + + + true + + + + + + + + + + External Module + + + + + + + Prompt to run SD Sync after update + + + + + + + Default Int. Module + + + + + 0 0 + + + 75 + true + + - General Settings + Radio Type + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Other Settings + + + + + + + Qt::Vertical + + + + 20 + 5 + + + + + + + + + 0 + 0 + + + + <html><head/><body><p>Channel order</p><p><br/></p><p>Defines the order of the default mixes created on a new model.</p></body></html> + + 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 + + - - - - Qt::Vertical - - - - 20 - 5 - - - - @@ -538,46 +575,19 @@ Mode 4: - - - - - 0 - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 5 - - - 4 - - - + + - - - - - 0 - 0 - + + + + true - Default Stick Mode + + + + false @@ -613,129 +623,106 @@ Mode 4: - - + + - + 0 0 - - Qt::Horizontal + + Default Stick Mode - - + + + + Select Folder + + + + + - + 0 0 - - - 75 - true - - - Other Settings + SD Structure path + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + - + 0 0 + + The profile specific folder, if set, will override general Backup folder + - Prompt to write firmware to radio after update + Backup folder - - + + - + 0 0 - - - 75 - true - - - Profile Name + Default Channel Order - - - - - - true + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - + + 0 0 - - Append version number to firmware file name - - - - - - - If set it will override the application general setting - - - false + + Qt::Horizontal - - + + - + 0 0 - - The profile specific folder, if set, will override general Backup folder - - - Backup folder + + + 75 + true + - - - - - External Module + Profile Name - - - @@ -1642,7 +1629,6 @@ Mode 4: pbackupEnable stickmodeCB channelorderCB - renameFirmware burnFirmware splashincludeCB snapshotPath diff --git a/companion/src/storage/appdata.h b/companion/src/storage/appdata.h index c544058b6fd..a69103a1142 100644 --- a/companion/src/storage/appdata.h +++ b/companion/src/storage/appdata.h @@ -492,7 +492,6 @@ class Profile: public CompStoreObj PROPERTY4(int, defaultMode, "default_mode", 1) PROPERTY (int, volumeGain, 10) - PROPERTY4(bool, renameFwFiles, "rename_firmware_files", false) PROPERTY (bool, burnFirmware, false) PROPERTY (bool, penableBackup, false) PROPERTY (bool, runSDSync, false)