Skip to content

Commit c1d7d19

Browse files
committed
Update about tab
1 parent e44d030 commit c1d7d19

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

etc/resources/images/BuiltWithQt.png

-3.71 KB
Binary file not shown.

etc/resources/resources.qrc

-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44
<file>fonts/Ubuntu-Bold.ttf</file>
55
<file>fonts/UbuntuMono.ttf</file>
66
<file>fonts/Ubuntu-Regular.ttf</file>
7-
<file>images/BuiltWithQt.png</file>
87
</qresource>
98
</RCC>

qml/MainWindow/About.qml

+7-7
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ ColumnLayout {
3030
spacing: Globals.spacing
3131

3232
//
33-
// Built with Qt icon
33+
// The icon of the button
3434
//
35-
Image {
36-
smooth: true
37-
sourceSize.width: Globals.scale (64)
38-
sourceSize.height: Globals.scale (64)
39-
source: "qrc:/images/BuiltWithQt.png"
35+
Icon {
36+
color: "#fff"
37+
name: icons.fa_cogs
38+
size: Globals.scale (64)
4039
anchors.horizontalCenter: parent.horizontalCenter
4140
}
4241

42+
4343
//
4444
// A large label displaying the application name
4545
//
@@ -55,8 +55,8 @@ ColumnLayout {
5555
//
5656
Label {
5757
size: medium
58-
text: qsTr ("Version") + " " + appVersion
5958
anchors.horizontalCenter: parent.horizontalCenter
59+
text: qsTr ("Version") + " " + appVersion + " " + appCodName
6060
}
6161

6262
//

qml/MainWindow/MainWindow.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Window {
124124
onHeightChanged: height = getMinimumHeight()
125125

126126
//
127-
// Trust me, I am an engineer
127+
// Trust me, I am an (aircraft control systems) engineer
128128
//
129129
flags: Qt.Window |
130130
Qt.WindowTitleHint |

src/main.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ int main (int argc, char* argv[]) {
251251
engine.rootContext()->setContextProperty ("cDashboard", &dashboards);
252252
engine.rootContext()->setContextProperty ("appDspName", APP_DSPNAME);
253253
engine.rootContext()->setContextProperty ("appVersion", APP_VERSION);
254+
engine.rootContext()->setContextProperty ("appCodName", APP_CODNAME);
254255
engine.rootContext()->setContextProperty ("UpdaterUrl", URL_UPDATER);
255256
engine.rootContext()->setContextProperty ("DriverStation", driverstation);
256257
engine.load (QUrl (QStringLiteral ("qrc:/qml/main.qml")));

src/versions.h

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
// *INDENT-OFF*
2929
static const QString APP_VERSION = "16.10";
30+
static const QString APP_CODNAME = "Zakusca";
3031
static const QString APP_DSPNAME = "QDriverStation";
3132
static const QString APP_COMPANY = "QDriverStation Developers";
3233
static const QString APP_WEBSITE = "http://qdriverstation.sf.net";

0 commit comments

Comments
 (0)