c-l/msfs-popout-panel-manager
1
0
Fork 0
mirror of https://github.com/hawkeye-stan/msfs-popout-panel-manager.git synced 2024-11-22 05:40:11 +00:00
Code Releases Activity

Version 3.3

Browse source
This commit is contained in:
hawkeye 2022-04-18 00:52:43 -04:00
parent a90077b44c
commit ba776ea35d
6 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
FsConnector/SimConnector.cs
View file

@ -139,6 +139,7 @@ namespace MSFSPopoutPanelManager.FsConnector
{ {
OnDisconnected?.Invoke(this, null); OnDisconnected?.Invoke(this, null);
StopAndReconnect();
// Try to reconnect again // Try to reconnect again
_timer.Enabled = true; _timer.Enabled = true;
} }

1
Provider/SimConnectManager.cs
View file

@ -130,6 +130,7 @@ namespace MSFSPopoutPanelManager.Provider
if (_lastSystemEvent == SimConnectSystemEvent.SIMSTART && systemEvent == SimConnectSystemEvent.VIEW && dwData == 4) if (_lastSystemEvent == SimConnectSystemEvent.SIMSTART && systemEvent == SimConnectSystemEvent.VIEW && dwData == 4)
{ {
_isSimActive = true; _isSimActive = true;
_lastSystemEvent = SimConnectSystemEvent.NONE;
OnFlightStarted?.Invoke(this, null); OnFlightStarted?.Invoke(this, null);
return; return;
} }

2
WpfApp/ApplicationWindow.xaml
View file

@ -65,7 +65,7 @@
<MenuItem Name="menuItem_DownloadLatestRelease" Header="Download Latest Release" Command="{Binding Path=DownloadLatestReleaseCommand}"/> <MenuItem Name="menuItem_DownloadLatestRelease" Header="Download Latest Release" Command="{Binding Path=DownloadLatestReleaseCommand}"/>
</MenuItem> </MenuItem>
</Menu> </Menu>
<Image Width="20" ToolTip="{Binding Path=DataStore.CurrentMsfsPlaneTitle}"> <Image Width="20">
<Image.Style> <Image.Style>
<Style TargetType="Image"> <Style TargetType="Image">
<Style.Triggers> <Style.Triggers>

27
WpfApp/PreferencesDialog.xaml
View file

@ -9,7 +9,7 @@
xmlns:local="clr-namespace:MSFSPopoutPanelManager.WpfApp" xmlns:local="clr-namespace:MSFSPopoutPanelManager.WpfApp"
mc:Ignorable="d" mc:Ignorable="d"
Title="Preferences" Title="Preferences"
Height="450" Height="580"
Width="800" Width="800"
ResizeMode="NoResize" ResizeMode="NoResize"
Background="Transparent"> Background="Transparent">
@ -32,7 +32,7 @@
</TreeView.ItemContainerStyle> </TreeView.ItemContainerStyle>
<TreeViewItem Header="Application Settings" Selected="TreeViewItem_Selected" Margin="0,15,0,10" IsSelected="True"></TreeViewItem> <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="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> </TreeView>
<WrapPanel Orientation="Vertical" DockPanel.Dock="Right" Margin="20,5,0,0" > <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}"> <WrapPanel Orientation="Vertical" Margin="0,10,0,0" Width="500" Visibility="{Binding Path=ApplicationSettingsVisibility, Mode=TwoWay}">
@ -74,22 +74,37 @@
</WrapPanel> </WrapPanel>
<WrapPanel Orientation="Vertical" Margin="0,10,0,0" Visibility="{Binding Path=AutoPopOutSettingsVisibility, Mode=TwoWay}"> <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> <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" > <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> <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> <Label Margin="10,0,0,0">Ready to Fly</Label>
</WrapPanel> </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" > <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> <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> <Label Margin="10,0,0,0" >Initial Cockpit View</Label>
</WrapPanel> </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" > <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> <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> <Label Margin="10,0,0,0">Instrumentation Power On</Label>
</WrapPanel> </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 Orientation="Horizontal"></WrapPanel>
</WrapPanel> </WrapPanel>
<WrapPanel Orientation="Vertical" Visibility="Visible"> <WrapPanel Orientation="Vertical" Visibility="Visible">

7
WpfApp/PreferencesDialog.xaml.cs
View file

@ -1,13 +1,8 @@
using MahApps.Metro.Controls; using MahApps.Metro.Controls;
using MSFSPopoutPanelManager.Model; using MSFSPopoutPanelManager.Model;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel; using System.ComponentModel;
using System.Linq;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Input;
namespace MSFSPopoutPanelManager.WpfApp namespace MSFSPopoutPanelManager.WpfApp
{ {
@ -54,7 +49,7 @@ namespace MSFSPopoutPanelManager.WpfApp
{ {
PopOutSettingsVisibility = Visibility.Visible; 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; AutoPopOutSettingsVisibility = Visibility.Visible;
} }

1
WpfApp/ViewModel/PanelSelectionViewModel.cs
View file

@ -40,7 +40,6 @@ namespace MSFSPopoutPanelManager.WpfApp.ViewModel
public DelegateCommand SaveAutoPanningCameraCommand => new DelegateCommand(OnSaveAutoPanningCamera, CanExecute); public DelegateCommand SaveAutoPanningCameraCommand => new DelegateCommand(OnSaveAutoPanningCamera, CanExecute);
public DelegateCommand EditPanelCoorOverlayCommand => new DelegateCommand(OnEditPanelCoorOverlay, CanExecute); public DelegateCommand EditPanelCoorOverlayCommand => new DelegateCommand(OnEditPanelCoorOverlay, CanExecute);
public PanelSelectionViewModel(DataStore dataStore, UserProfileManager userProfileManager, PanelPopOutManager panelPopoutManager, SimConnectManager simConnectManager) public PanelSelectionViewModel(DataStore dataStore, UserProfileManager userProfileManager, PanelPopOutManager panelPopoutManager, SimConnectManager simConnectManager)
{ {
DataStore = dataStore; DataStore = dataStore;