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

Cleaned up code, also made output log fill window

Browse Source
This commit is contained in:
Dunestorm
2019-03-15 12:04:52 +00:00
parent d89b4fd824
commit f29a58329e
5 changed files with 69 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GBM/Forms/frmMain.Designer.vb
Generated
+4 -3
View File
@@ -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
GBM/Forms/frmMain.vb
+20 -16
View File
@@ -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
GBM/Managers/mgrThemeEngine.vb
+20 -20
View File
@@ -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
''' <summary>
@@ -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
GBM/My Project/Resources.Designer.vb
Generated
+17 -17
View File
@@ -22,7 +22,7 @@ Namespace My.Resources
'''<summary>
''' A strongly-typed resource class, for looking up localized strings, etc.
'''</summary>
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"), _
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
@@ -6828,72 +6828,72 @@ Namespace My.Resources
'''<summary>
''' Looks up a localized string similar to 25,25,25.
'''</summary>
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
'''<summary>
''' Looks up a localized string similar to 0,0,0.
'''</summary>
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
'''<summary>
''' Looks up a localized string similar to 255,255,255.
'''</summary>
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
'''<summary>
''' Looks up a localized string similar to 0,131,255.
'''</summary>
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
'''<summary>
''' Looks up a localized string similar to 240,240,240.
'''</summary>
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
'''<summary>
''' Looks up a localized string similar to 255,255,255.
'''</summary>
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
'''<summary>
''' Looks up a localized string similar to 0,0,0.
'''</summary>
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
'''<summary>
''' Looks up a localized string similar to 0,0,0.
'''</summary>
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
GBM/My Project/Resources.resx
+8 -8
View File
@@ -2374,28 +2374,28 @@
<data name="mgrCommon_FolderSelection" xml:space="preserve">
<value>Current Folder</value>
</data>
<data name="mgrThemeEngine_Theme_Dark_BaseAlt" xml:space="preserve">
<data name="mgrThemeEngine_RGB_Dark_BaseSecondary" xml:space="preserve">
<value>0,0,0</value>
</data>
<data name="mgrThemeEngine_Theme_Dark_HighlightAlt" xml:space="preserve">
<data name="mgrThemeEngine_RGB_Dark_HighlightSecondary" xml:space="preserve">
<value>0,131,255</value>
</data>
<data name="mgrThemeEngine_Theme_Dark_Base" xml:space="preserve">
<data name="mgrThemeEngine_RGB_Dark_Base" xml:space="preserve">
<value>25,25,25</value>
</data>
<data name="mgrThemeEngine_Theme_Dark_Highlight" xml:space="preserve">
<data name="mgrThemeEngine_RGB_Dark_Highlight" xml:space="preserve">
<value>255,255,255</value>
</data>
<data name="mgrThemeEngine_Theme_Light_Base" xml:space="preserve">
<data name="mgrThemeEngine_RGB_Light_Base" xml:space="preserve">
<value>240,240,240</value>
</data>
<data name="mgrThemeEngine_Theme_Light_BaseAlt" xml:space="preserve">
<data name="mgrThemeEngine_RGB_Light_BaseSecondary" xml:space="preserve">
<value>255,255,255</value>
</data>
<data name="mgrThemeEngine_Theme_Light_Highlight" xml:space="preserve">
<data name="mgrThemeEngine_RGB_Light_Highlight" xml:space="preserve">
<value>0,0,0</value>
</data>
<data name="mgrThemeEngine_Theme_Light_HighlightAlt" xml:space="preserve">
<data name="mgrThemeEngine_RGB_Light_HighlightSecondary" xml:space="preserve">
<value>0,0,0</value>
</data>
</root>