Merge pull request #83 from FPGSchiba/feature/76-fix-radio-panel-head…

…ers-GUI Feature/76 fix radio panel headers
FPGSchiba · Nov 27, 2023 · ed97cf2 · ed97cf2
2 parents 4c4e54b + 7807b5c
commit ed97cf2
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 35 deletions.
diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayFiveHorizontal.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayFiveHorizontal.xaml
@@ -50,18 +50,18 @@
                     HorizontalAlignment="Right"
                     Orientation="Horizontal">
             <TextBlock Name="ControlText"
-                       Width="665"
-                       Height="16"
+                       Width="605"
+                       Height="12"
                        Margin="5,0,0,0"
                        VerticalAlignment="Center"
-                       FontSize="13"
+                       FontSize="8"
                        Foreground="#E7E7E7"
                        Padding="0"
-                       Text="5 Radio Panel Horizontal" />
+                       Text="5 Radio Panel" />
             <TextBlock Name="ControlSubText"
                        Width="100"
                        Text="VNGD is best"
-                       FontSize="11"
+                       FontSize="8"
                        TextAlignment="Center"
                        VerticalAlignment="Center"
                        Foreground="#E7E7E7"

diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneHorizontal.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneHorizontal.xaml
@@ -54,11 +54,11 @@
                        FontSize="8"
                        Foreground="#E7E7E7"
                        Padding="0"
-                       Text="1 Radio Panel Horizontal" />
+                       Text="1 Radio Panel" />
             <TextBlock Name="ControlSubText"
                        Width="100"
                        Text="VNGD is best"
-                       FontSize="11"
+                       FontSize="8"
                        TextAlignment="Center"
                        VerticalAlignment="Center"
                        Foreground="#E7E7E7"

diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneVertical.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneVertical.xaml
@@ -36,19 +36,19 @@
                    Width="118"
                    Height="12"
                    Margin="5,0,0,0"
-                   VerticalAlignment="Top"
+                   VerticalAlignment="Center"
                    FontSize="8"
                    Foreground="#E7E7E7"
                    Padding="0"
-                   Text="" />
+                   Text="1 Radio Panel" />
         <Button Margin="0,0,0,0"
                 Click="Button_About"
                 Style="{StaticResource DarkStyle-Button}">
             <Button.Content>
                 <Grid Width="10" Height="10">
                     <TextBlock HorizontalAlignment="Center"
                                VerticalAlignment="Center"
-                              FontWeight="Bold"
+                               FontWeight="Bold"
                                FontSize="10"
                                Padding="0"
                                Text="?" />

diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontal.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontal.xaml
@@ -38,7 +38,7 @@
             <ColumnDefinition Width="1*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="20" />
+            <RowDefinition Height="16" />
             <RowDefinition />
             <RowDefinition />
             <RowDefinition Height="35" />
@@ -52,17 +52,17 @@
                     Orientation="Horizontal">
             <TextBlock Name="ControlText"
                        Width="608"
-                       Height="16"
+                       Height="12"
                        Margin="5,0,0,0"
                        VerticalAlignment="Center"
-                       FontSize="13"
+                       FontSize="8"
                        Foreground="#E7E7E7"
                        Padding="0"
-                       Text="10 Horizontal" />
+                       Text="10 Radio Panel" />
             <TextBlock Name="ControlSubText"
                        Width="100"
                        Text="VNGD is best"
-                       FontSize="11"
+                       FontSize="8"
                        TextAlignment="Center"
                        VerticalAlignment="Center"
                        Foreground="#E7E7E7"

diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontalWide.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontalWide.xaml
@@ -56,17 +56,17 @@
                     Orientation="Horizontal">
             <TextBlock Name="ControlText"
                        Width="1510"
-                       Height="16"
+                       Height="12"
                        Margin="5,0,0,0"
                        VerticalAlignment="Center"
-                       FontSize="13"
+                       FontSize="8"
                        Foreground="#E7E7E7"
                        Padding="0"
                        Text="10 Radio Panel - Ultrawide" />
             <TextBlock Name="ControlSubText"
                        Width="100"
                        Text="VNGD is best"
-                       FontSize="11"
+                       FontSize="8"
                        TextAlignment="Center"
                        VerticalAlignment="Center"
                        Foreground="#E7E7E7"
@@ -177,7 +177,7 @@
 
             <awacsOverlayWindow:IntercomControlGroup x:Name="intercom"
                             Margin="0,0,0,0"
-                            HorizontalAlignment="Left"
+                            HorizontalAlignment="Center"
                             RadioId="0" />
 
             <StackPanel

diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVertical.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVertical.xaml
@@ -35,7 +35,7 @@
             <ColumnDefinition Width="1*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="20" />
+            <RowDefinition Height="16" />
             <RowDefinition />
             <RowDefinition />
             <RowDefinition />
@@ -52,13 +52,13 @@
                     Orientation="Horizontal">
             <TextBlock Name="ControlText"
                        Width="250"
-                       Height="16"
+                       Height="12"
                        Margin="5,0,0,0"
                        VerticalAlignment="Center"
-                       FontSize="13"
+                       FontSize="8"
                        Foreground="#E7E7E7"
                        Padding="0"
-                       Text="10 Vertical" />
+                       Text="10 Radio Panel" />
             <TextBlock Name="Orientation"
                   Width="28"
                   Height="12"
@@ -69,9 +69,10 @@
                   Padding="0"
                   Text="Vertical" />
             <Button Margin="0,0,0,0"
-               Click="Button_Swap_Orientation"
-               Style="{StaticResource DarkStyle-Button}"
-               ToolTip="Swap to horizon orientation">
+                   Height="15"
+                   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" />

diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVerticalLong.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVerticalLong.xaml
@@ -35,7 +35,7 @@
 
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="12" />
+            <RowDefinition Height="16" />
             <RowDefinition Height="80"/>
             <RowDefinition Height="80"/>
             <RowDefinition Height="80"/>
@@ -63,7 +63,7 @@
                        FontSize="8"
                        Foreground="#E7E7E7"
                        Padding="0"
-                       Text="10 Vertical" />
+                       Text="10 Radio Panel" />
             <Button Height="15"
                     Margin="0,0,0,0"
                     VerticalAlignment="Center"

diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayThreeHorizontal.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayThreeHorizontal.xaml
@@ -6,9 +6,9 @@
         Name="RadioOverlayWin"
         Title="DCS-SimpleRadio"
         Width="510"
-        Height="130"
+        Height="117"
         MinWidth="510"
-        MinHeight="130"
+        MinHeight="117"
         AllowsTransparency="True"
         Background="#444"
         Opacity="1.0"
@@ -36,9 +36,9 @@
             <ColumnDefinition Width="1*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
+            <RowDefinition Height="16" />
+            <RowDefinition Height="80" />
             <RowDefinition Height="20" />
-            <RowDefinition />
-            <RowDefinition Height="25" />
 
         </Grid.RowDefinitions>
 
@@ -57,7 +57,7 @@
             <TextBlock Name="ControlSubText"
                        Width="100"
                        Text="VNGD is best"
-                       FontSize="11"
+                       FontSize="8"
                        TextAlignment="Center"
                        VerticalAlignment="Center"
                        Foreground="#E7E7E7"

diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayThreeVertical.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayThreeVertical.xaml
@@ -67,7 +67,7 @@
                 <Grid Width="10" Height="10">
                     <TextBlock HorizontalAlignment="Center"
                                VerticalAlignment="Center"
-                              FontWeight="Bold"
+                               FontWeight="Bold"
                                FontSize="10"
                                Padding="0"
                                Text="?" />

diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTwoHorizontal.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTwoHorizontal.xaml
@@ -57,6 +57,7 @@
                        Width="80"
                        Text="VNGD is best"
                        FontSize="8"
+                       Height="12"
                        TextAlignment="Center"
                        VerticalAlignment="Center"
                        Foreground="#E7E7E7"

diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTwoVertical.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTwoVertical.xaml
@@ -112,7 +112,7 @@
         <local:IntercomControlGroup x:Name="Intercom" RadioId="0" />
         <Separator Width="170" Margin="0 2" />
 
-        <TextBlock x:Name="RadioLabel"
+        <TextBlock
            Margin="5,0,0,0"
            Width="60"
            HorizontalAlignment="Center"