Update dependencies, status labels

BOLL7708 · BOLL7708 · commit 28ec044a5e5b · 2024-07-29T10:17:02.000+02:00
diff --git a/EasyFramework b/EasyFramework
@@ -1 +1 @@
-Subproject commit c51169b22c403c4a7797b6e904e11dd810313cf6
+Subproject commit a050797df02e60bc0c0966c1cfe5c61360dbb420
diff --git a/EasyOpenVR b/EasyOpenVR
@@ -1 +1 @@
-Subproject commit 780af623ef01265284438280bc21df52759a902c
+Subproject commit d9a57a1fe8a5570407ff6fc07825085a9bc0e379
diff --git a/OpenVR2WS/DataStore.cs b/OpenVR2WS/DataStore.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
 using OpenVR2WS.Output;
 using Valve.VR;
 using static EasyOpenVR.EasyOpenVRSingleton;
diff --git a/OpenVR2WS/MainWindow.xaml b/OpenVR2WS/MainWindow.xaml
@@ -4,17 +4,17 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Title="MainWindow" Height="415" Width="360" Closing="Window_Closing" Icon="resources/logo.ico" StateChanged="Window_StateChanged">
+        Title="MainWindow" Height="415" Width="370" Closing="Window_Closing" Icon="resources/logo.ico" StateChanged="Window_StateChanged">
     <DockPanel LastChildFill="True" Margin="10">
         <GroupBox Header="Status &amp; Help" DockPanel.Dock="Top" Background="WhiteSmoke">
             <StackPanel Orientation="Vertical">
                 <StackPanel Orientation="Horizontal" Margin="5">
                     <Label Content="OpenVR status:"/>
-                    <Label x:Name="LabelOpenVrStatus" Content="openvr status" Background="Gray" Foreground="White"/>
+                    <Label x:Name="LabelOpenVrStatus" Content="OpenVR Status" Background="Gray" Foreground="White"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="5 0 5 5">
                     <Label Content="Server status:"/>
-                    <Label x:Name="LabelServerStatus" Content="server status" Background="Gray" Foreground="White"/>
+                    <Label x:Name="LabelServerStatus" Content="Server Status" Background="Gray" Foreground="White"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="5 0 5 5">
                     <TextBlock x:Name="TextBlockHelp" HorizontalAlignment="Left" TextWrapping="Wrap" VerticalAlignment="Top" Margin="10 0 10 0">
diff --git a/OpenVR2WS/MainWindow.xaml.cs b/OpenVR2WS/MainWindow.xaml.cs
@@ -60,11 +60,11 @@ public MainWindow()
                         {
                             case SuperServer.ServerStatus.Connected:
                                 LabelServerStatus.Background = Brushes.OliveDrab;
-                                LabelServerStatus.Content = "Connected";
+                                LabelServerStatus.Content = "Available";
                                 break;
                             case SuperServer.ServerStatus.Disconnected:
                                 LabelServerStatus.Background = Brushes.Tomato;
-                                LabelServerStatus.Content = "Disconnected";
+                                LabelServerStatus.Content = "Unavailable";
                                 break;
                             case SuperServer.ServerStatus.Error:
                                 LabelServerStatus.Background = Brushes.Gray;
@@ -202,10 +202,7 @@ private void Button_RemoteSettingsPassword_Click(object sender, RoutedEventArgs
         SingleInputDialog dlg = new(this, "", "Password");
         dlg.ShowDialog();
         var value = dlg.DialogResult == true ? dlg.Value : "";
-        var enc = Encoding.UTF8;
-        var hash = SHA256.HashData(enc.GetBytes(value));
-        var hashBase64String = Convert.ToBase64String(hash);
-        _settings.RemoteSettingsPasswordHash = hashBase64String;
+        _settings.RemoteSettingsPasswordHash = MiscUtils.HashPassword(value);
         _settings.Save();
     }
 }
diff --git a/OpenVR2WS/Properties/Resources.resx b/OpenVR2WS/Properties/Resources.resx
@@ -125,6 +125,6 @@
     <value>..\resources\Logo.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>v2.9.0</value>
+    <value>v2.9.1</value>
   </data>
 </root>
diff --git a/Types/dist/package.json b/Types/dist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openvr2ws-types",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "TypeScript type definitions for the input and output of OpenVR2WS.",
   "type": "module",
   "types": "types/index.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "openvr2ws-types",`
`3`		`- "version": "2.9.0",`
	`3`	`+ "version": "2.9.1",`
`4`	`4`	`"description": "TypeScript type definitions for the input and output of OpenVR2WS.",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"types": "types/index.d.ts",`