Moved Andrés new application selection next to the other selection check boxes. This seems like a natural fit to me, but please protest if you are of another opinion. I could also have added a horizontal line (there is a trick to it).
Set the first tab back as start tab in application settings dialog. Added automatic conversion of the old companion9x setting for using the wizard for creating models.
This commit is contained in:
@@ -601,6 +601,7 @@ AppData::AppData()
|
|||||||
|
|
||||||
// Store old values in new locations
|
// Store old values in new locations
|
||||||
autoCheckApp(settings.value("startup_check_companion9x", true).toBool());
|
autoCheckApp(settings.value("startup_check_companion9x", true).toBool());
|
||||||
|
useWizard(settings.value("wizardEnable", true).toBool());
|
||||||
|
|
||||||
// Convert and store the firmware type
|
// Convert and store the firmware type
|
||||||
QString fwType = settings.value("firmware", "").toString();
|
QString fwType = settings.value("firmware", "").toString();
|
||||||
|
|||||||
@@ -45,7 +45,7 @@
|
|||||||
<item row="0" column="1">
|
<item row="0" column="1">
|
||||||
<widget class="QTabWidget" name="tabWidget">
|
<widget class="QTabWidget" name="tabWidget">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>1</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="profileTab">
|
<widget class="QWidget" name="profileTab">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
@@ -580,7 +580,7 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="6" column="1" colspan="4">
|
<item row="7" column="1" colspan="4">
|
||||||
<widget class="QCheckBox" name="startupCheck_companion9x">
|
<widget class="QCheckBox" name="startupCheck_companion9x">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Automatic check for Companion updates</string>
|
<string>Automatic check for Companion updates</string>
|
||||||
@@ -590,7 +590,7 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="9" column="1" colspan="4">
|
<item row="10" column="1" colspan="4">
|
||||||
<widget class="QCheckBox" name="backupEnable">
|
<widget class="QCheckBox" name="backupEnable">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Enable automatic backup before writing firmware</string>
|
<string>Enable automatic backup before writing firmware</string>
|
||||||
@@ -604,14 +604,14 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="7" column="1" colspan="4">
|
<item row="8" column="1" colspan="4">
|
||||||
<widget class="Line" name="line_2">
|
<widget class="Line" name="line_2">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="1" colspan="4">
|
<item row="6" column="1" colspan="4">
|
||||||
<widget class="QCheckBox" name="startupCheck_fw">
|
<widget class="QCheckBox" name="startupCheck_fw">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Automatic check for OpenTX firmware updates</string>
|
<string>Automatic check for OpenTX firmware updates</string>
|
||||||
@@ -621,7 +621,7 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="12" column="1">
|
<item row="13" column="1">
|
||||||
<widget class="QLineEdit" name="libraryPath">
|
<widget class="QLineEdit" name="libraryPath">
|
||||||
<property name="enabled">
|
<property name="enabled">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@@ -644,7 +644,7 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item row="14" column="1">
|
<item row="15" column="1">
|
||||||
<spacer name="verticalSpacer_2">
|
<spacer name="verticalSpacer_2">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Vertical</enum>
|
<enum>Qt::Vertical</enum>
|
||||||
@@ -657,14 +657,14 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item row="8" column="4">
|
<item row="9" column="4">
|
||||||
<widget class="QPushButton" name="backupPathButton">
|
<widget class="QPushButton" name="backupPathButton">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Open Folder</string>
|
<string>Open Folder</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="11" column="0">
|
<item row="12" column="0">
|
||||||
<widget class="QLabel" name="label_10">
|
<widget class="QLabel" name="label_10">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
||||||
@@ -704,14 +704,14 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="12" column="4">
|
<item row="13" column="4">
|
||||||
<widget class="QPushButton" name="libraryPathButton">
|
<widget class="QPushButton" name="libraryPathButton">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Open Folder</string>
|
<string>Open Folder</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="8" column="1">
|
<item row="9" column="1">
|
||||||
<widget class="QLineEdit" name="backupPath">
|
<widget class="QLineEdit" name="backupPath">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
@@ -731,7 +731,7 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="11" column="1">
|
<item row="12" column="1">
|
||||||
<widget class="QComboBox" name="splashincludeCB">
|
<widget class="QComboBox" name="splashincludeCB">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
@@ -751,7 +751,7 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="12" column="0">
|
<item row="13" column="0">
|
||||||
<widget class="QLabel" name="label_9">
|
<widget class="QLabel" name="label_9">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
||||||
@@ -786,7 +786,7 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="8" column="0">
|
<item row="9" column="0">
|
||||||
<widget class="QLabel" name="label_17">
|
<widget class="QLabel" name="label_17">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Automatic Backup Folder</string>
|
<string>Automatic Backup Folder</string>
|
||||||
@@ -819,20 +819,20 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="13" column="1">
|
<item row="11" column="1" colspan="4">
|
||||||
<widget class="QCheckBox" name="modelWizard_CB">
|
|
||||||
<property name="text">
|
|
||||||
<string>Use model wizard when creating a new model</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="10" column="1" colspan="4">
|
|
||||||
<widget class="Line" name="line_5">
|
<widget class="Line" name="line_5">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="5" column="1" colspan="4">
|
||||||
|
<widget class="QCheckBox" name="modelWizard_CB">
|
||||||
|
<property name="text">
|
||||||
|
<string>Use model wizard when creating a new model</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="simulatorTab">
|
<widget class="QWidget" name="simulatorTab">
|
||||||
|
|||||||
Reference in New Issue
Block a user