From 2741d1b6f38f3220198559e6b328da3456c30f60 Mon Sep 17 00:00:00 2001
From: Todd Matthews <gtmatthews@gmail.com>
Date: Mon, 27 Nov 2023 08:22:14 -0500
Subject: [PATCH] Add orientation swap to 1, 10HW, 10VL

---
 .../UI/ClientWindow/MainWindow.xaml.cs        | 12 ++++-------
 .../RadioOverlayOneHorizontal.xaml            | 21 ++++++++++++++++++-
 .../RadioOverlayOneHorizontal.xaml.cs         | 14 ++++++++++---
 .../RadioOverlayOneVertical.xaml              | 21 ++++++++++++++++++-
 .../RadioOverlayOneVertical.xaml.cs           | 11 +++++++++-
 .../RadioOverlayTenHorizontalWide.xaml        | 19 +++++++++++++++++
 .../RadioOverlayTenHorizontalWide.xaml.cs     | 12 ++++++++++-
 .../RadioOverlayTenVerticalLong.xaml          | 21 ++++++++++++++++++-
 .../RadioOverlayTenVerticalLong.xaml.cs       | 12 ++++++++++-
 9 files changed, 126 insertions(+), 17 deletions(-)

diff --git a/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml.cs b/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml.cs
index 757a9e7a..edd324ec 100644
--- a/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml.cs
+++ b/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml.cs
@@ -1743,20 +1743,16 @@ private void ToggleOverlay(bool uiButton, int switchTo)
                             windows[switchTo] = new RadioOverlayWindowTenHorizontal(ToggleOverlay);
                             break;
                         case 8:
-                            // TODO: Add Toggle Overlay for Horizontal Swap
-                            windows[switchTo] = new RadioOverlayWindowOneVertical();
+                            windows[switchTo] = new RadioOverlayWindowOneVertical(ToggleOverlay);
                             break;
                         case 9:
-                            // TODO: Add Toggle Overlay for Horizontal Swap
-                            windows[switchTo] = new RadioOverlayWindowOneHorizontal();
+                            windows[switchTo] = new RadioOverlayWindowOneHorizontal(ToggleOverlay);
                             break;
                         case 10:
-                            // TODO: Add Toggle Overlay for Horizontal Swap
-                            windows[switchTo] = new RadioOverlayWindowTenVerticalLong();
+                            windows[switchTo] = new RadioOverlayWindowTenVerticalLong(ToggleOverlay);
                             break;
                         case 11:
-                            // TODO: Add Toggle Overlay for Horizontal Swap
-                            windows[switchTo] = new RadioOverlayWindowTenHorizontalWide();
+                            windows[switchTo] = new RadioOverlayWindowTenHorizontalWide(ToggleOverlay);
                             break;
                     }
                     try
diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneHorizontal.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneHorizontal.xaml
index dd1b7576..d9ad67be 100644
--- a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneHorizontal.xaml
+++ b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneHorizontal.xaml
@@ -47,7 +47,7 @@
                     HorizontalAlignment="Right"
                     Orientation="Horizontal">
             <TextBlock Name="ControlText"
-                       Width="200"
+                       Width="140"
                        Height="12"
                        Margin="5,0,0,0"
                        VerticalAlignment="Center"
@@ -76,6 +76,25 @@
                     </Style>
                 </TextBlock.Style>
             </TextBlock>
+            <TextBlock Name="Orientation"
+Width="38"
+Height="12"
+Margin="5,0,0,0"
+VerticalAlignment="Center"
+FontSize="8"
+Foreground="#E7E7E7"
+Padding="0"
+Text="Horizontal" />
+            <Button 
+     Height="15" 
+     Margin="0,0,2,0" 
+     ToolTip="Swap to vertical orientation"
+     Click="Button_Swap_Orientation"
+     Style="{StaticResource DarkStyle-Button}">
+                <Grid Width="10" Height="10">
+                    <Image Source="../../SRS_Orientation_Toggle.png" />
+                </Grid>
+            </Button>
             <Button Height="15"
                     Margin="0,0,0,0"
                     VerticalAlignment="Center"
diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneHorizontal.xaml.cs b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneHorizontal.xaml.cs
index 5b4e9a12..ac1de6b2 100644
--- a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneHorizontal.xaml.cs
+++ b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneHorizontal.xaml.cs
@@ -44,9 +44,9 @@ public partial class RadioOverlayWindowOneHorizontal : Window
 
         private long _lastUnitId;
 
-        
-       
-        public RadioOverlayWindowOneHorizontal()
+        private Action<bool, int> _toggleOverlay;
+
+        public RadioOverlayWindowOneHorizontal(Action<bool, int> ToggleOverlay)
         {
             //load opacity before the intialising as the slider changed
             //method fires after initialisation
@@ -89,6 +89,8 @@ public RadioOverlayWindowOneHorizontal()
             _updateTimer = new DispatcherTimer {Interval = TimeSpan.FromMilliseconds(80)};
             _updateTimer.Tick += RadioRefresh;
             _updateTimer.Start();
+
+            this._toggleOverlay = ToggleOverlay;
         }
 
         private void Location_Changed(object sender, EventArgs e)
@@ -238,6 +240,12 @@ private void Button_Close(object sender, RoutedEventArgs e)
             Close();
         }
 
+        private void Button_Swap_Orientation(object sender, RoutedEventArgs e)
+        {
+            Close();
+            _toggleOverlay(true, 8); // index 8 is the vertical orientation
+        }
+
         private void windowOpacitySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             Opacity = e.NewValue;
diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneVertical.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneVertical.xaml
index fe71ff3c..5a260632 100644
--- a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneVertical.xaml
+++ b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneVertical.xaml
@@ -33,7 +33,7 @@
         </WrapPanel.LayoutTransform>
 
         <TextBlock Name="ControlText"
-                   Width="118"
+                   Width="72"
                    Height="12"
                    Margin="5,0,0,0"
                    VerticalAlignment="Center"
@@ -41,6 +41,25 @@
                    Foreground="#E7E7E7"
                    Padding="0"
                    Text="1 Radio Panel" />
+        <TextBlock Name="Orientation"
+          Width="28"
+          Height="12"
+          Margin="5,0,0,0"
+          VerticalAlignment="Center"
+          FontSize="8"
+          Foreground="#E7E7E7"
+          Padding="0"
+          Text="Vertical" />
+        <Button Margin="0,0,0,0"
+       Click="Button_Swap_Orientation"
+       Style="{StaticResource DarkStyle-Button}"
+       ToolTip="Swap to horizon orientation">
+            <Button.Content>
+                <Grid Width="10" Height="10">
+                    <Image Source="../../SRS_Orientation_Toggle.png" />
+                </Grid>
+            </Button.Content>
+        </Button>
         <Button Margin="0,0,0,0"
                 Click="Button_About"
                 Style="{StaticResource DarkStyle-Button}">
diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneVertical.xaml.cs b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneVertical.xaml.cs
index 39ddffd6..2f0f1076 100644
--- a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneVertical.xaml.cs
+++ b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneVertical.xaml.cs
@@ -44,8 +44,10 @@ public partial class RadioOverlayWindowOneVertical : Window
 
         private long _lastUnitId;
 
+        private Action<bool, int> _toggleOverlay;
 
-        public RadioOverlayWindowOneVertical()
+
+        public RadioOverlayWindowOneVertical(Action<bool, int> ToggleOverlay)
         {
             //load opacity before the intialising as the slider changed
             //method fires after initialisation
@@ -88,6 +90,8 @@ public RadioOverlayWindowOneVertical()
             _updateTimer = new DispatcherTimer {Interval = TimeSpan.FromMilliseconds(80)};
             _updateTimer.Tick += RadioRefresh;
             _updateTimer.Start();
+
+            this._toggleOverlay = ToggleOverlay;
         }
 
         private void Location_Changed(object sender, EventArgs e)
@@ -255,6 +259,11 @@ private void Button_Close(object sender, RoutedEventArgs e)
         {
             Close();
         }
+        private void Button_Swap_Orientation(object sender, RoutedEventArgs e)
+        {
+            Close();
+            _toggleOverlay(true, 9); // index 9 is the horizontal orientation
+        }
 
         private void windowOpacitySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontalWide.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontalWide.xaml
index d2458736..479b9ec3 100644
--- a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontalWide.xaml
+++ b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontalWide.xaml
@@ -84,6 +84,25 @@
                     </Style>
                 </TextBlock.Style>
             </TextBlock>
+            <TextBlock Name="Orientation"
+Width="38"
+Height="12"
+Margin="5,0,0,0"
+VerticalAlignment="Center"
+FontSize="8"
+Foreground="#E7E7E7"
+Padding="0"
+Text="Horizontal" />
+            <Button 
+     Height="15" 
+     Margin="0,0,2,0" 
+     ToolTip="Swap to vertical orientation"
+     Click="Button_Swap_Orientation"
+     Style="{StaticResource DarkStyle-Button}">
+                <Grid Width="10" Height="10">
+                    <Image Source="../../SRS_Orientation_Toggle.png" />
+                </Grid>
+            </Button>
             <Button Height="15"
                     Margin="0,0,0,0"
                     VerticalAlignment="Center"
diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontalWide.xaml.cs b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontalWide.xaml.cs
index aa2da331..39aa2f34 100644
--- a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontalWide.xaml.cs
+++ b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontalWide.xaml.cs
@@ -35,7 +35,9 @@ public partial class RadioOverlayWindowTenHorizontalWide : Window
 
         private GlobalSettingsStore _globalSettings = GlobalSettingsStore.Instance;
 
-        public RadioOverlayWindowTenHorizontalWide()
+        private Action<bool, int> _toggleOverlay;
+
+        public RadioOverlayWindowTenHorizontalWide(Action<bool, int> ToggleOverlay)
         {
             //load opacity before the intialising as the slider changed
             //method fires after initialisation
@@ -83,6 +85,8 @@ public RadioOverlayWindowTenHorizontalWide()
             _updateTimer = new DispatcherTimer {Interval = TimeSpan.FromMilliseconds(80)};
             _updateTimer.Tick += RadioRefresh;
             _updateTimer.Start();
+
+            this._toggleOverlay = ToggleOverlay;
         }
 
         private void Location_Changed(object sender, EventArgs e)
@@ -184,6 +188,12 @@ private void Button_Close(object sender, RoutedEventArgs e)
             Close();
         }
 
+        private void Button_Swap_Orientation(object sender, RoutedEventArgs e)
+        {
+            Close();
+            _toggleOverlay(true, 10); // index 10 is the vertical orientation
+        }
+
         private void windowOpacitySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             Opacity = e.NewValue;
diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVerticalLong.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVerticalLong.xaml
index 3bae494e..2e4ca091 100644
--- a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVerticalLong.xaml
+++ b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVerticalLong.xaml
@@ -56,7 +56,7 @@
                     HorizontalAlignment="Left"
                     Orientation="Horizontal" Margin="5,0,0,0" Width="160">
             <TextBlock Name="ControlText"
-                       Width="125"
+                       Width="80"
                        Height="12"
                        Margin="2,0,0,0"
                        VerticalAlignment="Center"
@@ -64,6 +64,25 @@
                        Foreground="#E7E7E7"
                        Padding="0"
                        Text="10 Radio Panel" />
+            <TextBlock Name="Orientation"
+          Width="28"
+          Height="12"
+          Margin="5,0,0,0"
+          VerticalAlignment="Center"
+          FontSize="8"
+          Foreground="#E7E7E7"
+          Padding="0"
+          Text="Vertical" />
+            <Button Margin="0,0,0,0"
+       Click="Button_Swap_Orientation"
+       Style="{StaticResource DarkStyle-Button}"
+       ToolTip="Swap to horizon orientation">
+                <Button.Content>
+                    <Grid Width="10" Height="10">
+                        <Image Source="../../SRS_Orientation_Toggle.png" />
+                    </Grid>
+                </Button.Content>
+            </Button>
             <Button Height="15"
                     Margin="0,0,0,0"
                     VerticalAlignment="Center"
diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVerticalLong.xaml.cs b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVerticalLong.xaml.cs
index 6094a624..de7449ae 100644
--- a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVerticalLong.xaml.cs
+++ b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVerticalLong.xaml.cs
@@ -35,7 +35,9 @@ public partial class RadioOverlayWindowTenVerticalLong : Window
 
         private GlobalSettingsStore _globalSettings = GlobalSettingsStore.Instance;
 
-        public RadioOverlayWindowTenVerticalLong()
+        private Action<bool, int> _toggleOverlay;
+
+        public RadioOverlayWindowTenVerticalLong(Action<bool, int> ToggleOverlay)
         {
             //load opacity before the intialising as the slider changed
             //method fires after initialisation
@@ -81,6 +83,8 @@ public RadioOverlayWindowTenVerticalLong()
             _updateTimer = new DispatcherTimer {Interval = TimeSpan.FromMilliseconds(80)};
             _updateTimer.Tick += RadioRefresh;
             _updateTimer.Start();
+
+            this._toggleOverlay = ToggleOverlay;
         }
 
         private void RadioRefresh(object sender, EventArgs eventArgs)
@@ -176,6 +180,12 @@ private void Button_Close(object sender, RoutedEventArgs e)
             Close();
         }
 
+        private void Button_Swap_Orientation(object sender, RoutedEventArgs e)
+        {
+            Close();
+            _toggleOverlay(true, 11); // index 11 is the horizontal orientation
+        }
+
         private void windowOpacitySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             Opacity = e.NewValue;