Skip to content

Q
qgroundcontrol
Commit 61e63ac0 authored by Bryant's avatar Bryant
Browse files
Options

Styling improvements to the joystick configuration window.

parent cfffe063
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 15 deletions
files/styles/style-dark.css
View file @ 61e63ac0
...@@ -9,10 +9,11 @@ ...@@ -9,10 +9,11 @@
color: #777; color: #777;
} }
JoystickWidget QLabel { JoystickButton QLabel {
border: 1px solid #AAA; border: 1px solid #AAA;
border-radius: 4px; border-radius: 4px;
height: 16px; height: 16px;
padding: 0 3px;
} }
QCheckBox { QCheckBox {
...@@ -177,7 +178,8 @@ QLabel { ...@@ -177,7 +178,8 @@ QLabel {
} }
QLabel:disabled { QLabel:disabled {
color: #353535; color: #444;
border-color: #444;
} }
QLabel#noUas { QLabel#noUas {
......
files/styles/style-light.css
View file @ 61e63ac0
...@@ -9,10 +9,11 @@ ...@@ -9,10 +9,11 @@
color: #AAA; color: #AAA;
} }
JoystickWidget QLabel { JoystickButton QLabel {
border: 1px solid #777; border: 1px solid #777;
border-radius: 4px; border-radius: 4px;
height: 16px; height: 16px;
padding: 0 3px;
} }
QCheckBox { QCheckBox {
...@@ -176,7 +177,8 @@ QLabel { ...@@ -176,7 +177,8 @@ QLabel {
} }
QLabel:disabled { QLabel:disabled {
color: #AAA; color: #999;
border-color: #999;
} }
QLabel#noUas { QLabel#noUas {
......
src/ui/JoystickAxis.ui
View file @ 61e63ac0
...@@ -46,6 +46,9 @@ ...@@ -46,6 +46,9 @@
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget> </widget>
</item> </item>
<item> <item>
......
src/ui/JoystickButton.ui
View file @ 61e63ac0
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>125</width> <width>125</width>
<height>27</height> <height>29</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -42,25 +42,46 @@ ...@@ -42,25 +42,46 @@
<number>1</number> <number>1</number>
</property> </property>
<item> <item>
<widget class="QComboBox" name="joystickAction"> <widget class="QLabel" name="joystickButtonLabel">
<item> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>--</string> <string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property> </property>
</item>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="joystickButtonLabel"> <widget class="QComboBox" name="joystickAction">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
</size>
</property>
<item>
<property name="text"> <property name="text">
<string/> <string>--</string>
</property> </property>
</item>
</widget> </widget>
</item> </item>
</layout> </layout>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment