Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
b7e930ee
Commit
b7e930ee
authored
Oct 20, 2016
by
Don Gagne
Browse files
Add QGC version info to bottom of Settings/General
This makes it available on mobile builds
parent
81564629
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/QmlControls/QGroundControlQmlGlobal.h
View file @
b7e930ee
...
...
@@ -111,6 +111,8 @@ public:
Q_PROPERTY
(
QString
appSettingsDistanceUnitsString
READ
appSettingsDistanceUnitsString
CONSTANT
)
Q_PROPERTY
(
QString
appSettingsAreaUnitsString
READ
appSettingsAreaUnitsString
CONSTANT
)
Q_PROPERTY
(
QString
qgcVersion
READ
qgcVersion
CONSTANT
)
Q_INVOKABLE
void
saveGlobalSetting
(
const
QString
&
key
,
const
QString
&
value
);
Q_INVOKABLE
QString
loadGlobalSetting
(
const
QString
&
key
,
const
QString
&
defaultValue
);
Q_INVOKABLE
void
saveBoolGlobalSetting
(
const
QString
&
key
,
bool
value
);
...
...
@@ -209,6 +211,8 @@ public:
QString
missionFileExtension
(
void
)
const
{
return
QGCApplication
::
missionFileExtension
;
}
QString
telemetryFileExtension
(
void
)
const
{
return
QGCApplication
::
telemetryFileExtension
;
}
QString
qgcVersion
(
void
)
const
{
return
qgcApp
()
->
applicationVersion
();
}
// Overrides from QGCTool
virtual
void
setToolbox
(
QGCToolbox
*
toolbox
);
...
...
src/ui/MainWindow.cc
View file @
b7e930ee
...
...
@@ -452,28 +452,7 @@ void MainWindow::storeSettings()
void
MainWindow
::
configureWindowName
()
{
QList
<
QHostAddress
>
hostAddresses
=
QNetworkInterface
::
allAddresses
();
QString
windowname
=
qApp
->
applicationName
()
+
" "
+
qApp
->
applicationVersion
();
// XXX we do have UDP MAVLink heartbeat broadcast now in SITL and will have it on the
// WIFI radio, so people should not be in need any more of knowing their IP.
// this can go once we are certain its not needed any more.
#if 0
bool prevAddr = false;
windowname.append(" (" + QHostInfo::localHostName() + ": ");
for (int i = 0; i < hostAddresses.size(); i++)
{
// Exclude loopback IPv4 and all IPv6 addresses
if (hostAddresses.at(i) != QHostAddress("127.0.0.1") && !hostAddresses.at(i).toString().contains(":"))
{
if(prevAddr) windowname.append("/");
windowname.append(hostAddresses.at(i).toString());
prevAddr = true;
}
}
windowname.append(")");
#endif
setWindowTitle
(
windowname
);
setWindowTitle
(
qApp
->
applicationName
()
+
" "
+
qApp
->
applicationVersion
());
}
/**
...
...
src/ui/preferences/GeneralSettings.qml
View file @
b7e930ee
...
...
@@ -575,6 +575,11 @@ QGCView {
}
}
}
QGCLabel
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
text
:
qsTr
(
"
QGroundControl Version:
"
+
QGroundControl
.
qgcVersion
)
}
}
// settingsColumn
}
// QGCFlickable
}
// QGCViewPanel
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment