rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-17 02:52:12 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/next' into PipXtreme

Browse Source
This commit is contained in:
Brian Webb 2012-02-26 14:58:45 -07:00
commit a47073f302
5 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ground/openpilotgcs/src/plugins/config/stabilization.ui
View File

@ -495,7 +495,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-162</y>
<y>0</y>
<width>648</width>
<height>802</height>
</rect>
@ -3459,7 +3459,7 @@ border-radius: 5;</string>
</spacer>
</item>
<item row="1" column="4">
<widget class="QSlider" name="horizontalSlider_77">
<widget class="QSlider" name="PitchPSlider">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -3503,7 +3503,7 @@ border-radius: 5;</string>
</widget>
</item>
<item row="1" column="5">
<widget class="QSpinBox" name="spinBox_11">
<widget class="QSpinBox" name="spinBox_PitchRateP">
<property name="minimumSize">
<size>
<width>43</width>
@ -3525,7 +3525,7 @@ border-radius: 5;</string>
<property name="objrelation" stdset="0">
<stringlist>
<string>objname:StabilizationSettings</string>
<string>fieldname:RollRatePID</string>
<string>fieldname:PitchRatePID</string>
<string>element:Kp</string>
<string>haslimits:yes</string>
<string>scale:0.0001</string>
@ -11753,8 +11753,8 @@ border-radius: 4;
<property name="geometry">
<rect>
<x>0</x>
<y>-350</y>
<width>648</width>
<y>0</y>
<width>401</width>
<height>990</height>
</rect>
</property>

4
ground/openpilotgcs/src/plugins/welcome/qml/CommunityPanel.qml
View File

@ -2,7 +2,7 @@
import QtQuick 1.1
Item {
width: 600
width: background.sourceSize.width
height: 300
BorderImage {
@ -32,7 +32,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
anchors.left: newsPanel.right
anchors.margins: 16
color: "#A0A0B0"
color: "#A0A0A0"
}
SitesPanel {

8
ground/openpilotgcs/src/plugins/welcome/qml/NewsPanel.qml
View File

@ -12,7 +12,7 @@ Item {
id: header
text: "Project News"
width: parent.width
color: "#303060"
color: "#44515c"
font {
pointSize: 14
weight: Font.Bold
@ -50,16 +50,18 @@ Item {
Text {
text: title
width: view.width
textFormat: text.indexOf("&") > 0 ? Text.StyledText : Text.PlainText
elide: Text.ElideRight
font.bold: true
color: mouseArea.containsMouse ? "darkblue" : "black"
color: mouseArea.containsMouse ? "#224d81" : "black"
}
Text {
text: description
width: view.width
textFormat: text.indexOf("&") > 0 ? Text.StyledText : Text.PlainText
elide: Text.ElideRight
color: mouseArea.containsMouse ? "darkblue" : "black"
color: mouseArea.containsMouse ? "#224d81" : "black"
}
}

4
ground/openpilotgcs/src/plugins/welcome/qml/SitesPanel.qml
View File

@ -12,7 +12,7 @@ Item {
id: header
text: "OpenPilot Websites"
width: parent.width
color: "#303060"
color: "#44515c"
font {
pointSize: 14
weight: Font.Bold
@ -47,7 +47,7 @@ Item {
weight: Font.Bold
}
color: mouseArea.containsMouse ? "darkblue" : "black"
color: mouseArea.containsMouse ? "#224d81" : "black"
MouseArea {
id: mouseArea

26
ground/openpilotgcs/src/plugins/welcome/qml/main.qml
View File

@ -1,6 +1,7 @@
import QtQuick 1.1
Rectangle {
id: container
width: 1024
height: 768
@ -9,30 +10,43 @@ Rectangle {
Image {
id: bg
source: "images/welcome-op-bg.png"
anchors.fill: parent
fillMode: Image.PreserveAspectFit
anchors.bottom: parent.bottom
anchors.right: parent.right
// The background OP logo is downscalled to fit the page
// but not upscalled if page is larger
property real scale: Math.min(parent.width/sourceSize.width,
parent.height/sourceSize.height,
1.0)
width: scale*sourceSize.width
height: scale*sourceSize.height
smooth: true
}
Column {
anchors.centerIn: parent
anchors.horizontalCenter: parent.horizontalCenter
// distribute a vertical space between the icons blocks an community widget as:
// top - 48% - Icons - 27% - CommunityWidget - 25% - bottom
y: (parent.height - buttons.height - communityPanel.height) * 0.48
width: parent.width
spacing: 32
spacing: (parent.height - buttons.height - communityPanel.height) * 0.27
Row {
//anchors.bottom: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
spacing: 16
Image {
source: "images/welcome-op-logo.png"
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: -2 //it looks better aligned to icons grid
}
Grid {
id: buttons
columns: 3
spacing: 4
anchors.verticalCenter: parent.verticalCenter
WelcomePageButton {
baseIconName: "flightdata"
@ -73,8 +87,8 @@ Rectangle {
} // images row
CommunityPanel {
id: communityPanel
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width*0.8
}
}
}