diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp
index 4f3b8fc24..c68d44332 100644
--- a/companion/src/apppreferencesdialog.cpp
+++ b/companion/src/apppreferencesdialog.cpp
@@ -383,7 +383,6 @@ void AppPreferencesDialog::showVoice(bool show)
{
ui->voiceLabel->setVisible(show);
ui->voiceCombo->setVisible(show);
- QTimer::singleShot(0, this, SLOT(shrink()));
}
void AppPreferencesDialog::baseFirmwareChanged()
@@ -533,11 +532,11 @@ void AppPreferencesDialog::populateFirmwareOptions(const Firmware * firmware)
}
updateLock = false;
- QTimer::singleShot(0, this, SLOT(shrink()));
+ QTimer::singleShot(50, this, SLOT(shrink()));
}
void AppPreferencesDialog::shrink()
{
- resize(0,0);
+ adjustSize();
}
diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui
index 23ad622d0..9bd90b07d 100644
--- a/companion/src/apppreferencesdialog.ui
+++ b/companion/src/apppreferencesdialog.ui
@@ -6,26 +6,29 @@
0
0
- 686
- 713
+ 623
+ 537
-
+
0
0
-
-
- 685
- 0
-
-
Edit Settings
+
+ true
+
+
+ true
+
+
+ 6
+
-
@@ -38,6 +41,12 @@
-
+
+
+ 0
+ 0
+
+
0
@@ -84,7 +93,7 @@
-
-
+
0
0
@@ -120,7 +129,7 @@
-
-
+
0
0
@@ -163,6 +172,12 @@
-
+
+
+ 0
+ 0
+
+
Qt::Horizontal
@@ -173,6 +188,12 @@
-
+
+
+ 0
+ 0
+
+
75
@@ -189,6 +210,12 @@
-
+
+
+ 0
+ 0
+
+
Qt::Horizontal
@@ -197,7 +224,7 @@
-
-
+
0
0
@@ -226,6 +253,12 @@
-
+
+
+ 0
+ 0
+
+
Menu Language
@@ -252,7 +285,7 @@
-
-
+
0
0
@@ -290,6 +323,12 @@ May be different from firmware language
-
+
+
+ 0
+ 0
+
+
Build Options
@@ -298,33 +337,23 @@ May be different from firmware language
- -
-
-
-
+
+
+ 0
+ 0
+
+
Qt::Horizontal
- -
-
-
-
- 75
- true
-
-
-
- Other Settings
-
-
-
-
-
+
0
0
@@ -352,6 +381,12 @@ May be different from firmware language
-
+
+
+ 0
+ 0
+
+
The profile specific folder, if set, will override general Backup folder
@@ -372,6 +407,12 @@ May be different from firmware language
-
+
+
+ 0
+ 0
+
+
if set, will override general backup enable
@@ -382,6 +423,12 @@ May be different from firmware language
-
+
+
+ 0
+ 0
+
+
General Settings
@@ -392,6 +439,12 @@ May be different from firmware language
true
+
+
+ 0
+ 0
+
+
General Settings Label
@@ -400,7 +453,7 @@ May be different from firmware language
-
-
+
0
0
@@ -467,7 +520,7 @@ Mode 4:
-
-
+
0
0
@@ -483,23 +536,11 @@ Mode 4:
-
-
+
0
0
-
-
- 0
- 0
-
-
-
-
- 16777215
- 16777215
-
-
<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>
@@ -630,6 +671,12 @@ Mode 4:
-
+
+
+ 0
+ 0
+
+
Append version number to FW file name
@@ -637,6 +684,12 @@ Mode 4:
-
+
+
+ 0
+ 0
+
+
Offer to write FW to Tx after download
@@ -650,11 +703,60 @@ Mode 4:
20
- 40
+ 5
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ Other Settings
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 5
+
+
+ 4
+
+
+
+
@@ -664,6 +766,12 @@ Mode 4:
-
+
+
+ 0
+ 0
+
+
Automatic Backup Folder
@@ -764,7 +872,7 @@ Mode 4:
-
-
+
0
0
@@ -800,6 +908,12 @@ Mode 4:
-
+
+
+ 0
+ 0
+
+
Select Folder
@@ -808,7 +922,7 @@ Mode 4:
-
-
+
0
0
@@ -820,6 +934,12 @@ Mode 4:
-
+
+
+ 0
+ 0
+
+
Google Earth Executable
@@ -833,13 +953,19 @@ Mode 4:
20
- 40
+ 5
-
+
+
+ 0
+ 0
+
+
Enable automatic backup before writing firmware
@@ -865,7 +991,7 @@ Mode 4:
-
-
+
0
0
@@ -900,6 +1026,12 @@ Mode 4:
-
+
+
+ 0
+ 0
+
+
Select Executable
@@ -907,6 +1039,12 @@ Mode 4:
-
+
+
+ 0
+ 0
+
+
Select Folder
@@ -915,7 +1053,7 @@ Mode 4:
-
-
+
0
0
@@ -925,7 +1063,17 @@ Mode 4:
- -
+
-
+
+
+ <html><head/><body><p>This option maintains the behaviour from older OpenTx versions where empty model slots are preserved when a model is deleted or moved. </p><p>When this option is de-selected, the other models may be re-arranged to fill the gap left by the removed model.</p></body></html>
+
+
+ Remove empty model slots when deleting models (only applies for radios w/out categories)
+
+
+
+ -
-
@@ -959,16 +1107,6 @@ Mode 4:
- -
-
-
- <html><head/><body><p>This option maintains the behaviour from older OpenTx versions where empty model slots are preserved when a model is deleted or moved. </p><p>When this option is de-selected, the other models may be re-arranged to fill the gap left by the removed model.</p></body></html>
-
-
- Remove empty model slots when deleting models (only applies for radios w/out categories)
-
-
-
@@ -976,14 +1114,20 @@ Mode 4:
Simulator Settings
+
+ 6
+
-
-
+
0
0
+
+ QComboBox::AdjustToContents
+
-
@@ -1030,6 +1174,12 @@ Mode 4:
-
+
+
+ 0
+ 0
+
+
Simulator capture folder
@@ -1043,13 +1193,19 @@ Mode 4:
20
- 40
+ 5
-
+
+
+ 0
+ 0
+
+
Only capture to clipboard
@@ -1057,6 +1213,12 @@ Mode 4:
-
+
+
+ 0
+ 0
+
+
Enable
@@ -1075,7 +1237,7 @@ Mode 4:
-
-
+
0
0
@@ -1088,7 +1250,7 @@ Mode 4:
-
-
+
0
0
@@ -1107,7 +1269,7 @@ Mode 4:
true
-
+
0
0
@@ -1125,6 +1287,12 @@ Mode 4:
-
+
+
+ 0
+ 0
+
+
Remember simulator switch values
@@ -1132,6 +1300,12 @@ Mode 4:
-
+
+
+ 0
+ 0
+
+
Simulator Volume Gain
@@ -1139,6 +1313,12 @@ Mode 4:
-
+
+
+ 0
+ 0
+
+
50