Skip to content

Commit 2283133

Browse files
limpkinlimpkin
authored
Merge pull request #1040 from deXol/develop
[BLE] Change order of Device Settings
2 parents 1196ffc + 7fcb343 commit 2283133

1 file changed

Lines changed: 38 additions & 38 deletions

File tree

‎src/MainWindow.ui‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,14 +1533,11 @@ Hint: keep your mouse positioned over an option to get more details.</string>
15331533
</widget>
15341534
</item>
15351535
<item>
1536-
<widget class="QWidget" name="settings_information_time_delay" native="true">
1536+
<widget class="QWidget" name="settings_miscellaneous_brightness" native="true">
15371537
<property name="toolTip">
1538-
<string>How long information messages should be displayed for</string>
1538+
<string>Mooltipass screen brightness</string>
15391539
</property>
1540-
<layout class="QHBoxLayout" name="horizontalLayout_63" stretch="0,0,0">
1541-
<property name="spacing">
1542-
<number>6</number>
1543-
</property>
1540+
<layout class="QHBoxLayout" name="horizontalLayout_24">
15441541
<property name="leftMargin">
15451542
<number>0</number>
15461543
</property>
@@ -1554,17 +1551,24 @@ Hint: keep your mouse positioned over an option to get more details.</string>
15541551
<number>0</number>
15551552
</property>
15561553
<item>
1557-
<widget class="QLabel" name="label_informationTimeDelay">
1554+
<widget class="QLabel" name="label_3">
15581555
<property name="text">
1559-
<string>Information Time Delay</string>
1556+
<string>Screen Brightness</string>
15601557
</property>
15611558
</widget>
15621559
</item>
15631560
<item>
1564-
<widget class="QComboBox" name="comboBoxInformationTimeDelay"/>
1561+
<widget class="QComboBox" name="comboBoxScreenBrightness">
1562+
<property name="sizePolicy">
1563+
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
1564+
<horstretch>0</horstretch>
1565+
<verstretch>0</verstretch>
1566+
</sizepolicy>
1567+
</property>
1568+
</widget>
15651569
</item>
15661570
<item>
1567-
<spacer name="horizontalSpacer_55">
1571+
<spacer name="horizontalSpacer_28">
15681572
<property name="orientation">
15691573
<enum>Qt::Horizontal</enum>
15701574
</property>
@@ -1580,11 +1584,8 @@ Hint: keep your mouse positioned over an option to get more details.</string>
15801584
</widget>
15811585
</item>
15821586
<item>
1583-
<widget class="QWidget" name="settings_miscellaneous_brightness" native="true">
1584-
<property name="toolTip">
1585-
<string>Mooltipass screen brightness</string>
1586-
</property>
1587-
<layout class="QHBoxLayout" name="horizontalLayout_24">
1587+
<widget class="QWidget" name="settings_screen_brightness_bat" native="true">
1588+
<layout class="QHBoxLayout" name="horizontalLayout_68">
15881589
<property name="leftMargin">
15891590
<number>0</number>
15901591
</property>
@@ -1598,24 +1599,17 @@ Hint: keep your mouse positioned over an option to get more details.</string>
15981599
<number>0</number>
15991600
</property>
16001601
<item>
1601-
<widget class="QLabel" name="label_3">
1602+
<widget class="QLabel" name="label_BatteryScreenBrightness">
16021603
<property name="text">
1603-
<string>Screen Brightness</string>
1604+
<string>Brightness when battery powered</string>
16041605
</property>
16051606
</widget>
16061607
</item>
16071608
<item>
1608-
<widget class="QComboBox" name="comboBoxScreenBrightness">
1609-
<property name="sizePolicy">
1610-
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
1611-
<horstretch>0</horstretch>
1612-
<verstretch>0</verstretch>
1613-
</sizepolicy>
1614-
</property>
1615-
</widget>
1609+
<widget class="QComboBox" name="comboBoxBatteryScreenBrightness"/>
16161610
</item>
16171611
<item>
1618-
<spacer name="horizontalSpacer_28">
1612+
<spacer name="horizontalSpacer_44">
16191613
<property name="orientation">
16201614
<enum>Qt::Horizontal</enum>
16211615
</property>
@@ -1631,8 +1625,8 @@ Hint: keep your mouse positioned over an option to get more details.</string>
16311625
</widget>
16321626
</item>
16331627
<item>
1634-
<widget class="QWidget" name="settings_screen_brightness_bat" native="true">
1635-
<layout class="QHBoxLayout" name="horizontalLayout_68">
1628+
<widget class="QWidget" name="settings_screen_brightness_usb" native="true">
1629+
<layout class="QHBoxLayout" name="horizontalLayout_67">
16361630
<property name="leftMargin">
16371631
<number>0</number>
16381632
</property>
@@ -1646,17 +1640,17 @@ Hint: keep your mouse positioned over an option to get more details.</string>
16461640
<number>0</number>
16471641
</property>
16481642
<item>
1649-
<widget class="QLabel" name="label_BatteryScreenBrightness">
1643+
<widget class="QLabel" name="label_UsbScreenBrightness">
16501644
<property name="text">
1651-
<string>Brightness when battery powered</string>
1645+
<string>Brightness when USB powered</string>
16521646
</property>
16531647
</widget>
16541648
</item>
16551649
<item>
1656-
<widget class="QComboBox" name="comboBoxBatteryScreenBrightness"/>
1650+
<widget class="QComboBox" name="comboBoxUsbScreenBrightness"/>
16571651
</item>
16581652
<item>
1659-
<spacer name="horizontalSpacer_44">
1653+
<spacer name="horizontalSpacer_38">
16601654
<property name="orientation">
16611655
<enum>Qt::Horizontal</enum>
16621656
</property>
@@ -1672,8 +1666,14 @@ Hint: keep your mouse positioned over an option to get more details.</string>
16721666
</widget>
16731667
</item>
16741668
<item>
1675-
<widget class="QWidget" name="settings_screen_brightness_usb" native="true">
1676-
<layout class="QHBoxLayout" name="horizontalLayout_67">
1669+
<widget class="QWidget" name="settings_information_time_delay" native="true">
1670+
<property name="toolTip">
1671+
<string>How long information messages should be displayed for</string>
1672+
</property>
1673+
<layout class="QHBoxLayout" name="horizontalLayout_63" stretch="0,0,0">
1674+
<property name="spacing">
1675+
<number>6</number>
1676+
</property>
16771677
<property name="leftMargin">
16781678
<number>0</number>
16791679
</property>
@@ -1687,17 +1687,17 @@ Hint: keep your mouse positioned over an option to get more details.</string>
16871687
<number>0</number>
16881688
</property>
16891689
<item>
1690-
<widget class="QLabel" name="label_UsbScreenBrightness">
1690+
<widget class="QLabel" name="label_informationTimeDelay">
16911691
<property name="text">
1692-
<string>Brightness when USB powered</string>
1692+
<string>Information Time Delay</string>
16931693
</property>
16941694
</widget>
16951695
</item>
16961696
<item>
1697-
<widget class="QComboBox" name="comboBoxUsbScreenBrightness"/>
1697+
<widget class="QComboBox" name="comboBoxInformationTimeDelay"/>
16981698
</item>
16991699
<item>
1700-
<spacer name="horizontalSpacer_38">
1700+
<spacer name="horizontalSpacer_55">
17011701
<property name="orientation">
17021702
<enum>Qt::Horizontal</enum>
17031703
</property>

0 commit comments

Comments
 (0)