From ba776ea35d522390a0ef67b6a440575aeafec6ab Mon Sep 17 00:00:00 2001
From: hawkeye <hawkeye@outlook.com>
Date: Mon, 18 Apr 2022 00:52:43 -0400
Subject: [PATCH] Version 3.3

---
 FsConnector/SimConnector.cs                 |  1 +
 Provider/SimConnectManager.cs               |  1 +
 WpfApp/ApplicationWindow.xaml               |  2 +-
 WpfApp/PreferencesDialog.xaml               | 27 ++++++++++++++++-----
 WpfApp/PreferencesDialog.xaml.cs            |  7 +-----
 WpfApp/ViewModel/PanelSelectionViewModel.cs |  1 -
 6 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/FsConnector/SimConnector.cs b/FsConnector/SimConnector.cs
index 02593b2..ec63d47 100644
--- a/FsConnector/SimConnector.cs
+++ b/FsConnector/SimConnector.cs
@@ -139,6 +139,7 @@ namespace MSFSPopoutPanelManager.FsConnector
         {
             OnDisconnected?.Invoke(this, null);
 
+            StopAndReconnect();
             // Try to reconnect again
             _timer.Enabled = true;
         }
diff --git a/Provider/SimConnectManager.cs b/Provider/SimConnectManager.cs
index 74827e4..e9e6b37 100644
--- a/Provider/SimConnectManager.cs
+++ b/Provider/SimConnectManager.cs
@@ -130,6 +130,7 @@ namespace MSFSPopoutPanelManager.Provider
             if (_lastSystemEvent == SimConnectSystemEvent.SIMSTART && systemEvent == SimConnectSystemEvent.VIEW && dwData == 4)
             {
                 _isSimActive = true;
+                _lastSystemEvent = SimConnectSystemEvent.NONE;
                 OnFlightStarted?.Invoke(this, null);
                 return;
             }
diff --git a/WpfApp/ApplicationWindow.xaml b/WpfApp/ApplicationWindow.xaml
index 1bd391e..34dbd62 100644
--- a/WpfApp/ApplicationWindow.xaml
+++ b/WpfApp/ApplicationWindow.xaml
@@ -65,7 +65,7 @@
                         <MenuItem Name="menuItem_DownloadLatestRelease" Header="Download Latest Release" Command="{Binding Path=DownloadLatestReleaseCommand}"/>
                     </MenuItem>
                 </Menu>
-                <Image Width="20" ToolTip="{Binding Path=DataStore.CurrentMsfsPlaneTitle}">
+                <Image Width="20">
                     <Image.Style>
                         <Style TargetType="Image">
                             <Style.Triggers>
diff --git a/WpfApp/PreferencesDialog.xaml b/WpfApp/PreferencesDialog.xaml
index fbf813f..261dcfb 100644
--- a/WpfApp/PreferencesDialog.xaml
+++ b/WpfApp/PreferencesDialog.xaml
@@ -9,7 +9,7 @@
         xmlns:local="clr-namespace:MSFSPopoutPanelManager.WpfApp"
         mc:Ignorable="d"
         Title="Preferences" 
-        Height="450" 
+        Height="580" 
         Width="800"
         ResizeMode="NoResize" 
         Background="Transparent">
@@ -32,7 +32,7 @@
                 </TreeView.ItemContainerStyle>
                 <TreeViewItem Header="Application Settings" Selected="TreeViewItem_Selected" Margin="0,15,0,10" IsSelected="True"></TreeViewItem>
                 <TreeViewItem Header="Pop Out Settings" Selected="TreeViewItem_Selected" Margin="0,0,0,10"></TreeViewItem>
-                <TreeViewItem Header="Auto Pop Out Settings" Selected="TreeViewItem_Selected" Margin="0,0,0,10"></TreeViewItem>
+                <TreeViewItem Header="Auto Pop Out Panel Settings" Selected="TreeViewItem_Selected" Margin="0,0,0,10"></TreeViewItem>
             </TreeView>
             <WrapPanel Orientation="Vertical" DockPanel.Dock="Right" Margin="20,5,0,0" >
                 <WrapPanel Orientation="Vertical" Margin="0,10,0,0" Width="500" Visibility="{Binding Path=ApplicationSettingsVisibility, Mode=TwoWay}">
@@ -74,22 +74,37 @@
                 </WrapPanel>
                 <WrapPanel Orientation="Vertical" Margin="0,10,0,0" Visibility="{Binding Path=AutoPopOutSettingsVisibility, Mode=TwoWay}">
                     <CheckBox IsChecked="{Binding Path=AppSetting.AutoPopOutPanels, Mode=TwoWay}" Content="Auto Pop Out Panels"></CheckBox>
-                    <TextBlock Margin="24,10,0,10" Width="Auto" TextWrapping="Wrap" >Wait delay for each step during auto pop out process (in seconds)</TextBlock>
+                    <TextBlock Margin="24,5,0,0" Width="Auto" TextWrapping="Wrap" FontSize="14">
+                        Automatic pop out panels when an aircraft livery is binded to a profile. The following steps will be performed.
+                    </TextBlock>
+                    <TextBlock Margin="24,5,5,0" Width="Auto" TextWrapping="Wrap" FontSize="14">
+                        1. Detect flight start signal using SimConnect.
+                    </TextBlock>
+                    <TextBlock Margin="24,5,5,0" Width="Auto" TextWrapping="Wrap" FontSize="14">
+                        2. Wait for 'Ready to Fly' button to appear and simulate a left mouse click.
+                    </TextBlock>
+                    <TextBlock Margin="24,5,5,0" Width="Auto" TextWrapping="Wrap" FontSize="14">
+                        3. Wait for cockpit view to appear before executing pop out panel sequence.
+                    </TextBlock>
+                    <TextBlock Margin="24,5,5,0" Width="Auto" TextWrapping="Wrap" FontSize="14">
+                        4. If configured for a profile on cold start, wait for instrumentation power on before executing pop out panel sequence.
+                    </TextBlock>
+                    <TextBlock Margin="24,20,0,10" Width="Auto" TextWrapping="Wrap" >Wait delay for each step during auto pop out process (in seconds)</TextBlock>
                     <WrapPanel Orientation="Horizontal" Margin="24,0,0,0" >
                         <mah:NumericUpDown Width="80" Minimum="1" Maximum="30" FontSize="16" Height="32" Value="{Binding Path=AppSetting.AutoPopOutPanelsWaitDelay.ReadyToFlyButton, Mode=TwoWay}"></mah:NumericUpDown>
                         <Label Margin="10,0,0,0">Ready to Fly</Label>
                     </WrapPanel>
-                    <TextBlock Margin="119,0,10,10" Width="Auto" TextWrapping="Wrap" FontSize="14">Amount of time to wait for 'Ready to Fly' button to appear before simulating mouse click.<LineBreak/>(Default: 6 seconds)</TextBlock>
+                    <TextBlock Margin="119,0,10,10" Width="Auto" TextWrapping="Wrap" FontSize="14">Amount of time to wait for 'Ready to Fly' button to appear.<LineBreak/>(Default: 6 seconds)</TextBlock>
                     <WrapPanel Orientation="Horizontal" Margin="24,0,0,0" >
                         <mah:NumericUpDown Width="80" Minimum="1" Maximum="30" FontSize="16" Height="32" Value="{Binding Path=AppSetting.AutoPopOutPanelsWaitDelay.InitialCockpitView, Mode=TwoWay}"></mah:NumericUpDown>
                         <Label Margin="10,0,0,0" >Initial Cockpit View</Label>
                     </WrapPanel>
-                    <TextBlock Margin="119,0,10,10" Width="Auto" TextWrapping="Wrap" FontSize="14">Amount of time to wait for the cockpit to appear before beginning pop out panel process.<LineBreak/>(Default: 2 seconds)</TextBlock>
+                    <TextBlock Margin="119,0,10,10" Width="Auto" TextWrapping="Wrap" FontSize="14">Amount of time to wait for the cockpit to appear.<LineBreak/>(Default: 2 seconds)</TextBlock>
                     <WrapPanel Orientation="Horizontal" Margin="24,0,0,00" >
                         <mah:NumericUpDown Width="80" Minimum="1" Maximum="30" FontSize="16" Height="32" Value="{Binding Path=AppSetting.AutoPopOutPanelsWaitDelay.InstrumentationPowerOn, Mode=TwoWay}"></mah:NumericUpDown>
                         <Label Margin="10,0,0,0">Instrumentation Power On</Label>
                     </WrapPanel>
-                    <TextBlock Margin="119,0,10,10" Width="Auto" TextWrapping="Wrap" FontSize="14">Amount of time to wait for cold start instrumentation power on to complete before beginning pop out panel process.<LineBreak/>(Default: 2 seconds)</TextBlock>
+                    <TextBlock Margin="119,0,10,10" Width="Auto" TextWrapping="Wrap" FontSize="14">Amount of time to wait for cold start instrumentation power on to complete.<LineBreak/>(Default: 2 seconds)</TextBlock>
                     <WrapPanel Orientation="Horizontal"></WrapPanel>
                 </WrapPanel>
                 <WrapPanel Orientation="Vertical" Visibility="Visible">
diff --git a/WpfApp/PreferencesDialog.xaml.cs b/WpfApp/PreferencesDialog.xaml.cs
index 39a81e0..39478b1 100644
--- a/WpfApp/PreferencesDialog.xaml.cs
+++ b/WpfApp/PreferencesDialog.xaml.cs
@@ -1,13 +1,8 @@
 using MahApps.Metro.Controls;
 using MSFSPopoutPanelManager.Model;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
 
 namespace MSFSPopoutPanelManager.WpfApp
 {
@@ -54,7 +49,7 @@ namespace MSFSPopoutPanelManager.WpfApp
             {
                 PopOutSettingsVisibility = Visibility.Visible;
             }
-            else if (treeViewItem.Header.ToString() == "Auto Pop Out Settings")
+            else if (treeViewItem.Header.ToString() == "Auto Pop Out Panel Settings")
             {
                 AutoPopOutSettingsVisibility = Visibility.Visible;
             }
diff --git a/WpfApp/ViewModel/PanelSelectionViewModel.cs b/WpfApp/ViewModel/PanelSelectionViewModel.cs
index 5155d7d..9c3ffd0 100644
--- a/WpfApp/ViewModel/PanelSelectionViewModel.cs
+++ b/WpfApp/ViewModel/PanelSelectionViewModel.cs
@@ -40,7 +40,6 @@ namespace MSFSPopoutPanelManager.WpfApp.ViewModel
         public DelegateCommand SaveAutoPanningCameraCommand => new DelegateCommand(OnSaveAutoPanningCamera, CanExecute);
         public DelegateCommand EditPanelCoorOverlayCommand => new DelegateCommand(OnEditPanelCoorOverlay, CanExecute);
 
-
         public PanelSelectionViewModel(DataStore dataStore, UserProfileManager userProfileManager, PanelPopOutManager panelPopoutManager, SimConnectManager simConnectManager)
         {
             DataStore = dataStore;