zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Styling improvements to the joystick configuration window.

QGC4.4
Bryant 12 years ago
parent
d6e52a55d5
commit
133b39f968
4 changed files with 43 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      files/styles/style-dark.css
  2. 6
      files/styles/style-light.css
  3. 3
      src/ui/JoystickAxis.ui
  4. 37
      src/ui/JoystickButton.ui

6
files/styles/style-dark.css
Unescape View File

@ -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 {
@ -205,7 +206,8 @@ QLabel {
} }
QLabel:disabled { QLabel:disabled {
color: #353535; color: #444;
border-color: #444;
} }
QLabel#noUas { QLabel#noUas {

6
files/styles/style-light.css
Unescape View File

@ -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 {
@ -205,7 +206,8 @@ QLabel {
} }
QLabel:disabled { QLabel:disabled {
color: #AAA; color: #999;
border-color: #999;
} }
QLabel#noUas { QLabel#noUas {

3
src/ui/JoystickAxis.ui
Unescape View File

@ -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>

37
src/ui/JoystickButton.ui
Unescape View File

@ -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 @@
<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>

Write Preview
Loading…
Cancel
Save