diff --git a/Controls/GimbalVideoControl.Designer.cs b/Controls/GimbalVideoControl.Designer.cs index 21c7a3f8c9..a98e601445 100644 --- a/Controls/GimbalVideoControl.Designer.cs +++ b/Controls/GimbalVideoControl.Designer.cs @@ -72,7 +72,7 @@ private void InitializeComponent() this.toolStripMenuItem2, this.settingsToolStripMenuItem}); this.VideoBoxContextMenu.Name = "VideoBoxContextMenu"; - this.VideoBoxContextMenu.Size = new System.Drawing.Size(181, 264); + this.VideoBoxContextMenu.Size = new System.Drawing.Size(156, 242); // // videoStreamToolStripMenuItem // @@ -180,10 +180,7 @@ private void InitializeComponent() } #endregion - - private System.Windows.Forms.PictureBox VideoBox; private System.Windows.Forms.ToolTip ControlInfoTooltip; - private System.Windows.Forms.ContextMenuStrip VideoBoxContextMenu; private System.Windows.Forms.ToolStripMenuItem videoStreamToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem retractToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem neutralToolStripMenuItem; @@ -198,5 +195,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem takePictureToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem startRecordingToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem stopRecordingToolStripMenuItem; + public System.Windows.Forms.ContextMenuStrip VideoBoxContextMenu; + public System.Windows.Forms.PictureBox VideoBox; } } diff --git a/Controls/GimbalVideoControl.cs b/Controls/GimbalVideoControl.cs index 422fbaeffa..e3f1d22e2e 100644 --- a/Controls/GimbalVideoControl.cs +++ b/Controls/GimbalVideoControl.cs @@ -238,9 +238,7 @@ protected override void Dispose(bool disposing) { if (disposing) { - _stream.OnNewImage -= RenderFrame; - _stream.Stop(); - + Stop(); if (components != null) { components.Dispose(); @@ -249,6 +247,12 @@ protected override void Dispose(bool disposing) base.Dispose(disposing); } + public void Stop() + { + _stream.OnNewImage -= RenderFrame; + _stream.Stop(); + } + private void videoStreamToolStripMenuItem_Click(object sender, EventArgs e) { GStreamer.GstLaunch = GStreamer.LookForGstreamer(); @@ -273,7 +277,7 @@ private void videoStreamToolStripMenuItem_Click(object sender, EventArgs e) public bool PreFilterMessage(ref Message m) { // Don't hog the keyboard when this control doesn't have focus - if (!ContainsFocus) + if (!(Parent?.ContainsFocus ?? false)) { if(heldKeys.Count > 0) { @@ -546,6 +550,9 @@ private void VideoBox_MouseLeave(object sender, EventArgs e) private void VideoBox_Click(object sender, EventArgs e) { + // Focus the control when clicked + VideoBox.Focus(); + MouseEventArgs me = (MouseEventArgs)e; var point = getMousePosition(me.X, me.Y); if (!point.HasValue) diff --git a/GCSViews/FlightData.Designer.cs b/GCSViews/FlightData.Designer.cs index 557eb60268..3eeea28fc8 100644 --- a/GCSViews/FlightData.Designer.cs +++ b/GCSViews/FlightData.Designer.cs @@ -30,10 +30,10 @@ private void InitializeComponent() this.setBatteryCellCountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bindingSourceHud = new System.Windows.Forms.BindingSource(this.components); - this.tabControlactions = new System.Windows.Forms.TabControl(); this.contextMenuStripactionstab = new System.Windows.Forms.ContextMenuStrip(this.components); this.customizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.multiLineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tabControlactions = new System.Windows.Forms.TabControl(); this.tabQuick = new System.Windows.Forms.TabPage(); this.tableLayoutPanelQuick = new System.Windows.Forms.TableLayoutPanel(); this.quickView6 = new MissionPlanner.Controls.QuickView(); @@ -211,8 +211,16 @@ private void InitializeComponent() this.setHomeHereToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.takeOffToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.onOffCameraOverlapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.jumpToTagToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gimbalVideoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gimbalVideoFullSizedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gimbalVideoMiniToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gimbalVideoPopOutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.label1 = new System.Windows.Forms.Label(); this.but_disablejoystick = new MissionPlanner.Controls.MyButton(); + this.Zoomlevel = new System.Windows.Forms.NumericUpDown(); this.distanceBar1 = new MissionPlanner.Controls.DistanceBar(); + this.TRK_zoom = new MissionPlanner.Controls.MyTrackBar(); this.windDir1 = new MissionPlanner.Controls.WindDir(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.label6 = new System.Windows.Forms.Label(); @@ -222,11 +230,8 @@ private void InitializeComponent() this.lbl_hdop = new MissionPlanner.Controls.MyLabel(); this.lbl_sats = new MissionPlanner.Controls.MyLabel(); this.gMapControl1 = new MissionPlanner.Controls.myGMAP(); - this.TRK_zoom = new MissionPlanner.Controls.MyTrackBar(); this.panel1 = new System.Windows.Forms.Panel(); this.coords1 = new MissionPlanner.Controls.Coords(); - this.Zoomlevel = new System.Windows.Forms.NumericUpDown(); - this.label1 = new System.Windows.Forms.Label(); this.CHK_autopan = new System.Windows.Forms.CheckBox(); this.CB_tuning = new System.Windows.Forms.CheckBox(); this.ZedGraphTimer = new System.Windows.Forms.Timer(this.components); @@ -235,7 +240,6 @@ private void InitializeComponent() this.scriptChecker = new System.Windows.Forms.Timer(this.components); this.Messagetabtimer = new System.Windows.Forms.Timer(this.components); this.bindingSourceStatusTab = new System.Windows.Forms.BindingSource(this.components); - this.jumpToTagToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.MainH)).BeginInit(); this.MainH.Panel1.SuspendLayout(); this.MainH.Panel2.SuspendLayout(); @@ -246,8 +250,8 @@ private void InitializeComponent() this.SubMainLeft.SuspendLayout(); this.contextMenuStripHud.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bindingSourceHud)).BeginInit(); - this.tabControlactions.SuspendLayout(); this.contextMenuStripactionstab.SuspendLayout(); + this.tabControlactions.SuspendLayout(); this.tabQuick.SuspendLayout(); this.tableLayoutPanelQuick.SuspendLayout(); this.contextMenuStripQuickView.SuspendLayout(); @@ -286,10 +290,10 @@ private void InitializeComponent() this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); this.contextMenuStripMap.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.Zoomlevel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.TRK_zoom)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.Zoomlevel)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSourceStatusTab)).BeginInit(); this.SuspendLayout(); // @@ -334,6 +338,7 @@ private void InitializeComponent() this.hud1.batterycellcount = 4; this.hud1.batterylevel = 0F; this.hud1.batterylevel2 = 0F; + this.hud1.batteryon2 = true; this.hud1.batteryremaining = 0F; this.hud1.batteryremaining2 = 0F; this.hud1.bgimage = null; @@ -344,52 +349,52 @@ private void InitializeComponent() this.hud1.critSSA = 30F; this.hud1.current = 0F; this.hud1.current2 = 0F; - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("airspeed", this.bindingSourceHud, "airspeed", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("alt", this.bindingSourceHud, "alt", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("load", this.bindingSourceHud, "load", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("batterylevel", this.bindingSourceHud, "battery_voltage", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("batteryremaining", this.bindingSourceHud, "battery_remaining", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("connected", this.bindingSourceHud, "connected", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("current", this.bindingSourceHud, "current", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("batterylevel2", this.bindingSourceHud, "battery_voltage2", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("batteryremaining2", this.bindingSourceHud, "battery_remaining2", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("current2", this.bindingSourceHud, "current2", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("datetime", this.bindingSourceHud, "datetime", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("disttowp", this.bindingSourceHud, "wp_dist", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("ekfstatus", this.bindingSourceHud, "ekfstatus", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("failsafe", this.bindingSourceHud, "failsafe", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("gpsfix", this.bindingSourceHud, "gpsstatus", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("gpsfix2", this.bindingSourceHud, "gpsstatus2", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("gpshdop", this.bindingSourceHud, "gpshdop", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("gpshdop2", this.bindingSourceHud, "gpshdop2", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("groundalt", this.bindingSourceHud, "HomeAlt", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("groundcourse", this.bindingSourceHud, "groundcourse", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("groundspeed", this.bindingSourceHud, "groundspeed", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("heading", this.bindingSourceHud, "yaw", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("linkqualitygcs", this.bindingSourceHud, "linkqualitygcs", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("message", this.bindingSourceHud, "messageHigh", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("messageSeverity", this.bindingSourceHud, "messageHighSeverity", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("mode", this.bindingSourceHud, "mode", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("navpitch", this.bindingSourceHud, "nav_pitch", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("navroll", this.bindingSourceHud, "nav_roll", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("pitch", this.bindingSourceHud, "pitch", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("prearmstatus", this.bindingSourceHud, "prearmstatus", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("roll", this.bindingSourceHud, "roll", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("safetyactive", this.bindingSourceHud, "safetyactive", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("status", this.bindingSourceHud, "armed", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("targetalt", this.bindingSourceHud, "targetalt", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("targetheading", this.bindingSourceHud, "nav_bearing", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("targetspeed", this.bindingSourceHud, "targetairspeed", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("turnrate", this.bindingSourceHud, "turnrate", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("verticalspeed", this.bindingSourceHud, "verticalspeed", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("vibex", this.bindingSourceHud, "vibex", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("vibey", this.bindingSourceHud, "vibey", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("vibez", this.bindingSourceHud, "vibez", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("wpno", this.bindingSourceHud, "wpno", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("xtrack_error", this.bindingSourceHud, "xtrack_error", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("AOA", this.bindingSourceHud, "AOA", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("SSA", this.bindingSourceHud, "SSA", false)); - this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("critAOA", this.bindingSourceHud, "crit_AOA", false)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("airspeed", this.bindingSourceHud, "airspeed", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("alt", this.bindingSourceHud, "alt", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("load", this.bindingSourceHud, "load", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("batterylevel", this.bindingSourceHud, "battery_voltage", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("batteryremaining", this.bindingSourceHud, "battery_remaining", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("connected", this.bindingSourceHud, "connected", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("current", this.bindingSourceHud, "current", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("batterylevel2", this.bindingSourceHud, "battery_voltage2", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("batteryremaining2", this.bindingSourceHud, "battery_remaining2", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("current2", this.bindingSourceHud, "current2", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("datetime", this.bindingSourceHud, "datetime", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("disttowp", this.bindingSourceHud, "wp_dist", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("ekfstatus", this.bindingSourceHud, "ekfstatus", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("failsafe", this.bindingSourceHud, "failsafe", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("gpsfix", this.bindingSourceHud, "gpsstatus", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("gpsfix2", this.bindingSourceHud, "gpsstatus2", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("gpshdop", this.bindingSourceHud, "gpshdop", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("gpshdop2", this.bindingSourceHud, "gpshdop2", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("groundalt", this.bindingSourceHud, "HomeAlt", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("groundcourse", this.bindingSourceHud, "groundcourse", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("groundspeed", this.bindingSourceHud, "groundspeed", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("heading", this.bindingSourceHud, "yaw", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("linkqualitygcs", this.bindingSourceHud, "linkqualitygcs", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("message", this.bindingSourceHud, "messageHigh", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("messageSeverity", this.bindingSourceHud, "messageHighSeverity", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("mode", this.bindingSourceHud, "mode", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("navpitch", this.bindingSourceHud, "nav_pitch", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("navroll", this.bindingSourceHud, "nav_roll", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("pitch", this.bindingSourceHud, "pitch", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("prearmstatus", this.bindingSourceHud, "prearmstatus", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("roll", this.bindingSourceHud, "roll", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("safetyactive", this.bindingSourceHud, "safetyactive", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("status", this.bindingSourceHud, "armed", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("targetalt", this.bindingSourceHud, "targetalt", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("targetheading", this.bindingSourceHud, "nav_bearing", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("targetspeed", this.bindingSourceHud, "targetairspeed", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("turnrate", this.bindingSourceHud, "turnrate", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("verticalspeed", this.bindingSourceHud, "verticalspeed", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("vibex", this.bindingSourceHud, "vibex", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("vibey", this.bindingSourceHud, "vibey", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("vibez", this.bindingSourceHud, "vibez", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("wpno", this.bindingSourceHud, "wpno", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("xtrack_error", this.bindingSourceHud, "xtrack_error", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("AOA", this.bindingSourceHud, "AOA", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("SSA", this.bindingSourceHud, "SSA", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("critAOA", this.bindingSourceHud, "crit_AOA", true)); this.hud1.datetime = new System.DateTime(((long)(0))); this.hud1.displayAOASSA = false; this.hud1.displayCellVoltage = false; @@ -409,6 +414,7 @@ private void InitializeComponent() this.hud1.heading = 0F; this.hud1.hudcolor = System.Drawing.Color.LightGray; this.hud1.linkqualitygcs = 0F; + this.hud1.load = 0F; this.hud1.lowairspeed = false; this.hud1.lowgroundspeed = false; this.hud1.lowvoltagealert = false; @@ -422,6 +428,7 @@ private void InitializeComponent() this.hud1.prearmstatus = false; this.hud1.roll = 0F; this.hud1.Russian = false; + this.hud1.safetyactive = false; this.hud1.skyColor1 = System.Drawing.Color.Blue; this.hud1.skyColor2 = System.Drawing.Color.LightBlue; this.hud1.speedunit = null; @@ -561,6 +568,26 @@ private void InitializeComponent() // this.bindingSourceHud.DataSource = typeof(MissionPlanner.CurrentState); // + // contextMenuStripactionstab + // + this.contextMenuStripactionstab.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.customizeToolStripMenuItem, + this.multiLineToolStripMenuItem}); + this.contextMenuStripactionstab.Name = "contextMenuStripactionstab"; + resources.ApplyResources(this.contextMenuStripactionstab, "contextMenuStripactionstab"); + // + // customizeToolStripMenuItem + // + this.customizeToolStripMenuItem.Name = "customizeToolStripMenuItem"; + resources.ApplyResources(this.customizeToolStripMenuItem, "customizeToolStripMenuItem"); + this.customizeToolStripMenuItem.Click += new System.EventHandler(this.customizeToolStripMenuItem_Click); + // + // multiLineToolStripMenuItem + // + this.multiLineToolStripMenuItem.Name = "multiLineToolStripMenuItem"; + resources.ApplyResources(this.multiLineToolStripMenuItem, "multiLineToolStripMenuItem"); + this.multiLineToolStripMenuItem.Click += new System.EventHandler(this.multiLineToolStripMenuItem_Click); + // // tabControlactions // this.tabControlactions.ContextMenuStrip = this.contextMenuStripactionstab; @@ -584,26 +611,6 @@ private void InitializeComponent() this.tabControlactions.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); this.tabControlactions.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); // - // contextMenuStripactionstab - // - this.contextMenuStripactionstab.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.customizeToolStripMenuItem, - this.multiLineToolStripMenuItem}); - this.contextMenuStripactionstab.Name = "contextMenuStripactionstab"; - resources.ApplyResources(this.contextMenuStripactionstab, "contextMenuStripactionstab"); - // - // customizeToolStripMenuItem - // - this.customizeToolStripMenuItem.Name = "customizeToolStripMenuItem"; - resources.ApplyResources(this.customizeToolStripMenuItem, "customizeToolStripMenuItem"); - this.customizeToolStripMenuItem.Click += new System.EventHandler(this.customizeToolStripMenuItem_Click); - // - // multiLineToolStripMenuItem - // - this.multiLineToolStripMenuItem.Name = "multiLineToolStripMenuItem"; - resources.ApplyResources(this.multiLineToolStripMenuItem, "multiLineToolStripMenuItem"); - this.multiLineToolStripMenuItem.Click += new System.EventHandler(this.multiLineToolStripMenuItem_Click); - // // tabQuick // resources.ApplyResources(this.tabQuick, "tabQuick"); @@ -768,6 +775,7 @@ private void InitializeComponent() this.BUT_SendMSG.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_SendMSG, "BUT_SendMSG"); this.BUT_SendMSG.Name = "BUT_SendMSG"; + this.BUT_SendMSG.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUT_SendMSG, resources.GetString("BUT_SendMSG.ToolTip")); this.BUT_SendMSG.UseVisualStyleBackColor = true; this.BUT_SendMSG.Click += new System.EventHandler(this.BUT_SendMSG_Click); @@ -779,6 +787,7 @@ private void InitializeComponent() this.BUT_abortland.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_abortland, "BUT_abortland"); this.BUT_abortland.Name = "BUT_abortland"; + this.BUT_abortland.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUT_abortland, resources.GetString("BUT_abortland.ToolTip")); this.BUT_abortland.UseVisualStyleBackColor = true; this.BUT_abortland.Click += new System.EventHandler(this.BUT_abortland_Click); @@ -818,6 +827,7 @@ private void InitializeComponent() this.BUT_clear_track.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_clear_track, "BUT_clear_track"); this.BUT_clear_track.Name = "BUT_clear_track"; + this.BUT_clear_track.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUT_clear_track, resources.GetString("BUT_clear_track.ToolTip")); this.BUT_clear_track.UseVisualStyleBackColor = true; this.BUT_clear_track.Click += new System.EventHandler(this.BUT_clear_track_Click); @@ -837,6 +847,7 @@ private void InitializeComponent() this.BUTactiondo.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUTactiondo, "BUTactiondo"); this.BUTactiondo.Name = "BUTactiondo"; + this.BUTactiondo.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUTactiondo, resources.GetString("BUTactiondo.ToolTip")); this.BUTactiondo.UseVisualStyleBackColor = true; this.BUTactiondo.Click += new System.EventHandler(this.BUTactiondo_Click); @@ -848,6 +859,7 @@ private void InitializeComponent() this.BUT_resumemis.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_resumemis, "BUT_resumemis"); this.BUT_resumemis.Name = "BUT_resumemis"; + this.BUT_resumemis.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_resumemis.UseVisualStyleBackColor = true; this.BUT_resumemis.Click += new System.EventHandler(this.BUT_resumemis_Click); // @@ -926,6 +938,7 @@ private void InitializeComponent() this.BUT_ARM.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_ARM, "BUT_ARM"); this.BUT_ARM.Name = "BUT_ARM"; + this.BUT_ARM.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUT_ARM, resources.GetString("BUT_ARM.ToolTip")); this.BUT_ARM.UseVisualStyleBackColor = true; this.BUT_ARM.Click += new System.EventHandler(this.BUT_ARM_Click); @@ -937,6 +950,7 @@ private void InitializeComponent() this.BUT_mountmode.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_mountmode, "BUT_mountmode"); this.BUT_mountmode.Name = "BUT_mountmode"; + this.BUT_mountmode.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUT_mountmode, resources.GetString("BUT_mountmode.ToolTip")); this.BUT_mountmode.UseVisualStyleBackColor = true; this.BUT_mountmode.Click += new System.EventHandler(this.BUT_mountmode_Click); @@ -948,6 +962,7 @@ private void InitializeComponent() this.BUT_joystick.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_joystick, "BUT_joystick"); this.BUT_joystick.Name = "BUT_joystick"; + this.BUT_joystick.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUT_joystick, resources.GetString("BUT_joystick.ToolTip")); this.BUT_joystick.UseVisualStyleBackColor = true; this.BUT_joystick.Click += new System.EventHandler(this.BUT_joystick_Click); @@ -959,6 +974,7 @@ private void InitializeComponent() this.BUT_RAWSensor.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_RAWSensor, "BUT_RAWSensor"); this.BUT_RAWSensor.Name = "BUT_RAWSensor"; + this.BUT_RAWSensor.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUT_RAWSensor, resources.GetString("BUT_RAWSensor.ToolTip")); this.BUT_RAWSensor.UseVisualStyleBackColor = true; this.BUT_RAWSensor.Click += new System.EventHandler(this.BUT_RAWSensor_Click); @@ -970,6 +986,7 @@ private void InitializeComponent() this.BUT_Homealt.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_Homealt, "BUT_Homealt"); this.BUT_Homealt.Name = "BUT_Homealt"; + this.BUT_Homealt.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUT_Homealt, resources.GetString("BUT_Homealt.ToolTip")); this.BUT_Homealt.UseVisualStyleBackColor = true; this.BUT_Homealt.Click += new System.EventHandler(this.BUT_Homealt_Click); @@ -981,6 +998,7 @@ private void InitializeComponent() this.BUTrestartmission.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUTrestartmission, "BUTrestartmission"); this.BUTrestartmission.Name = "BUTrestartmission"; + this.BUTrestartmission.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUTrestartmission, resources.GetString("BUTrestartmission.ToolTip")); this.BUTrestartmission.UseVisualStyleBackColor = true; this.BUTrestartmission.Click += new System.EventHandler(this.BUTrestartmission_Click); @@ -1000,6 +1018,7 @@ private void InitializeComponent() this.BUT_quickrtl.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_quickrtl, "BUT_quickrtl"); this.BUT_quickrtl.Name = "BUT_quickrtl"; + this.BUT_quickrtl.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUT_quickrtl, resources.GetString("BUT_quickrtl.ToolTip")); this.BUT_quickrtl.UseVisualStyleBackColor = true; this.BUT_quickrtl.Click += new System.EventHandler(this.BUT_quickrtl_Click); @@ -1011,6 +1030,7 @@ private void InitializeComponent() this.BUT_quickmanual.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_quickmanual, "BUT_quickmanual"); this.BUT_quickmanual.Name = "BUT_quickmanual"; + this.BUT_quickmanual.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUT_quickmanual, resources.GetString("BUT_quickmanual.ToolTip")); this.BUT_quickmanual.UseVisualStyleBackColor = true; this.BUT_quickmanual.Click += new System.EventHandler(this.BUT_quickmanual_Click); @@ -1022,6 +1042,7 @@ private void InitializeComponent() this.BUT_setwp.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_setwp, "BUT_setwp"); this.BUT_setwp.Name = "BUT_setwp"; + this.BUT_setwp.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUT_setwp, resources.GetString("BUT_setwp.ToolTip")); this.BUT_setwp.UseVisualStyleBackColor = true; this.BUT_setwp.Click += new System.EventHandler(this.BUT_setwp_Click); @@ -1042,6 +1063,7 @@ private void InitializeComponent() this.BUT_quickauto.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_quickauto, "BUT_quickauto"); this.BUT_quickauto.Name = "BUT_quickauto"; + this.BUT_quickauto.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUT_quickauto, resources.GetString("BUT_quickauto.ToolTip")); this.BUT_quickauto.UseVisualStyleBackColor = true; this.BUT_quickauto.Click += new System.EventHandler(this.BUT_quickauto_Click); @@ -1053,6 +1075,7 @@ private void InitializeComponent() this.BUT_setmode.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_setmode, "BUT_setmode"); this.BUT_setmode.Name = "BUT_setmode"; + this.BUT_setmode.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.BUT_setmode, resources.GetString("BUT_setmode.ToolTip")); this.BUT_setmode.UseVisualStyleBackColor = true; this.BUT_setmode.Click += new System.EventHandler(this.BUT_setmode_Click); @@ -1085,6 +1108,7 @@ private void InitializeComponent() this.myButton1.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.myButton1, "myButton1"); this.myButton1.Name = "myButton1"; + this.myButton1.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.myButton1, resources.GetString("myButton1.ToolTip")); this.myButton1.UseVisualStyleBackColor = true; this.myButton1.Click += new System.EventHandler(this.BUT_quickmanual_Click); @@ -1096,6 +1120,7 @@ private void InitializeComponent() this.myButton2.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.myButton2, "myButton2"); this.myButton2.Name = "myButton2"; + this.myButton2.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.myButton2, resources.GetString("myButton2.ToolTip")); this.myButton2.UseVisualStyleBackColor = true; this.myButton2.Click += new System.EventHandler(this.BUT_quickrtl_Click); @@ -1107,6 +1132,7 @@ private void InitializeComponent() this.myButton3.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.myButton3, "myButton3"); this.myButton3.Name = "myButton3"; + this.myButton3.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.toolTip1.SetToolTip(this.myButton3, resources.GetString("myButton3.ToolTip")); this.myButton3.UseVisualStyleBackColor = true; this.myButton3.Click += new System.EventHandler(this.BUT_quickauto_Click); @@ -2012,6 +2038,7 @@ private void InitializeComponent() this.BUT_edit_selected.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_edit_selected, "BUT_edit_selected"); this.BUT_edit_selected.Name = "BUT_edit_selected"; + this.BUT_edit_selected.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_edit_selected.UseVisualStyleBackColor = true; this.BUT_edit_selected.Click += new System.EventHandler(this.BUT_edit_selected_Click); // @@ -2027,6 +2054,7 @@ private void InitializeComponent() this.BUT_run_script.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_run_script, "BUT_run_script"); this.BUT_run_script.Name = "BUT_run_script"; + this.BUT_run_script.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_run_script.UseVisualStyleBackColor = true; this.BUT_run_script.Click += new System.EventHandler(this.BUT_run_script_Click); // @@ -2037,6 +2065,7 @@ private void InitializeComponent() this.BUT_abort_script.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_abort_script, "BUT_abort_script"); this.BUT_abort_script.Name = "BUT_abort_script"; + this.BUT_abort_script.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_abort_script.UseVisualStyleBackColor = true; this.BUT_abort_script.Click += new System.EventHandler(this.BUT_abort_script_Click); // @@ -2052,6 +2081,7 @@ private void InitializeComponent() this.BUT_select_script.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_select_script, "BUT_select_script"); this.BUT_select_script.Name = "BUT_select_script"; + this.BUT_select_script.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_select_script.UseVisualStyleBackColor = true; this.BUT_select_script.Click += new System.EventHandler(this.BUT_select_script_Click); // @@ -2070,8 +2100,9 @@ private void InitializeComponent() // resources.ApplyResources(this.BUT_GimbalVideo, "BUT_GimbalVideo"); this.BUT_GimbalVideo.Name = "BUT_GimbalVideo"; + this.BUT_GimbalVideo.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_GimbalVideo.UseVisualStyleBackColor = true; - this.BUT_GimbalVideo.Click += new System.EventHandler(this.BUT_GimbalVideo_Click); + this.BUT_GimbalVideo.Click += new System.EventHandler(this.gimbalVideoPopOutToolStripMenuItem_Click); // // groupBoxRoll // @@ -2129,6 +2160,7 @@ private void InitializeComponent() // resources.ApplyResources(this.BUT_resetGimbalPos, "BUT_resetGimbalPos"); this.BUT_resetGimbalPos.Name = "BUT_resetGimbalPos"; + this.BUT_resetGimbalPos.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_resetGimbalPos.UseVisualStyleBackColor = true; this.BUT_resetGimbalPos.Click += new System.EventHandler(this.BUT_resetGimbalPos_Click); // @@ -2203,6 +2235,7 @@ private void InitializeComponent() resources.ApplyResources(this.BUT_speed10, "BUT_speed10"); this.BUT_speed10.Name = "BUT_speed10"; this.BUT_speed10.Tag = "10"; + this.BUT_speed10.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_speed10.UseVisualStyleBackColor = true; this.BUT_speed10.Click += new System.EventHandler(this.BUT_speed1_Click); // @@ -2214,6 +2247,7 @@ private void InitializeComponent() resources.ApplyResources(this.BUT_speed5, "BUT_speed5"); this.BUT_speed5.Name = "BUT_speed5"; this.BUT_speed5.Tag = "5"; + this.BUT_speed5.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_speed5.UseVisualStyleBackColor = true; this.BUT_speed5.Click += new System.EventHandler(this.BUT_speed1_Click); // @@ -2225,6 +2259,7 @@ private void InitializeComponent() resources.ApplyResources(this.BUT_speed2, "BUT_speed2"); this.BUT_speed2.Name = "BUT_speed2"; this.BUT_speed2.Tag = "2"; + this.BUT_speed2.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_speed2.UseVisualStyleBackColor = true; this.BUT_speed2.Click += new System.EventHandler(this.BUT_speed1_Click); // @@ -2236,6 +2271,7 @@ private void InitializeComponent() resources.ApplyResources(this.BUT_speed1, "BUT_speed1"); this.BUT_speed1.Name = "BUT_speed1"; this.BUT_speed1.Tag = "1"; + this.BUT_speed1.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_speed1.UseVisualStyleBackColor = true; this.BUT_speed1.Click += new System.EventHandler(this.BUT_speed1_Click); // @@ -2247,6 +2283,7 @@ private void InitializeComponent() resources.ApplyResources(this.BUT_speed1_2, "BUT_speed1_2"); this.BUT_speed1_2.Name = "BUT_speed1_2"; this.BUT_speed1_2.Tag = "0.5"; + this.BUT_speed1_2.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_speed1_2.UseVisualStyleBackColor = true; this.BUT_speed1_2.Click += new System.EventHandler(this.BUT_speed1_Click); // @@ -2258,6 +2295,7 @@ private void InitializeComponent() resources.ApplyResources(this.BUT_speed1_4, "BUT_speed1_4"); this.BUT_speed1_4.Name = "BUT_speed1_4"; this.BUT_speed1_4.Tag = "0.25"; + this.BUT_speed1_4.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_speed1_4.UseVisualStyleBackColor = true; this.BUT_speed1_4.Click += new System.EventHandler(this.BUT_speed1_Click); // @@ -2269,6 +2307,7 @@ private void InitializeComponent() resources.ApplyResources(this.BUT_speed1_10, "BUT_speed1_10"); this.BUT_speed1_10.Name = "BUT_speed1_10"; this.BUT_speed1_10.Tag = "0.1"; + this.BUT_speed1_10.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_speed1_10.UseVisualStyleBackColor = true; this.BUT_speed1_10.Click += new System.EventHandler(this.BUT_speed1_Click); // @@ -2279,6 +2318,7 @@ private void InitializeComponent() this.BUT_loadtelem.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_loadtelem, "BUT_loadtelem"); this.BUT_loadtelem.Name = "BUT_loadtelem"; + this.BUT_loadtelem.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_loadtelem.UseVisualStyleBackColor = true; this.BUT_loadtelem.Click += new System.EventHandler(this.BUT_loadtelem_Click); // @@ -2305,6 +2345,7 @@ private void InitializeComponent() this.BUT_log2kml.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_log2kml, "BUT_log2kml"); this.BUT_log2kml.Name = "BUT_log2kml"; + this.BUT_log2kml.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_log2kml.UseVisualStyleBackColor = true; this.BUT_log2kml.Click += new System.EventHandler(this.BUT_log2kml_Click); // @@ -2315,6 +2356,7 @@ private void InitializeComponent() this.BUT_playlog.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_playlog, "BUT_playlog"); this.BUT_playlog.Name = "BUT_playlog"; + this.BUT_playlog.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_playlog.UseVisualStyleBackColor = true; this.BUT_playlog.Click += new System.EventHandler(this.BUT_playlog_Click); // @@ -2352,6 +2394,7 @@ private void InitializeComponent() this.BUT_DFMavlink.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_DFMavlink, "BUT_DFMavlink"); this.BUT_DFMavlink.Name = "BUT_DFMavlink"; + this.BUT_DFMavlink.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_DFMavlink.UseVisualStyleBackColor = true; this.BUT_DFMavlink.Click += new System.EventHandler(this.BUT_DFMavlink_Click); // @@ -2359,6 +2402,7 @@ private void InitializeComponent() // resources.ApplyResources(this.BUT_georefimage, "BUT_georefimage"); this.BUT_georefimage.Name = "BUT_georefimage"; + this.BUT_georefimage.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_georefimage.Click += new System.EventHandler(this.BUT_georefimage_Click); // // BUT_logbrowse @@ -2368,6 +2412,7 @@ private void InitializeComponent() this.BUT_logbrowse.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_logbrowse, "BUT_logbrowse"); this.BUT_logbrowse.Name = "BUT_logbrowse"; + this.BUT_logbrowse.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_logbrowse.UseVisualStyleBackColor = true; this.BUT_logbrowse.Click += new System.EventHandler(this.BUT_logbrowse_Click); // @@ -2378,6 +2423,7 @@ private void InitializeComponent() this.BUT_matlab.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_matlab, "BUT_matlab"); this.BUT_matlab.Name = "BUT_matlab"; + this.BUT_matlab.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_matlab.UseVisualStyleBackColor = true; this.BUT_matlab.Click += new System.EventHandler(this.BUT_matlab_Click); // @@ -2388,6 +2434,7 @@ private void InitializeComponent() this.but_bintolog.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.but_bintolog, "but_bintolog"); this.but_bintolog.Name = "but_bintolog"; + this.but_bintolog.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.but_bintolog.UseVisualStyleBackColor = true; this.but_bintolog.Click += new System.EventHandler(this.but_bintolog_Click); // @@ -2398,6 +2445,7 @@ private void InitializeComponent() this.but_dflogtokml.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.but_dflogtokml, "but_dflogtokml"); this.but_dflogtokml.Name = "but_dflogtokml"; + this.but_dflogtokml.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.but_dflogtokml.UseVisualStyleBackColor = true; this.but_dflogtokml.Click += new System.EventHandler(this.but_dflogtokml_Click); // @@ -2408,6 +2456,7 @@ private void InitializeComponent() this.BUT_loganalysis.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.BUT_loganalysis, "BUT_loganalysis"); this.BUT_loganalysis.Name = "BUT_loganalysis"; + this.BUT_loganalysis.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.BUT_loganalysis.UseVisualStyleBackColor = true; this.BUT_loganalysis.Click += new System.EventHandler(this.BUT_loganalysis_Click); // @@ -2448,6 +2497,7 @@ private void InitializeComponent() this.splitContainer1.Panel2.Controls.Add(this.lbl_hdop); this.splitContainer1.Panel2.Controls.Add(this.lbl_sats); this.splitContainer1.Panel2.Controls.Add(this.gMapControl1); + this.splitContainer1.Panel2.Resize += new System.EventHandler(this.splitContainer1_Panel2_Resize); // // zg1 // @@ -2476,7 +2526,8 @@ private void InitializeComponent() this.setHomeHereToolStripMenuItem, this.takeOffToolStripMenuItem, this.onOffCameraOverlapToolStripMenuItem, - this.jumpToTagToolStripMenuItem}); + this.jumpToTagToolStripMenuItem, + this.gimbalVideoToolStripMenuItem}); this.contextMenuStripMap.Name = "contextMenuStrip1"; resources.ApplyResources(this.contextMenuStripMap, "contextMenuStripMap"); // @@ -2590,6 +2641,44 @@ private void InitializeComponent() resources.ApplyResources(this.onOffCameraOverlapToolStripMenuItem, "onOffCameraOverlapToolStripMenuItem"); this.onOffCameraOverlapToolStripMenuItem.Click += new System.EventHandler(this.onOffCameraOverlapToolStripMenuItem_Click); // + // jumpToTagToolStripMenuItem + // + this.jumpToTagToolStripMenuItem.Name = "jumpToTagToolStripMenuItem"; + resources.ApplyResources(this.jumpToTagToolStripMenuItem, "jumpToTagToolStripMenuItem"); + this.jumpToTagToolStripMenuItem.Click += new System.EventHandler(this.jumpToTagToolStripMenuItem_Click); + // + // gimbalVideoToolStripMenuItem + // + this.gimbalVideoToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.gimbalVideoFullSizedToolStripMenuItem, + this.gimbalVideoMiniToolStripMenuItem, + this.gimbalVideoPopOutToolStripMenuItem}); + this.gimbalVideoToolStripMenuItem.Name = "gimbalVideoToolStripMenuItem"; + resources.ApplyResources(this.gimbalVideoToolStripMenuItem, "gimbalVideoToolStripMenuItem"); + // + // gimbalVideoFullSizedToolStripMenuItem + // + this.gimbalVideoFullSizedToolStripMenuItem.Name = "gimbalVideoFullSizedToolStripMenuItem"; + resources.ApplyResources(this.gimbalVideoFullSizedToolStripMenuItem, "gimbalVideoFullSizedToolStripMenuItem"); + this.gimbalVideoFullSizedToolStripMenuItem.Click += new System.EventHandler(this.gimbalVideoFullSizedToolStripMenuItem_Click); + // + // gimbalVideoMiniToolStripMenuItem + // + this.gimbalVideoMiniToolStripMenuItem.Name = "gimbalVideoMiniToolStripMenuItem"; + resources.ApplyResources(this.gimbalVideoMiniToolStripMenuItem, "gimbalVideoMiniToolStripMenuItem"); + this.gimbalVideoMiniToolStripMenuItem.Click += new System.EventHandler(this.gimbalVideoMiniToolStripMenuItem_Click); + // + // gimbalVideoPopOutToolStripMenuItem + // + this.gimbalVideoPopOutToolStripMenuItem.Name = "gimbalVideoPopOutToolStripMenuItem"; + resources.ApplyResources(this.gimbalVideoPopOutToolStripMenuItem, "gimbalVideoPopOutToolStripMenuItem"); + this.gimbalVideoPopOutToolStripMenuItem.Click += new System.EventHandler(this.gimbalVideoPopOutToolStripMenuItem_Click); + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // // but_disablejoystick // this.but_disablejoystick.ColorMouseDown = System.Drawing.Color.Empty; @@ -2597,9 +2686,38 @@ private void InitializeComponent() this.but_disablejoystick.ColorNotEnabled = System.Drawing.Color.Empty; resources.ApplyResources(this.but_disablejoystick, "but_disablejoystick"); this.but_disablejoystick.Name = "but_disablejoystick"; + this.but_disablejoystick.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.but_disablejoystick.UseVisualStyleBackColor = true; this.but_disablejoystick.Click += new System.EventHandler(this.but_disablejoystick_Click); // + // Zoomlevel + // + resources.ApplyResources(this.Zoomlevel, "Zoomlevel"); + this.Zoomlevel.DecimalPlaces = 1; + this.Zoomlevel.Increment = new decimal(new int[] { + 5, + 0, + 0, + 65536}); + this.Zoomlevel.Maximum = new decimal(new int[] { + 18, + 0, + 0, + 0}); + this.Zoomlevel.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.Zoomlevel.Name = "Zoomlevel"; + this.toolTip1.SetToolTip(this.Zoomlevel, resources.GetString("Zoomlevel.ToolTip")); + this.Zoomlevel.Value = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.Zoomlevel.ValueChanged += new System.EventHandler(this.Zoomlevel_ValueChanged); + // // distanceBar1 // resources.ApplyResources(this.distanceBar1, "distanceBar1"); @@ -2608,11 +2726,24 @@ private void InitializeComponent() this.distanceBar1.totaldist = 100F; this.distanceBar1.traveleddist = 0F; // + // TRK_zoom + // + resources.ApplyResources(this.TRK_zoom, "TRK_zoom"); + this.TRK_zoom.LargeChange = 1F; + this.TRK_zoom.Maximum = 24F; + this.TRK_zoom.Minimum = 1F; + this.TRK_zoom.Name = "TRK_zoom"; + this.TRK_zoom.SmallChange = 1F; + this.TRK_zoom.TickFrequency = 1F; + this.TRK_zoom.TickStyle = System.Windows.Forms.TickStyle.TopLeft; + this.TRK_zoom.Value = 1F; + this.TRK_zoom.Scroll += new System.EventHandler(this.TRK_zoom_Scroll); + // // windDir1 // this.windDir1.BackColor = System.Drawing.Color.Transparent; - this.windDir1.DataBindings.Add(new System.Windows.Forms.Binding("Direction", this.bindingSource1, "wind_dir", false, System.Windows.Forms.DataSourceUpdateMode.Never)); - this.windDir1.DataBindings.Add(new System.Windows.Forms.Binding("Speed", this.bindingSource1, "wind_vel", false, System.Windows.Forms.DataSourceUpdateMode.Never)); + this.windDir1.DataBindings.Add(new System.Windows.Forms.Binding("Direction", this.bindingSource1, "wind_dir", true, System.Windows.Forms.DataSourceUpdateMode.Never)); + this.windDir1.DataBindings.Add(new System.Windows.Forms.Binding("Speed", this.bindingSource1, "wind_vel", true, System.Windows.Forms.DataSourceUpdateMode.Never)); this.windDir1.Direction = 180D; resources.ApplyResources(this.windDir1, "windDir1"); this.windDir1.Name = "windDir1"; @@ -2699,19 +2830,6 @@ private void InitializeComponent() this.gMapControl1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.gMapControl1_MouseMove); this.gMapControl1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.gMapControl1_MouseUp); // - // TRK_zoom - // - resources.ApplyResources(this.TRK_zoom, "TRK_zoom"); - this.TRK_zoom.LargeChange = 1F; - this.TRK_zoom.Maximum = 24F; - this.TRK_zoom.Minimum = 1F; - this.TRK_zoom.Name = "TRK_zoom"; - this.TRK_zoom.SmallChange = 1F; - this.TRK_zoom.TickFrequency = 1F; - this.TRK_zoom.TickStyle = System.Windows.Forms.TickStyle.TopLeft; - this.TRK_zoom.Value = 1F; - this.TRK_zoom.Scroll += new System.EventHandler(this.TRK_zoom_Scroll); - // // panel1 // resources.ApplyResources(this.panel1, "panel1"); @@ -2725,48 +2843,15 @@ private void InitializeComponent() this.coords1.Alt = 0D; this.coords1.AltSource = ""; this.coords1.AltUnit = "m"; - this.coords1.DataBindings.Add(new System.Windows.Forms.Binding("Alt", this.bindingSource1, "alt", false)); - this.coords1.DataBindings.Add(new System.Windows.Forms.Binding("Lat", this.bindingSource1, "lat", false)); - this.coords1.DataBindings.Add(new System.Windows.Forms.Binding("Lng", this.bindingSource1, "lng", false)); + this.coords1.DataBindings.Add(new System.Windows.Forms.Binding("Alt", this.bindingSource1, "alt", true)); + this.coords1.DataBindings.Add(new System.Windows.Forms.Binding("Lat", this.bindingSource1, "lat", true)); + this.coords1.DataBindings.Add(new System.Windows.Forms.Binding("Lng", this.bindingSource1, "lng", true)); this.coords1.Lat = 0D; this.coords1.Lng = 0D; resources.ApplyResources(this.coords1, "coords1"); this.coords1.Name = "coords1"; this.coords1.Vertical = false; // - // Zoomlevel - // - resources.ApplyResources(this.Zoomlevel, "Zoomlevel"); - this.Zoomlevel.DecimalPlaces = 1; - this.Zoomlevel.Increment = new decimal(new int[] { - 5, - 0, - 0, - 65536}); - this.Zoomlevel.Maximum = new decimal(new int[] { - 18, - 0, - 0, - 0}); - this.Zoomlevel.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.Zoomlevel.Name = "Zoomlevel"; - this.toolTip1.SetToolTip(this.Zoomlevel, resources.GetString("Zoomlevel.ToolTip")); - this.Zoomlevel.Value = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.Zoomlevel.ValueChanged += new System.EventHandler(this.Zoomlevel_ValueChanged); - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; - // // CHK_autopan // resources.ApplyResources(this.CHK_autopan, "CHK_autopan"); @@ -2811,12 +2896,6 @@ private void InitializeComponent() // this.bindingSourceStatusTab.DataSource = typeof(MissionPlanner.CurrentState); // - // jumpToTagToolStripMenuItem - // - this.jumpToTagToolStripMenuItem.Name = "jumpToTagToolStripMenuItem"; - resources.ApplyResources(this.jumpToTagToolStripMenuItem, "jumpToTagToolStripMenuItem"); - this.jumpToTagToolStripMenuItem.Click += new System.EventHandler(this.jumpToTagToolStripMenuItem_Click); - // // FlightData // this.Controls.Add(this.MainH); @@ -2837,8 +2916,8 @@ private void InitializeComponent() this.SubMainLeft.ResumeLayout(false); this.contextMenuStripHud.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bindingSourceHud)).EndInit(); - this.tabControlactions.ResumeLayout(false); this.contextMenuStripactionstab.ResumeLayout(false); + this.tabControlactions.ResumeLayout(false); this.tabQuick.ResumeLayout(false); this.tableLayoutPanelQuick.ResumeLayout(false); this.contextMenuStripQuickView.ResumeLayout(false); @@ -2888,9 +2967,9 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); this.contextMenuStripMap.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Zoomlevel)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.TRK_zoom)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.bindingSourceStatusTab)).EndInit(); @@ -3127,5 +3206,9 @@ private void InitializeComponent() private Controls.RelayOptions relayOptions14; private Controls.RelayOptions relayOptions15; private Controls.RelayOptions relayOptions16; + private ToolStripMenuItem gimbalVideoToolStripMenuItem; + private ToolStripMenuItem gimbalVideoFullSizedToolStripMenuItem; + private ToolStripMenuItem gimbalVideoMiniToolStripMenuItem; + private ToolStripMenuItem gimbalVideoPopOutToolStripMenuItem; } } diff --git a/GCSViews/FlightData.cs b/GCSViews/FlightData.cs index 9bb0bd71bd..0573b3fed3 100644 --- a/GCSViews/FlightData.cs +++ b/GCSViews/FlightData.cs @@ -1848,6 +1848,9 @@ private void CB_tuning_CheckedChanged(object sender, EventArgs e) ZedGraphTimer.Stop(); zg1.Visible = false; } + + // Fire the splitContainer1_Panel2_Resize event + splitContainer1_Panel2_Resize(null, null); } private void CheckAndBindPreFlightData() @@ -6448,19 +6451,178 @@ private void jumpToTagToolStripMenuItem_Click(object sender, EventArgs e) } } - private void BUT_GimbalVideo_Click(object sender, EventArgs e) + ToolStripMenuItem gimbalVideoShowMiniMap = new ToolStripMenuItem("Mini map"); + ToolStripMenuItem gimbalVideoSwapPosition = new ToolStripMenuItem("Swap with map"); + ToolStripMenuItem gimbalVideoClose = new ToolStripMenuItem("Close"); + GimbalVideoControl _gimbalVideoControl; + GimbalVideoControl gimbalVideoControl + { + get + { + // Check if we need to construct a gimbalVideoControl + if (_gimbalVideoControl == null || _gimbalVideoControl.IsDisposed) + { + _gimbalVideoControl = new GimbalVideoControl(); + _gimbalVideoControl.Dock = DockStyle.Fill; + + // Add option to show/hide minimap + gimbalVideoShowMiniMap.CheckOnClick = true; + gimbalVideoShowMiniMap.Checked = true; + gimbalVideoShowMiniMap.CheckedChanged += (s, ev) => + { + gMapControl1.Visible = gimbalVideoShowMiniMap.Checked; + gimbalVideoSwapPosition.Visible = gimbalVideoShowMiniMap.Checked; + }; + gimbalVideoSwapPosition.Click += (s, ev) => + { + if (gimbalVideoControl.Dock == DockStyle.None) + { + gimbalVideoFullSizedToolStripMenuItem_Click(null, null); + } + else + { + gimbalVideoMiniToolStripMenuItem_Click(null, null); + } + }; + gimbalVideoClose.Click += (s, ev) => + { + gimbalVideoMiniToolStripMenuItem_Click(null, null); + gimbalVideoControl.Visible = false; + gimbalVideoControl.Stop(); + gimbalVideoControl.Dispose(); + }; + + _gimbalVideoControl.VideoBoxContextMenu.Items.Add(gimbalVideoShowMiniMap); + _gimbalVideoControl.VideoBoxContextMenu.Items.Add(gimbalVideoSwapPosition); + _gimbalVideoControl.VideoBoxContextMenu.Items.Add(gimbalVideoClose); + } + + return _gimbalVideoControl; + } + } + + // Resize the mini video or mini map when the container is resized + private void splitContainer1_Panel2_Resize(object sender, EventArgs e) { + bool miniVideo = splitContainer1.Panel2.Contains(_gimbalVideoControl) + && _gimbalVideoControl?.Dock == DockStyle.None + && _gimbalVideoControl.Visible; + bool miniMap = gMapControl1.Dock == DockStyle.None && gMapControl1.Visible; + if (miniVideo) + { + var width = (int)(splitContainer1.Panel2.Width * 0.3); + var height = (int)(splitContainer1.Panel2.Height * 0.3); + var aspectRatio = _gimbalVideoControl.VideoBox.Image.Width / (double)_gimbalVideoControl.VideoBox.Image.Height; + (width, height) = ( + Math.Min(width, (int)(height * aspectRatio)), + Math.Min(height, (int)(width / aspectRatio)) + ); + var x = splitContainer1.Panel2.Width - width - TRK_zoom.Width; + var y = splitContainer1.Panel2.Height - height; + _gimbalVideoControl.Location = new Point(x, y); + _gimbalVideoControl.Size = new Size(width, height); + } + else if (miniMap) + { + var width = (int)(splitContainer1.Panel2.Width * 0.3); + var height = (int)(splitContainer1.Panel2.Height * 0.3); + var x = splitContainer1.Panel2.Width - width; + var y = splitContainer1.Panel2.Height - height; + gMapControl1.Location = new Point(x, y); + gMapControl1.Size = new Size(width, height); + } + + Invalidate(); + } + + private void gimbalVideoFullSizedToolStripMenuItem_Click(object sender, EventArgs e) + { + // If the gimbal video is in its own window, close it + var containingForm = gimbalVideoControl.Parent as Form; + + // Fill the panel with the gimbal video control + splitContainer1.Panel2.Controls.Add(gimbalVideoControl); + gimbalVideoControl.Dock = DockStyle.Fill; + gimbalVideoControl.BringToFront(); // Place on top of all map overlay controls + gimbalVideoControl.Visible = true; + + // Add the map panel to the mini map panel + gMapControl1.Dock = DockStyle.None; + gMapControl1.BringToFront(); + gMapControl1.Visible = gimbalVideoShowMiniMap.Checked; + + // Call resize to correctly position the mini map + splitContainer1_Panel2_Resize(null, null); + + // Reconfigure context menu controls + gimbalVideoShowMiniMap.Visible = true; + gimbalVideoSwapPosition.Visible = gimbalVideoShowMiniMap.Checked; + gimbalVideoClose.Visible = true; + + containingForm?.Close(); + } + + private void gimbalVideoMiniToolStripMenuItem_Click(object sender, EventArgs e) + { + // If the gimbal video is in its own window, close it + var containingForm = gimbalVideoControl.Parent as Form; + + // Fill the panel with the map + gMapControl1.Dock = DockStyle.Fill; + gMapControl1.Visible = true; + gMapControl1.SendToBack(); // Behind the map overlay controls + + // Add the gimbal video control to the mini video panel + splitContainer1.Panel2.Controls.Add(gimbalVideoControl); + gimbalVideoControl.Dock = DockStyle.None; + gimbalVideoControl.BringToFront(); + gimbalVideoControl.Visible = true; + + // Call resize to correctly position the mini video + splitContainer1_Panel2_Resize(null, null); + + // Reconfigure context menu controls + gimbalVideoShowMiniMap.Visible = false; + gimbalVideoSwapPosition.Visible = true; + gimbalVideoClose.Visible = true; + + containingForm?.Close(); + } + + private void gimbalVideoPopOutToolStripMenuItem_Click(object sender, EventArgs e) + { + // See if the gimbal video is already in its own window + if (gimbalVideoControl.Parent is Form) + { + // Remove from the form and dispose the form + // (in case the form has ended up off screen or something) + var ParentForm = gimbalVideoControl.Parent as Form; + ParentForm.Controls.Remove(gimbalVideoControl); + ParentForm.Close(); + } + + // Restore the map to full sized if necessary + gMapControl1.Dock = DockStyle.Fill; + gMapControl1.SendToBack(); + gMapControl1.Visible = true; + var form = new Form() { Text = "Gimbal Control", Size = new Size(600, 400), StartPosition = FormStartPosition.CenterParent }; - form.Controls.Add(new GimbalVideoControl() - { - Dock = DockStyle.Fill - }); - form.Show(); + form.Controls.Add(gimbalVideoControl); + gimbalVideoControl.Dock = DockStyle.Fill; + gimbalVideoControl.Visible = true; + + // Reconfigure context menu controls + gimbalVideoShowMiniMap.Visible = false; + gimbalVideoSwapPosition.Visible = false; + gimbalVideoClose.Visible = false; + + // Pass `this` to keep the pop-out always on top + form.Show(this); } } } diff --git a/GCSViews/FlightData.resx b/GCSViews/FlightData.resx index d709f2d951..f8dddae42c 100644 --- a/GCSViews/FlightData.resx +++ b/GCSViews/FlightData.resx @@ -694,7 +694,7 @@ modifyandSetLoiterRad - MissionPlanner.Controls.ModifyandSet, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ModifyandSet, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null tableLayoutPanel1 @@ -853,7 +853,7 @@ modifyandSetAlt - MissionPlanner.Controls.ModifyandSet, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ModifyandSet, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null tableLayoutPanel1 @@ -889,7 +889,7 @@ modifyandSetSpeed - MissionPlanner.Controls.ModifyandSet, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ModifyandSet, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null tableLayoutPanel1 @@ -1582,7 +1582,7 @@ checkListControl1 - MissionPlanner.Controls.PreFlight.CheckListControl, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.PreFlight.CheckListControl, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null tabPagePreFlight @@ -3071,7 +3071,7 @@ servoOptions1 - MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3092,7 +3092,7 @@ servoOptions2 - MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3113,7 +3113,7 @@ servoOptions3 - MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3134,7 +3134,7 @@ servoOptions4 - MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3155,7 +3155,7 @@ servoOptions5 - MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3164,7 +3164,7 @@ 4 - 3, 168 + 324, 3 315, 27 @@ -3176,7 +3176,7 @@ servoOptions6 - MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3185,7 +3185,7 @@ 5 - 3, 201 + 324, 36 315, 27 @@ -3197,7 +3197,7 @@ servoOptions7 - MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3206,7 +3206,7 @@ 6 - 3, 234 + 324, 69 295, 24 @@ -3218,7 +3218,7 @@ servoOptions8 - MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3227,7 +3227,7 @@ 7 - 3, 264 + 324, 99 295, 24 @@ -3239,7 +3239,7 @@ servoOptions9 - MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3248,7 +3248,7 @@ 8 - 3, 294 + 324, 129 295, 24 @@ -3260,7 +3260,7 @@ servoOptions10 - MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3269,7 +3269,7 @@ 9 - 3, 324 + 645, 3 295, 22 @@ -3281,7 +3281,7 @@ servoOptions11 - MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3290,7 +3290,7 @@ 10 - 3, 352 + 645, 31 295, 22 @@ -3302,7 +3302,7 @@ servoOptions12 - MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.ServoOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3311,7 +3311,7 @@ 11 - 3, 380 + 645, 59 198, 22 @@ -3323,7 +3323,7 @@ relayOptions1 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3332,7 +3332,7 @@ 12 - 3, 408 + 645, 87 198, 22 @@ -3344,7 +3344,7 @@ relayOptions2 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3353,7 +3353,7 @@ 13 - 3, 436 + 645, 115 198, 22 @@ -3365,7 +3365,7 @@ relayOptions3 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3374,7 +3374,7 @@ 14 - 3, 464 + 645, 143 198, 22 @@ -3386,7 +3386,7 @@ relayOptions4 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3395,7 +3395,7 @@ 15 - 3, 492 + 946, 3 295, 22 @@ -3407,7 +3407,7 @@ relayOptions5 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3416,7 +3416,7 @@ 16 - 3, 520 + 946, 31 295, 22 @@ -3428,7 +3428,7 @@ relayOptions6 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3437,7 +3437,7 @@ 17 - 3, 548 + 946, 59 295, 22 @@ -3449,7 +3449,7 @@ relayOptions7 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8888.28482, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3458,7 +3458,7 @@ 18 - 3, 576 + 946, 87 295, 22 @@ -3470,7 +3470,7 @@ relayOptions8 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8888.28482, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3479,7 +3479,7 @@ 19 - 3, 604 + 946, 115 295, 22 @@ -3491,7 +3491,7 @@ relayOptions9 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8888.28482, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3500,7 +3500,7 @@ 20 - 3, 632 + 946, 143 295, 22 @@ -3512,7 +3512,7 @@ relayOptions10 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8888.28482, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3521,7 +3521,7 @@ 21 - 3, 660 + 1247, 3 295, 22 @@ -3533,7 +3533,7 @@ relayOptions11 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8888.28482, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3542,7 +3542,7 @@ 22 - 3, 688 + 1247, 31 295, 22 @@ -3554,7 +3554,7 @@ relayOptions12 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8888.28482, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3563,7 +3563,7 @@ 23 - 3, 716 + 1247, 59 295, 22 @@ -3575,7 +3575,7 @@ relayOptions13 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8888.28482, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3584,7 +3584,7 @@ 24 - 3, 744 + 1247, 87 295, 22 @@ -3596,7 +3596,7 @@ relayOptions14 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8888.28482, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3605,7 +3605,7 @@ 25 - 3, 772 + 1247, 115 295, 22 @@ -3617,7 +3617,7 @@ relayOptions15 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8888.28482, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3626,7 +3626,7 @@ 26 - 3, 800 + 1247, 143 295, 22 @@ -3638,7 +3638,7 @@ relayOptions16 - MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.8888.28482, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.RelayOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanelServos @@ -3716,7 +3716,7 @@ auxOptions1 - MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanel1 @@ -3737,7 +3737,7 @@ auxOptions2 - MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanel1 @@ -3758,7 +3758,7 @@ auxOptions3 - MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanel1 @@ -3779,7 +3779,7 @@ auxOptions4 - MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanel1 @@ -3800,7 +3800,7 @@ auxOptions5 - MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanel1 @@ -3821,7 +3821,7 @@ auxOptions6 - MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanel1 @@ -3842,7 +3842,7 @@ auxOptions7 - MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.AuxOptions, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null flowLayoutPanel1 @@ -5455,6 +5455,30 @@ Jump To Tag + + 123, 22 + + + Full Sized + + + 123, 22 + + + Mini + + + 123, 22 + + + Pop Out + + + 187, 22 + + + Gimbal Video + 188, 290 @@ -5464,6 +5488,39 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top, Bottom, Right + + + True + + + NoControl + + + 555, 3 + + + 34, 13 + + + 70 + + + Zoom + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1.Panel2 + + + 0 + NoControl @@ -5492,7 +5549,34 @@ splitContainer1.Panel2 - 0 + 1 + + + Top, Right + + + 551, 22 + + + 46, 20 + + + 69 + + + Change Zoom Level + + + Zoomlevel + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1.Panel2 + + + 2 Top, Left, Right @@ -5510,13 +5594,43 @@ distanceBar1 - MissionPlanner.Controls.DistanceBar, MissionPlanner, Version=1.3.8313.24739, Culture=neutral, PublicKeyToken=null + MissionPlanner.Controls.DistanceBar, MissionPlanner, Version=1.3.9060.39140, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 - 1 + 3 + + + Top, Bottom, Right + + + NoControl + + + 550, 40 + + + Vertical + + + 45, 157 + + + 72 + + + TRK_zoom + + + MissionPlanner.Controls.MyTrackBar, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + splitContainer1.Panel2 + + + 4 307, 17 @@ -5543,7 +5657,7 @@ splitContainer1.Panel2 - 2 + 5 Bottom, Left @@ -5576,7 +5690,7 @@ splitContainer1.Panel2 - 3 + 6 Bottom, Left @@ -5609,7 +5723,7 @@ splitContainer1.Panel2 - 4 + 7 Bottom, Left @@ -5642,7 +5756,7 @@ splitContainer1.Panel2 - 5 + 8 Bottom, Left @@ -5675,7 +5789,7 @@ splitContainer1.Panel2 - 6 + 9 Bottom, Left @@ -5708,7 +5822,7 @@ splitContainer1.Panel2 - 7 + 10 Bottom, Left @@ -5741,10 +5855,10 @@ splitContainer1.Panel2 - 8 + 11 - - Top, Bottom, Left, Right + + Fill 0, 0 @@ -5753,7 +5867,7 @@ 0, 0, 0, 0 - 550, 197 + 595, 197 0 @@ -5768,37 +5882,7 @@ splitContainer1.Panel2 - 9 - - - Top, Bottom, Right - - - NoControl - - - 550, 40 - - - Vertical - - - 45, 157 - - - 72 - - - TRK_zoom - - - MissionPlanner.Controls.MyTrackBar, MissionPlanner.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - splitContainer1.Panel2 - - - 10 + 12 splitContainer1.Panel2 @@ -5857,66 +5941,6 @@ 0 - - Top, Right - - - 551, 22 - - - 46, 20 - - - 69 - - - Change Zoom Level - - - Zoomlevel - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer1.Panel2 - - - 1 - - - Top, Bottom, Right - - - True - - - NoControl - - - 555, 3 - - - 34, 13 - - - 70 - - - Zoom - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer1.Panel2 - - - 2 - Bottom, Left @@ -5951,7 +5975,7 @@ panel1 - 3 + 1 Bottom, Left @@ -5987,7 +6011,7 @@ panel1 - 4 + 2 Fill @@ -6101,7 +6125,7 @@ True - 98 + 48 0, 0, 0, 0 @@ -6349,6 +6373,36 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + jumpToTagToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gimbalVideoToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gimbalVideoFullSizedToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gimbalVideoMiniToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gimbalVideoPopOutToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + bindingSource1 @@ -6391,12 +6445,6 @@ System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - jumpToTagToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - FlightData