Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0516a61
Merge pull request #239 from zarunbal/Development
Hirogen Jul 20, 2022
cb39ad4
added credits
Hirogen Jul 20, 2022
eab2cf8
update readme
Hirogen Jul 20, 2022
b60a6b0
Trying to apply a darker style
jlrouzies-mantu Jul 26, 2022
d59bff9
implement dark mode as setting
jlrouzies-mantu Jul 26, 2022
92c3a86
Converting more to dark mode
jlrouzies-mantu Jul 26, 2022
8a95220
Added more menu items
jlrouzies-mantu Jul 26, 2022
b0af787
move color mode to config
jlrouzies-mantu Jul 26, 2022
d3b758c
Change approach: update colors after initizalize
jlrouzies-mantu Jul 26, 2022
12df0bc
Set title bar dark mode
jlrouzies-mantu Jul 26, 2022
f898e2a
improve menus parsing
jlrouzies-mantu Jul 26, 2022
3461957
separate forms extensions and move to correct folder
jlrouzies-mantu Jul 26, 2022
c138681
update project file
jlrouzies-mantu Jul 26, 2022
a0407db
Apply dark / bright theme based on color palette
jlrouzies-mantu Jul 26, 2022
e2e98ea
Apply style to menu in datagrid
jlrouzies-mantu Jul 26, 2022
272fc32
Adjust default line background
jlrouzies-mantu Jul 26, 2022
52052e6
Color dataGrid columns, trying foreground no success
jlrouzies-mantu Jul 26, 2022
0a78ecd
Fixed specific separators
jlrouzies-mantu Jul 26, 2022
9e1ebfd
fix default text color
jlrouzies-mantu Jul 27, 2022
ab188a1
Apply theme to tabs menu and bookmarks
jlrouzies-mantu Jul 27, 2022
dbc112d
Improve menus hover colors
jlrouzies-mantu Jul 27, 2022
c22f57a
Apply style to tabs
jlrouzies-mantu Jul 27, 2022
7855d4b
Rename class
jlrouzies-mantu Jul 27, 2022
8b26241
Fixed menus borders and timeshift background
jlrouzies-mantu Jul 27, 2022
076c103
Moved tab code in region
jlrouzies-mantu Jul 27, 2022
027cd52
fix toolstrip visible border
jlrouzies-mantu Jul 27, 2022
a91007d
Apply style to no bookmarks background
jlrouzies-mantu Jul 27, 2022
875c8af
Apply style to more menu strips
jlrouzies-mantu Jul 27, 2022
f820fc5
Fixed pro filters alignment and logo for colors
jlrouzies-mantu Jul 27, 2022
face6f0
Fix filter textbox background
jlrouzies-mantu Jul 27, 2022
0d0791a
Apply color to bookmark cells
jlrouzies-mantu Jul 27, 2022
c70d908
Remove unused new comment code
jlrouzies-mantu Jul 28, 2022
6e88e19
Log error if happens
jlrouzies-mantu Jul 28, 2022
adbcd03
Small code cleaning
jlrouzies-mantu Jul 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Log error if happens
Removed unecessary this.
Other code cleaning
  • Loading branch information
jlrouzies-mantu committed Jul 28, 2022
commit 6e88e1964c04045a07700a1f65f06a271f1dfec3
42 changes: 21 additions & 21 deletions src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNum
{
InitializeComponent();

ChangeTheme(this.Controls);
ChangeTheme(Controls);

_startupFileNames = fileNames;
this._instanceNumber = instanceNumber;
Expand Down Expand Up @@ -206,52 +206,52 @@ public void ChangeTheme(Control.ControlCollection container)
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
_logger.Error(ex, "An error occured while applying style dynamically to all Controls under LogTabWindow:");
}
}
}
}
#endregion

// Colors for selected menus
this.mainMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
mainMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();

// Dock special color
this.dockPanel.DockBackColor = LogExpert.Config.ColorMode.DockBackgroundColor;
dockPanel.DockBackColor = LogExpert.Config.ColorMode.DockBackgroundColor;

// Remove toolstrip bottom border
this.buttonToolStrip.Renderer = new LogExpert.Extensions.ToolStripRendererExtension();
buttonToolStrip.Renderer = new LogExpert.Extensions.ToolStripRendererExtension();

#region Tabs
this.tabContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
tabContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();

// Tabs menu
for (var y = 0; y < this.tabContextMenuStrip.Items.Count; y++)
for (var y = 0; y < tabContextMenuStrip.Items.Count; y++)
{
var item = this.tabContextMenuStrip.Items[y];
var item = tabContextMenuStrip.Items[y];
item.ForeColor = LogExpert.Config.ColorMode.ForeColor;
item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor;
}

// Tabs line
this.dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBackgroundStripColor;
this.dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBackgroundStripColor;
dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBackgroundStripColor;
dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBackgroundStripColor;

this.dockPanel.Skin.DockPaneStripSkin.DocumentGradient.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBackgroundStripColor;
this.dockPanel.Skin.DockPaneStripSkin.DocumentGradient.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBackgroundStripColor;
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBackgroundStripColor;
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBackgroundStripColor;

// Tabs
this.dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.StartColor = LogExpert.Config.ColorMode.ActiveTabColor;
this.dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.EndColor = LogExpert.Config.ColorMode.ActiveTabColor;
this.dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.TextColor = LogExpert.Config.ColorMode.ForeColor;
dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.StartColor = LogExpert.Config.ColorMode.ActiveTabColor;
dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.EndColor = LogExpert.Config.ColorMode.ActiveTabColor;
dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.ActiveTabGradient.TextColor = LogExpert.Config.ColorMode.ForeColor;

this.dockPanel.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.StartColor = LogExpert.Config.ColorMode.ActiveTabColor;
this.dockPanel.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.EndColor = LogExpert.Config.ColorMode.ActiveTabColor;
this.dockPanel.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.TextColor = LogExpert.Config.ColorMode.ForeColor;
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.StartColor = LogExpert.Config.ColorMode.ActiveTabColor;
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.EndColor = LogExpert.Config.ColorMode.ActiveTabColor;
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.ActiveTabGradient.TextColor = LogExpert.Config.ColorMode.ForeColor;

this.dockPanel.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.StartColor = LogExpert.Config.ColorMode.InactiveTabColor;
this.dockPanel.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.EndColor = LogExpert.Config.ColorMode.InactiveTabColor;
this.dockPanel.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.TextColor = LogExpert.Config.ColorMode.ForeColor;
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.StartColor = LogExpert.Config.ColorMode.InactiveTabColor;
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.EndColor = LogExpert.Config.ColorMode.InactiveTabColor;
dockPanel.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.TextColor = LogExpert.Config.ColorMode.ForeColor;
#endregion Tabs
}
#endregion
Expand Down
71 changes: 37 additions & 34 deletions src/LogExpert/Controls/LogWindow/LogWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,12 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF
_statusLineTrigger.Signal += OnStatusLineTriggerSignal;
_selectionChangedTrigger.Signal += OnSelectionChangedTriggerSignal;

ChangeTheme(this.Controls);
ChangeTheme(Controls);
}

#endregion

#region ColorTheme
public void ChangeTheme(Control.ControlCollection container)
{
#region ApplyColorToAllControls
Expand All @@ -270,83 +273,83 @@ public void ChangeTheme(Control.ControlCollection container)
#region DataGridView

// Main DataGridView
this.dataGridView.BackgroundColor = LogExpert.Config.ColorMode.DockBackgroundColor;
this.dataGridView.ColumnHeadersDefaultCellStyle.BackColor = LogExpert.Config.ColorMode.BackgroundColor;
this.dataGridView.ColumnHeadersDefaultCellStyle.ForeColor = LogExpert.Config.ColorMode.ForeColor;
this.dataGridView.EnableHeadersVisualStyles = false;
dataGridView.BackgroundColor = LogExpert.Config.ColorMode.DockBackgroundColor;
dataGridView.ColumnHeadersDefaultCellStyle.BackColor = LogExpert.Config.ColorMode.BackgroundColor;
dataGridView.ColumnHeadersDefaultCellStyle.ForeColor = LogExpert.Config.ColorMode.ForeColor;
dataGridView.EnableHeadersVisualStyles = false;

// Colors for menu
this.dataGridContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
this.bookmarkContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
this.columnContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
this.editModeContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
this.filterContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
this.filterListContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();

for (var y = 0; y < this.dataGridContextMenuStrip.Items.Count; y++)
dataGridContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
bookmarkContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
columnContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
editModeContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
filterContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
filterListContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();

for (var y = 0; y < dataGridContextMenuStrip.Items.Count; y++)
{
var item = this.dataGridContextMenuStrip.Items[y];
var item = dataGridContextMenuStrip.Items[y];
item.ForeColor = LogExpert.Config.ColorMode.ForeColor;
item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor;
}

for (var y = 0; y < this.bookmarkContextMenuStrip.Items.Count; y++)
for (var y = 0; y < bookmarkContextMenuStrip.Items.Count; y++)
{
var item = this.bookmarkContextMenuStrip.Items[y];
var item = bookmarkContextMenuStrip.Items[y];
item.ForeColor = LogExpert.Config.ColorMode.ForeColor;
item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor;
}

for (var y = 0; y < this.columnContextMenuStrip.Items.Count; y++)
for (var y = 0; y < columnContextMenuStrip.Items.Count; y++)
{
var item = this.columnContextMenuStrip.Items[y];
var item = columnContextMenuStrip.Items[y];
item.ForeColor = LogExpert.Config.ColorMode.ForeColor;
item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor;
}

for (var y = 0; y < this.editModeContextMenuStrip.Items.Count; y++)
for (var y = 0; y < editModeContextMenuStrip.Items.Count; y++)
{
var item = this.editModeContextMenuStrip.Items[y];
var item = editModeContextMenuStrip.Items[y];
item.ForeColor = LogExpert.Config.ColorMode.ForeColor;
item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor;
}

for (var y = 0; y < this.filterContextMenuStrip.Items.Count; y++)
for (var y = 0; y < filterContextMenuStrip.Items.Count; y++)
{
var item = this.filterContextMenuStrip.Items[y];
var item = filterContextMenuStrip.Items[y];
item.ForeColor = LogExpert.Config.ColorMode.ForeColor;
item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor;
}

for (var y = 0; y < this.filterListContextMenuStrip.Items.Count; y++)
for (var y = 0; y < filterListContextMenuStrip.Items.Count; y++)
{
var item = this.filterListContextMenuStrip.Items[y];
var item = filterListContextMenuStrip.Items[y];
item.ForeColor = LogExpert.Config.ColorMode.ForeColor;
item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor;
}

// Filter dataGridView
this.filterGridView.BackgroundColor = LogExpert.Config.ColorMode.DockBackgroundColor;
this.filterGridView.ColumnHeadersDefaultCellStyle.BackColor = LogExpert.Config.ColorMode.BackgroundColor;
this.filterGridView.ColumnHeadersDefaultCellStyle.ForeColor = LogExpert.Config.ColorMode.ForeColor;
this.filterGridView.EnableHeadersVisualStyles = false;
filterGridView.BackgroundColor = LogExpert.Config.ColorMode.DockBackgroundColor;
filterGridView.ColumnHeadersDefaultCellStyle.BackColor = LogExpert.Config.ColorMode.BackgroundColor;
filterGridView.ColumnHeadersDefaultCellStyle.ForeColor = LogExpert.Config.ColorMode.ForeColor;
filterGridView.EnableHeadersVisualStyles = false;

// Colors for menu
this.filterContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
filterContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();

for (var y = 0; y < this.filterContextMenuStrip.Items.Count; y++)
for (var y = 0; y < filterContextMenuStrip.Items.Count; y++)
{
var item = this.filterContextMenuStrip.Items[y];
var item = filterContextMenuStrip.Items[y];
item.ForeColor = LogExpert.Config.ColorMode.ForeColor;
item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor;
}

#endregion DataGridView

this.proFiltersRichTextBox.BackColor = LogExpert.Config.ColorMode.BackgroundColor;
this.proFiltersRichTextBox.ForeColor = LogExpert.Config.ColorMode.ForeColor;
proFiltersRichTextBox.BackColor = LogExpert.Config.ColorMode.BackgroundColor;
proFiltersRichTextBox.ForeColor = LogExpert.Config.ColorMode.ForeColor;

this.filterComboBox.BackColor = LogExpert.Config.ColorMode.DockBackgroundColor;
filterComboBox.BackColor = LogExpert.Config.ColorMode.DockBackgroundColor;
}

#endregion
Expand Down
3 changes: 2 additions & 1 deletion src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1175,8 +1175,9 @@ private void PaintHighlightedCell(DataGridViewCellPaintingEventArgs e, DataGridV
}
}

if (foreColor == System.Drawing.Color.Black)
if (foreColor == System.Drawing.Color.Black) {
foreColor = LogExpert.Config.ColorMode.ForeColor;
}

TextRenderer.DrawText(e.Graphics, matchWord, font, wordRect,
foreColor, flags);
Expand Down
22 changes: 13 additions & 9 deletions src/LogExpert/Dialogs/BookmarkWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,13 @@ public BookmarkWindow()
bookmarkDataGridView.CellValueNeeded += boomarkDataGridView_CellValueNeeded;
bookmarkDataGridView.CellPainting += boomarkDataGridView_CellPainting;

ChangeTheme(this.Controls);
ChangeTheme(Controls);
}

#endregion

#region ColorTheme

public void ChangeTheme(Control.ControlCollection container)
{
#region ApplyColorToAllControls
Expand All @@ -57,20 +61,20 @@ public void ChangeTheme(Control.ControlCollection container)

#region DataGridView

this.BackColor = LogExpert.Config.ColorMode.DockBackgroundColor;
BackColor = LogExpert.Config.ColorMode.DockBackgroundColor;

// Main DataGridView
this.bookmarkDataGridView.BackgroundColor = LogExpert.Config.ColorMode.DockBackgroundColor;
this.bookmarkDataGridView.ColumnHeadersDefaultCellStyle.BackColor = LogExpert.Config.ColorMode.BackgroundColor;
this.bookmarkDataGridView.ColumnHeadersDefaultCellStyle.ForeColor = LogExpert.Config.ColorMode.ForeColor;
this.bookmarkDataGridView.EnableHeadersVisualStyles = false;
bookmarkDataGridView.BackgroundColor = LogExpert.Config.ColorMode.DockBackgroundColor;
bookmarkDataGridView.ColumnHeadersDefaultCellStyle.BackColor = LogExpert.Config.ColorMode.BackgroundColor;
bookmarkDataGridView.ColumnHeadersDefaultCellStyle.ForeColor = LogExpert.Config.ColorMode.ForeColor;
bookmarkDataGridView.EnableHeadersVisualStyles = false;

// Colors for menu
this.contextMenuStrip1.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();
contextMenuStrip1.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer();

for (var y = 0; y < this.contextMenuStrip1.Items.Count; y++)
for (var y = 0; y < contextMenuStrip1.Items.Count; y++)
{
var item = this.contextMenuStrip1.Items[y];
var item = contextMenuStrip1.Items[y];
item.ForeColor = LogExpert.Config.ColorMode.ForeColor;
item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor;
}
Expand Down
40 changes: 40 additions & 0 deletions src/LogExpert/Extensions/Forms/MenuStripExtension.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace LogExpert.Extensions
{
public class ExtendedMenuStripRenderer : ToolStripProfessionalRenderer
{
public ExtendedMenuStripRenderer() : base(new MenuSelectedColors()) { }
}

public class MenuSelectedColors : ProfessionalColorTable
{
public override Color ImageMarginGradientBegin => LogExpert.Config.ColorMode.MenuBackgroundColor;

public override Color ImageMarginGradientMiddle => LogExpert.Config.ColorMode.MenuBackgroundColor;

public override Color ImageMarginGradientEnd => LogExpert.Config.ColorMode.MenuBackgroundColor;

public override Color ToolStripDropDownBackground => LogExpert.Config.ColorMode.MenuBackgroundColor;

public override Color MenuBorder => LogExpert.Config.ColorMode.MenuBackgroundColor;

public override Color MenuItemBorder => LogExpert.Config.ColorMode.MenuBackgroundColor;

public override Color MenuItemSelected => LogExpert.Config.ColorMode.HoverMenuBackgroundColor;

public override Color MenuItemSelectedGradientBegin => LogExpert.Config.ColorMode.HoverMenuBackgroundColor;

public override Color MenuItemSelectedGradientEnd => LogExpert.Config.ColorMode.HoverMenuBackgroundColor;

public override Color MenuItemPressedGradientBegin => LogExpert.Config.ColorMode.MenuBackgroundColor;

public override Color MenuItemPressedGradientEnd => LogExpert.Config.ColorMode.MenuBackgroundColor;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public ToolStripRendererExtension() { }

protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e)
{
// Commented on purpose to avoid drawing the border that appears visible in Dark Mode (not visible in Bright mode)
//base.OnRenderToolStripBorder(e);
}
}
Expand Down
Loading