Theme tweaks for better contrast

- Game title next now inherits theming from base theme text for improved contrast.
- Theme preview shows game title.
This commit is contained in:
2019-06-22 11:33:47 +01:00
parent b69e0f1474
commit 15e306d8e1
3 changed files with 35 additions and 15 deletions
+7 -7
View File
@@ -1653,13 +1653,13 @@ Public Class frmMain
gMonStripStatusButton.ForeColor = oThemeEngine.ColorHighlightSecondary gMonStripStatusButton.ForeColor = oThemeEngine.ColorHighlightSecondary
'Text Labels 'Text Labels
lblGameTitle.ForeColor = oThemeEngine.ColorHighlight lblGameTitle.ForeColor = oThemeEngine.ColorHighlightSecondary
lblStatus1.ForeColor = oThemeEngine.ColorHighlight lblStatus1.ForeColor = oThemeEngine.ColorHighlightSecondary
lblStatus2.ForeColor = oThemeEngine.ColorHighlight lblStatus2.ForeColor = oThemeEngine.ColorHighlightSecondary
lblStatus3.ForeColor = oThemeEngine.ColorHighlight lblStatus3.ForeColor = oThemeEngine.ColorHighlightSecondary
lblTimeSpent.ForeColor = oThemeEngine.ColorHighlight lblTimeSpent.ForeColor = oThemeEngine.ColorHighlightSecondary
lblLastActionTitle.ForeColor = oThemeEngine.ColorHighlight lblLastActionTitle.ForeColor = oThemeEngine.ColorHighlightSecondary
lblLastAction.ForeColor = oThemeEngine.ColorHighlight lblLastAction.ForeColor = oThemeEngine.ColorHighlightSecondary
'Output Log 'Output Log
txtLog.BackColor = oThemeEngine.ColorBaseSecondary txtLog.BackColor = oThemeEngine.ColorBaseSecondary
+21 -8
View File
@@ -77,6 +77,7 @@ Partial Class frmSettings
Me.chkMonitorOnStartup = New System.Windows.Forms.CheckBox() Me.chkMonitorOnStartup = New System.Windows.Forms.CheckBox()
Me.pnlInterface = New System.Windows.Forms.Panel() Me.pnlInterface = New System.Windows.Forms.Panel()
Me.grpInterfaceOptions = New System.Windows.Forms.GroupBox() Me.grpInterfaceOptions = New System.Windows.Forms.GroupBox()
Me.lblPreviewTheme_HighlightSecBottom = New System.Windows.Forms.Label()
Me.lblPreviewTheme_Highlight = New System.Windows.Forms.Label() Me.lblPreviewTheme_Highlight = New System.Windows.Forms.Label()
Me.lblPreviewTheme_HighlightSecTop = New System.Windows.Forms.Label() Me.lblPreviewTheme_HighlightSecTop = New System.Windows.Forms.Label()
Me.btnPreviewTheme_BaseSec = New System.Windows.Forms.Button() Me.btnPreviewTheme_BaseSec = New System.Windows.Forms.Button()
@@ -84,7 +85,7 @@ Partial Class frmSettings
Me.chkAutoHideLog = New System.Windows.Forms.CheckBox() Me.chkAutoHideLog = New System.Windows.Forms.CheckBox()
Me.cboThemeSelection = New System.Windows.Forms.ComboBox() Me.cboThemeSelection = New System.Windows.Forms.ComboBox()
Me.lblThemeSelection = New System.Windows.Forms.Label() Me.lblThemeSelection = New System.Windows.Forms.Label()
Me.lblPreviewTheme_HighlightSecBottom = New System.Windows.Forms.Label() Me.lblPreviewTheme_HighlightSec = New System.Windows.Forms.Label()
Me.grpFolderOptions.SuspendLayout() Me.grpFolderOptions.SuspendLayout()
Me.grp7zGeneral.SuspendLayout() Me.grp7zGeneral.SuspendLayout()
Me.pnlBackup.SuspendLayout() Me.pnlBackup.SuspendLayout()
@@ -644,6 +645,7 @@ Partial Class frmSettings
' '
'grpInterfaceOptions 'grpInterfaceOptions
' '
Me.grpInterfaceOptions.Controls.Add(Me.lblPreviewTheme_HighlightSec)
Me.grpInterfaceOptions.Controls.Add(Me.lblPreviewTheme_HighlightSecBottom) Me.grpInterfaceOptions.Controls.Add(Me.lblPreviewTheme_HighlightSecBottom)
Me.grpInterfaceOptions.Controls.Add(Me.lblPreviewTheme_Highlight) Me.grpInterfaceOptions.Controls.Add(Me.lblPreviewTheme_Highlight)
Me.grpInterfaceOptions.Controls.Add(Me.lblPreviewTheme_HighlightSecTop) Me.grpInterfaceOptions.Controls.Add(Me.lblPreviewTheme_HighlightSecTop)
@@ -659,6 +661,15 @@ Partial Class frmSettings
Me.grpInterfaceOptions.TabStop = False Me.grpInterfaceOptions.TabStop = False
Me.grpInterfaceOptions.Text = "Interface Options" Me.grpInterfaceOptions.Text = "Interface Options"
' '
'lblPreviewTheme_HighlightSecBottom
'
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"
'
'lblPreviewTheme_Highlight 'lblPreviewTheme_Highlight
' '
Me.lblPreviewTheme_Highlight.AutoSize = True Me.lblPreviewTheme_Highlight.AutoSize = True
@@ -725,14 +736,15 @@ Partial Class frmSettings
Me.lblThemeSelection.TabIndex = 0 Me.lblThemeSelection.TabIndex = 0
Me.lblThemeSelection.Text = "Theme Selection:" Me.lblThemeSelection.Text = "Theme Selection:"
' '
'lblPreviewTheme_HighlightSecBottom 'lblPreviewTheme_HighlightSec
' '
Me.lblPreviewTheme_HighlightSecBottom.AutoSize = True Me.lblPreviewTheme_HighlightSec.AutoSize = True
Me.lblPreviewTheme_HighlightSecBottom.Location = New System.Drawing.Point(15, 229) Me.lblPreviewTheme_HighlightSec.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblPreviewTheme_HighlightSecBottom.Name = "lblPreviewTheme_HighlightSecBottom" Me.lblPreviewTheme_HighlightSec.Location = New System.Drawing.Point(16, 77)
Me.lblPreviewTheme_HighlightSecBottom.Size = New System.Drawing.Size(80, 13) Me.lblPreviewTheme_HighlightSec.Name = "lblPreviewTheme_HighlightSec"
Me.lblPreviewTheme_HighlightSecBottom.TabIndex = 10 Me.lblPreviewTheme_HighlightSec.Size = New System.Drawing.Size(143, 24)
Me.lblPreviewTheme_HighlightSecBottom.Text = "Status Bar Text" Me.lblPreviewTheme_HighlightSec.TabIndex = 11
Me.lblPreviewTheme_HighlightSec.Text = "Game Title Text"
' '
'frmSettings 'frmSettings
' '
@@ -848,4 +860,5 @@ Partial Class frmSettings
Friend WithEvents lblPreviewTheme_HighlightSecTop As Label Friend WithEvents lblPreviewTheme_HighlightSecTop As Label
Friend WithEvents lblPreviewTheme_Highlight As Label Friend WithEvents lblPreviewTheme_Highlight As Label
Friend WithEvents lblPreviewTheme_HighlightSecBottom As Label Friend WithEvents lblPreviewTheme_HighlightSecBottom As Label
Friend WithEvents lblPreviewTheme_HighlightSec As Label
End Class End Class
+7
View File
@@ -475,14 +475,21 @@ Public Class frmSettings
'Only set the theme once it has been defined. 'Only set the theme once it has been defined.
If oThemeEngine.bThemeHasBeenDefined Then If oThemeEngine.bThemeHasBeenDefined Then
'Base Theme
btnPreviewTheme_Base.BackColor = oThemeEngine.ColorBase btnPreviewTheme_Base.BackColor = oThemeEngine.ColorBase
btnPreviewTheme_BaseSec.BackColor = oThemeEngine.ColorBaseSecondary btnPreviewTheme_BaseSec.BackColor = oThemeEngine.ColorBaseSecondary
'Log Text
lblPreviewTheme_Highlight.ForeColor = oThemeEngine.ColorHighlight lblPreviewTheme_Highlight.ForeColor = oThemeEngine.ColorHighlight
lblPreviewTheme_Highlight.BackColor = oThemeEngine.ColorBaseSecondary lblPreviewTheme_Highlight.BackColor = oThemeEngine.ColorBaseSecondary
'Menu Bar Text
lblPreviewTheme_HighlightSecTop.ForeColor = oThemeEngine.ColorHighlightSecondary lblPreviewTheme_HighlightSecTop.ForeColor = oThemeEngine.ColorHighlightSecondary
lblPreviewTheme_HighlightSecTop.BackColor = oThemeEngine.ColorBase lblPreviewTheme_HighlightSecTop.BackColor = oThemeEngine.ColorBase
'Status Bar Text
lblPreviewTheme_HighlightSecBottom.ForeColor = oThemeEngine.ColorHighlightSecondary lblPreviewTheme_HighlightSecBottom.ForeColor = oThemeEngine.ColorHighlightSecondary
lblPreviewTheme_HighlightSecBottom.BackColor = oThemeEngine.ColorBase lblPreviewTheme_HighlightSecBottom.BackColor = oThemeEngine.ColorBase
'Game Title Text
lblPreviewTheme_HighlightSec.ForeColor = oThemeEngine.ColorHighlightSecondary
lblPreviewTheme_HighlightSec.BackColor = oThemeEngine.ColorBase
End If End If
End Sub End Sub
End Class End Class