From bf49d2f1d59bd18ada8ba65d888d4430d9153899 Mon Sep 17 00:00:00 2001
From: Jeff Lord <jeff@jefflord.com>
Date: Fri, 15 Dec 2023 20:28:39 -0500
Subject: [PATCH] Allowed AppSpecific shortcut and fixed backup/restore
 shortcut dups

---
 .../ShortcutControl.cpp                       |  4 +-
 .../common/MappingConfiguration.cpp           | 67 ++++++++++++++++++-
 .../SettingsBackupAndRestoreUtils.cs          | 19 +++++-
 .../backup_restore_settings.json              |  5 ++
 4 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.cpp
index 1b95071bb3f4..e641efe9a757 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.cpp
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.cpp
@@ -210,7 +210,7 @@ void ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, std::vector<s
         }
         else if (shortcutType == ShortcutControl::ShortcutType::RunProgram)
         {
-            targetAppTextBox.IsEnabled(false);
+            //targetAppTextBox.IsEnabled(false);
             grid.Visibility(Visibility::Collapsed);
             shortcutButton.Visibility(Visibility::Collapsed);
             textInput.Visibility(Visibility::Collapsed);
@@ -219,7 +219,7 @@ void ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, std::vector<s
         }
         else
         {
-            targetAppTextBox.IsEnabled(false);
+            //targetAppTextBox.IsEnabled(false);
             grid.Visibility(Visibility::Collapsed);
             shortcutButton.Visibility(Visibility::Collapsed);
             textInput.Visibility(Visibility::Collapsed);
diff --git a/src/modules/keyboardmanager/common/MappingConfiguration.cpp b/src/modules/keyboardmanager/common/MappingConfiguration.cpp
index ea5e7c8f5665..a2c40400d0a0 100644
--- a/src/modules/keyboardmanager/common/MappingConfiguration.cpp
+++ b/src/modules/keyboardmanager/common/MappingConfiguration.cpp
@@ -212,6 +212,44 @@ bool MappingConfiguration::LoadAppSpecificShortcutRemaps(const json::JsonObject&
                 auto newRemapKeys = it.GetObjectW().GetNamedString(KeyboardManagerConstants::NewRemapKeysSettingName, {});
                 auto newRemapText = it.GetObjectW().GetNamedString(KeyboardManagerConstants::NewTextSettingName, {});
                 auto targetApp = it.GetObjectW().GetNamedString(KeyboardManagerConstants::TargetAppSettingName);
+                auto operationType = it.GetObjectW().GetNamedNumber(KeyboardManagerConstants::ShortcutOperationType, 0);
+
+                if (operationType == 1)
+                {
+                    auto runProgramFilePath = it.GetObjectW().GetNamedString(KeyboardManagerConstants::RunProgramFilePathSettingName, L"");
+                    auto runProgramArgs = it.GetObjectW().GetNamedString(KeyboardManagerConstants::RunProgramArgsSettingName, L"");
+                    auto runProgramStartInDir = it.GetObjectW().GetNamedString(KeyboardManagerConstants::RunProgramStartInDirSettingName, L"");
+                    auto runProgramElevationLevel = it.GetObjectW().GetNamedNumber(KeyboardManagerConstants::RunProgramElevationLevelSettingName, 0);
+                    auto secondKeyOfChord = it.GetObjectW().GetNamedNumber(KeyboardManagerConstants::ShortcutSecondKeyOfChordSettingName, 0);
+
+                    auto elevationLevel = Shortcut::ElevationLevel::NonElevated;
+                    if (runProgramElevationLevel == 1)
+                    {
+                        elevationLevel = Shortcut::ElevationLevel::Elevated;
+                    }
+                    else if (runProgramElevationLevel == 2)
+                    {
+                        elevationLevel = Shortcut::ElevationLevel::DifferentUser;
+                    }
+
+                    auto tempShortcut = Shortcut(newRemapKeys.c_str());
+                    tempShortcut.operationType = Shortcut::OperationType::RunProgram;
+                    tempShortcut.runProgramFilePath = runProgramFilePath;
+                    tempShortcut.elevationLevel = elevationLevel;
+                    tempShortcut.runProgramArgs = runProgramArgs;
+                    tempShortcut.runProgramStartInDir = runProgramStartInDir;
+
+                    AddAppSpecificShortcut(targetApp.c_str(), Shortcut(originalKeys.c_str(), static_cast<DWORD>(secondKeyOfChord)), tempShortcut);
+                }
+                else if (operationType == 2)
+                {
+                    auto secondKeyOfChord = it.GetObjectW().GetNamedNumber(KeyboardManagerConstants::ShortcutSecondKeyOfChordSettingName, 0);
+                    auto tempShortcut = Shortcut(newRemapKeys.c_str());
+                    tempShortcut.operationType = Shortcut::OperationType::OpenURI;
+                    tempShortcut.uriToOpen = it.GetObjectW().GetNamedString(KeyboardManagerConstants::ShortcutOpenURI, L"");
+
+                    AddAppSpecificShortcut(targetApp.c_str(), Shortcut(originalKeys.c_str(), static_cast<DWORD>(secondKeyOfChord)), tempShortcut);
+                }
 
                 if (!newRemapKeys.empty())
                 {
@@ -268,7 +306,6 @@ bool MappingConfiguration::LoadShortcutRemaps(const json::JsonObject& jsonData,
                         auto originalKeys = it.GetObjectW().GetNamedString(KeyboardManagerConstants::OriginalKeysSettingName);
                         auto newRemapKeys = it.GetObjectW().GetNamedString(KeyboardManagerConstants::NewRemapKeysSettingName, {});
                         auto newRemapText = it.GetObjectW().GetNamedString(KeyboardManagerConstants::NewTextSettingName, {});
-                        //auto isRunProgram = it.GetObjectW().GetNamedBoolean(KeyboardManagerConstants::IsRunProgramSettingName, false);
                         auto operationType = it.GetObjectW().GetNamedNumber(KeyboardManagerConstants::ShortcutOperationType, 0);
 
                         if (operationType == 1)
@@ -515,7 +552,33 @@ bool MappingConfiguration::SaveSettingsToFile()
             // For shortcut to shortcut remapping
             else if (itKeys.second.targetShortcut.index() == 1)
             {
-                keys.SetNamedValue(KeyboardManagerConstants::NewRemapKeysSettingName, json::value(std::get<Shortcut>(itKeys.second.targetShortcut).ToHstringVK()));
+                auto targetShortcut = std::get<Shortcut>(itKeys.second.targetShortcut);
+
+                //keys.SetNamedValue(KeyboardManagerConstants::IsRunProgramSettingName, json::value(targetShortcut.isRunProgram));
+
+                if (targetShortcut.operationType == Shortcut::OperationType::RunProgram)
+                {
+                    keys.SetNamedValue(KeyboardManagerConstants::RunProgramElevationLevelSettingName, json::value(static_cast<unsigned int>(targetShortcut.elevationLevel)));
+                    keys.SetNamedValue(KeyboardManagerConstants::ShortcutSecondKeyOfChordSettingName, json::value(static_cast<unsigned int>(itKeys.first.secondKey)));
+                    keys.SetNamedValue(KeyboardManagerConstants::ShortcutOperationType, json::value(static_cast<unsigned int>(targetShortcut.operationType)));
+
+                    keys.SetNamedValue(KeyboardManagerConstants::RunProgramFilePathSettingName, json::value(targetShortcut.runProgramFilePath));
+                    keys.SetNamedValue(KeyboardManagerConstants::RunProgramArgsSettingName, json::value(targetShortcut.runProgramArgs));
+                    keys.SetNamedValue(KeyboardManagerConstants::RunProgramStartInDirSettingName, json::value(targetShortcut.runProgramStartInDir));
+                }
+                else if (targetShortcut.operationType == Shortcut::OperationType::OpenURI)
+                {
+                    keys.SetNamedValue(KeyboardManagerConstants::RunProgramElevationLevelSettingName, json::value(static_cast<unsigned int>(targetShortcut.elevationLevel)));
+                    keys.SetNamedValue(KeyboardManagerConstants::ShortcutSecondKeyOfChordSettingName, json::value(static_cast<unsigned int>(itKeys.first.secondKey)));
+                    keys.SetNamedValue(KeyboardManagerConstants::ShortcutOperationType, json::value(static_cast<unsigned int>(targetShortcut.operationType)));
+
+                    keys.SetNamedValue(KeyboardManagerConstants::ShortcutOpenURI, json::value(targetShortcut.uriToOpen));
+                }
+                else
+                {
+                    keys.SetNamedValue(KeyboardManagerConstants::ShortcutOperationType, json::value(static_cast<unsigned int>(targetShortcut.operationType)));
+                    keys.SetNamedValue(KeyboardManagerConstants::NewRemapKeysSettingName, json::value(std::get<Shortcut>(itKeys.second.targetShortcut).ToHstringVK()));
+                }
             }
             else if (itKeys.second.targetShortcut.index() == 2)
             {
diff --git a/src/settings-ui/Settings.UI.Library/SettingsBackupAndRestoreUtils.cs b/src/settings-ui/Settings.UI.Library/SettingsBackupAndRestoreUtils.cs
index c6cf7d13b336..41bf5f04b9ab 100644
--- a/src/settings-ui/Settings.UI.Library/SettingsBackupAndRestoreUtils.cs
+++ b/src/settings-ui/Settings.UI.Library/SettingsBackupAndRestoreUtils.cs
@@ -319,8 +319,23 @@ public static string GetRegSettingsBackupAndRestoreRegItem(string itemName)
                             // the settings file needs to be updated, update the real one with non-excluded stuff...
                             Logger.LogInfo($"Settings file {currentFile.Key} is different and is getting updated from backup");
 
-                            var newCurrentSettingsFile = JsonMergeHelper.Merge(File.ReadAllText(currentSettingsFiles[currentFile.Key]), settingsToRestoreJson);
-                            File.WriteAllText(currentSettingsFiles[currentFile.Key], newCurrentSettingsFile);
+                            var overwrite = false;
+                            if (backupRestoreSettings["CustomRestoreSettings"] != null && backupRestoreSettings["CustomRestoreSettings"][currentFile.Key] != null)
+                            {
+                                var customRestoreSettings = backupRestoreSettings["CustomRestoreSettings"][currentFile.Key];
+                                overwrite = customRestoreSettings["overwrite"] != null && (bool)customRestoreSettings["overwrite"];
+                            }
+
+                            if (overwrite)
+                            {
+                                File.WriteAllText(currentSettingsFiles[currentFile.Key], settingsToRestoreJson);
+                            }
+                            else
+                            {
+                                var newCurrentSettingsFile = JsonMergeHelper.Merge(File.ReadAllText(currentSettingsFiles[currentFile.Key]), settingsToRestoreJson);
+                                File.WriteAllText(currentSettingsFiles[currentFile.Key], newCurrentSettingsFile);
+                            }
+
                             anyFilesUpdated = true;
                         }
                     }
diff --git a/src/settings-ui/Settings.UI.Library/backup_restore_settings.json b/src/settings-ui/Settings.UI.Library/backup_restore_settings.json
index 1863ed457505..84a03db71379 100644
--- a/src/settings-ui/Settings.UI.Library/backup_restore_settings.json
+++ b/src/settings-ui/Settings.UI.Library/backup_restore_settings.json
@@ -26,6 +26,11 @@
       ]
     }
   ],
+  "CustomRestoreSettings": {
+    "\\Keyboard Manager\\default.json": {
+      "overwrite": true
+    }
+  },
   "IgnoredSettings": {
     "backup-restore_settings.json": [
       "RestartAfterRestore"