diff --git a/mRemoteV1/UI/Forms/OptionsPages/ThemePage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/ThemePage.Designer.cs index 85b0bd0da..1476496bf 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/ThemePage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/ThemePage.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(ThemePage)); this.btnThemeDelete = new mRemoteNG.UI.Controls.Base.NGButton(); this.btnThemeNew = new mRemoteNG.UI.Controls.Base.NGButton(); this.cboTheme = new mRemoteNG.UI.Controls.Base.NGComboBox(); @@ -40,13 +39,15 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.ColorCol = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); this.ColorNameCol = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); this.labelRestart = new mRemoteNG.UI.Controls.Base.NGLabel(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); ((System.ComponentModel.ISupportInitialize)(this.listPalette)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // btnThemeDelete // this.btnThemeDelete._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.HOVER; - this.btnThemeDelete.Location = new System.Drawing.Point(535, 1); + this.btnThemeDelete.Location = new System.Drawing.Point(535, 3); this.btnThemeDelete.Name = "btnThemeDelete"; this.btnThemeDelete.Size = new System.Drawing.Size(75, 23); this.btnThemeDelete.TabIndex = 2; @@ -57,7 +58,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // btnThemeNew // this.btnThemeNew._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.HOVER; - this.btnThemeNew.Location = new System.Drawing.Point(454, 1); + this.btnThemeNew.Location = new System.Drawing.Point(454, 3); this.btnThemeNew.Name = "btnThemeNew"; this.btnThemeNew.Size = new System.Drawing.Size(75, 23); this.btnThemeNew.TabIndex = 1; @@ -70,7 +71,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.cboTheme._mice = mRemoteNG.UI.Controls.Base.NGComboBox.MouseState.HOVER; this.cboTheme.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboTheme.FormattingEnabled = true; - this.cboTheme.Location = new System.Drawing.Point(3, 2); + this.cboTheme.Location = new System.Drawing.Point(3, 3); this.cboTheme.Name = "cboTheme"; this.cboTheme.Size = new System.Drawing.Size(445, 21); this.cboTheme.TabIndex = 0; @@ -80,7 +81,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages // this.themeEnableCombo._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; this.themeEnableCombo.AutoSize = true; - this.themeEnableCombo.Location = new System.Drawing.Point(487, 457); + this.tableLayoutPanel1.SetColumnSpan(this.themeEnableCombo, 2); + this.themeEnableCombo.Location = new System.Drawing.Point(454, 469); this.themeEnableCombo.Name = "themeEnableCombo"; this.themeEnableCombo.Size = new System.Drawing.Size(100, 17); this.themeEnableCombo.TabIndex = 5; @@ -98,12 +100,14 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.keyCol, this.ColorCol, this.ColorNameCol}); + this.tableLayoutPanel1.SetColumnSpan(this.listPalette, 3); this.listPalette.Cursor = System.Windows.Forms.Cursors.Default; this.listPalette.DecorateLines = true; - this.listPalette.Location = new System.Drawing.Point(3, 29); + this.listPalette.Dock = System.Windows.Forms.DockStyle.Fill; + this.listPalette.Location = new System.Drawing.Point(3, 32); this.listPalette.Name = "listPalette"; this.listPalette.ShowGroups = false; - this.listPalette.Size = new System.Drawing.Size(604, 413); + this.listPalette.Size = new System.Drawing.Size(607, 431); this.listPalette.TabIndex = 3; this.listPalette.UseCellFormatEvents = true; this.listPalette.UseCompatibleStateImageBehavior = false; @@ -132,29 +136,47 @@ namespace mRemoteNG.UI.Forms.OptionsPages // labelRestart // this.labelRestart.AutoSize = true; - this.labelRestart.Location = new System.Drawing.Point(23, 457); + this.labelRestart.Location = new System.Drawing.Point(3, 466); this.labelRestart.Name = "labelRestart"; this.labelRestart.Size = new System.Drawing.Size(399, 13); this.labelRestart.TabIndex = 4; this.labelRestart.Text = "Warning: Restart is required to disable the themes or to completely apply a new o" + "ne"; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 3; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.Controls.Add(this.cboTheme, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.themeEnableCombo, 1, 2); + this.tableLayoutPanel1.Controls.Add(this.labelRestart, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.btnThemeNew, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.listPalette, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.btnThemeDelete, 2, 0); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 3; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.Size = new System.Drawing.Size(610, 489); + this.tableLayoutPanel1.TabIndex = 6; // // ThemePage // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.labelRestart); - this.Controls.Add(this.listPalette); - this.Controls.Add(this.themeEnableCombo); - this.Controls.Add(this.btnThemeDelete); - this.Controls.Add(this.btnThemeNew); - this.Controls.Add(this.cboTheme); + this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.Controls.Add(this.tableLayoutPanel1); this.Name = "ThemePage"; - this.PageIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PageIcon"))); this.Size = new System.Drawing.Size(610, 489); ((System.ComponentModel.ISupportInitialize)(this.listPalette)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } internal Controls.Base.NGButton btnThemeDelete; @@ -166,5 +188,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages private BrightIdeasSoftware.OLVColumn keyCol; private BrightIdeasSoftware.OLVColumn ColorCol; private BrightIdeasSoftware.OLVColumn ColorNameCol; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } diff --git a/mRemoteV1/UI/Forms/OptionsPages/ThemePage.cs b/mRemoteV1/UI/Forms/OptionsPages/ThemePage.cs index 0dd4f5321..6f59cdb6b 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/ThemePage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/ThemePage.cs @@ -3,6 +3,7 @@ using System.Windows.Forms; using mRemoteNG.Themes; using System.Linq; using System.Collections.Generic; +using System.Drawing; using BrightIdeasSoftware; namespace mRemoteNG.UI.Forms.OptionsPages @@ -36,6 +37,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages set { } } + public override Icon PageIcon { get; protected set; } = Resources.Appearance_Icon; + public override void ApplyLanguage() { base.ApplyLanguage(); diff --git a/mRemoteV1/UI/Forms/OptionsPages/ThemePage.resx b/mRemoteV1/UI/Forms/OptionsPages/ThemePage.resx index 9fb97cd1f..d58980a38 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/ThemePage.resx +++ b/mRemoteV1/UI/Forms/OptionsPages/ThemePage.resx @@ -117,29 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIGaichxkn/MZYp3PFmCakBNemDMAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKGyoMCRqpfyGreH/fqjc/1+Syf8wcqv/FF+ZsRNd - ly0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACxvrKttndH/mbzr/3Gg4/+Wuer/lLjq/2CT - yv8VX5n8E12XeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADV2sy0xc7D8nb/s/2mc4v9bk9//WJHf/1+U - 4P+VuOr/hq3h/0mDu/8TXpiQAAAAAAAAAABFgb9CQX68hD58ubc6ebfzdqTX/6HC7f+fwO3/nb/t/3Sj - 5P9akt//WJDe/3un5v+Stuj/Q3+3/xRfmVpOh8eTZJfP/3uo2f+NtOL/o8Tt/6fH7v9kl83/NHWy/1+T - yf+fwO3/eJaj/56WSP98lJH/jbPp/3ml2P8YYZzYUorL9q7N8P+wz/D/mL/s/36u5/+qyu//PXu4/wAA - AAA1drP/osPt/6iXMf/EtVr/rJcm/1uT3/+Yu+v/HGSf/1eNzt6oye3/hKft/1hq7f9qjun/rc3w/22d - 0v8+fLn/Z5nO/6XF7v+Vmmn/rZcm/52XTf9mm+L/mLvq/yFnovZbkNGckrnl/2509v+BhPX/QEDw/5C7 - 6/+uzfD/rMzw/6rK8P+Fsun/XqnB/0Szjf9WqLb/cKHk/5e66P8laqbtX5PVM1yR0vySpPX/WVr2/1GG - 9P87pvv/XKvy/36v5/97ref/eKrm/z+2gP9gyJf/O7d6/32s5/+PteP/Km6q1QAAAABgk9WHhq/h/7nX - 8/8ypv7/bL///yuj//9mvvD/Os77/1q+8f9Ss6D/O7d5/0ezkP+nyO7/d6XW/y9xrpwAAAAAY5bYBmGU - 1p+FruH/WrL5/yuj//9Aqfv/MNP+/2zi//8r1f//f7Do/3yt5/+pyu//pcXt/zd3tfw0dbIwAAAAAAAA - AAAAAAAAYZXXdV+T1faOtuP/udfz/13V+/8q1f//QdH7/7PS8v+x0PH/krji/2KVzP89e7iKAAAAAAAA - AAAAAAAAAAAAAAAAAABildceYJPVrnaj3P+RuOT/qMrs/6XH7P+NteL/aJrS/0mDwttFgb9OAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABhlNZCXpLUkFuQ0dJYjs/PVIzMmVGJykUAAAAAAAAAAAAA - AAAAAAAA//+cQfwfnEH4B5xB+AOcQfABnEGAAJxBAACcQQEAnEEAAJxBAACcQQAAnEGAAJxBgACcQeAB - nEHwA5xB/A+cQQ== - - \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/frmOptions.cs b/mRemoteV1/UI/Forms/frmOptions.cs index a613469f7..29606f791 100644 --- a/mRemoteV1/UI/Forms/frmOptions.cs +++ b/mRemoteV1/UI/Forms/frmOptions.cs @@ -58,17 +58,17 @@ namespace mRemoteNG.UI.Forms { _pages = new Dictionary { - {typeof(StartupExitPage).Name, new StartupExitPage()}, - {typeof(AppearancePage).Name, new AppearancePage()}, - {typeof(TabsPanelsPage).Name, new TabsPanelsPage()}, - {typeof(NotificationsPage).Name, new NotificationsPage()}, - {typeof(ConnectionsPage).Name, new ConnectionsPage()}, - {typeof(CredentialsPage).Name, new CredentialsPage()}, - {typeof(SqlServerPage).Name, new SqlServerPage()}, - {typeof(UpdatesPage).Name, new UpdatesPage()}, - {typeof(ThemePage).Name, new ThemePage()}, - {typeof(SecurityPage).Name, new SecurityPage()}, - {typeof(AdvancedPage).Name, new AdvancedPage()} + {typeof(StartupExitPage).Name, new StartupExitPage {Dock = DockStyle.Fill}}, + {typeof(AppearancePage).Name, new AppearancePage {Dock = DockStyle.Fill}}, + {typeof(TabsPanelsPage).Name, new TabsPanelsPage {Dock = DockStyle.Fill}}, + {typeof(NotificationsPage).Name, new NotificationsPage {Dock = DockStyle.Fill}}, + {typeof(ConnectionsPage).Name, new ConnectionsPage {Dock = DockStyle.Fill}}, + {typeof(CredentialsPage).Name, new CredentialsPage {Dock = DockStyle.Fill}}, + {typeof(SqlServerPage).Name, new SqlServerPage {Dock = DockStyle.Fill}}, + {typeof(UpdatesPage).Name, new UpdatesPage {Dock = DockStyle.Fill}}, + {typeof(ThemePage).Name, new ThemePage {Dock = DockStyle.Fill}}, + {typeof(SecurityPage).Name, new SecurityPage {Dock = DockStyle.Fill}}, + {typeof(AdvancedPage).Name, new AdvancedPage {Dock = DockStyle.Fill}} }; }