diff --git a/mRemoteV1/UI/Forms/ExportForm.Designer.cs b/mRemoteV1/UI/Forms/ExportForm.Designer.cs index 6e048a1b..026534c8 100644 --- a/mRemoteV1/UI/Forms/ExportForm.Designer.cs +++ b/mRemoteV1/UI/Forms/ExportForm.Designer.cs @@ -293,7 +293,7 @@ namespace mRemoteNG.UI.Forms this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOK); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = global::mRemoteNG.Resources.Connections_SaveAs_Icon; + this.Icon = global::mRemoteNG.Resources.ConnectionsSaveAs_Icon; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ExportForm"; diff --git a/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.Designer.cs index 4a6a5018..3c365e58 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.Designer.cs @@ -30,7 +30,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages [System.Diagnostics.DebuggerStepThrough()] private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AdvancedPage)); this.chkAutomaticallyGetSessionInfo = new mRemoteNG.UI.Controls.Base.NGCheckBox(); this.lblMaximumPuttyWaitTime = new mRemoteNG.UI.Controls.Base.NGLabel(); this.chkAutomaticReconnect = new mRemoteNG.UI.Controls.Base.NGCheckBox(); @@ -221,8 +220,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.Controls.Add(this.lblSeconds); this.Controls.Add(this.btnBrowseCustomPuttyPath); this.Name = "AdvancedPage"; - this.PageIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PageIcon"))); - this.Size = new System.Drawing.Size(610, 489); + this.Size = new System.Drawing.Size(610, 490); ((System.ComponentModel.ISupportInitialize)(this.numPuttyWaitTime)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numUVNCSCPort)).EndInit(); this.ResumeLayout(false); diff --git a/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.cs b/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.cs index af54298e..a86c89af 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.cs @@ -23,6 +23,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages #region Public Methods + public override Icon PageIcon { get; protected set; } = Resources.Config_Icon; + public override string PageName { get => Language.strTabAdvanced; diff --git a/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.resx b/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.resx index 479cdad2..d58980a3 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.resx +++ b/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.resx @@ -117,29 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsbGxjWFhYv1FRUb9SUlJjAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAb29vKW1tbQ5/f38CgICA6r29vf+ysrL/W1tb6n9/fwJbW1sOUFBQKQAA - AAAAAAAAAAAAAAAAAAAAAAAAgICAm25ubv1kZGTnenp6GYODg+fLy8v/x8fH/2JiYudbW1sZWFhY501N - Tf1ISEibAAAAAAAAAAAAAAAAo6Oje7y8vP/e3t7/pqam/4KCgvSEhIT+xMTE/8LCwv9tbW3+bW1t9Kam - pv/S0tL/gICA/1JSUnsAAAAAAAAAAKurq32lpaX+1dXV/8XFxf/Ly8v/0dHR/8nJyf/Hx8f/zMzM/8XF - xf+9vb3/y8vL/25ubv5lZWV9AAAAAAAAAAAAAAAArKyshcXFxf/BwcH/xcXF/8fHx/+qqqr/p6en/8HB - wf++vr7/tbW1/6qqqv9paWmFAAAAAAAAAACioqLNjo6O45+fn+7Pz8//xsbG/8zMzP+enp7GmZmZRJKS - kkSOjo7GwcHB/7y8vP+5ubn/Y2Nj7ldXV+NTU1PNv7+//eLi4v/S0tL/xsbG/83Nzf+xsbH/kpKSRAAA - AAAAAAAAlpaWRKioqP/CwsL/t7e3/8DAwP/S0tL/YGBg/cPDw/3p6en/1tbW/8nJyf/Ozs7/paWl/4OD - g0QAAAAAAAAAAJmZmUSsrKz/xMTE/7q6uv/Gxsb/3d3d/2pqav3IyMjNw8PD47+/v+7Y2Nj/zc3N/7y8 - vP+CgoLGeHh4RH9/f0SOjo7Gw8PD/8LCwv/Nzc3/jIyM7oaGhuOCgoLNAAAAAAAAAADFxcWF1NTU/8zM - zP/Jycn/urq6/5ycnP+hoaH/wsLC/8bGxv/BwcH/t7e3/4iIiIUAAAAAAAAAAAAAAADJycl9w8PD/tzc - 3P/U1NT/2dnZ/9vb2//W1tb/1NTU/9nZ2f/S0tL/y8vL/8jIyP95eXn+cHBwfQAAAAAAAAAAz8/Pe9zc - 3P/t7e3/29vb/8LCwvS9vb3+1tbW/9TU1P+vr6/+rKys9MvLy//n5+f/t7e3/4qKinsAAAAAAAAAAAAA - AADQ0NCbzc3N/crKyufBwcEZwsLC597e3v/d3d3/sbGx562trRmsrKznp6en/aKiopsAAAAAAAAAAAAA - AAAAAAAAAAAAANPT0ynIyMgO////AsfHx+rl5eX/5OTk/6ysrOp/f38Ctra2Dq6urikAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADLy8tjxsbGv8TExL++vr5jAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/n8AAPw/AADEIwAAwAMAAMADAADAAwAAAYAAAAPAAAADwAAAAYAAAMADAADAAwAAwAMAAMQj - AAD8PwAA/n8AAA== - - \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.Designer.cs index c0e0bb74..ac519b50 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.Designer.cs @@ -124,7 +124,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.Controls.Add(this.chkShowSystemTrayIcon); this.Controls.Add(this.chkMinimizeToSystemTray); this.Name = "AppearancePage"; - this.Size = new System.Drawing.Size(610, 489); + this.Size = new System.Drawing.Size(610, 490); this.ResumeLayout(false); this.PerformLayout(); diff --git a/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.cs b/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.cs index 8cae1d2e..f2810ff8 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.cs @@ -1,4 +1,5 @@ using System; +using System.Drawing; using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.Tools; @@ -11,9 +12,10 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Resources.Panels_Icon; } + public override Icon PageIcon { get; protected set; } = Resources.Panels_Icon; + public override string PageName { get => Language.strTabAppearance; diff --git a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs index 3473b63b..8aaed446 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs @@ -304,7 +304,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.Controls.Add(this.chkSingleClickOnOpenedConnectionSwitchesToIt); this.Controls.Add(this.pnlConfirmCloseConnection); this.Name = "ConnectionsPage"; - this.Size = new System.Drawing.Size(610, 489); + this.Size = new System.Drawing.Size(610, 490); ((System.ComponentModel.ISupportInitialize)(this.numRDPConTimeout)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numRdpReconnectionCount)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numAutoSave)).EndInit(); diff --git a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs index ec872aee..5448f0f8 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs @@ -1,4 +1,5 @@ using System; +using System.Drawing; using mRemoteNG.Config; namespace mRemoteNG.UI.Forms.OptionsPages @@ -11,9 +12,10 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Resources.Root_Icon; } + public override Icon PageIcon { get; protected set; } = Resources.Root_Icon; + public override string PageName { get => Language.strConnections; diff --git a/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.Designer.cs index 0d06f197..3335f080 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CredentialsPage)); this.pnlDefaultCredentials = new System.Windows.Forms.Panel(); this.radCredentialsCustom = new mRemoteNG.UI.Controls.Base.NGRadioButton(); this.lblDefaultCredentials = new mRemoteNG.UI.Controls.Base.NGLabel(); @@ -166,8 +165,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.pnlDefaultCredentials); this.Name = "CredentialsPage"; - this.PageIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PageIcon"))); - this.Size = new System.Drawing.Size(610, 489); + this.Size = new System.Drawing.Size(610, 490); this.pnlDefaultCredentials.ResumeLayout(false); this.pnlDefaultCredentials.PerformLayout(); this.ResumeLayout(false); diff --git a/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.cs index 27b5e608..1c21ee9d 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.cs @@ -1,4 +1,5 @@ using System; +using System.Drawing; using mRemoteNG.App; using mRemoteNG.Security.SymmetricEncryption; @@ -12,6 +13,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages ApplyTheme(); } + public override Icon PageIcon { get; protected set; } = Resources.Key_Icon; + public override string PageName { get => Language.Credentials; set { } diff --git a/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.resx b/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.resx index aefcb085..1af7de15 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.resx +++ b/mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.resx @@ -117,29 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA - AAA+ncp7NpbR5TOQzOsyi8vtO5XCh////wH///8B////Af///wH///8B////Af///wH///8B////Af// - /wH///8BQqzhzcTr9/9/4fb/n+b3/zKKye86kLqR////Af///wH///8B////Af///wH///8B////Af// - /wH///8B////AUSw4//G9Pv/Q9bx/0jb9f+C4fX/MYjI8TmNt5n///8B////Af///wH///8B////Af// - /wH///8B////Af///wFEsOPzu+/6/znR8f8oxe7/Ttz2/4Xi9/8yi8rvOYu1m////wH///8B////Af// - /wH///8B////Af///wH///8BRLDj//D8/v+w7vr/Q9j0/yjI7v9B1/T/ieL3/zKLy+04iLKj////Af// - /wH///8B////Af///wH///8B////AUSw45dEsOP/RLDj/6vq+f9O2PP/K8nv/z3W8/+K4ff/MorK7zOD - uN0pfdb/LIXY/zaOwcv///8B////Af///wH///8B////AUSw4//x/P7/u/H7/3vk9v8o0vD/N9T1/4Pg - 9v8+qeP/oPP8/6n1/P8rgtf/NYu/z////wH///8B////Af///wFEsOOXRLDj/0Wy4/92xer/rO76/znW - 8v9N2/X/ZeT3/zzO8v8yye//he/7/yuB1/81iLvV////Af///wH///8B////Af///wFEsOMDRLDjl2/E - 6v+A5ff/PdHx/13b9f9p3/b/UNfz/zTN7/+F7/v/KX/W/zSGutn///8B////Af///wH///8B////AUSw - 4//V9/z/ief4/37k9/9+5Pf/fuT3/4Ll9/9H1vL/OM7w/671/P8pfNb/////Af///wH///8B////Af// - /wFEsOP/vvL7/37k9/9+5Pf/geX3/5Tp+P+88fv/i9rz/0nd9f/B+P3/MJDa/////wH///8B////Af// - /wH///8BRLDj/974/P+N5/j/fuT3/5Tp+P+86fj/RLDj/0Ks4//u/P7/Mpjd/zmVyL////8B////Af// - /wH///8B////AUSw45dEsOP/zvX8/43n+P+h7Pn/RLDj/0Sw4///////OaHf/zmVyL////8B////Af// - /wH///8B////Af///wH///8BRLDjl0Sw4//O9fz/nuv5/77y+//+////RLDj/0Kr353///8B////Af// - /wH///8B////Af///wH///8B////Af///wFEsOOXRLDj/974/P/e+Pz/RLDj/0Sw45f///8B////Af// - /wH///8B////Af///wH///8B////Af///wH///8B////AUSw45dEsOP/RLDj/0Sw45f///8B////Af// - /wH///8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA - //8AAP//AAD//w== - - \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.Designer.cs index 1d13b356..b74db4df 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.Designer.cs @@ -30,7 +30,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages //Do not modify it using the code editor. [System.Diagnostics.DebuggerStepThrough()]private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NotificationsPage)); this.labelSwitchToErrorsAndInfos = new mRemoteNG.UI.Controls.Base.NGLabel(); this.chkSwitchToMCInformation = new mRemoteNG.UI.Controls.Base.NGCheckBox(); this.chkSwitchToMCErrors = new mRemoteNG.UI.Controls.Base.NGCheckBox(); @@ -425,8 +424,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.Controls.Add(this.groupBoxLogging); this.Controls.Add(this.groupBoxNotifications); this.Name = "NotificationsPage"; - this.PageIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PageIcon"))); - this.Size = new System.Drawing.Size(610, 489); + this.Size = new System.Drawing.Size(610, 490); this.groupBoxNotifications.ResumeLayout(false); this.groupBoxNotifications.PerformLayout(); this.groupBoxLogging.ResumeLayout(false); diff --git a/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.cs index 34e7d46f..c92af57e 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.cs @@ -1,4 +1,5 @@ using System.Diagnostics; +using System.Drawing; using System.IO; using System.Windows.Forms; using mRemoteNG.App; @@ -13,6 +14,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages ApplyTheme(); } + public override Icon PageIcon { get; protected set; } = Resources.Error_icon; + public override string PageName { get => Language.strMenuNotifications; diff --git a/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.resx b/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.resx index 58e72c62..aab31def 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.resx +++ b/mRemoteV1/UI/Forms/OptionsPages/NotificationsPage.resx @@ -120,29 +120,4 @@ 17, 16 - - - - AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA - AAD///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// - /wH///8BL6rioy2n4P8rpN//KaHd/yee3P8lm9r/I5jZ/yCT1v8bjNP/FoXP/xF+zP8Nd8n/CXHG/wZs - w/8DaMH/AGS/ozGt4+O+4/X/9Pz+/+/7/v/u+/7/7vv+/+/8/v/v/P7/7/v+/+77/v/t+/7/7fv+/+z7 - /v/y/P7/q87r/wNowdk0sOVLYr/o//T8/v+17/r/WNr1/1ja9f9X2PP/WNfy/1jW8v9X2fT/Udj1/07X - 9P9i2vb/6vv+/0ST0v8GbcNL////ATSw5cud1/H/5/n9/4vl+P9a2/b/W9r0/z2h1f89odX/VNby/1LY - 9f9Q1vT/2Pb8/4i/5f8Oecm1////Af///wE2s+YlNLHl+/P7/v/D8vv/XNz2/1za9P9k3/b/V8vr/1XW - 8v9U2fX/lOf4/+P0+/8Xh9D5E4DNJf///wH///8B////ATaz5quM0vD/6vv+/5Tm+P9c2vT/R7Hd/z2h - 1f9W1/L/XNv1/974/f99wOf/HY7Uh////wH///8B////Af///wE4tugNNrTm7cjq9//m+v3/Xdr0/z2h - 1f89odX/V9fy/8fz/P/A4/T/JJnZ5SKW2A3///8B////Af///wH///8B////ATi26FtxyO3/+f7//17c - 9P8+otX/PqLV/1zZ9P/t+/7/aLvl/yac21v///8B////Af///wH///8B////Af///wH///8BOLfo1anf - 9P/t+f3/PqPW/z6j1v/U9fz/otfx/yuj3sP///8B////Af///wH///8B////Af///wH///8B////ATq5 - 6TE4t+j9+f3//5Tp+f+e6/r/7Pr+/y+p4f0tpuAx////Af///wH///8B////Af///wH///8B////Af// - /wH///8BOrnptZTY8v/z/P7/5/r+/4/T8P8xrOOX////Af///wH///8B////Af///wH///8B////Af// - /wH///8B////ATy86xM6uunz8fr9/9Xv+v81subtM6/kE////wH///8B////Af///wH///8B////Af// - /wH///8B////Af///wH///8BPLzrlYXU8f+C0fD/N7Xnaf///wH///8B////Af///wH///8B////Af// - /wH///8B////Af///wH///8B////AT2/7AM8vOvVOrrqwzm46AP///8B////Af///wH///8B////Af// - /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// - /wH///8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA - //8AAP//AAD//w== - - \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.Designer.cs index 796e82e7..b073e913 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SecurityPage)); this.chkEncryptCompleteFile = new mRemoteNG.UI.Controls.Base.NGCheckBox(); this.comboBoxEncryptionEngine = new mRemoteNG.UI.Controls.Base.NGComboBox(); this.labelEncryptionEngine = new mRemoteNG.UI.Controls.Base.NGLabel(); @@ -150,8 +149,7 @@ this.Controls.Add(this.chkEncryptCompleteFile); this.Controls.Add(this.groupAdvancedSecurityOptions); this.Name = "SecurityPage"; - this.PageIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PageIcon"))); - this.Size = new System.Drawing.Size(610, 489); + this.Size = new System.Drawing.Size(610, 490); this.groupAdvancedSecurityOptions.ResumeLayout(false); this.groupAdvancedSecurityOptions.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.numberBoxKdfIterations)).EndInit(); diff --git a/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.cs b/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.cs index b5e2c57e..e50aee15 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel; +using System.Drawing; using mRemoteNG.Security; namespace mRemoteNG.UI.Forms.OptionsPages @@ -14,6 +15,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages ApplyTheme(); } + public override Icon PageIcon { get; protected set; } = Resources.Shield_Icon; + [Browsable(false)] public override string PageName { diff --git a/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.resx b/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.resx index cd23a7ef..1af7de15 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.resx +++ b/mRemoteV1/UI/Forms/OptionsPages/SecurityPage.resx @@ -117,29 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIZXXEh2P1JMZidIJAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnntsXJZvahDCf3P9wxen/HpDV3RqK0jsAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAro94qOajg/4LO7v/M+Pz/1P///5HZ8f9Fqt7/GovSTgAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAuqOEUOazi/5DT8P/e/P7/r/7//2/+///R/P7/mdvz/1Gv - 4f8bjNNUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMKvi/4HO7v/X9fz/hOn5/4v6/v96/P7/Wen5/7/v - +/+Z1/L/OaHc/xuN0ygAAAAAAAAAAAAAAAAAAAAAM7Dlj3fL7f/Y9Pz/hN72/3ng9/+Q9Pz/hfj9/1Xd - 9v86yfD/xO36/33H6/8gk9bTAAAAAAAAAAAAAAAAAAAAADWy5v/W9Pv/oOX4/3LZ9f943Pb/lfD7/4v0 - /P9W1/T/P8jw/zjC7//D7Pr/NKHd/yGU1xwAAAAAAAAAAAAAAAA3tef/3fb9/33c9v942/X/e932/5vu - +/+U8vz/W9b0/0XJ8f84w+//xe36/0Go4P8jmNktAAAAAAAAAAAAAAAAOLfo/9/3/f+D3/f/ftz2/4He - 9/+j7vv/nvL8/2LW9f9KzPL/P8bw/8fu+/9AquD/JZvaKAAAAAAAAAAAAAAAADq66f/g+P3/ieH3/4Tf - 9/+I4Pf/rO77/6fx/P9p1/T/Us3y/0bI8P/I7vv/Q63i/yee3CoAAAAAAAAAAAAAAAA7vOr/4vj9/4/k - +P+K4ff/kOL3/+b3/f/r+f7/cdr1/1rQ8/9NzPH/y+/7/zWo4P8pod0RAAAAAAAAAAA+v+wNRsHs/+T5 - /f/i+P3/1fX8/6/q+f/o+P3/7Pn+/4nh9/+16vr/0PH7/83w+/9Xuuf/K6PeRQAAAAAAAAAAP8Ht/4zb - 9P9hyvD/dtHy/6Xh9v/n+f7/8/z+//H8/v/g9/3/puD1/3TK7f9NuOf/jdTw/y2m4P8AAAAAAAAAAEDD - 7v8/we3/PsDsNj2+7Fg8vOufO7vq/4jV8v+H1PH/NrTn/zWy5rIzsOVpMq7kLzCr4vUvqeH/AAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA7u+rVObnp/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/38AAPw/AAD4HwAA8A8AAOAHAADAAwAAwAMAAMADAADAAwAAwAMAAMADAADAAwAAgAEAAJgZ - AAD+fwAA//8AAA== - - \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.Designer.cs index bfc4c758..ebe3b467 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.Designer.cs @@ -27,220 +27,218 @@ namespace mRemoteNG.UI.Forms.OptionsPages //Do not modify it using the code editor. [System.Diagnostics.DebuggerStepThrough()]private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SqlServerPage)); - this.lblSQLDatabaseName = new mRemoteNG.UI.Controls.Base.NGLabel(); - this.txtSQLDatabaseName = new mRemoteNG.UI.Controls.Base.NGTextBox(); - this.lblExperimental = new mRemoteNG.UI.Controls.Base.NGLabel(); - this.chkUseSQLServer = new mRemoteNG.UI.Controls.Base.NGCheckBox(); - this.lblSQLUsername = new mRemoteNG.UI.Controls.Base.NGLabel(); - this.txtSQLPassword = new mRemoteNG.UI.Controls.Base.NGTextBox(); - this.lblSQLInfo = new mRemoteNG.UI.Controls.Base.NGLabel(); - this.lblSQLServer = new mRemoteNG.UI.Controls.Base.NGLabel(); - this.txtSQLUsername = new mRemoteNG.UI.Controls.Base.NGTextBox(); - this.txtSQLServer = new mRemoteNG.UI.Controls.Base.NGTextBox(); - this.lblSQLPassword = new mRemoteNG.UI.Controls.Base.NGLabel(); - this.btnTestConnection = new mRemoteNG.UI.Controls.Base.NGButton(); - this.imgConnectionStatus = new System.Windows.Forms.PictureBox(); - this.lblTestConnectionResults = new mRemoteNG.UI.Controls.Base.NGLabel(); - this.chkSQLReadOnly = new mRemoteNG.UI.Controls.Base.NGCheckBox(); - this.lblSQLReadOnly = new mRemoteNG.UI.Controls.Base.NGLabel(); - ((System.ComponentModel.ISupportInitialize)(this.imgConnectionStatus)).BeginInit(); - this.SuspendLayout(); - // - // lblSQLDatabaseName - // - this.lblSQLDatabaseName.Enabled = false; - this.lblSQLDatabaseName.Location = new System.Drawing.Point(23, 132); - this.lblSQLDatabaseName.Name = "lblSQLDatabaseName"; - this.lblSQLDatabaseName.Size = new System.Drawing.Size(111, 13); - this.lblSQLDatabaseName.TabIndex = 5; - this.lblSQLDatabaseName.Text = "Database:"; - this.lblSQLDatabaseName.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // txtSQLDatabaseName - // - this.txtSQLDatabaseName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtSQLDatabaseName.Enabled = false; - this.txtSQLDatabaseName.Location = new System.Drawing.Point(140, 130); - this.txtSQLDatabaseName.Name = "txtSQLDatabaseName"; - this.txtSQLDatabaseName.Size = new System.Drawing.Size(153, 20); - this.txtSQLDatabaseName.TabIndex = 6; - // - // lblExperimental - // - this.lblExperimental.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.lblSQLDatabaseName = new mRemoteNG.UI.Controls.Base.NGLabel(); + this.txtSQLDatabaseName = new mRemoteNG.UI.Controls.Base.NGTextBox(); + this.lblExperimental = new mRemoteNG.UI.Controls.Base.NGLabel(); + this.chkUseSQLServer = new mRemoteNG.UI.Controls.Base.NGCheckBox(); + this.lblSQLUsername = new mRemoteNG.UI.Controls.Base.NGLabel(); + this.txtSQLPassword = new mRemoteNG.UI.Controls.Base.NGTextBox(); + this.lblSQLInfo = new mRemoteNG.UI.Controls.Base.NGLabel(); + this.lblSQLServer = new mRemoteNG.UI.Controls.Base.NGLabel(); + this.txtSQLUsername = new mRemoteNG.UI.Controls.Base.NGTextBox(); + this.txtSQLServer = new mRemoteNG.UI.Controls.Base.NGTextBox(); + this.lblSQLPassword = new mRemoteNG.UI.Controls.Base.NGLabel(); + this.btnTestConnection = new mRemoteNG.UI.Controls.Base.NGButton(); + this.imgConnectionStatus = new System.Windows.Forms.PictureBox(); + this.lblTestConnectionResults = new mRemoteNG.UI.Controls.Base.NGLabel(); + this.chkSQLReadOnly = new mRemoteNG.UI.Controls.Base.NGCheckBox(); + this.lblSQLReadOnly = new mRemoteNG.UI.Controls.Base.NGLabel(); + ((System.ComponentModel.ISupportInitialize)(this.imgConnectionStatus)).BeginInit(); + this.SuspendLayout(); + // + // lblSQLDatabaseName + // + this.lblSQLDatabaseName.Enabled = false; + this.lblSQLDatabaseName.Location = new System.Drawing.Point(23, 132); + this.lblSQLDatabaseName.Name = "lblSQLDatabaseName"; + this.lblSQLDatabaseName.Size = new System.Drawing.Size(111, 13); + this.lblSQLDatabaseName.TabIndex = 5; + this.lblSQLDatabaseName.Text = "Database:"; + this.lblSQLDatabaseName.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtSQLDatabaseName + // + this.txtSQLDatabaseName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtSQLDatabaseName.Enabled = false; + this.txtSQLDatabaseName.Location = new System.Drawing.Point(140, 130); + this.txtSQLDatabaseName.Name = "txtSQLDatabaseName"; + this.txtSQLDatabaseName.Size = new System.Drawing.Size(153, 20); + this.txtSQLDatabaseName.TabIndex = 6; + // + // lblExperimental + // + this.lblExperimental.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.lblExperimental.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World); - this.lblExperimental.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.lblExperimental.Location = new System.Drawing.Point(3, 0); - this.lblExperimental.Name = "lblExperimental"; - this.lblExperimental.Size = new System.Drawing.Size(596, 25); - this.lblExperimental.TabIndex = 0; - this.lblExperimental.Text = "EXPERIMENTAL"; - this.lblExperimental.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // chkUseSQLServer - // - this.chkUseSQLServer._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; - this.chkUseSQLServer.AutoSize = true; - this.chkUseSQLServer.Location = new System.Drawing.Point(3, 76); - this.chkUseSQLServer.Name = "chkUseSQLServer"; - this.chkUseSQLServer.Size = new System.Drawing.Size(234, 17); - this.chkUseSQLServer.TabIndex = 2; - this.chkUseSQLServer.Text = "Use SQL Server to load && save connections"; - this.chkUseSQLServer.UseVisualStyleBackColor = true; - this.chkUseSQLServer.CheckedChanged += new System.EventHandler(this.chkUseSQLServer_CheckedChanged); - // - // lblSQLUsername - // - this.lblSQLUsername.Enabled = false; - this.lblSQLUsername.Location = new System.Drawing.Point(23, 158); - this.lblSQLUsername.Name = "lblSQLUsername"; - this.lblSQLUsername.Size = new System.Drawing.Size(111, 13); - this.lblSQLUsername.TabIndex = 7; - this.lblSQLUsername.Text = "Username:"; - this.lblSQLUsername.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // txtSQLPassword - // - this.txtSQLPassword.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtSQLPassword.Enabled = false; - this.txtSQLPassword.Location = new System.Drawing.Point(140, 182); - this.txtSQLPassword.Name = "txtSQLPassword"; - this.txtSQLPassword.Size = new System.Drawing.Size(153, 20); - this.txtSQLPassword.TabIndex = 10; - this.txtSQLPassword.UseSystemPasswordChar = true; - // - // lblSQLInfo - // - this.lblSQLInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.lblExperimental.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World); + this.lblExperimental.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.lblExperimental.Location = new System.Drawing.Point(3, 0); + this.lblExperimental.Name = "lblExperimental"; + this.lblExperimental.Size = new System.Drawing.Size(596, 26); + this.lblExperimental.TabIndex = 0; + this.lblExperimental.Text = "EXPERIMENTAL"; + this.lblExperimental.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // chkUseSQLServer + // + this.chkUseSQLServer._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; + this.chkUseSQLServer.AutoSize = true; + this.chkUseSQLServer.Location = new System.Drawing.Point(3, 76); + this.chkUseSQLServer.Name = "chkUseSQLServer"; + this.chkUseSQLServer.Size = new System.Drawing.Size(234, 17); + this.chkUseSQLServer.TabIndex = 2; + this.chkUseSQLServer.Text = "Use SQL Server to load && save connections"; + this.chkUseSQLServer.UseVisualStyleBackColor = true; + this.chkUseSQLServer.CheckedChanged += new System.EventHandler(this.chkUseSQLServer_CheckedChanged); + // + // lblSQLUsername + // + this.lblSQLUsername.Enabled = false; + this.lblSQLUsername.Location = new System.Drawing.Point(23, 158); + this.lblSQLUsername.Name = "lblSQLUsername"; + this.lblSQLUsername.Size = new System.Drawing.Size(111, 13); + this.lblSQLUsername.TabIndex = 7; + this.lblSQLUsername.Text = "Username:"; + this.lblSQLUsername.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtSQLPassword + // + this.txtSQLPassword.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtSQLPassword.Enabled = false; + this.txtSQLPassword.Location = new System.Drawing.Point(140, 182); + this.txtSQLPassword.Name = "txtSQLPassword"; + this.txtSQLPassword.Size = new System.Drawing.Size(153, 20); + this.txtSQLPassword.TabIndex = 10; + this.txtSQLPassword.UseSystemPasswordChar = true; + // + // lblSQLInfo + // + this.lblSQLInfo.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.lblSQLInfo.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World); - this.lblSQLInfo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.lblSQLInfo.Location = new System.Drawing.Point(3, 25); - this.lblSQLInfo.Name = "lblSQLInfo"; - this.lblSQLInfo.Size = new System.Drawing.Size(596, 25); - this.lblSQLInfo.TabIndex = 1; - this.lblSQLInfo.Text = "Please see Help - Getting started - SQL Configuration for more Info!"; - this.lblSQLInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // lblSQLServer - // - this.lblSQLServer.Enabled = false; - this.lblSQLServer.Location = new System.Drawing.Point(23, 106); - this.lblSQLServer.Name = "lblSQLServer"; - this.lblSQLServer.Size = new System.Drawing.Size(111, 13); - this.lblSQLServer.TabIndex = 3; - this.lblSQLServer.Text = "SQL Server:"; - this.lblSQLServer.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // txtSQLUsername - // - this.txtSQLUsername.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtSQLUsername.Enabled = false; - this.txtSQLUsername.Location = new System.Drawing.Point(140, 156); - this.txtSQLUsername.Name = "txtSQLUsername"; - this.txtSQLUsername.Size = new System.Drawing.Size(153, 20); - this.txtSQLUsername.TabIndex = 8; - // - // txtSQLServer - // - this.txtSQLServer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtSQLServer.Enabled = false; - this.txtSQLServer.Location = new System.Drawing.Point(140, 103); - this.txtSQLServer.Name = "txtSQLServer"; - this.txtSQLServer.Size = new System.Drawing.Size(153, 20); - this.txtSQLServer.TabIndex = 4; - // - // lblSQLPassword - // - this.lblSQLPassword.Enabled = false; - this.lblSQLPassword.Location = new System.Drawing.Point(23, 184); - this.lblSQLPassword.Name = "lblSQLPassword"; - this.lblSQLPassword.Size = new System.Drawing.Size(111, 13); - this.lblSQLPassword.TabIndex = 9; - this.lblSQLPassword.Text = "Password:"; - this.lblSQLPassword.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // btnTestConnection - // - this.btnTestConnection._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.HOVER; - this.btnTestConnection.Enabled = false; - this.btnTestConnection.Location = new System.Drawing.Point(140, 228); - this.btnTestConnection.Name = "btnTestConnection"; - this.btnTestConnection.Size = new System.Drawing.Size(153, 23); - this.btnTestConnection.TabIndex = 11; - this.btnTestConnection.Text = "Test Connection"; - this.btnTestConnection.UseVisualStyleBackColor = true; - this.btnTestConnection.Click += new System.EventHandler(this.btnTestConnection_Click); - // - // imgConnectionStatus - // - this.imgConnectionStatus.Image = global::mRemoteNG.Resources.Help; - this.imgConnectionStatus.Location = new System.Drawing.Point(297, 231); - this.imgConnectionStatus.Name = "imgConnectionStatus"; - this.imgConnectionStatus.Size = new System.Drawing.Size(16, 16); - this.imgConnectionStatus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.imgConnectionStatus.TabIndex = 12; - this.imgConnectionStatus.TabStop = false; - // - // lblTestConnectionResults - // - this.lblTestConnectionResults.AutoSize = true; - this.lblTestConnectionResults.Location = new System.Drawing.Point(137, 254); - this.lblTestConnectionResults.Name = "lblTestConnectionResults"; - this.lblTestConnectionResults.Size = new System.Drawing.Size(117, 13); - this.lblTestConnectionResults.TabIndex = 13; - this.lblTestConnectionResults.Text = "Test connection details"; - // - // chkSQLReadOnly - // - this.chkSQLReadOnly._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; - this.chkSQLReadOnly.AutoSize = true; - this.chkSQLReadOnly.Location = new System.Drawing.Point(140, 208); - this.chkSQLReadOnly.Name = "chkSQLReadOnly"; - this.chkSQLReadOnly.Size = new System.Drawing.Size(15, 14); - this.chkSQLReadOnly.TabIndex = 14; - this.chkSQLReadOnly.UseVisualStyleBackColor = true; - // - // lblSQLReadOnly - // - this.lblSQLReadOnly.Enabled = false; - this.lblSQLReadOnly.Location = new System.Drawing.Point(23, 208); - this.lblSQLReadOnly.Name = "lblSQLReadOnly"; - this.lblSQLReadOnly.Size = new System.Drawing.Size(111, 13); - this.lblSQLReadOnly.TabIndex = 15; - this.lblSQLReadOnly.Text = "Read Only:"; - this.lblSQLReadOnly.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // SqlServerPage - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.lblSQLReadOnly); - this.Controls.Add(this.chkSQLReadOnly); - this.Controls.Add(this.lblTestConnectionResults); - this.Controls.Add(this.imgConnectionStatus); - this.Controls.Add(this.btnTestConnection); - this.Controls.Add(this.lblSQLDatabaseName); - this.Controls.Add(this.txtSQLDatabaseName); - this.Controls.Add(this.lblExperimental); - this.Controls.Add(this.chkUseSQLServer); - this.Controls.Add(this.lblSQLUsername); - this.Controls.Add(this.txtSQLPassword); - this.Controls.Add(this.lblSQLInfo); - this.Controls.Add(this.lblSQLServer); - this.Controls.Add(this.txtSQLUsername); - this.Controls.Add(this.txtSQLServer); - this.Controls.Add(this.lblSQLPassword); - this.Name = "SqlServerPage"; - this.PageIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PageIcon"))); - this.Size = new System.Drawing.Size(610, 489); - ((System.ComponentModel.ISupportInitialize)(this.imgConnectionStatus)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + this.lblSQLInfo.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World); + this.lblSQLInfo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.lblSQLInfo.Location = new System.Drawing.Point(3, 25); + this.lblSQLInfo.Name = "lblSQLInfo"; + this.lblSQLInfo.Size = new System.Drawing.Size(596, 26); + this.lblSQLInfo.TabIndex = 1; + this.lblSQLInfo.Text = "Please see Help - Getting started - SQL Configuration for more Info!"; + this.lblSQLInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // lblSQLServer + // + this.lblSQLServer.Enabled = false; + this.lblSQLServer.Location = new System.Drawing.Point(23, 106); + this.lblSQLServer.Name = "lblSQLServer"; + this.lblSQLServer.Size = new System.Drawing.Size(111, 13); + this.lblSQLServer.TabIndex = 3; + this.lblSQLServer.Text = "SQL Server:"; + this.lblSQLServer.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtSQLUsername + // + this.txtSQLUsername.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtSQLUsername.Enabled = false; + this.txtSQLUsername.Location = new System.Drawing.Point(140, 156); + this.txtSQLUsername.Name = "txtSQLUsername"; + this.txtSQLUsername.Size = new System.Drawing.Size(153, 20); + this.txtSQLUsername.TabIndex = 8; + // + // txtSQLServer + // + this.txtSQLServer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtSQLServer.Enabled = false; + this.txtSQLServer.Location = new System.Drawing.Point(140, 103); + this.txtSQLServer.Name = "txtSQLServer"; + this.txtSQLServer.Size = new System.Drawing.Size(153, 20); + this.txtSQLServer.TabIndex = 4; + // + // lblSQLPassword + // + this.lblSQLPassword.Enabled = false; + this.lblSQLPassword.Location = new System.Drawing.Point(23, 184); + this.lblSQLPassword.Name = "lblSQLPassword"; + this.lblSQLPassword.Size = new System.Drawing.Size(111, 13); + this.lblSQLPassword.TabIndex = 9; + this.lblSQLPassword.Text = "Password:"; + this.lblSQLPassword.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // btnTestConnection + // + this.btnTestConnection._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.HOVER; + this.btnTestConnection.Enabled = false; + this.btnTestConnection.Location = new System.Drawing.Point(140, 228); + this.btnTestConnection.Name = "btnTestConnection"; + this.btnTestConnection.Size = new System.Drawing.Size(153, 23); + this.btnTestConnection.TabIndex = 11; + this.btnTestConnection.Text = "Test Connection"; + this.btnTestConnection.UseVisualStyleBackColor = true; + this.btnTestConnection.Click += new System.EventHandler(this.btnTestConnection_Click); + // + // imgConnectionStatus + // + this.imgConnectionStatus.Image = global::mRemoteNG.Resources.Help; + this.imgConnectionStatus.Location = new System.Drawing.Point(297, 231); + this.imgConnectionStatus.Name = "imgConnectionStatus"; + this.imgConnectionStatus.Size = new System.Drawing.Size(16, 16); + this.imgConnectionStatus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.imgConnectionStatus.TabIndex = 12; + this.imgConnectionStatus.TabStop = false; + // + // lblTestConnectionResults + // + this.lblTestConnectionResults.AutoSize = true; + this.lblTestConnectionResults.Location = new System.Drawing.Point(137, 254); + this.lblTestConnectionResults.Name = "lblTestConnectionResults"; + this.lblTestConnectionResults.Size = new System.Drawing.Size(117, 13); + this.lblTestConnectionResults.TabIndex = 13; + this.lblTestConnectionResults.Text = "Test connection details"; + // + // chkSQLReadOnly + // + this.chkSQLReadOnly._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; + this.chkSQLReadOnly.AutoSize = true; + this.chkSQLReadOnly.Location = new System.Drawing.Point(140, 208); + this.chkSQLReadOnly.Name = "chkSQLReadOnly"; + this.chkSQLReadOnly.Size = new System.Drawing.Size(15, 14); + this.chkSQLReadOnly.TabIndex = 14; + this.chkSQLReadOnly.UseVisualStyleBackColor = true; + // + // lblSQLReadOnly + // + this.lblSQLReadOnly.Enabled = false; + this.lblSQLReadOnly.Location = new System.Drawing.Point(23, 208); + this.lblSQLReadOnly.Name = "lblSQLReadOnly"; + this.lblSQLReadOnly.Size = new System.Drawing.Size(111, 13); + this.lblSQLReadOnly.TabIndex = 15; + this.lblSQLReadOnly.Text = "Read Only:"; + this.lblSQLReadOnly.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // SqlServerPage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lblSQLReadOnly); + this.Controls.Add(this.chkSQLReadOnly); + this.Controls.Add(this.lblTestConnectionResults); + this.Controls.Add(this.imgConnectionStatus); + this.Controls.Add(this.btnTestConnection); + this.Controls.Add(this.lblSQLDatabaseName); + this.Controls.Add(this.txtSQLDatabaseName); + this.Controls.Add(this.lblExperimental); + this.Controls.Add(this.chkUseSQLServer); + this.Controls.Add(this.lblSQLUsername); + this.Controls.Add(this.txtSQLPassword); + this.Controls.Add(this.lblSQLInfo); + this.Controls.Add(this.lblSQLServer); + this.Controls.Add(this.txtSQLUsername); + this.Controls.Add(this.txtSQLServer); + this.Controls.Add(this.lblSQLPassword); + this.Name = "SqlServerPage"; + this.Size = new System.Drawing.Size(610, 490); + ((System.ComponentModel.ISupportInitialize)(this.imgConnectionStatus)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); } internal Controls.Base.NGLabel lblSQLDatabaseName; diff --git a/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs b/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs index 71022a18..0a3e56a5 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs @@ -1,4 +1,5 @@ using System; +using System.Drawing; using mRemoteNG.App; using mRemoteNG.Config.Connections; using mRemoteNG.Config.Connections.Multiuser; @@ -18,6 +19,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages _databaseConnectionTester = new SqlDatabaseConnectionTester(); } + public override Icon PageIcon { get; protected set; } = Resources.Database_Icon; + public override string PageName { get => Language.strSQLServer.TrimEnd(':'); diff --git a/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.resx b/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.resx index 65a078c4..d58980a3 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.resx +++ b/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.resx @@ -117,29 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAD///8A////AP///wD///8A////AP///wCZmZkNlZWVMZGRkS+MjIwH////AP///wD///8A////AP// - /wD///8A////AP///wD///8Ao6OjIaGhoZ2fn5/woaGh/6urq/+np6f/lZWV/42NjeeJiYmKhoaGFv// - /wD///8A////AP///wD///8Ap6enSqWlpfTOzs7/7e3t//T09P/19fX/9PT0/+/v7//i4uL/urq6/4qK - iueGhoY1////AP///wD///8A////AKmpqere3t7/8/Pz/9vb2//S0tL/29vb/9bW1v/AwMD/ycnJ/+bm - 5v/ExMT/i4uL6v///wD///8A////AP///wCsrKzq8PDw/97e3v/U1NT/0tLS/9vb2//W1tb/v7+//7Cw - sP+zs7P/3t7e/5CQkOr///8A////AP///wD///8Arq6u6vLy8v/i4uL/2NjY/9XV1f/c3Nz/2NjY/8DA - wP+zs7P/t7e3/+Dg4P+Wlpbq////AP///wD///8A////ALCwsOrz8/P/5+fn/93d3f/Z2dn/4ODg/9vb - 2//ExMT/uLi4/7u7u//h4eH/m5ub6v///wD///8A////AP///wCysrLq9PT0/+rq6v/h4eH/3d3d/+Pj - 4//e3t7/ycnJ/729vf+/v7//4uLi/56enur///8A////AP///wD///8AtLS06vX19f/u7u7/5ubm/+Li - 4v/m5ub/4eHh/83Nzf/CwsL/wsLC/+Pj4/+goKDq////AP///wD///8A////ALW1ter29vb/6+vr/97e - 3v/W1tb/1dXV/9HR0f/Dw8P/vLy8/8DAwP/l5eX/o6Oj6v///wD///8A////AP///wC3t7fq9/f3/+fn - 5//v7+//9vb2//v7+//6+vr/8PDw/97e3v/Dw8P/5ubm/6Wlper///8A////AP///wD///8Aubm56vj4 - +P/+/v7/////////////////////////////////+/v7/+rq6v+np6fq////AP///wD///8A////ALq6 - ur/h4eH//v7+//////////////////////////////////v7+//Pz8//qampof///wD///8A////AP// - /wC8vLwqu7u70dDQ0P/o6Oj/8/Pz//39/f/8/Pz/7e3t/+Dg4P/CwsL/ra2tw6ysrBv///8A////AP// - /wD///8A////ALy8vAe7u7tVurq6rri4uNa3t7f7tra2+bS0tM2zs7OpsbGxRq+vrwP///8A////AP// - /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A/D+sQeAHrEHAA6xBwAOsQcADrEHAA6xBwAOsQcADrEHAA6xBwAOsQcADrEHAA6xBwAOsQcAD - rEHgB6xB//+sQQ== - - \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.Designer.cs index 7cbe6aeb..eb85dee9 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.Designer.cs @@ -30,7 +30,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages //Do not modify it using the code editor. [System.Diagnostics.DebuggerStepThrough()]private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(StartupExitPage)); this.chkReconnectOnStart = new mRemoteNG.UI.Controls.Base.NGCheckBox(); this.chkSaveConsOnExit = new mRemoteNG.UI.Controls.Base.NGCheckBox(); this.chkSingleInstance = new mRemoteNG.UI.Controls.Base.NGCheckBox(); @@ -90,8 +89,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.Controls.Add(this.chkSingleInstance); this.Controls.Add(this.chkProperInstallationOfComponentsAtStartup); this.Name = "StartupExitPage"; - this.PageIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PageIcon"))); - this.Size = new System.Drawing.Size(610, 489); + this.Size = new System.Drawing.Size(610, 490); this.Load += new System.EventHandler(this.StartupExitPage_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.cs b/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.cs index b3389990..4a18752a 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.cs @@ -1,4 +1,5 @@ using System; +using System.Drawing; namespace mRemoteNG.UI.Forms.OptionsPages { @@ -10,6 +11,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages ApplyTheme(); } + public override Icon PageIcon { get; protected set; } = Resources.StartupExit_Icon; + public override string PageName { get => Language.strStartupExit; diff --git a/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.resx b/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.resx index eb498265..d58980a3 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.resx +++ b/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.resx @@ -117,29 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAeRUXA3seswB9IawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAALe3t/+cqJ7/EndS/zySdP8Oe1L/JGig/yFmnv8dY5v/GmGZ/xdfl/8UXJT/EVuT/2xs - bP9sbGz/AAAAAAAAAAAAeRkdAH0fokGVeP+Cvqr/UKWC/zGXav80mW//OJlz/zydeP92qtL/dKjR/xVd - lf8AAAAAAAAAAAAAAAAAeRsiAH0hpEilZrNtrJ//dLee/367rP9+u67/f7uw/4C8s/83mnv/VJXH/3er - 0/8ZYJj/AAAAAAAAAAAAAAAAAH8lsTygXLODwpizXKSR/2+2m/9ospv/arKe/2yzof+Fv7b/Pp6C/1mZ - yf97rdT/HmSc/wAAAAAAAAAAAAAAAAGDLQsHhzWyRqVos3ayqP99vaf/h8G1/4bBtv+Hwbf/iMG5/0Si - iP9enMv/f7DV/yNnn/8AAAAAAAAAAAAAAAAAAAAAEYs9CBePRbJPoIr/k8m6/1+vl/9EooP/RaOH/0ek - i/9GqpL/VMLt/4G01/8oa6P/AAAAAAAAAAAAAAAAAAAAAAAAAAAflU8GNZR3/265nv9Jpon/ebHV/3Wt - 1P9xq9L/X7rk/xiZaf8njlj/KnCa/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFiOxP9SrIv/T6qP/361 - 2P96stb/d6/V/3Os0/8kkGL/WaiE/xN4U/8AeRkbAAAAAAAAAAAAAAAAAAAAAAAAAABekcn/pMzk/4e7 - 2/8/oXr/OZx0/zSacP8vlmr/S6OB/4TAq/9Clnn/AH0fogB5GR0AAAAAAAAAAAAAAAAAAAAAY5XN/6jP - 5f+Mv93/RaWB/43FuP+Jw7T/hsGx/4S/r/93uZ//bq2g/0ilZrMAfSGkAHkbIgAAAAAAAAAAAAAAAGeY - 0P+r0ef/kMLf/0ypiP+Rybv/drql/3K4of9utp7/crid/12lkv+DwpizPKBcswB/JbEAAAAAAAAAAAAA - AABrm9P/rtTo/6vT6P9ZsZD/m87A/5nNvf+Wy7v/lcq5/4C/qP93s6n/RqVosweHNbIBgy0LAAAAAAAA - AAAAAAAAbp3V/2yb0/9pmtL/SaGM/0Sfiv9BnYX/PZmA/1alkv9/uLH/UKGL/xePRbIRiz0IAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxn2OsWrOBsyiYV7MflU8GAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN6NrrDGfZbMtnV8GAAAAAAAA - AAAAAAAA4/+cQYABnEGAB5xBAAecQQAHnEEAB5xBgAecQcAHnEHgA5xB4AGcQeAAnEHgAJxB4ACcQeAB - nEH/w5xB/8ecQQ== - - \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs index 1969b466..a5d7d4e6 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs @@ -30,7 +30,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages //Do not modify it using the code editor. [System.Diagnostics.DebuggerStepThrough()]private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TabsPanelsPage)); this.chkAlwaysShowPanelTabs = new mRemoteNG.UI.Controls.Base.NGCheckBox(); this.chkIdentifyQuickConnectTabs = new mRemoteNG.UI.Controls.Base.NGCheckBox(); this.chkOpenNewTabRightOfSelected = new mRemoteNG.UI.Controls.Base.NGCheckBox(); @@ -163,8 +162,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.Controls.Add(this.chkDoubleClickClosesTab); this.Controls.Add(this.chkShowProtocolOnTabs); this.Name = "TabsPanelsPage"; - this.PageIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PageIcon"))); - this.Size = new System.Drawing.Size(610, 489); + this.Size = new System.Drawing.Size(610, 490); this.ResumeLayout(false); this.PerformLayout(); diff --git a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs index 24a5e22b..18ebed3c 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs @@ -1,3 +1,5 @@ +using System.Drawing; + namespace mRemoteNG.UI.Forms.OptionsPages { public sealed partial class TabsPanelsPage @@ -8,6 +10,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages ApplyTheme(); } + public override Icon PageIcon { get; protected set; } = Resources.Tab_Icon; + public override string PageName { get => Language.strTabsAndPanels.Replace("&&", "&"); diff --git a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.resx b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.resx index 6af5d5b1..d58980a3 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.resx +++ b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.resx @@ -117,29 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAnZ2d/52dnf+dnZ3/nZ2d/52dnf+dnZ3/nZ2d/52dnf+dnZ3/nZ2d/52d - nf+dnZ3/nZ2d/52dnf+dnZ3/nZ2d/52dnf+6vb3/5uzs/+bt7f/n7e3/6O7u/+nv7//p7+//6u/v/+rw - 8P/r8PD/6/Hx/+zx8f/s8fH/vb+//52dnf8AAAAAnZ2d6tvi4v/Nz8//y8vL/8zMzP/Ozs7/z8/P/9DQ - 0P/S0tL/09PT/9XV1f/X2Nj/5+zs/52dnfcAAAAAAAAAAJ2dnerZ4eH/y8zM/8fHx//IyMj/ysrK/8vL - y//Nzc3/zs7O/9DQ0P/R0dH/09TU/+Xr6/+dnZ33AAAAAAAAAACdnZ3q19/f/8fJyf/CwsL/xMTE/8XF - xf/IyMj/ycnJ/8rKyv/MzMz/zc3N/9DR0f/j6ur/nZ2d9wAAAAAAAAAAnZ2d6tbf3//DxcX/wMDA/8DA - wP/CwsL/w8PD/8TExP/FxcX/yMjI/8nJyf/Nzc3/4Ojo/52dnfcAAAAAAAAAAJ2dndbHzc3/2+Tk/9vk - 5P/b5eX/3OXl/9zl5f/d5ub/3ebm/97n5//f6Oj/4Ojo/83T0/+dnZ3jAAAAAAAAAACdnZ1DnZ2dyJ2d - nf+dnZ3/nZ2d/52dnf+dnZ3/nZ2d/52dnf+dnZ3/nZ2d/52dnf+dnZ3dnZ2dTgAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA//+cQf//nEH//5xB//+cQQAAnEEAAJxBgAGcQYABnEGAAZxBgAGcQYABnEGAAZxB//+cQf// - nEH//5xB//+cQQ== - - \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.Designer.cs index 8cec079e..92f08880 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.Designer.cs @@ -29,7 +29,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages //Do not modify it using the code editor. [System.Diagnostics.DebuggerStepThrough()]private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdatesPage)); this.lblUpdatesExplanation = new mRemoteNG.UI.Controls.Base.NGLabel(); this.pnlUpdateCheck = new System.Windows.Forms.Panel(); this.btnUpdateCheckNow = new mRemoteNG.UI.Controls.Base.NGButton(); @@ -322,8 +321,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.Controls.Add(this.pnlUpdateCheck); this.Controls.Add(this.pnlProxy); this.Name = "UpdatesPage"; - this.PageIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PageIcon"))); - this.Size = new System.Drawing.Size(610, 489); + this.Size = new System.Drawing.Size(610, 490); this.pnlUpdateCheck.ResumeLayout(false); this.pnlUpdateCheck.PerformLayout(); this.pnlProxy.ResumeLayout(false); diff --git a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs index 4a4de03c..40da91b9 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel; +using System.Drawing; using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.App.Info; @@ -26,6 +27,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages #region Public Methods + public override Icon PageIcon { get; protected set; } = Resources.Update_Icon; + public override string PageName { get => Language.strTabUpdates; diff --git a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.resx b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.resx index cef4dd5f..d58980a3 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.resx +++ b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.resx @@ -117,29 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AACjo6O3n5+f/5qamv+Wlpb/kZGR/42Njf+JiYn/hISE/4CAgP98fHz/eHh4/3R0dP9xcXH/bW1t/2pq - av9nZ2e3qKio/+np6f/T09P/0tLS/9HR0f/Q0ND/zs7O/83Nzf/Nzc3/y8vL/8vLy//Kysr/ycnJ/8jI - yP/i4uL/ampq/62trf/W1tb/urq6/7i4uP+1tbX/s7Oz/7Gxsf+wsLD/ra2t/6urq/+qqqr/qKio/6en - p/+mpqb/yMjI/25ubv+xsbH/2dnZ/729vf+6urr/uLi4/7a2tv+1tbX/s7Oz/7CwsP+vr6//ra2t/6ur - q/+pqan/qKio/8rKyv9ycnL/tra2/93d3f/BwcH/vb29/7y8vP+6urr/uLi4/7W1tf+0tLT/srKy/7Cw - sP+tra3/rKys/6ysrP/Pz8//dnZ2/7q6ur3a2tr/yMjI/8DAwP+/v7//vb29/7q6uv+4uLj/t7e3/7W1 - tf+zs7P/sLCw/6+vr/+zs7P/wsLC/3t7e72+vr694+Pj/+fn5//h4eH/4ODg/+Dg4P/f39//39/f/97e - 3v/d3d3/3d3d/9zc3P/b29v/4ODg/9DQ0P9/f3+9w8PDP87Ozv/s7Oz/3t7e/9jY2P/S0tL/zMzM/8jI - yP/Hx8f/yMjI/8vLy//Q0ND/3d3d/+jo6P+kpKT/hISEQgAAAADDw8O94+Pj/9vb2//i4uL/t9C4/2St - aP92qmT/cK9o/1alYv+sxaz/wsLC/9HR0f/T09P/jY2NvQAAAAAAAAAAyMjIP9HR0f/z8/P/x97K/2TJ - hf+z3KT/58d8/9y/c/92zI//T61o/7jQuP/x8fH/r6+v/5KSkkIAAAAAAAAAAAAAAADIyMi9xMTE/3bO - i/+Z5Kv/sMVd/+q1SP/hojn/pZ1A/4LFj/9Jmlb/oKCg/5ubm70AAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AACI46n8oumV/9bPaf/is0f/0btP/8KuQv+CvWz/Xbh4/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAj+Ws/KLwn//Y7a//3sVo/7TiZf9g5zn/a9dr/2i8gPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAG7Xh9zI99T/2PbK/+fjqf/bz2z/r9xo/53qq/9OrF/gAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAABbw2hFkuau+tv46f/n8tj/7eWz/9/Zpv+F1I/7QqNOUAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAFvDaEdz2IrZmuKl/Jvdmvxw0n/dUbddUAAAAAAAAAAAAAAAAAAA - AAAAAAAAAACcQQAAnEEAAJxBAACcQQAAnEEAAJxBAACcQQAAnEGAAZxBgAGcQcADnEHwD5xB8A+cQfAP - nEHwD5xB+B+cQQ== - - \ No newline at end of file