From 547fe9ab79da10559616e1cd7eef05f3800c0a21 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Fri, 12 Jun 2020 16:26:43 -0700 Subject: [PATCH] Added internalization support. --- AddPortMapForm.Designer.cs | 110 +- AddPortMapForm.resx | 437 +++++++ AddRelayMapForm.Designer.cs | 124 +- AddRelayMapForm.resx | 494 ++++++++ AppLaunchForm.Designer.cs | 125 +- AppLaunchForm.resx | 295 ++++- InstallForm.Designer.cs | 38 +- InstallForm.resx | 152 +++ MainForm.Designer.cs | 464 ++------ MainForm.cs | 22 +- MainForm.resx | 1836 +++++++++++++++++++++++++++++- MapUserControl.Designer.cs | 34 +- MapUserControl.cs | 8 +- MapUserControl.resx | 158 ++- MappingHelpForm.Designer.cs | 10 +- MappingHelpForm.resx | 44 + MeshMapper.cs | 10 +- Program.cs | 17 +- Properties/Resources.Designer.cs | 183 ++- Properties/Resources.resx | 75 +- ServerUserControl.Designer.cs | 30 +- ServerUserControl.cs | 2 +- ServerUserControl.resx | 129 +++ altPortForm.Designer.cs | 38 +- altPortForm.resx | 155 +++ 25 files changed, 4156 insertions(+), 834 deletions(-) diff --git a/AddPortMapForm.Designer.cs b/AddPortMapForm.Designer.cs index ef1eea6..bf9f61a 100644 --- a/AddPortMapForm.Designer.cs +++ b/AddPortMapForm.Designer.cs @@ -50,85 +50,54 @@ // // cancelButton // - this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.cancelButton, "cancelButton"); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(288, 167); this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 8; - this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); // // okButton // - this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.okButton.Location = new System.Drawing.Point(207, 167); + resources.ApplyResources(this.okButton, "okButton"); this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(75, 23); - this.okButton.TabIndex = 7; - this.okButton.Text = "OK"; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // // localNumericUpDown // - this.localNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.localNumericUpDown.Location = new System.Drawing.Point(157, 33); + resources.ApplyResources(this.localNumericUpDown, "localNumericUpDown"); this.localNumericUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.localNumericUpDown.Name = "localNumericUpDown"; - this.localNumericUpDown.Size = new System.Drawing.Size(206, 20); - this.localNumericUpDown.TabIndex = 2; - this.localNumericUpDown.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // // label1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 35); + resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(55, 13); - this.label1.TabIndex = 3; - this.label1.Text = "Local Port"; // // nodeComboBox // - this.nodeComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.nodeComboBox, "nodeComboBox"); this.nodeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.nodeComboBox.FormattingEnabled = true; - this.nodeComboBox.Location = new System.Drawing.Point(157, 86); this.nodeComboBox.Name = "nodeComboBox"; - this.nodeComboBox.Size = new System.Drawing.Size(206, 21); - this.nodeComboBox.TabIndex = 4; // // label2 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 89); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(81, 13); - this.label2.TabIndex = 5; - this.label2.Text = "Remote Device"; // // label3 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(12, 142); + resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(66, 13); - this.label3.TabIndex = 7; - this.label3.Text = "Remote Port"; // // remoteNumericUpDown // - this.remoteNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.remoteNumericUpDown.Location = new System.Drawing.Point(157, 140); + resources.ApplyResources(this.remoteNumericUpDown, "remoteNumericUpDown"); this.remoteNumericUpDown.Maximum = new decimal(new int[] { 65535, 0, @@ -140,9 +109,6 @@ 0, 0}); this.remoteNumericUpDown.Name = "remoteNumericUpDown"; - this.remoteNumericUpDown.Size = new System.Drawing.Size(206, 20); - this.remoteNumericUpDown.TabIndex = 6; - this.remoteNumericUpDown.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.remoteNumericUpDown.Value = new decimal(new int[] { 80, 0, @@ -151,93 +117,64 @@ // // label4 // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(12, 116); + resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(59, 13); - this.label4.TabIndex = 9; - this.label4.Text = "Application"; // // appComboBox // - this.appComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.appComboBox, "appComboBox"); this.appComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.appComboBox.FormattingEnabled = true; this.appComboBox.Items.AddRange(new object[] { - "Custom", - "HTTP", - "HTTPS", - "RDP", - "PuTTY", - "WinSCP"}); - this.appComboBox.Location = new System.Drawing.Point(157, 113); + resources.GetString("appComboBox.Items"), + resources.GetString("appComboBox.Items1"), + resources.GetString("appComboBox.Items2"), + resources.GetString("appComboBox.Items3"), + resources.GetString("appComboBox.Items4"), + resources.GetString("appComboBox.Items5")}); this.appComboBox.Name = "appComboBox"; - this.appComboBox.Size = new System.Drawing.Size(206, 21); - this.appComboBox.TabIndex = 5; this.appComboBox.SelectedIndexChanged += new System.EventHandler(this.appComboBox_SelectedIndexChanged); // // label5 // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(12, 62); + resources.ApplyResources(this.label5, "label5"); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(73, 13); - this.label5.TabIndex = 11; - this.label5.Text = "Device Group"; // // groupComboBox // - this.groupComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.groupComboBox, "groupComboBox"); this.groupComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.groupComboBox.FormattingEnabled = true; - this.groupComboBox.Location = new System.Drawing.Point(157, 59); this.groupComboBox.Name = "groupComboBox"; - this.groupComboBox.Size = new System.Drawing.Size(206, 21); - this.groupComboBox.TabIndex = 3; this.groupComboBox.SelectedIndexChanged += new System.EventHandler(this.groupComboBox_SelectedIndexChanged); // // label6 // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(12, 9); + resources.ApplyResources(this.label6, "label6"); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(46, 13); - this.label6.TabIndex = 12; - this.label6.Text = "Protocol"; // // tcpRadioButton // - this.tcpRadioButton.AutoSize = true; + resources.ApplyResources(this.tcpRadioButton, "tcpRadioButton"); this.tcpRadioButton.Checked = true; - this.tcpRadioButton.Location = new System.Drawing.Point(157, 9); this.tcpRadioButton.Name = "tcpRadioButton"; - this.tcpRadioButton.Size = new System.Drawing.Size(46, 17); - this.tcpRadioButton.TabIndex = 1; this.tcpRadioButton.TabStop = true; - this.tcpRadioButton.Text = "TCP"; this.tcpRadioButton.UseVisualStyleBackColor = true; this.tcpRadioButton.CheckedChanged += new System.EventHandler(this.tcpRadioButton_CheckedChanged); // // udpRadioButton // - this.udpRadioButton.AutoSize = true; - this.udpRadioButton.Location = new System.Drawing.Point(209, 9); + resources.ApplyResources(this.udpRadioButton, "udpRadioButton"); this.udpRadioButton.Name = "udpRadioButton"; - this.udpRadioButton.Size = new System.Drawing.Size(48, 17); - this.udpRadioButton.TabIndex = 1; - this.udpRadioButton.Text = "UDP"; this.udpRadioButton.UseVisualStyleBackColor = true; this.udpRadioButton.CheckedChanged += new System.EventHandler(this.tcpRadioButton_CheckedChanged); // // AddPortMapForm // this.AcceptButton = this.okButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(375, 202); this.Controls.Add(this.udpRadioButton); this.Controls.Add(this.tcpRadioButton); this.Controls.Add(this.label6); @@ -254,12 +191,9 @@ this.Controls.Add(this.okButton); this.Controls.Add(this.cancelButton); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "AddPortMapForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Port Mapping"; this.Load += new System.EventHandler(this.AddPortMapForm_Load); ((System.ComponentModel.ISupportInitialize)(this.localNumericUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.remoteNumericUpDown)).EndInit(); diff --git a/AddPortMapForm.resx b/AddPortMapForm.resx index b93e49a..87424f7 100644 --- a/AddPortMapForm.resx +++ b/AddPortMapForm.resx @@ -117,7 +117,432 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bottom, Right + + + 288, 167 + + + 75, 23 + + + + 8 + + + Cancel + + + cancelButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + Bottom, Right + + + 207, 167 + + + 75, 23 + + + 7 + + + OK + + + okButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + + + Top, Left, Right + + + 157, 33 + + + 206, 20 + + + 2 + + + Right + + + localNumericUpDown + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + True + + + 12, 35 + + + 55, 13 + + + 3 + + + Local Port + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + Top, Left, Right + + + 157, 86 + + + 206, 21 + + + 4 + + + nodeComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + True + + + 12, 89 + + + 81, 13 + + + 5 + + + Remote Device + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + True + + + 12, 142 + + + 66, 13 + + + 7 + + + Remote Port + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + Top, Left, Right + + + 157, 140 + + + 206, 20 + + + 6 + + + Right + + + remoteNumericUpDown + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + True + + + 12, 116 + + + 59, 13 + + + 9 + + + Application + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Top, Left, Right + + + Custom + + + HTTP + + + HTTPS + + + RDP + + + PuTTY + + + WinSCP + + + 157, 113 + + + 206, 21 + + + 5 + + + appComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + True + + + 12, 62 + + + 73, 13 + + + 11 + + + Device Group + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Top, Left, Right + + + 157, 59 + + + 206, 21 + + + 3 + + + groupComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + True + + + 12, 9 + + + 46, 13 + + + 12 + + + Protocol + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + 157, 9 + + + 46, 17 + + + 1 + + + TCP + + + tcpRadioButton + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + + + 209, 9 + + + 48, 17 + + + 1 + + + UDP + + + udpRadioButton + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 375, 202 + AAABAA0AMDAQAAEABABoBgAA1gAAACAgEAABAAQA6AIAAD4HAAAYGBAAAQAEAOgBAAAmCgAAEBAQAAEA @@ -1812,4 +2237,16 @@ AADAPwAAwD8AAMA/AADAPwAA + + CenterParent + + + Port Mapping + + + AddPortMapForm + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/AddRelayMapForm.Designer.cs b/AddRelayMapForm.Designer.cs index fc257ae..6c1d390 100644 --- a/AddRelayMapForm.Designer.cs +++ b/AddRelayMapForm.Designer.cs @@ -52,85 +52,54 @@ // // cancelButton // - this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.cancelButton, "cancelButton"); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(288, 193); this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 0; - this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); // // okButton // - this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.okButton.Location = new System.Drawing.Point(207, 193); + resources.ApplyResources(this.okButton, "okButton"); this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(75, 23); - this.okButton.TabIndex = 1; - this.okButton.Text = "OK"; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // // localNumericUpDown // - this.localNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.localNumericUpDown.Location = new System.Drawing.Point(157, 32); + resources.ApplyResources(this.localNumericUpDown, "localNumericUpDown"); this.localNumericUpDown.Maximum = new decimal(new int[] { 65535, 0, 0, 0}); this.localNumericUpDown.Name = "localNumericUpDown"; - this.localNumericUpDown.Size = new System.Drawing.Size(206, 20); - this.localNumericUpDown.TabIndex = 2; - this.localNumericUpDown.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // // label1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 34); + resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(55, 13); - this.label1.TabIndex = 3; - this.label1.Text = "Local Port"; // // nodeComboBox // - this.nodeComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.nodeComboBox, "nodeComboBox"); this.nodeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.nodeComboBox.FormattingEnabled = true; - this.nodeComboBox.Location = new System.Drawing.Point(157, 85); this.nodeComboBox.Name = "nodeComboBox"; - this.nodeComboBox.Size = new System.Drawing.Size(206, 21); - this.nodeComboBox.TabIndex = 4; // // label2 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 88); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(71, 13); - this.label2.TabIndex = 5; - this.label2.Text = "Relay Device"; // // label3 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(12, 167); + resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(66, 13); - this.label3.TabIndex = 7; - this.label3.Text = "Remote Port"; // // remoteNumericUpDown // - this.remoteNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.remoteNumericUpDown.Location = new System.Drawing.Point(157, 165); + resources.ApplyResources(this.remoteNumericUpDown, "remoteNumericUpDown"); this.remoteNumericUpDown.Maximum = new decimal(new int[] { 65535, 0, @@ -142,9 +111,6 @@ 0, 0}); this.remoteNumericUpDown.Name = "remoteNumericUpDown"; - this.remoteNumericUpDown.Size = new System.Drawing.Size(206, 20); - this.remoteNumericUpDown.TabIndex = 6; - this.remoteNumericUpDown.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.remoteNumericUpDown.Value = new decimal(new int[] { 80, 0, @@ -153,113 +119,74 @@ // // label4 // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(12, 115); + resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(59, 13); - this.label4.TabIndex = 9; - this.label4.Text = "Application"; // // appComboBox // - this.appComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.appComboBox, "appComboBox"); this.appComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.appComboBox.FormattingEnabled = true; this.appComboBox.Items.AddRange(new object[] { - "Custom", - "HTTP", - "HTTPS", - "RDP", - "PuTTY", - "WinSCP"}); - this.appComboBox.Location = new System.Drawing.Point(157, 112); + resources.GetString("appComboBox.Items"), + resources.GetString("appComboBox.Items1"), + resources.GetString("appComboBox.Items2"), + resources.GetString("appComboBox.Items3"), + resources.GetString("appComboBox.Items4"), + resources.GetString("appComboBox.Items5")}); this.appComboBox.Name = "appComboBox"; - this.appComboBox.Size = new System.Drawing.Size(206, 21); - this.appComboBox.TabIndex = 8; this.appComboBox.SelectedIndexChanged += new System.EventHandler(this.appComboBox_SelectedIndexChanged); // // label5 // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(12, 142); + resources.ApplyResources(this.label5, "label5"); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(57, 13); - this.label5.TabIndex = 10; - this.label5.Text = "Remote IP"; // // remoteIpTextBox // - this.remoteIpTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.remoteIpTextBox.Location = new System.Drawing.Point(157, 139); + resources.ApplyResources(this.remoteIpTextBox, "remoteIpTextBox"); this.remoteIpTextBox.Name = "remoteIpTextBox"; - this.remoteIpTextBox.Size = new System.Drawing.Size(206, 20); - this.remoteIpTextBox.TabIndex = 11; - this.remoteIpTextBox.Text = "127.0.0.1"; - this.remoteIpTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.remoteIpTextBox.TextChanged += new System.EventHandler(this.remoteIpTextBox_TextChanged); // // label6 // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(12, 61); + resources.ApplyResources(this.label6, "label6"); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(73, 13); - this.label6.TabIndex = 13; - this.label6.Text = "Device Group"; // // groupComboBox // - this.groupComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.groupComboBox, "groupComboBox"); this.groupComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.groupComboBox.FormattingEnabled = true; - this.groupComboBox.Location = new System.Drawing.Point(157, 58); this.groupComboBox.Name = "groupComboBox"; - this.groupComboBox.Size = new System.Drawing.Size(206, 21); - this.groupComboBox.TabIndex = 12; this.groupComboBox.SelectedIndexChanged += new System.EventHandler(this.groupComboBox_SelectedIndexChanged); // // udpRadioButton // - this.udpRadioButton.AutoSize = true; - this.udpRadioButton.Location = new System.Drawing.Point(209, 9); + resources.ApplyResources(this.udpRadioButton, "udpRadioButton"); this.udpRadioButton.Name = "udpRadioButton"; - this.udpRadioButton.Size = new System.Drawing.Size(48, 17); - this.udpRadioButton.TabIndex = 14; - this.udpRadioButton.Text = "UDP"; this.udpRadioButton.UseVisualStyleBackColor = true; // // tcpRadioButton // - this.tcpRadioButton.AutoSize = true; + resources.ApplyResources(this.tcpRadioButton, "tcpRadioButton"); this.tcpRadioButton.Checked = true; - this.tcpRadioButton.Location = new System.Drawing.Point(157, 9); this.tcpRadioButton.Name = "tcpRadioButton"; - this.tcpRadioButton.Size = new System.Drawing.Size(46, 17); - this.tcpRadioButton.TabIndex = 15; this.tcpRadioButton.TabStop = true; - this.tcpRadioButton.Text = "TCP"; this.tcpRadioButton.UseVisualStyleBackColor = true; this.tcpRadioButton.CheckedChanged += new System.EventHandler(this.tcpRadioButton_CheckedChanged); // // label7 // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(12, 9); + resources.ApplyResources(this.label7, "label7"); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(46, 13); - this.label7.TabIndex = 16; - this.label7.Text = "Protocol"; // // AddRelayMapForm // this.AcceptButton = this.okButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(375, 228); this.Controls.Add(this.udpRadioButton); this.Controls.Add(this.tcpRadioButton); this.Controls.Add(this.label7); @@ -278,12 +205,9 @@ this.Controls.Add(this.okButton); this.Controls.Add(this.cancelButton); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "AddRelayMapForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Relay Mapping"; this.Load += new System.EventHandler(this.AddRelayMapForm_Load); ((System.ComponentModel.ISupportInitialize)(this.localNumericUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.remoteNumericUpDown)).EndInit(); diff --git a/AddRelayMapForm.resx b/AddRelayMapForm.resx index b93e49a..256cbe6 100644 --- a/AddRelayMapForm.resx +++ b/AddRelayMapForm.resx @@ -117,7 +117,489 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bottom, Right + + + 288, 193 + + + 75, 23 + + + + 0 + + + Cancel + + + cancelButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + + + Bottom, Right + + + 207, 193 + + + 75, 23 + + + 1 + + + OK + + + okButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + Top, Left, Right + + + 157, 32 + + + 206, 20 + + + 2 + + + Right + + + localNumericUpDown + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + True + + + 12, 34 + + + 55, 13 + + + 3 + + + Local Port + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + + + Top, Left, Right + + + 157, 85 + + + 206, 21 + + + 4 + + + nodeComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + True + + + 12, 88 + + + 71, 13 + + + 5 + + + Relay Device + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + True + + + 12, 167 + + + 66, 13 + + + 7 + + + Remote Port + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + Top, Left, Right + + + 157, 165 + + + 206, 20 + + + 6 + + + Right + + + remoteNumericUpDown + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + True + + + 12, 115 + + + 59, 13 + + + 9 + + + Application + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + Top, Left, Right + + + Custom + + + HTTP + + + HTTPS + + + RDP + + + PuTTY + + + WinSCP + + + 157, 112 + + + 206, 21 + + + 8 + + + appComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + True + + + 12, 142 + + + 57, 13 + + + 10 + + + Remote IP + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + Top, Left, Right + + + 157, 139 + + + 206, 20 + + + 11 + + + 127.0.0.1 + + + Right + + + remoteIpTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + True + + + 12, 61 + + + 73, 13 + + + 13 + + + Device Group + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Top, Left, Right + + + 157, 58 + + + 206, 21 + + + 12 + + + groupComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + True + + + 209, 9 + + + 48, 17 + + + 14 + + + UDP + + + udpRadioButton + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 157, 9 + + + 46, 17 + + + 15 + + + TCP + + + tcpRadioButton + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + + + 12, 9 + + + 46, 13 + + + 16 + + + Protocol + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + 6, 13 + + + 375, 228 + AAABAA0AMDAQAAEABABoBgAA1gAAACAgEAABAAQA6AIAAD4HAAAYGBAAAQAEAOgBAAAmCgAAEBAQAAEA @@ -1812,4 +2294,16 @@ AADAPwAAwD8AAMA/AADAPwAA + + CenterParent + + + Relay Mapping + + + AddRelayMapForm + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/AppLaunchForm.Designer.cs b/AppLaunchForm.Designer.cs index c443784..c46ae2a 100644 --- a/AppLaunchForm.Designer.cs +++ b/AppLaunchForm.Designer.cs @@ -32,45 +32,35 @@ this.cancelButton = new System.Windows.Forms.Button(); this.okButton = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.appNameLabel = new System.Windows.Forms.Label(); - this.appPathTextBox = new System.Windows.Forms.TextBox(); - this.appLinkLabel = new System.Windows.Forms.LinkLabel(); - this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); this.folderButton = new System.Windows.Forms.Button(); + this.appNameLabel = new System.Windows.Forms.Label(); + this.appLinkLabel = new System.Windows.Forms.LinkLabel(); + this.appPathTextBox = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // cancelButton // - this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.cancelButton, "cancelButton"); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(323, 128); this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 0; - this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); // // okButton // - this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.okButton.Location = new System.Drawing.Point(242, 128); + resources.ApplyResources(this.okButton, "okButton"); this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(75, 23); - this.okButton.TabIndex = 1; - this.okButton.Text = "OK"; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // // groupBox1 // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Controls.Add(this.folderButton); this.groupBox1.Controls.Add(this.appNameLabel); this.groupBox1.Controls.Add(this.appLinkLabel); @@ -78,101 +68,68 @@ this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Location = new System.Drawing.Point(12, 12); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(386, 110); - this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; - this.groupBox1.Text = "Application Launch"; // - // label1 + // folderButton // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 25); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(35, 13); - this.label1.TabIndex = 0; - this.label1.Text = "Name"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 51); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(25, 13); - this.label2.TabIndex = 1; - this.label2.Text = "Site"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(12, 77); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(29, 13); - this.label3.TabIndex = 2; - this.label3.Text = "Path"; + resources.ApplyResources(this.folderButton, "folderButton"); + this.folderButton.Image = global::MeshCentralRouter.Properties.Resources.Folder36; + this.folderButton.Name = "folderButton"; + this.folderButton.UseVisualStyleBackColor = true; + this.folderButton.Click += new System.EventHandler(this.folderPictureBox_Click); // // appNameLabel // - this.appNameLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.appNameLabel.Location = new System.Drawing.Point(83, 25); + resources.ApplyResources(this.appNameLabel, "appNameLabel"); this.appNameLabel.Name = "appNameLabel"; - this.appNameLabel.Size = new System.Drawing.Size(238, 16); - this.appNameLabel.TabIndex = 3; - this.appNameLabel.Text = "Application Name"; - // - // appPathTextBox - // - this.appPathTextBox.Location = new System.Drawing.Point(86, 74); - this.appPathTextBox.Name = "appPathTextBox"; - this.appPathTextBox.Size = new System.Drawing.Size(294, 20); - this.appPathTextBox.TabIndex = 3; - this.appPathTextBox.TextChanged += new System.EventHandler(this.appPathTextBox_TextChanged); // // appLinkLabel // - this.appLinkLabel.Location = new System.Drawing.Point(83, 49); + resources.ApplyResources(this.appLinkLabel, "appLinkLabel"); this.appLinkLabel.Name = "appLinkLabel"; - this.appLinkLabel.Size = new System.Drawing.Size(238, 16); - this.appLinkLabel.TabIndex = 4; this.appLinkLabel.TabStop = true; - this.appLinkLabel.Text = "Application Link"; this.appLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.appLinkLabel_LinkClicked); // + // appPathTextBox + // + resources.ApplyResources(this.appPathTextBox, "appPathTextBox"); + this.appPathTextBox.Name = "appPathTextBox"; + this.appPathTextBox.TextChanged += new System.EventHandler(this.appPathTextBox_TextChanged); + // + // label3 + // + resources.ApplyResources(this.label3, "label3"); + this.label3.Name = "label3"; + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.Name = "label2"; + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // // openFileDialog // this.openFileDialog.DefaultExt = "exe"; - this.openFileDialog.Filter = "Executable (*.exe)|*.exe"; - this.openFileDialog.Title = "Application Executable"; - // - // folderButton - // - this.folderButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.folderButton.Image = global::MeshCentralRouter.Properties.Resources.Folder36; - this.folderButton.Location = new System.Drawing.Point(327, 15); - this.folderButton.Name = "folderButton"; - this.folderButton.Size = new System.Drawing.Size(52, 52); - this.folderButton.TabIndex = 5; - this.folderButton.UseVisualStyleBackColor = true; - this.folderButton.Click += new System.EventHandler(this.folderPictureBox_Click); + resources.ApplyResources(this.openFileDialog, "openFileDialog"); // // AppLaunchForm // this.AcceptButton = this.okButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(410, 163); this.Controls.Add(this.groupBox1); this.Controls.Add(this.okButton); this.Controls.Add(this.cancelButton); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "AppLaunchForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "MeshCentral Router"; this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.ResumeLayout(false); diff --git a/AppLaunchForm.resx b/AppLaunchForm.resx index 7292dc4..7b40503 100644 --- a/AppLaunchForm.resx +++ b/AppLaunchForm.resx @@ -117,10 +117,285 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bottom, Right + + + + 323, 128 + + + 75, 23 + + + + 0 + + + Cancel + + + cancelButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Bottom, Right + + + 242, 128 + + + 75, 23 + + + 1 + + + OK + + + okButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Top, Bottom, Left, Right + + + Top, Right + + + 327, 15 + + + 52, 52 + + + 5 + + + folderButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + 83, 25 + + + 238, 16 + + + 3 + + + Application Name + + + appNameLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + 83, 49 + + + 238, 16 + + + 4 + + + Application Link + + + appLinkLabel + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + 86, 74 + + + 294, 20 + + + 3 + + + appPathTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 3 + + + True + + + 12, 77 + + + 29, 13 + + + 2 + + + Path + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 4 + + + True + + + 12, 51 + + + 25, 13 + + + 1 + + + Site + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 5 + + + True + + + 12, 25 + + + 35, 13 + + + 0 + + + Name + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 6 + + + 12, 12 + + + 386, 110 + + + 2 + + + Application Launch + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + 17, 17 - + + Executable (*.exe)|*.exe + + + Application Executable + + + True + + + 6, 13 + + + 410, 163 + AAABAA0AMDAQAAEABABoBgAA1gAAACAgEAABAAQA6AIAAD4HAAAYGBAAAQAEAOgBAAAmCgAAEBAQAAEA @@ -1815,4 +2090,22 @@ AADAPwAAwD8AAMA/AADAPwAA + + CenterParent + + + MeshCentral Router + + + openFileDialog + + + System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + AppLaunchForm + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/InstallForm.Designer.cs b/InstallForm.Designer.cs index 1fbbb28..f05b568 100644 --- a/InstallForm.Designer.cs +++ b/InstallForm.Designer.cs @@ -41,75 +41,49 @@ // pictureBox1 // this.pictureBox1.Image = global::MeshCentralRouter.Properties.Resources.install; - this.pictureBox1.Location = new System.Drawing.Point(6, 29); + resources.ApplyResources(this.pictureBox1, "pictureBox1"); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(250, 184); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // // cancelButton // - this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.cancelButton, "cancelButton"); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(200, 300); this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 1; - this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); // // okButton // - this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.okButton.Location = new System.Drawing.Point(119, 300); + resources.ApplyResources(this.okButton, "okButton"); this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(75, 23); - this.okButton.TabIndex = 2; - this.okButton.Text = "OK"; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // // groupBox1 // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.pictureBox1); - this.groupBox1.Location = new System.Drawing.Point(12, 12); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(263, 282); - this.groupBox1.TabIndex = 3; this.groupBox1.TabStop = false; - this.groupBox1.Text = "MeshCentral Router Installation"; // // label1 // - this.label1.Location = new System.Drawing.Point(6, 219); + resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(250, 59); - this.label1.TabIndex = 1; - this.label1.Text = "Click ok to register MeshCentral Router on your system as the handler for the \"mc" + - "router://\" protocol. This will allow the MeshCentral web site to launch this app" + - "lication when needed."; // // InstallForm // this.AcceptButton = this.okButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(287, 335); this.Controls.Add(this.groupBox1); this.Controls.Add(this.okButton); this.Controls.Add(this.cancelButton); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "InstallForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Installation"; ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); diff --git a/InstallForm.resx b/InstallForm.resx index b93e49a..fe5afbd 100644 --- a/InstallForm.resx +++ b/InstallForm.resx @@ -118,6 +118,146 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6, 29 + + + 250, 184 + + + + AutoSize + + + + 0 + + + pictureBox1 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + Bottom, Right + + + 200, 300 + + + 75, 23 + + + 1 + + + Cancel + + + cancelButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Bottom, Right + + + 119, 300 + + + 75, 23 + + + 2 + + + OK + + + okButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Top, Bottom, Left, Right + + + 6, 219 + + + 250, 59 + + + 1 + + + Click ok to register MeshCentral Router on your system as the handler for the "mcrouter://" protocol. This will allow the MeshCentral web site to launch this application when needed. + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + 12, 12 + + + 263, 282 + + + 3 + + + MeshCentral Router Installation + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 287, 335 + AAABAA0AMDAQAAEABABoBgAA1gAAACAgEAABAAQA6AIAAD4HAAAYGBAAAQAEAOgBAAAmCgAAEBAQAAEA @@ -1812,4 +1952,16 @@ AADAPwAAwD8AAMA/AADAPwAA + + CenterParent + + + Installation + + + InstallForm + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index c52d200..0d6f241 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -47,7 +47,6 @@ this.versionLabel = new System.Windows.Forms.Label(); this.nextButton1 = new System.Windows.Forms.Button(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); - this.label1 = new System.Windows.Forms.Label(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.panel2 = new System.Windows.Forms.Panel(); @@ -105,6 +104,7 @@ this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.installTimer = new System.Windows.Forms.Timer(this.components); + this.label1 = new System.Windows.Forms.Label(); this.panel5.SuspendLayout(); this.mainPanel.SuspendLayout(); this.mainTabControl.SuspendLayout(); @@ -138,46 +138,30 @@ // this.panel5.Controls.Add(this.mainPanel); this.panel5.Controls.Add(this.pictureBox1); - this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel5.Location = new System.Drawing.Point(0, 0); + resources.ApplyResources(this.panel5, "panel5"); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(492, 416); - this.panel5.TabIndex = 8; // // mainPanel // this.mainPanel.Controls.Add(this.mainTabControl); - this.mainPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.mainPanel.Location = new System.Drawing.Point(0, 65); + resources.ApplyResources(this.mainPanel, "mainPanel"); this.mainPanel.Name = "mainPanel"; - this.mainPanel.Size = new System.Drawing.Size(492, 351); - this.mainPanel.TabIndex = 9; // // mainTabControl // - this.mainTabControl.Appearance = System.Windows.Forms.TabAppearance.FlatButtons; + resources.ApplyResources(this.mainTabControl, "mainTabControl"); this.mainTabControl.Controls.Add(this.tabPage1); this.mainTabControl.Controls.Add(this.tabPage2); this.mainTabControl.Controls.Add(this.tabPage3); this.mainTabControl.Controls.Add(this.tabPage5); - this.mainTabControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.mainTabControl.Location = new System.Drawing.Point(0, 0); - this.mainTabControl.Margin = new System.Windows.Forms.Padding(0); this.mainTabControl.Name = "mainTabControl"; this.mainTabControl.SelectedIndex = 0; - this.mainTabControl.Size = new System.Drawing.Size(492, 351); - this.mainTabControl.TabIndex = 8; - this.mainTabControl.Visible = false; // // tabPage1 // this.tabPage1.Controls.Add(this.panel1); - this.tabPage1.Location = new System.Drawing.Point(4, 25); + resources.ApplyResources(this.tabPage1, "tabPage1"); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(484, 322); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "Login"; this.tabPage1.UseVisualStyleBackColor = true; // // panel1 @@ -196,184 +180,102 @@ this.panel1.Controls.Add(this.pictureBox3); this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.pictureBox2); - this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.panel1, "panel1"); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(478, 316); - this.panel1.TabIndex = 6; // // installButton // - this.installButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.installButton.Location = new System.Drawing.Point(6, 285); + resources.ApplyResources(this.installButton, "installButton"); this.installButton.Name = "installButton"; - this.installButton.Size = new System.Drawing.Size(75, 23); - this.installButton.TabIndex = 20; - this.installButton.Text = "Install..."; this.installButton.UseVisualStyleBackColor = true; - this.installButton.Visible = false; this.installButton.Click += new System.EventHandler(this.installButton_Click); // // stateLabel // - this.stateLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.stateLabel.AutoSize = true; - this.stateLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + resources.ApplyResources(this.stateLabel, "stateLabel"); this.stateLabel.ForeColor = System.Drawing.Color.Red; - this.stateLabel.Location = new System.Drawing.Point(241, 225); this.stateLabel.Name = "stateLabel"; - this.stateLabel.Size = new System.Drawing.Size(88, 13); - this.stateLabel.TabIndex = 19; - this.stateLabel.Text = "Error Message"; - this.stateLabel.Visible = false; // // label28 // - this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(238, 176); + resources.ApplyResources(this.label28, "label28"); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(53, 13); - this.label28.TabIndex = 18; - this.label28.Text = "Password"; // // label27 // - this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(238, 135); + resources.ApplyResources(this.label27, "label27"); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(55, 13); - this.label27.TabIndex = 17; - this.label27.Text = "Username"; // // label26 // - this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(238, 92); + resources.ApplyResources(this.label26, "label26"); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(38, 13); - this.label26.TabIndex = 16; - this.label26.Text = "Server"; // // passwordTextBox // - this.passwordTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.passwordTextBox.Location = new System.Drawing.Point(241, 192); + resources.ApplyResources(this.passwordTextBox, "passwordTextBox"); this.passwordTextBox.Name = "passwordTextBox"; - this.passwordTextBox.PasswordChar = '●'; - this.passwordTextBox.Size = new System.Drawing.Size(213, 20); - this.passwordTextBox.TabIndex = 3; this.passwordTextBox.TextChanged += new System.EventHandler(this.updatePanel1); this.passwordTextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.passwordTextBox_KeyPress); // // serverNameComboBox // - this.serverNameComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.serverNameComboBox, "serverNameComboBox"); this.serverNameComboBox.DisplayMember = "meshcentral.com"; this.serverNameComboBox.FormattingEnabled = true; this.serverNameComboBox.Items.AddRange(new object[] { - "meshcentral.com"}); - this.serverNameComboBox.Location = new System.Drawing.Point(241, 110); + resources.GetString("serverNameComboBox.Items")}); this.serverNameComboBox.Name = "serverNameComboBox"; - this.serverNameComboBox.Size = new System.Drawing.Size(213, 21); - this.serverNameComboBox.TabIndex = 1; this.serverNameComboBox.SelectedIndexChanged += new System.EventHandler(this.updatePanel1); this.serverNameComboBox.TextChanged += new System.EventHandler(this.updatePanel1); this.serverNameComboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.serverNameComboBox_KeyPress); // // userNameTextBox // - this.userNameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.userNameTextBox.Location = new System.Drawing.Point(241, 151); + resources.ApplyResources(this.userNameTextBox, "userNameTextBox"); this.userNameTextBox.Name = "userNameTextBox"; - this.userNameTextBox.Size = new System.Drawing.Size(213, 20); - this.userNameTextBox.TabIndex = 2; this.userNameTextBox.TextChanged += new System.EventHandler(this.updatePanel1); this.userNameTextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.userNameTextBox_KeyPress); // // licenseLinkLabel // - this.licenseLinkLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.licenseLinkLabel.AutoSize = true; - this.licenseLinkLabel.Location = new System.Drawing.Point(307, 260); + resources.ApplyResources(this.licenseLinkLabel, "licenseLinkLabel"); this.licenseLinkLabel.Name = "licenseLinkLabel"; - this.licenseLinkLabel.Size = new System.Drawing.Size(171, 13); - this.licenseLinkLabel.TabIndex = 12; this.licenseLinkLabel.TabStop = true; - this.licenseLinkLabel.Text = "Open Source, Apache 2.0 License"; - this.licenseLinkLabel.TextAlign = System.Drawing.ContentAlignment.TopRight; this.licenseLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.licenseLinkLabel_LinkClicked); // // versionLabel // - this.versionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.versionLabel.AutoSize = true; + resources.ApplyResources(this.versionLabel, "versionLabel"); this.versionLabel.ForeColor = System.Drawing.Color.Gray; - this.versionLabel.Location = new System.Drawing.Point(3, 260); this.versionLabel.Name = "versionLabel"; - this.versionLabel.Size = new System.Drawing.Size(37, 13); - this.versionLabel.TabIndex = 11; - this.versionLabel.Text = "v0.8.0"; // // nextButton1 // - this.nextButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.nextButton1.Location = new System.Drawing.Point(391, 285); + resources.ApplyResources(this.nextButton1, "nextButton1"); this.nextButton1.Name = "nextButton1"; - this.nextButton1.Size = new System.Drawing.Size(75, 23); - this.nextButton1.TabIndex = 4; - this.nextButton1.Text = "Login"; this.nextButton1.UseVisualStyleBackColor = true; this.nextButton1.Click += new System.EventHandler(this.nextButton1_Click); // // pictureBox3 // - this.pictureBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox3.Image = global::MeshCentralRouter.Properties.Resources.Empty_Banner; - this.pictureBox3.Location = new System.Drawing.Point(0, 276); + resources.ApplyResources(this.pictureBox3, "pictureBox3"); + this.pictureBox3.Image = global::MeshCentralRouter.Properties.Resources.EmptyBanner; this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(478, 40); - this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox3.TabIndex = 10; this.pictureBox3.TabStop = false; - // - // label1 - // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.label1.Location = new System.Drawing.Point(12, 9); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(454, 29); - this.label1.TabIndex = 6; - this.label1.Text = "MeshCentral Router allows mapping of TCP and UDP ports on this computer to any co" + - "mputer in your MeshCentral server account. Start by logging into your account."; // // pictureBox2 // - this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.pictureBox2, "pictureBox2"); this.pictureBox2.Image = global::MeshCentralRouter.Properties.Resources.MeshCentral; - this.pictureBox2.Location = new System.Drawing.Point(15, 68); this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(202, 170); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox2.TabIndex = 7; this.pictureBox2.TabStop = false; // // tabPage2 // this.tabPage2.Controls.Add(this.panel2); - this.tabPage2.Location = new System.Drawing.Point(4, 25); + resources.ApplyResources(this.tabPage2, "tabPage2"); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(484, 322); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Token"; this.tabPage2.UseVisualStyleBackColor = true; // // panel2 @@ -388,130 +290,79 @@ this.panel2.Controls.Add(this.nextButton2); this.panel2.Controls.Add(this.pictureBox4); this.panel2.Controls.Add(this.label2); - this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(3, 3); + resources.ApplyResources(this.panel2, "panel2"); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(478, 316); - this.panel2.TabIndex = 7; // // smsTokenButton // - this.smsTokenButton.Location = new System.Drawing.Point(322, 177); + resources.ApplyResources(this.smsTokenButton, "smsTokenButton"); this.smsTokenButton.Name = "smsTokenButton"; - this.smsTokenButton.Size = new System.Drawing.Size(75, 23); - this.smsTokenButton.TabIndex = 22; - this.smsTokenButton.Text = "SMS"; this.smsTokenButton.UseVisualStyleBackColor = true; - this.smsTokenButton.Visible = false; this.smsTokenButton.Click += new System.EventHandler(this.smsTokenButton_Click); // // tokenEmailSentLabel // - this.tokenEmailSentLabel.AutoSize = true; - this.tokenEmailSentLabel.Location = new System.Drawing.Point(238, 182); + resources.ApplyResources(this.tokenEmailSentLabel, "tokenEmailSentLabel"); this.tokenEmailSentLabel.Name = "tokenEmailSentLabel"; - this.tokenEmailSentLabel.Size = new System.Drawing.Size(55, 13); - this.tokenEmailSentLabel.TabIndex = 21; - this.tokenEmailSentLabel.Text = "Email sent"; - this.tokenEmailSentLabel.Visible = false; // // emailTokenButton // - this.emailTokenButton.Location = new System.Drawing.Point(241, 177); + resources.ApplyResources(this.emailTokenButton, "emailTokenButton"); this.emailTokenButton.Name = "emailTokenButton"; - this.emailTokenButton.Size = new System.Drawing.Size(75, 23); - this.emailTokenButton.TabIndex = 20; - this.emailTokenButton.Text = "Email"; this.emailTokenButton.UseVisualStyleBackColor = true; - this.emailTokenButton.Visible = false; this.emailTokenButton.Click += new System.EventHandler(this.emailTokenButton_Click); // // label3 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(238, 135); + resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(38, 13); - this.label3.TabIndex = 19; - this.label3.Text = "Token"; // // tokenTextBox // - this.tokenTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tokenTextBox.Location = new System.Drawing.Point(241, 151); + resources.ApplyResources(this.tokenTextBox, "tokenTextBox"); this.tokenTextBox.Name = "tokenTextBox"; - this.tokenTextBox.Size = new System.Drawing.Size(213, 20); - this.tokenTextBox.TabIndex = 18; this.tokenTextBox.TextChanged += new System.EventHandler(this.tokenTextBox_TextChanged); this.tokenTextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tokenTextBox_KeyPress); this.tokenTextBox.KeyUp += new System.Windows.Forms.KeyEventHandler(this.tokenTextBox_KeyUp); // // pictureBox6 // - this.pictureBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.pictureBox6, "pictureBox6"); this.pictureBox6.Image = global::MeshCentralRouter.Properties.Resources.MeshCentral; - this.pictureBox6.Location = new System.Drawing.Point(15, 68); this.pictureBox6.Name = "pictureBox6"; - this.pictureBox6.Size = new System.Drawing.Size(202, 170); - this.pictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox6.TabIndex = 15; this.pictureBox6.TabStop = false; // // backButton2 // - this.backButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.backButton2.Location = new System.Drawing.Point(310, 285); + resources.ApplyResources(this.backButton2, "backButton2"); this.backButton2.Name = "backButton2"; - this.backButton2.Size = new System.Drawing.Size(75, 23); - this.backButton2.TabIndex = 13; - this.backButton2.Text = "Back"; this.backButton2.UseVisualStyleBackColor = true; this.backButton2.Click += new System.EventHandler(this.backButton2_Click); // // nextButton2 // - this.nextButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.nextButton2.Location = new System.Drawing.Point(391, 285); + resources.ApplyResources(this.nextButton2, "nextButton2"); this.nextButton2.Name = "nextButton2"; - this.nextButton2.Size = new System.Drawing.Size(75, 23); - this.nextButton2.TabIndex = 14; - this.nextButton2.Text = "Next"; this.nextButton2.UseVisualStyleBackColor = true; this.nextButton2.Click += new System.EventHandler(this.nextButton2_Click); // // pictureBox4 // - this.pictureBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox4.Image = global::MeshCentralRouter.Properties.Resources.Empty_Banner; - this.pictureBox4.Location = new System.Drawing.Point(0, 276); + resources.ApplyResources(this.pictureBox4, "pictureBox4"); + this.pictureBox4.Image = global::MeshCentralRouter.Properties.Resources.EmptyBanner; this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.Size = new System.Drawing.Size(478, 40); - this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox4.TabIndex = 10; this.pictureBox4.TabStop = false; // // label2 // - this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.label2.Location = new System.Drawing.Point(12, 9); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(454, 32); - this.label2.TabIndex = 6; - this.label2.Text = "Enter the second factor authentication token."; // // tabPage3 // this.tabPage3.Controls.Add(this.panel3); - this.tabPage3.Location = new System.Drawing.Point(4, 25); + resources.ApplyResources(this.tabPage3, "tabPage3"); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(484, 322); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Certificate"; this.tabPage3.UseVisualStyleBackColor = true; // // panel3 @@ -523,103 +374,61 @@ this.panel3.Controls.Add(this.backButton3); this.panel3.Controls.Add(this.nextButton3); this.panel3.Controls.Add(this.pictureBox5); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(0, 0); + resources.ApplyResources(this.panel3, "panel3"); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(484, 322); - this.panel3.TabIndex = 8; // // certDetailsTextBox // - this.certDetailsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.certDetailsTextBox.Location = new System.Drawing.Point(15, 82); - this.certDetailsTextBox.Multiline = true; + resources.ApplyResources(this.certDetailsTextBox, "certDetailsTextBox"); this.certDetailsTextBox.Name = "certDetailsTextBox"; this.certDetailsTextBox.ReadOnly = true; - this.certDetailsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.certDetailsTextBox.Size = new System.Drawing.Size(451, 162); - this.certDetailsTextBox.TabIndex = 25; // // certDetailsButton // - this.certDetailsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.certDetailsButton.Location = new System.Drawing.Point(14, 251); + resources.ApplyResources(this.certDetailsButton, "certDetailsButton"); this.certDetailsButton.Name = "certDetailsButton"; - this.certDetailsButton.Size = new System.Drawing.Size(153, 23); - this.certDetailsButton.TabIndex = 24; - this.certDetailsButton.Text = "View Certificate Details..."; this.certDetailsButton.UseVisualStyleBackColor = true; this.certDetailsButton.Click += new System.EventHandler(this.certDetailsButton_Click); // // label4 // - this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.label4, "label4"); this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); - this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.ForeColor = System.Drawing.Color.Red; - this.label4.Location = new System.Drawing.Point(8, 6); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(468, 22); - this.label4.TabIndex = 23; - this.label4.Text = "WARNING - Invalid Server Certificate"; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // label5 // - this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.label5.Location = new System.Drawing.Point(12, 34); + resources.ApplyResources(this.label5, "label5"); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(454, 45); - this.label5.TabIndex = 22; - this.label5.Text = resources.GetString("label5.Text"); // // backButton3 // - this.backButton3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.backButton3.Location = new System.Drawing.Point(316, 291); + resources.ApplyResources(this.backButton3, "backButton3"); this.backButton3.Name = "backButton3"; - this.backButton3.Size = new System.Drawing.Size(75, 23); - this.backButton3.TabIndex = 20; - this.backButton3.Text = "Back"; this.backButton3.UseVisualStyleBackColor = true; this.backButton3.Click += new System.EventHandler(this.backButton3_Click); // // nextButton3 // - this.nextButton3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.nextButton3, "nextButton3"); this.nextButton3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.nextButton3.Location = new System.Drawing.Point(397, 291); this.nextButton3.Name = "nextButton3"; - this.nextButton3.Size = new System.Drawing.Size(75, 23); - this.nextButton3.TabIndex = 21; - this.nextButton3.Text = "Ignore"; this.nextButton3.UseVisualStyleBackColor = false; this.nextButton3.Click += new System.EventHandler(this.nextButton3_Click); // // pictureBox5 // - this.pictureBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox5.Image = global::MeshCentralRouter.Properties.Resources.Empty_Banner; - this.pictureBox5.Location = new System.Drawing.Point(0, 282); + resources.ApplyResources(this.pictureBox5, "pictureBox5"); + this.pictureBox5.Image = global::MeshCentralRouter.Properties.Resources.EmptyBanner; this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.Size = new System.Drawing.Size(484, 40); - this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox5.TabIndex = 10; this.pictureBox5.TabStop = false; // // tabPage5 // this.tabPage5.Controls.Add(this.panel4); - this.tabPage5.Location = new System.Drawing.Point(4, 25); + resources.ApplyResources(this.tabPage5, "tabPage5"); this.tabPage5.Name = "tabPage5"; - this.tabPage5.Size = new System.Drawing.Size(484, 322); - this.tabPage5.TabIndex = 4; - this.tabPage5.Text = "Mappings"; this.tabPage5.UseVisualStyleBackColor = true; // // panel4 @@ -631,24 +440,15 @@ this.panel4.Controls.Add(this.backButton5); this.panel4.Controls.Add(this.nextButton5); this.panel4.Controls.Add(this.pictureBox7); - this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(0, 0); + resources.ApplyResources(this.panel4, "panel4"); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(484, 322); - this.panel4.TabIndex = 8; // // menuLabel // - this.menuLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.menuLabel.AutoSize = true; + resources.ApplyResources(this.menuLabel, "menuLabel"); this.menuLabel.ContextMenuStrip = this.mainContextMenuStrip; this.menuLabel.Cursor = System.Windows.Forms.Cursors.Hand; - this.menuLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.menuLabel.Location = new System.Drawing.Point(454, 2); this.menuLabel.Name = "menuLabel"; - this.menuLabel.Size = new System.Drawing.Size(25, 25); - this.menuLabel.TabIndex = 6; - this.menuLabel.Text = "≡"; this.menuLabel.Click += new System.EventHandler(this.menuLabel_Click); // // mainContextMenuStrip @@ -660,120 +460,82 @@ this.sortByNameToolStripMenuItem, this.sortByGroupToolStripMenuItem}); this.mainContextMenuStrip.Name = "mainContextMenuStrip"; - this.mainContextMenuStrip.Size = new System.Drawing.Size(186, 98); + resources.ApplyResources(this.mainContextMenuStrip, "mainContextMenuStrip"); // // showGroupNamesToolStripMenuItem // this.showGroupNamesToolStripMenuItem.Checked = true; this.showGroupNamesToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.showGroupNamesToolStripMenuItem.Name = "showGroupNamesToolStripMenuItem"; - this.showGroupNamesToolStripMenuItem.Size = new System.Drawing.Size(185, 22); - this.showGroupNamesToolStripMenuItem.Text = "Show &Group Names"; + resources.ApplyResources(this.showGroupNamesToolStripMenuItem, "showGroupNamesToolStripMenuItem"); this.showGroupNamesToolStripMenuItem.Click += new System.EventHandler(this.showGroupNamesToolStripMenuItem_Click); // // showOfflineDevicesToolStripMenuItem // this.showOfflineDevicesToolStripMenuItem.Name = "showOfflineDevicesToolStripMenuItem"; - this.showOfflineDevicesToolStripMenuItem.Size = new System.Drawing.Size(185, 22); - this.showOfflineDevicesToolStripMenuItem.Text = "Show &Offline Devices"; + resources.ApplyResources(this.showOfflineDevicesToolStripMenuItem, "showOfflineDevicesToolStripMenuItem"); this.showOfflineDevicesToolStripMenuItem.Click += new System.EventHandler(this.hideOfflineDevicesToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(182, 6); + resources.ApplyResources(this.toolStripMenuItem2, "toolStripMenuItem2"); // // sortByNameToolStripMenuItem // this.sortByNameToolStripMenuItem.Checked = true; this.sortByNameToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.sortByNameToolStripMenuItem.Name = "sortByNameToolStripMenuItem"; - this.sortByNameToolStripMenuItem.Size = new System.Drawing.Size(185, 22); - this.sortByNameToolStripMenuItem.Text = "Sort by &Name"; + resources.ApplyResources(this.sortByNameToolStripMenuItem, "sortByNameToolStripMenuItem"); this.sortByNameToolStripMenuItem.Click += new System.EventHandler(this.sortByNameToolStripMenuItem_Click); // // sortByGroupToolStripMenuItem // this.sortByGroupToolStripMenuItem.Name = "sortByGroupToolStripMenuItem"; - this.sortByGroupToolStripMenuItem.Size = new System.Drawing.Size(185, 22); - this.sortByGroupToolStripMenuItem.Text = "Sort by G&roup"; + resources.ApplyResources(this.sortByGroupToolStripMenuItem, "sortByGroupToolStripMenuItem"); this.sortByGroupToolStripMenuItem.Click += new System.EventHandler(this.sortByGroupToolStripMenuItem_Click); // // searchTextBox // - this.searchTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.searchTextBox.Location = new System.Drawing.Point(306, 5); + resources.ApplyResources(this.searchTextBox, "searchTextBox"); this.searchTextBox.Name = "searchTextBox"; - this.searchTextBox.Size = new System.Drawing.Size(146, 20); - this.searchTextBox.TabIndex = 9; this.searchTextBox.TextChanged += new System.EventHandler(this.searchTextBox_TextChanged); this.searchTextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.searchTextBox_KeyPress); // // devicesTabControl // - this.devicesTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.devicesTabControl.Appearance = System.Windows.Forms.TabAppearance.FlatButtons; + resources.ApplyResources(this.devicesTabControl, "devicesTabControl"); this.devicesTabControl.Controls.Add(this.devicesTabPage); this.devicesTabControl.Controls.Add(this.portMapTabPage); - this.devicesTabControl.Location = new System.Drawing.Point(3, 3); this.devicesTabControl.Name = "devicesTabControl"; this.devicesTabControl.SelectedIndex = 0; - this.devicesTabControl.Size = new System.Drawing.Size(478, 273); - this.devicesTabControl.TabIndex = 55; this.devicesTabControl.SelectedIndexChanged += new System.EventHandler(this.devicesTabControl_SelectedIndexChanged); // // devicesTabPage // this.devicesTabPage.BackColor = System.Drawing.SystemColors.Control; this.devicesTabPage.Controls.Add(this.devicesPanel); - this.devicesTabPage.Location = new System.Drawing.Point(4, 25); + resources.ApplyResources(this.devicesTabPage, "devicesTabPage"); this.devicesTabPage.Name = "devicesTabPage"; - this.devicesTabPage.Padding = new System.Windows.Forms.Padding(3); - this.devicesTabPage.Size = new System.Drawing.Size(470, 244); - this.devicesTabPage.TabIndex = 0; - this.devicesTabPage.Text = "Devices"; // // devicesPanel // - this.devicesPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.devicesPanel.AutoScroll = true; + resources.ApplyResources(this.devicesPanel, "devicesPanel"); this.devicesPanel.BackColor = System.Drawing.SystemColors.ControlLightLight; this.devicesPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.devicesPanel.Controls.Add(this.noSearchResultsLabel); this.devicesPanel.Controls.Add(this.noDevicesLabel); - this.devicesPanel.Location = new System.Drawing.Point(0, 0); this.devicesPanel.Name = "devicesPanel"; - this.devicesPanel.Size = new System.Drawing.Size(470, 244); - this.devicesPanel.TabIndex = 50; // // noSearchResultsLabel // - this.noSearchResultsLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.noSearchResultsLabel.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.noSearchResultsLabel.Location = new System.Drawing.Point(91, 96); + resources.ApplyResources(this.noSearchResultsLabel, "noSearchResultsLabel"); this.noSearchResultsLabel.Name = "noSearchResultsLabel"; - this.noSearchResultsLabel.Size = new System.Drawing.Size(283, 17); - this.noSearchResultsLabel.TabIndex = 5; - this.noSearchResultsLabel.Text = "No Search Results"; - this.noSearchResultsLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.noSearchResultsLabel.Visible = false; // // noDevicesLabel // - this.noDevicesLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.noDevicesLabel.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.noDevicesLabel.Location = new System.Drawing.Point(91, 97); + resources.ApplyResources(this.noDevicesLabel, "noDevicesLabel"); this.noDevicesLabel.Name = "noDevicesLabel"; - this.noDevicesLabel.Size = new System.Drawing.Size(283, 17); - this.noDevicesLabel.TabIndex = 4; - this.noDevicesLabel.Text = "No Devices"; - this.noDevicesLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // portMapTabPage // @@ -783,141 +545,85 @@ this.portMapTabPage.Controls.Add(this.helpPictureBox); this.portMapTabPage.Controls.Add(this.addButton); this.portMapTabPage.Controls.Add(this.addRelayButton); - this.portMapTabPage.Location = new System.Drawing.Point(4, 25); + resources.ApplyResources(this.portMapTabPage, "portMapTabPage"); this.portMapTabPage.Name = "portMapTabPage"; - this.portMapTabPage.Padding = new System.Windows.Forms.Padding(3); - this.portMapTabPage.Size = new System.Drawing.Size(470, 244); - this.portMapTabPage.TabIndex = 1; - this.portMapTabPage.Text = "Mappings"; // // mapPanel // - this.mapPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.mapPanel.AutoScroll = true; + resources.ApplyResources(this.mapPanel, "mapPanel"); this.mapPanel.BackColor = System.Drawing.SystemColors.ControlLightLight; this.mapPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.mapPanel.Controls.Add(this.noMapLabel); - this.mapPanel.Location = new System.Drawing.Point(0, 0); this.mapPanel.Name = "mapPanel"; - this.mapPanel.Size = new System.Drawing.Size(470, 214); - this.mapPanel.TabIndex = 49; // // noMapLabel // - this.noMapLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.noMapLabel.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.noMapLabel.Location = new System.Drawing.Point(91, 79); + resources.ApplyResources(this.noMapLabel, "noMapLabel"); this.noMapLabel.Name = "noMapLabel"; - this.noMapLabel.Size = new System.Drawing.Size(283, 52); - this.noMapLabel.TabIndex = 4; - this.noMapLabel.Text = "No Port Mappings\r\n\r\nClick \"Add\" to get started."; - this.noMapLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // settingsPictureBox // - this.settingsPictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + resources.ApplyResources(this.settingsPictureBox, "settingsPictureBox"); this.settingsPictureBox.Cursor = System.Windows.Forms.Cursors.Hand; - this.settingsPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("settingsPictureBox.Image"))); - this.settingsPictureBox.Location = new System.Drawing.Point(1, 220); this.settingsPictureBox.Name = "settingsPictureBox"; - this.settingsPictureBox.Size = new System.Drawing.Size(20, 20); - this.settingsPictureBox.TabIndex = 54; this.settingsPictureBox.TabStop = false; this.settingsPictureBox.Click += new System.EventHandler(this.settingsPictureBox_Click); // // helpPictureBox // - this.helpPictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.helpPictureBox, "helpPictureBox"); this.helpPictureBox.Cursor = System.Windows.Forms.Cursors.Hand; - this.helpPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("helpPictureBox.Image"))); - this.helpPictureBox.Location = new System.Drawing.Point(238, 220); this.helpPictureBox.Name = "helpPictureBox"; - this.helpPictureBox.Size = new System.Drawing.Size(20, 20); - this.helpPictureBox.TabIndex = 5; this.helpPictureBox.TabStop = false; this.helpPictureBox.Click += new System.EventHandler(this.helpPictureBox_Click); // // addButton // - this.addButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.addButton.Enabled = false; - this.addButton.Location = new System.Drawing.Point(370, 218); + resources.ApplyResources(this.addButton, "addButton"); this.addButton.Name = "addButton"; - this.addButton.Size = new System.Drawing.Size(100, 23); - this.addButton.TabIndex = 50; - this.addButton.Text = "Add Map..."; this.addButton.UseVisualStyleBackColor = true; this.addButton.Click += new System.EventHandler(this.addButton_Click); // // addRelayButton // - this.addRelayButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.addRelayButton.Enabled = false; - this.addRelayButton.Location = new System.Drawing.Point(264, 218); + resources.ApplyResources(this.addRelayButton, "addRelayButton"); this.addRelayButton.Name = "addRelayButton"; - this.addRelayButton.Size = new System.Drawing.Size(100, 23); - this.addRelayButton.TabIndex = 52; - this.addRelayButton.Text = "Add Relay Map..."; this.addRelayButton.UseVisualStyleBackColor = true; this.addRelayButton.Click += new System.EventHandler(this.addRelayMapButton_Click); // // openWebSiteButton // - this.openWebSiteButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.openWebSiteButton.Location = new System.Drawing.Point(15, 291); + resources.ApplyResources(this.openWebSiteButton, "openWebSiteButton"); this.openWebSiteButton.Name = "openWebSiteButton"; - this.openWebSiteButton.Size = new System.Drawing.Size(109, 23); - this.openWebSiteButton.TabIndex = 53; - this.openWebSiteButton.Text = "Open Web Site"; this.openWebSiteButton.UseVisualStyleBackColor = true; - this.openWebSiteButton.Visible = false; this.openWebSiteButton.Click += new System.EventHandler(this.openWebSiteButton_Click); // // backButton5 // - this.backButton5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.backButton5.Location = new System.Drawing.Point(316, 291); + resources.ApplyResources(this.backButton5, "backButton5"); this.backButton5.Name = "backButton5"; - this.backButton5.Size = new System.Drawing.Size(75, 23); - this.backButton5.TabIndex = 35; - this.backButton5.Text = "Log out"; this.backButton5.UseVisualStyleBackColor = true; this.backButton5.Click += new System.EventHandler(this.backButton5_Click); // // nextButton5 // - this.nextButton5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.nextButton5.Location = new System.Drawing.Point(397, 291); + resources.ApplyResources(this.nextButton5, "nextButton5"); this.nextButton5.Name = "nextButton5"; - this.nextButton5.Size = new System.Drawing.Size(75, 23); - this.nextButton5.TabIndex = 36; - this.nextButton5.Text = "Close"; this.nextButton5.UseVisualStyleBackColor = true; this.nextButton5.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // // pictureBox7 // - this.pictureBox7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox7.Image = global::MeshCentralRouter.Properties.Resources.Empty_Banner; - this.pictureBox7.Location = new System.Drawing.Point(0, 282); + resources.ApplyResources(this.pictureBox7, "pictureBox7"); + this.pictureBox7.Image = global::MeshCentralRouter.Properties.Resources.EmptyBanner; this.pictureBox7.Name = "pictureBox7"; - this.pictureBox7.Size = new System.Drawing.Size(484, 40); - this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox7.TabIndex = 10; this.pictureBox7.TabStop = false; // // pictureBox1 // - this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Image = global::MeshCentralRouter.Properties.Resources.MC2_Banner; - this.pictureBox1.Location = new System.Drawing.Point(0, 0); + resources.ApplyResources(this.pictureBox1, "pictureBox1"); + this.pictureBox1.Image = global::MeshCentralRouter.Properties.Resources.MC2Banner; this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(492, 65); - this.pictureBox1.TabIndex = 2; this.pictureBox1.TabStop = false; // // stateClearTimer @@ -933,8 +639,7 @@ // notifyIcon // this.notifyIcon.ContextMenuStrip = this.trayIconContextMenuStrip; - this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon"))); - this.notifyIcon.Text = "MeshCentral Router"; + resources.ApplyResources(this.notifyIcon, "notifyIcon"); this.notifyIcon.DoubleClick += new System.EventHandler(this.notifyIcon_DoubleClick); // // trayIconContextMenuStrip @@ -944,43 +649,44 @@ this.toolStripMenuItem1, this.exitToolStripMenuItem}); this.trayIconContextMenuStrip.Name = "trayIconContextMenuStrip"; - this.trayIconContextMenuStrip.Size = new System.Drawing.Size(113, 54); + resources.ApplyResources(this.trayIconContextMenuStrip, "trayIconContextMenuStrip"); // // openToolStripMenuItem // this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Size = new System.Drawing.Size(112, 22); - this.openToolStripMenuItem.Text = "&Open..."; + resources.ApplyResources(this.openToolStripMenuItem, "openToolStripMenuItem"); this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(109, 6); + resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1"); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(112, 22); - this.exitToolStripMenuItem.Text = "E&xit"; + resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click_1); // // installTimer // this.installTimer.Tick += new System.EventHandler(this.installTimer_Tick); // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + this.label1.UseMnemonic = false; + // // MainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(492, 416); this.Controls.Add(this.panel5); this.DoubleBuffered = true; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.Name = "MainForm"; - this.Text = " MeshCentral Router"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); this.Load += new System.EventHandler(this.MainForm_Load); this.panel5.ResumeLayout(false); diff --git a/MainForm.cs b/MainForm.cs index d0e9dad..e3ec94d 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -217,7 +217,7 @@ namespace MeshCentralRouter //windowColor = serverNameTextBox.BackColor; setPanel(1); updatePanel1(null, null); - SendMessage(searchTextBox.Handle, EM_SETCUEBANNER, 0, "Search"); + SendMessage(searchTextBox.Handle, EM_SETCUEBANNER, 0, Properties.Resources.SearchPlaceHolder); // Start the multicast scanner //scanner = new MeshDiscovery(); @@ -520,14 +520,14 @@ namespace MeshCentralRouter } else { setPanel(1); } if ((meshcentral.disconnectMsg != null) && meshcentral.disconnectMsg.StartsWith("noauth")) { - stateLabel.Text = "Invalid username or password"; + stateLabel.Text = Properties.Resources.InvalidUsernameOrPassword; stateLabel.Visible = true; stateClearTimer.Enabled = true; serverNameComboBox.Focus(); } else if ((meshcentral.disconnectMsg != null) && meshcentral.disconnectMsg.StartsWith("emailvalidationrequired")) { - stateLabel.Text = "Email verification required"; + stateLabel.Text = Properties.Resources.EmailVerificationRequired; stateLabel.Visible = true; stateClearTimer.Enabled = true; serverNameComboBox.Focus(); @@ -538,7 +538,7 @@ namespace MeshCentralRouter setPanel(3); certDetailsButton.Focus(); } - else if (meshcentral.disconnectMsg == null) { stateLabel.Text = "Unable to connect"; stateLabel.Visible = true; stateClearTimer.Enabled = true; serverNameComboBox.Focus(); } + else if (meshcentral.disconnectMsg == null) { stateLabel.Text = Properties.Resources.UnableToConnect; stateLabel.Visible = true; stateClearTimer.Enabled = true; serverNameComboBox.Focus(); } // Clean up the UI nextButton1.Enabled = true; @@ -1027,7 +1027,7 @@ namespace MeshCentralRouter private void emailTokenButton_Click(object sender, EventArgs e) { - if (MessageBox.Show(this, "Send token to registered email address?", "Two-factor Authentication", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK) + if (MessageBox.Show(this, Properties.Resources.SendTokenEmail, Properties.Resources.TwoFactorAuthentication, MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK) { sendEmailToken = true; sendSMSToken = false; @@ -1037,7 +1037,7 @@ namespace MeshCentralRouter private void smsTokenButton_Click(object sender, EventArgs e) { - if (MessageBox.Show(this, "Send token to registered phone number?", "Two-factor Authentication", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK) + if (MessageBox.Show(this, Properties.Resources.SendTokenSMS, Properties.Resources.TwoFactorAuthentication, MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK) { sendEmailToken = false; sendSMSToken = true; @@ -1096,6 +1096,16 @@ namespace MeshCentralRouter if (form.ShowDialog(this) == DialogResult.OK) { hookRouterEx(); } } + private void ChangeLanguage(string lang) + { + if (System.Threading.Thread.CurrentThread.CurrentUICulture == new System.Globalization.CultureInfo(lang)) return; + if (MessageBox.Show(this, Properties.Resources.LanguagesChanging, Properties.Resources.LanguagesTitle, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(lang); + Close(); + } + } + /* private delegate void displayMessageHandler(string msg, int buttons, string extra, int progress); private void displayMessage(string msg, int buttons = 0, string extra = "", int progress = 0) diff --git a/MainForm.resx b/MainForm.resx index 0aec551..0be0696 100644 --- a/MainForm.resx +++ b/MainForm.resx @@ -117,13 +117,1316 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + FlatButtons + + + Bottom, Left + + + + 6, 285 + + + 75, 23 + + + + 20 + + + Install... + + + False + + + installButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 0 + + + Top, Left, Right + + + True + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + 241, 225 + + + 88, 13 + + + 19 + + + Error Message + + + False + + + stateLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 1 + + + True + + + 238, 176 + + + 53, 13 + + + 18 + + + Password + + + label28 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 2 + + + True + + + 238, 135 + + + 55, 13 + + + 17 + + + Username + + + label27 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 3 + + + True + + + 238, 92 + + + 38, 13 + + + 16 + + + Server + + + label26 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 4 + + + Top, Left, Right + + + 241, 192 + + + ● + + + 213, 20 + + + 3 + + + passwordTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 5 + + + Top, Left, Right + + + meshcentral.com + + + 241, 110 + + + 213, 21 + + + 1 + + + serverNameComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 6 + + + Top, Left, Right + + + 241, 151 + + + 213, 20 + + + 2 + + + userNameTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 7 + + + Bottom, Right + + + True + + + 307, 260 + + + 171, 13 + + + 12 + + + Open Source, Apache 2.0 License + + + TopRight + + + licenseLinkLabel + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 8 + + + Bottom, Left + + + True + + + 3, 260 + + + 37, 13 + + + 11 + + + v0.8.0 + + + versionLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 9 + + + Bottom, Right + + + 391, 285 + + + 75, 23 + + + 4 + + + Login + + + nextButton1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 10 + + + Bottom, Left, Right + + + 0, 276 + + + 478, 40 + + + StretchImage + + + 10 + + + pictureBox3 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 11 + + + Top, Left, Right + + + 12, 9 + + + 454, 29 + + + 6 + + + MeshCentral Router allows mapping of TCP and UDP ports on this computer to any computer in your MeshCentral server account. Start by logging into your account. + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 12 + + + Top, Bottom, Left, Right + + + 15, 68 + + + 202, 170 + + + CenterImage + + + 7 + + + pictureBox2 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 13 + + + Fill + + + 3, 3 + + + 478, 316 + + + 6 + + + panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage1 + + + 0 + + + 4, 25 + + + 3, 3, 3, 3 + + + 484, 322 + + + 0 + + + Login + + + tabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + 0 + + + 322, 177 + + + 75, 23 + + + 22 + + + SMS + + + False + + + smsTokenButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 0 + + + True + + + 238, 182 + + + 55, 13 + + + 21 + + + Email sent + + + False + + + tokenEmailSentLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 1 + + + 241, 177 + + + 75, 23 + + + 20 + + + Email + + + False + + + emailTokenButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 2 + + + True + + + 238, 135 + + + 38, 13 + + + 19 + + + Token + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 3 + + + Top, Left, Right + + + 241, 151 + + + 213, 20 + + + 18 + + + tokenTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 4 + + + Top, Bottom, Left, Right + + + 15, 68 + + + 202, 170 + + + CenterImage + + + 15 + + + pictureBox6 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 5 + + + Bottom, Right + + + 310, 285 + + + 75, 23 + + + 13 + + + Back + + + backButton2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 6 + + + Bottom, Right + + + 391, 285 + + + 75, 23 + + + 14 + + + Next + + + nextButton2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 7 + + + Bottom, Left, Right + + + 0, 276 + + + 478, 40 + + + StretchImage + + + 10 + + + pictureBox4 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 8 + + + Top, Left, Right + + + 12, 9 + + + 454, 32 + + + 6 + + + Enter the second factor authentication token. + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 9 + + + Fill + + + 3, 3 + + + 478, 316 + + + 7 + + + panel2 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage2 + + + 0 + + + 4, 25 + + + 3, 3, 3, 3 + + + 484, 322 + + + 1 + + + Token + + + tabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + 1 + + + Top, Bottom, Left, Right + + + 15, 82 + + + True + + + Vertical + + + 451, 162 + + + 25 + + + certDetailsTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel3 + + + 0 + + + Bottom, Left + + + 14, 251 + + + 153, 23 + + + 24 + + + View Certificate Details... + + + certDetailsButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel3 + + + 1 + + + Top, Left, Right + + + Microsoft Sans Serif, 12pt, style=Bold + + + 8, 6 + + + 468, 22 + + + 23 + + + WARNING - Invalid Server Certificate + + + MiddleCenter + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel3 + + + 2 + + + Top, Left, Right + + + 12, 34 + + + 454, 45 + + + 22 + This server presented a un-trusted certificate. This may indicate that this is not the correct server or that the server does not have a valid certificate. It is not recommanded, but you can press the ignore button to continue connection to this server. + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel3 + + + 3 + + + Bottom, Right + + + 316, 291 + + + 75, 23 + + + 20 + + + Back + + + backButton3 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel3 + + + 4 + + + Bottom, Right + + + 397, 291 + + + 75, 23 + + + 21 + + + Ignore + + + nextButton3 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel3 + + + 5 + + + Bottom, Left, Right + + + 0, 282 + + + 484, 40 + + + StretchImage + + + 10 + + + pictureBox5 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel3 + + + 6 + + + Fill + + + 0, 0 + + + 484, 322 + + + 8 + + + panel3 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 0 + + + 4, 25 + + + 484, 322 + + + 2 + + + Certificate + + + tabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + 2 + + + Top, Right + + + True + 613, 17 - + + 185, 22 + + + Show &Group Names + + + 185, 22 + + + Show &Offline Devices + + + 182, 6 + + + 185, 22 + + + Sort by &Name + + + 185, 22 + + + Sort by G&roup + + + 186, 98 + + + mainContextMenuStrip + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Microsoft Sans Serif, 15.75pt, style=Bold + + + 454, 2 + + + 25, 25 + + + 6 + + + ≡ + + + menuLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel4 + + + 0 + + + Top, Right + + + 306, 5 + + + 146, 20 + + + 9 + + + searchTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel4 + + + 1 + + + Top, Bottom, Left, Right + + + FlatButtons + + + Top, Bottom, Left, Right + + + True + + + Top, Left, Right + + + Arial, 8.25pt, style=Bold + + + 91, 96 + + + 283, 17 + + + 5 + + + No Search Results + + + MiddleCenter + + + False + + + noSearchResultsLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + devicesPanel + + + 0 + + + Top, Left, Right + + + Arial, 8.25pt, style=Bold + + + 91, 97 + + + 283, 17 + + + 4 + + + No Devices + + + MiddleCenter + + + noDevicesLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + devicesPanel + + + 1 + + + 0, 0 + + + 470, 244 + + + 50 + + + devicesPanel + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + devicesTabPage + + + 0 + + + 4, 25 + + + 3, 3, 3, 3 + + + 470, 244 + + + 0 + + + Devices + + + devicesTabPage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + devicesTabControl + + + 0 + + + Top, Bottom, Left, Right + + + True + + + Top, Left, Right + + + Arial, 8.25pt, style=Bold + + + 91, 79 + + + 283, 52 + + + 4 + + + No Port Mappings + +Click "Add" to get started. + + + MiddleCenter + + + noMapLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mapPanel + + + 0 + + + 0, 0 + + + 470, 214 + + + 49 + + + mapPanel + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + portMapTabPage + + + 0 + + + Bottom, Left + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -141,6 +1444,30 @@ +weFjgeDvNsCGAAAAABJRU5ErkJggg== + + 1, 220 + + + 20, 20 + + + 54 + + + settingsPictureBox + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + portMapTabPage + + + 1 + + + Bottom, Right + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -157,6 +1484,396 @@ RncTzRV6H30abpmOBnUzakAfGPsPoCH77EfzJ24AAAAASUVORK5CYII= + + 238, 220 + + + 20, 20 + + + 5 + + + helpPictureBox + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + portMapTabPage + + + 2 + + + Bottom, Right + + + False + + + 370, 218 + + + 100, 23 + + + 50 + + + Add Map... + + + addButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + portMapTabPage + + + 3 + + + Bottom, Right + + + False + + + 264, 218 + + + 100, 23 + + + 52 + + + Add Relay Map... + + + addRelayButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + portMapTabPage + + + 4 + + + 4, 25 + + + 3, 3, 3, 3 + + + 470, 244 + + + 1 + + + Mappings + + + portMapTabPage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + devicesTabControl + + + 1 + + + 3, 3 + + + 478, 273 + + + 55 + + + devicesTabControl + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel4 + + + 2 + + + Bottom, Left + + + 15, 291 + + + 109, 23 + + + 53 + + + Open Web Site + + + False + + + openWebSiteButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel4 + + + 3 + + + Bottom, Right + + + 316, 291 + + + 75, 23 + + + 35 + + + Log out + + + backButton5 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel4 + + + 4 + + + Bottom, Right + + + 397, 291 + + + 75, 23 + + + 36 + + + Close + + + nextButton5 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel4 + + + 5 + + + Bottom, Left, Right + + + 0, 282 + + + 484, 40 + + + StretchImage + + + 10 + + + pictureBox7 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel4 + + + 6 + + + Fill + + + 0, 0 + + + 484, 322 + + + 8 + + + panel4 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage5 + + + 0 + + + 4, 25 + + + 484, 322 + + + 4 + + + Mappings + + + tabPage5 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + 3 + + + Fill + + + 0, 0 + + + 0, 0, 0, 0 + + + 492, 351 + + + 8 + + + False + + + mainTabControl + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainPanel + + + 0 + + + Fill + + + 0, 65 + + + 492, 351 + + + 9 + + + mainPanel + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel5 + + + 0 + + + Top + + + 0, 0 + + + 492, 65 + + + 2 + + + pictureBox1 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel5 + + + 1 + + + Fill + + + 0, 0 + + + 492, 416 + + + 8 + + + panel5 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + 17, 17 @@ -169,6 +1886,30 @@ 418, 17 + + 112, 22 + + + &Open... + + + 109, 6 + + + 112, 22 + + + E&xit + + + 113, 54 + + + trayIconContextMenuStrip + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + AAABAA0AMDAQAAEABABoBgAA1gAAACAgEAABAAQA6AIAAD4HAAAYGBAAAQAEAOgBAAAmCgAAEBAQAAEA @@ -1863,9 +3604,21 @@ AADAPwAAwD8AAMA/AADAPwAA + + MeshCentral Router + 791, 17 + + True + + + 6, 13 + + + 492, 416 + AAABAA0AMDAQAAEABABoBgAA1gAAACAgEAABAAQA6AIAAD4HAAAYGBAAAQAEAOgBAAAmCgAAEBAQAAEA @@ -3560,4 +5313,85 @@ AADAPwAAwD8AAMA/AADAPwAA + + MeshCentral Router + + + showGroupNamesToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + showOfflineDevicesToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolStripMenuItem2 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + sortByNameToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + sortByGroupToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + stateClearTimer + + + System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + cookieRefreshTimer + + + System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + notifyIcon + + + System.Windows.Forms.NotifyIcon, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + openToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolStripMenuItem1 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + exitToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + installTimer + + + System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MainForm + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/MapUserControl.Designer.cs b/MapUserControl.Designer.cs index 46fadd1..b925c41 100644 --- a/MapUserControl.Designer.cs +++ b/MapUserControl.Designer.cs @@ -42,52 +42,31 @@ // devicePictureBox // this.devicePictureBox.Image = global::MeshCentralRouter.Properties.Resources.icons01; - this.devicePictureBox.Location = new System.Drawing.Point(6, 3); + resources.ApplyResources(this.devicePictureBox, "devicePictureBox"); this.devicePictureBox.Name = "devicePictureBox"; - this.devicePictureBox.Size = new System.Drawing.Size(50, 50); - this.devicePictureBox.TabIndex = 0; this.devicePictureBox.TabStop = false; // // deviceNameLabel // - this.deviceNameLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.deviceNameLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.deviceNameLabel.Location = new System.Drawing.Point(62, 12); + resources.ApplyResources(this.deviceNameLabel, "deviceNameLabel"); this.deviceNameLabel.Name = "deviceNameLabel"; - this.deviceNameLabel.Size = new System.Drawing.Size(290, 15); - this.deviceNameLabel.TabIndex = 1; - this.deviceNameLabel.Text = "ComputerName"; // // routingStatusLabel // - this.routingStatusLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.routingStatusLabel.Location = new System.Drawing.Point(62, 32); + resources.ApplyResources(this.routingStatusLabel, "routingStatusLabel"); this.routingStatusLabel.Name = "routingStatusLabel"; - this.routingStatusLabel.Size = new System.Drawing.Size(290, 15); - this.routingStatusLabel.TabIndex = 2; - this.routingStatusLabel.Text = "Routing Status"; // // appButton // - this.appButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.appButton.Location = new System.Drawing.Point(358, 6); + resources.ApplyResources(this.appButton, "appButton"); this.appButton.Name = "appButton"; - this.appButton.Size = new System.Drawing.Size(75, 23); - this.appButton.TabIndex = 3; - this.appButton.Text = "Open..."; this.appButton.UseVisualStyleBackColor = true; this.appButton.Click += new System.EventHandler(this.appButton_Click); // // closeButton // - this.closeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.closeButton.Location = new System.Drawing.Point(358, 30); + resources.ApplyResources(this.closeButton, "closeButton"); this.closeButton.Name = "closeButton"; - this.closeButton.Size = new System.Drawing.Size(75, 23); - this.closeButton.TabIndex = 4; - this.closeButton.Text = "Remove"; this.closeButton.UseVisualStyleBackColor = true; this.closeButton.Click += new System.EventHandler(this.closeButton_Click); // @@ -106,7 +85,7 @@ // // MapUserControl // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ControlLight; this.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; @@ -116,7 +95,6 @@ this.Controls.Add(this.deviceNameLabel); this.Controls.Add(this.devicePictureBox); this.Name = "MapUserControl"; - this.Size = new System.Drawing.Size(441, 60); ((System.ComponentModel.ISupportInitialize)(this.devicePictureBox)).EndInit(); this.ResumeLayout(false); diff --git a/MapUserControl.cs b/MapUserControl.cs index 2311a52..c6fba1f 100644 --- a/MapUserControl.cs +++ b/MapUserControl.cs @@ -50,7 +50,7 @@ namespace MeshCentralRouter public void Start() { - routingStatusLabel.Text = "Starting..."; + routingStatusLabel.Text = Properties.Resources.Starting; appButton.Enabled = (appId != 0); mapper = new MeshMapper(); mapper.xdebug = xdebug; @@ -71,7 +71,7 @@ namespace MeshCentralRouter public void Stop() { - routingStatusLabel.Text = "Stopped."; + routingStatusLabel.Text = Properties.Resources.Stopped; appButton.Enabled = false; mapper.onStateMsgChanged -= Mapper_onStateMsgChanged; mapper.stop(); @@ -127,7 +127,7 @@ namespace MeshCentralRouter using (AppLaunchForm f = new AppLaunchForm()) { System.Diagnostics.Process proc = null; - f.SetAppName("PuTTY SSH client"); + f.SetAppName(Properties.Resources.PuttyAppName); f.SetAppLink("http://www.chiark.greenend.org.uk/~sgtatham/putty/"); f.SetAppPath(loadFromRegistry("PuttyPath")); if (f.ShowDialog(this) == DialogResult.OK) @@ -145,7 +145,7 @@ namespace MeshCentralRouter using (AppLaunchForm f = new AppLaunchForm()) { System.Diagnostics.Process proc = null; - f.SetAppName("WinSCP client"); + f.SetAppName(Properties.Resources.WinscpAppName); f.SetAppLink("http://winscp.net/"); f.SetAppPath(loadFromRegistry("WinSCPPath")); if (f.ShowDialog(this) == DialogResult.OK) diff --git a/MapUserControl.resx b/MapUserControl.resx index 6444347..99adfad 100644 --- a/MapUserControl.resx +++ b/MapUserControl.resx @@ -117,6 +117,141 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 6, 3 + + + 50, 50 + + + + 0 + + + devicePictureBox + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + + Top, Left, Right + + + Microsoft Sans Serif, 8.25pt, style=Bold + + + 62, 12 + + + 290, 15 + + + 1 + + + ComputerName + + + deviceNameLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Top, Left, Right + + + 62, 32 + + + 290, 15 + + + 2 + + + Routing Status + + + routingStatusLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Top, Right + + + 358, 6 + + + 75, 23 + + + 3 + + + Open... + + + appButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Top, Right + + + 358, 30 + + + 75, 23 + + + 4 + + + Remove + + + closeButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + 17, 17 @@ -125,7 +260,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAy - mgAAAk1TRnQBSQFMAgEBCAEAASABAAEgAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI + mgAAAk1TRnQBSQFMAgEBCAEAASgBAAEoAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI AwABlgMAAQEBAAEQBQABYAHq/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A @@ -785,4 +920,25 @@ Df8B/AMAAT8H/wMADf8B/AMAAT8H/wMADf8B/gMACP8DAA7/AgABDwj/AwAO/wH8AT8J/wMAGf8DAAs= + + True + + + 6, 13 + + + 441, 60 + + + deviceImageList + + + System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MapUserControl + + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/MappingHelpForm.Designer.cs b/MappingHelpForm.Designer.cs index 4c92507..9a8a14b 100644 --- a/MappingHelpForm.Designer.cs +++ b/MappingHelpForm.Designer.cs @@ -35,26 +35,20 @@ // // helpPictureBox // - this.helpPictureBox.Dock = System.Windows.Forms.DockStyle.Fill; + resources.ApplyResources(this.helpPictureBox, "helpPictureBox"); this.helpPictureBox.Image = global::MeshCentralRouter.Properties.Resources.HelpRelayMap; - this.helpPictureBox.Location = new System.Drawing.Point(0, 0); this.helpPictureBox.Name = "helpPictureBox"; - this.helpPictureBox.Size = new System.Drawing.Size(325, 435); - this.helpPictureBox.TabIndex = 0; this.helpPictureBox.TabStop = false; // // MappingHelpForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(325, 435); this.Controls.Add(this.helpPictureBox); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "MappingHelpForm"; - this.Text = "Port Mapping Help"; ((System.ComponentModel.ISupportInitialize)(this.helpPictureBox)).EndInit(); this.ResumeLayout(false); diff --git a/MappingHelpForm.resx b/MappingHelpForm.resx index b93e49a..d41361e 100644 --- a/MappingHelpForm.resx +++ b/MappingHelpForm.resx @@ -117,7 +117,42 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + 0, 0 + + + 325, 435 + + + + 0 + + + helpPictureBox + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 325, 435 + AAABAA0AMDAQAAEABABoBgAA1gAAACAgEAABAAQA6AIAAD4HAAAYGBAAAQAEAOgBAAAmCgAAEBAQAAEA @@ -1812,4 +1847,13 @@ AADAPwAAwD8AAMA/AADAPwAA + + Port Mapping Help + + + MappingHelpForm + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/MeshMapper.cs b/MeshMapper.cs index dec275d..b0cb910 100644 --- a/MeshMapper.cs +++ b/MeshMapper.cs @@ -117,8 +117,8 @@ namespace MeshCentralRouter private void UpdateInfo() { string msg = ""; - if (state == -1) { msg = "Unable to bind to local port"; } - else if (state == 0) { msg = "Stopped"; } + if (state == -1) { msg = Properties.Resources.UnableToBindToLocalPort; } + else if (state == 0) { msg = Properties.Resources.Stopped2; } else if (state == 1) { if (remoteip == null) { @@ -126,8 +126,8 @@ namespace MeshCentralRouter } else { msg = "Port " + localport + " to " + remoteip + ":" + remoteport; } - if (totalConnectCounter == 1) { msg += ", 1 connection."; } - if (totalConnectCounter > 1) { msg += ", " + totalConnectCounter + " connections."; } + if (totalConnectCounter == 1) { msg += Properties.Resources.OneConnection; } + if (totalConnectCounter > 1) { msg += string.Format(Properties.Resources.ManyConnections, totalConnectCounter); } } if (onStateMsgChanged != null) { onStateMsgChanged(msg); } } @@ -400,7 +400,7 @@ namespace MeshCentralRouter catch (Exception ex) { // Disconnect - MessageBox.Show(ex.Message, "MeshRouter"); + MessageBox.Show(ex.Message, Properties.Resources.MeshCentralRouter); parent.Debug("#" + counter + ": Websocket TLS failed: " + ex.ToString()); parent.ShutdownClients(client, uclient, this, this.counter); return; diff --git a/Program.cs b/Program.cs index b81b4a5..e51b5ef 100644 --- a/Program.cs +++ b/Program.cs @@ -31,8 +31,21 @@ namespace MeshCentralRouter Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Properties.Settings.Default.Upgrade(); - MainForm main = new MainForm(args); - if (main.forceExit == false) { Application.Run(main); } + + foreach (string arg in args) + { + if (arg.Length > 3 && string.Compare(arg.Substring(0, 3), "-l:", true) == 0) { try { System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(arg.Substring(3)); } catch (ArgumentException) { } } + } + + MainForm main; + System.Globalization.CultureInfo currentCulture; + do + { + currentCulture = System.Threading.Thread.CurrentThread.CurrentUICulture; + main = new MainForm(args); + if (main.forceExit == false) { Application.Run(main); } + } + while (currentCulture.Equals(System.Threading.Thread.CurrentThread.CurrentUICulture) == false); } } diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 1602966..20452ff 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -61,29 +61,20 @@ namespace MeshCentralRouter.Properties { } /// - /// Looks up a localized string similar to Confirm Delete. + /// Looks up a localized string similar to Email verification required. /// - internal static string CertMgrForm_Del { + internal static string EmailVerificationRequired { get { - return ResourceManager.GetString("CertMgrForm_Del", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Delete Selected Certificate?. - /// - internal static string CertMgrForm_DelStr { - get { - return ResourceManager.GetString("CertMgrForm_DelStr", resourceCulture); + return ResourceManager.GetString("EmailVerificationRequired", resourceCulture); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Empty_Banner { + internal static System.Drawing.Bitmap EmptyBanner { get { - object obj = ResourceManager.GetObject("Empty-Banner", resourceCulture); + object obj = ResourceManager.GetObject("EmptyBanner", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -138,12 +129,48 @@ namespace MeshCentralRouter.Properties { } } + /// + /// Looks up a localized string similar to Invalid username or password. + /// + internal static string InvalidUsernameOrPassword { + get { + return ResourceManager.GetString("InvalidUsernameOrPassword", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Changing language will close this tool. Are you sure?. + /// + internal static string LanguagesChanging { + get { + return ResourceManager.GetString("LanguagesChanging", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Languages. + /// + internal static string LanguagesTitle { + get { + return ResourceManager.GetString("LanguagesTitle", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to , {0} connections.. + /// + internal static string ManyConnections { + get { + return ResourceManager.GetString("ManyConnections", resourceCulture); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap MC2_Banner { + internal static System.Drawing.Bitmap MC2Banner { get { - object obj = ResourceManager.GetObject("MC2-Banner", resourceCulture); + object obj = ResourceManager.GetObject("MC2Banner", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -151,9 +178,9 @@ namespace MeshCentralRouter.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap MC2_Logo { + internal static System.Drawing.Bitmap MC2Logo { get { - object obj = ResourceManager.GetObject("MC2-Logo", resourceCulture); + object obj = ResourceManager.GetObject("MC2Logo", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -168,6 +195,24 @@ namespace MeshCentralRouter.Properties { } } + /// + /// Looks up a localized string similar to MeshCentral Router. + /// + internal static string MeshCentralRouter { + get { + return ResourceManager.GetString("MeshCentralRouter", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MeshCentral. + /// + internal static string MeshCentralTitle { + get { + return ResourceManager.GetString("MeshCentralTitle", resourceCulture); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -189,20 +234,110 @@ namespace MeshCentralRouter.Properties { } /// - /// Looks up a localized string similar to Cert Import. + /// Looks up a localized string similar to , 1 connection.. /// - internal static string MsgBox_Import_Cert { + internal static string OneConnection { get { - return ResourceManager.GetString("MsgBox_Import_Cert", resourceCulture); + return ResourceManager.GetString("OneConnection", resourceCulture); } } /// - /// Looks up a localized string similar to Incorrect file or password. + /// Looks up a localized string similar to PuTTY SSH client. /// - internal static string MsgBox_Import_Error { + internal static string PuttyAppName { get { - return ResourceManager.GetString("MsgBox_Import_Error", resourceCulture); + return ResourceManager.GetString("PuttyAppName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Search. + /// + internal static string SearchPlaceHolder { + get { + return ResourceManager.GetString("SearchPlaceHolder", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Send token to registered email address?. + /// + internal static string SendTokenEmail { + get { + return ResourceManager.GetString("SendTokenEmail", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Send token to registered phone number?. + /// + internal static string SendTokenSMS { + get { + return ResourceManager.GetString("SendTokenSMS", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Starting.... + /// + internal static string Starting { + get { + return ResourceManager.GetString("Starting", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stopped.. + /// + internal static string Stopped { + get { + return ResourceManager.GetString("Stopped", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stopped. + /// + internal static string Stopped2 { + get { + return ResourceManager.GetString("Stopped2", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Two-factor Authentication. + /// + internal static string TwoFactorAuthentication { + get { + return ResourceManager.GetString("TwoFactorAuthentication", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unable to bind to local port. + /// + internal static string UnableToBindToLocalPort { + get { + return ResourceManager.GetString("UnableToBindToLocalPort", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unable to connect. + /// + internal static string UnableToConnect { + get { + return ResourceManager.GetString("UnableToConnect", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WinSCP client. + /// + internal static string WinscpAppName { + get { + return ResourceManager.GetString("WinscpAppName", resourceCulture); } } } diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 6402ab0..418f3aa 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -121,7 +121,7 @@ ../Resources/MeshIcon50T.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ../Resources/Empty-Banner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -130,21 +130,12 @@ ../Resources/Folder36.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ../Resources/MC2-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ../Resources/Help20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Confirm Delete - - - Incorrect file or password - - - Delete Selected Certificate? - ../Resources/icons01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -154,13 +145,67 @@ ../Resources/HelpRelayMap.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Cert Import - - + ../Resources/MC2-Banner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\install.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Changing language will close this tool. Are you sure? + + + Languages + + + Search + + + Email verification required + + + Invalid username or password + + + Send token to registered email address? + + + Send token to registered phone number? + + + Two-factor Authentication + + + Unable to connect + + + , {0} connections. + + + MeshCentral Router + + + MeshCentral + + + , 1 connection. + + + PuTTY SSH client + + + Starting... + + + Stopped. + + + Stopped + + + Unable to bind to local port + + + WinSCP client + \ No newline at end of file diff --git a/ServerUserControl.Designer.cs b/ServerUserControl.Designer.cs index 0b15499..9b58789 100644 --- a/ServerUserControl.Designer.cs +++ b/ServerUserControl.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServerUserControl)); this.serverInfoLabel = new System.Windows.Forms.Label(); this.serverNameLabel = new System.Windows.Forms.Label(); this.serverPictureBox = new System.Windows.Forms.PictureBox(); @@ -41,36 +42,21 @@ // // serverInfoLabel // - this.serverInfoLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.serverInfoLabel.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.serverInfoLabel.Location = new System.Drawing.Point(65, 30); + resources.ApplyResources(this.serverInfoLabel, "serverInfoLabel"); this.serverInfoLabel.Name = "serverInfoLabel"; - this.serverInfoLabel.Size = new System.Drawing.Size(420, 18); - this.serverInfoLabel.TabIndex = 11; - this.serverInfoLabel.Text = "Server information"; this.serverInfoLabel.Click += new System.EventHandler(this.serverButton_Click); // // serverNameLabel // - this.serverNameLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.serverNameLabel.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.serverNameLabel.Location = new System.Drawing.Point(65, 10); + resources.ApplyResources(this.serverNameLabel, "serverNameLabel"); this.serverNameLabel.Name = "serverNameLabel"; - this.serverNameLabel.Size = new System.Drawing.Size(420, 18); - this.serverNameLabel.TabIndex = 10; - this.serverNameLabel.Text = "ServerName"; this.serverNameLabel.Click += new System.EventHandler(this.serverButton_Click); // // serverPictureBox // this.serverPictureBox.Image = global::MeshCentralRouter.Properties.Resources.MeshCentral; - this.serverPictureBox.Location = new System.Drawing.Point(0, 0); + resources.ApplyResources(this.serverPictureBox, "serverPictureBox"); this.serverPictureBox.Name = "serverPictureBox"; - this.serverPictureBox.Size = new System.Drawing.Size(59, 59); - this.serverPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.serverPictureBox.TabIndex = 9; this.serverPictureBox.TabStop = false; this.serverPictureBox.Click += new System.EventHandler(this.serverButton_Click); // @@ -79,13 +65,12 @@ this.serverContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.infoToolStripMenuItem}); this.serverContextMenuStrip.Name = "serverContextMenuStrip"; - this.serverContextMenuStrip.Size = new System.Drawing.Size(153, 48); + resources.ApplyResources(this.serverContextMenuStrip, "serverContextMenuStrip"); // // infoToolStripMenuItem // this.infoToolStripMenuItem.Name = "infoToolStripMenuItem"; - this.infoToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.infoToolStripMenuItem.Text = "&Info..."; + resources.ApplyResources(this.infoToolStripMenuItem, "infoToolStripMenuItem"); this.infoToolStripMenuItem.Click += new System.EventHandler(this.infoToolStripMenuItem_Click); // // backTimer @@ -95,7 +80,7 @@ // // ServerUserControl // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -105,7 +90,6 @@ this.Controls.Add(this.serverPictureBox); this.Cursor = System.Windows.Forms.Cursors.Hand; this.Name = "ServerUserControl"; - this.Size = new System.Drawing.Size(485, 57); this.Load += new System.EventHandler(this.ServerUserControl_Load); this.Click += new System.EventHandler(this.serverButton_Click); ((System.ComponentModel.ISupportInitialize)(this.serverPictureBox)).EndInit(); diff --git a/ServerUserControl.cs b/ServerUserControl.cs index b6dbded..3bd864c 100644 --- a/ServerUserControl.cs +++ b/ServerUserControl.cs @@ -46,7 +46,7 @@ namespace MeshCentralRouter // Fix the name if (name == null) { name = this.name; } - if (name == null) { name = "MeshCentral"; } + if (name == null) { name = Properties.Resources.MeshCentralTitle; } // Don't replace a IPv4 address with a IPv6 one, or remove information if ((this.url.IndexOf("://[") == -1) && (url.IndexOf("://[") >= 0)) return false; diff --git a/ServerUserControl.resx b/ServerUserControl.resx index 01ae572..5d4df6a 100644 --- a/ServerUserControl.resx +++ b/ServerUserControl.resx @@ -117,10 +117,139 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Top, Left, Right + + + + Arial, 9pt + + + 65, 30 + + + 420, 18 + + + + 11 + + + Server information + + + serverInfoLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Top, Left, Right + + + Arial, 11.25pt, style=Bold + + + 65, 10 + + + 420, 18 + + + 10 + + + ServerName + + + serverNameLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + 0, 0 + + + 59, 59 + + + StretchImage + + + 9 + + + serverPictureBox + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + 17, 17 + + 104, 22 + + + &Info... + + + 105, 26 + + + serverContextMenuStrip + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 200, 17 + + True + + + 6, 13 + + + 485, 57 + + + infoToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + backTimer + + + System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ServerUserControl + + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/altPortForm.Designer.cs b/altPortForm.Designer.cs index 2b3ac0f..42e1d89 100644 --- a/altPortForm.Designer.cs +++ b/altPortForm.Designer.cs @@ -40,55 +40,35 @@ // // cancelButton // - this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.cancelButton, "cancelButton"); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(212, 66); this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 0; - this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); // // okButton // - this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.okButton.Location = new System.Drawing.Point(131, 66); + resources.ApplyResources(this.okButton, "okButton"); this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(75, 23); - this.okButton.TabIndex = 1; - this.okButton.Text = "OK"; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // // groupBox1 // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.portNumericUpDown); - this.groupBox1.Location = new System.Drawing.Point(12, 12); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(275, 48); - this.groupBox1.TabIndex = 3; this.groupBox1.TabStop = false; - this.groupBox1.Text = "Connection"; // // label2 // - this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.label2.Location = new System.Drawing.Point(6, 21); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(137, 18); - this.label2.TabIndex = 3; - this.label2.Text = "Alternative Port"; // // portNumericUpDown // - this.portNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.portNumericUpDown.Location = new System.Drawing.Point(149, 19); + resources.ApplyResources(this.portNumericUpDown, "portNumericUpDown"); this.portNumericUpDown.Maximum = new decimal(new int[] { 65535, 0, @@ -100,8 +80,6 @@ 0, 0}); this.portNumericUpDown.Name = "portNumericUpDown"; - this.portNumericUpDown.Size = new System.Drawing.Size(120, 20); - this.portNumericUpDown.TabIndex = 0; this.portNumericUpDown.Value = new decimal(new int[] { 3389, 0, @@ -113,20 +91,16 @@ // altPortForm // this.AcceptButton = this.okButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(299, 101); this.Controls.Add(this.groupBox1); this.Controls.Add(this.okButton); this.Controls.Add(this.cancelButton); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "altPortForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Alternative Port"; this.groupBox1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.portNumericUpDown)).EndInit(); this.ResumeLayout(false); diff --git a/altPortForm.resx b/altPortForm.resx index b93e49a..1e82b95 100644 --- a/altPortForm.resx +++ b/altPortForm.resx @@ -117,7 +117,150 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bottom, Right + + + 212, 66 + + + 75, 23 + + + + 0 + + + Cancel + + + cancelButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Bottom, Right + + + 131, 66 + + + 75, 23 + + + 1 + + + OK + + + okButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Top, Bottom, Left, Right + + + Top, Left, Right + + + 6, 21 + + + 137, 18 + + + 3 + + + Alternative Port + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + Top, Right + + + 149, 19 + + + 120, 20 + + + 0 + + + portNumericUpDown + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + 12, 12 + + + 275, 48 + + + 3 + + + Connection + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 299, 101 + AAABAA0AMDAQAAEABABoBgAA1gAAACAgEAABAAQA6AIAAD4HAAAYGBAAAQAEAOgBAAAmCgAAEBAQAAEA @@ -1812,4 +1955,16 @@ AADAPwAAwD8AAMA/AADAPwAA + + CenterParent + + + Alternative Port + + + altPortForm + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file