dunestorm/GBM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented light/default theme as well as refactored some code

Browse Source
This commit is contained in:
Dunestorm
2019-03-14 19:23:47 +00:00
parent c557b2554b
commit d89b4fd824
4 changed files with 118 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GBM/Forms/frmMain.vb
+6 -1
View File
@@ -1566,8 +1566,13 @@ Public Class frmMain
ResetGameInfo()
'Initialise theme engine
InitThemeEngine()
End Sub
Private Sub InitThemeEngine()
Dim oThemeEngine As New mgrThemeEngine
oThemeEngine.SetTheme(mgrThemeEngine.eTheme.Dark)
oThemeEngine.SetTheme(mgrThemeEngine.eBaseTheme.Light) 'Will ultimately be changable via UI
BackColor = oThemeEngine.colBase
gMonMainMenu.BackColor = oThemeEngine.colBase
gMonMainMenu.ForeColor = oThemeEngine.colHighlightAlt
GBM/Managers/mgrThemeEngine.vb
+38 -8
View File
@@ -8,18 +8,48 @@ Public Class mgrThemeEngine
Public ReadOnly Property colHighlightAlt As Color
Public Enum eTheme
''' <summary>
''' Supported themes.
''' </summary>
Public Enum eBaseTheme
Dark
Light
End Enum
Public Function SetTheme(thm As eTheme)
''' <summary>
''' Configures the base colors for the overall theme based on input.
''' </summary>
''' <param name="_eBaseTheme"></param>
''' <returns></returns>
Public Function SetTheme(_eBaseTheme As eBaseTheme)
Dim selectedColor As Color
Select Case thm
Case eTheme.Dark
_colBase = New ColorConverter().ConvertFromString(mgrThemeEngine_Color_Dark)
_colBaseAlt = New ColorConverter().ConvertFromString(mgrThemeEngine_Color_Black)
_colHightlight = New ColorConverter().ConvertFromString(mgrThemeEngine_Color_White)
_colHighlightAlt = New ColorConverter().ConvertFromString(mgrThemeEngine_Color_Blue)
Select Case _eBaseTheme
Case eBaseTheme.Dark
_colBase = New ColorConverter().ConvertFromString(
mgrThemeEngine_Theme_Dark_Base)
_colBaseAlt = New ColorConverter().ConvertFromString(
mgrThemeEngine_Theme_Dark_BaseAlt)
_colHightlight = New ColorConverter().ConvertFromString(
mgrThemeEngine_Theme_Dark_Highlight)
_colHighlightAlt = New ColorConverter().ConvertFromString(
mgrThemeEngine_Theme_Dark_HighlightAlt)
Case eBaseTheme.Light
_colBase = New ColorConverter().ConvertFromString(
mgrThemeEngine_Theme_Light_Base)
_colBaseAlt = New ColorConverter().ConvertFromString(
mgrThemeEngine_Theme_Light_BaseAlt)
_colHightlight = New ColorConverter().ConvertFromString(
mgrThemeEngine_Theme_Light_Highlight)
_colHighlightAlt = New ColorConverter().ConvertFromString(
mgrThemeEngine_Theme_Light_HighlightAlt)
End Select
Return selectedColor
End Function
GBM/My Project/Resources.Designer.vb
Generated
+58 -22
View File
@@ -6825,39 +6825,75 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Looks up a localized string similar to 0,0,0.
'''</summary>
Friend ReadOnly Property mgrThemeEngine_Color_Black() As String
Get
Return ResourceManager.GetString("mgrThemeEngine_Color_Black", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to 0,131,255.
'''</summary>
Friend ReadOnly Property mgrThemeEngine_Color_Blue() As String
Get
Return ResourceManager.GetString("mgrThemeEngine_Color_Blue", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to 25,25,25.
'''</summary>
Friend ReadOnly Property mgrThemeEngine_Color_Dark() As String
Friend ReadOnly Property mgrThemeEngine_Theme_Dark_Base() As String
Get
Return ResourceManager.GetString("mgrThemeEngine_Color_Dark", resourceCulture)
Return ResourceManager.GetString("mgrThemeEngine_Theme_Dark_Base", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to 0,0,0.
'''</summary>
Friend ReadOnly Property mgrThemeEngine_Theme_Dark_BaseAlt() As String
Get
Return ResourceManager.GetString("mgrThemeEngine_Theme_Dark_BaseAlt", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to 255,255,255.
'''</summary>
Friend ReadOnly Property mgrThemeEngine_Color_White() As String
Friend ReadOnly Property mgrThemeEngine_Theme_Dark_Highlight() As String
Get
Return ResourceManager.GetString("mgrThemeEngine_Color_White", resourceCulture)
Return ResourceManager.GetString("mgrThemeEngine_Theme_Dark_Highlight", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to 0,131,255.
'''</summary>
Friend ReadOnly Property mgrThemeEngine_Theme_Dark_HighlightAlt() As String
Get
Return ResourceManager.GetString("mgrThemeEngine_Theme_Dark_HighlightAlt", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to 240,240,240.
'''</summary>
Friend ReadOnly Property mgrThemeEngine_Theme_Light_Base() As String
Get
Return ResourceManager.GetString("mgrThemeEngine_Theme_Light_Base", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to 255,255,255.
'''</summary>
Friend ReadOnly Property mgrThemeEngine_Theme_Light_BaseAlt() As String
Get
Return ResourceManager.GetString("mgrThemeEngine_Theme_Light_BaseAlt", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to 0,0,0.
'''</summary>
Friend ReadOnly Property mgrThemeEngine_Theme_Light_Highlight() As String
Get
Return ResourceManager.GetString("mgrThemeEngine_Theme_Light_Highlight", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to 0,0,0.
'''</summary>
Friend ReadOnly Property mgrThemeEngine_Theme_Light_HighlightAlt() As String
Get
Return ResourceManager.GetString("mgrThemeEngine_Theme_Light_HighlightAlt", resourceCulture)
End Get
End Property
GBM/My Project/Resources.resx
+16 -4
View File
@@ -2374,16 +2374,28 @@
<data name="mgrCommon_FolderSelection" xml:space="preserve">
<value>Current Folder</value>
</data>
<data name="mgrThemeEngine_Color_Black" xml:space="preserve">
<data name="mgrThemeEngine_Theme_Dark_BaseAlt" xml:space="preserve">
<value>0,0,0</value>
</data>
<data name="mgrThemeEngine_Color_Blue" xml:space="preserve">
<data name="mgrThemeEngine_Theme_Dark_HighlightAlt" xml:space="preserve">
<value>0,131,255</value>
</data>
<data name="mgrThemeEngine_Color_Dark" xml:space="preserve">
<data name="mgrThemeEngine_Theme_Dark_Base" xml:space="preserve">
<value>25,25,25</value>
</data>
<data name="mgrThemeEngine_Color_White" xml:space="preserve">
<data name="mgrThemeEngine_Theme_Dark_Highlight" xml:space="preserve">
<value>255,255,255</value>
</data>
<data name="mgrThemeEngine_Theme_Light_Base" xml:space="preserve">
<value>240,240,240</value>
</data>
<data name="mgrThemeEngine_Theme_Light_BaseAlt" xml:space="preserve">
<value>255,255,255</value>
</data>
<data name="mgrThemeEngine_Theme_Light_Highlight" xml:space="preserve">
<value>0,0,0</value>
</data>
<data name="mgrThemeEngine_Theme_Light_HighlightAlt" xml:space="preserve">
<value>0,0,0</value>
</data>
</root>