rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-01 18:29:16 +01:00
Code Issues Releases Activity

Slightly new look to the new map plug-in (button colours).

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@884 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2010-06-24 13:46:43 +00:00 committed by pip
parent 0dd472444c
commit 4f4c04d16b
2 changed files with 21 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ground/src/plugins/opmap/opmap_widget.ui
View File

@ -58,7 +58,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(71, 71, 71, 255), stop:1 rgba(120, 120, 120, 255));</string> <string notr="true">background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(110, 110, 110, 255), stop:1 rgba(71, 71, 71, 255));</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
@ -105,7 +105,7 @@
<string>Show/Hide Flight Controls</string> <string>Show/Hide Flight Controls</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: rgba(71, 71, 71, 0); <string notr="true">background-color: rgba(255, 255, 255, 0);
color: rgb(255, 255, 255);</string> color: rgb(255, 255, 255);</string>
</property> </property>
<property name="text"> <property name="text">
@ -136,7 +136,7 @@ color: rgb(255, 255, 255);</string>
<string>Find place</string> <string>Find place</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: rgba(71, 71, 71, 0); <string notr="true">background-color: rgba(255, 255, 255, 0);
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
</string> </string>
</property> </property>
@ -177,7 +177,7 @@ color: rgb(255, 255, 255);
<string>Center map over home position</string> <string>Center map over home position</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: rgba(71, 71, 71, 0); <string notr="true">background-color: rgba(255, 255, 255, 0);
color: rgb(255, 255, 255);</string> color: rgb(255, 255, 255);</string>
</property> </property>
<property name="text"> <property name="text">
@ -207,7 +207,7 @@ color: rgb(255, 255, 255);</string>
<string>Center map over UAV position</string> <string>Center map over UAV position</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: rgba(71, 71, 71, 0); <string notr="true">background-color: rgba(255, 255, 255, 0);
color: rgb(255, 255, 255);</string> color: rgb(255, 255, 255);</string>
</property> </property>
<property name="text"> <property name="text">
@ -428,8 +428,8 @@ color: rgb(255, 255, 255);</string>
<string>Reload map</string> <string>Reload map</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: rgba(71, 71, 71, 0); <string notr="true">color: rgb(255, 255, 255);
color: rgb(255, 255, 255);</string> background-color: rgba(255, 255, 255, 0);</string>
</property> </property>
<property name="text"> <property name="text">
<string>Reload</string> <string>Reload</string>
@ -484,7 +484,7 @@ color: rgb(255, 255, 255);</string>
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(120, 120, 120, 255), stop:1 rgba(68, 68, 68, 255));</string> <string notr="true">background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(71, 71, 71, 255), stop:1 rgba(110, 110, 110, 255));</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<property name="leftMargin"> <property name="leftMargin">
@ -532,16 +532,6 @@ color: rgb(255, 255, 255);</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="Line" name="line_9">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item> <item>
<widget class="QToolButton" name="toolButtonHoldPosition"> <widget class="QToolButton" name="toolButtonHoldPosition">
<property name="toolTip"> <property name="toolTip">
@ -569,16 +559,6 @@ color: rgb(255, 255, 255);</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="Line" name="line_10">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item> <item>
<widget class="QToolButton" name="toolButtonGo"> <widget class="QToolButton" name="toolButtonGo">
<property name="toolTip"> <property name="toolTip">
@ -656,7 +636,7 @@ color: rgb(255, 255, 255);</string>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(68, 68, 68, 255), stop:1 rgba(117, 117, 117, 255));</string> <string notr="true">background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(110, 110, 110, 255), stop:1 rgba(71, 71, 71, 255));</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
@ -668,25 +648,16 @@ color: rgb(255, 255, 255);</string>
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="leftMargin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>5</number>
</property>
<item> <item>
<layout class="QHBoxLayout" name="layoutWidgetStatusBar"> <layout class="QHBoxLayout" name="layoutWidgetStatusBar">
<property name="spacing"> <property name="spacing">
<number>12</number> <number>0</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>12</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>8</number> <number>8</number>
@ -715,12 +686,18 @@ color: rgb(255, 255, 255);</string>
<string notr="true">color: rgb(255, 255, 255); <string notr="true">color: rgb(255, 255, 255);
background-color: rgba(255, 255, 255, 0);</string> background-color: rgba(255, 255, 255, 0);</string>
</property> </property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="text"> <property name="text">
<string>labelMapPos</string> <string>labelMapPos</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="margin">
<number>5</number>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -763,6 +740,9 @@ background-color: rgba(255, 255, 255, 0);</string>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="margin">
<number>5</number>
</property>
</widget> </widget>
</item> </item>
<item> <item>

3
ground/src/plugins/opmap/opmapgadgetwidget.h
View File

@ -34,8 +34,6 @@
#include "uavobjects/uavobjectmanager.h" #include "uavobjects/uavobjectmanager.h"
#include "uavobjects/positionactual.h" #include "uavobjects/positionactual.h"
//class Ui_OPMap_Widget;
namespace Ui { namespace Ui {
class OPMap_Widget; class OPMap_Widget;
} }
@ -144,7 +142,6 @@ private:
PositionActual *m_positionActual; PositionActual *m_positionActual;
// Ui_OPMap_Widget *m_widget;
Ui::OPMap_Widget *m_widget; Ui::OPMap_Widget *m_widget;
mapcontrol::OPMapWidget *m_map; mapcontrol::OPMapWidget *m_map;