Enable app to auto-launch with SteamVR

Added option to exit with SteamVR as well, as otherwise it can have issues relaunching
Add d to debug build versions

Author: BOLL7708

OpenVR2Key/App.config

@@ -22,6 +22,9 @@
             <setting name="Haptic" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="ExitWithSteam" serializeAs="String">
+                <value>True</value>
+            </setting>
         </OpenVR2Key.Properties.Settings>
     </userSettings>
 </configuration>

OpenVR2Key/MainModel.cs

@@ -163,7 +163,7 @@ static public Dictionary<string, Key[]> RetrieveConfig(string configName = null)
         #region Settings
         public enum Setting
         {
-            Minimize, Tray, Notification, Haptic
+            Minimize, Tray, Notification, Haptic, ExitWithSteam
         }
 
         private static readonly Properties.Settings p = Properties.Settings.Default;

OpenVR2Key/MainWindow.xaml

@@ -14,6 +14,7 @@
                         <CheckBox x:Name="CheckBox_Minimize" Margin="5" Focusable="False" Content="Minimize on launch" HorizontalAlignment="Left" VerticalAlignment="Top" Checked="CheckBox_Minimize_Checked" Unchecked="CheckBox_Minimize_Checked"/>
                         <CheckBox x:Name="CheckBox_Tray" Margin="5" Focusable="False" Content="to system tray" HorizontalAlignment="Left" VerticalAlignment="Top" Checked="CheckBox_Tray_Checked" Unchecked="CheckBox_Tray_Checked"/>
                     </StackPanel>
+                    <CheckBox x:Name="CheckBox_ExitWithSteamVR" Content="Exit with SteamVR" Margin="5 0 5 5" Checked="CheckBox_ExitWithSteamVR_Checked" Unchecked="CheckBox_ExitWithSteamVR_Checked"/>
                     <CheckBox x:Name="CheckBox_DebugNotifications" Content="Show debug notifications in headset" Margin="5 0 5 5" Focusable="False" Checked="CheckBox_DebugNotifications_Checked" Unchecked="CheckBox_DebugNotifications_Checked"/>
                     <CheckBox x:Name="CheckBox_HapticFeedback" Content="Do haptic pulse on triggering key" Margin="5 0 5 5" Focusable="False" Checked="CheckBox_HapticFeedback_Checked" Unchecked="CheckBox_HapticFeedback_Checked"/>
                     <StackPanel Orientation="Horizontal" Margin="5 0 5 5">

OpenVR2Key/MainWindow.xaml.cs

@@ -22,6 +22,7 @@ public partial class MainWindow : Window
         private string _currentlyRunningAppId = MainModel.CONFIG_DEFAULT;
         private System.Windows.Forms.NotifyIcon _notifyIcon;
         private HashSet<string> _activeKeys = new HashSet<string>();
+        private bool _initDone = false;
         public MainWindow()
         {
             InitWindow();
@@ -55,6 +56,10 @@ public MainWindow()
                     {
                         Label_OpenVR.Content = message;
                         Label_OpenVR.Background = color;
+                        if (!connected && _initDone && MainModel.LoadSetting(MainModel.Setting.ExitWithSteam)) {
+                            if (_notifyIcon != null) _notifyIcon.Dispose();
+                            System.Windows.Application.Current.Shutdown();
+                        }
                     });
                 },
 
@@ -129,6 +134,7 @@ public MainWindow()
             _controller.Init(actionKeys);
             InitSettings();
             InitTrayIcon();
+            _initDone = true;
         }
 
         private void WriteToLog(String message)
@@ -376,9 +382,14 @@ private void InitSettings()
         {
             CheckBox_Minimize.IsChecked = MainModel.LoadSetting(MainModel.Setting.Minimize);
             CheckBox_Tray.IsChecked = MainModel.LoadSetting(MainModel.Setting.Tray);
+            CheckBox_ExitWithSteamVR.IsChecked = MainModel.LoadSetting(MainModel.Setting.ExitWithSteam);
             CheckBox_DebugNotifications.IsChecked = MainModel.LoadSetting(MainModel.Setting.Notification);
             CheckBox_HapticFeedback.IsChecked = MainModel.LoadSetting(MainModel.Setting.Haptic);
+#if DEBUG
+            Label_Version.Content = $"{MainModel.GetVersion()}d";
+#else
             Label_Version.Content = MainModel.GetVersion();
+#endif
         }
         private bool CheckboxValue(RoutedEventArgs e)
         {
@@ -421,5 +432,10 @@ private void NotifyIcon_Click(object sender, EventArgs e)
             Activate();
         }
         #endregion
+
+        private void CheckBox_ExitWithSteamVR_Checked(object sender, RoutedEventArgs e)
+        {
+            MainModel.UpdateSetting(MainModel.Setting.ExitWithSteam, CheckboxValue(e));
+        }
     }
 }

OpenVR2Key/Properties/Resources.Designer.cs

@@ -128,6 +128,6 @@
     <value>..\resources\logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>v0.45</value>
+    <value>v0.49</value>
   </data>
 </root>

OpenVR2Key/Properties/Resources.resx

@@ -14,5 +14,8 @@
     <Setting Name="Haptic" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="ExitWithSteam" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

OpenVR2Key/Properties/Settings.Designer.cs

@@ -3,7 +3,7 @@
 		"app_key": "boll7708.openvr2key",
 		"launch_type": "binary",
 		"binary_path_windows": "OpenVR2Key.exe",
-		"is_dashboard_overlay": false,
+		"is_dashboard_overlay": true,
 		"action_manifest_path": "./actions.json",
 
 		"strings": {