From 1b60de0612a5e7fce24e5ebf9e7ae31762870d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20St=C3=B6=C3=9Fl?= Date: Sat, 9 Jan 2021 13:28:38 +0100 Subject: [PATCH 1/3] added PW Engine RPM Style option to for RPM 1 Gauge with max 100 rpm --- .../LightningGauges/LightningGauges.csproj | 1 + .../Renderers/F16/Tachometer.cs | 60 +- .../LightningGauges/images/rpm100.bmp | Bin 0 -> 262282 bytes .../MFDExtractor/MFDExtractor.csproj | 1 + .../Properties/Settings.Designer.cs | 277 ++- .../MFDExtractor/Properties/Settings.settings | 3 + .../TachometerRendererFactory.cs | 29 + .../MFDExtractor/RendererFactory.cs | 10 +- .../MFDExtractor/UI/frmOptions.Designer.cs | 1595 +++++++++-------- .../MFDExtractor/UI/frmOptions.cs | 7 +- src/MFDExtractor/MFDExtractor/app.config | 160 +- 11 files changed, 1275 insertions(+), 868 deletions(-) create mode 100644 src/LightningGauges/LightningGauges/images/rpm100.bmp create mode 100644 src/MFDExtractor/MFDExtractor/RendererFactories/TachometerRendererFactory.cs diff --git a/src/LightningGauges/LightningGauges/LightningGauges.csproj b/src/LightningGauges/LightningGauges/LightningGauges.csproj index b292e3fa..96a8c79d 100644 --- a/src/LightningGauges/LightningGauges/LightningGauges.csproj +++ b/src/LightningGauges/LightningGauges/LightningGauges.csproj @@ -221,6 +221,7 @@ Designer + Always diff --git a/src/LightningGauges/LightningGauges/Renderers/F16/Tachometer.cs b/src/LightningGauges/LightningGauges/Renderers/F16/Tachometer.cs index 1c7825b7..fc4295ab 100644 --- a/src/LightningGauges/LightningGauges/Renderers/F16/Tachometer.cs +++ b/src/LightningGauges/LightningGauges/Renderers/F16/Tachometer.cs @@ -16,13 +16,15 @@ public class Tachometer : InstrumentRendererBase, ITachometer { private const string RPM_BACKGROUND_IMAGE_FILENAME = "rpm.bmp"; private const string RPM_BACKGROUND2_IMAGE_FILENAME = "rpm2.bmp"; + private const string RPM_BACKGROUND100_IMAGE_FILENAME = "rpm100.bmp"; private const string RPM_NEEDLE_IMAGE_FILENAME = "arrow_rpm.bmp"; private const string RPM_NEEDLE_MASK_FILENAME = "arrow_rpmmask.bmp"; - private static readonly string IMAGES_FOLDER_NAME = "images"; + private static readonly string IMAGES_FOLDER_NAME = "images"; private static Bitmap _background; + private static Bitmap _backgroundPW; private static Bitmap _background2; private static ImageMaskPair _needle; private static readonly object _imagesLock = new object(); @@ -39,8 +41,10 @@ private static void LoadImageResources() { lock (_imagesLock) { - if (_background == null) _background = (Bitmap) ResourceUtil.LoadBitmapFromEmbeddedResource(IMAGES_FOLDER_NAME + Path.DirectorySeparatorChar + RPM_BACKGROUND_IMAGE_FILENAME); - if (_background2 == null) _background2 = (Bitmap) ResourceUtil.LoadBitmapFromEmbeddedResource(IMAGES_FOLDER_NAME + Path.DirectorySeparatorChar + RPM_BACKGROUND2_IMAGE_FILENAME); + + if (_background == null) _background = (Bitmap)ResourceUtil.LoadBitmapFromEmbeddedResource(IMAGES_FOLDER_NAME + Path.DirectorySeparatorChar + RPM_BACKGROUND_IMAGE_FILENAME); + if (_backgroundPW == null) _backgroundPW = (Bitmap)ResourceUtil.LoadBitmapFromEmbeddedResource(IMAGES_FOLDER_NAME + Path.DirectorySeparatorChar + RPM_BACKGROUND100_IMAGE_FILENAME); + if (_background2 == null) _background2 = (Bitmap)ResourceUtil.LoadBitmapFromEmbeddedResource(IMAGES_FOLDER_NAME + Path.DirectorySeparatorChar + RPM_BACKGROUND2_IMAGE_FILENAME); if (_needle == null) { _needle = ResourceUtil.CreateImageMaskPairFromEmbeddedResources( @@ -69,7 +73,7 @@ public float RPMPercent var pct = value; if (float.IsInfinity(pct) || float.IsNaN(pct)) pct = 0; if (pct < 0) pct = 0; - if (pct > 110) pct = 110; + if (pct > 100) pct = 100; _rpmPercent = pct; } } @@ -78,6 +82,12 @@ public float RPMPercent public class TachometerOptions { public bool IsSecondary { get; set; } + public enum TachometerEngineType + { + PWEngine, + GEEngine + } + public TachometerEngineType EngineType { get; set; } } public override void Render(Graphics destinationGraphics, Rectangle destinationRectangle) @@ -94,7 +104,7 @@ public override void Render(Graphics destinationGraphics, Rectangle destinationR destinationGraphics.ResetTransform(); //clear any existing transforms destinationGraphics.SetClip(destinationRectangle); //set the clipping region on the graphics object to our render rectangle's boundaries destinationGraphics.FillRectangle(Brushes.Black, destinationRectangle); - destinationGraphics.ScaleTransform(destinationRectangle.Width / (float) width, destinationRectangle.Height / (float) height); + destinationGraphics.ScaleTransform(destinationRectangle.Width / (float)width, destinationRectangle.Height / (float)height); //set the initial scale transformation destinationGraphics.TranslateTransform(-39, -39); //save the basic canvas transform and clip settings so we can revert to them later, as needed @@ -109,18 +119,34 @@ public override void Render(Graphics destinationGraphics, Rectangle destinationR } else { - destinationGraphics.DrawImageFast( - _background, new Rectangle(0, 0, _background.Width, _background.Height), new Rectangle(0, 0, _background.Width, _background.Height), GraphicsUnit.Pixel); + if (Options.EngineType == TachometerOptions.TachometerEngineType.GEEngine) + { + destinationGraphics.DrawImageFast( + _background, new Rectangle(0, 0, _background.Width, _background.Height), new Rectangle(0, 0, _background.Width, _background.Height), GraphicsUnit.Pixel); + } + else if (Options.EngineType == TachometerOptions.TachometerEngineType.PWEngine) + { + destinationGraphics.DrawImageFast( + _backgroundPW, new Rectangle(0, 0, _backgroundPW.Width, _backgroundPW.Height), new Rectangle(0, 0, _backgroundPW.Width, _backgroundPW.Height), GraphicsUnit.Pixel); + } + } GraphicsUtil.RestoreGraphicsState(destinationGraphics, ref basicState); //draw the needle GraphicsUtil.RestoreGraphicsState(destinationGraphics, ref basicState); - var angle = GetAngle(InstrumentState.RPMPercent); - + var angle = 0f; + if (Options.EngineType == TachometerOptions.TachometerEngineType.GEEngine) + { + angle= GetAngle(InstrumentState.RPMPercent); + } + else if (Options.EngineType == TachometerOptions.TachometerEngineType.PWEngine) + { + angle = GetAnglePW(InstrumentState.RPMPercent); + } destinationGraphics.TranslateTransform(_background.Width / 2.0f, _background.Width / 2.0f); destinationGraphics.RotateTransform(angle); - destinationGraphics.TranslateTransform(-(float) _background.Width / 2.0f, -(float) _background.Width / 2.0f); + destinationGraphics.TranslateTransform(-(float)_background.Width / 2.0f, -(float)_background.Width / 2.0f); destinationGraphics.DrawImageFast(_needle.MaskedImage, new Point(0, 0)); GraphicsUtil.RestoreGraphicsState(destinationGraphics, ref basicState); @@ -142,5 +168,19 @@ private static float GetAngle(float RPMPercent) } return angle; } + + private static float GetAnglePW(float RPMPercent) + { + float angle = 0; + if (RPMPercent >= 0.0f && RPMPercent <= 60.0f) + { + angle = 1.9f * RPMPercent; //1.7 degrees per of space per 1 percent of readout + } + else if (RPMPercent >= 60.0f) + { + angle = 118.5f + (RPMPercent - 60.0f) * 5.3f; //4.7 degrees of space for 1 percent of readout + } + return angle; + } } } \ No newline at end of file diff --git a/src/LightningGauges/LightningGauges/images/rpm100.bmp b/src/LightningGauges/LightningGauges/images/rpm100.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b002019c4bd09c621837ccb7a58e197832041461 GIT binary patch literal 262282 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 + diff --git a/src/MFDExtractor/MFDExtractor/Properties/Settings.Designer.cs b/src/MFDExtractor/MFDExtractor/Properties/Settings.Designer.cs index 72ed8f61..d48ebd4c 100644 --- a/src/MFDExtractor/MFDExtractor/Properties/Settings.Designer.cs +++ b/src/MFDExtractor/MFDExtractor/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace MFDExtractor.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.1.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -503,6 +503,269 @@ public string CompressionType { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool EnableMfd3Output { + get { + return ((bool)(this["EnableMfd3Output"])); + } + set { + this["EnableMfd3Output"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool EnableMfd4Output { + get { + return ((bool)(this["EnableMfd4Output"])); + } + set { + this["EnableMfd4Output"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool MFD3_StretchToFit { + get { + return ((bool)(this["MFD3_StretchToFit"])); + } + set { + this["MFD3_StretchToFit"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("RotateNoneFlipNone")] + public global::System.Drawing.RotateFlipType MFD3_RotateFlipType { + get { + return ((global::System.Drawing.RotateFlipType)(this["MFD3_RotateFlipType"])); + } + set { + this["MFD3_RotateFlipType"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string MFD3_OutputDisplay { + get { + return ((string)(this["MFD3_OutputDisplay"])); + } + set { + this["MFD3_OutputDisplay"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public int MFD3_OutZOrder { + get { + return ((int)(this["MFD3_OutZOrder"])); + } + set { + this["MFD3_OutZOrder"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public int MFD3_OutULX { + get { + return ((int)(this["MFD3_OutULX"])); + } + set { + this["MFD3_OutULX"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("205")] + public int MFD3_OutULY { + get { + return ((int)(this["MFD3_OutULY"])); + } + set { + this["MFD3_OutULY"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("200")] + public int MFD3_OutLRX { + get { + return ((int)(this["MFD3_OutLRX"])); + } + set { + this["MFD3_OutLRX"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("405")] + public int MFD3_OutLRY { + get { + return ((int)(this["MFD3_OutLRY"])); + } + set { + this["MFD3_OutLRY"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool MFD3_Monochrome { + get { + return ((bool)(this["MFD3_Monochrome"])); + } + set { + this["MFD3_Monochrome"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool MFD3_AlwaysOnTop { + get { + return ((bool)(this["MFD3_AlwaysOnTop"])); + } + set { + this["MFD3_AlwaysOnTop"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool MFD4_StretchToFit { + get { + return ((bool)(this["MFD4_StretchToFit"])); + } + set { + this["MFD4_StretchToFit"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string MFD4_OutputDisplay { + get { + return ((string)(this["MFD4_OutputDisplay"])); + } + set { + this["MFD4_OutputDisplay"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("RotateNoneFlipNone")] + public global::System.Drawing.RotateFlipType MFD4_RotateFlipType { + get { + return ((global::System.Drawing.RotateFlipType)(this["MFD4_RotateFlipType"])); + } + set { + this["MFD4_RotateFlipType"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("205")] + public int MFD4_OutZOrder { + get { + return ((int)(this["MFD4_OutZOrder"])); + } + set { + this["MFD4_OutZOrder"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("205")] + public int MFD4_OutULX { + get { + return ((int)(this["MFD4_OutULX"])); + } + set { + this["MFD4_OutULX"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("205")] + public int MFD4_OutULY { + get { + return ((int)(this["MFD4_OutULY"])); + } + set { + this["MFD4_OutULY"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("405")] + public int MFD4_OutLRX { + get { + return ((int)(this["MFD4_OutLRX"])); + } + set { + this["MFD4_OutLRX"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("405")] + public int MFD4_OutLRY { + get { + return ((int)(this["MFD4_OutLRY"])); + } + set { + this["MFD4_OutLRY"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool MFD4_Monochrome { + get { + return ((bool)(this["MFD4_Monochrome"])); + } + set { + this["MFD4_Monochrome"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool MFD4_AlwaysOnTop { + get { + return ((bool)(this["MFD4_AlwaysOnTop"])); + } + set { + this["MFD4_AlwaysOnTop"] = value; + } + } [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5747,5 +6010,17 @@ public int PollingDelay { this["PollingDelay"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool IsPwEngine { + get { + return ((bool)(this["IsPwEngine"])); + } + set { + this["IsPwEngine"] = value; + } + } } } diff --git a/src/MFDExtractor/MFDExtractor/Properties/Settings.settings b/src/MFDExtractor/MFDExtractor/Properties/Settings.settings index a8085d98..7ece1c3c 100644 --- a/src/MFDExtractor/MFDExtractor/Properties/Settings.settings +++ b/src/MFDExtractor/MFDExtractor/Properties/Settings.settings @@ -1499,5 +1499,8 @@ 5 + + False + \ No newline at end of file diff --git a/src/MFDExtractor/MFDExtractor/RendererFactories/TachometerRendererFactory.cs b/src/MFDExtractor/MFDExtractor/RendererFactories/TachometerRendererFactory.cs new file mode 100644 index 00000000..0c5f0692 --- /dev/null +++ b/src/MFDExtractor/MFDExtractor/RendererFactories/TachometerRendererFactory.cs @@ -0,0 +1,29 @@ +using LightningGauges.Renderers.F16; +using MFDExtractor.Properties; + +namespace MFDExtractor.RendererFactories +{ + internal interface ITachometerRendererFactory + { + ITachometer Create(); + } + + + class TachometerRendererFactory : ITachometerRendererFactory + { + public ITachometer Create() + { + return new Tachometer + { + Options = + { + EngineType = Settings.Default.IsPwEngine + ?Tachometer.TachometerOptions.TachometerEngineType.PWEngine + :Tachometer.TachometerOptions.TachometerEngineType.GEEngine, + IsSecondary=false + } + }; + } + } + +} diff --git a/src/MFDExtractor/MFDExtractor/RendererFactory.cs b/src/MFDExtractor/MFDExtractor/RendererFactory.cs index 0aae3262..16907a99 100644 --- a/src/MFDExtractor/MFDExtractor/RendererFactory.cs +++ b/src/MFDExtractor/MFDExtractor/RendererFactory.cs @@ -25,13 +25,15 @@ internal class RendererFactory : IRendererFactory private readonly IFuelQualityIndicatorRendererFactory _fuelQualityIndicatorRendererFactory; private readonly IISISRendererFactory _isisRendererFactory; private readonly IVVIRendererFactory _vviRendererFactory; + private readonly ITachometerRendererFactory _tachometerRendererFactory; public RendererFactory( IAzimuthIndicatorRendererFactory azimuthIndicatorFactory = null, IRWRRendererFactory rwrRendererFactory=null, IFuelQualityIndicatorRendererFactory fuelQualityIndicatorRendererFactory=null, IAltimeterRendererFactory altimeterRendererFactory=null, IISISRendererFactory isisRendererFactory=null, - IVVIRendererFactory vviRendererFactory=null + IVVIRendererFactory vviRendererFactory=null, + ITachometerRendererFactory tachometerRendererFactory=null ) { _azimuthIndicatorFactory = azimuthIndicatorFactory ?? new AzimuthIndicatorRendererFactory(); @@ -40,6 +42,7 @@ public RendererFactory( _fuelQualityIndicatorRendererFactory = fuelQualityIndicatorRendererFactory ?? new FuelQualityIndicatorRendererFactory(); _isisRendererFactory = isisRendererFactory ?? new ISISRendererFactory(); _vviRendererFactory = vviRendererFactory ?? new VVIRendererFactory(); + _tachometerRendererFactory = tachometerRendererFactory ?? new TachometerRendererFactory(); } public IInstrumentRenderer CreateRenderer(InstrumentType instrumentType) @@ -174,12 +177,13 @@ private IVerticalVelocityIndicator CreateVVIRenderer() private ITachometer CreateRPM2Renderer() { - return new Tachometer {Options = {IsSecondary = true}}; + return new Tachometer { Options = { IsSecondary = true } }; } private ITachometer CreateRPM1Renderer() { - return new Tachometer {Options = {IsSecondary = false}}; + return _tachometerRendererFactory.Create(); + } private ISpeedbrakeIndicator CreateSpeedbrakeRenderer() diff --git a/src/MFDExtractor/MFDExtractor/UI/frmOptions.Designer.cs b/src/MFDExtractor/MFDExtractor/UI/frmOptions.Designer.cs index 8a3837d4..0ff87a88 100644 --- a/src/MFDExtractor/MFDExtractor/UI/frmOptions.Designer.cs +++ b/src/MFDExtractor/MFDExtractor/UI/frmOptions.Designer.cs @@ -196,13 +196,6 @@ private void InitializeComponent() this.lblISISStandardBrightnessButtonPressed = new System.Windows.Forms.Label(); this.tabNetworking = new System.Windows.Forms.TabPage(); this.grpNetworkMode = new System.Windows.Forms.GroupBox(); - this.grpServerOptions = new System.Windows.Forms.GroupBox(); - this.lblCompressionType = new System.Windows.Forms.Label(); - this.cboCompressionType = new System.Windows.Forms.ComboBox(); - this.lblImageFormat = new System.Windows.Forms.Label(); - this.cboImageFormat = new System.Windows.Forms.ComboBox(); - this.lblServerServerPortNum = new System.Windows.Forms.Label(); - this.txtNetworkServerUsePortNum = new System.Windows.Forms.TextBox(); this.gbNetworkingMode = new System.Windows.Forms.GroupBox(); this.rdoServer = new System.Windows.Forms.RadioButton(); this.rdoStandalone = new System.Windows.Forms.RadioButton(); @@ -212,6 +205,13 @@ private void InitializeComponent() this.lblClientServerPortNum = new System.Windows.Forms.Label(); this.txtNetworkClientUseServerPortNum = new System.Windows.Forms.TextBox(); this.lblServerIpAddress = new System.Windows.Forms.Label(); + this.grpServerOptions = new System.Windows.Forms.GroupBox(); + this.lblCompressionType = new System.Windows.Forms.Label(); + this.cboCompressionType = new System.Windows.Forms.ComboBox(); + this.lblImageFormat = new System.Windows.Forms.Label(); + this.cboImageFormat = new System.Windows.Forms.ComboBox(); + this.lblServerServerPortNum = new System.Windows.Forms.Label(); + this.txtNetworkServerUsePortNum = new System.Windows.Forms.TextBox(); this.tabPerformance = new System.Windows.Forms.TabPage(); this.grpPerformanceOptions = new System.Windows.Forms.GroupBox(); this.cmdBMSOptions = new System.Windows.Forms.Button(); @@ -250,6 +250,7 @@ private void InitializeComponent() this.cmdApply = new System.Windows.Forms.Button(); this.globalEventProvider1 = new Common.InputSupport.GlobalEventProvider(); this.globalEventProvider2 = new Common.InputSupport.GlobalEventProvider(); + this.chkRPMPW = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.errControlErrorProvider)).BeginInit(); this.tabAllTabs.SuspendLayout(); this.tabInstruments.SuspendLayout(); @@ -330,9 +331,9 @@ private void InitializeComponent() this.gbISIS.SuspendLayout(); this.tabNetworking.SuspendLayout(); this.grpNetworkMode.SuspendLayout(); - this.grpServerOptions.SuspendLayout(); this.gbNetworkingMode.SuspendLayout(); this.grpClientOptions.SuspendLayout(); + this.grpServerOptions.SuspendLayout(); this.tabPerformance.SuspendLayout(); this.grpPerformanceOptions.SuspendLayout(); this.tabGraphics.SuspendLayout(); @@ -345,10 +346,10 @@ private void InitializeComponent() // // cmdOk // - this.cmdOk.Location = new System.Drawing.Point(5, 964); - this.cmdOk.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdOk.Location = new System.Drawing.Point(2, 501); + this.cmdOk.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdOk.Name = "cmdOk"; - this.cmdOk.Size = new System.Drawing.Size(213, 56); + this.cmdOk.Size = new System.Drawing.Size(106, 29); this.cmdOk.TabIndex = 150; this.cmdOk.Text = "&OK"; this.cmdOk.UseVisualStyleBackColor = true; @@ -357,10 +358,10 @@ private void InitializeComponent() // cmdCancel // this.cmdCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cmdCancel.Location = new System.Drawing.Point(227, 964); - this.cmdCancel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdCancel.Location = new System.Drawing.Point(114, 501); + this.cmdCancel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdCancel.Name = "cmdCancel"; - this.cmdCancel.Size = new System.Drawing.Size(211, 56); + this.cmdCancel.Size = new System.Drawing.Size(106, 29); this.cmdCancel.TabIndex = 151; this.cmdCancel.Text = "&Cancel"; this.cmdCancel.UseVisualStyleBackColor = true; @@ -382,21 +383,21 @@ private void InitializeComponent() this.tabAllTabs.Dock = System.Windows.Forms.DockStyle.Top; this.errControlErrorProvider.SetIconAlignment(this.tabAllTabs, System.Windows.Forms.ErrorIconAlignment.TopRight); this.tabAllTabs.Location = new System.Drawing.Point(0, 0); - this.tabAllTabs.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabAllTabs.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabAllTabs.Multiline = true; this.tabAllTabs.Name = "tabAllTabs"; this.tabAllTabs.SelectedIndex = 0; - this.tabAllTabs.Size = new System.Drawing.Size(1056, 949); + this.tabAllTabs.Size = new System.Drawing.Size(528, 493); this.tabAllTabs.TabIndex = 1; // // tabInstruments // this.tabInstruments.Controls.Add(this.panel1); - this.tabInstruments.Location = new System.Drawing.Point(8, 39); - this.tabInstruments.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabInstruments.Location = new System.Drawing.Point(4, 22); + this.tabInstruments.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabInstruments.Name = "tabInstruments"; - this.tabInstruments.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabInstruments.Size = new System.Drawing.Size(1040, 902); + this.tabInstruments.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabInstruments.Size = new System.Drawing.Size(520, 467); this.tabInstruments.TabIndex = 11; this.tabInstruments.Text = "Instruments"; this.tabInstruments.UseVisualStyleBackColor = true; @@ -405,10 +406,10 @@ private void InitializeComponent() // this.panel1.Controls.Add(this.tabOtherInstros); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(5, 6); - this.panel1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.panel1.Location = new System.Drawing.Point(2, 3); + this.panel1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1030, 890); + this.panel1.Size = new System.Drawing.Size(516, 461); this.panel1.TabIndex = 156; // // tabOtherInstros @@ -425,11 +426,11 @@ private void InitializeComponent() this.tabOtherInstros.Controls.Add(this.tabGearAndBrakes); this.tabOtherInstros.Dock = System.Windows.Forms.DockStyle.Fill; this.tabOtherInstros.Location = new System.Drawing.Point(0, 0); - this.tabOtherInstros.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabOtherInstros.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabOtherInstros.Multiline = true; this.tabOtherInstros.Name = "tabOtherInstros"; this.tabOtherInstros.SelectedIndex = 0; - this.tabOtherInstros.Size = new System.Drawing.Size(1030, 890); + this.tabOtherInstros.Size = new System.Drawing.Size(516, 461); this.tabOtherInstros.TabIndex = 156; // // tabMfdsHud @@ -440,22 +441,21 @@ private void InitializeComponent() this.tabMfdsHud.Controls.Add(this.cmdRecoverLeftMfd); this.tabMfdsHud.Controls.Add(this.cmdRecoverHud); this.tabMfdsHud.Controls.Add(this.chkEnableHud); - this.tabMfdsHud.Location = new System.Drawing.Point(8, 70); - this.tabMfdsHud.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabMfdsHud.Location = new System.Drawing.Point(4, 40); + this.tabMfdsHud.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabMfdsHud.Name = "tabMfdsHud"; - this.tabMfdsHud.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabMfdsHud.Size = new System.Drawing.Size(1014, 812); + this.tabMfdsHud.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabMfdsHud.Size = new System.Drawing.Size(508, 417); this.tabMfdsHud.TabIndex = 17; this.tabMfdsHud.Text = "MFDs & HUD"; this.tabMfdsHud.UseVisualStyleBackColor = true; - // // cmdRecoverRightMfd // - this.cmdRecoverRightMfd.Location = new System.Drawing.Point(308, 60); - this.cmdRecoverRightMfd.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdRecoverRightMfd.Location = new System.Drawing.Point(154, 31); + this.cmdRecoverRightMfd.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdRecoverRightMfd.Name = "cmdRecoverRightMfd"; - this.cmdRecoverRightMfd.Size = new System.Drawing.Size(160, 44); + this.cmdRecoverRightMfd.Size = new System.Drawing.Size(80, 23); this.cmdRecoverRightMfd.TabIndex = 158; this.cmdRecoverRightMfd.Text = "&Recover"; this.cmdRecoverRightMfd.UseVisualStyleBackColor = true; @@ -464,10 +464,10 @@ private void InitializeComponent() // chkEnableRightMFD // this.chkEnableRightMFD.AutoSize = true; - this.chkEnableRightMFD.Location = new System.Drawing.Point(19, 68); - this.chkEnableRightMFD.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkEnableRightMFD.Location = new System.Drawing.Point(10, 35); + this.chkEnableRightMFD.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkEnableRightMFD.Name = "chkEnableRightMFD"; - this.chkEnableRightMFD.Size = new System.Drawing.Size(285, 29); + this.chkEnableRightMFD.Size = new System.Drawing.Size(146, 17); this.chkEnableRightMFD.TabIndex = 155; this.chkEnableRightMFD.Text = "Enable Right MFD output"; this.chkEnableRightMFD.UseVisualStyleBackColor = true; @@ -476,10 +476,10 @@ private void InitializeComponent() // chkEnableLeftMFD // this.chkEnableLeftMFD.AutoSize = true; - this.chkEnableLeftMFD.Location = new System.Drawing.Point(19, 19); - this.chkEnableLeftMFD.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkEnableLeftMFD.Location = new System.Drawing.Point(10, 10); + this.chkEnableLeftMFD.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkEnableLeftMFD.Name = "chkEnableLeftMFD"; - this.chkEnableLeftMFD.Size = new System.Drawing.Size(271, 29); + this.chkEnableLeftMFD.Size = new System.Drawing.Size(139, 17); this.chkEnableLeftMFD.TabIndex = 2; this.chkEnableLeftMFD.Text = "Enable Left MFD output"; this.chkEnableLeftMFD.UseVisualStyleBackColor = true; @@ -487,10 +487,10 @@ private void InitializeComponent() // // cmdRecoverLeftMfd // - this.cmdRecoverLeftMfd.Location = new System.Drawing.Point(308, 11); - this.cmdRecoverLeftMfd.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdRecoverLeftMfd.Location = new System.Drawing.Point(154, 6); + this.cmdRecoverLeftMfd.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdRecoverLeftMfd.Name = "cmdRecoverLeftMfd"; - this.cmdRecoverLeftMfd.Size = new System.Drawing.Size(160, 44); + this.cmdRecoverLeftMfd.Size = new System.Drawing.Size(80, 23); this.cmdRecoverLeftMfd.TabIndex = 9; this.cmdRecoverLeftMfd.Text = "&Recover"; this.cmdRecoverLeftMfd.UseVisualStyleBackColor = true; @@ -498,10 +498,10 @@ private void InitializeComponent() // // cmdRecoverHud // - this.cmdRecoverHud.Location = new System.Drawing.Point(308, 202); - this.cmdRecoverHud.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdRecoverHud.Location = new System.Drawing.Point(154, 105); + this.cmdRecoverHud.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdRecoverHud.Name = "cmdRecoverHud"; - this.cmdRecoverHud.Size = new System.Drawing.Size(160, 44); + this.cmdRecoverHud.Size = new System.Drawing.Size(80, 23); this.cmdRecoverHud.TabIndex = 170; this.cmdRecoverHud.Text = "&Recover"; this.cmdRecoverHud.UseVisualStyleBackColor = true; @@ -510,10 +510,10 @@ private void InitializeComponent() // chkEnableHud // this.chkEnableHud.AutoSize = true; - this.chkEnableHud.Location = new System.Drawing.Point(19, 210); - this.chkEnableHud.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkEnableHud.Location = new System.Drawing.Point(10, 109); + this.chkEnableHud.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkEnableHud.Name = "chkEnableHud"; - this.chkEnableHud.Size = new System.Drawing.Size(228, 29); + this.chkEnableHud.Size = new System.Drawing.Size(119, 17); this.chkEnableHud.TabIndex = 167; this.chkEnableHud.Text = "Enable HUD output"; this.chkEnableHud.UseVisualStyleBackColor = true; @@ -549,11 +549,11 @@ private void InitializeComponent() this.tabFlightInstruments.Controls.Add(this.pbRecoverAOAIndicator); this.tabFlightInstruments.Controls.Add(this.pbRecoverAltimeter); this.tabFlightInstruments.Controls.Add(this.grpAltimeterStyle); - this.tabFlightInstruments.Location = new System.Drawing.Point(8, 70); - this.tabFlightInstruments.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabFlightInstruments.Location = new System.Drawing.Point(4, 40); + this.tabFlightInstruments.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabFlightInstruments.Name = "tabFlightInstruments"; - this.tabFlightInstruments.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabFlightInstruments.Size = new System.Drawing.Size(1019, 817); + this.tabFlightInstruments.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabFlightInstruments.Size = new System.Drawing.Size(507, 419); this.tabFlightInstruments.TabIndex = 8; this.tabFlightInstruments.Text = "Flight & Navigation Instruments"; this.tabFlightInstruments.UseVisualStyleBackColor = true; @@ -561,10 +561,10 @@ private void InitializeComponent() // chkDED // this.chkDED.AutoSize = true; - this.chkDED.Location = new System.Drawing.Point(12, 448); - this.chkDED.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkDED.Location = new System.Drawing.Point(6, 233); + this.chkDED.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkDED.Name = "chkDED"; - this.chkDED.Size = new System.Drawing.Size(286, 29); + this.chkDED.Size = new System.Drawing.Size(145, 17); this.chkDED.TabIndex = 72; this.chkDED.Text = "Data Entry Display (DED)"; this.chkDED.UseVisualStyleBackColor = true; @@ -576,12 +576,12 @@ private void InitializeComponent() this.pbRecoverDED.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverDED.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverDED.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverDED.Location = new System.Drawing.Point(533, 448); - this.pbRecoverDED.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverDED.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverDED.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverDED.Location = new System.Drawing.Point(266, 233); + this.pbRecoverDED.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverDED.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverDED.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverDED.Name = "pbRecoverDED"; - this.pbRecoverDED.Size = new System.Drawing.Size(32, 31); + this.pbRecoverDED.Size = new System.Drawing.Size(16, 16); this.pbRecoverDED.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverDED.TabIndex = 73; this.pbRecoverDED.TabStop = false; @@ -590,10 +590,10 @@ private void InitializeComponent() // chkEHSI // this.chkEHSI.AutoSize = true; - this.chkEHSI.Location = new System.Drawing.Point(12, 491); - this.chkEHSI.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkEHSI.Location = new System.Drawing.Point(6, 255); + this.chkEHSI.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkEHSI.Name = "chkEHSI"; - this.chkEHSI.Size = new System.Drawing.Size(488, 29); + this.chkEHSI.Size = new System.Drawing.Size(245, 17); this.chkEHSI.TabIndex = 19; this.chkEHSI.Text = "Electronic Horizontal Situation Indicator (EHSI)"; this.chkEHSI.UseVisualStyleBackColor = true; @@ -602,10 +602,10 @@ private void InitializeComponent() // chkAccelerometer // this.chkAccelerometer.AutoSize = true; - this.chkAccelerometer.Location = new System.Drawing.Point(12, 11); - this.chkAccelerometer.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkAccelerometer.Location = new System.Drawing.Point(6, 6); + this.chkAccelerometer.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkAccelerometer.Name = "chkAccelerometer"; - this.chkAccelerometer.Size = new System.Drawing.Size(279, 29); + this.chkAccelerometer.Size = new System.Drawing.Size(140, 17); this.chkAccelerometer.TabIndex = 0; this.chkAccelerometer.Text = "Accelerometer (G-meter)"; this.chkAccelerometer.UseVisualStyleBackColor = true; @@ -617,12 +617,12 @@ private void InitializeComponent() this.pbRecoverEHSI.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverEHSI.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverEHSI.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverEHSI.Location = new System.Drawing.Point(533, 491); - this.pbRecoverEHSI.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverEHSI.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverEHSI.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverEHSI.Location = new System.Drawing.Point(266, 255); + this.pbRecoverEHSI.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverEHSI.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverEHSI.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverEHSI.Name = "pbRecoverEHSI"; - this.pbRecoverEHSI.Size = new System.Drawing.Size(32, 31); + this.pbRecoverEHSI.Size = new System.Drawing.Size(16, 16); this.pbRecoverEHSI.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverEHSI.TabIndex = 86; this.pbRecoverEHSI.TabStop = false; @@ -634,12 +634,12 @@ private void InitializeComponent() this.pbRecoverASI.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverASI.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverASI.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverASI.Location = new System.Drawing.Point(533, 60); - this.pbRecoverASI.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverASI.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverASI.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverASI.Location = new System.Drawing.Point(266, 31); + this.pbRecoverASI.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverASI.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverASI.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverASI.Name = "pbRecoverASI"; - this.pbRecoverASI.Size = new System.Drawing.Size(32, 31); + this.pbRecoverASI.Size = new System.Drawing.Size(16, 16); this.pbRecoverASI.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverASI.TabIndex = 67; this.pbRecoverASI.TabStop = false; @@ -649,11 +649,11 @@ private void InitializeComponent() // this.grpVVIOptions.Controls.Add(this.rdoVVIStyleNeedle); this.grpVVIOptions.Controls.Add(this.rdoVVIStyleTape); - this.grpVVIOptions.Location = new System.Drawing.Point(59, 716); - this.grpVVIOptions.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.grpVVIOptions.Location = new System.Drawing.Point(30, 372); + this.grpVVIOptions.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.grpVVIOptions.Name = "grpVVIOptions"; - this.grpVVIOptions.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.grpVVIOptions.Size = new System.Drawing.Size(373, 71); + this.grpVVIOptions.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.grpVVIOptions.Size = new System.Drawing.Size(186, 37); this.grpVVIOptions.TabIndex = 44; this.grpVVIOptions.TabStop = false; this.grpVVIOptions.Text = "Style"; @@ -661,10 +661,10 @@ private void InitializeComponent() // rdoVVIStyleNeedle // this.rdoVVIStyleNeedle.AutoSize = true; - this.rdoVVIStyleNeedle.Location = new System.Drawing.Point(128, 29); - this.rdoVVIStyleNeedle.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoVVIStyleNeedle.Location = new System.Drawing.Point(64, 15); + this.rdoVVIStyleNeedle.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoVVIStyleNeedle.Name = "rdoVVIStyleNeedle"; - this.rdoVVIStyleNeedle.Size = new System.Drawing.Size(111, 29); + this.rdoVVIStyleNeedle.Size = new System.Drawing.Size(59, 17); this.rdoVVIStyleNeedle.TabIndex = 1; this.rdoVVIStyleNeedle.TabStop = true; this.rdoVVIStyleNeedle.Text = "Needle"; @@ -674,10 +674,10 @@ private void InitializeComponent() // rdoVVIStyleTape // this.rdoVVIStyleTape.AutoSize = true; - this.rdoVVIStyleTape.Location = new System.Drawing.Point(21, 29); - this.rdoVVIStyleTape.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoVVIStyleTape.Location = new System.Drawing.Point(10, 15); + this.rdoVVIStyleTape.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoVVIStyleTape.Name = "rdoVVIStyleTape"; - this.rdoVVIStyleTape.Size = new System.Drawing.Size(92, 29); + this.rdoVVIStyleTape.Size = new System.Drawing.Size(50, 17); this.rdoVVIStyleTape.TabIndex = 0; this.rdoVVIStyleTape.TabStop = true; this.rdoVVIStyleTape.Text = "Tape"; @@ -687,10 +687,10 @@ private void InitializeComponent() // chkStandbyADI // this.chkStandbyADI.AutoSize = true; - this.chkStandbyADI.Location = new System.Drawing.Point(12, 624); - this.chkStandbyADI.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkStandbyADI.Location = new System.Drawing.Point(6, 324); + this.chkStandbyADI.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkStandbyADI.Name = "chkStandbyADI"; - this.chkStandbyADI.Size = new System.Drawing.Size(290, 29); + this.chkStandbyADI.Size = new System.Drawing.Size(148, 17); this.chkStandbyADI.TabIndex = 91; this.chkStandbyADI.Text = "Standby Attitude Indicator"; this.chkStandbyADI.UseVisualStyleBackColor = true; @@ -699,10 +699,10 @@ private void InitializeComponent() // chkHSI // this.chkHSI.AutoSize = true; - this.chkHSI.Location = new System.Drawing.Point(12, 536); - this.chkHSI.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkHSI.Location = new System.Drawing.Point(6, 279); + this.chkHSI.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkHSI.Name = "chkHSI"; - this.chkHSI.Size = new System.Drawing.Size(373, 29); + this.chkHSI.Size = new System.Drawing.Size(188, 17); this.chkHSI.TabIndex = 33; this.chkHSI.Text = "Horizontal Situation Indicator (HSI)"; this.chkHSI.UseVisualStyleBackColor = true; @@ -714,12 +714,12 @@ private void InitializeComponent() this.pbRecoverCompass.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverCompass.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverCompass.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverCompass.Location = new System.Drawing.Point(533, 404); - this.pbRecoverCompass.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverCompass.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverCompass.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverCompass.Location = new System.Drawing.Point(266, 210); + this.pbRecoverCompass.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverCompass.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverCompass.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverCompass.Name = "pbRecoverCompass"; - this.pbRecoverCompass.Size = new System.Drawing.Size(32, 31); + this.pbRecoverCompass.Size = new System.Drawing.Size(16, 16); this.pbRecoverCompass.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverCompass.TabIndex = 90; this.pbRecoverCompass.TabStop = false; @@ -731,12 +731,12 @@ private void InitializeComponent() this.pbRecoverBackupADI.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverBackupADI.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverBackupADI.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverBackupADI.Location = new System.Drawing.Point(533, 624); - this.pbRecoverBackupADI.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverBackupADI.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverBackupADI.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverBackupADI.Location = new System.Drawing.Point(266, 324); + this.pbRecoverBackupADI.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverBackupADI.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverBackupADI.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverBackupADI.Name = "pbRecoverBackupADI"; - this.pbRecoverBackupADI.Size = new System.Drawing.Size(32, 31); + this.pbRecoverBackupADI.Size = new System.Drawing.Size(16, 16); this.pbRecoverBackupADI.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverBackupADI.TabIndex = 92; this.pbRecoverBackupADI.TabStop = false; @@ -748,12 +748,12 @@ private void InitializeComponent() this.pbRecoverHSI.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverHSI.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverHSI.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverHSI.Location = new System.Drawing.Point(533, 536); - this.pbRecoverHSI.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverHSI.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverHSI.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverHSI.Location = new System.Drawing.Point(266, 279); + this.pbRecoverHSI.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverHSI.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverHSI.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverHSI.Name = "pbRecoverHSI"; - this.pbRecoverHSI.Size = new System.Drawing.Size(32, 31); + this.pbRecoverHSI.Size = new System.Drawing.Size(16, 16); this.pbRecoverHSI.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverHSI.TabIndex = 51; this.pbRecoverHSI.TabStop = false; @@ -765,12 +765,12 @@ private void InitializeComponent() this.pbRecoverVVI.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverVVI.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverVVI.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverVVI.Location = new System.Drawing.Point(533, 669); - this.pbRecoverVVI.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverVVI.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverVVI.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverVVI.Location = new System.Drawing.Point(266, 348); + this.pbRecoverVVI.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverVVI.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverVVI.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverVVI.Name = "pbRecoverVVI"; - this.pbRecoverVVI.Size = new System.Drawing.Size(32, 31); + this.pbRecoverVVI.Size = new System.Drawing.Size(16, 16); this.pbRecoverVVI.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverVVI.TabIndex = 50; this.pbRecoverVVI.TabStop = false; @@ -779,10 +779,10 @@ private void InitializeComponent() // chkCabinPress // this.chkCabinPress.AutoSize = true; - this.chkCabinPress.Location = new System.Drawing.Point(12, 359); - this.chkCabinPress.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkCabinPress.Location = new System.Drawing.Point(6, 187); + this.chkCabinPress.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkCabinPress.Name = "chkCabinPress"; - this.chkCabinPress.Size = new System.Drawing.Size(282, 29); + this.chkCabinPress.Size = new System.Drawing.Size(140, 17); this.chkCabinPress.TabIndex = 62; this.chkCabinPress.Text = "Cabin Pressure Altimeter"; this.chkCabinPress.UseVisualStyleBackColor = true; @@ -794,12 +794,12 @@ private void InitializeComponent() this.pbRecoverCabinPress.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverCabinPress.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverCabinPress.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverCabinPress.Location = new System.Drawing.Point(533, 359); - this.pbRecoverCabinPress.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverCabinPress.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverCabinPress.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverCabinPress.Location = new System.Drawing.Point(266, 187); + this.pbRecoverCabinPress.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverCabinPress.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverCabinPress.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverCabinPress.Name = "pbRecoverCabinPress"; - this.pbRecoverCabinPress.Size = new System.Drawing.Size(32, 31); + this.pbRecoverCabinPress.Size = new System.Drawing.Size(16, 16); this.pbRecoverCabinPress.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverCabinPress.TabIndex = 63; this.pbRecoverCabinPress.TabStop = false; @@ -808,10 +808,10 @@ private void InitializeComponent() // chkAirspeedIndicator // this.chkAirspeedIndicator.AutoSize = true; - this.chkAirspeedIndicator.Location = new System.Drawing.Point(12, 60); - this.chkAirspeedIndicator.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkAirspeedIndicator.Location = new System.Drawing.Point(6, 31); + this.chkAirspeedIndicator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkAirspeedIndicator.Name = "chkAirspeedIndicator"; - this.chkAirspeedIndicator.Size = new System.Drawing.Size(337, 29); + this.chkAirspeedIndicator.Size = new System.Drawing.Size(173, 17); this.chkAirspeedIndicator.TabIndex = 1; this.chkAirspeedIndicator.Text = "Airspeed Indicator/Mach Meter"; this.chkAirspeedIndicator.UseVisualStyleBackColor = true; @@ -823,12 +823,12 @@ private void InitializeComponent() this.pbRecoverAccelerometer.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverAccelerometer.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverAccelerometer.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverAccelerometer.Location = new System.Drawing.Point(533, 11); - this.pbRecoverAccelerometer.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverAccelerometer.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverAccelerometer.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverAccelerometer.Location = new System.Drawing.Point(266, 6); + this.pbRecoverAccelerometer.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverAccelerometer.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverAccelerometer.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverAccelerometer.Name = "pbRecoverAccelerometer"; - this.pbRecoverAccelerometer.Size = new System.Drawing.Size(32, 31); + this.pbRecoverAccelerometer.Size = new System.Drawing.Size(16, 16); this.pbRecoverAccelerometer.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverAccelerometer.TabIndex = 88; this.pbRecoverAccelerometer.TabStop = false; @@ -837,10 +837,10 @@ private void InitializeComponent() // chkVVI // this.chkVVI.AutoSize = true; - this.chkVVI.Location = new System.Drawing.Point(12, 669); - this.chkVVI.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkVVI.Location = new System.Drawing.Point(6, 348); + this.chkVVI.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkVVI.Name = "chkVVI"; - this.chkVVI.Size = new System.Drawing.Size(339, 29); + this.chkVVI.Size = new System.Drawing.Size(171, 17); this.chkVVI.TabIndex = 43; this.chkVVI.Text = "Vertical Velocity Indicator (VVI)"; this.chkVVI.UseVisualStyleBackColor = true; @@ -849,10 +849,10 @@ private void InitializeComponent() // chkAltimeter // this.chkAltimeter.AutoSize = true; - this.chkAltimeter.Location = new System.Drawing.Point(12, 104); - this.chkAltimeter.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkAltimeter.Location = new System.Drawing.Point(6, 54); + this.chkAltimeter.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkAltimeter.Name = "chkAltimeter"; - this.chkAltimeter.Size = new System.Drawing.Size(128, 29); + this.chkAltimeter.Size = new System.Drawing.Size(66, 17); this.chkAltimeter.TabIndex = 2; this.chkAltimeter.Text = "Altimeter"; this.chkAltimeter.UseVisualStyleBackColor = true; @@ -861,10 +861,10 @@ private void InitializeComponent() // chkISIS // this.chkISIS.AutoSize = true; - this.chkISIS.Location = new System.Drawing.Point(12, 580); - this.chkISIS.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkISIS.Location = new System.Drawing.Point(6, 302); + this.chkISIS.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkISIS.Name = "chkISIS"; - this.chkISIS.Size = new System.Drawing.Size(466, 29); + this.chkISIS.Size = new System.Drawing.Size(234, 17); this.chkISIS.TabIndex = 36; this.chkISIS.Text = "Integrated Standby Instrument System (ISIS)"; this.chkISIS.UseVisualStyleBackColor = true; @@ -873,10 +873,10 @@ private void InitializeComponent() // chkCompass // this.chkCompass.AutoSize = true; - this.chkCompass.Location = new System.Drawing.Point(12, 404); - this.chkCompass.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkCompass.Location = new System.Drawing.Point(6, 210); + this.chkCompass.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkCompass.Name = "chkCompass"; - this.chkCompass.Size = new System.Drawing.Size(134, 29); + this.chkCompass.Size = new System.Drawing.Size(69, 17); this.chkCompass.TabIndex = 89; this.chkCompass.Text = "Compass"; this.chkCompass.UseVisualStyleBackColor = true; @@ -888,12 +888,12 @@ private void InitializeComponent() this.pbRecoverISIS.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverISIS.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverISIS.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverISIS.Location = new System.Drawing.Point(533, 580); - this.pbRecoverISIS.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverISIS.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverISIS.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverISIS.Location = new System.Drawing.Point(266, 302); + this.pbRecoverISIS.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverISIS.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverISIS.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverISIS.Name = "pbRecoverISIS"; - this.pbRecoverISIS.Size = new System.Drawing.Size(32, 31); + this.pbRecoverISIS.Size = new System.Drawing.Size(16, 16); this.pbRecoverISIS.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverISIS.TabIndex = 84; this.pbRecoverISIS.TabStop = false; @@ -902,10 +902,10 @@ private void InitializeComponent() // chkADI // this.chkADI.AutoSize = true; - this.chkADI.Location = new System.Drawing.Point(12, 315); - this.chkADI.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkADI.Location = new System.Drawing.Point(6, 164); + this.chkADI.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkADI.Name = "chkADI"; - this.chkADI.Size = new System.Drawing.Size(340, 29); + this.chkADI.Size = new System.Drawing.Size(173, 17); this.chkADI.TabIndex = 8; this.chkADI.Text = "Attitude Director Indicator (ADI)"; this.chkADI.UseVisualStyleBackColor = true; @@ -917,12 +917,12 @@ private void InitializeComponent() this.pbRecoverADI.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverADI.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverADI.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverADI.Location = new System.Drawing.Point(533, 315); - this.pbRecoverADI.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverADI.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverADI.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverADI.Location = new System.Drawing.Point(266, 164); + this.pbRecoverADI.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverADI.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverADI.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverADI.Name = "pbRecoverADI"; - this.pbRecoverADI.Size = new System.Drawing.Size(32, 31); + this.pbRecoverADI.Size = new System.Drawing.Size(16, 16); this.pbRecoverADI.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverADI.TabIndex = 28; this.pbRecoverADI.TabStop = false; @@ -931,10 +931,10 @@ private void InitializeComponent() // chkAOAIndicator // this.chkAOAIndicator.AutoSize = true; - this.chkAOAIndicator.Location = new System.Drawing.Point(12, 270); - this.chkAOAIndicator.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkAOAIndicator.Location = new System.Drawing.Point(6, 140); + this.chkAOAIndicator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkAOAIndicator.Name = "chkAOAIndicator"; - this.chkAOAIndicator.Size = new System.Drawing.Size(341, 29); + this.chkAOAIndicator.Size = new System.Drawing.Size(174, 17); this.chkAOAIndicator.TabIndex = 7; this.chkAOAIndicator.Text = "Angle of Attack (AOA) Indicator"; this.chkAOAIndicator.UseVisualStyleBackColor = true; @@ -946,12 +946,12 @@ private void InitializeComponent() this.pbRecoverAOAIndicator.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverAOAIndicator.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverAOAIndicator.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverAOAIndicator.Location = new System.Drawing.Point(533, 270); - this.pbRecoverAOAIndicator.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverAOAIndicator.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverAOAIndicator.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverAOAIndicator.Location = new System.Drawing.Point(266, 140); + this.pbRecoverAOAIndicator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverAOAIndicator.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverAOAIndicator.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverAOAIndicator.Name = "pbRecoverAOAIndicator"; - this.pbRecoverAOAIndicator.Size = new System.Drawing.Size(32, 31); + this.pbRecoverAOAIndicator.Size = new System.Drawing.Size(16, 16); this.pbRecoverAOAIndicator.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverAOAIndicator.TabIndex = 32; this.pbRecoverAOAIndicator.TabStop = false; @@ -963,12 +963,12 @@ private void InitializeComponent() this.pbRecoverAltimeter.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverAltimeter.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverAltimeter.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverAltimeter.Location = new System.Drawing.Point(533, 110); - this.pbRecoverAltimeter.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverAltimeter.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverAltimeter.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverAltimeter.Location = new System.Drawing.Point(266, 57); + this.pbRecoverAltimeter.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverAltimeter.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverAltimeter.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverAltimeter.Name = "pbRecoverAltimeter"; - this.pbRecoverAltimeter.Size = new System.Drawing.Size(32, 31); + this.pbRecoverAltimeter.Size = new System.Drawing.Size(16, 16); this.pbRecoverAltimeter.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverAltimeter.TabIndex = 30; this.pbRecoverAltimeter.TabStop = false; @@ -978,11 +978,11 @@ private void InitializeComponent() // this.grpAltimeterStyle.Controls.Add(this.rdoAltimeterStyleDigital); this.grpAltimeterStyle.Controls.Add(this.rdoAltimeterStyleElectromechanical); - this.grpAltimeterStyle.Location = new System.Drawing.Point(43, 154); - this.grpAltimeterStyle.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.grpAltimeterStyle.Location = new System.Drawing.Point(22, 80); + this.grpAltimeterStyle.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.grpAltimeterStyle.Name = "grpAltimeterStyle"; - this.grpAltimeterStyle.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.grpAltimeterStyle.Size = new System.Drawing.Size(389, 90); + this.grpAltimeterStyle.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.grpAltimeterStyle.Size = new System.Drawing.Size(194, 47); this.grpAltimeterStyle.TabIndex = 4; this.grpAltimeterStyle.TabStop = false; this.grpAltimeterStyle.Text = "Style"; @@ -990,10 +990,10 @@ private void InitializeComponent() // rdoAltimeterStyleDigital // this.rdoAltimeterStyleDigital.AutoSize = true; - this.rdoAltimeterStyleDigital.Location = new System.Drawing.Point(248, 36); - this.rdoAltimeterStyleDigital.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoAltimeterStyleDigital.Location = new System.Drawing.Point(124, 19); + this.rdoAltimeterStyleDigital.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoAltimeterStyleDigital.Name = "rdoAltimeterStyleDigital"; - this.rdoAltimeterStyleDigital.Size = new System.Drawing.Size(103, 29); + this.rdoAltimeterStyleDigital.Size = new System.Drawing.Size(54, 17); this.rdoAltimeterStyleDigital.TabIndex = 1; this.rdoAltimeterStyleDigital.TabStop = true; this.rdoAltimeterStyleDigital.Text = "Digital"; @@ -1003,10 +1003,10 @@ private void InitializeComponent() // rdoAltimeterStyleElectromechanical // this.rdoAltimeterStyleElectromechanical.AutoSize = true; - this.rdoAltimeterStyleElectromechanical.Location = new System.Drawing.Point(12, 36); - this.rdoAltimeterStyleElectromechanical.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoAltimeterStyleElectromechanical.Location = new System.Drawing.Point(6, 19); + this.rdoAltimeterStyleElectromechanical.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoAltimeterStyleElectromechanical.Name = "rdoAltimeterStyleElectromechanical"; - this.rdoAltimeterStyleElectromechanical.Size = new System.Drawing.Size(219, 29); + this.rdoAltimeterStyleElectromechanical.Size = new System.Drawing.Size(112, 17); this.rdoAltimeterStyleElectromechanical.TabIndex = 0; this.rdoAltimeterStyleElectromechanical.TabStop = true; this.rdoAltimeterStyleElectromechanical.Text = "Electromechanical"; @@ -1020,11 +1020,11 @@ private void InitializeComponent() this.tabEW.Controls.Add(this.chkCMDSPanel); this.tabEW.Controls.Add(this.pbRecoverCMDS); this.tabEW.Controls.Add(this.grpAzimuthIndicatorStyle); - this.tabEW.Location = new System.Drawing.Point(8, 70); - this.tabEW.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabEW.Location = new System.Drawing.Point(4, 40); + this.tabEW.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabEW.Name = "tabEW"; - this.tabEW.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabEW.Size = new System.Drawing.Size(1019, 817); + this.tabEW.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabEW.Size = new System.Drawing.Size(507, 419); this.tabEW.TabIndex = 11; this.tabEW.Text = "EW Suite"; this.tabEW.UseVisualStyleBackColor = true; @@ -1032,10 +1032,10 @@ private void InitializeComponent() // chkAzimuthIndicator // this.chkAzimuthIndicator.AutoSize = true; - this.chkAzimuthIndicator.Location = new System.Drawing.Point(12, 11); - this.chkAzimuthIndicator.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkAzimuthIndicator.Location = new System.Drawing.Point(6, 6); + this.chkAzimuthIndicator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkAzimuthIndicator.Name = "chkAzimuthIndicator"; - this.chkAzimuthIndicator.Size = new System.Drawing.Size(279, 29); + this.chkAzimuthIndicator.Size = new System.Drawing.Size(143, 17); this.chkAzimuthIndicator.TabIndex = 76; this.chkAzimuthIndicator.Text = "Azimuth Indicator (RWR)"; this.chkAzimuthIndicator.UseVisualStyleBackColor = true; @@ -1047,12 +1047,12 @@ private void InitializeComponent() this.pbRecoverRWR.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverRWR.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverRWR.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverRWR.Location = new System.Drawing.Point(528, 14); - this.pbRecoverRWR.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverRWR.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverRWR.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverRWR.Location = new System.Drawing.Point(264, 7); + this.pbRecoverRWR.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverRWR.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverRWR.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverRWR.Name = "pbRecoverRWR"; - this.pbRecoverRWR.Size = new System.Drawing.Size(32, 31); + this.pbRecoverRWR.Size = new System.Drawing.Size(16, 16); this.pbRecoverRWR.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverRWR.TabIndex = 78; this.pbRecoverRWR.TabStop = false; @@ -1061,10 +1061,10 @@ private void InitializeComponent() // chkCMDSPanel // this.chkCMDSPanel.AutoSize = true; - this.chkCMDSPanel.Location = new System.Drawing.Point(12, 289); - this.chkCMDSPanel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkCMDSPanel.Location = new System.Drawing.Point(6, 150); + this.chkCMDSPanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkCMDSPanel.Name = "chkCMDSPanel"; - this.chkCMDSPanel.Size = new System.Drawing.Size(167, 29); + this.chkCMDSPanel.Size = new System.Drawing.Size(87, 17); this.chkCMDSPanel.TabIndex = 79; this.chkCMDSPanel.Text = "CMDS Panel"; this.chkCMDSPanel.UseVisualStyleBackColor = true; @@ -1076,12 +1076,12 @@ private void InitializeComponent() this.pbRecoverCMDS.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverCMDS.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverCMDS.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverCMDS.Location = new System.Drawing.Point(528, 289); - this.pbRecoverCMDS.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverCMDS.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverCMDS.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverCMDS.Location = new System.Drawing.Point(264, 150); + this.pbRecoverCMDS.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverCMDS.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverCMDS.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverCMDS.Name = "pbRecoverCMDS"; - this.pbRecoverCMDS.Size = new System.Drawing.Size(32, 31); + this.pbRecoverCMDS.Size = new System.Drawing.Size(16, 16); this.pbRecoverCMDS.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverCMDS.TabIndex = 80; this.pbRecoverCMDS.TabStop = false; @@ -1093,11 +1093,11 @@ private void InitializeComponent() this.grpAzimuthIndicatorStyle.Controls.Add(this.rdoAzimuthIndicatorStyleDigital); this.grpAzimuthIndicatorStyle.Controls.Add(this.grpAzimuthIndicatorBezelTypes); this.grpAzimuthIndicatorStyle.Controls.Add(this.grpAzimuthIndicatorDigitalTypes); - this.grpAzimuthIndicatorStyle.Location = new System.Drawing.Point(21, 54); - this.grpAzimuthIndicatorStyle.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.grpAzimuthIndicatorStyle.Location = new System.Drawing.Point(10, 28); + this.grpAzimuthIndicatorStyle.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.grpAzimuthIndicatorStyle.Name = "grpAzimuthIndicatorStyle"; - this.grpAzimuthIndicatorStyle.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.grpAzimuthIndicatorStyle.Size = new System.Drawing.Size(539, 222); + this.grpAzimuthIndicatorStyle.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.grpAzimuthIndicatorStyle.Size = new System.Drawing.Size(270, 115); this.grpAzimuthIndicatorStyle.TabIndex = 77; this.grpAzimuthIndicatorStyle.TabStop = false; this.grpAzimuthIndicatorStyle.Text = "Style"; @@ -1105,10 +1105,10 @@ private void InitializeComponent() // rdoAzimuthIndicatorStyleScope // this.rdoAzimuthIndicatorStyleScope.AutoSize = true; - this.rdoAzimuthIndicatorStyleScope.Location = new System.Drawing.Point(12, 31); - this.rdoAzimuthIndicatorStyleScope.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoAzimuthIndicatorStyleScope.Location = new System.Drawing.Point(6, 16); + this.rdoAzimuthIndicatorStyleScope.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoAzimuthIndicatorStyleScope.Name = "rdoAzimuthIndicatorStyleScope"; - this.rdoAzimuthIndicatorStyleScope.Size = new System.Drawing.Size(153, 29); + this.rdoAzimuthIndicatorStyleScope.Size = new System.Drawing.Size(81, 17); this.rdoAzimuthIndicatorStyleScope.TabIndex = 11; this.rdoAzimuthIndicatorStyleScope.TabStop = true; this.rdoAzimuthIndicatorStyleScope.Text = "CRT Scope"; @@ -1118,10 +1118,10 @@ private void InitializeComponent() // rdoAzimuthIndicatorStyleDigital // this.rdoAzimuthIndicatorStyleDigital.AutoSize = true; - this.rdoAzimuthIndicatorStyleDigital.Location = new System.Drawing.Point(11, 75); - this.rdoAzimuthIndicatorStyleDigital.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoAzimuthIndicatorStyleDigital.Location = new System.Drawing.Point(6, 39); + this.rdoAzimuthIndicatorStyleDigital.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoAzimuthIndicatorStyleDigital.Name = "rdoAzimuthIndicatorStyleDigital"; - this.rdoAzimuthIndicatorStyleDigital.Size = new System.Drawing.Size(159, 29); + this.rdoAzimuthIndicatorStyleDigital.Size = new System.Drawing.Size(82, 17); this.rdoAzimuthIndicatorStyleDigital.TabIndex = 12; this.rdoAzimuthIndicatorStyleDigital.TabStop = true; this.rdoAzimuthIndicatorStyleDigital.Text = "TFT Display"; @@ -1133,11 +1133,11 @@ private void InitializeComponent() this.grpAzimuthIndicatorBezelTypes.Controls.Add(this.rdoAzimuthIndicatorNoBezel); this.grpAzimuthIndicatorBezelTypes.Controls.Add(this.rdoAzimuthIndicatorHAFBezelType); this.grpAzimuthIndicatorBezelTypes.Controls.Add(this.rdoAzimuthIndicatorIP1310BezelType); - this.grpAzimuthIndicatorBezelTypes.Location = new System.Drawing.Point(36, 129); - this.grpAzimuthIndicatorBezelTypes.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.grpAzimuthIndicatorBezelTypes.Location = new System.Drawing.Point(18, 67); + this.grpAzimuthIndicatorBezelTypes.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.grpAzimuthIndicatorBezelTypes.Name = "grpAzimuthIndicatorBezelTypes"; - this.grpAzimuthIndicatorBezelTypes.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.grpAzimuthIndicatorBezelTypes.Size = new System.Drawing.Size(477, 82); + this.grpAzimuthIndicatorBezelTypes.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.grpAzimuthIndicatorBezelTypes.Size = new System.Drawing.Size(238, 43); this.grpAzimuthIndicatorBezelTypes.TabIndex = 13; this.grpAzimuthIndicatorBezelTypes.TabStop = false; this.grpAzimuthIndicatorBezelTypes.Text = "Bezel Type"; @@ -1145,36 +1145,36 @@ private void InitializeComponent() // rdoAzimuthIndicatorNoBezel // this.rdoAzimuthIndicatorNoBezel.AutoSize = true; - this.rdoAzimuthIndicatorNoBezel.Location = new System.Drawing.Point(365, 36); - this.rdoAzimuthIndicatorNoBezel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoAzimuthIndicatorNoBezel.Location = new System.Drawing.Point(182, 19); + this.rdoAzimuthIndicatorNoBezel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoAzimuthIndicatorNoBezel.Name = "rdoAzimuthIndicatorNoBezel"; - this.rdoAzimuthIndicatorNoBezel.Size = new System.Drawing.Size(94, 29); + this.rdoAzimuthIndicatorNoBezel.Size = new System.Drawing.Size(51, 17); this.rdoAzimuthIndicatorNoBezel.TabIndex = 3; this.rdoAzimuthIndicatorNoBezel.TabStop = true; this.rdoAzimuthIndicatorNoBezel.Text = "None"; this.rdoAzimuthIndicatorNoBezel.UseVisualStyleBackColor = true; this.rdoAzimuthIndicatorNoBezel.CheckedChanged += new System.EventHandler(this.rdoAzimuthIndicatorNoBezel_CheckedChanged); // - // rdoRWRHAFBezelType + // rdoAzimuthIndicatorHAFBezelType // this.rdoAzimuthIndicatorHAFBezelType.AutoSize = true; - this.rdoAzimuthIndicatorHAFBezelType.Location = new System.Drawing.Point(261, 36); - this.rdoAzimuthIndicatorHAFBezelType.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.rdoAzimuthIndicatorHAFBezelType.Name = "rdoRWRHAFBezelType"; - this.rdoAzimuthIndicatorHAFBezelType.Size = new System.Drawing.Size(85, 29); + this.rdoAzimuthIndicatorHAFBezelType.Location = new System.Drawing.Point(130, 19); + this.rdoAzimuthIndicatorHAFBezelType.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.rdoAzimuthIndicatorHAFBezelType.Name = "rdoAzimuthIndicatorHAFBezelType"; + this.rdoAzimuthIndicatorHAFBezelType.Size = new System.Drawing.Size(46, 17); this.rdoAzimuthIndicatorHAFBezelType.TabIndex = 2; this.rdoAzimuthIndicatorHAFBezelType.TabStop = true; this.rdoAzimuthIndicatorHAFBezelType.Text = "HAF"; this.rdoAzimuthIndicatorHAFBezelType.UseVisualStyleBackColor = true; this.rdoAzimuthIndicatorHAFBezelType.CheckedChanged += new System.EventHandler(this.rdoAzimuthIndicatorHAFBezelType_CheckedChanged); // - // rdoRWRIP1310BezelType + // rdoAzimuthIndicatorIP1310BezelType // this.rdoAzimuthIndicatorIP1310BezelType.AutoSize = true; - this.rdoAzimuthIndicatorIP1310BezelType.Location = new System.Drawing.Point(0, 36); - this.rdoAzimuthIndicatorIP1310BezelType.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.rdoAzimuthIndicatorIP1310BezelType.Name = "rdoRWRIP1310BezelType"; - this.rdoAzimuthIndicatorIP1310BezelType.Size = new System.Drawing.Size(227, 29); + this.rdoAzimuthIndicatorIP1310BezelType.Location = new System.Drawing.Point(0, 19); + this.rdoAzimuthIndicatorIP1310BezelType.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.rdoAzimuthIndicatorIP1310BezelType.Name = "rdoAzimuthIndicatorIP1310BezelType"; + this.rdoAzimuthIndicatorIP1310BezelType.Size = new System.Drawing.Size(119, 17); this.rdoAzimuthIndicatorIP1310BezelType.TabIndex = 1; this.rdoAzimuthIndicatorIP1310BezelType.TabStop = true; this.rdoAzimuthIndicatorIP1310BezelType.Text = "IP-1310/ALR (USA)"; @@ -1185,11 +1185,11 @@ private void InitializeComponent() // this.grpAzimuthIndicatorDigitalTypes.Controls.Add(this.rdoTTD); this.grpAzimuthIndicatorDigitalTypes.Controls.Add(this.rdoATDPlus); - this.grpAzimuthIndicatorDigitalTypes.Location = new System.Drawing.Point(36, 129); - this.grpAzimuthIndicatorDigitalTypes.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.grpAzimuthIndicatorDigitalTypes.Location = new System.Drawing.Point(18, 67); + this.grpAzimuthIndicatorDigitalTypes.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.grpAzimuthIndicatorDigitalTypes.Name = "grpAzimuthIndicatorDigitalTypes"; - this.grpAzimuthIndicatorDigitalTypes.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.grpAzimuthIndicatorDigitalTypes.Size = new System.Drawing.Size(477, 82); + this.grpAzimuthIndicatorDigitalTypes.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.grpAzimuthIndicatorDigitalTypes.Size = new System.Drawing.Size(238, 43); this.grpAzimuthIndicatorDigitalTypes.TabIndex = 13; this.grpAzimuthIndicatorDigitalTypes.TabStop = false; this.grpAzimuthIndicatorDigitalTypes.Text = "Display Type"; @@ -1198,10 +1198,10 @@ private void InitializeComponent() // this.rdoTTD.AutoSize = true; this.rdoTTD.Enabled = false; - this.rdoTTD.Location = new System.Drawing.Point(131, 36); - this.rdoTTD.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoTTD.Location = new System.Drawing.Point(66, 19); + this.rdoTTD.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoTTD.Name = "rdoTTD"; - this.rdoTTD.Size = new System.Drawing.Size(84, 29); + this.rdoTTD.Size = new System.Drawing.Size(47, 17); this.rdoTTD.TabIndex = 2; this.rdoTTD.TabStop = true; this.rdoTTD.Text = "TTD"; @@ -1210,10 +1210,10 @@ private void InitializeComponent() // rdoATDPlus // this.rdoATDPlus.AutoSize = true; - this.rdoATDPlus.Location = new System.Drawing.Point(12, 36); - this.rdoATDPlus.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoATDPlus.Location = new System.Drawing.Point(6, 19); + this.rdoATDPlus.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoATDPlus.Name = "rdoATDPlus"; - this.rdoATDPlus.Size = new System.Drawing.Size(97, 29); + this.rdoATDPlus.Size = new System.Drawing.Size(53, 17); this.rdoATDPlus.TabIndex = 1; this.rdoATDPlus.TabStop = true; this.rdoATDPlus.Text = "ATD+"; @@ -1229,11 +1229,11 @@ private void InitializeComponent() this.tabEngineInstruments.Controls.Add(this.gbFuelQuantityOptions); this.tabEngineInstruments.Controls.Add(this.chkFuelQty); this.tabEngineInstruments.Controls.Add(this.pbRecoverFuelQuantity); - this.tabEngineInstruments.Location = new System.Drawing.Point(8, 70); - this.tabEngineInstruments.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabEngineInstruments.Location = new System.Drawing.Point(4, 40); + this.tabEngineInstruments.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabEngineInstruments.Name = "tabEngineInstruments"; - this.tabEngineInstruments.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabEngineInstruments.Size = new System.Drawing.Size(1019, 817); + this.tabEngineInstruments.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabEngineInstruments.Size = new System.Drawing.Size(508, 417); this.tabEngineInstruments.TabIndex = 10; this.tabEngineInstruments.Text = "Engine & Fuel Instruments"; this.tabEngineInstruments.UseVisualStyleBackColor = true; @@ -1241,10 +1241,10 @@ private void InitializeComponent() // chkFuelFlow // this.chkFuelFlow.AutoSize = true; - this.chkFuelFlow.Location = new System.Drawing.Point(24, 500); - this.chkFuelFlow.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkFuelFlow.Location = new System.Drawing.Point(12, 260); + this.chkFuelFlow.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkFuelFlow.Name = "chkFuelFlow"; - this.chkFuelFlow.Size = new System.Drawing.Size(225, 29); + this.chkFuelFlow.Size = new System.Drawing.Size(115, 17); this.chkFuelFlow.TabIndex = 29; this.chkFuelFlow.Text = "Fuel Flow Indicator"; this.chkFuelFlow.UseVisualStyleBackColor = true; @@ -1256,12 +1256,12 @@ private void InitializeComponent() this.pbRecoverFuelFlow.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverFuelFlow.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverFuelFlow.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverFuelFlow.Location = new System.Drawing.Point(547, 500); - this.pbRecoverFuelFlow.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverFuelFlow.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverFuelFlow.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverFuelFlow.Location = new System.Drawing.Point(274, 260); + this.pbRecoverFuelFlow.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverFuelFlow.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverFuelFlow.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverFuelFlow.Name = "pbRecoverFuelFlow"; - this.pbRecoverFuelFlow.Size = new System.Drawing.Size(32, 31); + this.pbRecoverFuelFlow.Size = new System.Drawing.Size(16, 16); this.pbRecoverFuelFlow.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverFuelFlow.TabIndex = 46; this.pbRecoverFuelFlow.TabStop = false; @@ -1269,6 +1269,7 @@ private void InitializeComponent() // // gbEngine1Instros // + this.gbEngine1Instros.Controls.Add(this.chkRPMPW); this.gbEngine1Instros.Controls.Add(this.chkFTIT1); this.gbEngine1Instros.Controls.Add(this.pbRecoverRPM1); this.gbEngine1Instros.Controls.Add(this.pbRecoverOil1); @@ -1277,11 +1278,11 @@ private void InitializeComponent() this.gbEngine1Instros.Controls.Add(this.chkRPM1); this.gbEngine1Instros.Controls.Add(this.chkOIL1); this.gbEngine1Instros.Controls.Add(this.chkNOZ1); - this.gbEngine1Instros.Location = new System.Drawing.Point(12, 11); - this.gbEngine1Instros.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.gbEngine1Instros.Location = new System.Drawing.Point(6, 6); + this.gbEngine1Instros.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbEngine1Instros.Name = "gbEngine1Instros"; - this.gbEngine1Instros.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.gbEngine1Instros.Size = new System.Drawing.Size(595, 232); + this.gbEngine1Instros.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbEngine1Instros.Size = new System.Drawing.Size(298, 121); this.gbEngine1Instros.TabIndex = 56; this.gbEngine1Instros.TabStop = false; this.gbEngine1Instros.Text = "Engine 1 Instruments"; @@ -1289,10 +1290,10 @@ private void InitializeComponent() // chkFTIT1 // this.chkFTIT1.AutoSize = true; - this.chkFTIT1.Location = new System.Drawing.Point(12, 42); - this.chkFTIT1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkFTIT1.Location = new System.Drawing.Point(6, 22); + this.chkFTIT1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkFTIT1.Name = "chkFTIT1"; - this.chkFTIT1.Size = new System.Drawing.Size(158, 29); + this.chkFTIT1.Size = new System.Drawing.Size(84, 17); this.chkFTIT1.TabIndex = 20; this.chkFTIT1.Text = "FTIT Gauge"; this.chkFTIT1.UseVisualStyleBackColor = true; @@ -1304,12 +1305,12 @@ private void InitializeComponent() this.pbRecoverRPM1.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverRPM1.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverRPM1.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverRPM1.Location = new System.Drawing.Point(533, 175); - this.pbRecoverRPM1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverRPM1.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverRPM1.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverRPM1.Location = new System.Drawing.Point(266, 91); + this.pbRecoverRPM1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverRPM1.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverRPM1.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverRPM1.Name = "pbRecoverRPM1"; - this.pbRecoverRPM1.Size = new System.Drawing.Size(32, 31); + this.pbRecoverRPM1.Size = new System.Drawing.Size(16, 16); this.pbRecoverRPM1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverRPM1.TabIndex = 40; this.pbRecoverRPM1.TabStop = false; @@ -1321,12 +1322,12 @@ private void InitializeComponent() this.pbRecoverOil1.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverOil1.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverOil1.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverOil1.Location = new System.Drawing.Point(533, 131); - this.pbRecoverOil1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverOil1.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverOil1.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverOil1.Location = new System.Drawing.Point(266, 68); + this.pbRecoverOil1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverOil1.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverOil1.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverOil1.Name = "pbRecoverOil1"; - this.pbRecoverOil1.Size = new System.Drawing.Size(32, 31); + this.pbRecoverOil1.Size = new System.Drawing.Size(16, 16); this.pbRecoverOil1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverOil1.TabIndex = 39; this.pbRecoverOil1.TabStop = false; @@ -1338,12 +1339,12 @@ private void InitializeComponent() this.pbRecoverNOZ1.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverNOZ1.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverNOZ1.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverNOZ1.Location = new System.Drawing.Point(533, 86); - this.pbRecoverNOZ1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverNOZ1.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverNOZ1.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverNOZ1.Location = new System.Drawing.Point(266, 45); + this.pbRecoverNOZ1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverNOZ1.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverNOZ1.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverNOZ1.Name = "pbRecoverNOZ1"; - this.pbRecoverNOZ1.Size = new System.Drawing.Size(32, 31); + this.pbRecoverNOZ1.Size = new System.Drawing.Size(16, 16); this.pbRecoverNOZ1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverNOZ1.TabIndex = 38; this.pbRecoverNOZ1.TabStop = false; @@ -1355,12 +1356,12 @@ private void InitializeComponent() this.pbRecoverFTIT1.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverFTIT1.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverFTIT1.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverFTIT1.Location = new System.Drawing.Point(533, 42); - this.pbRecoverFTIT1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverFTIT1.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverFTIT1.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverFTIT1.Location = new System.Drawing.Point(266, 22); + this.pbRecoverFTIT1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverFTIT1.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverFTIT1.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverFTIT1.Name = "pbRecoverFTIT1"; - this.pbRecoverFTIT1.Size = new System.Drawing.Size(32, 31); + this.pbRecoverFTIT1.Size = new System.Drawing.Size(16, 16); this.pbRecoverFTIT1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverFTIT1.TabIndex = 37; this.pbRecoverFTIT1.TabStop = false; @@ -1369,10 +1370,10 @@ private void InitializeComponent() // chkRPM1 // this.chkRPM1.AutoSize = true; - this.chkRPM1.Location = new System.Drawing.Point(12, 175); - this.chkRPM1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkRPM1.Location = new System.Drawing.Point(6, 91); + this.chkRPM1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkRPM1.Name = "chkRPM1"; - this.chkRPM1.Size = new System.Drawing.Size(161, 29); + this.chkRPM1.Size = new System.Drawing.Size(85, 17); this.chkRPM1.TabIndex = 23; this.chkRPM1.Text = "RPM Gauge"; this.chkRPM1.UseVisualStyleBackColor = true; @@ -1381,10 +1382,10 @@ private void InitializeComponent() // chkOIL1 // this.chkOIL1.AutoSize = true; - this.chkOIL1.Location = new System.Drawing.Point(12, 131); - this.chkOIL1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkOIL1.Location = new System.Drawing.Point(6, 68); + this.chkOIL1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkOIL1.Name = "chkOIL1"; - this.chkOIL1.Size = new System.Drawing.Size(232, 29); + this.chkOIL1.Size = new System.Drawing.Size(117, 17); this.chkOIL1.TabIndex = 22; this.chkOIL1.Text = "Oil Pressure Gauge"; this.chkOIL1.UseVisualStyleBackColor = true; @@ -1393,10 +1394,10 @@ private void InitializeComponent() // chkNOZ1 // this.chkNOZ1.AutoSize = true; - this.chkNOZ1.Location = new System.Drawing.Point(12, 86); - this.chkNOZ1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkNOZ1.Location = new System.Drawing.Point(6, 45); + this.chkNOZ1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkNOZ1.Name = "chkNOZ1"; - this.chkNOZ1.Size = new System.Drawing.Size(281, 29); + this.chkNOZ1.Size = new System.Drawing.Size(142, 17); this.chkNOZ1.TabIndex = 21; this.chkNOZ1.Text = "Nozzle Position Indicator"; this.chkNOZ1.UseVisualStyleBackColor = true; @@ -1412,11 +1413,11 @@ private void InitializeComponent() this.gbEngine2Instros.Controls.Add(this.pbRecoverNOZ2); this.gbEngine2Instros.Controls.Add(this.pbRecoverFTIT2); this.gbEngine2Instros.Controls.Add(this.chkRPM2); - this.gbEngine2Instros.Location = new System.Drawing.Point(12, 256); - this.gbEngine2Instros.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.gbEngine2Instros.Location = new System.Drawing.Point(6, 133); + this.gbEngine2Instros.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbEngine2Instros.Name = "gbEngine2Instros"; - this.gbEngine2Instros.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.gbEngine2Instros.Size = new System.Drawing.Size(595, 232); + this.gbEngine2Instros.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbEngine2Instros.Size = new System.Drawing.Size(298, 121); this.gbEngine2Instros.TabIndex = 57; this.gbEngine2Instros.TabStop = false; this.gbEngine2Instros.Text = "Engine 2 Instruments"; @@ -1424,10 +1425,10 @@ private void InitializeComponent() // chkFTIT2 // this.chkFTIT2.AutoSize = true; - this.chkFTIT2.Location = new System.Drawing.Point(12, 40); - this.chkFTIT2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkFTIT2.Location = new System.Drawing.Point(6, 21); + this.chkFTIT2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkFTIT2.Name = "chkFTIT2"; - this.chkFTIT2.Size = new System.Drawing.Size(158, 29); + this.chkFTIT2.Size = new System.Drawing.Size(84, 17); this.chkFTIT2.TabIndex = 24; this.chkFTIT2.Text = "FTIT Gauge"; this.chkFTIT2.UseVisualStyleBackColor = true; @@ -1436,10 +1437,10 @@ private void InitializeComponent() // chkNOZ2 // this.chkNOZ2.AutoSize = true; - this.chkNOZ2.Location = new System.Drawing.Point(12, 85); - this.chkNOZ2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkNOZ2.Location = new System.Drawing.Point(6, 44); + this.chkNOZ2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkNOZ2.Name = "chkNOZ2"; - this.chkNOZ2.Size = new System.Drawing.Size(281, 29); + this.chkNOZ2.Size = new System.Drawing.Size(142, 17); this.chkNOZ2.TabIndex = 25; this.chkNOZ2.Text = "Nozzle Position Indicator"; this.chkNOZ2.UseVisualStyleBackColor = true; @@ -1451,12 +1452,12 @@ private void InitializeComponent() this.pbRecoverRPM2.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverRPM2.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverRPM2.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverRPM2.Location = new System.Drawing.Point(533, 172); - this.pbRecoverRPM2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverRPM2.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverRPM2.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverRPM2.Location = new System.Drawing.Point(266, 89); + this.pbRecoverRPM2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverRPM2.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverRPM2.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverRPM2.Name = "pbRecoverRPM2"; - this.pbRecoverRPM2.Size = new System.Drawing.Size(32, 31); + this.pbRecoverRPM2.Size = new System.Drawing.Size(16, 16); this.pbRecoverRPM2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverRPM2.TabIndex = 44; this.pbRecoverRPM2.TabStop = false; @@ -1468,12 +1469,12 @@ private void InitializeComponent() this.pbRecoverOil2.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverOil2.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverOil2.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverOil2.Location = new System.Drawing.Point(533, 129); - this.pbRecoverOil2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverOil2.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverOil2.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverOil2.Location = new System.Drawing.Point(266, 67); + this.pbRecoverOil2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverOil2.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverOil2.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverOil2.Name = "pbRecoverOil2"; - this.pbRecoverOil2.Size = new System.Drawing.Size(32, 31); + this.pbRecoverOil2.Size = new System.Drawing.Size(16, 16); this.pbRecoverOil2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverOil2.TabIndex = 43; this.pbRecoverOil2.TabStop = false; @@ -1482,10 +1483,10 @@ private void InitializeComponent() // chkOIL2 // this.chkOIL2.AutoSize = true; - this.chkOIL2.Location = new System.Drawing.Point(12, 129); - this.chkOIL2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkOIL2.Location = new System.Drawing.Point(6, 67); + this.chkOIL2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkOIL2.Name = "chkOIL2"; - this.chkOIL2.Size = new System.Drawing.Size(232, 29); + this.chkOIL2.Size = new System.Drawing.Size(117, 17); this.chkOIL2.TabIndex = 26; this.chkOIL2.Text = "Oil Pressure Gauge"; this.chkOIL2.UseVisualStyleBackColor = true; @@ -1497,12 +1498,12 @@ private void InitializeComponent() this.pbRecoverNOZ2.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverNOZ2.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverNOZ2.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverNOZ2.Location = new System.Drawing.Point(533, 85); - this.pbRecoverNOZ2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverNOZ2.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverNOZ2.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverNOZ2.Location = new System.Drawing.Point(266, 44); + this.pbRecoverNOZ2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverNOZ2.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverNOZ2.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverNOZ2.Name = "pbRecoverNOZ2"; - this.pbRecoverNOZ2.Size = new System.Drawing.Size(32, 31); + this.pbRecoverNOZ2.Size = new System.Drawing.Size(16, 16); this.pbRecoverNOZ2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverNOZ2.TabIndex = 42; this.pbRecoverNOZ2.TabStop = false; @@ -1514,12 +1515,12 @@ private void InitializeComponent() this.pbRecoverFTIT2.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverFTIT2.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverFTIT2.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverFTIT2.Location = new System.Drawing.Point(533, 40); - this.pbRecoverFTIT2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverFTIT2.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverFTIT2.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverFTIT2.Location = new System.Drawing.Point(266, 21); + this.pbRecoverFTIT2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverFTIT2.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverFTIT2.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverFTIT2.Name = "pbRecoverFTIT2"; - this.pbRecoverFTIT2.Size = new System.Drawing.Size(32, 31); + this.pbRecoverFTIT2.Size = new System.Drawing.Size(16, 16); this.pbRecoverFTIT2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverFTIT2.TabIndex = 41; this.pbRecoverFTIT2.TabStop = false; @@ -1528,10 +1529,10 @@ private void InitializeComponent() // chkRPM2 // this.chkRPM2.AutoSize = true; - this.chkRPM2.Location = new System.Drawing.Point(12, 172); - this.chkRPM2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkRPM2.Location = new System.Drawing.Point(6, 89); + this.chkRPM2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkRPM2.Name = "chkRPM2"; - this.chkRPM2.Size = new System.Drawing.Size(161, 29); + this.chkRPM2.Size = new System.Drawing.Size(85, 17); this.chkRPM2.TabIndex = 27; this.chkRPM2.Text = "RPM Gauge"; this.chkRPM2.UseVisualStyleBackColor = true; @@ -1541,11 +1542,11 @@ private void InitializeComponent() // this.gbFuelQuantityOptions.Controls.Add(this.rdoFuelQuantityDModel); this.gbFuelQuantityOptions.Controls.Add(this.rdoFuelQuantityNeedleCModel); - this.gbFuelQuantityOptions.Location = new System.Drawing.Point(72, 589); - this.gbFuelQuantityOptions.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.gbFuelQuantityOptions.Location = new System.Drawing.Point(36, 306); + this.gbFuelQuantityOptions.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbFuelQuantityOptions.Name = "gbFuelQuantityOptions"; - this.gbFuelQuantityOptions.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.gbFuelQuantityOptions.Size = new System.Drawing.Size(389, 79); + this.gbFuelQuantityOptions.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbFuelQuantityOptions.Size = new System.Drawing.Size(194, 41); this.gbFuelQuantityOptions.TabIndex = 67; this.gbFuelQuantityOptions.TabStop = false; this.gbFuelQuantityOptions.Text = "Needle Style"; @@ -1553,10 +1554,10 @@ private void InitializeComponent() // rdoFuelQuantityDModel // this.rdoFuelQuantityDModel.AutoSize = true; - this.rdoFuelQuantityDModel.Location = new System.Drawing.Point(165, 36); - this.rdoFuelQuantityDModel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoFuelQuantityDModel.Location = new System.Drawing.Point(82, 19); + this.rdoFuelQuantityDModel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoFuelQuantityDModel.Name = "rdoFuelQuantityDModel"; - this.rdoFuelQuantityDModel.Size = new System.Drawing.Size(123, 29); + this.rdoFuelQuantityDModel.Size = new System.Drawing.Size(65, 17); this.rdoFuelQuantityDModel.TabIndex = 1; this.rdoFuelQuantityDModel.TabStop = true; this.rdoFuelQuantityDModel.Text = "D Model"; @@ -1566,10 +1567,10 @@ private void InitializeComponent() // rdoFuelQuantityNeedleCModel // this.rdoFuelQuantityNeedleCModel.AutoSize = true; - this.rdoFuelQuantityNeedleCModel.Location = new System.Drawing.Point(27, 36); - this.rdoFuelQuantityNeedleCModel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoFuelQuantityNeedleCModel.Location = new System.Drawing.Point(14, 19); + this.rdoFuelQuantityNeedleCModel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoFuelQuantityNeedleCModel.Name = "rdoFuelQuantityNeedleCModel"; - this.rdoFuelQuantityNeedleCModel.Size = new System.Drawing.Size(123, 29); + this.rdoFuelQuantityNeedleCModel.Size = new System.Drawing.Size(64, 17); this.rdoFuelQuantityNeedleCModel.TabIndex = 0; this.rdoFuelQuantityNeedleCModel.TabStop = true; this.rdoFuelQuantityNeedleCModel.Text = "C Model"; @@ -1579,10 +1580,10 @@ private void InitializeComponent() // chkFuelQty // this.chkFuelQty.AutoSize = true; - this.chkFuelQty.Location = new System.Drawing.Point(24, 544); - this.chkFuelQty.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkFuelQty.Location = new System.Drawing.Point(12, 283); + this.chkFuelQty.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkFuelQty.Name = "chkFuelQty"; - this.chkFuelQty.Size = new System.Drawing.Size(260, 29); + this.chkFuelQty.Size = new System.Drawing.Size(132, 17); this.chkFuelQty.TabIndex = 66; this.chkFuelQty.Text = "Fuel Quantity Indicator"; this.chkFuelQty.UseVisualStyleBackColor = true; @@ -1594,12 +1595,12 @@ private void InitializeComponent() this.pbRecoverFuelQuantity.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverFuelQuantity.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverFuelQuantity.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverFuelQuantity.Location = new System.Drawing.Point(547, 544); - this.pbRecoverFuelQuantity.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverFuelQuantity.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverFuelQuantity.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverFuelQuantity.Location = new System.Drawing.Point(274, 283); + this.pbRecoverFuelQuantity.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverFuelQuantity.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverFuelQuantity.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverFuelQuantity.Name = "pbRecoverFuelQuantity"; - this.pbRecoverFuelQuantity.Size = new System.Drawing.Size(32, 31); + this.pbRecoverFuelQuantity.Size = new System.Drawing.Size(16, 16); this.pbRecoverFuelQuantity.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverFuelQuantity.TabIndex = 68; this.pbRecoverFuelQuantity.TabStop = false; @@ -1611,11 +1612,11 @@ private void InitializeComponent() this.tabHydraulics.Controls.Add(this.pbRecoverHydA); this.tabHydraulics.Controls.Add(this.pbRecoverHydB); this.tabHydraulics.Controls.Add(this.chkHydB); - this.tabHydraulics.Location = new System.Drawing.Point(8, 70); - this.tabHydraulics.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabHydraulics.Location = new System.Drawing.Point(4, 40); + this.tabHydraulics.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabHydraulics.Name = "tabHydraulics"; - this.tabHydraulics.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabHydraulics.Size = new System.Drawing.Size(1019, 817); + this.tabHydraulics.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabHydraulics.Size = new System.Drawing.Size(507, 419); this.tabHydraulics.TabIndex = 14; this.tabHydraulics.Text = "Hydraulic Instruments"; this.tabHydraulics.UseVisualStyleBackColor = true; @@ -1623,10 +1624,10 @@ private void InitializeComponent() // chkHydA // this.chkHydA.AutoSize = true; - this.chkHydA.Location = new System.Drawing.Point(12, 11); - this.chkHydA.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkHydA.Location = new System.Drawing.Point(6, 6); + this.chkHydA.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkHydA.Name = "chkHydA"; - this.chkHydA.Size = new System.Drawing.Size(340, 29); + this.chkHydA.Size = new System.Drawing.Size(171, 17); this.chkHydA.TabIndex = 69; this.chkHydA.Text = "Hydraulic Pressure Indicator A "; this.chkHydA.UseVisualStyleBackColor = true; @@ -1638,12 +1639,12 @@ private void InitializeComponent() this.pbRecoverHydA.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverHydA.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverHydA.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverHydA.Location = new System.Drawing.Point(532, 11); - this.pbRecoverHydA.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverHydA.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverHydA.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverHydA.Location = new System.Drawing.Point(266, 6); + this.pbRecoverHydA.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverHydA.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverHydA.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverHydA.Name = "pbRecoverHydA"; - this.pbRecoverHydA.Size = new System.Drawing.Size(32, 31); + this.pbRecoverHydA.Size = new System.Drawing.Size(16, 16); this.pbRecoverHydA.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverHydA.TabIndex = 71; this.pbRecoverHydA.TabStop = false; @@ -1655,12 +1656,12 @@ private void InitializeComponent() this.pbRecoverHydB.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverHydB.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverHydB.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverHydB.Location = new System.Drawing.Point(532, 56); - this.pbRecoverHydB.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverHydB.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverHydB.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverHydB.Location = new System.Drawing.Point(266, 29); + this.pbRecoverHydB.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverHydB.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverHydB.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverHydB.Name = "pbRecoverHydB"; - this.pbRecoverHydB.Size = new System.Drawing.Size(32, 31); + this.pbRecoverHydB.Size = new System.Drawing.Size(16, 16); this.pbRecoverHydB.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverHydB.TabIndex = 72; this.pbRecoverHydB.TabStop = false; @@ -1669,10 +1670,10 @@ private void InitializeComponent() // chkHydB // this.chkHydB.AutoSize = true; - this.chkHydB.Location = new System.Drawing.Point(12, 54); - this.chkHydB.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkHydB.Location = new System.Drawing.Point(6, 28); + this.chkHydB.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkHydB.Name = "chkHydB"; - this.chkHydB.Size = new System.Drawing.Size(334, 29); + this.chkHydB.Size = new System.Drawing.Size(168, 17); this.chkHydB.TabIndex = 70; this.chkHydB.Text = "Hydraulic Pressure Indicator B"; this.chkHydB.UseVisualStyleBackColor = true; @@ -1684,11 +1685,11 @@ private void InitializeComponent() this.tabFaults.Controls.Add(this.chkCautionPanel); this.tabFaults.Controls.Add(this.pbRecoverCautionPanel); this.tabFaults.Controls.Add(this.pbRecoverPFL); - this.tabFaults.Location = new System.Drawing.Point(8, 70); - this.tabFaults.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabFaults.Location = new System.Drawing.Point(4, 40); + this.tabFaults.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabFaults.Name = "tabFaults"; - this.tabFaults.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabFaults.Size = new System.Drawing.Size(1019, 817); + this.tabFaults.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabFaults.Size = new System.Drawing.Size(507, 419); this.tabFaults.TabIndex = 7; this.tabFaults.Text = "Fault Indicators"; this.tabFaults.UseVisualStyleBackColor = true; @@ -1696,10 +1697,10 @@ private void InitializeComponent() // chkPFL // this.chkPFL.AutoSize = true; - this.chkPFL.Location = new System.Drawing.Point(12, 56); - this.chkPFL.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkPFL.Location = new System.Drawing.Point(6, 29); + this.chkPFL.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkPFL.Name = "chkPFL"; - this.chkPFL.Size = new System.Drawing.Size(239, 29); + this.chkPFL.Size = new System.Drawing.Size(119, 17); this.chkPFL.TabIndex = 74; this.chkPFL.Text = "Pilot Fault List (PFL)"; this.chkPFL.UseVisualStyleBackColor = true; @@ -1708,10 +1709,10 @@ private void InitializeComponent() // chkCautionPanel // this.chkCautionPanel.AutoSize = true; - this.chkCautionPanel.Location = new System.Drawing.Point(12, 11); - this.chkCautionPanel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkCautionPanel.Location = new System.Drawing.Point(6, 6); + this.chkCautionPanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkCautionPanel.Name = "chkCautionPanel"; - this.chkCautionPanel.Size = new System.Drawing.Size(179, 29); + this.chkCautionPanel.Size = new System.Drawing.Size(92, 17); this.chkCautionPanel.TabIndex = 70; this.chkCautionPanel.Text = "Caution Panel"; this.chkCautionPanel.UseVisualStyleBackColor = true; @@ -1723,12 +1724,12 @@ private void InitializeComponent() this.pbRecoverCautionPanel.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverCautionPanel.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverCautionPanel.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverCautionPanel.Location = new System.Drawing.Point(533, 11); - this.pbRecoverCautionPanel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverCautionPanel.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverCautionPanel.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverCautionPanel.Location = new System.Drawing.Point(266, 6); + this.pbRecoverCautionPanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverCautionPanel.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverCautionPanel.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverCautionPanel.Name = "pbRecoverCautionPanel"; - this.pbRecoverCautionPanel.Size = new System.Drawing.Size(32, 31); + this.pbRecoverCautionPanel.Size = new System.Drawing.Size(16, 16); this.pbRecoverCautionPanel.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverCautionPanel.TabIndex = 71; this.pbRecoverCautionPanel.TabStop = false; @@ -1740,12 +1741,12 @@ private void InitializeComponent() this.pbRecoverPFL.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverPFL.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverPFL.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverPFL.Location = new System.Drawing.Point(533, 56); - this.pbRecoverPFL.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverPFL.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverPFL.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverPFL.Location = new System.Drawing.Point(266, 29); + this.pbRecoverPFL.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverPFL.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverPFL.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverPFL.Name = "pbRecoverPFL"; - this.pbRecoverPFL.Size = new System.Drawing.Size(32, 31); + this.pbRecoverPFL.Size = new System.Drawing.Size(16, 16); this.pbRecoverPFL.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverPFL.TabIndex = 75; this.pbRecoverPFL.TabStop = false; @@ -1757,11 +1758,11 @@ private void InitializeComponent() this.tabIndexers.Controls.Add(this.pbRecoverNWSIndexer); this.tabIndexers.Controls.Add(this.chkAOAIndexer); this.tabIndexers.Controls.Add(this.pbRecoverAOAIndexer); - this.tabIndexers.Location = new System.Drawing.Point(8, 70); - this.tabIndexers.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabIndexers.Location = new System.Drawing.Point(4, 40); + this.tabIndexers.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabIndexers.Name = "tabIndexers"; - this.tabIndexers.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabIndexers.Size = new System.Drawing.Size(1019, 817); + this.tabIndexers.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabIndexers.Size = new System.Drawing.Size(507, 419); this.tabIndexers.TabIndex = 13; this.tabIndexers.Text = "Indexers"; this.tabIndexers.UseVisualStyleBackColor = true; @@ -1769,10 +1770,10 @@ private void InitializeComponent() // chkNWSIndexer // this.chkNWSIndexer.AutoSize = true; - this.chkNWSIndexer.Location = new System.Drawing.Point(12, 56); - this.chkNWSIndexer.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkNWSIndexer.Location = new System.Drawing.Point(6, 29); + this.chkNWSIndexer.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkNWSIndexer.Name = "chkNWSIndexer"; - this.chkNWSIndexer.Size = new System.Drawing.Size(382, 29); + this.chkNWSIndexer.Size = new System.Drawing.Size(194, 17); this.chkNWSIndexer.TabIndex = 95; this.chkNWSIndexer.Text = "Nosewheel Steering (NWS) Indexer"; this.chkNWSIndexer.UseVisualStyleBackColor = true; @@ -1784,12 +1785,12 @@ private void InitializeComponent() this.pbRecoverNWSIndexer.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverNWSIndexer.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverNWSIndexer.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverNWSIndexer.Location = new System.Drawing.Point(533, 56); - this.pbRecoverNWSIndexer.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverNWSIndexer.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverNWSIndexer.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverNWSIndexer.Location = new System.Drawing.Point(266, 29); + this.pbRecoverNWSIndexer.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverNWSIndexer.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverNWSIndexer.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverNWSIndexer.Name = "pbRecoverNWSIndexer"; - this.pbRecoverNWSIndexer.Size = new System.Drawing.Size(32, 31); + this.pbRecoverNWSIndexer.Size = new System.Drawing.Size(16, 16); this.pbRecoverNWSIndexer.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverNWSIndexer.TabIndex = 96; this.pbRecoverNWSIndexer.TabStop = false; @@ -1798,10 +1799,10 @@ private void InitializeComponent() // chkAOAIndexer // this.chkAOAIndexer.AutoSize = true; - this.chkAOAIndexer.Location = new System.Drawing.Point(12, 11); - this.chkAOAIndexer.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkAOAIndexer.Location = new System.Drawing.Point(6, 6); + this.chkAOAIndexer.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkAOAIndexer.Name = "chkAOAIndexer"; - this.chkAOAIndexer.Size = new System.Drawing.Size(330, 29); + this.chkAOAIndexer.Size = new System.Drawing.Size(168, 17); this.chkAOAIndexer.TabIndex = 93; this.chkAOAIndexer.Text = "Angle of Attack (AOA) Indexer"; this.chkAOAIndexer.UseVisualStyleBackColor = true; @@ -1813,12 +1814,12 @@ private void InitializeComponent() this.pbRecoverAOAIndexer.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverAOAIndexer.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverAOAIndexer.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverAOAIndexer.Location = new System.Drawing.Point(533, 11); - this.pbRecoverAOAIndexer.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverAOAIndexer.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverAOAIndexer.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverAOAIndexer.Location = new System.Drawing.Point(266, 6); + this.pbRecoverAOAIndexer.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverAOAIndexer.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverAOAIndexer.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverAOAIndexer.Name = "pbRecoverAOAIndexer"; - this.pbRecoverAOAIndexer.Size = new System.Drawing.Size(32, 31); + this.pbRecoverAOAIndexer.Size = new System.Drawing.Size(16, 16); this.pbRecoverAOAIndexer.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverAOAIndexer.TabIndex = 94; this.pbRecoverAOAIndexer.TabStop = false; @@ -1830,11 +1831,11 @@ private void InitializeComponent() this.tabTrim.Controls.Add(this.pbRecoverPitchTrim); this.tabTrim.Controls.Add(this.pbRecoverRollTrim); this.tabTrim.Controls.Add(this.chkRollTrim); - this.tabTrim.Location = new System.Drawing.Point(8, 70); - this.tabTrim.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabTrim.Location = new System.Drawing.Point(4, 40); + this.tabTrim.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabTrim.Name = "tabTrim"; - this.tabTrim.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabTrim.Size = new System.Drawing.Size(1019, 817); + this.tabTrim.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabTrim.Size = new System.Drawing.Size(507, 419); this.tabTrim.TabIndex = 6; this.tabTrim.Text = "Manual Trim"; this.tabTrim.UseVisualStyleBackColor = true; @@ -1842,10 +1843,10 @@ private void InitializeComponent() // chkPitchTrim // this.chkPitchTrim.AutoSize = true; - this.chkPitchTrim.Location = new System.Drawing.Point(12, 11); - this.chkPitchTrim.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkPitchTrim.Location = new System.Drawing.Point(6, 6); + this.chkPitchTrim.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkPitchTrim.Name = "chkPitchTrim"; - this.chkPitchTrim.Size = new System.Drawing.Size(228, 29); + this.chkPitchTrim.Size = new System.Drawing.Size(117, 17); this.chkPitchTrim.TabIndex = 39; this.chkPitchTrim.Text = "Pitch Trim Indicator"; this.chkPitchTrim.UseVisualStyleBackColor = true; @@ -1857,12 +1858,12 @@ private void InitializeComponent() this.pbRecoverPitchTrim.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverPitchTrim.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverPitchTrim.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverPitchTrim.Location = new System.Drawing.Point(541, 11); - this.pbRecoverPitchTrim.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverPitchTrim.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverPitchTrim.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverPitchTrim.Location = new System.Drawing.Point(270, 6); + this.pbRecoverPitchTrim.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverPitchTrim.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverPitchTrim.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverPitchTrim.Name = "pbRecoverPitchTrim"; - this.pbRecoverPitchTrim.Size = new System.Drawing.Size(32, 31); + this.pbRecoverPitchTrim.Size = new System.Drawing.Size(16, 16); this.pbRecoverPitchTrim.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverPitchTrim.TabIndex = 65; this.pbRecoverPitchTrim.TabStop = false; @@ -1874,12 +1875,12 @@ private void InitializeComponent() this.pbRecoverRollTrim.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverRollTrim.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverRollTrim.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverRollTrim.Location = new System.Drawing.Point(541, 56); - this.pbRecoverRollTrim.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverRollTrim.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverRollTrim.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverRollTrim.Location = new System.Drawing.Point(270, 29); + this.pbRecoverRollTrim.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverRollTrim.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverRollTrim.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverRollTrim.Name = "pbRecoverRollTrim"; - this.pbRecoverRollTrim.Size = new System.Drawing.Size(32, 31); + this.pbRecoverRollTrim.Size = new System.Drawing.Size(16, 16); this.pbRecoverRollTrim.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverRollTrim.TabIndex = 63; this.pbRecoverRollTrim.TabStop = false; @@ -1888,10 +1889,10 @@ private void InitializeComponent() // chkRollTrim // this.chkRollTrim.AutoSize = true; - this.chkRollTrim.Location = new System.Drawing.Point(12, 56); - this.chkRollTrim.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkRollTrim.Location = new System.Drawing.Point(6, 29); + this.chkRollTrim.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkRollTrim.Name = "chkRollTrim"; - this.chkRollTrim.Size = new System.Drawing.Size(217, 29); + this.chkRollTrim.Size = new System.Drawing.Size(111, 17); this.chkRollTrim.TabIndex = 40; this.chkRollTrim.Text = "Roll Trim Indicator"; this.chkRollTrim.UseVisualStyleBackColor = true; @@ -1901,11 +1902,11 @@ private void InitializeComponent() // this.tabEPU.Controls.Add(this.chkEPU); this.tabEPU.Controls.Add(this.pbRecoverEPUFuel); - this.tabEPU.Location = new System.Drawing.Point(8, 70); - this.tabEPU.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabEPU.Location = new System.Drawing.Point(4, 40); + this.tabEPU.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabEPU.Name = "tabEPU"; - this.tabEPU.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabEPU.Size = new System.Drawing.Size(1019, 817); + this.tabEPU.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabEPU.Size = new System.Drawing.Size(507, 419); this.tabEPU.TabIndex = 15; this.tabEPU.Text = "EPU"; this.tabEPU.UseVisualStyleBackColor = true; @@ -1913,10 +1914,10 @@ private void InitializeComponent() // chkEPU // this.chkEPU.AutoSize = true; - this.chkEPU.Location = new System.Drawing.Point(12, 11); - this.chkEPU.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkEPU.Location = new System.Drawing.Point(6, 6); + this.chkEPU.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkEPU.Name = "chkEPU"; - this.chkEPU.Size = new System.Drawing.Size(205, 29); + this.chkEPU.Size = new System.Drawing.Size(106, 17); this.chkEPU.TabIndex = 64; this.chkEPU.Text = "EPU Fuel Gauge"; this.chkEPU.UseVisualStyleBackColor = true; @@ -1928,12 +1929,12 @@ private void InitializeComponent() this.pbRecoverEPUFuel.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverEPUFuel.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverEPUFuel.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverEPUFuel.Location = new System.Drawing.Point(533, 11); - this.pbRecoverEPUFuel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverEPUFuel.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverEPUFuel.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverEPUFuel.Location = new System.Drawing.Point(266, 6); + this.pbRecoverEPUFuel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverEPUFuel.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverEPUFuel.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverEPUFuel.Name = "pbRecoverEPUFuel"; - this.pbRecoverEPUFuel.Size = new System.Drawing.Size(32, 31); + this.pbRecoverEPUFuel.Size = new System.Drawing.Size(16, 16); this.pbRecoverEPUFuel.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverEPUFuel.TabIndex = 65; this.pbRecoverEPUFuel.TabStop = false; @@ -1945,11 +1946,11 @@ private void InitializeComponent() this.tabGearAndBrakes.Controls.Add(this.pbRecoverSpeedbrake); this.tabGearAndBrakes.Controls.Add(this.chkGearLights); this.tabGearAndBrakes.Controls.Add(this.pbRecoverGearLights); - this.tabGearAndBrakes.Location = new System.Drawing.Point(8, 70); - this.tabGearAndBrakes.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabGearAndBrakes.Location = new System.Drawing.Point(4, 40); + this.tabGearAndBrakes.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabGearAndBrakes.Name = "tabGearAndBrakes"; - this.tabGearAndBrakes.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabGearAndBrakes.Size = new System.Drawing.Size(1019, 817); + this.tabGearAndBrakes.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabGearAndBrakes.Size = new System.Drawing.Size(507, 419); this.tabGearAndBrakes.TabIndex = 16; this.tabGearAndBrakes.Text = "Gear & Brakes"; this.tabGearAndBrakes.UseVisualStyleBackColor = true; @@ -1957,10 +1958,10 @@ private void InitializeComponent() // chkSpeedbrake // this.chkSpeedbrake.AutoSize = true; - this.chkSpeedbrake.Location = new System.Drawing.Point(12, 56); - this.chkSpeedbrake.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkSpeedbrake.Location = new System.Drawing.Point(6, 29); + this.chkSpeedbrake.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkSpeedbrake.Name = "chkSpeedbrake"; - this.chkSpeedbrake.Size = new System.Drawing.Size(339, 29); + this.chkSpeedbrake.Size = new System.Drawing.Size(172, 17); this.chkSpeedbrake.TabIndex = 67; this.chkSpeedbrake.Text = "Speed Brake Position Indicator"; this.chkSpeedbrake.UseVisualStyleBackColor = true; @@ -1972,12 +1973,12 @@ private void InitializeComponent() this.pbRecoverSpeedbrake.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverSpeedbrake.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverSpeedbrake.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverSpeedbrake.Location = new System.Drawing.Point(528, 56); - this.pbRecoverSpeedbrake.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverSpeedbrake.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverSpeedbrake.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverSpeedbrake.Location = new System.Drawing.Point(264, 29); + this.pbRecoverSpeedbrake.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverSpeedbrake.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverSpeedbrake.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverSpeedbrake.Name = "pbRecoverSpeedbrake"; - this.pbRecoverSpeedbrake.Size = new System.Drawing.Size(32, 31); + this.pbRecoverSpeedbrake.Size = new System.Drawing.Size(16, 16); this.pbRecoverSpeedbrake.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverSpeedbrake.TabIndex = 68; this.pbRecoverSpeedbrake.TabStop = false; @@ -1986,10 +1987,10 @@ private void InitializeComponent() // chkGearLights // this.chkGearLights.AutoSize = true; - this.chkGearLights.Location = new System.Drawing.Point(12, 11); - this.chkGearLights.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkGearLights.Location = new System.Drawing.Point(6, 6); + this.chkGearLights.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkGearLights.Name = "chkGearLights"; - this.chkGearLights.Size = new System.Drawing.Size(240, 29); + this.chkGearLights.Size = new System.Drawing.Size(124, 17); this.chkGearLights.TabIndex = 66; this.chkGearLights.Text = "Wheels Down Lights"; this.chkGearLights.UseVisualStyleBackColor = true; @@ -2001,12 +2002,12 @@ private void InitializeComponent() this.pbRecoverGearLights.ErrorImage = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverGearLights.Image = global::MFDExtractor.Properties.Resources.restore; this.pbRecoverGearLights.InitialImage = global::MFDExtractor.Properties.Resources.restore; - this.pbRecoverGearLights.Location = new System.Drawing.Point(528, 11); - this.pbRecoverGearLights.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.pbRecoverGearLights.MaximumSize = new System.Drawing.Size(32, 31); - this.pbRecoverGearLights.MinimumSize = new System.Drawing.Size(32, 31); + this.pbRecoverGearLights.Location = new System.Drawing.Point(264, 6); + this.pbRecoverGearLights.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.pbRecoverGearLights.MaximumSize = new System.Drawing.Size(16, 16); + this.pbRecoverGearLights.MinimumSize = new System.Drawing.Size(16, 16); this.pbRecoverGearLights.Name = "pbRecoverGearLights"; - this.pbRecoverGearLights.Size = new System.Drawing.Size(32, 31); + this.pbRecoverGearLights.Size = new System.Drawing.Size(16, 16); this.pbRecoverGearLights.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbRecoverGearLights.TabIndex = 69; this.pbRecoverGearLights.TabStop = false; @@ -2015,11 +2016,11 @@ private void InitializeComponent() // tabHotkeys // this.tabHotkeys.Controls.Add(this.panel2); - this.tabHotkeys.Location = new System.Drawing.Point(8, 39); - this.tabHotkeys.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabHotkeys.Location = new System.Drawing.Point(4, 22); + this.tabHotkeys.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabHotkeys.Name = "tabHotkeys"; - this.tabHotkeys.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabHotkeys.Size = new System.Drawing.Size(1040, 902); + this.tabHotkeys.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabHotkeys.Size = new System.Drawing.Size(520, 467); this.tabHotkeys.TabIndex = 6; this.tabHotkeys.Text = "Hotkeys"; this.tabHotkeys.UseVisualStyleBackColor = true; @@ -2028,10 +2029,10 @@ private void InitializeComponent() // this.panel2.Controls.Add(this.tabHotkeysInner); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(5, 6); - this.panel2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.panel2.Location = new System.Drawing.Point(2, 3); + this.panel2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1030, 890); + this.panel2.Size = new System.Drawing.Size(516, 461); this.panel2.TabIndex = 156; // // tabHotkeysInner @@ -2044,21 +2045,21 @@ private void InitializeComponent() this.tabHotkeysInner.Controls.Add(this.tabISISKeys); this.tabHotkeysInner.Dock = System.Windows.Forms.DockStyle.Fill; this.tabHotkeysInner.Location = new System.Drawing.Point(0, 0); - this.tabHotkeysInner.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabHotkeysInner.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabHotkeysInner.Name = "tabHotkeysInner"; this.tabHotkeysInner.SelectedIndex = 0; - this.tabHotkeysInner.Size = new System.Drawing.Size(1030, 890); + this.tabHotkeysInner.Size = new System.Drawing.Size(516, 461); this.tabHotkeysInner.TabIndex = 156; // // tabGeneralKeys // this.tabGeneralKeys.Controls.Add(this.lblNVIS); this.tabGeneralKeys.Controls.Add(this.cmdNV); - this.tabGeneralKeys.Location = new System.Drawing.Point(8, 39); - this.tabGeneralKeys.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabGeneralKeys.Location = new System.Drawing.Point(4, 22); + this.tabGeneralKeys.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabGeneralKeys.Name = "tabGeneralKeys"; - this.tabGeneralKeys.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabGeneralKeys.Size = new System.Drawing.Size(1014, 843); + this.tabGeneralKeys.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabGeneralKeys.Size = new System.Drawing.Size(508, 435); this.tabGeneralKeys.TabIndex = 0; this.tabGeneralKeys.Text = "General"; this.tabGeneralKeys.UseVisualStyleBackColor = true; @@ -2066,19 +2067,19 @@ private void InitializeComponent() // lblNVIS // this.lblNVIS.AutoSize = true; - this.lblNVIS.Location = new System.Drawing.Point(20, 19); - this.lblNVIS.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblNVIS.Location = new System.Drawing.Point(10, 10); + this.lblNVIS.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblNVIS.Name = "lblNVIS"; - this.lblNVIS.Size = new System.Drawing.Size(198, 25); + this.lblNVIS.Size = new System.Drawing.Size(101, 13); this.lblNVIS.TabIndex = 7; this.lblNVIS.Text = "NVIS Mode Toggle:"; // // cmdNV // - this.cmdNV.Location = new System.Drawing.Point(235, 10); - this.cmdNV.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdNV.Location = new System.Drawing.Point(118, 5); + this.cmdNV.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdNV.Name = "cmdNV"; - this.cmdNV.Size = new System.Drawing.Size(149, 44); + this.cmdNV.Size = new System.Drawing.Size(74, 23); this.cmdNV.TabIndex = 8; this.cmdNV.Text = "View/Set..."; this.cmdNV.UseVisualStyleBackColor = true; @@ -2087,11 +2088,11 @@ private void InitializeComponent() // tabAccelerometerKeys // this.tabAccelerometerKeys.Controls.Add(this.gbAccelerometer); - this.tabAccelerometerKeys.Location = new System.Drawing.Point(8, 39); - this.tabAccelerometerKeys.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabAccelerometerKeys.Location = new System.Drawing.Point(4, 22); + this.tabAccelerometerKeys.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabAccelerometerKeys.Name = "tabAccelerometerKeys"; - this.tabAccelerometerKeys.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabAccelerometerKeys.Size = new System.Drawing.Size(1019, 848); + this.tabAccelerometerKeys.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabAccelerometerKeys.Size = new System.Drawing.Size(507, 437); this.tabAccelerometerKeys.TabIndex = 4; this.tabAccelerometerKeys.Text = "Accelerometer"; this.tabAccelerometerKeys.UseVisualStyleBackColor = true; @@ -2099,11 +2100,11 @@ private void InitializeComponent() // gbAccelerometer // this.gbAccelerometer.Controls.Add(this.groupBox5); - this.gbAccelerometer.Location = new System.Drawing.Point(12, 11); - this.gbAccelerometer.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.gbAccelerometer.Location = new System.Drawing.Point(6, 6); + this.gbAccelerometer.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbAccelerometer.Name = "gbAccelerometer"; - this.gbAccelerometer.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.gbAccelerometer.Size = new System.Drawing.Size(381, 171); + this.gbAccelerometer.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbAccelerometer.Size = new System.Drawing.Size(190, 89); this.gbAccelerometer.TabIndex = 11; this.gbAccelerometer.TabStop = false; this.gbAccelerometer.Text = "Accelerometer Hotkeys"; @@ -2112,21 +2113,21 @@ private void InitializeComponent() // this.groupBox5.Controls.Add(this.cmdAccelerometerResetButtonPressed); this.groupBox5.Controls.Add(this.lblAccelerometerResetButtonPressed); - this.groupBox5.Location = new System.Drawing.Point(19, 36); - this.groupBox5.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.groupBox5.Location = new System.Drawing.Point(10, 19); + this.groupBox5.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.groupBox5.Size = new System.Drawing.Size(347, 108); + this.groupBox5.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.groupBox5.Size = new System.Drawing.Size(174, 56); this.groupBox5.TabIndex = 6; this.groupBox5.TabStop = false; this.groupBox5.Text = "Reset Button"; // // cmdAccelerometerResetButtonPressed // - this.cmdAccelerometerResetButtonPressed.Location = new System.Drawing.Point(155, 36); - this.cmdAccelerometerResetButtonPressed.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdAccelerometerResetButtonPressed.Location = new System.Drawing.Point(78, 19); + this.cmdAccelerometerResetButtonPressed.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdAccelerometerResetButtonPressed.Name = "cmdAccelerometerResetButtonPressed"; - this.cmdAccelerometerResetButtonPressed.Size = new System.Drawing.Size(149, 44); + this.cmdAccelerometerResetButtonPressed.Size = new System.Drawing.Size(74, 23); this.cmdAccelerometerResetButtonPressed.TabIndex = 5; this.cmdAccelerometerResetButtonPressed.Text = "View/Set..."; this.cmdAccelerometerResetButtonPressed.UseVisualStyleBackColor = true; @@ -2135,21 +2136,21 @@ private void InitializeComponent() // lblAccelerometerResetButtonPressed // this.lblAccelerometerResetButtonPressed.AutoSize = true; - this.lblAccelerometerResetButtonPressed.Location = new System.Drawing.Point(21, 46); - this.lblAccelerometerResetButtonPressed.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblAccelerometerResetButtonPressed.Location = new System.Drawing.Point(10, 24); + this.lblAccelerometerResetButtonPressed.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblAccelerometerResetButtonPressed.Name = "lblAccelerometerResetButtonPressed"; - this.lblAccelerometerResetButtonPressed.Size = new System.Drawing.Size(97, 25); + this.lblAccelerometerResetButtonPressed.Size = new System.Drawing.Size(48, 13); this.lblAccelerometerResetButtonPressed.TabIndex = 4; this.lblAccelerometerResetButtonPressed.Text = "Pressed:"; // // tabASI // this.tabASI.Controls.Add(this.gbAirspeedIndicator); - this.tabASI.Location = new System.Drawing.Point(8, 39); - this.tabASI.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabASI.Location = new System.Drawing.Point(4, 22); + this.tabASI.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabASI.Name = "tabASI"; - this.tabASI.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabASI.Size = new System.Drawing.Size(1019, 848); + this.tabASI.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabASI.Size = new System.Drawing.Size(507, 437); this.tabASI.TabIndex = 2; this.tabASI.Text = "Airspeed Indicator"; this.tabASI.UseVisualStyleBackColor = true; @@ -2157,11 +2158,11 @@ private void InitializeComponent() // gbAirspeedIndicator // this.gbAirspeedIndicator.Controls.Add(this.gbASIIndexKnob); - this.gbAirspeedIndicator.Location = new System.Drawing.Point(12, 11); - this.gbAirspeedIndicator.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.gbAirspeedIndicator.Location = new System.Drawing.Point(6, 6); + this.gbAirspeedIndicator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbAirspeedIndicator.Name = "gbAirspeedIndicator"; - this.gbAirspeedIndicator.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.gbAirspeedIndicator.Size = new System.Drawing.Size(384, 210); + this.gbAirspeedIndicator.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbAirspeedIndicator.Size = new System.Drawing.Size(192, 109); this.gbAirspeedIndicator.TabIndex = 14; this.gbAirspeedIndicator.TabStop = false; this.gbAirspeedIndicator.Text = "Airspeed Indicator Hotkeys"; @@ -2172,11 +2173,11 @@ private void InitializeComponent() this.gbASIIndexKnob.Controls.Add(this.cmdAirspeedIndexIncreaseHotkey); this.gbASIIndexKnob.Controls.Add(this.lblAirspeedIndexDecreaseHotkey); this.gbASIIndexKnob.Controls.Add(this.cmdAirspeedIndexDecreaseHotkey); - this.gbASIIndexKnob.Location = new System.Drawing.Point(12, 36); - this.gbASIIndexKnob.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.gbASIIndexKnob.Location = new System.Drawing.Point(6, 19); + this.gbASIIndexKnob.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbASIIndexKnob.Name = "gbASIIndexKnob"; - this.gbASIIndexKnob.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.gbASIIndexKnob.Size = new System.Drawing.Size(356, 150); + this.gbASIIndexKnob.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbASIIndexKnob.Size = new System.Drawing.Size(178, 78); this.gbASIIndexKnob.TabIndex = 7; this.gbASIIndexKnob.TabStop = false; this.gbASIIndexKnob.Text = "Index Knob"; @@ -2184,19 +2185,19 @@ private void InitializeComponent() // lblAirspeedIndexIncreaseHotkey // this.lblAirspeedIndexIncreaseHotkey.AutoSize = true; - this.lblAirspeedIndexIncreaseHotkey.Location = new System.Drawing.Point(12, 46); - this.lblAirspeedIndexIncreaseHotkey.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblAirspeedIndexIncreaseHotkey.Location = new System.Drawing.Point(6, 24); + this.lblAirspeedIndexIncreaseHotkey.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblAirspeedIndexIncreaseHotkey.Name = "lblAirspeedIndexIncreaseHotkey"; - this.lblAirspeedIndexIncreaseHotkey.Size = new System.Drawing.Size(112, 25); + this.lblAirspeedIndexIncreaseHotkey.Size = new System.Drawing.Size(57, 13); this.lblAirspeedIndexIncreaseHotkey.TabIndex = 0; this.lblAirspeedIndexIncreaseHotkey.Text = "Increment:"; // // cmdAirspeedIndexIncreaseHotkey // - this.cmdAirspeedIndexIncreaseHotkey.Location = new System.Drawing.Point(164, 36); - this.cmdAirspeedIndexIncreaseHotkey.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdAirspeedIndexIncreaseHotkey.Location = new System.Drawing.Point(82, 19); + this.cmdAirspeedIndexIncreaseHotkey.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdAirspeedIndexIncreaseHotkey.Name = "cmdAirspeedIndexIncreaseHotkey"; - this.cmdAirspeedIndexIncreaseHotkey.Size = new System.Drawing.Size(149, 44); + this.cmdAirspeedIndexIncreaseHotkey.Size = new System.Drawing.Size(74, 23); this.cmdAirspeedIndexIncreaseHotkey.TabIndex = 1; this.cmdAirspeedIndexIncreaseHotkey.Text = "View/Set..."; this.cmdAirspeedIndexIncreaseHotkey.UseVisualStyleBackColor = true; @@ -2205,19 +2206,19 @@ private void InitializeComponent() // lblAirspeedIndexDecreaseHotkey // this.lblAirspeedIndexDecreaseHotkey.AutoSize = true; - this.lblAirspeedIndexDecreaseHotkey.Location = new System.Drawing.Point(12, 102); - this.lblAirspeedIndexDecreaseHotkey.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblAirspeedIndexDecreaseHotkey.Location = new System.Drawing.Point(6, 53); + this.lblAirspeedIndexDecreaseHotkey.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblAirspeedIndexDecreaseHotkey.Name = "lblAirspeedIndexDecreaseHotkey"; - this.lblAirspeedIndexDecreaseHotkey.Size = new System.Drawing.Size(122, 25); + this.lblAirspeedIndexDecreaseHotkey.Size = new System.Drawing.Size(62, 13); this.lblAirspeedIndexDecreaseHotkey.TabIndex = 2; this.lblAirspeedIndexDecreaseHotkey.Text = "Decrement:"; // // cmdAirspeedIndexDecreaseHotkey // - this.cmdAirspeedIndexDecreaseHotkey.Location = new System.Drawing.Point(164, 92); - this.cmdAirspeedIndexDecreaseHotkey.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdAirspeedIndexDecreaseHotkey.Location = new System.Drawing.Point(82, 48); + this.cmdAirspeedIndexDecreaseHotkey.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdAirspeedIndexDecreaseHotkey.Name = "cmdAirspeedIndexDecreaseHotkey"; - this.cmdAirspeedIndexDecreaseHotkey.Size = new System.Drawing.Size(149, 44); + this.cmdAirspeedIndexDecreaseHotkey.Size = new System.Drawing.Size(74, 23); this.cmdAirspeedIndexDecreaseHotkey.TabIndex = 3; this.cmdAirspeedIndexDecreaseHotkey.Text = "View/Set..."; this.cmdAirspeedIndexDecreaseHotkey.UseVisualStyleBackColor = true; @@ -2226,11 +2227,11 @@ private void InitializeComponent() // tabAzimuthIndicatorKeys // this.tabAzimuthIndicatorKeys.Controls.Add(this.gbAzimuthIndicator); - this.tabAzimuthIndicatorKeys.Location = new System.Drawing.Point(8, 39); - this.tabAzimuthIndicatorKeys.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabAzimuthIndicatorKeys.Location = new System.Drawing.Point(4, 22); + this.tabAzimuthIndicatorKeys.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabAzimuthIndicatorKeys.Name = "tabAzimuthIndicatorKeys"; - this.tabAzimuthIndicatorKeys.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabAzimuthIndicatorKeys.Size = new System.Drawing.Size(1019, 848); + this.tabAzimuthIndicatorKeys.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabAzimuthIndicatorKeys.Size = new System.Drawing.Size(507, 437); this.tabAzimuthIndicatorKeys.TabIndex = 3; this.tabAzimuthIndicatorKeys.Text = "Azimuth Indicator"; this.tabAzimuthIndicatorKeys.UseVisualStyleBackColor = true; @@ -2238,11 +2239,11 @@ private void InitializeComponent() // gbAzimuthIndicator // this.gbAzimuthIndicator.Controls.Add(this.gbAzimuthIndicatorBrightnessControl); - this.gbAzimuthIndicator.Location = new System.Drawing.Point(12, 11); - this.gbAzimuthIndicator.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.gbAzimuthIndicator.Location = new System.Drawing.Point(6, 6); + this.gbAzimuthIndicator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbAzimuthIndicator.Name = "gbAzimuthIndicator"; - this.gbAzimuthIndicator.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.gbAzimuthIndicator.Size = new System.Drawing.Size(376, 206); + this.gbAzimuthIndicator.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbAzimuthIndicator.Size = new System.Drawing.Size(188, 107); this.gbAzimuthIndicator.TabIndex = 15; this.gbAzimuthIndicator.TabStop = false; this.gbAzimuthIndicator.Text = "Azimuth Indicator Hotkeys"; @@ -2253,11 +2254,11 @@ private void InitializeComponent() this.gbAzimuthIndicatorBrightnessControl.Controls.Add(this.lblAzimuthIndicatorBrightnessIncrease); this.gbAzimuthIndicatorBrightnessControl.Controls.Add(this.cmdAzimuthIndicatorBrightnessIncrease); this.gbAzimuthIndicatorBrightnessControl.Controls.Add(this.cmdAzimuthIndicatorBrightnessDecrease); - this.gbAzimuthIndicatorBrightnessControl.Location = new System.Drawing.Point(12, 36); - this.gbAzimuthIndicatorBrightnessControl.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.gbAzimuthIndicatorBrightnessControl.Location = new System.Drawing.Point(6, 19); + this.gbAzimuthIndicatorBrightnessControl.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbAzimuthIndicatorBrightnessControl.Name = "gbAzimuthIndicatorBrightnessControl"; - this.gbAzimuthIndicatorBrightnessControl.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.gbAzimuthIndicatorBrightnessControl.Size = new System.Drawing.Size(339, 148); + this.gbAzimuthIndicatorBrightnessControl.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbAzimuthIndicatorBrightnessControl.Size = new System.Drawing.Size(170, 77); this.gbAzimuthIndicatorBrightnessControl.TabIndex = 0; this.gbAzimuthIndicatorBrightnessControl.TabStop = false; this.gbAzimuthIndicatorBrightnessControl.Text = "Brightness Control"; @@ -2265,29 +2266,29 @@ private void InitializeComponent() // lblAzimuthIndicatorBrightnessDecrease // this.lblAzimuthIndicatorBrightnessDecrease.AutoSize = true; - this.lblAzimuthIndicatorBrightnessDecrease.Location = new System.Drawing.Point(12, 102); - this.lblAzimuthIndicatorBrightnessDecrease.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblAzimuthIndicatorBrightnessDecrease.Location = new System.Drawing.Point(6, 53); + this.lblAzimuthIndicatorBrightnessDecrease.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblAzimuthIndicatorBrightnessDecrease.Name = "lblAzimuthIndicatorBrightnessDecrease"; - this.lblAzimuthIndicatorBrightnessDecrease.Size = new System.Drawing.Size(110, 25); + this.lblAzimuthIndicatorBrightnessDecrease.Size = new System.Drawing.Size(56, 13); this.lblAzimuthIndicatorBrightnessDecrease.TabIndex = 2; this.lblAzimuthIndicatorBrightnessDecrease.Text = "Decrease:"; // // lblAzimuthIndicatorBrightnessIncrease // this.lblAzimuthIndicatorBrightnessIncrease.AutoSize = true; - this.lblAzimuthIndicatorBrightnessIncrease.Location = new System.Drawing.Point(12, 46); - this.lblAzimuthIndicatorBrightnessIncrease.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblAzimuthIndicatorBrightnessIncrease.Location = new System.Drawing.Point(6, 24); + this.lblAzimuthIndicatorBrightnessIncrease.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblAzimuthIndicatorBrightnessIncrease.Name = "lblAzimuthIndicatorBrightnessIncrease"; - this.lblAzimuthIndicatorBrightnessIncrease.Size = new System.Drawing.Size(100, 25); + this.lblAzimuthIndicatorBrightnessIncrease.Size = new System.Drawing.Size(51, 13); this.lblAzimuthIndicatorBrightnessIncrease.TabIndex = 0; this.lblAzimuthIndicatorBrightnessIncrease.Text = "Increase:"; // // cmdAzimuthIndicatorBrightnessIncrease // - this.cmdAzimuthIndicatorBrightnessIncrease.Location = new System.Drawing.Point(164, 36); - this.cmdAzimuthIndicatorBrightnessIncrease.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdAzimuthIndicatorBrightnessIncrease.Location = new System.Drawing.Point(82, 19); + this.cmdAzimuthIndicatorBrightnessIncrease.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdAzimuthIndicatorBrightnessIncrease.Name = "cmdAzimuthIndicatorBrightnessIncrease"; - this.cmdAzimuthIndicatorBrightnessIncrease.Size = new System.Drawing.Size(149, 44); + this.cmdAzimuthIndicatorBrightnessIncrease.Size = new System.Drawing.Size(74, 23); this.cmdAzimuthIndicatorBrightnessIncrease.TabIndex = 1; this.cmdAzimuthIndicatorBrightnessIncrease.Text = "View/Set..."; this.cmdAzimuthIndicatorBrightnessIncrease.UseVisualStyleBackColor = true; @@ -2295,10 +2296,10 @@ private void InitializeComponent() // // cmdAzimuthIndicatorBrightnessDecrease // - this.cmdAzimuthIndicatorBrightnessDecrease.Location = new System.Drawing.Point(164, 92); - this.cmdAzimuthIndicatorBrightnessDecrease.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdAzimuthIndicatorBrightnessDecrease.Location = new System.Drawing.Point(82, 48); + this.cmdAzimuthIndicatorBrightnessDecrease.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdAzimuthIndicatorBrightnessDecrease.Name = "cmdAzimuthIndicatorBrightnessDecrease"; - this.cmdAzimuthIndicatorBrightnessDecrease.Size = new System.Drawing.Size(149, 44); + this.cmdAzimuthIndicatorBrightnessDecrease.Size = new System.Drawing.Size(74, 23); this.cmdAzimuthIndicatorBrightnessDecrease.TabIndex = 3; this.cmdAzimuthIndicatorBrightnessDecrease.Text = "View/Set..."; this.cmdAzimuthIndicatorBrightnessDecrease.UseVisualStyleBackColor = true; @@ -2307,11 +2308,11 @@ private void InitializeComponent() // tabEHSIKeys // this.tabEHSIKeys.Controls.Add(this.gbEHSI); - this.tabEHSIKeys.Location = new System.Drawing.Point(8, 39); - this.tabEHSIKeys.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabEHSIKeys.Location = new System.Drawing.Point(4, 22); + this.tabEHSIKeys.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabEHSIKeys.Name = "tabEHSIKeys"; - this.tabEHSIKeys.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabEHSIKeys.Size = new System.Drawing.Size(1019, 848); + this.tabEHSIKeys.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabEHSIKeys.Size = new System.Drawing.Size(507, 437); this.tabEHSIKeys.TabIndex = 1; this.tabEHSIKeys.Text = "EHSI"; this.tabEHSIKeys.UseVisualStyleBackColor = true; @@ -2322,11 +2323,11 @@ private void InitializeComponent() this.gbEHSI.Controls.Add(this.groupBox4); this.gbEHSI.Controls.Add(this.groupBox3); this.gbEHSI.Controls.Add(this.cmdEHSIMenuButtonHotkey); - this.gbEHSI.Location = new System.Drawing.Point(12, 11); - this.gbEHSI.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.gbEHSI.Location = new System.Drawing.Point(6, 6); + this.gbEHSI.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbEHSI.Name = "gbEHSI"; - this.gbEHSI.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.gbEHSI.Size = new System.Drawing.Size(811, 328); + this.gbEHSI.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbEHSI.Size = new System.Drawing.Size(406, 171); this.gbEHSI.TabIndex = 8; this.gbEHSI.TabStop = false; this.gbEHSI.Text = "EHSI Hotkeys"; @@ -2334,10 +2335,10 @@ private void InitializeComponent() // lblEHSIMenuButton // this.lblEHSIMenuButton.AutoSize = true; - this.lblEHSIMenuButton.Location = new System.Drawing.Point(24, 31); - this.lblEHSIMenuButton.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblEHSIMenuButton.Location = new System.Drawing.Point(12, 16); + this.lblEHSIMenuButton.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblEHSIMenuButton.Name = "lblEHSIMenuButton"; - this.lblEHSIMenuButton.Size = new System.Drawing.Size(104, 25); + this.lblEHSIMenuButton.Size = new System.Drawing.Size(53, 13); this.lblEHSIMenuButton.TabIndex = 0; this.lblEHSIMenuButton.Text = "M Button:"; // @@ -2349,11 +2350,11 @@ private void InitializeComponent() this.groupBox4.Controls.Add(this.lblEHSICourseDecreaseHotkey); this.groupBox4.Controls.Add(this.cmdEHSICourseDecreaseKey); this.groupBox4.Controls.Add(this.label54); - this.groupBox4.Location = new System.Drawing.Point(403, 89); - this.groupBox4.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.groupBox4.Location = new System.Drawing.Point(202, 46); + this.groupBox4.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.groupBox4.Size = new System.Drawing.Size(381, 218); + this.groupBox4.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.groupBox4.Size = new System.Drawing.Size(190, 113); this.groupBox4.TabIndex = 2; this.groupBox4.TabStop = false; this.groupBox4.Text = "CRS/BRT Knob"; @@ -2361,19 +2362,19 @@ private void InitializeComponent() // lblEHSICourseIncreaseHotkey // this.lblEHSICourseIncreaseHotkey.AutoSize = true; - this.lblEHSICourseIncreaseHotkey.Location = new System.Drawing.Point(24, 46); - this.lblEHSICourseIncreaseHotkey.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblEHSICourseIncreaseHotkey.Location = new System.Drawing.Point(12, 24); + this.lblEHSICourseIncreaseHotkey.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblEHSICourseIncreaseHotkey.Name = "lblEHSICourseIncreaseHotkey"; - this.lblEHSICourseIncreaseHotkey.Size = new System.Drawing.Size(112, 25); + this.lblEHSICourseIncreaseHotkey.Size = new System.Drawing.Size(57, 13); this.lblEHSICourseIncreaseHotkey.TabIndex = 0; this.lblEHSICourseIncreaseHotkey.Text = "Increment:"; // // cmdEHSICourseIncreaseKey // - this.cmdEHSICourseIncreaseKey.Location = new System.Drawing.Point(196, 36); - this.cmdEHSICourseIncreaseKey.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdEHSICourseIncreaseKey.Location = new System.Drawing.Point(98, 19); + this.cmdEHSICourseIncreaseKey.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdEHSICourseIncreaseKey.Name = "cmdEHSICourseIncreaseKey"; - this.cmdEHSICourseIncreaseKey.Size = new System.Drawing.Size(149, 44); + this.cmdEHSICourseIncreaseKey.Size = new System.Drawing.Size(74, 23); this.cmdEHSICourseIncreaseKey.TabIndex = 1; this.cmdEHSICourseIncreaseKey.Text = "View/Set..."; this.cmdEHSICourseIncreaseKey.UseVisualStyleBackColor = true; @@ -2381,10 +2382,10 @@ private void InitializeComponent() // // cmdEHSICourseKnobDepressedKey // - this.cmdEHSICourseKnobDepressedKey.Location = new System.Drawing.Point(196, 148); - this.cmdEHSICourseKnobDepressedKey.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdEHSICourseKnobDepressedKey.Location = new System.Drawing.Point(98, 77); + this.cmdEHSICourseKnobDepressedKey.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdEHSICourseKnobDepressedKey.Name = "cmdEHSICourseKnobDepressedKey"; - this.cmdEHSICourseKnobDepressedKey.Size = new System.Drawing.Size(149, 44); + this.cmdEHSICourseKnobDepressedKey.Size = new System.Drawing.Size(74, 23); this.cmdEHSICourseKnobDepressedKey.TabIndex = 5; this.cmdEHSICourseKnobDepressedKey.Text = "View/Set..."; this.cmdEHSICourseKnobDepressedKey.UseVisualStyleBackColor = true; @@ -2393,19 +2394,19 @@ private void InitializeComponent() // lblEHSICourseDecreaseHotkey // this.lblEHSICourseDecreaseHotkey.AutoSize = true; - this.lblEHSICourseDecreaseHotkey.Location = new System.Drawing.Point(24, 102); - this.lblEHSICourseDecreaseHotkey.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblEHSICourseDecreaseHotkey.Location = new System.Drawing.Point(12, 53); + this.lblEHSICourseDecreaseHotkey.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblEHSICourseDecreaseHotkey.Name = "lblEHSICourseDecreaseHotkey"; - this.lblEHSICourseDecreaseHotkey.Size = new System.Drawing.Size(122, 25); + this.lblEHSICourseDecreaseHotkey.Size = new System.Drawing.Size(62, 13); this.lblEHSICourseDecreaseHotkey.TabIndex = 2; this.lblEHSICourseDecreaseHotkey.Text = "Decrement:"; // // cmdEHSICourseDecreaseKey // - this.cmdEHSICourseDecreaseKey.Location = new System.Drawing.Point(196, 92); - this.cmdEHSICourseDecreaseKey.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdEHSICourseDecreaseKey.Location = new System.Drawing.Point(98, 48); + this.cmdEHSICourseDecreaseKey.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdEHSICourseDecreaseKey.Name = "cmdEHSICourseDecreaseKey"; - this.cmdEHSICourseDecreaseKey.Size = new System.Drawing.Size(149, 44); + this.cmdEHSICourseDecreaseKey.Size = new System.Drawing.Size(74, 23); this.cmdEHSICourseDecreaseKey.TabIndex = 3; this.cmdEHSICourseDecreaseKey.Text = "View/Set..."; this.cmdEHSICourseDecreaseKey.UseVisualStyleBackColor = true; @@ -2414,10 +2415,10 @@ private void InitializeComponent() // label54 // this.label54.AutoSize = true; - this.label54.Location = new System.Drawing.Point(24, 158); - this.label54.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label54.Location = new System.Drawing.Point(12, 82); + this.label54.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label54.Name = "label54"; - this.label54.Size = new System.Drawing.Size(97, 25); + this.label54.Size = new System.Drawing.Size(48, 13); this.label54.TabIndex = 4; this.label54.Text = "Pressed:"; // @@ -2427,11 +2428,11 @@ private void InitializeComponent() this.groupBox3.Controls.Add(this.cmdEHSIHeadingIncreaseKey); this.groupBox3.Controls.Add(this.label53); this.groupBox3.Controls.Add(this.cmdEHSIHeadingDecreaseKey); - this.groupBox3.Location = new System.Drawing.Point(12, 89); - this.groupBox3.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.groupBox3.Location = new System.Drawing.Point(6, 46); + this.groupBox3.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.groupBox3.Size = new System.Drawing.Size(371, 218); + this.groupBox3.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.groupBox3.Size = new System.Drawing.Size(186, 113); this.groupBox3.TabIndex = 1; this.groupBox3.TabStop = false; this.groupBox3.Text = "HDG/ATT Knob"; @@ -2439,19 +2440,19 @@ private void InitializeComponent() // lblEHSIHeadingIncreaseButton // this.lblEHSIHeadingIncreaseButton.AutoSize = true; - this.lblEHSIHeadingIncreaseButton.Location = new System.Drawing.Point(12, 46); - this.lblEHSIHeadingIncreaseButton.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblEHSIHeadingIncreaseButton.Location = new System.Drawing.Point(6, 24); + this.lblEHSIHeadingIncreaseButton.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblEHSIHeadingIncreaseButton.Name = "lblEHSIHeadingIncreaseButton"; - this.lblEHSIHeadingIncreaseButton.Size = new System.Drawing.Size(112, 25); + this.lblEHSIHeadingIncreaseButton.Size = new System.Drawing.Size(57, 13); this.lblEHSIHeadingIncreaseButton.TabIndex = 0; this.lblEHSIHeadingIncreaseButton.Text = "Increment:"; // // cmdEHSIHeadingIncreaseKey // - this.cmdEHSIHeadingIncreaseKey.Location = new System.Drawing.Point(195, 36); - this.cmdEHSIHeadingIncreaseKey.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdEHSIHeadingIncreaseKey.Location = new System.Drawing.Point(98, 19); + this.cmdEHSIHeadingIncreaseKey.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdEHSIHeadingIncreaseKey.Name = "cmdEHSIHeadingIncreaseKey"; - this.cmdEHSIHeadingIncreaseKey.Size = new System.Drawing.Size(149, 44); + this.cmdEHSIHeadingIncreaseKey.Size = new System.Drawing.Size(74, 23); this.cmdEHSIHeadingIncreaseKey.TabIndex = 1; this.cmdEHSIHeadingIncreaseKey.Text = "View/Set..."; this.cmdEHSIHeadingIncreaseKey.UseVisualStyleBackColor = true; @@ -2460,19 +2461,19 @@ private void InitializeComponent() // label53 // this.label53.AutoSize = true; - this.label53.Location = new System.Drawing.Point(12, 102); - this.label53.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label53.Location = new System.Drawing.Point(6, 53); + this.label53.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(122, 25); + this.label53.Size = new System.Drawing.Size(62, 13); this.label53.TabIndex = 2; this.label53.Text = "Decrement:"; // // cmdEHSIHeadingDecreaseKey // - this.cmdEHSIHeadingDecreaseKey.Location = new System.Drawing.Point(195, 92); - this.cmdEHSIHeadingDecreaseKey.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdEHSIHeadingDecreaseKey.Location = new System.Drawing.Point(98, 48); + this.cmdEHSIHeadingDecreaseKey.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdEHSIHeadingDecreaseKey.Name = "cmdEHSIHeadingDecreaseKey"; - this.cmdEHSIHeadingDecreaseKey.Size = new System.Drawing.Size(149, 44); + this.cmdEHSIHeadingDecreaseKey.Size = new System.Drawing.Size(74, 23); this.cmdEHSIHeadingDecreaseKey.TabIndex = 3; this.cmdEHSIHeadingDecreaseKey.Text = "View/Set..."; this.cmdEHSIHeadingDecreaseKey.UseVisualStyleBackColor = true; @@ -2480,10 +2481,10 @@ private void InitializeComponent() // // cmdEHSIMenuButtonHotkey // - this.cmdEHSIMenuButtonHotkey.Location = new System.Drawing.Point(205, 21); - this.cmdEHSIMenuButtonHotkey.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdEHSIMenuButtonHotkey.Location = new System.Drawing.Point(102, 11); + this.cmdEHSIMenuButtonHotkey.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdEHSIMenuButtonHotkey.Name = "cmdEHSIMenuButtonHotkey"; - this.cmdEHSIMenuButtonHotkey.Size = new System.Drawing.Size(149, 44); + this.cmdEHSIMenuButtonHotkey.Size = new System.Drawing.Size(74, 23); this.cmdEHSIMenuButtonHotkey.TabIndex = 1; this.cmdEHSIMenuButtonHotkey.Text = "View/Set..."; this.cmdEHSIMenuButtonHotkey.UseVisualStyleBackColor = true; @@ -2492,11 +2493,11 @@ private void InitializeComponent() // tabISISKeys // this.tabISISKeys.Controls.Add(this.gbISIS); - this.tabISISKeys.Location = new System.Drawing.Point(8, 39); - this.tabISISKeys.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabISISKeys.Location = new System.Drawing.Point(4, 22); + this.tabISISKeys.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabISISKeys.Name = "tabISISKeys"; - this.tabISISKeys.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabISISKeys.Size = new System.Drawing.Size(1019, 848); + this.tabISISKeys.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabISISKeys.Size = new System.Drawing.Size(507, 437); this.tabISISKeys.TabIndex = 5; this.tabISISKeys.Text = "ISIS"; this.tabISISKeys.UseVisualStyleBackColor = true; @@ -2507,11 +2508,11 @@ private void InitializeComponent() this.gbISIS.Controls.Add(this.cmdISISBrightButtonPressed); this.gbISIS.Controls.Add(this.cmdISISStandardBrightnessButtonPressed); this.gbISIS.Controls.Add(this.lblISISStandardBrightnessButtonPressed); - this.gbISIS.Location = new System.Drawing.Point(12, 11); - this.gbISIS.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.gbISIS.Location = new System.Drawing.Point(6, 6); + this.gbISIS.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbISIS.Name = "gbISIS"; - this.gbISIS.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.gbISIS.Size = new System.Drawing.Size(389, 142); + this.gbISIS.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbISIS.Size = new System.Drawing.Size(194, 74); this.gbISIS.TabIndex = 12; this.gbISIS.TabStop = false; this.gbISIS.Text = "ISIS Hotkeys"; @@ -2519,19 +2520,19 @@ private void InitializeComponent() // lblISISBrightBrightnessButtonPressed // this.lblISISBrightBrightnessButtonPressed.AutoSize = true; - this.lblISISBrightBrightnessButtonPressed.Location = new System.Drawing.Point(24, 36); - this.lblISISBrightBrightnessButtonPressed.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblISISBrightBrightnessButtonPressed.Location = new System.Drawing.Point(12, 19); + this.lblISISBrightBrightnessButtonPressed.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblISISBrightBrightnessButtonPressed.Name = "lblISISBrightBrightnessButtonPressed"; - this.lblISISBrightBrightnessButtonPressed.Size = new System.Drawing.Size(128, 25); + this.lblISISBrightBrightnessButtonPressed.Size = new System.Drawing.Size(66, 13); this.lblISISBrightBrightnessButtonPressed.TabIndex = 0; this.lblISISBrightBrightnessButtonPressed.Text = "BRT Button:"; // // cmdISISBrightButtonPressed // - this.cmdISISBrightButtonPressed.Location = new System.Drawing.Point(176, 28); - this.cmdISISBrightButtonPressed.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdISISBrightButtonPressed.Location = new System.Drawing.Point(88, 15); + this.cmdISISBrightButtonPressed.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdISISBrightButtonPressed.Name = "cmdISISBrightButtonPressed"; - this.cmdISISBrightButtonPressed.Size = new System.Drawing.Size(149, 44); + this.cmdISISBrightButtonPressed.Size = new System.Drawing.Size(74, 23); this.cmdISISBrightButtonPressed.TabIndex = 1; this.cmdISISBrightButtonPressed.Text = "View/Set..."; this.cmdISISBrightButtonPressed.UseVisualStyleBackColor = true; @@ -2539,10 +2540,10 @@ private void InitializeComponent() // // cmdISISStandardBrightnessButtonPressed // - this.cmdISISStandardBrightnessButtonPressed.Location = new System.Drawing.Point(176, 81); - this.cmdISISStandardBrightnessButtonPressed.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdISISStandardBrightnessButtonPressed.Location = new System.Drawing.Point(88, 42); + this.cmdISISStandardBrightnessButtonPressed.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdISISStandardBrightnessButtonPressed.Name = "cmdISISStandardBrightnessButtonPressed"; - this.cmdISISStandardBrightnessButtonPressed.Size = new System.Drawing.Size(149, 44); + this.cmdISISStandardBrightnessButtonPressed.Size = new System.Drawing.Size(74, 23); this.cmdISISStandardBrightnessButtonPressed.TabIndex = 3; this.cmdISISStandardBrightnessButtonPressed.Text = "View/Set..."; this.cmdISISStandardBrightnessButtonPressed.UseVisualStyleBackColor = true; @@ -2551,21 +2552,21 @@ private void InitializeComponent() // lblISISStandardBrightnessButtonPressed // this.lblISISStandardBrightnessButtonPressed.AutoSize = true; - this.lblISISStandardBrightnessButtonPressed.Location = new System.Drawing.Point(24, 90); - this.lblISISStandardBrightnessButtonPressed.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblISISStandardBrightnessButtonPressed.Location = new System.Drawing.Point(12, 47); + this.lblISISStandardBrightnessButtonPressed.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblISISStandardBrightnessButtonPressed.Name = "lblISISStandardBrightnessButtonPressed"; - this.lblISISStandardBrightnessButtonPressed.Size = new System.Drawing.Size(128, 25); + this.lblISISStandardBrightnessButtonPressed.Size = new System.Drawing.Size(66, 13); this.lblISISStandardBrightnessButtonPressed.TabIndex = 2; this.lblISISStandardBrightnessButtonPressed.Text = "STD Button:"; // // tabNetworking // this.tabNetworking.Controls.Add(this.grpNetworkMode); - this.tabNetworking.Location = new System.Drawing.Point(8, 39); - this.tabNetworking.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabNetworking.Location = new System.Drawing.Point(4, 22); + this.tabNetworking.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabNetworking.Name = "tabNetworking"; - this.tabNetworking.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabNetworking.Size = new System.Drawing.Size(1040, 902); + this.tabNetworking.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabNetworking.Size = new System.Drawing.Size(520, 467); this.tabNetworking.TabIndex = 16; this.tabNetworking.Text = "Networking"; this.tabNetworking.UseVisualStyleBackColor = true; @@ -2576,103 +2577,25 @@ private void InitializeComponent() this.grpNetworkMode.Controls.Add(this.grpClientOptions); this.grpNetworkMode.Controls.Add(this.grpServerOptions); this.grpNetworkMode.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpNetworkMode.Location = new System.Drawing.Point(5, 6); - this.grpNetworkMode.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.grpNetworkMode.Location = new System.Drawing.Point(2, 3); + this.grpNetworkMode.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.grpNetworkMode.Name = "grpNetworkMode"; - this.grpNetworkMode.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.grpNetworkMode.Size = new System.Drawing.Size(1030, 890); + this.grpNetworkMode.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.grpNetworkMode.Size = new System.Drawing.Size(516, 461); this.grpNetworkMode.TabIndex = 58; this.grpNetworkMode.TabStop = false; this.grpNetworkMode.Text = "Networking"; // - // grpServerOptions - // - this.grpServerOptions.Controls.Add(this.lblCompressionType); - this.grpServerOptions.Controls.Add(this.cboCompressionType); - this.grpServerOptions.Controls.Add(this.lblImageFormat); - this.grpServerOptions.Controls.Add(this.cboImageFormat); - this.grpServerOptions.Controls.Add(this.lblServerServerPortNum); - this.grpServerOptions.Controls.Add(this.txtNetworkServerUsePortNum); - this.grpServerOptions.Location = new System.Drawing.Point(232, 31); - this.grpServerOptions.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.grpServerOptions.Name = "grpServerOptions"; - this.grpServerOptions.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.grpServerOptions.Size = new System.Drawing.Size(467, 182); - this.grpServerOptions.TabIndex = 45; - this.grpServerOptions.TabStop = false; - this.grpServerOptions.Text = "Server Options"; - // - // lblCompressionType - // - this.lblCompressionType.AutoSize = true; - this.lblCompressionType.Location = new System.Drawing.Point(8, 125); - this.lblCompressionType.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); - this.lblCompressionType.Name = "lblCompressionType"; - this.lblCompressionType.Size = new System.Drawing.Size(198, 25); - this.lblCompressionType.TabIndex = 92; - this.lblCompressionType.Text = "Compression Type:"; - // - // cboCompressionType - // - this.cboCompressionType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboCompressionType.FormattingEnabled = true; - this.cboCompressionType.Location = new System.Drawing.Point(213, 119); - this.cboCompressionType.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.cboCompressionType.Name = "cboCompressionType"; - this.cboCompressionType.Size = new System.Drawing.Size(169, 33); - this.cboCompressionType.TabIndex = 48; - // - // lblImageFormat - // - this.lblImageFormat.AutoSize = true; - this.lblImageFormat.Location = new System.Drawing.Point(53, 79); - this.lblImageFormat.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); - this.lblImageFormat.Name = "lblImageFormat"; - this.lblImageFormat.Size = new System.Drawing.Size(149, 25); - this.lblImageFormat.TabIndex = 90; - this.lblImageFormat.Text = "Image Format:"; - // - // cboImageFormat - // - this.cboImageFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboImageFormat.FormattingEnabled = true; - this.cboImageFormat.Location = new System.Drawing.Point(213, 71); - this.cboImageFormat.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.cboImageFormat.Name = "cboImageFormat"; - this.cboImageFormat.Size = new System.Drawing.Size(169, 33); - this.cboImageFormat.TabIndex = 47; - this.cboImageFormat.SelectedIndexChanged += new System.EventHandler(this.cboImageFormat_SelectedIndexChanged); - // - // lblServerServerPortNum - // - this.lblServerServerPortNum.AutoSize = true; - this.lblServerServerPortNum.Location = new System.Drawing.Point(68, 31); - this.lblServerServerPortNum.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); - this.lblServerServerPortNum.Name = "lblServerServerPortNum"; - this.lblServerServerPortNum.Size = new System.Drawing.Size(138, 25); - this.lblServerServerPortNum.TabIndex = 5; - this.lblServerServerPortNum.Text = "Port Number:"; - this.lblServerServerPortNum.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // txtNetworkServerUsePortNum - // - this.txtNetworkServerUsePortNum.Location = new System.Drawing.Point(213, 25); - this.txtNetworkServerUsePortNum.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.txtNetworkServerUsePortNum.MaxLength = 5; - this.txtNetworkServerUsePortNum.Name = "txtNetworkServerUsePortNum"; - this.txtNetworkServerUsePortNum.Size = new System.Drawing.Size(169, 31); - this.txtNetworkServerUsePortNum.TabIndex = 46; - // // gbNetworkingMode // this.gbNetworkingMode.Controls.Add(this.rdoServer); this.gbNetworkingMode.Controls.Add(this.rdoStandalone); this.gbNetworkingMode.Controls.Add(this.rdoClient); - this.gbNetworkingMode.Location = new System.Drawing.Point(32, 31); - this.gbNetworkingMode.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.gbNetworkingMode.Location = new System.Drawing.Point(16, 16); + this.gbNetworkingMode.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbNetworkingMode.Name = "gbNetworkingMode"; - this.gbNetworkingMode.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.gbNetworkingMode.Size = new System.Drawing.Size(188, 179); + this.gbNetworkingMode.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbNetworkingMode.Size = new System.Drawing.Size(94, 93); this.gbNetworkingMode.TabIndex = 58; this.gbNetworkingMode.TabStop = false; this.gbNetworkingMode.Text = "Mode"; @@ -2680,10 +2603,10 @@ private void InitializeComponent() // rdoServer // this.rdoServer.AutoSize = true; - this.rdoServer.Location = new System.Drawing.Point(12, 119); - this.rdoServer.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoServer.Location = new System.Drawing.Point(6, 62); + this.rdoServer.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoServer.Name = "rdoServer"; - this.rdoServer.Size = new System.Drawing.Size(106, 29); + this.rdoServer.Size = new System.Drawing.Size(56, 17); this.rdoServer.TabIndex = 41; this.rdoServer.TabStop = true; this.rdoServer.Text = "Server"; @@ -2693,10 +2616,10 @@ private void InitializeComponent() // rdoStandalone // this.rdoStandalone.AutoSize = true; - this.rdoStandalone.Location = new System.Drawing.Point(12, 31); - this.rdoStandalone.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoStandalone.Location = new System.Drawing.Point(6, 16); + this.rdoStandalone.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoStandalone.Name = "rdoStandalone"; - this.rdoStandalone.Size = new System.Drawing.Size(152, 29); + this.rdoStandalone.Size = new System.Drawing.Size(79, 17); this.rdoStandalone.TabIndex = 39; this.rdoStandalone.TabStop = true; this.rdoStandalone.Text = "Standalone"; @@ -2706,10 +2629,10 @@ private void InitializeComponent() // rdoClient // this.rdoClient.AutoSize = true; - this.rdoClient.Location = new System.Drawing.Point(12, 75); - this.rdoClient.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.rdoClient.Location = new System.Drawing.Point(6, 39); + this.rdoClient.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rdoClient.Name = "rdoClient"; - this.rdoClient.Size = new System.Drawing.Size(98, 29); + this.rdoClient.Size = new System.Drawing.Size(51, 17); this.rdoClient.TabIndex = 40; this.rdoClient.TabStop = true; this.rdoClient.Text = "Client"; @@ -2722,63 +2645,141 @@ private void InitializeComponent() this.grpClientOptions.Controls.Add(this.lblClientServerPortNum); this.grpClientOptions.Controls.Add(this.txtNetworkClientUseServerPortNum); this.grpClientOptions.Controls.Add(this.lblServerIpAddress); - this.grpClientOptions.Location = new System.Drawing.Point(232, 31); - this.grpClientOptions.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.grpClientOptions.Location = new System.Drawing.Point(116, 16); + this.grpClientOptions.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.grpClientOptions.Name = "grpClientOptions"; - this.grpClientOptions.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.grpClientOptions.Size = new System.Drawing.Size(467, 131); + this.grpClientOptions.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.grpClientOptions.Size = new System.Drawing.Size(234, 68); this.grpClientOptions.TabIndex = 42; this.grpClientOptions.TabStop = false; this.grpClientOptions.Text = "Client Options"; // // txtClientUseServerIpAddress // - this.txtClientUseServerIpAddress.Location = new System.Drawing.Point(213, 25); - this.txtClientUseServerIpAddress.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.txtClientUseServerIpAddress.Location = new System.Drawing.Point(106, 13); + this.txtClientUseServerIpAddress.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.txtClientUseServerIpAddress.MaxLength = 16; this.txtClientUseServerIpAddress.Name = "txtClientUseServerIpAddress"; - this.txtClientUseServerIpAddress.Size = new System.Drawing.Size(210, 31); + this.txtClientUseServerIpAddress.Size = new System.Drawing.Size(107, 20); this.txtClientUseServerIpAddress.TabIndex = 43; // // lblClientServerPortNum // this.lblClientServerPortNum.AutoSize = true; - this.lblClientServerPortNum.Location = new System.Drawing.Point(64, 82); - this.lblClientServerPortNum.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblClientServerPortNum.Location = new System.Drawing.Point(32, 43); + this.lblClientServerPortNum.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblClientServerPortNum.Name = "lblClientServerPortNum"; - this.lblClientServerPortNum.Size = new System.Drawing.Size(138, 25); + this.lblClientServerPortNum.Size = new System.Drawing.Size(69, 13); this.lblClientServerPortNum.TabIndex = 3; this.lblClientServerPortNum.Text = "Port Number:"; this.lblClientServerPortNum.TextAlign = System.Drawing.ContentAlignment.TopRight; // // txtNetworkClientUseServerPortNum // - this.txtNetworkClientUseServerPortNum.Location = new System.Drawing.Point(216, 78); - this.txtNetworkClientUseServerPortNum.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.txtNetworkClientUseServerPortNum.Location = new System.Drawing.Point(108, 41); + this.txtNetworkClientUseServerPortNum.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.txtNetworkClientUseServerPortNum.MaxLength = 5; this.txtNetworkClientUseServerPortNum.Name = "txtNetworkClientUseServerPortNum"; - this.txtNetworkClientUseServerPortNum.Size = new System.Drawing.Size(168, 31); + this.txtNetworkClientUseServerPortNum.Size = new System.Drawing.Size(86, 20); this.txtNetworkClientUseServerPortNum.TabIndex = 44; // // lblServerIpAddress // this.lblServerIpAddress.AutoSize = true; - this.lblServerIpAddress.Location = new System.Drawing.Point(12, 31); - this.lblServerIpAddress.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblServerIpAddress.Location = new System.Drawing.Point(6, 16); + this.lblServerIpAddress.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblServerIpAddress.Name = "lblServerIpAddress"; - this.lblServerIpAddress.Size = new System.Drawing.Size(191, 25); + this.lblServerIpAddress.Size = new System.Drawing.Size(95, 13); this.lblServerIpAddress.TabIndex = 1; this.lblServerIpAddress.Text = "Server IP Address:"; this.lblServerIpAddress.TextAlign = System.Drawing.ContentAlignment.TopRight; // + // grpServerOptions + // + this.grpServerOptions.Controls.Add(this.lblCompressionType); + this.grpServerOptions.Controls.Add(this.cboCompressionType); + this.grpServerOptions.Controls.Add(this.lblImageFormat); + this.grpServerOptions.Controls.Add(this.cboImageFormat); + this.grpServerOptions.Controls.Add(this.lblServerServerPortNum); + this.grpServerOptions.Controls.Add(this.txtNetworkServerUsePortNum); + this.grpServerOptions.Location = new System.Drawing.Point(116, 16); + this.grpServerOptions.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.grpServerOptions.Name = "grpServerOptions"; + this.grpServerOptions.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.grpServerOptions.Size = new System.Drawing.Size(234, 95); + this.grpServerOptions.TabIndex = 45; + this.grpServerOptions.TabStop = false; + this.grpServerOptions.Text = "Server Options"; + // + // lblCompressionType + // + this.lblCompressionType.AutoSize = true; + this.lblCompressionType.Location = new System.Drawing.Point(4, 65); + this.lblCompressionType.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblCompressionType.Name = "lblCompressionType"; + this.lblCompressionType.Size = new System.Drawing.Size(97, 13); + this.lblCompressionType.TabIndex = 92; + this.lblCompressionType.Text = "Compression Type:"; + // + // cboCompressionType + // + this.cboCompressionType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cboCompressionType.FormattingEnabled = true; + this.cboCompressionType.Location = new System.Drawing.Point(106, 62); + this.cboCompressionType.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.cboCompressionType.Name = "cboCompressionType"; + this.cboCompressionType.Size = new System.Drawing.Size(86, 21); + this.cboCompressionType.TabIndex = 48; + // + // lblImageFormat + // + this.lblImageFormat.AutoSize = true; + this.lblImageFormat.Location = new System.Drawing.Point(26, 41); + this.lblImageFormat.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblImageFormat.Name = "lblImageFormat"; + this.lblImageFormat.Size = new System.Drawing.Size(74, 13); + this.lblImageFormat.TabIndex = 90; + this.lblImageFormat.Text = "Image Format:"; + // + // cboImageFormat + // + this.cboImageFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cboImageFormat.FormattingEnabled = true; + this.cboImageFormat.Location = new System.Drawing.Point(106, 37); + this.cboImageFormat.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.cboImageFormat.Name = "cboImageFormat"; + this.cboImageFormat.Size = new System.Drawing.Size(86, 21); + this.cboImageFormat.TabIndex = 47; + this.cboImageFormat.SelectedIndexChanged += new System.EventHandler(this.cboImageFormat_SelectedIndexChanged); + // + // lblServerServerPortNum + // + this.lblServerServerPortNum.AutoSize = true; + this.lblServerServerPortNum.Location = new System.Drawing.Point(34, 16); + this.lblServerServerPortNum.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblServerServerPortNum.Name = "lblServerServerPortNum"; + this.lblServerServerPortNum.Size = new System.Drawing.Size(69, 13); + this.lblServerServerPortNum.TabIndex = 5; + this.lblServerServerPortNum.Text = "Port Number:"; + this.lblServerServerPortNum.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtNetworkServerUsePortNum + // + this.txtNetworkServerUsePortNum.Location = new System.Drawing.Point(106, 13); + this.txtNetworkServerUsePortNum.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.txtNetworkServerUsePortNum.MaxLength = 5; + this.txtNetworkServerUsePortNum.Name = "txtNetworkServerUsePortNum"; + this.txtNetworkServerUsePortNum.Size = new System.Drawing.Size(86, 20); + this.txtNetworkServerUsePortNum.TabIndex = 46; + // // tabPerformance // this.tabPerformance.Controls.Add(this.grpPerformanceOptions); - this.tabPerformance.Location = new System.Drawing.Point(8, 39); - this.tabPerformance.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabPerformance.Location = new System.Drawing.Point(4, 22); + this.tabPerformance.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabPerformance.Name = "tabPerformance"; - this.tabPerformance.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabPerformance.Size = new System.Drawing.Size(1040, 902); + this.tabPerformance.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabPerformance.Size = new System.Drawing.Size(520, 467); this.tabPerformance.TabIndex = 18; this.tabPerformance.Text = "Performance"; this.tabPerformance.UseVisualStyleBackColor = true; @@ -2790,21 +2791,21 @@ private void InitializeComponent() this.grpPerformanceOptions.Controls.Add(this.label18); this.grpPerformanceOptions.Controls.Add(this.txtPollDelay); this.grpPerformanceOptions.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpPerformanceOptions.Location = new System.Drawing.Point(5, 6); - this.grpPerformanceOptions.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.grpPerformanceOptions.Location = new System.Drawing.Point(2, 3); + this.grpPerformanceOptions.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.grpPerformanceOptions.Name = "grpPerformanceOptions"; - this.grpPerformanceOptions.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.grpPerformanceOptions.Size = new System.Drawing.Size(1030, 890); + this.grpPerformanceOptions.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.grpPerformanceOptions.Size = new System.Drawing.Size(516, 461); this.grpPerformanceOptions.TabIndex = 57; this.grpPerformanceOptions.TabStop = false; this.grpPerformanceOptions.Text = "Performance"; // // cmdBMSOptions // - this.cmdBMSOptions.Location = new System.Drawing.Point(24, 79); - this.cmdBMSOptions.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdBMSOptions.Location = new System.Drawing.Point(12, 41); + this.cmdBMSOptions.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdBMSOptions.Name = "cmdBMSOptions"; - this.cmdBMSOptions.Size = new System.Drawing.Size(416, 61); + this.cmdBMSOptions.Size = new System.Drawing.Size(208, 32); this.cmdBMSOptions.TabIndex = 52; this.cmdBMSOptions.Text = "Falcon BMS Advanced Options..."; this.cmdBMSOptions.UseVisualStyleBackColor = true; @@ -2813,39 +2814,39 @@ private void InitializeComponent() // lblMilliseconds // this.lblMilliseconds.AutoSize = true; - this.lblMilliseconds.Location = new System.Drawing.Point(373, 42); - this.lblMilliseconds.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.lblMilliseconds.Location = new System.Drawing.Point(186, 22); + this.lblMilliseconds.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblMilliseconds.Name = "lblMilliseconds"; - this.lblMilliseconds.Size = new System.Drawing.Size(130, 25); + this.lblMilliseconds.Size = new System.Drawing.Size(63, 13); this.lblMilliseconds.TabIndex = 77; this.lblMilliseconds.Text = "milliseconds"; // // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(32, 42); - this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label18.Location = new System.Drawing.Point(16, 22); + this.label18.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(231, 25); + this.label18.Size = new System.Drawing.Size(115, 13); this.label18.TabIndex = 27; this.label18.Text = "Poll for new data every"; // // txtPollDelay // - this.txtPollDelay.Location = new System.Drawing.Point(307, 36); - this.txtPollDelay.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.txtPollDelay.Location = new System.Drawing.Point(154, 19); + this.txtPollDelay.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.txtPollDelay.Name = "txtPollDelay"; - this.txtPollDelay.Size = new System.Drawing.Size(52, 31); + this.txtPollDelay.Size = new System.Drawing.Size(28, 20); this.txtPollDelay.TabIndex = 50; // // tabGraphics // this.tabGraphics.Controls.Add(this.gbGDIOptions); - this.tabGraphics.Location = new System.Drawing.Point(8, 39); - this.tabGraphics.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabGraphics.Location = new System.Drawing.Point(4, 22); + this.tabGraphics.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabGraphics.Name = "tabGraphics"; - this.tabGraphics.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabGraphics.Size = new System.Drawing.Size(1040, 902); + this.tabGraphics.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabGraphics.Size = new System.Drawing.Size(520, 467); this.tabGraphics.TabIndex = 15; this.tabGraphics.Text = "Graphics"; this.tabGraphics.UseVisualStyleBackColor = true; @@ -2854,11 +2855,11 @@ private void InitializeComponent() // this.gbGDIOptions.Controls.Add(this.chkHighlightOutputWindowsWhenContainMouseCursor); this.gbGDIOptions.Dock = System.Windows.Forms.DockStyle.Fill; - this.gbGDIOptions.Location = new System.Drawing.Point(5, 6); - this.gbGDIOptions.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.gbGDIOptions.Location = new System.Drawing.Point(2, 3); + this.gbGDIOptions.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbGDIOptions.Name = "gbGDIOptions"; - this.gbGDIOptions.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.gbGDIOptions.Size = new System.Drawing.Size(1030, 890); + this.gbGDIOptions.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbGDIOptions.Size = new System.Drawing.Size(516, 461); this.gbGDIOptions.TabIndex = 56; this.gbGDIOptions.TabStop = false; this.gbGDIOptions.Text = "Graphics"; @@ -2866,10 +2867,10 @@ private void InitializeComponent() // chkHighlightOutputWindowsWhenContainMouseCursor // this.chkHighlightOutputWindowsWhenContainMouseCursor.AutoSize = true; - this.chkHighlightOutputWindowsWhenContainMouseCursor.Location = new System.Drawing.Point(10, 36); - this.chkHighlightOutputWindowsWhenContainMouseCursor.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkHighlightOutputWindowsWhenContainMouseCursor.Location = new System.Drawing.Point(5, 19); + this.chkHighlightOutputWindowsWhenContainMouseCursor.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkHighlightOutputWindowsWhenContainMouseCursor.Name = "chkHighlightOutputWindowsWhenContainMouseCursor"; - this.chkHighlightOutputWindowsWhenContainMouseCursor.Size = new System.Drawing.Size(350, 29); + this.chkHighlightOutputWindowsWhenContainMouseCursor.Size = new System.Drawing.Size(177, 17); this.chkHighlightOutputWindowsWhenContainMouseCursor.TabIndex = 0; this.chkHighlightOutputWindowsWhenContainMouseCursor.Text = "Highlight output window borders"; this.chkHighlightOutputWindowsWhenContainMouseCursor.UseVisualStyleBackColor = true; @@ -2878,11 +2879,11 @@ private void InitializeComponent() // tabStartup // this.tabStartup.Controls.Add(this.grpStartupOptions); - this.tabStartup.Location = new System.Drawing.Point(8, 39); - this.tabStartup.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabStartup.Location = new System.Drawing.Point(4, 22); + this.tabStartup.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabStartup.Name = "tabStartup"; - this.tabStartup.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabStartup.Size = new System.Drawing.Size(1040, 902); + this.tabStartup.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabStartup.Size = new System.Drawing.Size(520, 467); this.tabStartup.TabIndex = 17; this.tabStartup.Text = "Startup"; this.tabStartup.UseVisualStyleBackColor = true; @@ -2892,11 +2893,11 @@ private void InitializeComponent() this.grpStartupOptions.Controls.Add(this.chkStartWithWindows); this.grpStartupOptions.Controls.Add(this.chkStartOnLaunch); this.grpStartupOptions.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpStartupOptions.Location = new System.Drawing.Point(5, 6); - this.grpStartupOptions.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.grpStartupOptions.Location = new System.Drawing.Point(2, 3); + this.grpStartupOptions.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.grpStartupOptions.Name = "grpStartupOptions"; - this.grpStartupOptions.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.grpStartupOptions.Size = new System.Drawing.Size(1030, 890); + this.grpStartupOptions.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.grpStartupOptions.Size = new System.Drawing.Size(516, 461); this.grpStartupOptions.TabIndex = 55; this.grpStartupOptions.TabStop = false; this.grpStartupOptions.Text = "Startup"; @@ -2904,10 +2905,10 @@ private void InitializeComponent() // chkStartWithWindows // this.chkStartWithWindows.AutoSize = true; - this.chkStartWithWindows.Location = new System.Drawing.Point(32, 75); - this.chkStartWithWindows.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkStartWithWindows.Location = new System.Drawing.Point(16, 39); + this.chkStartWithWindows.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkStartWithWindows.Name = "chkStartWithWindows"; - this.chkStartWithWindows.Size = new System.Drawing.Size(478, 29); + this.chkStartWithWindows.Size = new System.Drawing.Size(240, 17); this.chkStartWithWindows.TabIndex = 55; this.chkStartWithWindows.Text = "Launch automatically during Windows startup"; this.chkStartWithWindows.UseVisualStyleBackColor = true; @@ -2915,20 +2916,20 @@ private void InitializeComponent() // chkStartOnLaunch // this.chkStartOnLaunch.AutoSize = true; - this.chkStartOnLaunch.Location = new System.Drawing.Point(32, 31); - this.chkStartOnLaunch.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.chkStartOnLaunch.Location = new System.Drawing.Point(16, 16); + this.chkStartOnLaunch.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.chkStartOnLaunch.Name = "chkStartOnLaunch"; - this.chkStartOnLaunch.Size = new System.Drawing.Size(487, 29); + this.chkStartOnLaunch.Size = new System.Drawing.Size(243, 17); this.chkStartOnLaunch.TabIndex = 54; this.chkStartOnLaunch.Text = "Start extracting when this program is launched"; this.chkStartOnLaunch.UseVisualStyleBackColor = true; // // cmdResetToDefaults // - this.cmdResetToDefaults.Location = new System.Drawing.Point(779, 968); - this.cmdResetToDefaults.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdResetToDefaults.Location = new System.Drawing.Point(390, 503); + this.cmdResetToDefaults.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdResetToDefaults.Name = "cmdResetToDefaults"; - this.cmdResetToDefaults.Size = new System.Drawing.Size(252, 44); + this.cmdResetToDefaults.Size = new System.Drawing.Size(126, 23); this.cmdResetToDefaults.TabIndex = 152; this.cmdResetToDefaults.Text = "Rese&t to Defaults"; this.cmdResetToDefaults.UseVisualStyleBackColor = true; @@ -2965,7 +2966,7 @@ private void InitializeComponent() this.label25.AutoSize = true; this.label25.Location = new System.Drawing.Point(6, 48); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(139, 25); + this.label25.Size = new System.Drawing.Size(70, 13); this.label25.TabIndex = 21; this.label25.Text = "Upper Left Y:"; // @@ -2974,7 +2975,7 @@ private void InitializeComponent() this.label26.AutoSize = true; this.label26.Location = new System.Drawing.Point(149, 48); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(153, 25); + this.label26.Size = new System.Drawing.Size(77, 13); this.label26.TabIndex = 22; this.label26.Text = "Lower Right Y:"; // @@ -2983,7 +2984,7 @@ private void InitializeComponent() this.label27.AutoSize = true; this.label27.Location = new System.Drawing.Point(6, 22); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(138, 25); + this.label27.Size = new System.Drawing.Size(70, 13); this.label27.TabIndex = 19; this.label27.Text = "Upper Left X:"; // @@ -2991,14 +2992,14 @@ private void InitializeComponent() // this.textBox1.Location = new System.Drawing.Point(82, 19); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(61, 31); + this.textBox1.Size = new System.Drawing.Size(61, 20); this.textBox1.TabIndex = 9; // // textBox2 // this.textBox2.Location = new System.Drawing.Point(232, 45); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(61, 31); + this.textBox2.Size = new System.Drawing.Size(61, 20); this.textBox2.TabIndex = 12; // // label32 @@ -3006,7 +3007,7 @@ private void InitializeComponent() this.label32.AutoSize = true; this.label32.Location = new System.Drawing.Point(149, 22); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(152, 25); + this.label32.Size = new System.Drawing.Size(77, 13); this.label32.TabIndex = 20; this.label32.Text = "Lower Right X:"; // @@ -3014,14 +3015,14 @@ private void InitializeComponent() // this.textBox3.Location = new System.Drawing.Point(82, 45); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(61, 31); + this.textBox3.Size = new System.Drawing.Size(61, 20); this.textBox3.TabIndex = 10; // // textBox4 // this.textBox4.Location = new System.Drawing.Point(232, 19); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(61, 31); + this.textBox4.Size = new System.Drawing.Size(61, 20); this.textBox4.TabIndex = 11; // // checkBox1 @@ -3056,7 +3057,7 @@ private void InitializeComponent() this.label33.AutoSize = true; this.label33.Location = new System.Drawing.Point(6, 48); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(139, 25); + this.label33.Size = new System.Drawing.Size(70, 13); this.label33.TabIndex = 21; this.label33.Text = "Upper Left Y:"; // @@ -3065,7 +3066,7 @@ private void InitializeComponent() this.label34.AutoSize = true; this.label34.Location = new System.Drawing.Point(149, 48); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(153, 25); + this.label34.Size = new System.Drawing.Size(77, 13); this.label34.TabIndex = 22; this.label34.Text = "Lower Right Y:"; // @@ -3074,7 +3075,7 @@ private void InitializeComponent() this.label35.AutoSize = true; this.label35.Location = new System.Drawing.Point(6, 22); this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(138, 25); + this.label35.Size = new System.Drawing.Size(70, 13); this.label35.TabIndex = 19; this.label35.Text = "Upper Left X:"; // @@ -3082,14 +3083,14 @@ private void InitializeComponent() // this.textBox5.Location = new System.Drawing.Point(82, 19); this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(61, 31); + this.textBox5.Size = new System.Drawing.Size(61, 20); this.textBox5.TabIndex = 4; // // textBox6 // this.textBox6.Location = new System.Drawing.Point(232, 45); this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(61, 31); + this.textBox6.Size = new System.Drawing.Size(61, 20); this.textBox6.TabIndex = 7; // // label36 @@ -3097,7 +3098,7 @@ private void InitializeComponent() this.label36.AutoSize = true; this.label36.Location = new System.Drawing.Point(149, 22); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(152, 25); + this.label36.Size = new System.Drawing.Size(77, 13); this.label36.TabIndex = 20; this.label36.Text = "Lower Right X:"; // @@ -3105,33 +3106,44 @@ private void InitializeComponent() // this.textBox7.Location = new System.Drawing.Point(82, 45); this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(61, 31); + this.textBox7.Size = new System.Drawing.Size(61, 20); this.textBox7.TabIndex = 5; // // textBox8 // this.textBox8.Location = new System.Drawing.Point(232, 19); this.textBox8.Name = "textBox8"; - this.textBox8.Size = new System.Drawing.Size(61, 31); + this.textBox8.Size = new System.Drawing.Size(61, 20); this.textBox8.TabIndex = 6; // // cmdApply // - this.cmdApply.Location = new System.Drawing.Point(477, 964); - this.cmdApply.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.cmdApply.Location = new System.Drawing.Point(238, 501); + this.cmdApply.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cmdApply.Name = "cmdApply"; - this.cmdApply.Size = new System.Drawing.Size(213, 56); + this.cmdApply.Size = new System.Drawing.Size(106, 29); this.cmdApply.TabIndex = 155; this.cmdApply.Text = "&Apply"; this.cmdApply.UseVisualStyleBackColor = true; this.cmdApply.Click += new System.EventHandler(this.cmdApply_Click); // + // chkRPMPW + // + this.chkRPMPW.AutoSize = true; + this.chkRPMPW.Location = new System.Drawing.Point(89, 91); + this.chkRPMPW.Name = "chkRPMPW"; + this.chkRPMPW.Size = new System.Drawing.Size(123, 17); + this.chkRPMPW.TabIndex = 41; + this.chkRPMPW.Text = "PW Engine max 100"; + this.chkRPMPW.UseVisualStyleBackColor = true; + this.chkRPMPW.CheckedChanged += new System.EventHandler(this.chkRPMPW_CheckedChanged); + // // frmOptions // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; - this.ClientSize = new System.Drawing.Size(1056, 1032); + this.ClientSize = new System.Drawing.Size(528, 537); this.ControlBox = false; this.Controls.Add(this.tabAllTabs); this.Controls.Add(this.cmdApply); @@ -3141,7 +3153,7 @@ private void InitializeComponent() this.DoubleBuffered = true; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmOptions"; @@ -3258,12 +3270,12 @@ private void InitializeComponent() this.gbISIS.PerformLayout(); this.tabNetworking.ResumeLayout(false); this.grpNetworkMode.ResumeLayout(false); - this.grpServerOptions.ResumeLayout(false); - this.grpServerOptions.PerformLayout(); this.gbNetworkingMode.ResumeLayout(false); this.gbNetworkingMode.PerformLayout(); this.grpClientOptions.ResumeLayout(false); this.grpClientOptions.PerformLayout(); + this.grpServerOptions.ResumeLayout(false); + this.grpServerOptions.PerformLayout(); this.tabPerformance.ResumeLayout(false); this.grpPerformanceOptions.ResumeLayout(false); this.grpPerformanceOptions.PerformLayout(); @@ -3502,5 +3514,6 @@ private void InitializeComponent() private System.Windows.Forms.TabPage tabISISKeys; private System.Windows.Forms.TabPage tabMfdsHud; private System.Windows.Forms.TextBox txtClientUseServerIpAddress; + private System.Windows.Forms.CheckBox chkRPMPW; } } \ No newline at end of file diff --git a/src/MFDExtractor/MFDExtractor/UI/frmOptions.cs b/src/MFDExtractor/MFDExtractor/UI/frmOptions.cs index 3c3114c1..e948f585 100644 --- a/src/MFDExtractor/MFDExtractor/UI/frmOptions.cs +++ b/src/MFDExtractor/MFDExtractor/UI/frmOptions.cs @@ -265,6 +265,7 @@ private void LoadSettings() chkOIL1.Checked = settings.EnableOIL1Output; chkOIL2.Checked = settings.EnableOIL2Output; chkRPM1.Checked = settings.EnableRPM1Output; + chkRPMPW.Checked = settings.IsPwEngine; chkRPM2.Checked = settings.EnableRPM2Output; chkEPU.Checked = settings.EnableEPUFuelOutput; chkFuelFlow.Checked = settings.EnableFuelFlowOutput; @@ -1804,6 +1805,10 @@ private void cmdRecoverHud_Click(object sender, EventArgs e) RecoverInstrument("HUD"); } - + private void chkRPMPW_CheckedChanged(object sender, EventArgs e) + { + Settings.Default.IsPwEngine = chkRPMPW.Checked; + BringToFront(); + } } } \ No newline at end of file diff --git a/src/MFDExtractor/MFDExtractor/app.config b/src/MFDExtractor/MFDExtractor/app.config index 298da7b8..262cf238 100644 --- a/src/MFDExtractor/MFDExtractor/app.config +++ b/src/MFDExtractor/MFDExtractor/app.config @@ -51,10 +51,10 @@ False - + - + RotateNoneFlipNone @@ -90,7 +90,7 @@ 200 - + RotateNoneFlipNone @@ -102,7 +102,7 @@ 0 - + 62121 @@ -120,7 +120,7 @@ False - + PNG @@ -141,7 +141,7 @@ RotateNoneFlipNone - + 0 @@ -168,7 +168,7 @@ False - + RotateNoneFlipNone @@ -219,7 +219,7 @@ False - + RotateNoneFlipNone @@ -252,7 +252,7 @@ False - + RotateNoneFlipNone @@ -285,7 +285,7 @@ False - + RotateNoneFlipNone @@ -318,7 +318,7 @@ False - + RotateNoneFlipNone @@ -351,7 +351,7 @@ False - + RotateNoneFlipNone @@ -384,7 +384,7 @@ False - + RotateNoneFlipNone @@ -417,7 +417,7 @@ False - + RotateNoneFlipNone @@ -450,7 +450,7 @@ False - + RotateNoneFlipNone @@ -483,7 +483,7 @@ False - + RotateNoneFlipNone @@ -516,7 +516,7 @@ False - + RotateNoneFlipNone @@ -549,7 +549,7 @@ False - + RotateNoneFlipNone @@ -582,7 +582,7 @@ False - + RotateNoneFlipNone @@ -615,7 +615,7 @@ False - + RotateNoneFlipNone @@ -648,7 +648,7 @@ False - + RotateNoneFlipNone @@ -681,7 +681,7 @@ False - + RotateNoneFlipNone @@ -714,7 +714,7 @@ False - + RotateNoneFlipNone @@ -747,7 +747,7 @@ False - + RotateNoneFlipNone @@ -780,7 +780,7 @@ False - + RotateNoneFlipNone @@ -813,7 +813,7 @@ False - + RotateNoneFlipNone @@ -846,7 +846,7 @@ False - + RotateNoneFlipNone @@ -879,7 +879,7 @@ False - + RotateNoneFlipNone @@ -912,7 +912,7 @@ False - + RotateNoneFlipNone @@ -945,7 +945,7 @@ False - + RotateNoneFlipNone @@ -978,7 +978,7 @@ False - + RotateNoneFlipNone @@ -1011,7 +1011,7 @@ False - + RotateNoneFlipNone @@ -1044,7 +1044,7 @@ False - + RotateNoneFlipNone @@ -1077,7 +1077,7 @@ False - + RotateNoneFlipNone @@ -1110,7 +1110,7 @@ False - + RotateNoneFlipNone @@ -1143,7 +1143,7 @@ False - + RotateNoneFlipNone @@ -1176,7 +1176,7 @@ False - + RotateNoneFlipNone @@ -1209,7 +1209,7 @@ False - + RotateNoneFlipNone @@ -1242,7 +1242,7 @@ False - + RotateNoneFlipNone @@ -1275,7 +1275,7 @@ False - + RotateNoneFlipNone @@ -1287,7 +1287,40 @@ False - + + + + False + + + 0 + + + 0 + + + 0 + + + 312 + + + 312 + + + False + + + + + + RotateNoneFlipNone + + + True + + + False IP1310ALR @@ -1329,7 +1362,7 @@ False - + RotateNoneFlipNone @@ -1347,10 +1380,10 @@ FeetPerSecond - + - + False @@ -1374,7 +1407,7 @@ False - + RotateNoneFlipNone @@ -1386,22 +1419,22 @@ False - + - + - + - + - + - + 255 @@ -1410,16 +1443,16 @@ 0 - + - + - + - + False @@ -1443,7 +1476,7 @@ False - + RotateNoneFlipNone @@ -1455,7 +1488,7 @@ False - + True @@ -1472,6 +1505,9 @@ 5 + + False + @@ -1483,11 +1519,11 @@ - + From 88fa82f4e8b8ed3e54fd3d4dc16ed93f44276c52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20St=C3=B6=C3=9Fl?= Date: Thu, 18 Dec 2025 23:27:22 +0100 Subject: [PATCH 2/3] fix magvar offset on HSI and EHSI compass rose --- src/MFDExtractor/MFDExtractor/FlightDataUpdater.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MFDExtractor/MFDExtractor/FlightDataUpdater.cs b/src/MFDExtractor/MFDExtractor/FlightDataUpdater.cs index 40b9009f..62cbc603 100644 --- a/src/MFDExtractor/MFDExtractor/FlightDataUpdater.cs +++ b/src/MFDExtractor/MFDExtractor/FlightDataUpdater.cs @@ -381,10 +381,10 @@ private static void UpdateEHSI(Action updateEHSIBrightnessLabelVisibility) private static void UpdateHSI(IHorizontalSituationIndicator hsi, IEHSI ehsi, HsiBits hsibits, FlightData fromFalcon) { hsi.InstrumentState.OffFlag = ((hsibits & HsiBits.HSI_OFF) == HsiBits.HSI_OFF) && !Extractor.State.OptionsFormIsShowing; - hsi.InstrumentState.MagneticHeadingDegrees = (360 + (fromFalcon.yaw / Common.Math.Constants.RADIANS_PER_DEGREE)) % 360; + hsi.InstrumentState.MagneticHeadingDegrees = fromFalcon.currentHeading; ehsi.InstrumentState.NoDataFlag = ((hsibits & HsiBits.HSI_OFF) == HsiBits.HSI_OFF) && !Extractor.State.OptionsFormIsShowing; ; - ehsi.InstrumentState.NoPowerFlag = ((fromFalcon.powerBits & (int)PowerBits.BusPowerBattery) != (int)PowerBits.BusPowerBattery) && !Extractor.State.OptionsFormIsShowing; - ehsi.InstrumentState.MagneticHeadingDegrees = (360 + (fromFalcon.yaw / Common.Math.Constants.RADIANS_PER_DEGREE)) % 360; + ehsi.InstrumentState.NoPowerFlag = ((fromFalcon.powerBits & (int)PowerBits.BusPowerBattery) != (int)PowerBits.BusPowerBattery) && !Extractor.State.OptionsFormIsShowing; + ehsi.InstrumentState.MagneticHeadingDegrees = fromFalcon.currentHeading; } private static void UpdateADI(IADI adi, HsiBits hsibits) From b1bf0f915af6fa384311c7cdf517f5d1fdfcc081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20St=C3=B6=C3=9Fl?= Date: Thu, 18 Dec 2025 23:33:06 +0100 Subject: [PATCH 3/3] fix mag heding from yaw calculation to flightData.currentHeading --- .../FlightDataAdapters/AzimuthIndicatorFlightDataAdapter.cs | 2 +- .../MFDExtractor/FlightDataAdapters/CompassFlightDataAdapter.cs | 2 +- .../MFDExtractor/FlightDataAdapters/ISISFlightDataAdapter.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MFDExtractor/MFDExtractor/FlightDataAdapters/AzimuthIndicatorFlightDataAdapter.cs b/src/MFDExtractor/MFDExtractor/FlightDataAdapters/AzimuthIndicatorFlightDataAdapter.cs index 8f2df805..fb28971c 100644 --- a/src/MFDExtractor/MFDExtractor/FlightDataAdapters/AzimuthIndicatorFlightDataAdapter.cs +++ b/src/MFDExtractor/MFDExtractor/FlightDataAdapters/AzimuthIndicatorFlightDataAdapter.cs @@ -15,7 +15,7 @@ class AzimuthIndicatorFlightDataAdapter : IAzimuthIndicatorFlightDataAdapter { public void Adapt(IAzimuthIndicator azimuthIndicator, FlightData flightData) { - azimuthIndicator.InstrumentState.MagneticHeadingDegrees = (360 + (flightData.yaw / Common.Math.Constants.RADIANS_PER_DEGREE)) % 360; + azimuthIndicator.InstrumentState.MagneticHeadingDegrees = flightData.currentHeading; azimuthIndicator.InstrumentState.RollDegrees = ((flightData.roll / Common.Math.Constants.RADIANS_PER_DEGREE)); var rwrObjectCount = flightData.RwrObjectCount; if (flightData.RWRsymbol != null) diff --git a/src/MFDExtractor/MFDExtractor/FlightDataAdapters/CompassFlightDataAdapter.cs b/src/MFDExtractor/MFDExtractor/FlightDataAdapters/CompassFlightDataAdapter.cs index 53ef1e44..c0ce372c 100644 --- a/src/MFDExtractor/MFDExtractor/FlightDataAdapters/CompassFlightDataAdapter.cs +++ b/src/MFDExtractor/MFDExtractor/FlightDataAdapters/CompassFlightDataAdapter.cs @@ -14,7 +14,7 @@ class CompassFlightDataAdapter : ICompassFlightDataAdapter { public void Adapt(ICompass compass, FlightData flightData) { - compass.InstrumentState.MagneticHeadingDegrees = (360 + (flightData.yaw / Constants.RADIANS_PER_DEGREE)) % 360; + compass.InstrumentState.MagneticHeadingDegrees = flightData.currentHeading; } } } diff --git a/src/MFDExtractor/MFDExtractor/FlightDataAdapters/ISISFlightDataAdapter.cs b/src/MFDExtractor/MFDExtractor/FlightDataAdapters/ISISFlightDataAdapter.cs index 9d56599a..91115bb9 100644 --- a/src/MFDExtractor/MFDExtractor/FlightDataAdapters/ISISFlightDataAdapter.cs +++ b/src/MFDExtractor/MFDExtractor/FlightDataAdapters/ISISFlightDataAdapter.cs @@ -26,7 +26,7 @@ public void Adapt(IISIS isis, FlightData flightData) isis.InstrumentState.RadarAltitudeAGL = -flightData.RALT; isis.InstrumentState.RadarAltitudeValid = (flightData.miscBits & (uint)MiscBits.RALT_Valid) == (uint)MiscBits.RALT_Valid; isis.InstrumentState.MachNumber = flightData.mach; - isis.InstrumentState.MagneticHeadingDegrees = (360 +(flightData.yaw/Common.Math.Constants.RADIANS_PER_DEGREE))%360; + isis.InstrumentState.MagneticHeadingDegrees = flightData.currentHeading; isis.InstrumentState.NeverExceedSpeedKnots = 850; isis.InstrumentState.PitchDegrees = ((flightData.pitch/Common.Math.Constants.RADIANS_PER_DEGREE)); isis.InstrumentState.RollDegrees = ((flightData.roll/Common.Math.Constants.RADIANS_PER_DEGREE));