From f29a58329e4ddf488f38757fcf2a87b39d41fd93 Mon Sep 17 00:00:00 2001 From: Dunestorm Date: Fri, 15 Mar 2019 12:04:52 +0000 Subject: [PATCH] Cleaned up code, also made output log fill window --- GBM/Forms/frmMain.Designer.vb | 7 ++--- GBM/Forms/frmMain.vb | 36 ++++++++++++++----------- GBM/Managers/mgrThemeEngine.vb | 40 ++++++++++++++-------------- GBM/My Project/Resources.Designer.vb | 34 +++++++++++------------ GBM/My Project/Resources.resx | 16 +++++------ 5 files changed, 69 insertions(+), 64 deletions(-) diff --git a/GBM/Forms/frmMain.Designer.vb b/GBM/Forms/frmMain.Designer.vb index d21040a..ae5040b 100644 --- a/GBM/Forms/frmMain.Designer.vb +++ b/GBM/Forms/frmMain.Designer.vb @@ -257,14 +257,15 @@ Partial Class frmMain Me.txtLog.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtLog.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.txtLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtLog.Location = New System.Drawing.Point(12, 184) + Me.txtLog.Location = New System.Drawing.Point(0, 184) Me.txtLog.MaxLength = 524288 Me.txtLog.Multiline = True Me.txtLog.Name = "txtLog" Me.txtLog.ReadOnly = True Me.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtLog.Size = New System.Drawing.Size(500, 186) + Me.txtLog.Size = New System.Drawing.Size(524, 192) Me.txtLog.TabIndex = 10 Me.txtLog.TabStop = False ' @@ -292,7 +293,7 @@ Partial Class frmMain ' Me.gMonStripTxtStatus.Margin = New System.Windows.Forms.Padding(5, 0, 0, 0) Me.gMonStripTxtStatus.Name = "gMonStripTxtStatus" - Me.gMonStripTxtStatus.Size = New System.Drawing.Size(369, 22) + Me.gMonStripTxtStatus.Size = New System.Drawing.Size(400, 22) Me.gMonStripTxtStatus.Spring = True Me.gMonStripTxtStatus.Text = "Monitor Status" Me.gMonStripTxtStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb index bd7f32a..2e375b0 100644 --- a/GBM/Forms/frmMain.vb +++ b/GBM/Forms/frmMain.vb @@ -1571,23 +1571,27 @@ Public Class frmMain Private Sub InitThemeEngine() Dim oThemeEngine As New mgrThemeEngine - oThemeEngine.SetTheme(mgrThemeEngine.eBaseTheme.Light) 'Will ultimately be changable via UI + oThemeEngine.SetTheme(mgrThemeEngine.eBaseTheme.Dark) 'Will ultimately be changable via UI - BackColor = oThemeEngine.colBase - gMonMainMenu.BackColor = oThemeEngine.colBase - gMonMainMenu.ForeColor = oThemeEngine.colHighlightAlt - gMonStatusStrip.BackColor = oThemeEngine.colBase - gMonStripTxtStatus.ForeColor = oThemeEngine.colHightlight - gMonStripStatusButton.ForeColor = oThemeEngine.colHightlight - lblGameTitle.ForeColor = oThemeEngine.colHightlight - lblStatus1.ForeColor = oThemeEngine.colHightlight - lblStatus2.ForeColor = oThemeEngine.colHightlight - lblStatus3.ForeColor = oThemeEngine.colHightlight - lblTimeSpent.ForeColor = oThemeEngine.colHightlight - lblLastActionTitle.ForeColor = oThemeEngine.colHightlight - lblLastAction.ForeColor = oThemeEngine.colHightlight - txtLog.BackColor = oThemeEngine.colBaseAlt - txtLog.ForeColor = oThemeEngine.colHightlight + 'Base Theme + BackColor = oThemeEngine.ColorBase + 'Menu/Status Bars + gMonMainMenu.BackColor = oThemeEngine.ColorBase + gMonMainMenu.ForeColor = oThemeEngine.ColorHighlightSecondary + gMonStatusStrip.BackColor = oThemeEngine.ColorBase + gMonStripTxtStatus.ForeColor = oThemeEngine.ColorHighlight + gMonStripStatusButton.ForeColor = oThemeEngine.ColorHighlight + 'Text Labels + lblGameTitle.ForeColor = oThemeEngine.ColorHighlight + lblStatus1.ForeColor = oThemeEngine.ColorHighlight + lblStatus2.ForeColor = oThemeEngine.ColorHighlight + lblStatus3.ForeColor = oThemeEngine.ColorHighlight + lblTimeSpent.ForeColor = oThemeEngine.ColorHighlight + lblLastActionTitle.ForeColor = oThemeEngine.ColorHighlight + lblLastAction.ForeColor = oThemeEngine.ColorHighlight + 'Output Log + txtLog.BackColor = oThemeEngine.ColorBaseSecondary + txtLog.ForeColor = oThemeEngine.ColorHighlight End Sub Private Function BuildChildProcesses() As Integer diff --git a/GBM/Managers/mgrThemeEngine.vb b/GBM/Managers/mgrThemeEngine.vb index bc15078..c71851a 100644 --- a/GBM/Managers/mgrThemeEngine.vb +++ b/GBM/Managers/mgrThemeEngine.vb @@ -2,10 +2,10 @@ Public Class mgrThemeEngine - Public ReadOnly Property colBase As Color - Public ReadOnly Property colBaseAlt As Color - Public ReadOnly Property colHightlight As Color - Public ReadOnly Property colHighlightAlt As Color + Public ReadOnly Property ColorBase As Color + Public ReadOnly Property ColorBaseSecondary As Color + Public ReadOnly Property ColorHighlight As Color + Public ReadOnly Property ColorHighlightSecondary As Color ''' @@ -25,30 +25,30 @@ Public Class mgrThemeEngine Dim selectedColor As Color Select Case _eBaseTheme Case eBaseTheme.Dark - _colBase = New ColorConverter().ConvertFromString( - mgrThemeEngine_Theme_Dark_Base) + _ColorBase = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Dark_Base) - _colBaseAlt = New ColorConverter().ConvertFromString( - mgrThemeEngine_Theme_Dark_BaseAlt) + _ColorBaseSecondary = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Dark_BaseSecondary) - _colHightlight = New ColorConverter().ConvertFromString( - mgrThemeEngine_Theme_Dark_Highlight) + _ColorHighlight = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Dark_Highlight) - _colHighlightAlt = New ColorConverter().ConvertFromString( - mgrThemeEngine_Theme_Dark_HighlightAlt) + _ColorHighlightSecondary = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Dark_HighlightSecondary) Case eBaseTheme.Light - _colBase = New ColorConverter().ConvertFromString( - mgrThemeEngine_Theme_Light_Base) + _ColorBase = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Light_Base) - _colBaseAlt = New ColorConverter().ConvertFromString( - mgrThemeEngine_Theme_Light_BaseAlt) + _ColorBaseSecondary = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Light_BaseSecondary) - _colHightlight = New ColorConverter().ConvertFromString( - mgrThemeEngine_Theme_Light_Highlight) + _ColorHighlight = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Light_Highlight) - _colHighlightAlt = New ColorConverter().ConvertFromString( - mgrThemeEngine_Theme_Light_HighlightAlt) + _ColorHighlightSecondary = New ColorConverter().ConvertFromString( + mgrThemeEngine_RGB_Light_HighlightSecondary) End Select Return selectedColor diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 0f59327..6610227 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. ''' - _ @@ -6828,72 +6828,72 @@ Namespace My.Resources ''' ''' Looks up a localized string similar to 25,25,25. ''' - Friend ReadOnly Property mgrThemeEngine_Theme_Dark_Base() As String + Friend ReadOnly Property mgrThemeEngine_RGB_Dark_Base() As String Get - Return ResourceManager.GetString("mgrThemeEngine_Theme_Dark_Base", resourceCulture) + Return ResourceManager.GetString("mgrThemeEngine_RGB_Dark_Base", resourceCulture) End Get End Property ''' ''' Looks up a localized string similar to 0,0,0. ''' - Friend ReadOnly Property mgrThemeEngine_Theme_Dark_BaseAlt() As String + Friend ReadOnly Property mgrThemeEngine_RGB_Dark_BaseSecondary() As String Get - Return ResourceManager.GetString("mgrThemeEngine_Theme_Dark_BaseAlt", resourceCulture) + Return ResourceManager.GetString("mgrThemeEngine_RGB_Dark_BaseSecondary", resourceCulture) End Get End Property ''' ''' Looks up a localized string similar to 255,255,255. ''' - Friend ReadOnly Property mgrThemeEngine_Theme_Dark_Highlight() As String + Friend ReadOnly Property mgrThemeEngine_RGB_Dark_Highlight() As String Get - Return ResourceManager.GetString("mgrThemeEngine_Theme_Dark_Highlight", resourceCulture) + Return ResourceManager.GetString("mgrThemeEngine_RGB_Dark_Highlight", resourceCulture) End Get End Property ''' ''' Looks up a localized string similar to 0,131,255. ''' - Friend ReadOnly Property mgrThemeEngine_Theme_Dark_HighlightAlt() As String + Friend ReadOnly Property mgrThemeEngine_RGB_Dark_HighlightSecondary() As String Get - Return ResourceManager.GetString("mgrThemeEngine_Theme_Dark_HighlightAlt", resourceCulture) + Return ResourceManager.GetString("mgrThemeEngine_RGB_Dark_HighlightSecondary", resourceCulture) End Get End Property ''' ''' Looks up a localized string similar to 240,240,240. ''' - Friend ReadOnly Property mgrThemeEngine_Theme_Light_Base() As String + Friend ReadOnly Property mgrThemeEngine_RGB_Light_Base() As String Get - Return ResourceManager.GetString("mgrThemeEngine_Theme_Light_Base", resourceCulture) + Return ResourceManager.GetString("mgrThemeEngine_RGB_Light_Base", resourceCulture) End Get End Property ''' ''' Looks up a localized string similar to 255,255,255. ''' - Friend ReadOnly Property mgrThemeEngine_Theme_Light_BaseAlt() As String + Friend ReadOnly Property mgrThemeEngine_RGB_Light_BaseSecondary() As String Get - Return ResourceManager.GetString("mgrThemeEngine_Theme_Light_BaseAlt", resourceCulture) + Return ResourceManager.GetString("mgrThemeEngine_RGB_Light_BaseSecondary", resourceCulture) End Get End Property ''' ''' Looks up a localized string similar to 0,0,0. ''' - Friend ReadOnly Property mgrThemeEngine_Theme_Light_Highlight() As String + Friend ReadOnly Property mgrThemeEngine_RGB_Light_Highlight() As String Get - Return ResourceManager.GetString("mgrThemeEngine_Theme_Light_Highlight", resourceCulture) + Return ResourceManager.GetString("mgrThemeEngine_RGB_Light_Highlight", resourceCulture) End Get End Property ''' ''' Looks up a localized string similar to 0,0,0. ''' - Friend ReadOnly Property mgrThemeEngine_Theme_Light_HighlightAlt() As String + Friend ReadOnly Property mgrThemeEngine_RGB_Light_HighlightSecondary() As String Get - Return ResourceManager.GetString("mgrThemeEngine_Theme_Light_HighlightAlt", resourceCulture) + Return ResourceManager.GetString("mgrThemeEngine_RGB_Light_HighlightSecondary", resourceCulture) End Get End Property diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 91f3bcb..cc9a987 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -2374,28 +2374,28 @@ Current Folder - + 0,0,0 - + 0,131,255 - + 25,25,25 - + 255,255,255 - + 240,240,240 - + 255,255,255 - + 0,0,0 - + 0,0,0 \ No newline at end of file