Skip to content

Q
qgroundcontrol
Commit c00032ef authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Lots of usability improvements

parent 9fb46a10
Hide whitespace changes
Inline Side-by-side
Showing with 390 additions and 49 deletions
files/images/actions/qgroundcontrol-connect.svg 0 → 100644
View file @ c00032ef
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="97.454216"
height="98.741951"
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="qgroundcontrol_connect_logo.svg"
inkscape:export-filename="/Users/lomeier/Documents/logos/qupgrade_logo.png"
inkscape:export-xdpi="197.41441"
inkscape:export-ydpi="197.41441">
<defs
id="defs4">
<linearGradient
id="linearGradient3886">
<stop
id="stop3888"
offset="0"
style="stop-color:#fd8f00;stop-opacity:1;" />
<stop
id="stop3890"
offset="1"
style="stop-color:#ff590f;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient3870">
<stop
style="stop-color:#101317;stop-opacity:0.67521369;"
offset="0"
id="stop3872" />
<stop
style="stop-color:#000f27;stop-opacity:0;"
offset="1"
id="stop3874" />
</linearGradient>
<linearGradient
id="linearGradient3769">
<stop
style="stop-color:#0b6cff;stop-opacity:1;"
offset="0"
id="stop3771" />
<stop
style="stop-color:#62a1ff;stop-opacity:1;"
offset="1"
id="stop3773" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3769"
id="linearGradient3777"
x1="256.27164"
y1="397.87418"
x2="388.64728"
y2="397.87418"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3769"
id="linearGradient3785"
x1="309.72726"
y1="430.48431"
x2="440.78152"
y2="430.48431"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3769"
id="linearGradient3793"
x1="221.13821"
y1="362.93268"
x2="317.54544"
y2="362.93268"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3769"
id="linearGradient3801"
x1="229.16389"
y1="462.22253"
x2="270.93777"
y2="462.22253"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(1.4347202,1.2912482)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3769"
id="linearGradient3809"
x1="267.68182"
y1="478.02814"
x2="309.43112"
y2="478.02814"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9982874,0.05850016,-0.05850016,0.9982874,26.737243,-13.909849)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3769"
id="linearGradient3853"
x1="221.13821"
y1="398.46805"
x2="440.78152"
y2="398.46805"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3769"
id="linearGradient3855"
gradientUnits="userSpaceOnUse"
x1="221.13821"
y1="398.46805"
x2="440.78152"
y2="398.46805" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3769"
id="linearGradient3857"
gradientUnits="userSpaceOnUse"
x1="221.13821"
y1="398.46805"
x2="440.78152"
y2="398.46805" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3769"
id="linearGradient3859"
gradientUnits="userSpaceOnUse"
x1="221.13821"
y1="398.46805"
x2="440.78152"
y2="398.46805" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3769"
id="linearGradient3861"
gradientUnits="userSpaceOnUse"
x1="221.13821"
y1="398.46805"
x2="440.78152"
y2="398.46805" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3769"
id="linearGradient3863"
gradientUnits="userSpaceOnUse"
x1="221.13821"
y1="398.46805"
x2="440.78152"
y2="398.46805" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3870"
id="radialGradient3876"
cx="314.65048"
cy="521.57562"
fx="314.65048"
fy="521.57562"
r="104.71806"
gradientTransform="matrix(1,0,0,0.20616113,0,414.047)"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3886"
id="radialGradient3898"
cx="270.87222"
cy="392.51038"
fx="270.87222"
fy="392.51038"
r="61.659081"
gradientTransform="matrix(1,0,0,1.8914171,0,-349.89048)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3886"
id="linearGradient3906"
x1="319.07666"
y1="406.0119"
x2="438.94656"
y2="406.0119"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3769"
id="linearGradient3017"
gradientUnits="userSpaceOnUse"
x1="221.13821"
y1="398.46805"
x2="440.78152"
y2="398.46805"
gradientTransform="translate(1.4888824,-1.9851766)" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.43852551"
inkscape:cx="89.583702"
inkscape:cy="2.5395249"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="752"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-215.72467,-301.6875)">
<g
id="g3926"
transform="matrix(0.38944465,0,0,0.38944465,131.71185,184.19692)">
<path
id="path2987"
d="m 232.8125,302.1875 -9.6875,21.4375 66.65625,90.96875 c -7.25015,13.5715 -14.3327,27.20023 -19.90625,38.59375 l -27.28125,-12.84375 -8.5,11.875 25.28125,25 c -0.65577,2.1993 -0.79174,3.60942 -0.3125,4 4.92138,4.0109 1.13367,1.46752 7.15625,5.28125 0.62827,0.39784 2.1212,-0.38979 4.28125,-2.03125 l 30.0625,16.125 9.125,-11.40625 -20.5625,-22.625 c 8.76527,-9.25589 19.08205,-20.76266 29.3125,-32.53125 l 103.75,28.59375 19.59375,-17.15625 -91.71875,-49 c 7.97727,-9.82795 14.02942,-17.64629 16.1875,-21.09375 9.60221,-15.33923 33.98072,-62.20143 18.1875,-69.3125 -15.79323,-7.11107 -50.73943,31.06094 -60.21875,46.59375 -1.75706,2.87912 -5.28553,8.99198 -9.8125,17.03125 l -81.59375,-67.5 z"
style="fill:#000000;fill-opacity:0.53376202;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.61093247"
inkscape:connector-curvature="0" />
<path
inkscape:export-ydpi="197.41441"
inkscape:export-xdpi="197.41441"
sodipodi:nodetypes="ccczccc"
inkscape:connector-curvature="0"
id="path3830"
d="m 388.47226,426.94175 c -14.14502,20.08913 -37.17423,14.7309 -37.17423,14.7309 0,0 2.22673,-11.0706 2.30274,-11.14995 0,0 15.50452,4.19264 25.83843,-9.50522 10.33393,-13.69786 0.55137,-32.59232 0.55137,-32.59232 l 10.3275,-3.81066 c 8.45771,20.14931 5.65551,30.55726 -1.84581,42.32725 z"
style="fill:#000000;fill-opacity:0.53376202;stroke:#000000;stroke-width:0.324599px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<text
sodipodi:linespacing="125%"
id="text3827"
y="554.34241"
x="213.86139"
style="font-size:40px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:0.53697749;stroke:#000000;stroke-opacity:0.67845662;font-family:Open Sans;-inkscape-font-specification:Open Sans Semi-Bold"
xml:space="preserve"><tspan
y="554.34241"
x="213.86139"
id="tspan3829"
sodipodi:role="line">Connect Link</tspan></text>
<path
style="fill:#000000;fill-opacity:0.53376202;stroke:#000000;stroke-width:0.53760475px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 411.47403,444.9229 c -23.42715,33.27186 -61.5684,24.39749 -61.5684,24.39749 0,0 3.68793,-18.33526 3.81382,-18.46668 0,0 25.67877,6.9439 42.79392,-15.74266 17.11517,-22.68656 0.91318,-53.97979 0.91318,-53.97979 l 17.10453,-6.31125 c 14.00776,33.37152 9.36672,50.60929 -3.05705,70.10289 z"
id="path3835"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccczccc"
inkscape:export-xdpi="197.41441"
inkscape:export-ydpi="197.41441" />
<path
inkscape:export-ydpi="197.41441"
inkscape:export-xdpi="197.41441"
sodipodi:nodetypes="ccczccc"
inkscape:connector-curvature="0"
id="path3837"
d="m 446.80628,470.86241 c -37.66593,53.49416 -98.98904,39.22603 -98.98904,39.22603 0,0 5.92941,-29.47924 6.13182,-29.69053 0,0 41.28606,11.16433 68.80362,-25.31089 27.5176,-36.47522 1.4682,-86.78815 1.4682,-86.78815 l 27.50049,-10.14716 c 22.52153,53.65438 15.05972,81.36909 -4.91509,112.7107 z"
style="fill:#000000;fill-opacity:0.53376202;stroke:#000000;stroke-width:0.86435539px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
</g>
</svg>
files/styles/style-indoor.css
View file @ c00032ef
......@@ -113,8 +113,7 @@ QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
QDockWidget {
border: 10px solid #66666B;
padding: 2px;
margin: 1px;
/*padding: 2px;*/
border-radius: 1px;
/*background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #59666f, stop: 1 #414B52);*/
/* titlebar-close-icon: url(close.png);
......@@ -269,9 +268,9 @@ QSlider::groove:horizontal {
}
QSlider::groove:disabled:horizontal {
border: 1px solid #AAAAAA;
border: 1px solid #454545;
height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #6A6A6F, stop:1 #6A6A6F);
background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #4A4A4F, stop:1 #4A4A4F);
margin: 2px 0;
}
......
qgroundcontrol.qrc
View file @ c00032ef
......@@ -101,6 +101,7 @@
<file>files/styles/style-outdoor.css</file>
<file>files/images/patterns/lenna.jpg</file>
<file>files/images/rc_stick.svg</file>
<file>files/images/actions/qgroundcontrol-connect.svg</file>
</qresource>
<qresource prefix="/general">
<file alias="vera.ttf">files/styles/Vera.ttf</file>
......
src/configuration.h
View file @ c00032ef
......@@ -12,14 +12,14 @@
#define WITH_TEXT_TO_SPEECH 1
#define QGC_APPLICATION_NAME "QGroundControl"
#define QGC_APPLICATION_VERSION "v. 1.0.5 (beta)"
#define QGC_APPLICATION_VERSION "v. 1.0.6 (beta)"
namespace QGC
{
const QString APPNAME = "QGROUNDCONTROL";
const QString COMPANYNAME = "QGROUNDCONTROL";
const int APPLICATIONVERSION = 105; // 1.0.4
const int APPLICATIONVERSION = 106; // 1.0.6
}
#endif // QGC_CONFIGURATION_H
src/ui/CommConfigurationWindow.cc
View file @ c00032ef
......@@ -62,6 +62,18 @@ CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolIn
// Setup the user interface according to link type
ui.setupUi(this);
// Initialize basic ui state
// Do not allow changes here unless advanced is checked
ui.connectionType->setEnabled(false);
ui.linkType->setEnabled(false);
ui.protocolGroupBox->setVisible(false);
// Connect UI element visibility to checkbox
connect(ui.advancedOptionsCheckBox, SIGNAL(clicked(bool)), ui.connectionType, SLOT(setEnabled(bool)));
connect(ui.advancedOptionsCheckBox, SIGNAL(clicked(bool)), ui.linkType, SLOT(setEnabled(bool)));
connect(ui.advancedOptionsCheckBox, SIGNAL(clicked(bool)), ui.protocolGroupBox, SLOT(setVisible(bool)));
// add link types
ui.linkType->addItem(tr("Serial"), QGC_LINK_SERIAL);
ui.linkType->addItem(tr("UDP"), QGC_LINK_UDP);
......
src/ui/CommSettings.ui
View file @ c00032ef
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>413</width>
<height>484</height>
<height>373</height>
</rect>
</property>
<property name="windowTitle">
......@@ -17,9 +17,6 @@
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
......@@ -62,6 +59,13 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="advancedOptionsCheckBox">
<property name="text">
<string>Advanced Options</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0" colspan="2">
......@@ -94,7 +98,7 @@
<x>0</x>
<y>0</y>
<width>393</width>
<height>154</height>
<height>76</height>
</rect>
</property>
</widget>
......@@ -126,7 +130,7 @@
<x>0</x>
<y>0</y>
<width>393</width>
<height>154</height>
<height>76</height>
</rect>
</property>
</widget>
......@@ -169,7 +173,7 @@
<item>
<widget class="QPushButton" name="deleteButton">
<property name="text">
<string>Delete</string>
<string>Delete Link</string>
</property>
</widget>
</item>
......
src/ui/QGCToolBar.cc
View file @ c00032ef
......@@ -147,7 +147,7 @@ void QGCToolBar::createUI()
QWidget* spacer = new QWidget();
spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
spacer->setStyleSheet("* { margin: 0px; background-color: transparent; min-height: 28px}");
spacer->setStyleSheet("* { margin: 0px; background-color: transparent; min-height: 24px}");
addWidget(spacer);
connectButton = new QPushButton(tr("Connect"), this);
......
src/ui/WaypointEditableView.ui
View file @ c00032ef
......@@ -43,7 +43,6 @@ QGroupBox {
border: 1px solid #EEEEEE;
border-radius: 5px;
padding: 0px 0px 0px 0px;
margin-top: 1ex; /* leave space at the top for the title */
margin: 0px;
}
......@@ -55,26 +54,22 @@ margin-top: 1ex; /* leave space at the top for the title */
font: bold 8px;
}
QDockWidget {
font: bold;
border: 1px solid #32345E;
}
QPushButton {
font-weight: bold;
font-size: 12px;
border: 1px solid #999999;
border-radius: 10px;
min-width:22px;
max-width: 36px;
border: 1px solid #465158;
margin: 1px;
border-radius: 2px;
min-width:16px;
max-width: 16px;
min-height: 16px;
max-height: 16px;
padding: 2px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #777777, stop: 1 #555555);
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #59666f, stop: 1 #414B52);
}
QPushButton:pressed {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #444444, stop: 1 #555555);
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #09A2B2, stop: 1 #414B52);
}
</string>
</property>
......@@ -270,8 +265,8 @@ QPushButton:pressed {
</property>
<property name="minimumSize">
<size>
<width>28</width>
<height>22</height>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="focusPolicy">
......@@ -302,8 +297,8 @@ QPushButton:pressed {
</property>
<property name="minimumSize">
<size>
<width>28</width>
<height>22</height>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="focusPolicy">
......@@ -334,8 +329,8 @@ QPushButton:pressed {
</property>
<property name="minimumSize">
<size>
<width>28</width>
<height>22</height>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="focusPolicy">
......
src/ui/map/QGCMapTool.ui
View file @ c00032ef
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
<width>261</width>
<height>206</height>
</rect>
</property>
<property name="windowTitle">
......
src/ui/map/QGCMapToolBar.ui
View file @ c00032ef
......@@ -13,7 +13,7 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1,1,1,1,1,1,1,30,1">
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1,1,1,1,1,1,5,1,30,1">
<property name="spacing">
<number>2</number>
</property>
......@@ -58,7 +58,7 @@
<item>
<widget class="QPushButton" name="clearTrailsButton">
<property name="text">
<string>Clear Trails</string>
<string>Clear Map</string>
</property>
</widget>
</item>
......@@ -69,6 +69,19 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="posLabel">
<property name="text">
......
src/ui/map/QGCMapWidget.cc
View file @ c00032ef
......@@ -55,8 +55,8 @@ void QGCMapWidget::showEvent(QShowEvent* event)
SetFollowMouse(true); // we want a contiuous mouse position reading
SetShowHome(true); // display the HOME position on the map
Home->SetSafeArea(30); // set radius (meters)
Home->SetShowSafeArea(true); // show the safe area
Home->SetSafeArea(0); // set radius (meters)
Home->SetShowSafeArea(false); // show the safe area
Home->SetCoord(pos_lat_lon); // set the HOME position
setFrameStyle(QFrame::NoFrame); // no border frame
......
src/ui/uas/QGCUnconnectedInfoWidget.cc
View file @ c00032ef
......@@ -15,7 +15,7 @@ QGCUnconnectedInfoWidget::QGCUnconnectedInfoWidget(QWidget *parent) :
connect(ui->connectButton, SIGNAL(clicked()), this, SLOT(addLink()));
// Overwrite global style sheet
ui->connectButton->setStyleSheet("* { max-height: 1000; background-color: transparent; border-color: transparent; }");
//ui->connectButton->setStyleSheet("* { max-height: 1000; background-color: transparent; border-color: transparent; }");
//ui->connectButton->setStyleSheet("QToolButton {background-color: green; border-radius: 20px; } QButton {} QPushButton {}");
}
......
src/ui/uas/QGCUnconnectedInfoWidget.ui
View file @ c00032ef
......@@ -7,39 +7,72 @@
<x>0</x>
<y>0</y>
<width>372</width>
<height>299</height>
<height>309</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout" rowstretch="90,100">
<layout class="QGridLayout" name="gridLayout" rowstretch="90,30">
<item row="0" column="0">
<widget class="QToolButton" name="connectButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="sizeIncrement">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="baseSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
<string notr="true">
QToolButton {
color: #222222;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #80B81D, stop: 1 #306807);
margin: 15px;
padding: 20px;
border-radius: 18px;
min-height: 100px;
border: 2px solid #085B35;
}
QToolButton:pressed {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #306807, stop: 1 #80B81D);
color: #222222;
border-color: #D1892A;
}
QToolButton:checked {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #306807, stop: 1 #80B81D);
color: #222222;
border-color: #D1892A;
}</string>
</property>
<property name="text">
<string>Click Icon to Connect</string>
<string/>
</property>
<property name="icon">
<iconset resource="../../../qgroundcontrol.qrc">
<normaloff>:/files/images/devices/network-wireless.svg</normaloff>:/files/images/devices/network-wireless.svg</iconset>
<normaloff>:/files/images/actions/qgroundcontrol-connect.svg</normaloff>:/files/images/actions/qgroundcontrol-connect.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>180</width>
<height>200</height>
<width>140</width>
<height>140</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
<enum>Qt::ToolButtonIconOnly</enum>
</property>
</widget>
</item>
......
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