diff --git a/SourceCode/GPS/Culture/gStr.Designer.cs b/SourceCode/GPS/Culture/gStr.Designer.cs index 32ebb9190..055d2df0a 100644 --- a/SourceCode/GPS/Culture/gStr.Designer.cs +++ b/SourceCode/GPS/Culture/gStr.Designer.cs @@ -150,6 +150,15 @@ public static string gsAntennaOffset { } } + /// + /// Looks up a localized string similar to Applied. + /// + public static string gsApplied { + get { + return ResourceManager.GetString("gsApplied", resourceCulture); + } + } + /// /// Looks up a localized string similar to Area. /// @@ -456,6 +465,15 @@ public static string gsCoverage { } } + /// + /// Looks up a localized string similar to Create. + /// + public static string gsCreate { + get { + return ResourceManager.GetString("gsCreate", resourceCulture); + } + } + /// /// Looks up a localized string similar to Create A Boundary First. /// @@ -897,6 +915,15 @@ public static string gsFlagFileIsCorrupt { } } + /// + /// Looks up a localized string similar to Flags. + /// + public static string gsFormFlag { + get { + return ResourceManager.GetString("gsFormFlag", resourceCulture); + } + } + /// /// Looks up a localized string similar to For Now. /// @@ -1590,6 +1617,42 @@ public static string gsPleaseEnterABLine { } } + /// + /// Looks up a localized string similar to Please Wait.... + /// + public static string gsPleaseWait { + get { + return ResourceManager.GetString("gsPleaseWait", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Point. + /// + public static string gsPoint { + get { + return ResourceManager.GetString("gsPoint", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Points. + /// + public static string gsPoints { + get { + return ResourceManager.GetString("gsPoints", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Points to Process. + /// + public static string gsPointsToProcess { + get { + return ResourceManager.GetString("gsPointsToProcess", resourceCulture); + } + } + /// /// Looks up a localized string similar to Polygons. /// @@ -1644,6 +1707,15 @@ public static string gsRaiseTime { } } + /// + /// Looks up a localized string similar to Rate. + /// + public static string gsRate { + get { + return ResourceManager.GetString("gsRate", resourceCulture); + } + } + /// /// Looks up a localized string similar to Really Reset Everything. /// @@ -1680,6 +1752,24 @@ public static string gsRecordedPathMenu { } } + /// + /// Looks up a localized string similar to Reduced Points. + /// + public static string gsReducedPoints { + get { + return ResourceManager.GetString("gsReducedPoints", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Remain. + /// + public static string gsRemain { + get { + return ResourceManager.GetString("gsRemain", resourceCulture); + } + } + /// /// Looks up a localized string similar to Remove Offset. /// @@ -1887,6 +1977,15 @@ public static string gsSlowDownBelow { } } + /// + /// Looks up a localized string similar to Smooth. + /// + public static string gsSmooth { + get { + return ResourceManager.GetString("gsSmooth", resourceCulture); + } + } + /// /// Looks up a localized string similar to Smooth AB Curve. /// @@ -2118,6 +2217,15 @@ public static string gsTopFieldView { } } + /// + /// Looks up a localized string similar to Total. + /// + public static string gsTotal { + get { + return ResourceManager.GetString("gsTotal", resourceCulture); + } + } + /// /// Looks up a localized string similar to Track. /// @@ -2325,6 +2433,15 @@ public static string gsWizards { } } + /// + /// Looks up a localized string similar to Worked. + /// + public static string gsWorked { + get { + return ResourceManager.GetString("gsWorked", resourceCulture); + } + } + /// /// Looks up a localized string similar to Work Switch. /// diff --git a/SourceCode/GPS/Culture/gStr.nl.resx b/SourceCode/GPS/Culture/gStr.nl.resx index ff0687b98..9e27780b0 100644 --- a/SourceCode/GPS/Culture/gStr.nl.resx +++ b/SourceCode/GPS/Culture/gStr.nl.resx @@ -147,6 +147,9 @@ Antenne-verschuiving + + Bewerkt + Weet u het zeker? @@ -246,6 +249,9 @@ % Dekking + + Creër + Maak eerst een perceelgrens @@ -393,6 +399,9 @@ Tijdelijk + + Vlaggen + Vanuit bestaand @@ -612,6 +621,18 @@ Volg AB lijn aub + + Even wachten... + + + Punt + + + Punten + + + Punten te berekenen + Schakel uit op batterij @@ -627,6 +648,9 @@ Hef-tijd + + Ratio + Alles terugzetten naar defaults @@ -639,6 +663,12 @@ Opgenomen pad Menu + + Verminder Punten + + + Te doen + Verwijder Offset @@ -708,6 +738,9 @@ Vertraag hieronder + + Afvlakken + AB-curve Glad strijken @@ -786,6 +819,9 @@ GEBRUIK OP EIGEN RISICO. Bovenaanzicht Perceel + + Totaal + Spoorbreedte @@ -837,6 +873,9 @@ GEBRUIK OP EIGEN RISICO. Werk Schakelaar + + Gedaan + XTE Grafiek diff --git a/SourceCode/GPS/Culture/gStr.resx b/SourceCode/GPS/Culture/gStr.resx index feb2311b4..2d9f5fc41 100644 --- a/SourceCode/GPS/Culture/gStr.resx +++ b/SourceCode/GPS/Culture/gStr.resx @@ -147,6 +147,9 @@ Antenna Offset + + Applied + Are you sure ? @@ -249,6 +252,9 @@ % Coverage + + Create + Create A Boundary First @@ -399,6 +405,9 @@ For Now + + Flags + From Existing @@ -627,6 +636,18 @@ Please Enter ABLine + + Please Wait... + + + Point + + + Points + + + Points to Process + Polygons @@ -645,6 +666,9 @@ Raise Time + + Rate + Really Reset Everything @@ -657,6 +681,12 @@ Recorded Path + + Reduced Points + + + Remain + Remove Offset @@ -726,6 +756,9 @@ Slow Down Below + + Smooth + Smooth AB Curve @@ -807,6 +840,9 @@ USE AT OWN RISK. Top Field View + + Total + Track @@ -879,6 +915,9 @@ USE AT OWN RISK. Work Switch + + Worked + XTE Chart diff --git a/SourceCode/GPS/Forms/Field/FormBndTool.Designer.cs b/SourceCode/GPS/Forms/Field/FormBndTool.Designer.cs index 1488399b3..234bb3bcb 100644 --- a/SourceCode/GPS/Forms/Field/FormBndTool.Designer.cs +++ b/SourceCode/GPS/Forms/Field/FormBndTool.Designer.cs @@ -32,33 +32,33 @@ private void InitializeComponent() this.oglSelf = new OpenTK.GLControl(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.cboxPointDistance = new System.Windows.Forms.ComboBox(); - this.lblReducedPoints = new System.Windows.Forms.Label(); + this.labelReducedPoints = new System.Windows.Forms.Label(); this.cboxSmooth = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); + this.labelSpacing = new System.Windows.Forms.Label(); + this.labelSmooth = new System.Windows.Forms.Label(); this.cboxIsZoom = new System.Windows.Forms.CheckBox(); this.btnCenterOGL = new System.Windows.Forms.Button(); this.btnSlice = new System.Windows.Forms.Button(); this.btnMakeBoundary = new System.Windows.Forms.Button(); this.btnStartStop = new System.Windows.Forms.Button(); - this.btnResetReduce = new System.Windows.Forms.Button(); + this.btnStart = new System.Windows.Forms.Button(); this.btnCancelTouch = new System.Windows.Forms.Button(); this.btnExit = new System.Windows.Forms.Button(); this.btnZoomOut = new System.Windows.Forms.Button(); this.btnZoomIn = new System.Windows.Forms.Button(); this.tlp1 = new System.Windows.Forms.TableLayoutPanel(); - this.label2 = new System.Windows.Forms.Label(); + this.btnMoveUp = new System.Windows.Forms.Button(); + this.btnMoveLeft = new System.Windows.Forms.Button(); + this.btnMoveRight = new System.Windows.Forms.Button(); + this.btnMoveDn = new System.Windows.Forms.Button(); + this.labelCreate = new System.Windows.Forms.Label(); this.btnAddPoints = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); - this.label4 = new System.Windows.Forms.Label(); + this.labelPleaseWait = new System.Windows.Forms.Label(); this.lblPointToProcess = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.labelPointsToProcess = new System.Windows.Forms.Label(); this.lblI = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.btnMoveDn = new System.Windows.Forms.Button(); - this.btnMoveUp = new System.Windows.Forms.Button(); - this.btnMoveLeft = new System.Windows.Forms.Button(); - this.btnMoveRight = new System.Windows.Forms.Button(); + this.labelPoints = new System.Windows.Forms.Label(); this.tlp1.SuspendLayout(); this.panel1.SuspendLayout(); this.SuspendLayout(); @@ -113,19 +113,19 @@ private void InitializeComponent() this.cboxPointDistance.TabIndex = 541; this.cboxPointDistance.SelectedIndexChanged += new System.EventHandler(this.cboxPointDistance_SelectedIndexChanged); // - // lblReducedPoints + // labelReducedPoints // - this.lblReducedPoints.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.tlp1.SetColumnSpan(this.lblReducedPoints, 3); - this.lblReducedPoints.Enabled = false; - this.lblReducedPoints.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblReducedPoints.ForeColor = System.Drawing.Color.Black; - this.lblReducedPoints.Location = new System.Drawing.Point(166, 92); - this.lblReducedPoints.Name = "lblReducedPoints"; - this.lblReducedPoints.Size = new System.Drawing.Size(120, 25); - this.lblReducedPoints.TabIndex = 542; - this.lblReducedPoints.Text = "***"; - this.lblReducedPoints.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelReducedPoints.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.tlp1.SetColumnSpan(this.labelReducedPoints, 3); + this.labelReducedPoints.Enabled = false; + this.labelReducedPoints.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelReducedPoints.ForeColor = System.Drawing.Color.Black; + this.labelReducedPoints.Location = new System.Drawing.Point(166, 92); + this.labelReducedPoints.Name = "labelReducedPoints"; + this.labelReducedPoints.Size = new System.Drawing.Size(120, 25); + this.labelReducedPoints.TabIndex = 542; + this.labelReducedPoints.Text = "***"; + this.labelReducedPoints.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // cboxSmooth // @@ -152,33 +152,33 @@ private void InitializeComponent() this.cboxSmooth.TabIndex = 547; this.cboxSmooth.SelectedIndexChanged += new System.EventHandler(this.cboxSmooth_SelectedIndexChanged); // - // label1 - // - this.label1.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.tlp1.SetColumnSpan(this.label1, 3); - this.label1.Enabled = false; - this.label1.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.ForeColor = System.Drawing.Color.Black; - this.label1.Location = new System.Drawing.Point(12, 92); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(130, 25); - this.label1.TabIndex = 562; - this.label1.Text = "Spacing (m)"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label6 - // - this.label6.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.label6.AutoSize = true; - this.tlp1.SetColumnSpan(this.label6, 3); - this.label6.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.ForeColor = System.Drawing.Color.Black; - this.label6.Location = new System.Drawing.Point(41, 210); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(71, 19); - this.label6.TabIndex = 569; - this.label6.Text = "Smooth"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // labelSpacing + // + this.labelSpacing.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.tlp1.SetColumnSpan(this.labelSpacing, 3); + this.labelSpacing.Enabled = false; + this.labelSpacing.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelSpacing.ForeColor = System.Drawing.Color.Black; + this.labelSpacing.Location = new System.Drawing.Point(12, 92); + this.labelSpacing.Name = "labelSpacing"; + this.labelSpacing.Size = new System.Drawing.Size(130, 25); + this.labelSpacing.TabIndex = 562; + this.labelSpacing.Text = "Spacing (m)"; + this.labelSpacing.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labelSmooth + // + this.labelSmooth.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.labelSmooth.AutoSize = true; + this.tlp1.SetColumnSpan(this.labelSmooth, 3); + this.labelSmooth.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelSmooth.ForeColor = System.Drawing.Color.Black; + this.labelSmooth.Location = new System.Drawing.Point(41, 210); + this.labelSmooth.Name = "labelSmooth"; + this.labelSmooth.Size = new System.Drawing.Size(71, 19); + this.labelSmooth.TabIndex = 569; + this.labelSmooth.Text = "Smooth"; + this.labelSmooth.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // cboxIsZoom // @@ -280,28 +280,28 @@ private void InitializeComponent() this.btnStartStop.UseVisualStyleBackColor = false; this.btnStartStop.Click += new System.EventHandler(this.btnStartStop_Click); // - // btnResetReduce - // - this.btnResetReduce.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnResetReduce.BackColor = System.Drawing.Color.WhiteSmoke; - this.btnResetReduce.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.tlp1.SetColumnSpan(this.btnResetReduce, 3); - this.btnResetReduce.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btnResetReduce.FlatAppearance.BorderSize = 0; - this.btnResetReduce.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnResetReduce.Font = new System.Drawing.Font("Tahoma", 14.25F); - this.btnResetReduce.Image = global::AgOpenGPS.Properties.Resources.SwitchOn; - this.btnResetReduce.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; - this.btnResetReduce.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnResetReduce.Location = new System.Drawing.Point(30, 4); - this.btnResetReduce.Margin = new System.Windows.Forms.Padding(0); - this.btnResetReduce.Name = "btnResetReduce"; - this.btnResetReduce.Size = new System.Drawing.Size(93, 81); - this.btnResetReduce.TabIndex = 540; - this.btnResetReduce.Text = "Start"; - this.btnResetReduce.TextAlign = System.Drawing.ContentAlignment.TopCenter; - this.btnResetReduce.UseVisualStyleBackColor = false; - this.btnResetReduce.Click += new System.EventHandler(this.btnResetReduce_Click); + // btnStart + // + this.btnStart.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnStart.BackColor = System.Drawing.Color.WhiteSmoke; + this.btnStart.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.tlp1.SetColumnSpan(this.btnStart, 3); + this.btnStart.FlatAppearance.BorderColor = System.Drawing.Color.Black; + this.btnStart.FlatAppearance.BorderSize = 0; + this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnStart.Font = new System.Drawing.Font("Tahoma", 14.25F); + this.btnStart.Image = global::AgOpenGPS.Properties.Resources.SwitchOn; + this.btnStart.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; + this.btnStart.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.btnStart.Location = new System.Drawing.Point(30, 4); + this.btnStart.Margin = new System.Windows.Forms.Padding(0); + this.btnStart.Name = "btnStart"; + this.btnStart.Size = new System.Drawing.Size(93, 81); + this.btnStart.TabIndex = 540; + this.btnStart.Text = "Start"; + this.btnStart.TextAlign = System.Drawing.ContentAlignment.TopCenter; + this.btnStart.UseVisualStyleBackColor = false; + this.btnStart.Click += new System.EventHandler(this.btnResetReduce_Click); // // btnCancelTouch // @@ -393,19 +393,19 @@ private void InitializeComponent() this.tlp1.Controls.Add(this.btnMoveLeft, 3, 7); this.tlp1.Controls.Add(this.btnMoveRight, 5, 7); this.tlp1.Controls.Add(this.btnMoveDn, 0, 7); - this.tlp1.Controls.Add(this.label6, 0, 3); - this.tlp1.Controls.Add(this.btnResetReduce, 0, 0); + this.tlp1.Controls.Add(this.labelSmooth, 0, 3); + this.tlp1.Controls.Add(this.btnStart, 0, 0); this.tlp1.Controls.Add(this.cboxPointDistance, 0, 2); this.tlp1.Controls.Add(this.btnCancelTouch, 3, 6); this.tlp1.Controls.Add(this.btnSlice, 3, 5); this.tlp1.Controls.Add(this.btnCenterOGL, 0, 6); this.tlp1.Controls.Add(this.btnStartStop, 3, 2); - this.tlp1.Controls.Add(this.label1, 0, 1); - this.tlp1.Controls.Add(this.lblReducedPoints, 3, 1); + this.tlp1.Controls.Add(this.labelSpacing, 0, 1); + this.tlp1.Controls.Add(this.labelReducedPoints, 3, 1); this.tlp1.Controls.Add(this.btnMakeBoundary, 3, 4); this.tlp1.Controls.Add(this.cboxSmooth, 0, 4); this.tlp1.Controls.Add(this.cboxIsZoom, 0, 5); - this.tlp1.Controls.Add(this.label2, 3, 3); + this.tlp1.Controls.Add(this.labelCreate, 3, 3); this.tlp1.Controls.Add(this.btnAddPoints, 3, 0); this.tlp1.Controls.Add(this.btnZoomOut, 0, 8); this.tlp1.Controls.Add(this.btnZoomIn, 2, 8); @@ -426,19 +426,91 @@ private void InitializeComponent() this.tlp1.Size = new System.Drawing.Size(299, 700); this.tlp1.TabIndex = 572; // - // label2 + // btnMoveUp + // + this.btnMoveUp.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnMoveUp.BackColor = System.Drawing.Color.White; + this.btnMoveUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.btnMoveUp.FlatAppearance.BorderColor = System.Drawing.Color.Black; + this.btnMoveUp.FlatAppearance.BorderSize = 0; + this.btnMoveUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnMoveUp.Font = new System.Drawing.Font("Tahoma", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnMoveUp.Image = global::AgOpenGPS.Properties.Resources.UpArrow64; + this.btnMoveUp.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.btnMoveUp.Location = new System.Drawing.Point(92, 544); + this.btnMoveUp.Name = "btnMoveUp"; + this.btnMoveUp.Size = new System.Drawing.Size(55, 60); + this.btnMoveUp.TabIndex = 575; + this.btnMoveUp.UseVisualStyleBackColor = false; + this.btnMoveUp.Click += new System.EventHandler(this.btnMoveUp_Click); + // + // btnMoveLeft + // + this.btnMoveLeft.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnMoveLeft.BackColor = System.Drawing.Color.White; + this.btnMoveLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.btnMoveLeft.FlatAppearance.BorderColor = System.Drawing.Color.Black; + this.btnMoveLeft.FlatAppearance.BorderSize = 0; + this.btnMoveLeft.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnMoveLeft.Font = new System.Drawing.Font("Tahoma", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnMoveLeft.Image = global::AgOpenGPS.Properties.Resources.ArrowLeft; + this.btnMoveLeft.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.btnMoveLeft.Location = new System.Drawing.Point(161, 544); + this.btnMoveLeft.Name = "btnMoveLeft"; + this.btnMoveLeft.Size = new System.Drawing.Size(55, 60); + this.btnMoveLeft.TabIndex = 576; + this.btnMoveLeft.UseVisualStyleBackColor = false; + this.btnMoveLeft.Click += new System.EventHandler(this.btnMoveLeft_Click); + // + // btnMoveRight + // + this.btnMoveRight.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnMoveRight.BackColor = System.Drawing.Color.White; + this.btnMoveRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.btnMoveRight.FlatAppearance.BorderColor = System.Drawing.Color.Black; + this.btnMoveRight.FlatAppearance.BorderSize = 0; + this.btnMoveRight.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnMoveRight.Font = new System.Drawing.Font("Tahoma", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnMoveRight.Image = global::AgOpenGPS.Properties.Resources.ArrowRight; + this.btnMoveRight.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.btnMoveRight.Location = new System.Drawing.Point(237, 544); + this.btnMoveRight.Name = "btnMoveRight"; + this.btnMoveRight.Size = new System.Drawing.Size(55, 60); + this.btnMoveRight.TabIndex = 577; + this.btnMoveRight.UseVisualStyleBackColor = false; + this.btnMoveRight.Click += new System.EventHandler(this.btnMoveRight_Click); + // + // btnMoveDn + // + this.btnMoveDn.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnMoveDn.BackColor = System.Drawing.Color.White; + this.btnMoveDn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.btnMoveDn.FlatAppearance.BorderColor = System.Drawing.Color.Black; + this.btnMoveDn.FlatAppearance.BorderSize = 0; + this.btnMoveDn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnMoveDn.Font = new System.Drawing.Font("Tahoma", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnMoveDn.Image = global::AgOpenGPS.Properties.Resources.DnArrow64; + this.btnMoveDn.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.btnMoveDn.Location = new System.Drawing.Point(11, 544); + this.btnMoveDn.Name = "btnMoveDn"; + this.btnMoveDn.Size = new System.Drawing.Size(55, 60); + this.btnMoveDn.TabIndex = 574; + this.btnMoveDn.UseVisualStyleBackColor = false; + this.btnMoveDn.Click += new System.EventHandler(this.btnMoveDn_Click); + // + // labelCreate // - this.label2.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.label2.AutoSize = true; - this.tlp1.SetColumnSpan(this.label2, 3); - this.label2.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.ForeColor = System.Drawing.Color.Black; - this.label2.Location = new System.Drawing.Point(194, 210); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(64, 19); - this.label2.TabIndex = 572; - this.label2.Text = "Create"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelCreate.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.labelCreate.AutoSize = true; + this.tlp1.SetColumnSpan(this.labelCreate, 3); + this.labelCreate.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelCreate.ForeColor = System.Drawing.Color.Black; + this.labelCreate.Location = new System.Drawing.Point(194, 210); + this.labelCreate.Name = "labelCreate"; + this.labelCreate.Size = new System.Drawing.Size(64, 19); + this.labelCreate.TabIndex = 572; + this.labelCreate.Text = "Create"; + this.labelCreate.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // btnAddPoints // @@ -463,26 +535,26 @@ private void InitializeComponent() // panel1 // this.panel1.BackColor = System.Drawing.Color.MistyRose; - this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.labelPleaseWait); this.panel1.Controls.Add(this.lblPointToProcess); - this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.labelPointsToProcess); this.panel1.Controls.Add(this.lblI); - this.panel1.Controls.Add(this.label5); + this.panel1.Controls.Add(this.labelPoints); this.panel1.Location = new System.Drawing.Point(137, 181); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(445, 305); this.panel1.TabIndex = 573; // - // label4 + // labelPleaseWait // - this.label4.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.ForeColor = System.Drawing.Color.Black; - this.label4.Location = new System.Drawing.Point(159, 71); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(161, 25); - this.label4.TabIndex = 529; - this.label4.Text = "Please Wait"; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.labelPleaseWait.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelPleaseWait.ForeColor = System.Drawing.Color.Black; + this.labelPleaseWait.Location = new System.Drawing.Point(159, 71); + this.labelPleaseWait.Name = "labelPleaseWait"; + this.labelPleaseWait.Size = new System.Drawing.Size(161, 25); + this.labelPleaseWait.TabIndex = 529; + this.labelPleaseWait.Text = "Please Wait"; + this.labelPleaseWait.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // lblPointToProcess // @@ -495,16 +567,16 @@ private void InitializeComponent() this.lblPointToProcess.Text = "100,000"; this.lblPointToProcess.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // label3 + // labelPointsToProcess // - this.label3.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.ForeColor = System.Drawing.Color.Black; - this.label3.Location = new System.Drawing.Point(84, 151); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(180, 25); - this.label3.TabIndex = 526; - this.label3.Text = "Points to Process: "; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.labelPointsToProcess.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelPointsToProcess.ForeColor = System.Drawing.Color.Black; + this.labelPointsToProcess.Location = new System.Drawing.Point(84, 151); + this.labelPointsToProcess.Name = "labelPointsToProcess"; + this.labelPointsToProcess.Size = new System.Drawing.Size(180, 25); + this.labelPointsToProcess.TabIndex = 526; + this.labelPointsToProcess.Text = "Points to Process: "; + this.labelPointsToProcess.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // lblI // @@ -517,95 +589,23 @@ private void InitializeComponent() this.lblI.Text = "Points"; this.lblI.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // label5 - // - this.label5.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.ForeColor = System.Drawing.Color.Black; - this.label5.Location = new System.Drawing.Point(132, 201); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(82, 25); - this.label5.TabIndex = 528; - this.label5.Text = "Points:"; - this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // btnMoveDn - // - this.btnMoveDn.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnMoveDn.BackColor = System.Drawing.Color.White; - this.btnMoveDn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.btnMoveDn.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btnMoveDn.FlatAppearance.BorderSize = 0; - this.btnMoveDn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnMoveDn.Font = new System.Drawing.Font("Tahoma", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnMoveDn.Image = global::AgOpenGPS.Properties.Resources.DnArrow64; - this.btnMoveDn.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnMoveDn.Location = new System.Drawing.Point(11, 544); - this.btnMoveDn.Name = "btnMoveDn"; - this.btnMoveDn.Size = new System.Drawing.Size(55, 60); - this.btnMoveDn.TabIndex = 574; - this.btnMoveDn.UseVisualStyleBackColor = false; - this.btnMoveDn.Click += new System.EventHandler(this.btnMoveDn_Click); - // - // btnMoveUp - // - this.btnMoveUp.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnMoveUp.BackColor = System.Drawing.Color.White; - this.btnMoveUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.btnMoveUp.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btnMoveUp.FlatAppearance.BorderSize = 0; - this.btnMoveUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnMoveUp.Font = new System.Drawing.Font("Tahoma", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnMoveUp.Image = global::AgOpenGPS.Properties.Resources.UpArrow64; - this.btnMoveUp.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnMoveUp.Location = new System.Drawing.Point(92, 544); - this.btnMoveUp.Name = "btnMoveUp"; - this.btnMoveUp.Size = new System.Drawing.Size(55, 60); - this.btnMoveUp.TabIndex = 575; - this.btnMoveUp.UseVisualStyleBackColor = false; - this.btnMoveUp.Click += new System.EventHandler(this.btnMoveUp_Click); - // - // btnMoveLeft - // - this.btnMoveLeft.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnMoveLeft.BackColor = System.Drawing.Color.White; - this.btnMoveLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.btnMoveLeft.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btnMoveLeft.FlatAppearance.BorderSize = 0; - this.btnMoveLeft.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnMoveLeft.Font = new System.Drawing.Font("Tahoma", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnMoveLeft.Image = global::AgOpenGPS.Properties.Resources.ArrowLeft; - this.btnMoveLeft.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnMoveLeft.Location = new System.Drawing.Point(161, 544); - this.btnMoveLeft.Name = "btnMoveLeft"; - this.btnMoveLeft.Size = new System.Drawing.Size(55, 60); - this.btnMoveLeft.TabIndex = 576; - this.btnMoveLeft.UseVisualStyleBackColor = false; - this.btnMoveLeft.Click += new System.EventHandler(this.btnMoveLeft_Click); - // - // btnMoveRight + // labelPoints // - this.btnMoveRight.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnMoveRight.BackColor = System.Drawing.Color.White; - this.btnMoveRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.btnMoveRight.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btnMoveRight.FlatAppearance.BorderSize = 0; - this.btnMoveRight.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnMoveRight.Font = new System.Drawing.Font("Tahoma", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnMoveRight.Image = global::AgOpenGPS.Properties.Resources.ArrowRight; - this.btnMoveRight.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnMoveRight.Location = new System.Drawing.Point(237, 544); - this.btnMoveRight.Name = "btnMoveRight"; - this.btnMoveRight.Size = new System.Drawing.Size(55, 60); - this.btnMoveRight.TabIndex = 577; - this.btnMoveRight.UseVisualStyleBackColor = false; - this.btnMoveRight.Click += new System.EventHandler(this.btnMoveRight_Click); + this.labelPoints.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelPoints.ForeColor = System.Drawing.Color.Black; + this.labelPoints.Location = new System.Drawing.Point(132, 201); + this.labelPoints.Name = "labelPoints"; + this.labelPoints.Size = new System.Drawing.Size(82, 25); + this.labelPoints.TabIndex = 528; + this.labelPoints.Text = "Points:"; + this.labelPoints.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // FormBndTool // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.LightGray; - this.ClientSize = new System.Drawing.Size(1006, 703); + this.ClientSize = new System.Drawing.Size(1006, 726); this.ControlBox = false; this.Controls.Add(this.panel1); this.Controls.Add(this.tlp1); @@ -636,26 +636,26 @@ private void InitializeComponent() private System.Windows.Forms.Button btnExit; private System.Windows.Forms.Button btnCancelTouch; private System.Windows.Forms.ComboBox cboxPointDistance; - private System.Windows.Forms.Button btnResetReduce; - private System.Windows.Forms.Label lblReducedPoints; + private System.Windows.Forms.Button btnStart; + private System.Windows.Forms.Label labelReducedPoints; private System.Windows.Forms.Button btnStartStop; private System.Windows.Forms.Button btnMakeBoundary; private System.Windows.Forms.ComboBox cboxSmooth; private System.Windows.Forms.Button btnSlice; private System.Windows.Forms.Button btnCenterOGL; private System.Windows.Forms.CheckBox cboxIsZoom; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label labelSpacing; + private System.Windows.Forms.Label labelSmooth; private System.Windows.Forms.Button btnZoomOut; private System.Windows.Forms.Button btnZoomIn; private System.Windows.Forms.TableLayoutPanel tlp1; - private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label labelCreate; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Label lblI; private System.Windows.Forms.Label lblPointToProcess; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label labelPointsToProcess; + private System.Windows.Forms.Label labelPoints; + private System.Windows.Forms.Label labelPleaseWait; private System.Windows.Forms.Button btnAddPoints; private System.Windows.Forms.Button btnMoveDn; private System.Windows.Forms.Button btnMoveUp; diff --git a/SourceCode/GPS/Forms/Field/FormBndTool.cs b/SourceCode/GPS/Forms/Field/FormBndTool.cs index c8c947661..32e5c39d9 100644 --- a/SourceCode/GPS/Forms/Field/FormBndTool.cs +++ b/SourceCode/GPS/Forms/Field/FormBndTool.cs @@ -1,4 +1,4 @@ -using AgOpenGPS.Culture; +using AgOpenGPS.Culture; using AgOpenGPS.Helpers; using OpenTK; using OpenTK.Graphics.OpenGL; @@ -70,6 +70,15 @@ public FormBndTool(Form callingForm) private void FormBndTool_Load(object sender, EventArgs e) { panel1.Visible = false; + //translate + labelCreate.Text = gStr.gsCreate; + labelSmooth.Text = gStr.gsSmooth; + labelPleaseWait.Text = gStr.gsPleaseWait; + labelReducedPoints.Text = gStr.gsReducedPoints; + labelSpacing.Text = gStr.gsSpacing; + labelPoints.Text = gStr.gsPoints; + labelPointsToProcess.Text = gStr.gsPointsToProcess; + //already have a boundary if (mf.bnd.bndList.Count == 0) @@ -457,7 +466,7 @@ private void btnResetReduce_Click(object sender, EventArgs e) } } - lblReducedPoints.Text = secList.Count.ToString(); + labelReducedPoints.Text = secList.Count.ToString(); rA = rB = rC = rD = rE = rF = rG = firstPoint = currentPoint = 0; bndList?.Clear(); @@ -635,7 +644,7 @@ private void cboxPointDistance_SelectedIndexChanged(object sender, EventArgs e) if (item.heading == 2) secList.Add(new vec3(item.easting, item.northing, 0)); } - lblReducedPoints.Text = secList.Count.ToString(); + labelReducedPoints.Text = secList.Count.ToString(); //Find most South point double minny = double.MaxValue; diff --git a/SourceCode/GPS/Forms/Field/FormEnterFlag.Designer.cs b/SourceCode/GPS/Forms/Field/FormEnterFlag.Designer.cs index 8541d6856..e31d5cee0 100644 --- a/SourceCode/GPS/Forms/Field/FormEnterFlag.Designer.cs +++ b/SourceCode/GPS/Forms/Field/FormEnterFlag.Designer.cs @@ -32,9 +32,9 @@ private void InitializeComponent() this.label8 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.label18 = new System.Windows.Forms.Label(); - this.nudLatitude = new NudlessNumericUpDown(); - this.nudLongitude = new NudlessNumericUpDown(); - this.label2 = new System.Windows.Forms.Label(); + this.nudLatitude = new AgOpenGPS.NudlessNumericUpDown(); + this.nudLongitude = new AgOpenGPS.NudlessNumericUpDown(); + this.labelPoint = new System.Windows.Forms.Label(); this.btnCancel = new System.Windows.Forms.Button(); this.btnYellow = new System.Windows.Forms.Button(); this.btnRed = new System.Windows.Forms.Button(); @@ -107,6 +107,11 @@ private void InitializeComponent() this.nudLatitude.Size = new System.Drawing.Size(274, 52); this.nudLatitude.TabIndex = 198; this.nudLatitude.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudLatitude.Value = new decimal(new int[] { + 0, + 0, + 0, + 0}); this.nudLatitude.Click += new System.EventHandler(this.nudLatitude_Click); // // nudLongitude @@ -129,18 +134,23 @@ private void InitializeComponent() this.nudLongitude.Size = new System.Drawing.Size(298, 52); this.nudLongitude.TabIndex = 197; this.nudLongitude.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudLongitude.Value = new decimal(new int[] { + 0, + 0, + 0, + 0}); this.nudLongitude.Click += new System.EventHandler(this.nudLongitude_Click); // - // label2 + // labelPoint // - this.label2.Font = new System.Drawing.Font("Tahoma", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label2.Location = new System.Drawing.Point(22, 76); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(125, 34); - this.label2.TabIndex = 205; - this.label2.Text = "Point A"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelPoint.Font = new System.Drawing.Font("Tahoma", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelPoint.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.labelPoint.Location = new System.Drawing.Point(22, 76); + this.labelPoint.Name = "labelPoint"; + this.labelPoint.Size = new System.Drawing.Size(125, 34); + this.labelPoint.TabIndex = 205; + this.labelPoint.Text = "Point A"; + this.labelPoint.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // btnCancel // @@ -221,7 +231,7 @@ private void InitializeComponent() this.Controls.Add(this.btnRed); this.Controls.Add(this.btnYellow); this.Controls.Add(this.btnCancel); - this.Controls.Add(this.label2); + this.Controls.Add(this.labelPoint); this.Controls.Add(this.label9); this.Controls.Add(this.label8); this.Controls.Add(this.label1); @@ -248,7 +258,7 @@ private void InitializeComponent() private System.Windows.Forms.Label label18; private NudlessNumericUpDown nudLatitude; private NudlessNumericUpDown nudLongitude; - private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label labelPoint; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.Button btnYellow; private System.Windows.Forms.Button btnRed; diff --git a/SourceCode/GPS/Forms/Field/FormEnterFlag.cs b/SourceCode/GPS/Forms/Field/FormEnterFlag.cs index b43c8a399..1453b5664 100644 --- a/SourceCode/GPS/Forms/Field/FormEnterFlag.cs +++ b/SourceCode/GPS/Forms/Field/FormEnterFlag.cs @@ -18,7 +18,8 @@ public FormEnterFlag(Form callingForm) InitializeComponent(); - this.Text = gStr.gsEditABLine; + this.Text = gStr.gsFormFlag; + labelPoint.Text = gStr.gsPoint; nudLatitude.Controls[0].Enabled = false; nudLongitude.Controls[0].Enabled = false; diff --git a/SourceCode/GPS/Forms/Field/FormFieldData.Designer.cs b/SourceCode/GPS/Forms/Field/FormFieldData.Designer.cs index 52cac34d6..b8977cc5e 100644 --- a/SourceCode/GPS/Forms/Field/FormFieldData.Designer.cs +++ b/SourceCode/GPS/Forms/Field/FormFieldData.Designer.cs @@ -31,25 +31,25 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.lblTimeRemaining = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.labelRemain = new System.Windows.Forms.Label(); this.lblAreaRemain = new System.Windows.Forms.Label(); this.lblWorkRate = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.labelRate = new System.Windows.Forms.Label(); this.lblTotalArea = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.labelTotal = new System.Windows.Forms.Label(); this.lblApplied = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); + this.labelApplied = new System.Windows.Forms.Label(); this.lblRemainPercent = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.lblActualLessOverlap = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); + this.labelApplied2 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); this.lblOverlapPercent = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); + this.labelOverlap = new System.Windows.Forms.Label(); + this.labelActual = new System.Windows.Forms.Label(); + this.labelWorked = new System.Windows.Forms.Label(); this.lblActualRemain = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); + this.labelRemain2 = new System.Windows.Forms.Label(); this.SuspendLayout(); // // timer1 @@ -70,17 +70,17 @@ private void InitializeComponent() this.lblTimeRemaining.TabIndex = 479; this.lblTimeRemaining.Text = "-"; // - // label2 + // labelRemain // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(12, 95); - this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(80, 23); - this.label2.TabIndex = 478; - this.label2.Text = "Remain:"; + this.labelRemain.AutoSize = true; + this.labelRemain.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelRemain.ForeColor = System.Drawing.Color.White; + this.labelRemain.Location = new System.Drawing.Point(12, 95); + this.labelRemain.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelRemain.Name = "labelRemain"; + this.labelRemain.Size = new System.Drawing.Size(80, 23); + this.labelRemain.TabIndex = 478; + this.labelRemain.Text = "Remain:"; // // lblAreaRemain // @@ -106,17 +106,17 @@ private void InitializeComponent() this.lblWorkRate.TabIndex = 482; this.lblWorkRate.Text = "-"; // - // label3 + // labelRate // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Location = new System.Drawing.Point(10, 325); - this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(55, 23); - this.label3.TabIndex = 481; - this.label3.Text = "Rate:"; + this.labelRate.AutoSize = true; + this.labelRate.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelRate.ForeColor = System.Drawing.Color.White; + this.labelRate.Location = new System.Drawing.Point(10, 325); + this.labelRate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelRate.Name = "labelRate"; + this.labelRate.Size = new System.Drawing.Size(55, 23); + this.labelRate.TabIndex = 481; + this.labelRate.Text = "Rate:"; // // lblTotalArea // @@ -130,17 +130,17 @@ private void InitializeComponent() this.lblTotalArea.TabIndex = 484; this.lblTotalArea.Text = "-"; // - // label4 + // labelTotal // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.ForeColor = System.Drawing.Color.White; - this.label4.Location = new System.Drawing.Point(23, 0); - this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(58, 23); - this.label4.TabIndex = 483; - this.label4.Text = "Total:"; + this.labelTotal.AutoSize = true; + this.labelTotal.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelTotal.ForeColor = System.Drawing.Color.White; + this.labelTotal.Location = new System.Drawing.Point(23, 0); + this.labelTotal.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelTotal.Name = "labelTotal"; + this.labelTotal.Size = new System.Drawing.Size(58, 23); + this.labelTotal.TabIndex = 483; + this.labelTotal.Text = "Total:"; // // lblApplied // @@ -154,17 +154,17 @@ private void InitializeComponent() this.lblApplied.TabIndex = 486; this.lblApplied.Text = "-"; // - // label8 + // labelApplied // - this.label8.AutoSize = true; - this.label8.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label8.ForeColor = System.Drawing.Color.White; - this.label8.Location = new System.Drawing.Point(13, 66); - this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(79, 23); - this.label8.TabIndex = 485; - this.label8.Text = "Applied:"; + this.labelApplied.AutoSize = true; + this.labelApplied.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelApplied.ForeColor = System.Drawing.Color.White; + this.labelApplied.Location = new System.Drawing.Point(13, 66); + this.labelApplied.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelApplied.Name = "labelApplied"; + this.labelApplied.Size = new System.Drawing.Size(79, 23); + this.labelApplied.TabIndex = 485; + this.labelApplied.Text = "Applied:"; // // lblRemainPercent // @@ -203,17 +203,17 @@ private void InitializeComponent() this.lblActualLessOverlap.TabIndex = 490; this.lblActualLessOverlap.Text = "-"; // - // label6 + // labelApplied2 // - this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.ForeColor = System.Drawing.Color.White; - this.label6.Location = new System.Drawing.Point(9, 229); - this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(79, 23); - this.label6.TabIndex = 489; - this.label6.Text = "Applied:"; + this.labelApplied2.AutoSize = true; + this.labelApplied2.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelApplied2.ForeColor = System.Drawing.Color.White; + this.labelApplied2.Location = new System.Drawing.Point(9, 229); + this.labelApplied2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelApplied2.Name = "labelApplied2"; + this.labelApplied2.Size = new System.Drawing.Size(79, 23); + this.labelApplied2.TabIndex = 489; + this.labelApplied2.Text = "Applied:"; // // label7 // @@ -239,41 +239,41 @@ private void InitializeComponent() this.lblOverlapPercent.TabIndex = 493; this.lblOverlapPercent.Text = "-"; // - // label9 - // - this.label9.AutoSize = true; - this.label9.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label9.ForeColor = System.Drawing.Color.White; - this.label9.Location = new System.Drawing.Point(9, 287); - this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(81, 23); - this.label9.TabIndex = 492; - this.label9.Text = "Overlap:"; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label10.ForeColor = System.Drawing.Color.White; - this.label10.Location = new System.Drawing.Point(51, 193); - this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(61, 23); - this.label10.TabIndex = 494; - this.label10.Text = "Actual"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.ForeColor = System.Drawing.Color.White; - this.label5.Location = new System.Drawing.Point(45, 30); - this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(74, 23); - this.label5.TabIndex = 495; - this.label5.Text = "Worked"; + // labelOverlap + // + this.labelOverlap.AutoSize = true; + this.labelOverlap.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelOverlap.ForeColor = System.Drawing.Color.White; + this.labelOverlap.Location = new System.Drawing.Point(9, 287); + this.labelOverlap.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelOverlap.Name = "labelOverlap"; + this.labelOverlap.Size = new System.Drawing.Size(81, 23); + this.labelOverlap.TabIndex = 492; + this.labelOverlap.Text = "Overlap:"; + // + // labelActual + // + this.labelActual.AutoSize = true; + this.labelActual.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelActual.ForeColor = System.Drawing.Color.White; + this.labelActual.Location = new System.Drawing.Point(51, 193); + this.labelActual.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelActual.Name = "labelActual"; + this.labelActual.Size = new System.Drawing.Size(61, 23); + this.labelActual.TabIndex = 494; + this.labelActual.Text = "Actual"; + // + // labelWorked + // + this.labelWorked.AutoSize = true; + this.labelWorked.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelWorked.ForeColor = System.Drawing.Color.White; + this.labelWorked.Location = new System.Drawing.Point(45, 30); + this.labelWorked.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelWorked.Name = "labelWorked"; + this.labelWorked.Size = new System.Drawing.Size(74, 23); + this.labelWorked.TabIndex = 495; + this.labelWorked.Text = "Worked"; // // lblActualRemain // @@ -287,17 +287,17 @@ private void InitializeComponent() this.lblActualRemain.TabIndex = 497; this.lblActualRemain.Text = "-"; // - // label12 + // labelRemain2 // - this.label12.AutoSize = true; - this.label12.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.ForeColor = System.Drawing.Color.White; - this.label12.Location = new System.Drawing.Point(10, 258); - this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(80, 23); - this.label12.TabIndex = 496; - this.label12.Text = "Remain:"; + this.labelRemain2.AutoSize = true; + this.labelRemain2.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelRemain2.ForeColor = System.Drawing.Color.White; + this.labelRemain2.Location = new System.Drawing.Point(10, 258); + this.labelRemain2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelRemain2.Name = "labelRemain2"; + this.labelRemain2.Size = new System.Drawing.Size(80, 23); + this.labelRemain2.TabIndex = 496; + this.labelRemain2.Text = "Remain:"; // // FormFieldData // @@ -307,23 +307,23 @@ private void InitializeComponent() this.ClientSize = new System.Drawing.Size(176, 356); this.Controls.Add(this.lblWorkRate); this.Controls.Add(this.lblActualRemain); - this.Controls.Add(this.label12); - this.Controls.Add(this.label5); - this.Controls.Add(this.label10); + this.Controls.Add(this.labelRemain2); + this.Controls.Add(this.labelWorked); + this.Controls.Add(this.labelActual); this.Controls.Add(this.lblOverlapPercent); - this.Controls.Add(this.label9); + this.Controls.Add(this.labelOverlap); this.Controls.Add(this.label7); this.Controls.Add(this.lblActualLessOverlap); - this.Controls.Add(this.label6); + this.Controls.Add(this.labelApplied2); this.Controls.Add(this.lblRemainPercent); this.Controls.Add(this.lblApplied); - this.Controls.Add(this.label8); + this.Controls.Add(this.labelApplied); this.Controls.Add(this.lblTotalArea); - this.Controls.Add(this.label4); - this.Controls.Add(this.label3); + this.Controls.Add(this.labelTotal); + this.Controls.Add(this.labelRate); this.Controls.Add(this.lblAreaRemain); this.Controls.Add(this.lblTimeRemaining); - this.Controls.Add(this.label2); + this.Controls.Add(this.labelRemain); this.Controls.Add(this.label1); this.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; @@ -343,24 +343,24 @@ private void InitializeComponent() private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Label lblTimeRemaining; - private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label labelRemain; private System.Windows.Forms.Label lblAreaRemain; private System.Windows.Forms.Label lblWorkRate; - private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label labelRate; private System.Windows.Forms.Label lblTotalArea; - private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label labelTotal; private System.Windows.Forms.Label lblApplied; - private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label labelApplied; private System.Windows.Forms.Label lblRemainPercent; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label lblActualLessOverlap; - private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label labelApplied2; private System.Windows.Forms.Label label7; private System.Windows.Forms.Label lblOverlapPercent; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label labelOverlap; + private System.Windows.Forms.Label labelActual; + private System.Windows.Forms.Label labelWorked; private System.Windows.Forms.Label lblActualRemain; - private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label labelRemain2; } } \ No newline at end of file diff --git a/SourceCode/GPS/Forms/Field/FormFieldData.cs b/SourceCode/GPS/Forms/Field/FormFieldData.cs index 2d3dc64fc..bb639430f 100644 --- a/SourceCode/GPS/Forms/Field/FormFieldData.cs +++ b/SourceCode/GPS/Forms/Field/FormFieldData.cs @@ -3,6 +3,7 @@ using System; using System.Windows.Forms; +using AgOpenGPS.Culture; namespace AgOpenGPS { @@ -14,6 +15,16 @@ public FormFieldData(Form callingForm) { mf = callingForm as FormGPS; InitializeComponent(); + labelTotal.Text = gStr.gsTotal; + labelWorked.Text = gStr.gsWorked; + labelApplied.Text = gStr.gsApplied; + labelApplied2.Text = gStr.gsApplied; + labelRemain.Text = gStr.gsRemain; + labelRemain2.Text = gStr.gsRemain; + labelOverlap.Text = gStr.gsOverlap; + labelActual.Text = gStr.gsActual; + labelRate.Text = gStr.gsRate; + } private void FormFieldData_Load(object sender, EventArgs e) { diff --git a/SourceCode/GPS/Forms/Field/FormFieldDir.Designer.cs b/SourceCode/GPS/Forms/Field/FormFieldDir.Designer.cs index 24e4e6556..98d88ea17 100644 --- a/SourceCode/GPS/Forms/Field/FormFieldDir.Designer.cs +++ b/SourceCode/GPS/Forms/Field/FormFieldDir.Designer.cs @@ -33,7 +33,7 @@ private void InitializeComponent() this.label2 = new System.Windows.Forms.Label(); this.btnSave = new System.Windows.Forms.Button(); this.btnSerialCancel = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); + this.labelEnterFieldName = new System.Windows.Forms.Label(); this.btnAddTime = new System.Windows.Forms.Button(); this.btnAddDate = new System.Windows.Forms.Button(); this.SuspendLayout(); @@ -111,18 +111,18 @@ private void InitializeComponent() this.btnSerialCancel.UseVisualStyleBackColor = false; this.btnSerialCancel.Click += new System.EventHandler(this.btnSerialCancel_Click); // - // label1 + // labelEnterFieldName // - this.label1.AutoSize = true; - this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label1.Location = new System.Drawing.Point(34, 25); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(174, 23); - this.label1.TabIndex = 4; - this.label1.Text = "Enter Field Name"; + this.labelEnterFieldName.AutoSize = true; + this.labelEnterFieldName.BackColor = System.Drawing.Color.Transparent; + this.labelEnterFieldName.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelEnterFieldName.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.labelEnterFieldName.Location = new System.Drawing.Point(34, 25); + this.labelEnterFieldName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelEnterFieldName.Name = "labelEnterFieldName"; + this.labelEnterFieldName.Size = new System.Drawing.Size(174, 23); + this.labelEnterFieldName.TabIndex = 4; + this.labelEnterFieldName.Text = "Enter Field Name"; // // btnAddTime // @@ -167,7 +167,7 @@ private void InitializeComponent() this.Controls.Add(this.btnAddTime); this.Controls.Add(this.label3); this.Controls.Add(this.label2); - this.Controls.Add(this.label1); + this.Controls.Add(this.labelEnterFieldName); this.Controls.Add(this.tboxFieldName); this.Controls.Add(this.btnSave); this.Controls.Add(this.btnSerialCancel); @@ -191,7 +191,7 @@ private void InitializeComponent() private System.Windows.Forms.Button btnSave; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label labelEnterFieldName; private System.Windows.Forms.Button btnAddTime; private System.Windows.Forms.Button btnAddDate; } diff --git a/SourceCode/GPS/Forms/Field/FormFieldDir.cs b/SourceCode/GPS/Forms/Field/FormFieldDir.cs index 4e46144d4..ede8c2eb9 100644 --- a/SourceCode/GPS/Forms/Field/FormFieldDir.cs +++ b/SourceCode/GPS/Forms/Field/FormFieldDir.cs @@ -22,7 +22,7 @@ public FormFieldDir(Form _callingForm) InitializeComponent(); - label1.Text = gStr.gsEnterFieldName; + labelEnterFieldName.Text = gStr.gsEnterFieldName; this.Text = gStr.gsCreateNewField; }