Skip to content

Q
qgroundcontrol
Commit 46a2a7cf authored by pixhawk's avatar pixhawk
Browse files
Options

Adjustments to QGroundControl to suit small displays

parent ee7ae9ba
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 45 deletions
images/style-mission.css
View file @ 46a2a7cf
......@@ -77,10 +77,43 @@ border: 1px solid #777777;
color: #DDDDDF;
}
QMainWindow::separator {
background: #090909;
width: 2px; /* when vertical */
height: 2px; /* when horizontal */
}
QMainWindow::separator:hover {
background: white;
}
QDockWidget {
font: bold;
border: 1px solid #32345E;
}
border: 1px solid #32345E;
/* titlebar-close-icon: url(close.png);
titlebar-normal-icon: url(undock.png);*/
}
QDockWidget::title {
text-align: left; /* align the text to the left */
background: lightgray;
padding-left: 5px;
}
QDockWidget::close-button, QDockWidget::float-button {
border: 1px solid transparent;
background: darkgray;
padding: 0px;
}
QDockWidget::close-button:hover, QDockWidget::float-button:hover {
background: gray;
}
QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
padding: 1px -1px -1px 1px;
}
QDockWidget::close-button, QDockWidget::float-button {
background-color: #181820;
......
src/ui/DebugConsole.ui
View file @ 46a2a7cf
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>435</width>
<width>402</width>
<height>185</height>
</rect>
</property>
......@@ -77,14 +77,24 @@
<string>Enable auto hold to lower the CPU consumption</string>
</property>
<property name="text">
<string>Auto hold</string>
<string>Hold</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0" colspan="2">
<widget class="QPlainTextEdit" name="receiveText"/>
<widget class="QPlainTextEdit" name="receiveText">
<property name="minimumSize">
<size>
<width>300</width>
<height>50</height>
</size>
</property>
<property name="tabStopWidth">
<number>60</number>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLineEdit" name="sentText">
......@@ -98,13 +108,22 @@
</item>
<item row="3" column="0">
<widget class="QLineEdit" name="sendText">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Type the bytes to send here, use 0xAA format for HEX (Check HEX checkbox above)</string>
</property>
</widget>
</item>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QHBoxLayout" name="horizontalLayout" stretch="10,10,10">
<property name="spacing">
<number>5</number>
</property>
<item>
<widget class="QPushButton" name="transmitButton">
<property name="toolTip">
......
src/ui/MainWindow.cc
View file @ 46a2a7cf
......@@ -83,7 +83,7 @@ MainWindow::MainWindow(QWidget *parent) :
configureWindowName();
// Add status bar
setStatusBar(createStatusBar());
//setStatusBar(createStatusBar());
// Set the application style (not the same as a style sheet)
// Set the style to Plastique
......@@ -131,7 +131,7 @@ void MainWindow::buildWidgets()
// Center widgets
linechartWidget = new Linecharts(this);
hudWidget = new HUD(640, 480, this);
hudWidget = new HUD(320, 240, this);
mapWidget = new MapWidget(this);
protocolWidget = new XMLCommProtocolWidget(this);
dataplotWidget = new QGCDataPlot2D(this);
......@@ -340,12 +340,12 @@ void MainWindow::reloadStylesheet()
void MainWindow::showStatusMessage(const QString& status, int timeout)
{
statusBar->showMessage(status, timeout);
//statusBar->showMessage(status, timeout);
}
void MainWindow::showStatusMessage(const QString& status)
{
statusBar->showMessage(status, 5);
//statusBar->showMessage(status, 5);
}
/**
......
src/ui/ParameterInterface.ui
View file @ 46a2a7cf
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>350</width>
<height>545</height>
<width>335</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
......
src/ui/QGCSensorSettingsWidget.ui
View file @ 46a2a7cf
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>319</width>
<width>231</width>
<height>221</height>
</rect>
</property>
......@@ -22,7 +22,7 @@
<property name="title">
<string>Calibration Wizards</string>
</property>
<layout class="QGridLayout" name="gridLayout" columnstretch="5,5">
<layout class="QGridLayout" name="gridLayout" columnstretch="100,100">
<property name="leftMargin">
<number>6</number>
</property>
......@@ -44,28 +44,28 @@
<item row="0" column="0">
<widget class="QPushButton" name="rcCalButton">
<property name="text">
<string>RC Calibration</string>
<string>RC Cal.</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="magCalButton">
<property name="text">
<string>Mag. Calibration</string>
<string>Mag. Cal.</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="gyroCalButton">
<property name="text">
<string>Gyro Calibration</string>
<string>Gyro Cal.</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="pressureCalButton">
<property name="text">
<string>Pressure Calibration</string>
<string>Pressure Cal.</string>
</property>
</widget>
</item>
......@@ -99,7 +99,7 @@
<item row="0" column="0">
<widget class="QCheckBox" name="sendRawCheckBox">
<property name="text">
<string>RAW Sensor Data</string>
<string>RAW Sensors</string>
</property>
</widget>
</item>
......@@ -113,14 +113,14 @@
<item row="4" column="0">
<widget class="QCheckBox" name="sendPositionCheckBox">
<property name="text">
<string>Position setpoint</string>
<string>Position CTRL</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="sendControllerCheckBox">
<property name="text">
<string>Raw Controller</string>
<string>Attitude CTRL</string>
</property>
</widget>
</item>
......
src/ui/UASControl.ui
View file @ 46a2a7cf
......@@ -6,44 +6,53 @@
<rect>
<x>0</x>
<y>0</y>
<width>287</width>
<height>354</height>
<width>210</width>
<height>130</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>280</width>
<height>170</height>
<width>210</width>
<height>130</height>
</size>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout" rowminimumheight="10,20,0,10,10,10,300">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>12</number>
<layout class="QGridLayout" name="gridLayout" rowstretch="10,10,0,10,10,5,100" columnstretch="0,0,10,10,10,0">
<property name="margin">
<number>0</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1" colspan="4">
<widget class="QLabel" name="controlStatusLabel">
<property name="minimumSize">
<size>
<width>50</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>UNCONNECTED</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="margin">
<number>0</number>
</property>
</widget>
</item>
<item row="1" column="1" colspan="4">
<widget class="QPushButton" name="controlButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>12</height>
</size>
</property>
<property name="text">
<string>Activate Engine</string>
</property>
......@@ -80,6 +89,12 @@
</item>
<item row="3" column="1">
<widget class="QPushButton" name="liftoffButton">
<property name="minimumSize">
<size>
<width>80</width>
<height>12</height>
</size>
</property>
<property name="text">
<string>Liftoff</string>
</property>
......@@ -91,6 +106,12 @@
</item>
<item row="3" column="2" colspan="2">
<widget class="QPushButton" name="landButton">
<property name="minimumSize">
<size>
<width>80</width>
<height>12</height>
</size>
</property>
<property name="text">
<string>Land</string>
</property>
......@@ -102,6 +123,12 @@
</item>
<item row="3" column="4">
<widget class="QPushButton" name="shutdownButton">
<property name="minimumSize">
<size>
<width>80</width>
<height>12</height>
</size>
</property>
<property name="text">
<string>Halt</string>
</property>
......@@ -125,10 +152,23 @@
</spacer>
</item>
<item row="4" column="1" colspan="2">
<widget class="QComboBox" name="modeComboBox"/>
<widget class="QComboBox" name="modeComboBox">
<property name="minimumSize">
<size>
<width>0</width>
<height>12</height>
</size>
</property>
</widget>
</item>
<item row="4" column="3" colspan="2">
<widget class="QPushButton" name="setModeButton">
<property name="minimumSize">
<size>
<width>40</width>
<height>12</height>
</size>
</property>
<property name="text">
<string>Set Mode</string>
</property>
......@@ -140,6 +180,12 @@
</item>
<item row="5" column="1" colspan="4">
<widget class="QLabel" name="lastActionLabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>12</height>
</size>
</property>
<property name="text">
<string>No actions executed so far</string>
</property>
......
src/ui/UASInfo.ui
View file @ 46a2a7cf
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>455</width>
<height>220</height>
<width>223</width>
<height>138</height>
</rect>
</property>
<property name="windowTitle">
......@@ -16,9 +16,12 @@
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,100" columnstretch="0,0,0,0,0,0,0">
<property name="margin">
<number>6</number>
<number>3</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
......
src/ui/UASView.ui
View file @ 46a2a7cf
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>370</width>
<height>120</height>
<width>335</width>
<height>121</height>
</rect>
</property>
<property name="sizePolicy">
......@@ -18,7 +18,7 @@
</property>
<property name="minimumSize">
<size>
<width>370</width>
<width>335</width>
<height>0</height>
</size>
</property>
......
src/ui/linechart/LinechartWidget.cc
View file @ 46a2a7cf
......@@ -70,7 +70,7 @@ updateTimer(new QTimer())
{
// Add elements defined in Qt Designer
ui.setupUi(this);
this->setMinimumSize(600, 300);
this->setMinimumSize(400, 250);
// Add and customize curve list elements (left side)
curvesWidget = new QWidget(ui.curveListWidget);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment