APM Planner 1.1.91

fix datasource binding exception.
This commit is contained in:
Michael Oborne committed 2012-06-03 08:08:47 +08:00
1 parent 173ae33627
commit e4ea66b5dc
5 files changed
+202 -190

No files matched your search

@@ -249,22 +249,24 @@ namespace ArdupilotMega.Controls.BackstageView
{
// deactivate the old page
_activePage.Page.Close();
Pages.ForEach(x =>
{
x.Page.Visible = false;
});
// Pages.ForEach(x =>
// {
// x.Page.Visible = false;
// });
// deactivate button
_activePage.Page.Visible = false;
var oldButton = this.pnlMenu.Controls.OfType<BackstageViewButton>().Single(b => b.Tag == _activePage);
oldButton.IsSelected = false;
// ensure fields have been init
associatedPage.Page.DoLoad(new EventArgs());
// show it
associatedPage.Page.Visible = true;
var newButton = this.pnlMenu.Controls.OfType<BackstageViewButton>().Single(b => b.Tag == associatedPage);
newButton.IsSelected = true;
_activePage = associatedPage;
_activePage.Page.DoLoad(new EventArgs());
}
public void Close()
@@ -120,6 +120,10 @@
this.lbl_currentmode.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.currentStateBindingSource, "mode", true));
this.lbl_currentmode.Name = "lbl_currentmode";
//
// currentStateBindingSource
//
this.currentStateBindingSource.DataSource = typeof(ArdupilotMega.CurrentState);
//
// label12
//
resources.ApplyResources(this.label12, "label12");
@@ -946,7 +946,7 @@
<value>BUT_SaveModes</value>
</data>
<data name="&gt;&gt;BUT_SaveModes.Type" xml:space="preserve">
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4536.38105, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;BUT_SaveModes.Parent" xml:space="preserve">
<value>$this</value>
@@ -973,6 +973,6 @@
<value>ConfigFlightModes</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4536.38105, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>
File diff suppressed because it is too large. Load diff
@@ -34,5 +34,5 @@ using System.Resources;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.*")]
[assembly: AssemblyFileVersion("1.1.90")]
[assembly: AssemblyFileVersion("1.1.91")]
[assembly: NeutralResourcesLanguageAttribute("")]