UI defaults, version bump.

NTDLS · Nov 3, 2023 · 1a93a42 · 1a93a42
1 parent 9424ca0
commit 1a93a42
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 29 deletions.
diff --git a/@Installers/Service.Iss b/@Installers/Service.Iss
@@ -1,4 +1,4 @@
-#define AppVersion "0.3.0.0"
+#define AppVersion "0.4.0.0"
 
 [Setup]
 ;-- Main Setup Information

diff --git a/NetTunnel.ClientAPI/NetTunnel.ClientAPI.csproj b/NetTunnel.ClientAPI/NetTunnel.ClientAPI.csproj
@@ -10,10 +10,10 @@
     <Company>NetworkDLS</Company>
     <Authors>NetworkDLS</Authors>
     <Copyright>Copyright © 2023 NetworkDLS</Copyright>
-    <AssemblyVersion>0.3.0.0</AssemblyVersion>
-    <FileVersion>0.3.0.0</FileVersion>
-    <VersionPrefix>0.3.0.0</VersionPrefix>
-    <Version>0.3.0.0</Version>
+    <AssemblyVersion>0.4.0.0</AssemblyVersion>
+    <FileVersion>0.4.0.0</FileVersion>
+    <VersionPrefix>0.4.0.0</VersionPrefix>
+    <Version>0.4.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/NetTunnel.Library/NetTunnel.Library.csproj b/NetTunnel.Library/NetTunnel.Library.csproj
@@ -9,10 +9,10 @@
     <Company>NetworkDLS</Company>
     <Authors>NetworkDLS</Authors>
     <Copyright>Copyright © 2023 NetworkDLS</Copyright>
-    <AssemblyVersion>0.3.0.0</AssemblyVersion>
-    <FileVersion>0.3.0.0</FileVersion>
-    <VersionPrefix>0.3.0.0</VersionPrefix>
-    <Version>0.3.0.0</Version>
+    <AssemblyVersion>0.4.0.0</AssemblyVersion>
+    <FileVersion>0.4.0.0</FileVersion>
+    <VersionPrefix>0.4.0.0</VersionPrefix>
+    <Version>0.4.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/NetTunnel.Library/Persistence.cs b/NetTunnel.Library/Persistence.cs
@@ -44,5 +44,15 @@ public static void SaveToDisk<T>(T obj)
             }
             return default;
         }
+
+        public static T LoadFromDisk<T>(T defaultResult)
+        {
+            var result = LoadFromDisk<T>();
+            if (result == null)
+            {
+                return defaultResult;
+            }
+            return result;
+        }
     }
 }
diff --git a/NetTunnel.Service/NetTunnel.Service.csproj b/NetTunnel.Service/NetTunnel.Service.csproj
@@ -9,10 +9,10 @@
     <Company>NetworkDLS</Company>
     <Authors>NetworkDLS</Authors>
     <Copyright>Copyright © 2023 NetworkDLS</Copyright>
-    <AssemblyVersion>0.3.0.0</AssemblyVersion>
-    <FileVersion>0.3.0.0</FileVersion>
-    <VersionPrefix>0.3.0.0</VersionPrefix>
-    <Version>0.3.0.0</Version>
+    <AssemblyVersion>0.4.0.0</AssemblyVersion>
+    <FileVersion>0.4.0.0</FileVersion>
+    <VersionPrefix>0.4.0.0</VersionPrefix>
+    <Version>0.4.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/NetTunnel.UI/Forms/FormLogin.Designer.cs b/NetTunnel.UI/Forms/FormLogin.Designer.cs
diff --git a/NetTunnel.UI/Forms/FormLogin.cs b/NetTunnel.UI/Forms/FormLogin.cs
@@ -16,17 +16,23 @@ public FormLogin()
             AcceptButton = buttonLogin;
             CancelButton = buttonCancel;
 
-            var preferences = Persistence.LoadFromDisk<UILoginPreferences>();
-            if (preferences != null)
+            var preferences = Persistence.LoadFromDisk<UILoginPreferences>(new UILoginPreferences
             {
-                textBoxAddress.Text = preferences.Address;
-                textBoxPort.Text = preferences.Port;
-                textBoxUsername.Text = preferences.Username;
-            }
+                Address = "127.0.0.1",
+                Port = "52845",
+                Username = "root"
+            });
+
+            textBoxAddress.Text = preferences.Address;
+            textBoxPort.Text = preferences.Port;
+            textBoxUsername.Text = preferences.Username;
 
 #if DEBUG
             textBoxPassword.Text = Environment.MachineName.ToLower();
 #endif
+
+            textBoxPassword.Focus();
+
         }
 
         private void buttonLogin_Click(object sender, EventArgs e)

diff --git a/NetTunnel.UI/NetTunnel.UI.csproj b/NetTunnel.UI/NetTunnel.UI.csproj
@@ -11,10 +11,10 @@
     <Company>NetworkDLS</Company>
     <Authors>NetworkDLS</Authors>
     <Copyright>Copyright © 2023 NetworkDLS</Copyright>
-    <AssemblyVersion>0.3.0.0</AssemblyVersion>
-    <FileVersion>0.3.0.0</FileVersion>
-    <VersionPrefix>0.3.0.0</VersionPrefix>
-    <Version>0.3.0.0</Version>
+    <AssemblyVersion>0.4.0.0</AssemblyVersion>
+    <FileVersion>0.4.0.0</FileVersion>
+    <VersionPrefix>0.4.0.0</VersionPrefix>
+    <Version>0.4.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>