From 2ac04e60ae65c7e9451e2ee4d3727b094011216d Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 14 Dec 2014 16:41:42 +0100 Subject: [PATCH] Re #1909: tabs fixed in .ui files --- companion/src/apppreferencesdialog.ui | 23 +- companion/src/burnconfigdialog.ui | 10 +- companion/src/burndialog.ui | 3 +- companion/src/fwpreferencesdialog.ui | 6 +- companion/src/imgpreferences.ui | 21 +- companion/src/logsdialog.ui | 11 + companion/src/modeledit/curves.ui | 14 + companion/src/modeledit/expodialog.ui | 7 +- companion/src/modeledit/flightmode.ui | 18 + companion/src/modeledit/mixerdialog.ui | 37 +- companion/src/modeledit/setup.ui | 14 + companion/src/modeledit/setup_module.ui | 19 +- companion/src/modeledit/telemetry.ui | 28 +- companion/src/modeledit/telemetry_analog.ui | 13 +- companion/src/preferencesdialog.ui | 1683 ------------------- 15 files changed, 202 insertions(+), 1705 deletions(-) delete mode 100644 companion/src/preferencesdialog.ui diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui index 7a75bc755..bbbfc8174 100644 --- a/companion/src/apppreferencesdialog.ui +++ b/companion/src/apppreferencesdialog.ui @@ -1049,10 +1049,26 @@ Mode 4: + tabWidget + profileNameLE + removeProfileButton + downloadVerCB + langCombo + voiceCombo + SplashFileName + SplashSelect + clearImageButton + sdPath + sdPathButton + stickmodeCB + channelorderCB + renameFirmware + burnFirmware ge_lineedit ge_pathButton historySize showSplash + modelWizard_CB startupCheck_fw startupCheck_companion9x backupPath @@ -1061,7 +1077,6 @@ Mode 4: splashincludeCB libraryPath libraryPathButton - buttonBox snapshotPath snapshotPathButton snapshotClipboardCKB @@ -1070,11 +1085,7 @@ Mode 4: joystickCB joystickChkB joystickcalButton - SplashFileName - stickmodeCB - channelorderCB - renameFirmware - burnFirmware + buttonBox diff --git a/companion/src/burnconfigdialog.ui b/companion/src/burnconfigdialog.ui index 94a7f783f..36d343884 100644 --- a/companion/src/burnconfigdialog.ui +++ b/companion/src/burnconfigdialog.ui @@ -7,7 +7,7 @@ 0 0 531 - 335 + 422 @@ -817,6 +817,14 @@ Please only use this if you know what you are doing. There are no error checks avrdude_port avrArgs pushButton_4 + samba_location + sb_browse + arm_mcu + samba_port + dfu_location + dfu_browse + dfuArgs + advCtrChkB buttonBox diff --git a/companion/src/burndialog.ui b/companion/src/burndialog.ui index 208bc4527..870a57672 100644 --- a/companion/src/burndialog.ui +++ b/companion/src/burndialog.ui @@ -357,11 +357,11 @@ - BurnFlashButton FWFileName FlashLoadButton versionField ModField + DateField useProfileImageCB useFwImageCB useLibraryImageCB @@ -371,6 +371,7 @@ patchhw_CB EEpromCB cancelButton + BurnFlashButton diff --git a/companion/src/fwpreferencesdialog.ui b/companion/src/fwpreferencesdialog.ui index f0c68f84b..0f21b6592 100644 --- a/companion/src/fwpreferencesdialog.ui +++ b/companion/src/fwpreferencesdialog.ui @@ -7,7 +7,7 @@ 0 0 416 - 153 + 154 @@ -177,6 +177,10 @@ May be different from firmware language + checkFWUpdates + fw_dnld + voiceCombo + voice_dnld buttonBox diff --git a/companion/src/imgpreferences.ui b/companion/src/imgpreferences.ui index 31209088d..fc92aeb1e 100644 --- a/companion/src/imgpreferences.ui +++ b/companion/src/imgpreferences.ui @@ -7,7 +7,7 @@ 0 0 685 - 418 + 432 @@ -441,6 +441,25 @@ + + backLightColor + joystickCB + joystickChkB + joystickcalButton + simuSW + snapshotPath + snapshotPathButton + snapshotClipboardCKB + libraryPath + libraryPathButton + splashincludeCB + SplashFileName + SplashSelect + splashLibraryButton + clearImageButton + InvertPixels + buttonBox + diff --git a/companion/src/logsdialog.ui b/companion/src/logsdialog.ui index e483cbbdf..dfa53014b 100644 --- a/companion/src/logsdialog.ui +++ b/companion/src/logsdialog.ui @@ -287,6 +287,17 @@ 1 + + FileName_LE + fileOpen_BT + FieldsTW + mapsButton + ZoomX_ChkB + ZoomY_ChkB + Reset_PB + sessions_CB + logTable + diff --git a/companion/src/modeledit/curves.ui b/companion/src/modeledit/curves.ui index 1be96eecd..0ad46bdd9 100644 --- a/companion/src/modeledit/curves.ui +++ b/companion/src/modeledit/curves.ui @@ -339,6 +339,20 @@ + + curvePreview + curvePoints + curveCustom + curveSmooth + curveName + curveType + curveCoeff + yMin + yMid + yMax + curveSide + curveApply + diff --git a/companion/src/modeledit/expodialog.ui b/companion/src/modeledit/expodialog.ui index 37bdb4362..133a2ae43 100644 --- a/companion/src/modeledit/expodialog.ui +++ b/companion/src/modeledit/expodialog.ui @@ -6,8 +6,8 @@ 0 0 - 381 - 414 + 389 + 488 @@ -481,6 +481,9 @@ If blank then the input is considered to be "ON" all the time.weightGV weightSB weightCB + offsetGV + offsetSB + offsetCB curveTypeCB curveGVarCB curveValueCB diff --git a/companion/src/modeledit/flightmode.ui b/companion/src/modeledit/flightmode.ui index b2ff04752..fffb61a0f 100644 --- a/companion/src/modeledit/flightmode.ui +++ b/companion/src/modeledit/flightmode.ui @@ -457,6 +457,24 @@ + + name + fadeIn + swtch + fadeOut + trim2Slider + trim2Use + trim2Value + trim1Use + trim1Value + trim1Slider + trim3Use + trim3Value + trim4Use + trim4Value + trim4Slider + trim3Slider + diff --git a/companion/src/modeledit/mixerdialog.ui b/companion/src/modeledit/mixerdialog.ui index 0671f7c90..d9c2ef9dc 100644 --- a/companion/src/modeledit/mixerdialog.ui +++ b/companion/src/modeledit/mixerdialog.ui @@ -6,8 +6,8 @@ 0 0 - 364 - 434 + 412 + 541 @@ -611,6 +611,39 @@ If blank then the mix is considered to be "ON" all the time. + + mixerName + sourceCB + weightGV + weightCB + weightSB + offsetGV + offsetCB + offsetSB + curveTypeCB + curveGVarCB + curveValueCB + curveValueSB + trimCB + MixDR_CB + cb_FP0 + cb_FP1 + cb_FP2 + cb_FP3 + cb_FP4 + cb_FP5 + cb_FP6 + cb_FP7 + cb_FP8 + switchesCB + warningCB + mltpxCB + delayUpSB + delayDownSB + slowUpSB + slowDownSB + buttonBox + diff --git a/companion/src/modeledit/setup.ui b/companion/src/modeledit/setup.ui index bade33288..28f5469f3 100644 --- a/companion/src/modeledit/setup.ui +++ b/companion/src/modeledit/setup.ui @@ -596,6 +596,20 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi
autocombobox.h
+ + name + image + throttleSource + throttleTrim + throttleWarning + throttleReverse + trimIncrement + extendedLimits + extendedTrims + displayText + trimsDisplay + potWarningMode + diff --git a/companion/src/modeledit/setup_module.ui b/companion/src/modeledit/setup_module.ui index 7dcebe3ea..3574236cf 100644 --- a/companion/src/modeledit/setup_module.ui +++ b/companion/src/modeledit/setup_module.ui @@ -6,7 +6,7 @@ 0 0 - 628 + 692 300 @@ -67,12 +67,12 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - 6 - 0 + + 6 + @@ -550,6 +550,17 @@ + + trainerMode + protocol + channelsStart + channelsCount + ppmFrameLength + ppmPolarity + ppmDelay + failsafeMode + rxNumber + diff --git a/companion/src/modeledit/telemetry.ui b/companion/src/modeledit/telemetry.ui index 4529436cf..ce0bcd4af 100644 --- a/companion/src/modeledit/telemetry.ui +++ b/companion/src/modeledit/telemetry.ui @@ -7,7 +7,7 @@ 0 0 861 - 562 + 737 @@ -326,7 +326,7 @@ 4 - -1 + 6 @@ -549,7 +549,7 @@ 4 - -1 + 6 @@ -921,6 +921,28 @@
autocombobox.h
+ + telemetryProtocol + rssiAlarm1CB + rssiAlarm1SB + rssiAlarm2CB + rssiAlarm2SB + varioSourceCB + varioLimitMin_DSB + varioLimitCenterMin_DSB + varioLimitCenterMax_DSB + varioLimitMax_DSB + voltsSource + altitudeSource + frskyProtoCB + fasOffset_DSB + mahCount_SB + mahCount_ChkB + frskyVoltCB + frskyCurrentCB + bladesCount + customScreens + diff --git a/companion/src/modeledit/telemetry_analog.ui b/companion/src/modeledit/telemetry_analog.ui index 980b5328f..137b11966 100644 --- a/companion/src/modeledit/telemetry_analog.ui +++ b/companion/src/modeledit/telemetry_analog.ui @@ -7,7 +7,7 @@ 0 0 276 - 118 + 138 @@ -325,6 +325,17 @@ + + UnitCB + RatioSB + CalibSB + alarm1LevelCB + alarm1GreaterCB + alarm1ValueSB + alarm2LevelCB + alarm2GreaterCB + alarm2ValueSB + diff --git a/companion/src/preferencesdialog.ui b/companion/src/preferencesdialog.ui deleted file mode 100644 index 7fa210b48..000000000 --- a/companion/src/preferencesdialog.ui +++ /dev/null @@ -1,1683 +0,0 @@ - - - preferencesDialog - - - - 0 - 0 - 685 - 838 - - - - - 0 - 0 - - - - - 685 - 0 - - - - Preferences - - - - QLayout::SetMinimumSize - - - 2 - - - 4 - - - - - 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) - - - - - - - - - Blue - - - - - Green - - - - - Red - - - - - Orange - - - - - Yellow - - - - - - - - - - true - - - - - - - Open Folder - - - - - - - auto backup before write - - - - - - - - - Automatic Backup Folder - - - - - - - - 0 - 0 - - - - Show Splash At Start - - - - - - - - - Enable - - - - - - - - 0 - 0 - - - - - - - - Calibrate - - - - - - - - - - - - 40 - 0 - - - - 15 - - - 10 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Ask use of wizard for new models - - - true - - - - - - - - - Qt::Horizontal - - - - - - - - 0 - 0 - - - - Simu BackLight - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - 0 - 0 - - - - - 128 - 64 - - - - - 128 - 64 - - - - QFrame::Panel - - - QFrame::Raised - - - - - - true - - - - - - - false - - - Invert Pixels - - - - - - - ... - - - - - - - - - Remember switches in simulator - - - - - - - 6 - - - - - true - - - true - - - - - - - ... - - - - - - - - 0 - 0 - - - - Open Image - - - - - - - - - Simulator capture folder - - - - - - - Qt::Horizontal - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - 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 - - - - Custom TX splash screen - - - - - - - 1 - - - - - Open Folder - - - - - - - true - - - true - - - - - - - - - - - - 0 - 0 - - - - FwInfo - - - - - - - Check for updates - - - - - - - - - - 0 - 0 - - - - Personal splash library - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 0 - 0 - - - - Ask for flashing after Download - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - - - - Export Profile - - - - - - - Save Profile - - - - - - - 1 - - - 10 - - - - - - - Import Profile - - - - - - - - - - Profile Name - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - 1 - - - - - Open Folder - - - - - - - true - - - true - - - - - - - Use clipboard only - - - - - - - - - - 0 - 0 - - - - Default Stick Mode - - - - - - - - 0 - 0 - - - - Default Channel Order - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Profile slot - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 40 - 10 - - - - - - - - - - - 0 - 0 - - - - Automatically add version number to the filename after download - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - - QLayout::SetMaximumSize - - - - - Voice - - - - - - - - 0 - 0 - - - - Download - - - - - - - Set language of voice. -May be different from firmware language - - - - - - - - 0 - 0 - - - - - - - - Language - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - Download - - - - - - - true - - - true - - - - - - - Open Folder - - - - - - - - - - - - - - - 0 - 0 - - - - Firmware - - - - - - - - 0 - 0 - - - - SD Structure path - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Processor ID - - - - - - - - - - 0 - 0 - - - - Recent History Size - - - - - - - QLayout::SetMaximumSize - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - - - 0 - 0 - - - - Splash library behaviour - - - - - - - - 0 - 0 - - - - - Include companion splashes - - - - - Only user defined splashes - - - - - - - - - - - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Check for updates on startup - - - true - - - - - - - Check for selected Fw updates - - - true - - - - - - - - - - 0 - 0 - - - - Joystick - - - - - - - Google Earth Executable - - - - - - - - - true - - - - - - - Find Executable - - - - - - - - - InvertPixels - clearImageButton - SplashFileName - splashLibraryButton - SplashSelect - libraryPath - libraryPathButton - downloadVerCB - fw_dnld - optionCheckBox_1 - optionCheckBox_2 - checkFWUpdates - channelorderCB - joystickChkB - joystickCB - joystickcalButton - buttonBox - - - - - - - buttonBox - accepted() - preferencesDialog - accept() - - - 370 - 49 - - - 157 - 274 - - - - - buttonBox - rejected() - preferencesDialog - reject() - - - 390 - 55 - - - 286 - 274 - - - - -