Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorder XML .ui files to correct tab orders for plugin config dialogs #1955

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 20 additions & 20 deletions plugin-mainmenu/lxqtmainmenuconfiguration.ui
Expand Up @@ -127,6 +127,13 @@
<string>Keyboard Shortcut</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Click the button to record shortcut:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="ShortcutSelector" name="shortcutEd">
<property name="minimumSize">
Expand All @@ -140,13 +147,6 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Click the button to record shortcut:</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand All @@ -156,10 +156,10 @@
<string>Search</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="2" column="1">
<widget class="QLabel" name="filterShowMaxWidthL">
<item row="0" column="0" colspan="3">
<widget class="QCheckBox" name="filterMenuCB">
<property name="text">
<string>Max. item width:</string>
<string>Filter menu entries</string>
</property>
</widget>
</item>
Expand All @@ -170,24 +170,24 @@
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QSpinBox" name="filterShowMaxItemsSB">
<property name="maximum">
<number>20</number>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="filterShowMaxItemsL">
<property name="text">
<string>Maximum visible items:</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="QCheckBox" name="filterMenuCB">
<item row="1" column="2">
<widget class="QSpinBox" name="filterShowMaxItemsSB">
<property name="maximum">
<number>20</number>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="filterShowMaxWidthL">
<property name="text">
<string>Filter menu entries</string>
<string>Max. item width:</string>
</property>
</widget>
</item>
Expand Down
38 changes: 19 additions & 19 deletions plugin-networkmonitor/lxqtnetworkmonitorconfiguration.ui
Expand Up @@ -29,23 +29,10 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QLabel" name="interfaceLabel">
<item row="0" column="0">
<widget class="QLabel" name="iconLabel">
<property name="text">
<string>Interface</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="interfaceCB">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>true</bool>
<string>Icon</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -89,10 +76,23 @@
</item>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="iconLabel">
<item row="1" column="0">
<widget class="QLabel" name="interfaceLabel">
<property name="text">
<string>Icon</string>
<string>Interface</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="interfaceCB">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
Expand Down
66 changes: 33 additions & 33 deletions plugin-sensors/lxqtsensorsconfiguration.ui
Expand Up @@ -43,13 +43,6 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="tempBarWidthL">
<property name="text">
<string>Temperature bar width</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="updateIntervalSB">
<property name="enabled">
Expand All @@ -75,6 +68,13 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="tempBarWidthL">
<property name="text">
<string>Temperature bar width</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="tempBarWidthSB">
<property name="minimum">
Expand All @@ -85,18 +85,24 @@
</property>
</widget>
</item>
<item row="5" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="warningAboutHighTemperatureChB">
<property name="toolTip">
<string>Blink status bars when the temperature is too high</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
</spacer>
<property name="text">
<string>Warning about high temperature</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QGroupBox" name="tempScaleGB">
Expand Down Expand Up @@ -126,24 +132,18 @@
<zorder>celsiusTempScaleRB</zorder>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="warningAboutHighTemperatureChB">
<property name="toolTip">
<string>Blink status bars when the temperature is too high</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Warning about high temperature</string>
</property>
<property name="checked">
<bool>true</bool>
<item row="5" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="tristate">
<bool>false</bool>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</widget>
</spacer>
</item>
</layout>
</widget>
Expand Down
34 changes: 17 additions & 17 deletions plugin-spacer/spacerconfiguration.ui
Expand Up @@ -34,27 +34,24 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelType">
<item row="0" column="1">
<widget class="QRadioButton" name="sizeFixedRB">
<property name="text">
<string>Space type:</string>
<string>fixed</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<widget class="QDialogButtonBox" name="buttons">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
<item row="1" column="1" colspan="2">
<widget class="QRadioButton" name="sizeExpandRB">
<property name="text">
<string>expandable</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="sizeFixedRB">
<item row="2" column="0">
<widget class="QLabel" name="labelType">
<property name="text">
<string>fixed</string>
<string>Space type:</string>
</property>
</widget>
</item>
Expand All @@ -65,10 +62,13 @@
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QRadioButton" name="sizeExpandRB">
<property name="text">
<string>expandable</string>
<item row="3" column="0" colspan="3">
<widget class="QDialogButtonBox" name="buttons">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
</property>
</widget>
</item>
Expand Down