From 07a6fd8ee7b42599e1bdb317e6921f2163db7485 Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Sun, 9 Feb 2014 14:30:50 +0100 Subject: [PATCH] Alternative testable tab based setting version. --- companion/src/apppreferencesdialog.ui | 1300 ++++++++++++++------- companion/src/mainwindow.cpp | 8 +- companion/src/old_apppreferencesdialog.ui | 505 ++++++++ 3 files changed, 1391 insertions(+), 422 deletions(-) create mode 100644 companion/src/old_apppreferencesdialog.ui diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui index bc1f734f3..dcf1e0ce3 100644 --- a/companion/src/apppreferencesdialog.ui +++ b/companion/src/apppreferencesdialog.ui @@ -7,7 +7,7 @@ 0 0 685 - 456 + 431 @@ -23,7 +23,7 @@ - Application Preferences + Edit Settings @@ -32,230 +32,7 @@ 6 - - - - Open Folder - - - - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - - - - - - 0 - 0 - - - - Joystick - - - - - - - Simulator capture folder - - - - - - - Remember simulator switch values - - - - - - - - 0 - 0 - - - - User Splash Screens - - - - - - - - 0 - 0 - - - - Files to keep - - - - - - - Offer to use wizard for new models - - - true - - - - - - - Qt::Horizontal - - - - - - - - 100 - 16777215 - - - - - Blue - - - - - Green - - - - - Red - - - - - Orange - - - - - Yellow - - - - - - - - Automatic check for Companion updates - - - true - - - - - - - Qt::Horizontal - - - - - - - true - - - true - - - - - - - Only capture to clipboard - - - - - - - - 40 - 0 - - - - - 50 - 16777215 - - - - 15 - - - 10 - - - - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - - - - - - 250 - 0 - - - - true - - - - - - - Calibrate - - - - - - - Automatic Backup Folder - - - - + Qt::Horizontal @@ -265,205 +42,892 @@ - - - - Open Folder - - - false - - - - - - - true - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Simulator BackLight - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Enable automatic backup before writing firmware - - - - - - - Show splash screen when Companion starts - - - true - - - - - - - Find Executable - - - - - - - Open Folder - - - - - - - Enable - - - - - - - Google Earth Executable - - - - - - - Automatic check for OpenTX firmware updates - - - true - - - - - - - - 0 - 0 - - - - - Include companion splashes - - - - - Only user defined splashes - - - - - - - - - 0 - 0 - - - - Splash Screen Library - - - - - - - true - - - true + + + + 0 + + + Application Settings + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Automatic Backup Folder + + + + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + 15 + + + 10 + + + + + + + + 0 + 0 + + + + User Splash Screens + + + + + + + + 0 + 0 + + + + + Include companion splashes + + + + + Only user defined splashes + + + + + + + + Google Earth Executable + + + + + + + Automatic check for OpenTX firmware updates + + + true + + + + + + + + 350 + 0 + + + + true + + + + + + + Open Folder + + + + + + + Qt::Horizontal + + + + + + + + 350 + 0 + + + + true + + + + + + + Find Executable + + + + + + + + 0 + 0 + + + + Files to keep + + + + + + + + 0 + 0 + + + + Splash Screen Library + + + + + + + Enable automatic backup before writing firmware + + + + + + + Open Folder + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + + + + + Automatic check for Companion updates + + + true + + + + + + + Qt::Horizontal + + + + + + + Offer to use wizard for new models + + + true + + + + + + + Show splash screen when Companion starts + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + true + + + true + + + + + + + + Simulator Settings + + + + + + + 0 + 0 + + + + Simulator BackLight + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Enable + + + + + + + Open Folder + + + false + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 100 + 16777215 + + + + + Blue + + + + + Green + + + + + Red + + + + + Orange + + + + + Yellow + + + + + + + + + 0 + 0 + + + + Joystick + + + + + + + Only capture to clipboard + + + + + + + + 0 + 0 + + + + + + + + Calibrate + + + + + + + Remember simulator switch values + + + + + + + Simulator capture folder + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + true + + + + 350 + 0 + + + + true + + + + + + + + Radio Settings + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 128 + 64 + + + + + 128 + 64 + + + + QFrame::Panel + + + QFrame::Raised + + + + + + true + + + + + + + + 0 + 0 + + + + Channel Order + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + true + + + + 350 + 0 + + + + true + + + + + + + true + + + + 350 + 0 + + + + true + + + + + + + Offer to write FW to Tx after download + + + + + + + + 0 + 0 + + + + + + + + Save Profile + + + + + + + Open Folder + + + + + + + Clear Image + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 100 + 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 + + + + + + + + + 0 + 0 + + + + SD Structure path + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 200 + 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) + + + + + + + + + 0 + 0 + + + + Default Stick Mode + + + + + + + + 0 + 0 + + + + Splash Screen + + + + + + + Append version number to FW file name + + + + + + + Edit Image + + + + + + + Settings Profile Name + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - startupCheck_companion9x - backupEnable - line - backupPath - line_2 - startupCheck_fw - wizardEnable_ChkB - ge_label - label_5 - showSplash - line_3 - ge_pathButton - line_4 - backupPathButton - label_3 - backLightColor - snapshotPath - snapshotPathButton - snapshotClipboardCKB - label_11 - joystickCB - joystickcalButton - ge_lineedit - simuSW - buttonBox - line_5 - joystickChkB - label_17 - label_19 - historySize - label_9 - libraryPath - libraryPathButton - line_6 - splashincludeCB - label_10 buttonBox - ge_lineedit - ge_pathButton - historySize - showSplash - startupCheck_fw - startupCheck_companion9x - wizardEnable_ChkB - backupPath - backupPathButton - backupEnable - snapshotPath - snapshotPathButton - snapshotClipboardCKB - simuSW - backLightColor - joystickCB - joystickChkB - joystickcalButton diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index df57d182c..6f40c7c2d 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -1705,12 +1705,12 @@ void MainWindow::createActions() preferencesAct->setStatusTip(tr("Used the old Preferences Dialog")); connect(preferencesAct, SIGNAL(triggered()), this, SLOT(preferences())); - appPreferencesAct = new QAction(CompanionIcon("apppreferences.png"), tr("&Application Preferences..."), this); - appPreferencesAct->setStatusTip(tr("Edit application preferences")); + appPreferencesAct = new QAction(CompanionIcon("apppreferences.png"), tr("&Setting..."), this); + appPreferencesAct->setStatusTip(tr("Edit Settings")); connect(appPreferencesAct, SIGNAL(triggered()), this, SLOT(appPreferences())); - fwPreferencesAct = new QAction(CompanionIcon("fwpreferences.png"), tr("&Downloads and Profiles..."), this); - fwPreferencesAct->setStatusTip(tr("Firmware and voice file downloads as well as profile definition.")); + fwPreferencesAct = new QAction(CompanionIcon("fwpreferences.png"), tr("&Downloads..."), this); + fwPreferencesAct->setStatusTip(tr("Download firmware and voice files")); connect(fwPreferencesAct, SIGNAL(triggered()), this, SLOT(fwPreferences())); checkForUpdatesAct = new QAction(CompanionIcon("update.png"), tr("&Check for updates..."), this); diff --git a/companion/src/old_apppreferencesdialog.ui b/companion/src/old_apppreferencesdialog.ui new file mode 100644 index 000000000..bc1f734f3 --- /dev/null +++ b/companion/src/old_apppreferencesdialog.ui @@ -0,0 +1,505 @@ + + + appPreferencesDialog + + + + 0 + 0 + 685 + 456 + + + + + 0 + 0 + + + + + 685 + 0 + + + + Application Preferences + + + + 2 + + + 6 + + + + + Open Folder + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + Joystick + + + + + + + Simulator capture folder + + + + + + + Remember simulator switch values + + + + + + + + 0 + 0 + + + + User Splash Screens + + + + + + + + 0 + 0 + + + + Files to keep + + + + + + + Offer to use wizard for new models + + + true + + + + + + + Qt::Horizontal + + + + + + + + 100 + 16777215 + + + + + Blue + + + + + Green + + + + + Red + + + + + Orange + + + + + Yellow + + + + + + + + Automatic check for Companion updates + + + true + + + + + + + Qt::Horizontal + + + + + + + true + + + true + + + + + + + Only capture to clipboard + + + + + + + + 40 + 0 + + + + + 50 + 16777215 + + + + 15 + + + 10 + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + + + + + 250 + 0 + + + + true + + + + + + + Calibrate + + + + + + + Automatic Backup Folder + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + Open Folder + + + false + + + + + + + true + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Simulator BackLight + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Enable automatic backup before writing firmware + + + + + + + Show splash screen when Companion starts + + + true + + + + + + + Find Executable + + + + + + + Open Folder + + + + + + + Enable + + + + + + + Google Earth Executable + + + + + + + Automatic check for OpenTX firmware updates + + + true + + + + + + + + 0 + 0 + + + + + Include companion splashes + + + + + Only user defined splashes + + + + + + + + + 0 + 0 + + + + Splash Screen Library + + + + + + + true + + + true + + + + + startupCheck_companion9x + backupEnable + line + backupPath + line_2 + startupCheck_fw + wizardEnable_ChkB + ge_label + label_5 + showSplash + line_3 + ge_pathButton + line_4 + backupPathButton + label_3 + backLightColor + snapshotPath + snapshotPathButton + snapshotClipboardCKB + label_11 + joystickCB + joystickcalButton + ge_lineedit + simuSW + buttonBox + line_5 + joystickChkB + label_17 + label_19 + historySize + label_9 + libraryPath + libraryPathButton + line_6 + splashincludeCB + label_10 + + + buttonBox + ge_lineedit + ge_pathButton + historySize + showSplash + startupCheck_fw + startupCheck_companion9x + wizardEnable_ChkB + backupPath + backupPathButton + backupEnable + snapshotPath + snapshotPathButton + snapshotClipboardCKB + simuSW + backLightColor + joystickCB + joystickChkB + joystickcalButton + + + + + + + buttonBox + accepted() + appPreferencesDialog + accept() + + + 376 + 596 + + + 157 + 274 + + + + + buttonBox + rejected() + appPreferencesDialog + reject() + + + 396 + 596 + + + 286 + 274 + + + + +