Merge branch 'upstream/next'

This commit is contained in:
projectkk2glider
2014-04-16 09:34:14 +02:00
44 changed files with 2840 additions and 3020 deletions
+44 -20
View File
@@ -73,7 +73,7 @@
<number>6</number>
</property>
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0,0">
<layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0">
<item row="1" column="1">
<widget class="QGraphicsView" name="leftStick">
<property name="minimumSize">
@@ -121,7 +121,7 @@ QPushButton:checked {
}</string>
</property>
<property name="text">
<string>THR</string>
<string notr="true">THR</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -151,7 +151,7 @@ QPushButton:checked {
}</string>
</property>
<property name="text">
<string>RUD</string>
<string notr="true">RUD</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -181,7 +181,7 @@ QPushButton:checked {
}</string>
</property>
<property name="text">
<string>ELE</string>
<string notr="true">ELE</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -211,7 +211,7 @@ QPushButton:checked {
}</string>
</property>
<property name="text">
<string>AIL</string>
<string notr="true">AIL</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -355,7 +355,7 @@ QPushButton:checked {
<item>
<widget class="QLabel" name="leftXPerc">
<property name="text">
<string>TextLabel</string>
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -365,7 +365,7 @@ QPushButton:checked {
<item>
<widget class="QLabel" name="leftYPerc">
<property name="text">
<string>TextLabel</string>
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -393,6 +393,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">&lt;-</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
@@ -428,6 +431,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">-&gt;</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@@ -451,6 +457,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">^</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
@@ -486,6 +495,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">v</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@@ -535,7 +547,7 @@ QPushButton:pressed {
}</string>
</property>
<property name="text">
<string>TRN</string>
<string notr="true">TRN</string>
</property>
</widget>
</item>
@@ -562,7 +574,7 @@ QPushButton:checked {
}</string>
</property>
<property name="text">
<string>GEA</string>
<string notr="true">GEA</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -595,7 +607,7 @@ QPushButton:checked {
}</string>
</property>
<property name="text">
<string>ID0</string>
<string notr="true">ID0</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -632,7 +644,7 @@ QPushButton:checked {
}</string>
</property>
<property name="text">
<string>ID1</string>
<string notr="true">ID1</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -665,7 +677,7 @@ QPushButton:checked {
}</string>
</property>
<property name="text">
<string>ID2</string>
<string notr="true">ID2</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -812,7 +824,7 @@ QPushButton:checked {
<item>
<widget class="QLabel" name="rightXPerc">
<property name="text">
<string>TextLabel</string>
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -822,7 +834,7 @@ QPushButton:checked {
<item>
<widget class="QLabel" name="rightYPerc">
<property name="text">
<string>TextLabel</string>
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -850,6 +862,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">&lt;-</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
@@ -885,6 +900,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">-&gt;</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@@ -908,6 +926,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">^</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
@@ -943,6 +964,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">v</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@@ -1010,7 +1034,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>P1</string>
<string notr="true">P1</string>
</property>
<property name="minimum">
<number>-1024</number>
@@ -1032,7 +1056,7 @@ QPushButton:checked {
<item>
<widget class="QLabel" name="dialP_1value">
<property name="text">
<string>0 %</string>
<string notr="true">0 %</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1067,7 +1091,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>P2</string>
<string notr="true">P2</string>
</property>
<property name="minimum">
<number>-1024</number>
@@ -1092,7 +1116,7 @@ QPushButton:checked {
<item>
<widget class="QLabel" name="dialP_2value">
<property name="text">
<string>0 %</string>
<string notr="true">0 %</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1127,7 +1151,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>P3</string>
<string notr="true">P3</string>
</property>
<property name="minimum">
<number>-1024</number>
@@ -1149,7 +1173,7 @@ QPushButton:checked {
<item>
<widget class="QLabel" name="dialP_3value">
<property name="text">
<string>0 %</string>
<string notr="true">0 %</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -301,6 +301,9 @@
<property name="text">
<string notr="true">^</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
@@ -342,6 +345,9 @@
<property name="text">
<string notr="true">v</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@@ -555,7 +561,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>S1</string>
<string/>
</property>
<property name="minimum">
<number>-1024</number>
@@ -585,7 +591,7 @@ QPushButton:checked {
<item>
<widget class="QLabel" name="leftXPerc">
<property name="text">
<string>TextLabel</string>
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -595,7 +601,7 @@ QPushButton:checked {
<item>
<widget class="QLabel" name="leftYPerc">
<property name="text">
<string>TextLabel</string>
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -619,7 +625,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>SB</string>
<string/>
</property>
<property name="maximum">
<number>2</number>
@@ -675,7 +681,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>SA</string>
<string/>
</property>
<property name="maximum">
<number>2</number>
@@ -715,7 +721,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>SE</string>
<string/>
</property>
<property name="maximum">
<number>2</number>
@@ -743,7 +749,7 @@ QPushButton:checked {
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>SF</string>
<string notr="true">SF</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -765,10 +771,10 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>SF</string>
<string/>
</property>
<property name="statusTip">
<string>SF</string>
<string/>
</property>
<property name="maximum">
<number>1</number>
@@ -811,7 +817,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>LS</string>
<string/>
</property>
<property name="minimum">
<number>-1024</number>
@@ -833,7 +839,7 @@ QPushButton:checked {
<item row="3" column="6">
<widget class="QLabel" name="label_2">
<property name="text">
<string>SA</string>
<string notr="true">SA</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -843,7 +849,7 @@ QPushButton:checked {
<item row="3" column="8">
<widget class="QLabel" name="label_3">
<property name="text">
<string>SB</string>
<string notr="true">SB</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -853,7 +859,7 @@ QPushButton:checked {
<item row="3" column="5">
<widget class="QLabel" name="label_5">
<property name="text">
<string>SE</string>
<string notr="true">SE</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -863,7 +869,7 @@ QPushButton:checked {
<item row="3" column="3">
<widget class="QLabel" name="label_9">
<property name="text">
<string>LS</string>
<string notr="true">LS</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -873,7 +879,7 @@ QPushButton:checked {
<item row="3" column="10">
<widget class="QLabel" name="label_10">
<property name="text">
<string>S1</string>
<string notr="true">S1</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -899,6 +905,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">&lt;-</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
@@ -934,6 +943,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">-&gt;</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@@ -982,6 +994,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">^</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
@@ -1017,6 +1032,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">v</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@@ -1038,7 +1056,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>S2</string>
<string/>
</property>
<property name="minimum">
<number>-1024</number>
@@ -1060,7 +1078,7 @@ QPushButton:checked {
<item row="3" column="1">
<widget class="QLabel" name="label_11">
<property name="text">
<string>S2</string>
<string notr="true">S2</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1254,7 +1272,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>SD</string>
<string/>
</property>
<property name="maximum">
<number>2</number>
@@ -1294,7 +1312,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>SC</string>
<string/>
</property>
<property name="maximum">
<number>2</number>
@@ -1360,7 +1378,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>SG</string>
<string/>
</property>
<property name="maximum">
<number>2</number>
@@ -1403,7 +1421,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>RS</string>
<string/>
</property>
<property name="minimum">
<number>-1024</number>
@@ -1437,7 +1455,7 @@ QPushButton:checked {
</size>
</property>
<property name="toolTip">
<string>SH</string>
<string/>
</property>
<property name="styleSheet">
<string notr="true"/>
@@ -1468,7 +1486,7 @@ QPushButton:checked {
<item row="3" column="3">
<widget class="QLabel" name="label_4">
<property name="text">
<string>SC</string>
<string notr="true">SC</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1478,7 +1496,7 @@ QPushButton:checked {
<item row="3" column="5">
<widget class="QLabel" name="label_6">
<property name="text">
<string>SD</string>
<string notr="true">SD</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1488,7 +1506,7 @@ QPushButton:checked {
<item row="3" column="6">
<widget class="QLabel" name="label_7">
<property name="text">
<string>SG</string>
<string notr="true">SG</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1498,7 +1516,7 @@ QPushButton:checked {
<item row="3" column="11">
<widget class="QLabel" name="label_8">
<property name="text">
<string>SH</string>
<string notr="true">SH</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1508,7 +1526,7 @@ QPushButton:checked {
<item row="3" column="8">
<widget class="QLabel" name="label_12">
<property name="text">
<string>RS</string>
<string notr="true">RS</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1526,7 +1544,7 @@ QPushButton:checked {
<item>
<widget class="QLabel" name="rightXPerc">
<property name="text">
<string>TextLabel</string>
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1536,7 +1554,7 @@ QPushButton:checked {
<item>
<widget class="QLabel" name="rightYPerc">
<property name="text">
<string>TextLabel</string>
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1564,6 +1582,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">&lt;-</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
@@ -1605,6 +1626,9 @@ QPushButton:checked {
<property name="text">
<string notr="true">-&gt;</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>