moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-02 15:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display version number in toolbar on the settings page

Browse Source 
Fixes #341
This commit is contained in:
Cameron Gutman 2020-05-09 22:20:39 -07:00
parent fc9871b075
commit 12016af326
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/backend/systemproperties.cpp
View File

@ -8,6 +8,7 @@
SystemProperties::SystemProperties() SystemProperties::SystemProperties()
{ {
versionString = QString(VERSION_STR);
hasWindowManager = WMUtils::isRunningWindowManager(); hasWindowManager = WMUtils::isRunningWindowManager();
isRunningWayland = WMUtils::isRunningWayland(); isRunningWayland = WMUtils::isRunningWayland();
isRunningXWayland = isRunningWayland && QGuiApplication::platformName() == "xcb"; isRunningXWayland = isRunningWayland && QGuiApplication::platformName() == "xcb";

2
app/backend/systemproperties.h
View File

@ -21,6 +21,7 @@ public:
Q_PROPERTY(QString unmappedGamepads MEMBER unmappedGamepads NOTIFY unmappedGamepadsChanged) Q_PROPERTY(QString unmappedGamepads MEMBER unmappedGamepads NOTIFY unmappedGamepadsChanged)
Q_PROPERTY(int maximumStreamingFrameRate MEMBER maximumStreamingFrameRate CONSTANT) Q_PROPERTY(int maximumStreamingFrameRate MEMBER maximumStreamingFrameRate CONSTANT)
Q_PROPERTY(QSize maximumResolution MEMBER maximumResolution CONSTANT) Q_PROPERTY(QSize maximumResolution MEMBER maximumResolution CONSTANT)
Q_PROPERTY(QString versionString MEMBER versionString CONSTANT)
Q_INVOKABLE QRect getDesktopResolution(int displayIndex); Q_INVOKABLE QRect getDesktopResolution(int displayIndex);
Q_INVOKABLE QRect getNativeResolution(int displayIndex); Q_INVOKABLE QRect getNativeResolution(int displayIndex);
@ -44,5 +45,6 @@ private:
QSize maximumResolution; QSize maximumResolution;
QList<QRect> monitorDesktopResolutions; QList<QRect> monitorDesktopResolutions;
QList<QRect> monitorNativeResolutions; QList<QRect> monitorNativeResolutions;
QString versionString;
}; };

9
app/gui/main.qml
View File

@ -204,6 +204,15 @@ ApplicationWindow {
Layout.fillWidth: true Layout.fillWidth: true
} }
Label {
id: versionLabel
visible: stackView.currentItem.objectName === "Settings"
text: "Version " + SystemProperties.versionString
font.pointSize: titleLabel.font.pointSize
horizontalAlignment: Qt.AlignRight
verticalAlignment: Qt.AlignVCenter
}
NavigableToolButton { NavigableToolButton {
id: addPcButton id: addPcButton
visible: stackView.currentItem.objectName === "Computers" visible: stackView.currentItem.objectName === "Computers"