Skip to content
GitLab
Commit 3f0592d2 authored by dogmaphobic's avatar dogmaphobic
Browse files

Finalizing it.

parent f1e7c9bd
Hide whitespace changes
Inline Side-by-side
resources/Antenna_RC.svg
View file @ 3f0592d2
......@@ -21,20 +21,20 @@
</g>
<g id="Layer_2">
<g>
<path fill="#FFFFFF" d="M36.956,278.969V171.596h55.298c10.254,0,18.091,0.879,23.511,2.637s9.789,5.018,13.11,9.777
c3.32,4.762,4.98,10.56,4.98,17.396c0,5.958-1.271,11.097-3.811,15.417c-2.541,4.322-6.035,7.826-10.479,10.511
c-2.834,1.71-6.718,3.125-11.652,4.248c3.951,1.32,6.831,2.641,8.637,3.959c1.22,0.88,2.988,2.761,5.307,5.645
c2.317,2.884,3.867,5.107,4.647,6.671l16.067,31.113h-37.489l-17.735-32.812c-2.246-4.248-4.248-7.006-6.006-8.276
c-2.393-1.659-5.103-2.49-8.13-2.49h-2.93v43.579H36.956z M70.281,215.102h13.989c1.513,0,4.442-0.487,8.789-1.465
c2.197-0.439,3.992-1.562,5.383-3.369c1.393-1.806,2.088-3.882,2.088-6.226c0-3.467-1.099-6.127-3.296-7.983
c-2.197-1.855-6.324-2.783-12.378-2.783H70.281V215.102z"/>
<path fill="#FFFFFF" d="M221.966,235.024l29.078,8.789c-1.953,8.155-5.029,14.967-9.229,20.435
c-4.201,5.469-9.412,9.595-15.639,12.378c-6.225,2.783-14.146,4.175-23.766,4.175c-11.672,0-21.205-1.696-28.602-5.087
c-7.398-3.391-13.781-9.355-19.152-17.896c-5.373-8.539-8.057-19.47-8.057-32.792c0-17.761,4.723-31.411,14.172-40.951
c9.447-9.539,22.814-14.31,40.1-14.31c13.525,0,24.158,2.735,31.896,8.203c7.74,5.47,13.488,13.868,17.25,25.195l-29.297,6.519
c-1.025-3.271-2.1-5.664-3.223-7.178c-1.857-2.538-4.127-4.492-6.812-5.859c-2.686-1.366-5.688-2.051-9.008-2.051
c-7.52,0-13.283,3.024-17.285,9.071c-3.029,4.487-4.541,11.535-4.541,21.142c0,11.9,1.805,20.058,5.42,24.471
c3.613,4.414,8.689,6.62,15.234,6.62c6.346,0,11.145-1.782,14.391-5.347C218.145,246.988,220.501,241.811,221.966,235.024z"/>
<path fill="#FFFFFF" d="M46.824,279.138v-97.475h50.201c9.309,0,16.423,0.798,21.344,2.394c4.92,1.596,8.887,4.555,11.902,8.876
c3.014,4.323,4.521,9.586,4.521,15.792c0,5.409-1.153,10.074-3.459,13.996c-2.307,3.924-5.479,7.105-9.513,9.542
c-2.573,1.552-6.099,2.837-10.578,3.856c3.587,1.199,6.201,2.397,7.841,3.594c1.107,0.799,2.713,2.506,4.817,5.124
c2.104,2.618,3.511,4.637,4.219,6.056l14.586,28.245H108.67L92.569,249.35c-2.039-3.856-3.856-6.36-5.452-7.513
c-2.172-1.506-4.632-2.261-7.38-2.261h-2.66v39.562H46.824z M77.077,221.158h12.7c1.373,0,4.033-0.442,7.979-1.33
c1.995-0.399,3.624-1.418,4.887-3.059c1.264-1.639,1.895-3.524,1.895-5.652c0-3.147-0.997-5.562-2.992-7.247
c-1.995-1.684-5.741-2.527-11.237-2.527H77.077V221.158z"/>
<path fill="#FFFFFF" d="M214.779,239.243l26.398,7.979c-1.773,7.404-4.566,13.587-8.378,18.551
c-3.814,4.965-8.545,8.71-14.197,11.237c-5.651,2.527-12.842,3.79-21.575,3.79c-10.596,0-19.25-1.54-25.965-4.618
c-6.716-3.078-12.511-8.493-17.387-16.246c-4.878-7.752-7.314-17.675-7.314-29.769c0-16.124,4.287-28.516,12.866-37.176
c8.576-8.66,20.711-12.991,36.403-12.991c12.279,0,21.931,2.483,28.956,7.447c7.027,4.966,12.245,12.59,15.66,22.873
l-26.596,5.918c-0.931-2.969-1.906-5.142-2.926-6.516c-1.686-2.304-3.747-4.078-6.185-5.319c-2.438-1.24-5.163-1.862-8.177-1.862
c-6.826,0-12.059,2.746-15.692,8.235c-2.75,4.074-4.122,10.472-4.122,19.193c0,10.803,1.638,18.209,4.92,22.215
c3.28,4.007,7.888,6.01,13.83,6.01c5.761,0,10.117-1.618,13.064-4.854C211.311,250.104,213.449,245.405,214.779,239.243z"/>
</g>
</g>
</svg>
resources/Antenna_T.svg
View file @ 3f0592d2
......@@ -15,7 +15,7 @@
</g>
<g id="Layer_2">
<g>
<path fill="#FFFFFF" d="M93.573,173.427h100.855v26.514H160.59V280.8H127.41v-80.859H93.573V173.427z"/>
<path fill="#FFFFFF" d="M96.66,180h94.681v24.891h-31.766V280.8h-31.148v-75.909H96.66V180z"/>
</g>
</g>
</svg>
src/ui/MainWindow.cc
View file @ 3f0592d2
......@@ -148,7 +148,7 @@ MainWindow::MainWindow(QSplashScreen* splashScreen)
emit initStatusChanged(tr("Setting up user interface"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
_ui.setupUi(this);
// Make sure tool bar elements all fit before changing minimum width
setMinimumWidth(926);
setMinimumWidth(1008);
configureWindowName();
// Setup central widget with a layout to hold the views
......
src/ui/toolbar/MainToolBar.qml
View file @ 3f0592d2
......@@ -45,11 +45,10 @@ Rectangle {
property int cellSpacerSize: getProportionalDimmension(4)
property int cellHeight: getProportionalDimmension(30)
property int cellRadius: getProportionalDimmension(3)
property var colorBlue: "#1a6eaa"
property var colorGreen: "#079527"
property var colorRed: "#a81a1b"
property var colorGreen: "#329147"
property var colorRed: "#942324"
property var colorOrange: "#a76f26"
property var colorWhite: "#f0f0f0"
......@@ -60,10 +59,6 @@ Rectangle {
color: qgcPal.windowShade
Component.onCompleted: {
console.log(cellSpacerSize, cellHeight, cellRadius);
}
function getProportionalDimmension(val) {
return toolBarHolder.height * val / 40
}
......@@ -229,12 +224,11 @@ Rectangle {
Rectangle {
id: messages
width: (mainToolBar.messageCount > 99) ? getProportionalDimmension(70) : getProportionalDimmension(60)
width: (mainToolBar.messageCount > 99) ? getProportionalDimmension(65) : getProportionalDimmension(60)
height: cellHeight
visible: (mainToolBar.connectionCount > 0) && (mainToolBar.showMessages)
anchors.verticalCenter: parent.verticalCenter
color: getMessageColor()
//radius: cellRadius
border.color: "#00000000"
border.width: 0
property bool showTriangle: false
......@@ -249,7 +243,7 @@ Rectangle {
anchors.leftMargin: getProportionalDimmension(8)
}
Rectangle {
Item {
id: messageTextRect
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
......@@ -308,7 +302,6 @@ Rectangle {
visible: showMavStatus() && (mainToolBar.showMav)
anchors.verticalCenter: parent.verticalCenter
color: colorBlue
//radius: cellRadius
border.color: "#00000000"
border.width: 0
Image {
......@@ -327,7 +320,6 @@ Rectangle {
visible: showMavStatus() && (mainToolBar.showGPS)
anchors.verticalCenter: parent.verticalCenter
color: getSatelliteColor();
//radius: cellRadius
border.color: "#00000000"
border.width: 0
......@@ -344,7 +336,7 @@ Rectangle {
QGCLabel {
id: satelitteText
text: (mainToolBar.satelliteCount > 0) ? mainToolBar.satelliteCount : ''
text: mainToolBar.satelliteCount
font.pointSize: screenTools.dpiAdjustedPointSize(14);
font.weight: Font.DemiBold
anchors.verticalCenter: parent.verticalCenter
......@@ -362,7 +354,6 @@ Rectangle {
visible: showMavStatus() && mainToolBar.showRSSI
anchors.verticalCenter: parent.verticalCenter
color: getRSSIColor(mainToolBar.remoteRSSI);
//radius: cellRadius
border.color: "#00000000"
border.width: 0
Image {
......@@ -394,7 +385,6 @@ Rectangle {
visible: showMavStatus() && (mainToolBar.showRSSI) && ((mainToolBar.telemetryRRSSI > 0) && (mainToolBar.telemetryLRSSI > 0))
anchors.verticalCenter: parent.verticalCenter
color: getRSSIColor(Math.min(mainToolBar.telemetryRRSSI,mainToolBar.telemetryLRSSI));
//radius: cellRadius
border.color: "#00000000"
border.width: 0
Image {
......@@ -454,8 +444,7 @@ Rectangle {
height: cellHeight
visible: showMavStatus() && (mainToolBar.showBattery)
anchors.verticalCenter: parent.verticalCenter
color: (mainToolBar.batteryPercent > 40.0 || mainToolBar.batteryPercent < 0.01) ? colorBlue : colorRed
//radius: cellRadius
color: getBatteryColor();
border.color: "#00000000"
border.width: 0
......
Supports Markdown
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