rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

OP-39 Updated some GUI. Changed stylesheet on some elements. Switched button graphix and added new graphix.

Browse Source
This commit is contained in:
Fredrik Arvidsson 2012-08-24 16:22:21 +02:00
parent 49bdb731f5
commit 4d701a2f7a
12 changed files with 89 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ground/openpilotgcs/src/plugins/setupwizard/pages/flashpage.ui
View File

@ -43,25 +43,37 @@ p, li { white-space: pre-wrap; }
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="saveButton">
<widget class="QToolButton" name="saveButton">
<property name="geometry">
<rect>
<x>490</x>
<y>350</y>
<width>70</width>
<height>23</height>
<x>200</x>
<y>250</y>
<width>200</width>
<height>70</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">QToolButton { border: none }</string>
</property>
<property name="text">
<string>Save</string>
</property>
<property name="iconSize">
<size>
<width>200</width>
<height>70</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonIconOnly</enum>
</property>
</widget>
<widget class="QLabel" name="saveProgressLabel">
<property name="geometry">
<rect>
<x>42</x>
<y>325</y>
<width>491</width>
<y>330</y>
<width>441</width>
<height>16</height>
</rect>
</property>
@ -79,13 +91,28 @@ p, li { white-space: pre-wrap; }
<rect>
<x>40</x>
<y>350</y>
<width>450</width>
<width>520</width>
<height>23</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">QProgressBar {
border: 2px solid grey;
border-radius: 5px;
text-align: center;
}
QProgressBar::chunk {
background-color: #3D6699;
width: 10px;
margin: 0.5px;
}</string>
</property>
<property name="value">
<number>0</number>
</property>
<property name="format">
<string/>
</property>
</widget>
</widget>
<resources/>

16
ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.ui
View File

@ -66,9 +66,7 @@ p, li { white-space: pre-wrap; }
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-sat-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-sat-down.png</normalon>
<activeoff>:/setupwizard/resources/bttn-sat-down.png</activeoff>
<activeon>:/setupwizard/resources/bttn-sat-down.png</activeon>:/setupwizard/resources/bttn-sat-up.png</iconset>
<normalon>:/setupwizard/resources/bttn-sat-down.png</normalon>:/setupwizard/resources/bttn-sat-up.png</iconset>
</property>
<property name="iconSize">
<size>
@ -115,9 +113,7 @@ p, li { white-space: pre-wrap; }
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-pwm-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-pwm-down.png</normalon>
<activeoff>:/setupwizard/resources/bttn-pwm-down.png</activeoff>
<activeon>:/setupwizard/resources/bttn-pwm-down.png</activeon>:/setupwizard/resources/bttn-pwm-up.png</iconset>
<normalon>:/setupwizard/resources/bttn-pwm-down.png</normalon>:/setupwizard/resources/bttn-pwm-up.png</iconset>
</property>
<property name="iconSize">
<size>
@ -167,9 +163,7 @@ p, li { white-space: pre-wrap; }
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-ppm-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-ppm-down.png</normalon>
<activeoff>:/setupwizard/resources/bttn-ppm-down.png</activeoff>
<activeon>:/setupwizard/resources/bttn-ppm-down.png</activeon>:/setupwizard/resources/bttn-ppm-up.png</iconset>
<normalon>:/setupwizard/resources/bttn-ppm-down.png</normalon>:/setupwizard/resources/bttn-ppm-up.png</iconset>
</property>
<property name="iconSize">
<size>
@ -216,9 +210,7 @@ p, li { white-space: pre-wrap; }
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-sbus-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-sbus-down.png</normalon>
<activeoff>:/setupwizard/resources/bttn-sbus-down.png</activeoff>
<activeon>:/setupwizard/resources/bttn-sbus-down.png</activeon>:/setupwizard/resources/bttn-sbus-up.png</iconset>
<normalon>:/setupwizard/resources/bttn-sbus-down.png</normalon>:/setupwizard/resources/bttn-sbus-up.png</iconset>
</property>
<property name="iconSize">
<size>

45
ground/openpilotgcs/src/plugins/setupwizard/pages/levellingpage.ui
View File

@ -40,33 +40,64 @@ p, li { white-space: pre-wrap; }
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="levelButton">
<widget class="QToolButton" name="levelButton">
<property name="geometry">
<rect>
<x>490</x>
<y>350</y>
<width>70</width>
<height>23</height>
<x>200</x>
<y>250</y>
<width>200</width>
<height>70</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">QToolButton { border: none }</string>
</property>
<property name="text">
<string>Calculate</string>
</property>
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-calculate-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-calculate-down.png</normalon>:/setupwizard/resources/bttn-calculate-up.png</iconset>
</property>
<property name="iconSize">
<size>
<width>200</width>
<height>70</height>
</size>
</property>
</widget>
<widget class="QProgressBar" name="levellinProgressBar">
<property name="geometry">
<rect>
<x>40</x>
<y>350</y>
<width>450</width>
<width>520</width>
<height>23</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">QProgressBar {
border: 2px solid grey;
border-radius: 5px;
text-align: center;
}
QProgressBar::chunk {
background-color: #3D6699;
width: 10px;
margin: 0.5px;
}</string>
</property>
<property name="value">
<number>0</number>
</property>
<property name="format">
<string/>
</property>
</widget>
</widget>
<resources/>
<resources>
<include location="../wizardResources.qrc"/>
</resources>
<connections/>
</ui>

12
ground/openpilotgcs/src/plugins/setupwizard/pages/outputpage.ui
View File

@ -61,14 +61,12 @@ p, li { white-space: pre-wrap; }
<string notr="true">QToolButton { border: none }</string>
</property>
<property name="text">
<string>Rapid ESC</string>
<string>Turbo PWM</string>
</property>
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-rapid-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-rapid-down.png</normalon>
<activeoff>:/setupwizard/resources/bttn-rapid-down.png</activeoff>
<activeon>:/setupwizard/resources/bttn-rapid-down.png</activeon>:/setupwizard/resources/bttn-rapid-up.png</iconset>
<normaloff>:/setupwizard/resources/bttn-turbo-down.png</normaloff>
<normalon>:/setupwizard/resources/bttn-turbo-up.png</normalon>:/setupwizard/resources/bttn-turbo-down.png</iconset>
</property>
<property name="iconSize">
<size>
@ -118,9 +116,7 @@ p, li { white-space: pre-wrap; }
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-ESC-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-ESC-down.png</normalon>
<activeoff>:/setupwizard/resources/bttn-ESC-down.png</activeoff>
<activeon>:/setupwizard/resources/bttn-ESC-down.png</activeon>:/setupwizard/resources/bttn-ESC-up.png</iconset>
<normalon>:/setupwizard/resources/bttn-ESC-down.png</normalon>:/setupwizard/resources/bttn-ESC-up.png</iconset>
</property>
<property name="iconSize">
<size>

16
ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui
View File

@ -66,9 +66,7 @@ p, li { white-space: pre-wrap; }
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-land-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-land-down.png</normalon>
<activeoff>:/setupwizard/resources/bttn-land-down.png</activeoff>
<activeon>:/setupwizard/resources/bttn-land-down.png</activeon>:/setupwizard/resources/bttn-land-up.png</iconset>
<normalon>:/setupwizard/resources/bttn-land-down.png</normalon>:/setupwizard/resources/bttn-land-up.png</iconset>
</property>
<property name="iconSize">
<size>
@ -118,9 +116,7 @@ p, li { white-space: pre-wrap; }
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-multi-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-multi-down.png</normalon>
<activeoff>:/setupwizard/resources/bttn-multi-down.png</activeoff>
<activeon>:/setupwizard/resources/bttn-multi-down.png</activeon>:/setupwizard/resources/bttn-multi-up.png</iconset>
<normalon>:/setupwizard/resources/bttn-multi-down.png</normalon>:/setupwizard/resources/bttn-multi-up.png</iconset>
</property>
<property name="iconSize">
<size>
@ -170,9 +166,7 @@ p, li { white-space: pre-wrap; }
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-plane-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-plane-down.png</normalon>
<activeoff>:/setupwizard/resources/bttn-plane-down.png</activeoff>
<activeon>:/setupwizard/resources/bttn-plane-down.png</activeon>:/setupwizard/resources/bttn-plane-up.png</iconset>
<normalon>:/setupwizard/resources/bttn-plane-down.png</normalon>:/setupwizard/resources/bttn-plane-up.png</iconset>
</property>
<property name="iconSize">
<size>
@ -219,9 +213,7 @@ p, li { white-space: pre-wrap; }
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-heli-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-heli-down.png</normalon>
<activeoff>:/setupwizard/resources/bttn-heli-down.png</activeoff>
<activeon>:/setupwizard/resources/bttn-heli-down.png</activeon>:/setupwizard/resources/bttn-heli-up.png</iconset>
<normalon>:/setupwizard/resources/bttn-heli-down.png</normalon>:/setupwizard/resources/bttn-heli-up.png</iconset>
</property>
<property name="iconSize">
<size>

BIN
ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-calculate-down.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-calculate-up.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-rapid-down.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.5 KiB

BIN
ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-rapid-up.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.2 KiB

BIN
ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-turbo-down.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-turbo-up.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

6
ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
View File

@ -18,8 +18,6 @@
<file>resources/bttn-ppm-up.png</file>
<file>resources/bttn-pwm-down.png</file>
<file>resources/bttn-pwm-up.png</file>
<file>resources/bttn-rapid-down.png</file>
<file>resources/bttn-rapid-up.png</file>
<file>resources/bttn-sat-down.png</file>
<file>resources/bttn-sat-up.png</file>
<file>resources/bttn-sbus-down.png</file>
@ -27,5 +25,9 @@
<file>resources/bttn-txwizard-off.png</file>
<file>resources/bttn-txwizard-on.png</file>
<file>resources/connection-diagrams.svg</file>
<file>resources/bttn-calculate-down.png</file>
<file>resources/bttn-calculate-up.png</file>
<file>resources/bttn-turbo-down.png</file>
<file>resources/bttn-turbo-up.png</file>
</qresource>
</RCC>