Provide instruction on how to manually add in case shortcut writing f…

…ails
Alia5 · Jan 4, 2022 · 0daa67e · 0daa67e
1 parent 139432c
commit 0daa67e
Show file tree

Hide file tree

Showing 8 changed files with 326 additions and 11 deletions.
diff --git a/GlosSIConfig/Resource.rc b/GlosSIConfig/Resource.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,3,103000945081
- PRODUCTVERSION 0,0,3,103000945081
+ FILEVERSION 0,0,3,105001394320
+ PRODUCTVERSION 0,0,3,105001394320
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Peter Repukat - FlatspotSoftware"
             VALUE "FileDescription", "GlosSI - Config"
-            VALUE "FileVersion", "0.0.3.1-3-ge945c81"
+            VALUE "FileVersion", "0.0.3.1-5-g139432c"
             VALUE "InternalName", "GlosSIConfig"
             VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware"
             VALUE "OriginalFilename", "GlosSIConfig.exe"
             VALUE "ProductName", "GlosSi"
-            VALUE "ProductVersion", "0.0.3.1-3-ge945c81"
+            VALUE "ProductVersion", "0.0.3.1-5-g139432c"
         END
     END
     BLOCK "VarFileInfo"
@@ -530,6 +530,154 @@ END
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

diff --git a/GlosSIConfig/UIModel.cpp b/GlosSIConfig/UIModel.cpp
@@ -236,6 +236,26 @@ bool UIModel::removeFromSteam(const QString& name, const QString& shortcutspath,
     return writeShortcutsVDF(L"remove", name.toStdWString(), shortcutspath.toStdWString(), from_cmd);
 }
 
+QVariantMap UIModel::manualProps(QVariant shortcut)
+{
+    QDir appDir = QGuiApplication::applicationDirPath();
+    const auto map = shortcut.toMap();
+    const auto name = map["name"].toString();
+    const auto maybeLaunchPath = map["launchPath"].toString();
+    const auto launch = map["launch"].toBool();
+
+    QVariantMap res;
+    res.insert("name", name);
+    res.insert("config", name + ".json");
+    res.insert("launch", ("\"" + appDir.absolutePath() + "/GlosSITarget.exe" + "\""));
+    res.insert("launchDir", (
+        launch && !maybeLaunchPath.isEmpty()
+            ? (QString("\"") + QString::fromStdString(std::filesystem::path(maybeLaunchPath.toStdString()).parent_path().string()) + "\"")
+            : ("\"" + appDir.absolutePath() + "\""))
+    );
+    return res;
+}
+
 #ifdef _WIN32
 QVariantList UIModel::uwpApps()
 {

diff --git a/GlosSIConfig/UIModel.h b/GlosSIConfig/UIModel.h
@@ -40,6 +40,7 @@ class UIModel : public QObject {
     Q_INVOKABLE bool addToSteam(QVariant shortcut, const QString& shortcutspath, bool from_cmd = false);
     bool addToSteam(const QString& name, const QString& shortcutspath, bool from_cmd = false);
     Q_INVOKABLE bool removeFromSteam(const QString& name, const QString& shortcutspath, bool from_cmd = false);
+    Q_INVOKABLE QVariantMap manualProps(QVariant shortcut);
 #ifdef _WIN32
     Q_INVOKABLE QVariantList uwpApps();
 #endif

diff --git a/GlosSIConfig/qml.qrc b/GlosSIConfig/qml.qrc
@@ -11,5 +11,6 @@
         <file>svg/steam.svg</file>
         <file>qml/UWPSelectDialog.qml</file>
         <file>qml/InfoDialog.qml</file>
+        <file>steamscreener.png</file>
     </qresource>
 </RCC>
diff --git a/GlosSIConfig/qml/InfoDialog.qml b/GlosSIConfig/qml/InfoDialog.qml
@@ -21,6 +21,7 @@ Dialog {
 
 	property var confirmedParam: null
 	signal confirmed(var param)
+	signal confirmedExtra(var param)
 
 	visible: false
 	modal: true
@@ -40,6 +41,10 @@ Dialog {
 	property alias titleText: title.text
 	property alias text: text.text
 
+	property bool extraButton: false
+	property alias extraButtonText: extrabutton.text
+	property var confirmedExtraParam: null
+
 	enter: Transition {
 		NumberAnimation{target: content; property: "y"; from: parent.height; to: 16; duration: 300; easing.type: Easing.OutQuad }
 		NumberAnimation{target: background; property: "y"; from: parent.height; to: 0; duration: 300; easing.type: Easing.OutQuad }
@@ -84,6 +89,16 @@ Dialog {
 			anchors.top: col.bottom
 			anchors.topMargin: parent.spacing
 			spacing: 16
+
+			Button {
+				id: extrabutton
+				visible: extraButton
+				onClicked: function(){
+					close()
+					confirmedExtra(confirmedExtraParam)
+				}
+			}
+
 			Button {
 				text: qsTr("OK")
 				onClicked: function(){