From 66c4258f64ffcca4ab9a315ecd2ee3d5e2b31172 Mon Sep 17 00:00:00 2001 From: dunestorm Date: Thu, 30 May 2019 16:04:33 +0100 Subject: [PATCH 1/4] Improved theme selector preview in settings. --- GBM/Forms/frmSettings.Designer.vb | 70 +++++++++++++++---------------- GBM/Forms/frmSettings.vb | 6 ++- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/GBM/Forms/frmSettings.Designer.vb b/GBM/Forms/frmSettings.Designer.vb index 52d8dcc..a00da96 100644 --- a/GBM/Forms/frmSettings.Designer.vb +++ b/GBM/Forms/frmSettings.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmSettings Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmSettings 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Me.chkAutoSaveLog = New System.Windows.Forms.CheckBox() Me.btnOptionalFields = New System.Windows.Forms.Button() @@ -77,13 +77,13 @@ Partial Class frmSettings Me.chkMonitorOnStartup = New System.Windows.Forms.CheckBox() Me.pnlInterface = New System.Windows.Forms.Panel() Me.grpInterfaceOptions = New System.Windows.Forms.GroupBox() - Me.btnPreviewTheme_HighlightSec = New System.Windows.Forms.Button() - Me.btnPreviewTheme_Highlight = New System.Windows.Forms.Button() Me.btnPreviewTheme_BaseSec = New System.Windows.Forms.Button() Me.btnPreviewTheme_Base = New System.Windows.Forms.Button() Me.chkAutoHideLog = New System.Windows.Forms.CheckBox() Me.cboThemeSelection = New System.Windows.Forms.ComboBox() Me.lblThemeSelection = New System.Windows.Forms.Label() + Me.lblPreviewTheme_HighlightSec = New System.Windows.Forms.Label() + Me.lblPreviewTheme_Highlight = New System.Windows.Forms.Label() Me.grpFolderOptions.SuspendLayout() Me.grp7zGeneral.SuspendLayout() Me.pnlBackup.SuspendLayout() @@ -643,8 +643,8 @@ Partial Class frmSettings ' 'grpInterfaceOptions ' - Me.grpInterfaceOptions.Controls.Add(Me.btnPreviewTheme_HighlightSec) - Me.grpInterfaceOptions.Controls.Add(Me.btnPreviewTheme_Highlight) + Me.grpInterfaceOptions.Controls.Add(Me.lblPreviewTheme_Highlight) + Me.grpInterfaceOptions.Controls.Add(Me.lblPreviewTheme_HighlightSec) Me.grpInterfaceOptions.Controls.Add(Me.btnPreviewTheme_BaseSec) Me.grpInterfaceOptions.Controls.Add(Me.btnPreviewTheme_Base) Me.grpInterfaceOptions.Controls.Add(Me.chkAutoHideLog) @@ -652,38 +652,18 @@ Partial Class frmSettings Me.grpInterfaceOptions.Controls.Add(Me.lblThemeSelection) Me.grpInterfaceOptions.Location = New System.Drawing.Point(6, 12) Me.grpInterfaceOptions.Name = "grpInterfaceOptions" - Me.grpInterfaceOptions.Size = New System.Drawing.Size(354, 82) + Me.grpInterfaceOptions.Size = New System.Drawing.Size(354, 259) Me.grpInterfaceOptions.TabIndex = 1 Me.grpInterfaceOptions.TabStop = False Me.grpInterfaceOptions.Text = "Interface Options" ' - 'btnPreviewTheme_HighlightSec - ' - Me.btnPreviewTheme_HighlightSec.Enabled = False - Me.btnPreviewTheme_HighlightSec.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnPreviewTheme_HighlightSec.Location = New System.Drawing.Point(312, 23) - Me.btnPreviewTheme_HighlightSec.Name = "btnPreviewTheme_HighlightSec" - Me.btnPreviewTheme_HighlightSec.Size = New System.Drawing.Size(21, 21) - Me.btnPreviewTheme_HighlightSec.TabIndex = 7 - Me.btnPreviewTheme_HighlightSec.UseVisualStyleBackColor = True - ' - 'btnPreviewTheme_Highlight - ' - Me.btnPreviewTheme_Highlight.Enabled = False - Me.btnPreviewTheme_Highlight.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnPreviewTheme_Highlight.Location = New System.Drawing.Point(285, 23) - Me.btnPreviewTheme_Highlight.Name = "btnPreviewTheme_Highlight" - Me.btnPreviewTheme_Highlight.Size = New System.Drawing.Size(21, 21) - Me.btnPreviewTheme_Highlight.TabIndex = 6 - Me.btnPreviewTheme_Highlight.UseVisualStyleBackColor = True - ' 'btnPreviewTheme_BaseSec ' Me.btnPreviewTheme_BaseSec.Enabled = False Me.btnPreviewTheme_BaseSec.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnPreviewTheme_BaseSec.Location = New System.Drawing.Point(258, 23) + Me.btnPreviewTheme_BaseSec.Location = New System.Drawing.Point(12, 127) Me.btnPreviewTheme_BaseSec.Name = "btnPreviewTheme_BaseSec" - Me.btnPreviewTheme_BaseSec.Size = New System.Drawing.Size(21, 21) + Me.btnPreviewTheme_BaseSec.Size = New System.Drawing.Size(321, 86) Me.btnPreviewTheme_BaseSec.TabIndex = 5 Me.btnPreviewTheme_BaseSec.UseVisualStyleBackColor = True ' @@ -691,16 +671,16 @@ Partial Class frmSettings ' Me.btnPreviewTheme_Base.Enabled = False Me.btnPreviewTheme_Base.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnPreviewTheme_Base.Location = New System.Drawing.Point(230, 23) + Me.btnPreviewTheme_Base.Location = New System.Drawing.Point(12, 52) Me.btnPreviewTheme_Base.Name = "btnPreviewTheme_Base" - Me.btnPreviewTheme_Base.Size = New System.Drawing.Size(21, 21) + Me.btnPreviewTheme_Base.Size = New System.Drawing.Size(321, 171) Me.btnPreviewTheme_Base.TabIndex = 4 Me.btnPreviewTheme_Base.UseVisualStyleBackColor = True ' 'chkAutoHideLog ' Me.chkAutoHideLog.AutoSize = True - Me.chkAutoHideLog.Location = New System.Drawing.Point(9, 56) + Me.chkAutoHideLog.Location = New System.Drawing.Point(12, 229) Me.chkAutoHideLog.Name = "chkAutoHideLog" Me.chkAutoHideLog.Size = New System.Drawing.Size(167, 17) Me.chkAutoHideLog.TabIndex = 3 @@ -713,7 +693,7 @@ Partial Class frmSettings Me.cboThemeSelection.FormattingEnabled = True Me.cboThemeSelection.Location = New System.Drawing.Point(110, 23) Me.cboThemeSelection.Name = "cboThemeSelection" - Me.cboThemeSelection.Size = New System.Drawing.Size(114, 21) + Me.cboThemeSelection.Size = New System.Drawing.Size(223, 21) Me.cboThemeSelection.TabIndex = 1 ' 'lblThemeSelection @@ -725,6 +705,24 @@ Partial Class frmSettings Me.lblThemeSelection.TabIndex = 0 Me.lblThemeSelection.Text = "Theme Selection:" ' + 'lblPreviewTheme_HighlightSec + ' + Me.lblPreviewTheme_HighlightSec.AutoSize = True + Me.lblPreviewTheme_HighlightSec.Location = New System.Drawing.Point(18, 58) + Me.lblPreviewTheme_HighlightSec.Name = "lblPreviewTheme_HighlightSec" + Me.lblPreviewTheme_HighlightSec.Size = New System.Drawing.Size(77, 13) + Me.lblPreviewTheme_HighlightSec.TabIndex = 8 + Me.lblPreviewTheme_HighlightSec.Text = "Menu Bar Text" + ' + 'lblPreviewTheme_Highlight + ' + Me.lblPreviewTheme_Highlight.AutoSize = True + Me.lblPreviewTheme_Highlight.Location = New System.Drawing.Point(18, 133) + Me.lblPreviewTheme_Highlight.Name = "lblPreviewTheme_Highlight" + Me.lblPreviewTheme_Highlight.Size = New System.Drawing.Size(49, 13) + Me.lblPreviewTheme_Highlight.TabIndex = 9 + Me.lblPreviewTheme_Highlight.Text = "Log Text" + ' 'frmSettings ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -835,7 +833,7 @@ Partial Class frmSettings Friend WithEvents cboThemeSelection As ComboBox Friend WithEvents lblThemeSelection As Label Friend WithEvents btnPreviewTheme_Base As Button - Friend WithEvents btnPreviewTheme_HighlightSec As Button - Friend WithEvents btnPreviewTheme_Highlight As Button Friend WithEvents btnPreviewTheme_BaseSec As Button + Friend WithEvents lblPreviewTheme_HighlightSec As Label + Friend WithEvents lblPreviewTheme_Highlight As Label End Class diff --git a/GBM/Forms/frmSettings.vb b/GBM/Forms/frmSettings.vb index 0d341da..9074c64 100644 --- a/GBM/Forms/frmSettings.vb +++ b/GBM/Forms/frmSettings.vb @@ -468,8 +468,10 @@ Public Class frmSettings If oThemeEngine.bThemeHasBeenDefined Then btnPreviewTheme_Base.BackColor = oThemeEngine.ColorBase btnPreviewTheme_BaseSec.BackColor = oThemeEngine.ColorBaseSecondary - btnPreviewTheme_Highlight.BackColor = oThemeEngine.ColorHighlight - btnPreviewTheme_HighlightSec.BackColor = oThemeEngine.ColorHighlightSecondary + lblPreviewTheme_Highlight.ForeColor = oThemeEngine.ColorHighlight + lblPreviewTheme_Highlight.BackColor = oThemeEngine.ColorBaseSecondary + lblPreviewTheme_HighlightSec.ForeColor = oThemeEngine.ColorHighlightSecondary + lblPreviewTheme_HighlightSec.BackColor = oThemeEngine.ColorBase End If End Sub End Class \ No newline at end of file From 9c3643fa2e3e32dcf99325a6499b69dc1391c841 Mon Sep 17 00:00:00 2001 From: Dunestorm Date: Mon, 10 Jun 2019 15:02:13 +0100 Subject: [PATCH 2/4] Added three new themes (colors not yet final). --- GBM/Forms/frmSettings.vb | 9 ++ GBM/Managers/mgrThemeEngine.vb | 49 ++++++++++ GBM/My Project/Resources.Designer.vb | 137 ++++++++++++++++++++++++++- GBM/My Project/Resources.resx | 45 +++++++++ 4 files changed, 239 insertions(+), 1 deletion(-) diff --git a/GBM/Forms/frmSettings.vb b/GBM/Forms/frmSettings.vb index 9074c64..4d651a3 100644 --- a/GBM/Forms/frmSettings.vb +++ b/GBM/Forms/frmSettings.vb @@ -269,6 +269,9 @@ Public Class frmSettings oThemeItems.Add(New KeyValuePair(Of Integer, String)(0, frmSettings_cboThemeSelection_Light)) oThemeItems.Add(New KeyValuePair(Of Integer, String)(1, frmSettings_cboThemeSelection_Dark)) + oThemeItems.Add(New KeyValuePair(Of Integer, String)(2, frmSettings_cboThemeSelection_Crimson)) + oThemeItems.Add(New KeyValuePair(Of Integer, String)(3, frmSettings_cboThemeSelection_Emerald)) + oThemeItems.Add(New KeyValuePair(Of Integer, String)(4, frmSettings_cboThemeSelection_GBM)) cboThemeSelection.DataSource = oThemeItems @@ -462,6 +465,12 @@ Public Class frmSettings oThemeEngine.SetTheme(cboThemeSelection.SelectedIndex) ElseIf cboThemeSelection.SelectedIndex = 1 Then oThemeEngine.SetTheme(cboThemeSelection.SelectedIndex) + ElseIf cboThemeSelection.SelectedIndex = 2 Then + oThemeEngine.SetTheme(cboThemeSelection.SelectedIndex) + ElseIf cboThemeSelection.SelectedIndex = 3 Then + oThemeEngine.SetTheme(cboThemeSelection.SelectedIndex) + ElseIf cboThemeSelection.SelectedIndex = 4 Then + oThemeEngine.SetTheme(cboThemeSelection.SelectedIndex) End If 'Only set the theme once it has been defined. diff --git a/GBM/Managers/mgrThemeEngine.vb b/GBM/Managers/mgrThemeEngine.vb index 496faf8..0b96ced 100644 --- a/GBM/Managers/mgrThemeEngine.vb +++ b/GBM/Managers/mgrThemeEngine.vb @@ -70,6 +70,9 @@ Public Class mgrThemeEngine Public Enum eBaseTheme Light = 0 Dark = 1 + Crimson = 2 + Emerald = 3 + GBM = 4 End Enum ''' @@ -107,6 +110,52 @@ Public Class mgrThemeEngine mgrThemeEngine_RGB_Light_HighlightSecondary) _bThemeHasBeenDefined = True + + Case eBaseTheme.Crimson + _ColorBase = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Crimson_Base) + + _ColorBaseSecondary = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Crimson_BaseSecondary) + + _ColorHighlight = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Crimson_Highlight) + + _ColorHighlightSecondary = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Crimson_HighlightSecondary) + + _bThemeHasBeenDefined = True + + Case eBaseTheme.Emerald + _ColorBase = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Emerald_Base) + + _ColorBaseSecondary = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Emerald_BaseSecondary) + + _ColorHighlight = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Emerald_Highlight) + + _ColorHighlightSecondary = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Emerald_HighlightSecondary) + + _bThemeHasBeenDefined = True + + Case eBaseTheme.GBM + _ColorBase = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_GBM_Base) + + _ColorBaseSecondary = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_GBM_BaseSecondary) + + _ColorHighlight = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_GBM_Highlight) + + _ColorHighlightSecondary = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_GBM_HighlightSecondary) + + _bThemeHasBeenDefined = True + End Select End Sub End Class diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 50330c5..933c57c 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' A strongly-typed resource class, for looking up localized strings, etc. ''' - _ @@ -4731,6 +4731,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Crimson. + ''' + Friend ReadOnly Property frmSettings_cboThemeSelection_Crimson() As String + Get + Return ResourceManager.GetString("frmSettings_cboThemeSelection_Crimson", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Dark. ''' @@ -4740,6 +4749,24 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Emerald. + ''' + Friend ReadOnly Property frmSettings_cboThemeSelection_Emerald() As String + Get + Return ResourceManager.GetString("frmSettings_cboThemeSelection_Emerald", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to GBM. + ''' + Friend ReadOnly Property frmSettings_cboThemeSelection_GBM() As String + Get + Return ResourceManager.GetString("frmSettings_cboThemeSelection_GBM", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Light. ''' @@ -6916,6 +6943,42 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to 209,10,10. + ''' + Friend ReadOnly Property mgrThemeEngine_RGB_Crimson_Base() As String + Get + Return ResourceManager.GetString("mgrThemeEngine_RGB_Crimson_Base", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to 119,0,0. + ''' + Friend ReadOnly Property mgrThemeEngine_RGB_Crimson_BaseSecondary() As String + Get + Return ResourceManager.GetString("mgrThemeEngine_RGB_Crimson_BaseSecondary", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to 255,255,255. + ''' + Friend ReadOnly Property mgrThemeEngine_RGB_Crimson_Highlight() As String + Get + Return ResourceManager.GetString("mgrThemeEngine_RGB_Crimson_Highlight", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to 255,255,255. + ''' + Friend ReadOnly Property mgrThemeEngine_RGB_Crimson_HighlightSecondary() As String + Get + Return ResourceManager.GetString("mgrThemeEngine_RGB_Crimson_HighlightSecondary", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to 25,25,25. ''' @@ -6952,6 +7015,78 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to 80,200,120. + ''' + Friend ReadOnly Property mgrThemeEngine_RGB_Emerald_Base() As String + Get + Return ResourceManager.GetString("mgrThemeEngine_RGB_Emerald_Base", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to 77,137,105. + ''' + Friend ReadOnly Property mgrThemeEngine_RGB_Emerald_BaseSecondary() As String + Get + Return ResourceManager.GetString("mgrThemeEngine_RGB_Emerald_BaseSecondary", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to 255,255,255. + ''' + Friend ReadOnly Property mgrThemeEngine_RGB_Emerald_Highlight() As String + Get + Return ResourceManager.GetString("mgrThemeEngine_RGB_Emerald_Highlight", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to 0,0,0. + ''' + Friend ReadOnly Property mgrThemeEngine_RGB_Emerald_HighlightSecondary() As String + Get + Return ResourceManager.GetString("mgrThemeEngine_RGB_Emerald_HighlightSecondary", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to 48,179,219. + ''' + Friend ReadOnly Property mgrThemeEngine_RGB_GBM_Base() As String + Get + Return ResourceManager.GetString("mgrThemeEngine_RGB_GBM_Base", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to 66,203,244. + ''' + Friend ReadOnly Property mgrThemeEngine_RGB_GBM_BaseSecondary() As String + Get + Return ResourceManager.GetString("mgrThemeEngine_RGB_GBM_BaseSecondary", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to 0,0,0. + ''' + Friend ReadOnly Property mgrThemeEngine_RGB_GBM_Highlight() As String + Get + Return ResourceManager.GetString("mgrThemeEngine_RGB_GBM_Highlight", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to 0,0,0. + ''' + Friend ReadOnly Property mgrThemeEngine_RGB_GBM_HighlightSecondary() As String + Get + Return ResourceManager.GetString("mgrThemeEngine_RGB_GBM_HighlightSecondary", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to 240,240,240. ''' diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 3c929ef..26dbeea 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -2428,4 +2428,49 @@ You cannot return to this step after clicking Next. The Backup Location can be changed any time once Setup is complete. + + Crimson + + + Emerald + + + GBM + + + 209,10,10 + + + 119,0,0 + + + 255,255,255 + + + 255,255,255 + + + 80,200,120 + + + 77,137,105 + + + 255,255,255 + + + 0,0,0 + + + 48,179,219 + + + 66,203,244 + + + 0,0,0 + + + 0,0,0 + \ No newline at end of file From 7185ca5e61eecb9fa8cad59614339c0267bfeaca Mon Sep 17 00:00:00 2001 From: Dunestorm Date: Thu, 20 Jun 2019 13:23:26 +0100 Subject: [PATCH 3/4] Updated Emerald and GBM theme colors. --- GBM/My Project/Resources.Designer.vb | 10 +++++----- GBM/My Project/Resources.resx | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 933c57c..fb92b45 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -7016,7 +7016,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to 80,200,120. + ''' Looks up a localized string similar to 22,193,114. ''' Friend ReadOnly Property mgrThemeEngine_RGB_Emerald_Base() As String Get @@ -7025,7 +7025,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to 77,137,105. + ''' Looks up a localized string similar to 33,79,75. ''' Friend ReadOnly Property mgrThemeEngine_RGB_Emerald_BaseSecondary() As String Get @@ -7052,7 +7052,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to 48,179,219. + ''' Looks up a localized string similar to 23,190,187. ''' Friend ReadOnly Property mgrThemeEngine_RGB_GBM_Base() As String Get @@ -7061,7 +7061,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to 66,203,244. + ''' Looks up a localized string similar to 14,124,123. ''' Friend ReadOnly Property mgrThemeEngine_RGB_GBM_BaseSecondary() As String Get @@ -7070,7 +7070,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to 0,0,0. + ''' Looks up a localized string similar to 255,255,255. ''' Friend ReadOnly Property mgrThemeEngine_RGB_GBM_Highlight() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 26dbeea..38fce5c 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -2450,10 +2450,10 @@ 255,255,255 - 80,200,120 + 22,193,114 - 77,137,105 + 33,79,75 255,255,255 @@ -2462,13 +2462,13 @@ 0,0,0 - 48,179,219 + 23,190,187 - 66,203,244 + 14,124,123 - 0,0,0 + 255,255,255 0,0,0 From c568e5e675f31f61e687ca6f81b83e9653889d1f Mon Sep 17 00:00:00 2001 From: Dunestorm Date: Thu, 20 Jun 2019 18:43:05 +0100 Subject: [PATCH 4/4] Tweaked various theming elements - Status bar now inherits theme style from menu bar. - Theme preview slightly expanded to show status bar. - Modified secondary highlight values of GBM and Emerald themes. --- GBM/Forms/frmMain.vb | 4 +- GBM/Forms/frmSettings.Designer.vb | 60 +++++++++++++++++----------- GBM/Forms/frmSettings.vb | 6 ++- GBM/My Project/Resources.Designer.vb | 4 +- GBM/My Project/Resources.resx | 4 +- 5 files changed, 46 insertions(+), 32 deletions(-) diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb index ca7b999..e581807 100644 --- a/GBM/Forms/frmMain.vb +++ b/GBM/Forms/frmMain.vb @@ -1649,8 +1649,8 @@ Public Class frmMain gMonMainMenu.BackColor = oThemeEngine.ColorBase gMonMainMenu.ForeColor = oThemeEngine.ColorHighlightSecondary gMonStatusStrip.BackColor = oThemeEngine.ColorBase - gMonStripTxtStatus.ForeColor = oThemeEngine.ColorHighlight - gMonStripStatusButton.ForeColor = oThemeEngine.ColorHighlight + gMonStripTxtStatus.ForeColor = oThemeEngine.ColorHighlightSecondary + gMonStripStatusButton.ForeColor = oThemeEngine.ColorHighlightSecondary 'Text Labels lblGameTitle.ForeColor = oThemeEngine.ColorHighlight diff --git a/GBM/Forms/frmSettings.Designer.vb b/GBM/Forms/frmSettings.Designer.vb index a00da96..0940091 100644 --- a/GBM/Forms/frmSettings.Designer.vb +++ b/GBM/Forms/frmSettings.Designer.vb @@ -77,13 +77,14 @@ Partial Class frmSettings Me.chkMonitorOnStartup = New System.Windows.Forms.CheckBox() Me.pnlInterface = New System.Windows.Forms.Panel() Me.grpInterfaceOptions = New System.Windows.Forms.GroupBox() + Me.lblPreviewTheme_Highlight = New System.Windows.Forms.Label() + Me.lblPreviewTheme_HighlightSecTop = New System.Windows.Forms.Label() Me.btnPreviewTheme_BaseSec = New System.Windows.Forms.Button() Me.btnPreviewTheme_Base = New System.Windows.Forms.Button() Me.chkAutoHideLog = New System.Windows.Forms.CheckBox() Me.cboThemeSelection = New System.Windows.Forms.ComboBox() Me.lblThemeSelection = New System.Windows.Forms.Label() - Me.lblPreviewTheme_HighlightSec = New System.Windows.Forms.Label() - Me.lblPreviewTheme_Highlight = New System.Windows.Forms.Label() + Me.lblPreviewTheme_HighlightSecBottom = New System.Windows.Forms.Label() Me.grpFolderOptions.SuspendLayout() Me.grp7zGeneral.SuspendLayout() Me.pnlBackup.SuspendLayout() @@ -643,8 +644,9 @@ Partial Class frmSettings ' 'grpInterfaceOptions ' + Me.grpInterfaceOptions.Controls.Add(Me.lblPreviewTheme_HighlightSecBottom) Me.grpInterfaceOptions.Controls.Add(Me.lblPreviewTheme_Highlight) - Me.grpInterfaceOptions.Controls.Add(Me.lblPreviewTheme_HighlightSec) + Me.grpInterfaceOptions.Controls.Add(Me.lblPreviewTheme_HighlightSecTop) Me.grpInterfaceOptions.Controls.Add(Me.btnPreviewTheme_BaseSec) Me.grpInterfaceOptions.Controls.Add(Me.btnPreviewTheme_Base) Me.grpInterfaceOptions.Controls.Add(Me.chkAutoHideLog) @@ -652,16 +654,34 @@ Partial Class frmSettings Me.grpInterfaceOptions.Controls.Add(Me.lblThemeSelection) Me.grpInterfaceOptions.Location = New System.Drawing.Point(6, 12) Me.grpInterfaceOptions.Name = "grpInterfaceOptions" - Me.grpInterfaceOptions.Size = New System.Drawing.Size(354, 259) + Me.grpInterfaceOptions.Size = New System.Drawing.Size(354, 299) Me.grpInterfaceOptions.TabIndex = 1 Me.grpInterfaceOptions.TabStop = False Me.grpInterfaceOptions.Text = "Interface Options" ' + 'lblPreviewTheme_Highlight + ' + Me.lblPreviewTheme_Highlight.AutoSize = True + Me.lblPreviewTheme_Highlight.Location = New System.Drawing.Point(18, 145) + Me.lblPreviewTheme_Highlight.Name = "lblPreviewTheme_Highlight" + Me.lblPreviewTheme_Highlight.Size = New System.Drawing.Size(49, 13) + Me.lblPreviewTheme_Highlight.TabIndex = 9 + Me.lblPreviewTheme_Highlight.Text = "Log Text" + ' + 'lblPreviewTheme_HighlightSecTop + ' + Me.lblPreviewTheme_HighlightSecTop.AutoSize = True + Me.lblPreviewTheme_HighlightSecTop.Location = New System.Drawing.Point(18, 58) + Me.lblPreviewTheme_HighlightSecTop.Name = "lblPreviewTheme_HighlightSecTop" + Me.lblPreviewTheme_HighlightSecTop.Size = New System.Drawing.Size(77, 13) + Me.lblPreviewTheme_HighlightSecTop.TabIndex = 8 + Me.lblPreviewTheme_HighlightSecTop.Text = "Menu Bar Text" + ' 'btnPreviewTheme_BaseSec ' Me.btnPreviewTheme_BaseSec.Enabled = False Me.btnPreviewTheme_BaseSec.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnPreviewTheme_BaseSec.Location = New System.Drawing.Point(12, 127) + Me.btnPreviewTheme_BaseSec.Location = New System.Drawing.Point(12, 139) Me.btnPreviewTheme_BaseSec.Name = "btnPreviewTheme_BaseSec" Me.btnPreviewTheme_BaseSec.Size = New System.Drawing.Size(321, 86) Me.btnPreviewTheme_BaseSec.TabIndex = 5 @@ -673,14 +693,14 @@ Partial Class frmSettings Me.btnPreviewTheme_Base.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnPreviewTheme_Base.Location = New System.Drawing.Point(12, 52) Me.btnPreviewTheme_Base.Name = "btnPreviewTheme_Base" - Me.btnPreviewTheme_Base.Size = New System.Drawing.Size(321, 171) + Me.btnPreviewTheme_Base.Size = New System.Drawing.Size(321, 194) Me.btnPreviewTheme_Base.TabIndex = 4 Me.btnPreviewTheme_Base.UseVisualStyleBackColor = True ' 'chkAutoHideLog ' Me.chkAutoHideLog.AutoSize = True - Me.chkAutoHideLog.Location = New System.Drawing.Point(12, 229) + Me.chkAutoHideLog.Location = New System.Drawing.Point(12, 275) Me.chkAutoHideLog.Name = "chkAutoHideLog" Me.chkAutoHideLog.Size = New System.Drawing.Size(167, 17) Me.chkAutoHideLog.TabIndex = 3 @@ -705,23 +725,14 @@ Partial Class frmSettings Me.lblThemeSelection.TabIndex = 0 Me.lblThemeSelection.Text = "Theme Selection:" ' - 'lblPreviewTheme_HighlightSec + 'lblPreviewTheme_HighlightSecBottom ' - Me.lblPreviewTheme_HighlightSec.AutoSize = True - Me.lblPreviewTheme_HighlightSec.Location = New System.Drawing.Point(18, 58) - Me.lblPreviewTheme_HighlightSec.Name = "lblPreviewTheme_HighlightSec" - Me.lblPreviewTheme_HighlightSec.Size = New System.Drawing.Size(77, 13) - Me.lblPreviewTheme_HighlightSec.TabIndex = 8 - Me.lblPreviewTheme_HighlightSec.Text = "Menu Bar Text" - ' - 'lblPreviewTheme_Highlight - ' - Me.lblPreviewTheme_Highlight.AutoSize = True - Me.lblPreviewTheme_Highlight.Location = New System.Drawing.Point(18, 133) - Me.lblPreviewTheme_Highlight.Name = "lblPreviewTheme_Highlight" - Me.lblPreviewTheme_Highlight.Size = New System.Drawing.Size(49, 13) - Me.lblPreviewTheme_Highlight.TabIndex = 9 - Me.lblPreviewTheme_Highlight.Text = "Log Text" + Me.lblPreviewTheme_HighlightSecBottom.AutoSize = True + Me.lblPreviewTheme_HighlightSecBottom.Location = New System.Drawing.Point(15, 229) + Me.lblPreviewTheme_HighlightSecBottom.Name = "lblPreviewTheme_HighlightSecBottom" + Me.lblPreviewTheme_HighlightSecBottom.Size = New System.Drawing.Size(80, 13) + Me.lblPreviewTheme_HighlightSecBottom.TabIndex = 10 + Me.lblPreviewTheme_HighlightSecBottom.Text = "Status Bar Text" ' 'frmSettings ' @@ -834,6 +845,7 @@ Partial Class frmSettings Friend WithEvents lblThemeSelection As Label Friend WithEvents btnPreviewTheme_Base As Button Friend WithEvents btnPreviewTheme_BaseSec As Button - Friend WithEvents lblPreviewTheme_HighlightSec As Label + Friend WithEvents lblPreviewTheme_HighlightSecTop As Label Friend WithEvents lblPreviewTheme_Highlight As Label + Friend WithEvents lblPreviewTheme_HighlightSecBottom As Label End Class diff --git a/GBM/Forms/frmSettings.vb b/GBM/Forms/frmSettings.vb index 4d651a3..255b1c2 100644 --- a/GBM/Forms/frmSettings.vb +++ b/GBM/Forms/frmSettings.vb @@ -479,8 +479,10 @@ Public Class frmSettings btnPreviewTheme_BaseSec.BackColor = oThemeEngine.ColorBaseSecondary lblPreviewTheme_Highlight.ForeColor = oThemeEngine.ColorHighlight lblPreviewTheme_Highlight.BackColor = oThemeEngine.ColorBaseSecondary - lblPreviewTheme_HighlightSec.ForeColor = oThemeEngine.ColorHighlightSecondary - lblPreviewTheme_HighlightSec.BackColor = oThemeEngine.ColorBase + lblPreviewTheme_HighlightSecTop.ForeColor = oThemeEngine.ColorHighlightSecondary + lblPreviewTheme_HighlightSecTop.BackColor = oThemeEngine.ColorBase + lblPreviewTheme_HighlightSecBottom.ForeColor = oThemeEngine.ColorHighlightSecondary + lblPreviewTheme_HighlightSecBottom.BackColor = oThemeEngine.ColorBase End If End Sub End Class \ No newline at end of file diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index fb92b45..9cf80bf 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -7043,7 +7043,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to 0,0,0. + ''' Looks up a localized string similar to 33,79,75. ''' Friend ReadOnly Property mgrThemeEngine_RGB_Emerald_HighlightSecondary() As String Get @@ -7079,7 +7079,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to 0,0,0. + ''' Looks up a localized string similar to 7,66,65. ''' Friend ReadOnly Property mgrThemeEngine_RGB_GBM_HighlightSecondary() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 38fce5c..176cb8a 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -2459,7 +2459,7 @@ 255,255,255 - 0,0,0 + 33,79,75 23,190,187 @@ -2471,6 +2471,6 @@ 255,255,255 - 0,0,0 + 7,66,65 \ No newline at end of file