Windows position fixes, streamdeck json fix for dcsbios class organiz…

…ation (#468)
DCS-Skunkworks · Feb 7, 2024 · 054f9db · 054f9db
1 parent 7190115
commit 054f9db
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 67 deletions.
diff --git a/src/ControlReference/App.config b/src/ControlReference/App.config
@@ -23,10 +23,10 @@
                 <value>%userprofile%\Saved Games\DCS\Scripts\DCS-BIOS\doc\json</value>
             </setting>
             <setting name="MainWindowHeight" serializeAs="String">
-                <value>-1</value>
+                <value>600</value>
             </setting>
             <setting name="MainWindowWidth" serializeAs="String">
-                <value>-1</value>
+                <value>700</value>
             </setting>
             <setting name="MainWindowTop" serializeAs="String">
                 <value>-1</value>

diff --git a/src/ControlReference/CTRLMainWindow.xaml.cs b/src/ControlReference/CTRLMainWindow.xaml.cs
@@ -106,10 +106,11 @@ private void MainWindow_OnLoaded(object sender, RoutedEventArgs e)
                 {
                     return;
                 }
-                Top = Settings.Default.MainWindowTop.CompareTo(-1) == 0 ? Top : Settings.Default.MainWindowTop; 
-                Left = Settings.Default.MainWindowLeft.CompareTo(-1) == 0 ? Top : Settings.Default.MainWindowLeft;
-                Height = Settings.Default.MainWindowHeight.CompareTo(-1) == 0 ? Top : Settings.Default.MainWindowHeight;
-                Width = Settings.Default.MainWindowWidth.CompareTo(-1) == 0 ? Top : Settings.Default.MainWindowWidth;
+
+                Top = Settings.Default.MainWindowTop; 
+                Left = Settings.Default.MainWindowLeft;
+                Height = Settings.Default.MainWindowHeight;
+                Width = Settings.Default.MainWindowWidth;
 
                 var result = Common.CheckJSONDirectory(Settings.Default.DCSBiosJSONLocation);
                 if (result.Item1 == false && result.Item2 == false)

diff --git a/src/ControlReference/Properties/Settings.Designer.cs b/src/ControlReference/Properties/Settings.Designer.cs
diff --git a/src/ControlReference/Properties/Settings.settings b/src/ControlReference/Properties/Settings.settings
@@ -18,10 +18,10 @@
       <Value Profile="(Default)">%userprofile%\Saved Games\DCS\Scripts\DCS-BIOS\doc\json</Value>
     </Setting>
     <Setting Name="MainWindowHeight" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">-1</Value>
+      <Value Profile="(Default)">600</Value>
     </Setting>
     <Setting Name="MainWindowWidth" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">-1</Value>
+      <Value Profile="(Default)">700</Value>
     </Setting>
     <Setting Name="MainWindowTop" Type="System.Double" Scope="User">
       <Value Profile="(Default)">-1</Value>

diff --git a/src/DCS-BIOS/misc/DCSBIOSInputInterface.cs → ...-BIOS/Serialized/DCSBIOSInputInterface.cs b/src/DCS-BIOS/misc/DCSBIOSInputInterface.cs → ...-BIOS/Serialized/DCSBIOSInputInterface.cs
@@ -1,9 +1,8 @@
 using System;
 using ClassLibraryCommon;
 using DCS_BIOS.Json;
-using DCS_BIOS.Serialized;
 
-namespace DCS_BIOS.misc
+namespace DCS_BIOS.Serialized
 {
 
     /// <summary>

diff --git a/src/DCSFlightpanels/MainWindow.xaml b/src/DCSFlightpanels/MainWindow.xaml
@@ -9,7 +9,6 @@
         Loaded="WindowLoaded" 
         Closing="MainWindowClosing" 
         Closed="MainWindow_OnClosed" 
-        LocationChanged="MainWindowLocationChanged" 
         KeyDown="MainWindow_OnKeyDown"
         SizeChanged="MainWindowSizeChanged"
         WindowStartupLocation="CenterScreen"  

diff --git a/src/DCSFlightpanels/MainWindow.xaml.cs b/src/DCSFlightpanels/MainWindow.xaml.cs
@@ -71,7 +71,7 @@ public MainWindow()
             AppEventHandler.AttachSettingsModified(this);
             AppEventHandler.AttachPanelEventListener(this);
             AppEventHandler.AttachForwardPanelEventListener(this);
-            BIOSEventHandler.AttachConnectionListener(this); 
+            BIOSEventHandler.AttachConnectionListener(this);
             BIOSEventHandler.AttachStringListener(this);
             /*
              * Correct JSON folder path, move away from $USERDIRECTORY$.
@@ -184,7 +184,7 @@ private void WindowLoaded(object sender, RoutedEventArgs e)
                 Common.ShowErrorMessageBox(ex);
             }
         }
-        
+
         private void FindDCSBIOSControls()
         {
             if (!DCSAircraft.HasDCSBIOSModules || DCSAircraft.IsKeyEmulator(ProfileHandler.ActiveDCSAircraft) || DCSAircraft.IsKeyEmulatorSRS(ProfileHandler.ActiveDCSAircraft))
@@ -361,51 +361,14 @@ private void LoadSettings()
         {
             LoadProcessPriority();
 
-            if (Settings.Default.MainWindowHeight > 0)
-            {
-                Height = Settings.Default.MainWindowHeight;
-            }
-
-            if (Settings.Default.MainWindowWidth > 0)
-            {
-                Width = Settings.Default.MainWindowWidth;
-            }
-
-            if (Settings.Default.MainWindowTop > 0)
-            {
-                Top = Settings.Default.MainWindowTop;
-            }
-
-            if (Settings.Default.MainWindowLeft > 0)
-            {
-                Left = Settings.Default.MainWindowLeft;
-            }
+            Height = Settings.Default.MainWindowHeight;
+            Width = Settings.Default.MainWindowWidth;
+            Top = Settings.Default.MainWindowTop;
+            Left = Settings.Default.MainWindowLeft;
 
             Common.APIModeUsed = Settings.Default.APIMode == 0 ? APIModeEnum.KeybdEvent : APIModeEnum.SendInput;
         }
 
-        private void MainWindowLocationChanged(object sender, EventArgs e)
-        {
-            try
-            {
-                if (!_isLoaded)
-                {
-                    return;
-                }
-
-                if (Top > 0 && Left > 0)
-                {
-                    Settings.Default.MainWindowTop = Top;
-                    Settings.Default.MainWindowLeft = Left;
-                    Settings.Default.Save();
-                }
-            }
-            catch (Exception ex)
-            {
-                Common.ShowErrorMessageBox(ex);
-            }
-        }
-
         public void SwitchesChanged(object sender, SwitchesChangedEventArgs e)
         {
             try
@@ -576,6 +539,10 @@ private void MainWindowClosing(object sender, System.ComponentModel.CancelEventA
                 {
                     e.Cancel = true;
                 }
+
+                Settings.Default.MainWindowTop = Top;
+                Settings.Default.MainWindowLeft = Left;
+                Settings.Default.Save();
             }
             catch (Exception ex)
             {
@@ -1380,7 +1347,7 @@ private void MenuItemCTRLRef_OnClick(object sender, RoutedEventArgs e)
                     FileName = AppDomain.CurrentDomain.BaseDirectory + "ctrlref.exe",
                     UseShellExecute = true
                 });
-                
+
             }
             catch (Exception ex)
             {

diff --git a/src/DCSFlightpanels/Properties/Settings.Designer.cs b/src/DCSFlightpanels/Properties/Settings.Designer.cs
diff --git a/src/DCSFlightpanels/Properties/Settings.settings b/src/DCSFlightpanels/Properties/Settings.settings
@@ -6,10 +6,10 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="MainWindowHeight" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">0</Value>
+      <Value Profile="(Default)">800</Value>
     </Setting>
     <Setting Name="MainWindowWidth" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">0</Value>
+      <Value Profile="(Default)">1300</Value>
     </Setting>
     <Setting Name="MainWindowTop" Type="System.Double" Scope="User">
       <Value Profile="(Default)">0</Value>

diff --git a/src/DCSFlightpanels/app.config b/src/DCSFlightpanels/app.config
@@ -11,10 +11,10 @@
                 <value />
             </setting>
             <setting name="MainWindowHeight" serializeAs="String">
-                <value>0</value>
+                <value>800</value>
             </setting>
             <setting name="MainWindowWidth" serializeAs="String">
-                <value>0</value>
+                <value>1300</value>
             </setting>
             <setting name="MainWindowTop" serializeAs="String">
                 <value>0</value>

diff --git a/src/NonVisuals/Panels/StreamDeck/JSONFixer.cs b/src/NonVisuals/Panels/StreamDeck/JSONFixer.cs
@@ -20,6 +20,17 @@ public static string Fix(string json)
              */
             json = json.Replace("NonVisuals.KeyPress, NonVisuals", "NonVisuals.KeyEmulation.KeyPress, NonVisuals");
             json = json.Replace("NonVisuals.KeyPressInfo, NonVisuals", "NonVisuals.KeyEmulation.KeyPressInfo, NonVisuals");
+
+            /*
+             * 07.02.2024, organized DCS-BIOS classes
+             */
+            json = json.Replace("DCS_BIOS.DCSBIOSInput, DCS-BIOS", "DCS_BIOS.Serialized.DCSBIOSInput, DCS-BIOS");
+            json = json.Replace("DCS_BIOS.DCSBIOSOutput, DCS-BIOS", "DCS_BIOS.Serialized.DCSBIOSOutput, DCS-BIOS");
+            json = json.Replace("DCS_BIOS.DCSBIOSOutputFormula, DCS-BIOS", "DCS_BIOS.Serialized.DCSBIOSOutputFormula, DCS-BIOS");
+            json = json.Replace("DCS_BIOS.DCSBIOSInputInterface, DCS-BIOS", "DCS_BIOS.Serialized.DCSBIOSInputInterface, DCS-BIOS");
+
+
+
             return json;
         }
 

diff --git a/src/Tests/DcsBios/DCSBIOSInputInterfaceTests.cs b/src/Tests/DcsBios/DCSBIOSInputInterfaceTests.cs
@@ -1,6 +1,5 @@
 using System;
 using DCS_BIOS.Json;
-using DCS_BIOS.misc;
 using DCS_BIOS.Serialized;
 using Xunit;
 

diff --git a/src/Tests/Serialization/DCSBIOSInputInterface_SerializeTests.cs b/src/Tests/Serialization/DCSBIOSInputInterface_SerializeTests.cs
@@ -1,5 +1,4 @@
-using DCS_BIOS.misc;
-using DCS_BIOS.Serialized;
+using DCS_BIOS.Serialized;
 using DCSFPTests.Serialization.Common;
 using Newtonsoft.Json;
 using Xunit;