mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-11-29 07:24:13 +01:00
Merge branch 'cp/extraGUIchanges' of ssh://git.openpilot.org/OpenPilot into next
This commit is contained in:
commit
399fc7fe85
@ -66,6 +66,8 @@ Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:
|
||||
width: 6px;
|
||||
border-radius: 2px;
|
||||
margin 0px -10px;
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
QSlider::sub-page:vertical {
|
||||
background: #fff;
|
||||
|
@ -65,6 +65,8 @@ Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:
|
||||
width: 6px;
|
||||
border-radius: 2px;
|
||||
margin 0px -10px;
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
QSlider::sub-page:vertical {
|
||||
background: #fff;
|
||||
|
@ -65,6 +65,8 @@ Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:
|
||||
width: 6px;
|
||||
border-radius: 2px;
|
||||
margin 0px -10px;
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
QSlider::sub-page:vertical {
|
||||
background: #fff;
|
||||
|
@ -66,6 +66,8 @@ Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:
|
||||
width: 6px;
|
||||
border-radius: 2px;
|
||||
margin 0px -10px;
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
QSlider::sub-page:vertical {
|
||||
background: #fff;
|
||||
|
@ -65,6 +65,8 @@ Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:
|
||||
width: 6px;
|
||||
border-radius: 2px;
|
||||
margin 0px -10px;
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
QSlider::sub-page:vertical {
|
||||
background: #fff;
|
||||
|
@ -65,6 +65,8 @@ Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:
|
||||
width: 6px;
|
||||
border-radius: 2px;
|
||||
margin 0px -10px;
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
QSlider::sub-page:vertical {
|
||||
background: #fff;
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 30 KiB |
@ -6,6 +6,5 @@
|
||||
<file>images/up_alt.png</file>
|
||||
<file>images/trash.png</file>
|
||||
<file>images/1343241276_eye.png</file>
|
||||
<file>images/reset.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
@ -128,14 +128,14 @@
|
||||
<item>
|
||||
<widget class="QToolButton" name="eraseSDButton">
|
||||
<property name="toolTip">
|
||||
<string>Resets UAV object setting to default values at next boot</string>
|
||||
<string>Erase</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="uavobjectbrowser.qrc">
|
||||
<normaloff>:/uavobjectbrowser/images/reset.png</normaloff>:/uavobjectbrowser/images/reset.png</iconset>
|
||||
<normaloff>:/uavobjectbrowser/images/trash.png</normaloff>:/uavobjectbrowser/images/trash.png</iconset>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
|
Loading…
Reference in New Issue
Block a user