From 9c3643fa2e3e32dcf99325a6499b69dc1391c841 Mon Sep 17 00:00:00 2001 From: Dunestorm Date: Mon, 10 Jun 2019 15:02:13 +0100 Subject: [PATCH] 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