Bugfix, options now shown when choosing profile (#437)

* Bugfix, options now shown when choosing profile * compile
DCS-Skunkworks · Nov 29, 2023 · e04b5ef · e04b5ef
1 parent 9c27004
commit e04b5ef
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/Source/DCSFlightpanels/DCSFlightpanels.csproj b/Source/DCSFlightpanels/DCSFlightpanels.csproj
@@ -28,7 +28,7 @@
     </Authors>
     <PackageId>DCSFlightpanels (DCSFP)</PackageId>
     <Version>1.0.0</Version>
-    <AssemblyVersion>4.11.1</AssemblyVersion>
+    <AssemblyVersion>4.11.2</AssemblyVersion>
     <FileVersion>
     </FileVersion>
     <ApplicationIcon>Images\UI\flightpanels02_8Rc_icon.ico</ApplicationIcon>

diff --git a/Source/DCSFlightpanels/Windows/ChooseProfileModuleWindow.xaml b/Source/DCSFlightpanels/Windows/ChooseProfileModuleWindow.xaml
@@ -13,26 +13,27 @@
             <RowDefinition Height="1*" />
             <RowDefinition Height="1*" />
             <RowDefinition Height="1*" />
+            <RowDefinition Height="1*" />
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" >
             <Label Content="Module:" Margin="5,0,0,0"/>
             <ComboBox Name="ComboBoxAirframe" ToolTip="Cockpit controls from DCS-BIOS will be loaded based on the selected airframe" HorizontalAlignment="Left" Margin="10,0,10,0" Width="150" SelectedIndex="0" SelectionChanged="ComboBoxAirframe_OnSelectionChanged"/>
         </StackPanel>
-        <StackPanel Name="StackPanelUseGenericRadio" Grid.Row="1" Visibility="Collapsed">
+        <StackPanel Name="StackPanelUseGenericRadio" Grid.Row="1" Visibility="Visible">
             <CheckBox Name="CheckBoxUseGenericRadio" IsChecked="False" Content="Use Generic Radio Panel" Margin="10,10,0,0" />
-            <StackPanel Name="StackPanelA10C" Margin="10,5,0,0" Visibility="Collapsed">
-                <RadioButton Name="RadioButtonA10C" GroupName="A10" IsChecked="True">A10-C</RadioButton>
-                <RadioButton Name="RadioButtonA10CII" GroupName="A10">A10-C II</RadioButton>
-            </StackPanel>
         </StackPanel>
-        <StackPanel Grid.Row="2" >
+        <StackPanel Name="StackPanelA10C" Grid.Row="2" Visibility="Visible" Margin="10,5,0,0" >
+            <RadioButton Name="RadioButtonA10C" GroupName="A10" IsChecked="True">A10-C</RadioButton>
+            <RadioButton Name="RadioButtonA10CII" GroupName="A10">A10-C II</RadioButton>
+        </StackPanel>
+        <StackPanel Grid.Row="3" >
             <Label Margin="0,15,0,0">
                 <TextBlock TextWrapping="Wrap">
                     For keyboard emulation only (SwitchPanel PZ55, Multipanel PZ70, TPM) choose "KeyEmulator".
                 </TextBlock>
             </Label>
         </StackPanel>
-        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,0" >
+        <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,0" >
             <Button Name="ButtonOk" Content="Ok" Click="ButtonOk_OnClick" Width="75" Height="25" Margin="0,0,5,0" />
             <Button Name="ButtonCancel" Content="Cancel" Click="ButtonCancel_OnClick" Width="75" Height="25" HorizontalAlignment="Right" />
         </StackPanel>

diff --git a/Source/DCSFlightpanels/Windows/ChooseProfileModuleWindow.xaml.cs b/Source/DCSFlightpanels/Windows/ChooseProfileModuleWindow.xaml.cs
@@ -15,6 +15,7 @@ namespace DCSFlightpanels.Windows
     public partial class ChooseProfileModuleWindow
     {
         private DCSAircraft _dcsAircraft;
+        private bool _isLoaded;
 
         public ChooseProfileModuleWindow()
         {
@@ -23,8 +24,11 @@ public ChooseProfileModuleWindow()
 
         private void ChooseProfileModuleWindow_OnLoaded(object sender, RoutedEventArgs e)
         {
+            if (_isLoaded) return;
+
             PopulateAirframeCombobox();
             DarkMode.SetFrameworkElementDarkMode(this);
+            _isLoaded = true;
         }
 
         private void ButtonCancel_OnClick(object sender, RoutedEventArgs e)
@@ -53,8 +57,7 @@ private void ButtonOk_OnClick(object sender, RoutedEventArgs e)
                 Common.ShowErrorMessageBox( ex);
             }
         }
-
-
+
         private void PopulateAirframeCombobox()
         {
             if (!IsLoaded)
@@ -77,6 +80,14 @@ private void PopulateAirframeCombobox()
             ComboBoxAirframe.ItemsSource = itemsSource;
             ComboBoxAirframe.SelectedIndex = 0;
             ComboBoxAirframe.SelectionChanged += ComboBoxAirframe_OnSelectionChanged;
+
+            if (ComboBoxAirframe.Items.Count <= 0)
+            {
+                return;
+            }
+
+            SetAirframe();
+            StackPanelA10C.Visibility = DCSAircraft.IsA10C(_dcsAircraft) ? Visibility.Visible : Visibility.Collapsed;
         }
 
         private void SetAirframe()