Browse Source

Styling improvements to the joystick configuration window.

QGC4.4
Bryant 12 years ago
parent
commit
61e63ac09a
  1. 6
      files/styles/style-dark.css
  2. 6
      files/styles/style-light.css
  3. 3
      src/ui/JoystickAxis.ui
  4. 43
      src/ui/JoystickButton.ui

6
files/styles/style-dark.css

@ -9,10 +9,11 @@ @@ -9,10 +9,11 @@
color: #777;
}
JoystickWidget QLabel {
JoystickButton QLabel {
border: 1px solid #AAA;
border-radius: 4px;
height: 16px;
padding: 0 3px;
}
QCheckBox {
@ -177,7 +178,8 @@ QLabel { @@ -177,7 +178,8 @@ QLabel {
}
QLabel:disabled {
color: #353535;
color: #444;
border-color: #444;
}
QLabel#noUas {

6
files/styles/style-light.css

@ -9,10 +9,11 @@ @@ -9,10 +9,11 @@
color: #AAA;
}
JoystickWidget QLabel {
JoystickButton QLabel {
border: 1px solid #777;
border-radius: 4px;
height: 16px;
padding: 0 3px;
}
QCheckBox {
@ -176,7 +177,8 @@ QLabel { @@ -176,7 +177,8 @@ QLabel {
}
QLabel:disabled {
color: #AAA;
color: #999;
border-color: #999;
}
QLabel#noUas {

3
src/ui/JoystickAxis.ui

@ -46,6 +46,9 @@ @@ -46,6 +46,9 @@
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>

43
src/ui/JoystickButton.ui

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>125</width>
<height>27</height>
<height>29</height>
</rect>
</property>
<property name="sizePolicy">
@ -42,25 +42,46 @@ @@ -42,25 +42,46 @@
<number>1</number>
</property>
<item>
<widget class="QComboBox" name="joystickAction">
<item>
<property name="text">
<string>--</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QLabel" name="joystickButtonLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<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">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="joystickAction">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
</size>
</property>
<item>
<property name="text">
<string>--</string>
</property>
</item>
</widget>
</item>
</layout>

Loading…
Cancel
Save