zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Configurator.Net: Label changes only 

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1818 f9c3cf11-9bcb-44bc-f272-b75c42450872
master
mandrolic 14 years ago
parent
17c6acd310
commit
8daed835c8
5 changed files with 86 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Configurator/Configurator.Net/ArducopterConfigurator.csproj
  2. 48
      Configurator/Configurator.Net/Views/StableConfigView.Designer.cs
  3. 4
      Configurator/Configurator.Net/Views/StableConfigView.resx
  4. 42
      Configurator/Configurator.Net/Views/TransmitterChannelsView.Designer.cs
  5. 4
      Configurator/Configurator.Net/Views/TransmitterChannelsView.resx

2
Configurator/Configurator.Net/ArducopterConfigurator.csproj
Unescape View File

@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>index.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>9</ApplicationRevision>
<ApplicationRevision>10</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>

48
Configurator/Configurator.Net/Views/StableConfigView.Designer.cs generated
Unescape View File

@ -55,6 +55,9 @@ @@ -55,6 +55,9 @@
this.label1 = new System.Windows.Forms.Label();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.toolTips = new System.Windows.Forms.ToolTip(this.components);
this.label10 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.StableModeConfigVmBindingSource)).BeginInit();
this.groupBox4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).BeginInit();
@ -75,7 +78,7 @@ @@ -75,7 +78,7 @@
this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.button2.DataBindings.Add(new System.Windows.Forms.Binding("Tag", this.StableModeConfigVmBindingSource, "RefreshCommand", true));
this.button2.Image = ((System.Drawing.Image)(resources.GetObject("button2.Image")));
this.button2.Location = new System.Drawing.Point(240, 109);
this.button2.Location = new System.Drawing.Point(240, 131);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(26, 26);
this.button2.TabIndex = 12;
@ -88,6 +91,7 @@ @@ -88,6 +91,7 @@
//
// groupBox4
//
this.groupBox4.Controls.Add(this.label12);
this.groupBox4.Controls.Add(this.numericUpDown9);
this.groupBox4.Controls.Add(this.numericUpDown8);
this.groupBox4.Controls.Add(this.numericUpDown3);
@ -96,7 +100,7 @@ @@ -96,7 +100,7 @@
this.groupBox4.Controls.Add(this.label9);
this.groupBox4.Location = new System.Drawing.Point(184, 6);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(82, 101);
this.groupBox4.Size = new System.Drawing.Size(82, 120);
this.groupBox4.TabIndex = 11;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Yaw";
@ -172,6 +176,7 @@ @@ -172,6 +176,7 @@
//
// groupBox2
//
this.groupBox2.Controls.Add(this.label11);
this.groupBox2.Controls.Add(this.numericUpDown7);
this.groupBox2.Controls.Add(this.numericUpDown6);
this.groupBox2.Controls.Add(this.numericUpDown2);
@ -180,7 +185,7 @@ @@ -180,7 +185,7 @@
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Location = new System.Drawing.Point(95, 6);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(83, 101);
this.groupBox2.Size = new System.Drawing.Size(83, 120);
this.groupBox2.TabIndex = 10;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Pitch";
@ -256,6 +261,7 @@ @@ -256,6 +261,7 @@
//
// groupBox3
//
this.groupBox3.Controls.Add(this.label10);
this.groupBox3.Controls.Add(this.numericUpDown5);
this.groupBox3.Controls.Add(this.numericUpDown4);
this.groupBox3.Controls.Add(this.numericUpDown1);
@ -264,7 +270,7 @@ @@ -264,7 +270,7 @@
this.groupBox3.Controls.Add(this.label1);
this.groupBox3.Location = new System.Drawing.Point(6, 5);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(83, 101);
this.groupBox3.Size = new System.Drawing.Size(83, 120);
this.groupBox3.TabIndex = 9;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Roll";
@ -342,7 +348,7 @@ @@ -342,7 +348,7 @@
//
this.checkBox1.AutoSize = true;
this.checkBox1.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.StableModeConfigVmBindingSource, "MagnetometerEnable", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.checkBox1.Location = new System.Drawing.Point(14, 112);
this.checkBox1.Location = new System.Drawing.Point(16, 131);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(94, 17);
this.checkBox1.TabIndex = 13;
@ -350,6 +356,33 @@ @@ -350,6 +356,33 @@
this.toolTips.SetToolTip(this.checkBox1, "Enable the use of the Magnetometer, if present");
this.checkBox1.UseVisualStyleBackColor = true;
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(20, 96);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(41, 13);
this.label10.TabIndex = 17;
this.label10.Text = "(P rate)";
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(20, 95);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(41, 13);
this.label11.TabIndex = 18;
this.label11.Text = "(P rate)";
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(20, 95);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(41, 13);
this.label12.TabIndex = 19;
this.label12.Text = "(P rate)";
//
// StableConfigView
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -360,7 +393,7 @@ @@ -360,7 +393,7 @@
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox3);
this.Name = "StableConfigView";
this.Size = new System.Drawing.Size(271, 135);
this.Size = new System.Drawing.Size(271, 157);
((System.ComponentModel.ISupportInitialize)(this.StableModeConfigVmBindingSource)).EndInit();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
@ -409,5 +442,8 @@ @@ -409,5 +442,8 @@
private System.Windows.Forms.NumericUpDown numericUpDown6;
private System.Windows.Forms.NumericUpDown numericUpDown5;
private System.Windows.Forms.NumericUpDown numericUpDown4;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Label label10;
}
}

4
Configurator/Configurator.Net/Views/StableConfigView.resx
Unescape View File

@ -124,8 +124,8 @@ @@ -124,8 +124,8 @@
<data name="button2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAOvQAA
Dr0BR/uQrQAAAtVJREFUOE9jYKAaiN/PweB3RIohcL8MGIPYIDFigVbd+cTIeXfuxS+5+yQWiCPn3X4o
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAOvAAA
DrwBlbxySQAAAtVJREFUOE9jYKAaiN/PweB3RIohcL8MGIPYIDFigVbd+cTIeXfuxS+5+yQWiCPn3X4o
X3Y2EaRfMOOojkbN2XKprCMGOM2TyDoakrfm3tcZ59/+nw7EnQef/dGqPJnKELhTLHzGtcNzT77+X7Hh
wQXdsuOeDAz1TKgGWazktG87M6dx95P/vcde/u8/8ep/4Zo772Sz9tsw+K8X8Oo9N7Nr18PP666+/1+z
8d5VsDgykEvZ4ZO/6taHroPP/sfOvHSvZM3tL7EzLt5hcFsuC1ZnPJNLJWtvYenqGx/mnnr1P3jCme0M

42
Configurator/Configurator.Net/Views/TransmitterChannelsView.Designer.cs generated
Unescape View File

@ -54,13 +54,16 @@ @@ -54,13 +54,16 @@
this.button3 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button();
this.label6 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.TransmitterChannelsBindingSource)).BeginInit();
this.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(5, 30);
this.label1.Location = new System.Drawing.Point(35, 11);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(43, 13);
this.label1.TabIndex = 1;
@ -69,7 +72,7 @@ @@ -69,7 +72,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(196, 30);
this.label2.Location = new System.Drawing.Point(227, 11);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(31, 13);
this.label2.TabIndex = 3;
@ -124,7 +127,7 @@ @@ -124,7 +127,7 @@
this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.TransmitterChannelsBindingSource, "Throttle", true));
this.textBox2.Enabled = false;
this.textBox2.Location = new System.Drawing.Point(13, 141);
this.textBox2.Location = new System.Drawing.Point(43, 141);
this.textBox2.Name = "textBox2";
this.textBox2.ReadOnly = true;
this.textBox2.Size = new System.Drawing.Size(35, 13);
@ -373,10 +376,40 @@ @@ -373,10 +376,40 @@
this.button4.Text = "Cancel";
this.button4.UseVisualStyleBackColor = true;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(96, 103);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(50, 13);
this.label6.TabIndex = 55;
this.label6.Text = "(Alt Hold)";
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(152, 103);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(56, 13);
this.label7.TabIndex = 56;
this.label7.Text = "(Pos Hold)";
//
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(96, 128);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(108, 13);
this.label8.TabIndex = 57;
this.label8.Text = "(Low value activates)";
//
// TransmitterChannelsView
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.label8);
this.Controls.Add(this.label7);
this.Controls.Add(this.label6);
this.Controls.Add(this.button4);
this.Controls.Add(this.label12);
this.Controls.Add(this.label11);
@ -434,5 +467,8 @@ @@ -434,5 +467,8 @@
private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button button4;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label8;
}
}

4
Configurator/Configurator.Net/Views/TransmitterChannelsView.resx
Unescape View File

@ -132,8 +132,8 @@ @@ -132,8 +132,8 @@
<data name="button2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCQAA
CwkBEvpHPgAAA11JREFUOE8tkYtTVHUUx+8fU5PCUjjlMDT42JB4qcSjoumxk00FG6USapngOrvuDg+B
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
CwgBwL2l2gAAA11JREFUOE8tkYtTVHUUx+8fU5PCUjjlMDT42JB4qcSjoumxk00FG6USapngOrvuDg+B
SlYmZQKFxWZyyiBRHBChKMCw5e6CzYagsu+9+4gWVxb49NulO/d353vO/X7P+Z7zk87/uICm7nvKdcM0
X/wV0yWZxss2mjplmnptNPdYOdM9TUOPwL3zGDrsFNf+wgHdBB39i0hv1o2g7fRwuHueGP8/q4/hSQKv
syq+ImJD4LggxAU+1D3LwU4Hr33+A9Leoz9RdcVNlcXJCmtJycamVgjjIpNUCyTUIsfGKtre+2gtS5Qd

Write Preview
Loading…
Cancel
Save