From cb39ad44407b54d1b3b8ffcb27ac15df0077d7b3 Mon Sep 17 00:00:00 2001 From: Patrick Bruner Date: Wed, 20 Jul 2022 09:45:03 +0200 Subject: [PATCH 01/33] added credits added credits --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index b70cf8c4..1e699f14 100644 --- a/README.md +++ b/README.md @@ -56,3 +56,13 @@ Nuke.build Requirements Please checkout the wiki for FAQ / HELP / Informations / Examples https://github.com/zarunbal/LogExpert/wiki + +## Credits +### Contributors + +This project exists thanks to all the people who contribute. + + + + +Made with [contrib.rocks](https://contrib.rocks). From eab2cf86abbb6ece15ab5b85e771a42936246631 Mon Sep 17 00:00:00 2001 From: Patrick Bruner Date: Wed, 20 Jul 2022 09:51:07 +0200 Subject: [PATCH 02/33] update readme updated the readme a bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e699f14..b4892d60 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # LogExpert [![Build status](https://ci.appveyor.com/api/projects/status/hxwxyyxy81l4tee8/branch/master?svg=true)](https://ci.appveyor.com/project/Zarunbal/logexpert/branch/master) -Clone from https://logexpert.codeplex.com/ +This is a clone from (no longer exists) https://logexpert.codeplex.com/ # Overview LogExpert is a Windows tail program (a GUI replacement for the Unix tail command). @@ -21,6 +21,7 @@ Summary of (most) features: * Plugin API for more log file data sources * Automatical determine columnizer with given file name and content (Experimental) * Serilog.Formatting.Compact format support (Experimental) +* Portable (all options / settings saved in application startup directory) # Download Follow the [Link](https://github.com/zarunbal/LogExpert/releases/latest) and download the latest package. Just extract it where you want and execute the application or download the Setup and install it From b60a6b0e5c687df0f5ae9693aaeb302ecb92a301 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 14:14:56 +0200 Subject: [PATCH 03/33] Trying to apply a darker style --- src/LogExpert/Controls/DarkTitleBar.cs | 37 +++ .../Controls/LogTabWindow/LogTabWindow.cs | 1 + .../LogTabWindow/LogTabWindow.designer.cs | 254 +++++++++--------- .../Controls/LogTabWindow/LogTabWindow.resx | 4 +- .../Controls/LogWindow/LogWindow.designer.cs | 191 +++++++------ .../LogWindow/LogWindowEventHandlers.cs | 1 + .../Controls/LogWindow/LogWindowPrivate.cs | 1 + .../Controls/LogWindow/LogWindowsPublic.cs | 2 + src/LogExpert/LogExpert.csproj | 1 + 9 files changed, 272 insertions(+), 220 deletions(-) create mode 100644 src/LogExpert/Controls/DarkTitleBar.cs diff --git a/src/LogExpert/Controls/DarkTitleBar.cs b/src/LogExpert/Controls/DarkTitleBar.cs new file mode 100644 index 00000000..3a68e690 --- /dev/null +++ b/src/LogExpert/Controls/DarkTitleBar.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace LogExpert.Controls +{ + class DarkTitleBar + { + [DllImport("dwmapi.dll")] + private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int attrValue, int attrSize); + + private const int DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19; + private const int DWMWA_USE_IMMERSIVE_DARK_MODE = 20; + + public static bool UseImmersiveDarkMode(IntPtr handle, bool enabled) + { + + var attribute = DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1; + if (IsWindows10OrGreater(18985)) + { + attribute = DWMWA_USE_IMMERSIVE_DARK_MODE; + } + + int useImmersiveDarkMode = enabled ? 1 : 0; + return DwmSetWindowAttribute(handle, (int)attribute, ref useImmersiveDarkMode, sizeof(int)) == 0; + + } + + private static bool IsWindows10OrGreater(int build = -1) + { + return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= build; + } + } +} diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index 6a6842ed..9ede13bd 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -254,5 +254,6 @@ internal class StaticLogTabWindowData #endregion } + } } \ No newline at end of file diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index f8018f4b..226714c5 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -170,6 +170,7 @@ private void InitializeComponent() // statusStrip // this.statusStrip.AutoSize = false; + this.statusStrip.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.statusStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.labelLines, @@ -177,10 +178,10 @@ private void InitializeComponent() this.labelCurrentLine, this.loadProgessBar, this.labelStatus}); - this.statusStrip.Location = new System.Drawing.Point(0, 779); + this.statusStrip.Location = new System.Drawing.Point(0, 623); this.statusStrip.Name = "statusStrip"; - this.statusStrip.Padding = new System.Windows.Forms.Padding(2, 0, 21, 0); - this.statusStrip.Size = new System.Drawing.Size(1443, 35); + this.statusStrip.Padding = new System.Windows.Forms.Padding(2, 0, 19, 0); + this.statusStrip.Size = new System.Drawing.Size(1283, 28); this.statusStrip.SizingGrip = false; this.statusStrip.TabIndex = 5; this.statusStrip.Text = "statusStrip1"; @@ -193,7 +194,7 @@ private void InitializeComponent() | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); this.labelLines.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter; this.labelLines.Name = "labelLines"; - this.labelLines.Size = new System.Drawing.Size(90, 28); + this.labelLines.Size = new System.Drawing.Size(90, 22); this.labelLines.Text = "0"; // // labelSize @@ -204,7 +205,7 @@ private void InitializeComponent() | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); this.labelSize.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter; this.labelSize.Name = "labelSize"; - this.labelSize.Size = new System.Drawing.Size(90, 28); + this.labelSize.Size = new System.Drawing.Size(90, 22); this.labelSize.Text = "0"; // // labelCurrentLine @@ -215,24 +216,24 @@ private void InitializeComponent() | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); this.labelCurrentLine.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter; this.labelCurrentLine.Name = "labelCurrentLine"; - this.labelCurrentLine.Size = new System.Drawing.Size(90, 28); + this.labelCurrentLine.Size = new System.Drawing.Size(90, 22); this.labelCurrentLine.Text = "L:"; // // loadProgessBar // this.loadProgessBar.Name = "loadProgessBar"; - this.loadProgessBar.Size = new System.Drawing.Size(75, 27); + this.loadProgessBar.Size = new System.Drawing.Size(67, 20); // // labelStatus // this.labelStatus.Name = "labelStatus"; - this.labelStatus.Size = new System.Drawing.Size(60, 28); + this.labelStatus.Size = new System.Drawing.Size(50, 22); this.labelStatus.Text = "Ready"; // // mainMenuStrip // this.mainMenuStrip.AllowMerge = false; - this.mainMenuStrip.BackColor = System.Drawing.SystemColors.ControlLight; + this.mainMenuStrip.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.mainMenuStrip.Dock = System.Windows.Forms.DockStyle.None; this.mainMenuStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -243,9 +244,9 @@ private void InitializeComponent() this.helpToolStripMenuItem, this.debugToolStripMenuItem}); this.mainMenuStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; - this.mainMenuStrip.Location = new System.Drawing.Point(0, 34); + this.mainMenuStrip.Location = new System.Drawing.Point(0, 31); this.mainMenuStrip.Name = "mainMenuStrip"; - this.mainMenuStrip.Size = new System.Drawing.Size(1443, 33); + this.mainMenuStrip.Size = new System.Drawing.Size(1283, 28); this.mainMenuStrip.TabIndex = 6; this.mainMenuStrip.Text = "menuStrip1"; // @@ -267,7 +268,7 @@ private void InitializeComponent() this.lastUsedToolStripMenuItem, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(54, 29); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24); this.fileToolStripMenuItem.Text = "File"; this.fileToolStripMenuItem.DropDownOpening += new System.EventHandler(this.OnFileToolStripMenuItemDropDownOpening); // @@ -276,7 +277,7 @@ private void InitializeComponent() this.openToolStripMenuItem.Image = global::LogExpert.Properties.Resources.folder_blue; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(368, 34); + this.openToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.openToolStripMenuItem.Text = "Open..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.OnOpenToolStripMenuItemClick); // @@ -284,7 +285,7 @@ private void InitializeComponent() // this.openURIToolStripMenuItem.Name = "openURIToolStripMenuItem"; this.openURIToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); - this.openURIToolStripMenuItem.Size = new System.Drawing.Size(368, 34); + this.openURIToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.openURIToolStripMenuItem.Text = "Open URL..."; this.openURIToolStripMenuItem.ToolTipText = "Opens a file by entering a URL which is supported by a file system plugin"; this.openURIToolStripMenuItem.Click += new System.EventHandler(this.OnOpenURIToolStripMenuItemClick); @@ -293,7 +294,7 @@ private void InitializeComponent() // this.closeFileToolStripMenuItem.Name = "closeFileToolStripMenuItem"; this.closeFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F4))); - this.closeFileToolStripMenuItem.Size = new System.Drawing.Size(368, 34); + this.closeFileToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.closeFileToolStripMenuItem.Text = "Close File"; this.closeFileToolStripMenuItem.Click += new System.EventHandler(this.OnCloseFileToolStripMenuItemClick); // @@ -301,7 +302,7 @@ private void InitializeComponent() // this.reloadToolStripMenuItem.Name = "reloadToolStripMenuItem"; this.reloadToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; - this.reloadToolStripMenuItem.Size = new System.Drawing.Size(368, 34); + this.reloadToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.reloadToolStripMenuItem.Text = "Reload"; this.reloadToolStripMenuItem.Click += new System.EventHandler(this.OnReloadToolStripMenuItemClick); // @@ -309,7 +310,7 @@ private void InitializeComponent() // this.newFromClipboardToolStripMenuItem.Name = "newFromClipboardToolStripMenuItem"; this.newFromClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.newFromClipboardToolStripMenuItem.Size = new System.Drawing.Size(368, 34); + this.newFromClipboardToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.newFromClipboardToolStripMenuItem.Text = "New tab from clipboard"; this.newFromClipboardToolStripMenuItem.ToolTipText = "Creates a new tab with content from clipboard"; this.newFromClipboardToolStripMenuItem.Click += new System.EventHandler(this.OnNewFromClipboardToolStripMenuItemClick); @@ -317,7 +318,7 @@ private void InitializeComponent() // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(365, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(302, 6); // // multiFileToolStripMenuItem // @@ -326,7 +327,7 @@ private void InitializeComponent() this.multiFileEnabledStripMenuItem, this.multifileMaskToolStripMenuItem}); this.multiFileToolStripMenuItem.Name = "multiFileToolStripMenuItem"; - this.multiFileToolStripMenuItem.Size = new System.Drawing.Size(368, 34); + this.multiFileToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.multiFileToolStripMenuItem.Text = "MultiFile"; this.multiFileToolStripMenuItem.ToolTipText = "Treat multiple files as one large file (e.g. data.log, data.log.1, data.log.2,..." + ")"; @@ -336,26 +337,26 @@ private void InitializeComponent() // this.multiFileEnabledStripMenuItem.CheckOnClick = true; this.multiFileEnabledStripMenuItem.Name = "multiFileEnabledStripMenuItem"; - this.multiFileEnabledStripMenuItem.Size = new System.Drawing.Size(248, 34); + this.multiFileEnabledStripMenuItem.Size = new System.Drawing.Size(203, 26); this.multiFileEnabledStripMenuItem.Text = "Enable MultiFile"; this.multiFileEnabledStripMenuItem.Click += new System.EventHandler(this.OnMultiFileEnabledStripMenuItemClick); // // multifileMaskToolStripMenuItem // this.multifileMaskToolStripMenuItem.Name = "multifileMaskToolStripMenuItem"; - this.multifileMaskToolStripMenuItem.Size = new System.Drawing.Size(248, 34); + this.multifileMaskToolStripMenuItem.Size = new System.Drawing.Size(203, 26); this.multifileMaskToolStripMenuItem.Text = "File name mask..."; this.multifileMaskToolStripMenuItem.Click += new System.EventHandler(this.OnMultiFileMaskToolStripMenuItemClick); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(365, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(302, 6); // // loadProjectToolStripMenuItem // this.loadProjectToolStripMenuItem.Name = "loadProjectToolStripMenuItem"; - this.loadProjectToolStripMenuItem.Size = new System.Drawing.Size(368, 34); + this.loadProjectToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.loadProjectToolStripMenuItem.Text = "Load session..."; this.loadProjectToolStripMenuItem.ToolTipText = "Load a saved session (list of log files)"; this.loadProjectToolStripMenuItem.Click += new System.EventHandler(this.OnLoadProjectToolStripMenuItemClick); @@ -363,7 +364,7 @@ private void InitializeComponent() // saveProjectToolStripMenuItem // this.saveProjectToolStripMenuItem.Name = "saveProjectToolStripMenuItem"; - this.saveProjectToolStripMenuItem.Size = new System.Drawing.Size(368, 34); + this.saveProjectToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.saveProjectToolStripMenuItem.Text = "Save session..."; this.saveProjectToolStripMenuItem.ToolTipText = "Save a session (all open tabs)"; this.saveProjectToolStripMenuItem.Click += new System.EventHandler(this.OnSaveProjectToolStripMenuItemClick); @@ -371,7 +372,7 @@ private void InitializeComponent() // exportBookmarksToolStripMenuItem // this.exportBookmarksToolStripMenuItem.Name = "exportBookmarksToolStripMenuItem"; - this.exportBookmarksToolStripMenuItem.Size = new System.Drawing.Size(368, 34); + this.exportBookmarksToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.exportBookmarksToolStripMenuItem.Text = "Export bookmarks..."; this.exportBookmarksToolStripMenuItem.ToolTipText = "Write a list of bookmarks and their comments to a CSV file"; this.exportBookmarksToolStripMenuItem.Click += new System.EventHandler(this.OnExportBookmarksToolStripMenuItemClick); @@ -379,19 +380,19 @@ private void InitializeComponent() // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(365, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(302, 6); // // lastUsedToolStripMenuItem // this.lastUsedToolStripMenuItem.Name = "lastUsedToolStripMenuItem"; - this.lastUsedToolStripMenuItem.Size = new System.Drawing.Size(368, 34); + this.lastUsedToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.lastUsedToolStripMenuItem.Text = "Last used"; // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(368, 34); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.OnExitToolStripMenuItemClick); // @@ -411,14 +412,14 @@ private void InitializeComponent() this.toolStripSeparator3, this.copyMarkedLinesIntoNewTabToolStripMenuItem}); this.viewNavigateToolStripMenuItem.Name = "viewNavigateToolStripMenuItem"; - this.viewNavigateToolStripMenuItem.Size = new System.Drawing.Size(142, 29); + this.viewNavigateToolStripMenuItem.Size = new System.Drawing.Size(121, 24); this.viewNavigateToolStripMenuItem.Text = "View/Navigate"; // // goToLineToolStripMenuItem // this.goToLineToolStripMenuItem.Name = "goToLineToolStripMenuItem"; this.goToLineToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); - this.goToLineToolStripMenuItem.Size = new System.Drawing.Size(270, 34); + this.goToLineToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.goToLineToolStripMenuItem.Text = "Go to line..."; this.goToLineToolStripMenuItem.Click += new System.EventHandler(this.OnGoToLineToolStripMenuItemClick); // @@ -426,7 +427,7 @@ private void InitializeComponent() // this.searchToolStripMenuItem.Name = "searchToolStripMenuItem"; this.searchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); - this.searchToolStripMenuItem.Size = new System.Drawing.Size(270, 34); + this.searchToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.searchToolStripMenuItem.Text = "Search..."; this.searchToolStripMenuItem.Click += new System.EventHandler(this.OnSearchToolStripMenuItemClick); // @@ -435,7 +436,7 @@ private void InitializeComponent() this.filterToolStripMenuItem.Image = global::LogExpert.Properties.Resources.search_blue; this.filterToolStripMenuItem.Name = "filterToolStripMenuItem"; this.filterToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F4; - this.filterToolStripMenuItem.Size = new System.Drawing.Size(270, 34); + this.filterToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.filterToolStripMenuItem.Text = "Filter"; this.filterToolStripMenuItem.Click += new System.EventHandler(this.OnFilterToolStripMenuItemClick); // @@ -447,7 +448,7 @@ private void InitializeComponent() this.jumpToPrevToolStripMenuItem, this.showBookmarkListToolStripMenuItem}); this.bookmarksToolStripMenuItem.Name = "bookmarksToolStripMenuItem"; - this.bookmarksToolStripMenuItem.Size = new System.Drawing.Size(270, 34); + this.bookmarksToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.bookmarksToolStripMenuItem.Text = "Bookmarks"; // // toggleBookmarkToolStripMenuItem @@ -455,7 +456,7 @@ private void InitializeComponent() this.toggleBookmarkToolStripMenuItem.Image = global::LogExpert.Properties.Resources.check_blue; this.toggleBookmarkToolStripMenuItem.Name = "toggleBookmarkToolStripMenuItem"; this.toggleBookmarkToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F2))); - this.toggleBookmarkToolStripMenuItem.Size = new System.Drawing.Size(323, 34); + this.toggleBookmarkToolStripMenuItem.Size = new System.Drawing.Size(266, 26); this.toggleBookmarkToolStripMenuItem.Text = "Toggle Bookmark"; this.toggleBookmarkToolStripMenuItem.Click += new System.EventHandler(this.OnToggleBookmarkToolStripMenuItemClick); // @@ -464,7 +465,7 @@ private void InitializeComponent() this.jumpToNextToolStripMenuItem.Image = global::LogExpert.Properties.Resources.down_blue; this.jumpToNextToolStripMenuItem.Name = "jumpToNextToolStripMenuItem"; this.jumpToNextToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F2; - this.jumpToNextToolStripMenuItem.Size = new System.Drawing.Size(323, 34); + this.jumpToNextToolStripMenuItem.Size = new System.Drawing.Size(266, 26); this.jumpToNextToolStripMenuItem.Text = "Jump to next"; this.jumpToNextToolStripMenuItem.Click += new System.EventHandler(this.OnJumpToNextToolStripMenuItemClick); // @@ -473,7 +474,7 @@ private void InitializeComponent() this.jumpToPrevToolStripMenuItem.Image = global::LogExpert.Properties.Resources.up_blue; this.jumpToPrevToolStripMenuItem.Name = "jumpToPrevToolStripMenuItem"; this.jumpToPrevToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F2))); - this.jumpToPrevToolStripMenuItem.Size = new System.Drawing.Size(323, 34); + this.jumpToPrevToolStripMenuItem.Size = new System.Drawing.Size(266, 26); this.jumpToPrevToolStripMenuItem.Text = "Jump to prev"; this.jumpToPrevToolStripMenuItem.Click += new System.EventHandler(this.OnJumpToPrevToolStripMenuItemClick); // @@ -481,7 +482,7 @@ private void InitializeComponent() // this.showBookmarkListToolStripMenuItem.Name = "showBookmarkListToolStripMenuItem"; this.showBookmarkListToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F6; - this.showBookmarkListToolStripMenuItem.Size = new System.Drawing.Size(323, 34); + this.showBookmarkListToolStripMenuItem.Size = new System.Drawing.Size(266, 26); this.showBookmarkListToolStripMenuItem.Text = "Bookmark list"; this.showBookmarkListToolStripMenuItem.Click += new System.EventHandler(this.OnShowBookmarkListToolStripMenuItemClick); // @@ -490,14 +491,14 @@ private void InitializeComponent() this.columnFinderToolStripMenuItem.CheckOnClick = true; this.columnFinderToolStripMenuItem.Name = "columnFinderToolStripMenuItem"; this.columnFinderToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F8; - this.columnFinderToolStripMenuItem.Size = new System.Drawing.Size(270, 34); + this.columnFinderToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.columnFinderToolStripMenuItem.Text = "Column finder"; this.columnFinderToolStripMenuItem.Click += new System.EventHandler(this.OnColumnFinderToolStripMenuItemClick); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(267, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(218, 6); // // toolStripEncodingMenuItem // @@ -508,13 +509,13 @@ private void InitializeComponent() this.toolStripEncodingUTF8Item, this.toolStripEncodingUTF16Item}); this.toolStripEncodingMenuItem.Name = "toolStripEncodingMenuItem"; - this.toolStripEncodingMenuItem.Size = new System.Drawing.Size(270, 34); + this.toolStripEncodingMenuItem.Size = new System.Drawing.Size(221, 26); this.toolStripEncodingMenuItem.Text = "Encoding"; // // toolStripEncodingASCIIItem // this.toolStripEncodingASCIIItem.Name = "toolStripEncodingASCIIItem"; - this.toolStripEncodingASCIIItem.Size = new System.Drawing.Size(207, 34); + this.toolStripEncodingASCIIItem.Size = new System.Drawing.Size(167, 26); this.toolStripEncodingASCIIItem.Tag = ""; this.toolStripEncodingASCIIItem.Text = "ASCII"; this.toolStripEncodingASCIIItem.Click += new System.EventHandler(this.OnASCIIToolStripMenuItemClick); @@ -522,7 +523,7 @@ private void InitializeComponent() // toolStripEncodingANSIItem // this.toolStripEncodingANSIItem.Name = "toolStripEncodingANSIItem"; - this.toolStripEncodingANSIItem.Size = new System.Drawing.Size(207, 34); + this.toolStripEncodingANSIItem.Size = new System.Drawing.Size(167, 26); this.toolStripEncodingANSIItem.Tag = ""; this.toolStripEncodingANSIItem.Text = "ANSI"; this.toolStripEncodingANSIItem.Click += new System.EventHandler(this.OnANSIToolStripMenuItemClick); @@ -530,34 +531,34 @@ private void InitializeComponent() // toolStripEncodingISO88591Item // this.toolStripEncodingISO88591Item.Name = "toolStripEncodingISO88591Item"; - this.toolStripEncodingISO88591Item.Size = new System.Drawing.Size(207, 34); + this.toolStripEncodingISO88591Item.Size = new System.Drawing.Size(167, 26); this.toolStripEncodingISO88591Item.Text = "ISO-8859-1"; this.toolStripEncodingISO88591Item.Click += new System.EventHandler(this.OnISO88591ToolStripMenuItemClick); // // toolStripEncodingUTF8Item // this.toolStripEncodingUTF8Item.Name = "toolStripEncodingUTF8Item"; - this.toolStripEncodingUTF8Item.Size = new System.Drawing.Size(207, 34); + this.toolStripEncodingUTF8Item.Size = new System.Drawing.Size(167, 26); this.toolStripEncodingUTF8Item.Text = "UTF8"; this.toolStripEncodingUTF8Item.Click += new System.EventHandler(this.OnUTF8ToolStripMenuItemClick); // // toolStripEncodingUTF16Item // this.toolStripEncodingUTF16Item.Name = "toolStripEncodingUTF16Item"; - this.toolStripEncodingUTF16Item.Size = new System.Drawing.Size(207, 34); + this.toolStripEncodingUTF16Item.Size = new System.Drawing.Size(167, 26); this.toolStripEncodingUTF16Item.Text = "Unicode"; this.toolStripEncodingUTF16Item.Click += new System.EventHandler(this.OnUTF16ToolStripMenuItemClick); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(267, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(218, 6); // // timeshiftToolStripMenuItem // this.timeshiftToolStripMenuItem.CheckOnClick = true; this.timeshiftToolStripMenuItem.Name = "timeshiftToolStripMenuItem"; - this.timeshiftToolStripMenuItem.Size = new System.Drawing.Size(270, 34); + this.timeshiftToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.timeshiftToolStripMenuItem.Text = "Timeshift"; this.timeshiftToolStripMenuItem.ToolTipText = "If supported by the columnizer, you can set an offset to the displayed log time"; this.timeshiftToolStripMenuItem.CheckStateChanged += new System.EventHandler(this.OnTimeShiftToolStripMenuItemCheckStateChanged); @@ -566,8 +567,9 @@ private void InitializeComponent() // this.timeshiftMenuTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.timeshiftMenuTextBox.Enabled = false; + this.timeshiftMenuTextBox.Font = new System.Drawing.Font("Segoe UI", 9F); this.timeshiftMenuTextBox.Name = "timeshiftMenuTextBox"; - this.timeshiftMenuTextBox.Size = new System.Drawing.Size(100, 31); + this.timeshiftMenuTextBox.Size = new System.Drawing.Size(100, 27); this.timeshiftMenuTextBox.Text = "+00:00:00.000"; this.timeshiftMenuTextBox.ToolTipText = "Time offset (hh:mm:ss.fff)"; this.timeshiftMenuTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnTimeShiftMenuTextBoxKeyDown); @@ -575,13 +577,13 @@ private void InitializeComponent() // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(267, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(218, 6); // // copyMarkedLinesIntoNewTabToolStripMenuItem // this.copyMarkedLinesIntoNewTabToolStripMenuItem.Name = "copyMarkedLinesIntoNewTabToolStripMenuItem"; this.copyMarkedLinesIntoNewTabToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); - this.copyMarkedLinesIntoNewTabToolStripMenuItem.Size = new System.Drawing.Size(270, 34); + this.copyMarkedLinesIntoNewTabToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.copyMarkedLinesIntoNewTabToolStripMenuItem.Text = "Copy to Tab"; this.copyMarkedLinesIntoNewTabToolStripMenuItem.ToolTipText = "Copies all selected lines into a new tab page"; this.copyMarkedLinesIntoNewTabToolStripMenuItem.Click += new System.EventHandler(this.OnCopyMarkedLinesIntoNewTabToolStripMenuItemClick); @@ -599,14 +601,14 @@ private void InitializeComponent() this.toolStripSeparator19, this.lockInstanceToolStripMenuItem}); this.optionToolStripMenuItem.Name = "optionToolStripMenuItem"; - this.optionToolStripMenuItem.Size = new System.Drawing.Size(92, 29); + this.optionToolStripMenuItem.Size = new System.Drawing.Size(75, 24); this.optionToolStripMenuItem.Text = "Options"; this.optionToolStripMenuItem.DropDownOpening += new System.EventHandler(this.OnOptionToolStripMenuItemDropDownOpening); // // columnizerToolStripMenuItem // this.columnizerToolStripMenuItem.Name = "columnizerToolStripMenuItem"; - this.columnizerToolStripMenuItem.Size = new System.Drawing.Size(325, 34); + this.columnizerToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.columnizerToolStripMenuItem.Text = "Columnizer..."; this.columnizerToolStripMenuItem.ToolTipText = "Splits various kinds of logfiles into fixed columns"; this.columnizerToolStripMenuItem.Click += new System.EventHandler(this.OnSelectFilterToolStripMenuItemClick); @@ -614,27 +616,27 @@ private void InitializeComponent() // hilightingToolStripMenuItem1 // this.hilightingToolStripMenuItem1.Name = "hilightingToolStripMenuItem1"; - this.hilightingToolStripMenuItem1.Size = new System.Drawing.Size(325, 34); + this.hilightingToolStripMenuItem1.Size = new System.Drawing.Size(268, 26); this.hilightingToolStripMenuItem1.Text = "Highlighting and triggers..."; this.hilightingToolStripMenuItem1.Click += new System.EventHandler(this.OnHighlightingToolStripMenuItemClick); // // settingsToolStripMenuItem // this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(325, 34); + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.settingsToolStripMenuItem.Text = "Settings..."; this.settingsToolStripMenuItem.Click += new System.EventHandler(this.OnSettingsToolStripMenuItemClick); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(322, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(265, 6); // // cellSelectModeToolStripMenuItem // this.cellSelectModeToolStripMenuItem.CheckOnClick = true; this.cellSelectModeToolStripMenuItem.Name = "cellSelectModeToolStripMenuItem"; - this.cellSelectModeToolStripMenuItem.Size = new System.Drawing.Size(325, 34); + this.cellSelectModeToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.cellSelectModeToolStripMenuItem.Text = "Cell select mode"; this.cellSelectModeToolStripMenuItem.ToolTipText = "Switches between foll row selection and single cell selection mode"; this.cellSelectModeToolStripMenuItem.Click += new System.EventHandler(this.OnCellSelectModeToolStripMenuItemClick); @@ -643,7 +645,7 @@ private void InitializeComponent() // this.alwaysOnTopToolStripMenuItem.CheckOnClick = true; this.alwaysOnTopToolStripMenuItem.Name = "alwaysOnTopToolStripMenuItem"; - this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(325, 34); + this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.alwaysOnTopToolStripMenuItem.Text = "Always on top"; this.alwaysOnTopToolStripMenuItem.Click += new System.EventHandler(this.OnAlwaysOnTopToolStripMenuItemClick); // @@ -651,19 +653,19 @@ private void InitializeComponent() // this.hideLineColumnToolStripMenuItem.CheckOnClick = true; this.hideLineColumnToolStripMenuItem.Name = "hideLineColumnToolStripMenuItem"; - this.hideLineColumnToolStripMenuItem.Size = new System.Drawing.Size(325, 34); + this.hideLineColumnToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.hideLineColumnToolStripMenuItem.Text = "Hide line column"; this.hideLineColumnToolStripMenuItem.Click += new System.EventHandler(this.OnHideLineColumnToolStripMenuItemClick); // // toolStripSeparator19 // this.toolStripSeparator19.Name = "toolStripSeparator19"; - this.toolStripSeparator19.Size = new System.Drawing.Size(322, 6); + this.toolStripSeparator19.Size = new System.Drawing.Size(265, 6); // // lockInstanceToolStripMenuItem // this.lockInstanceToolStripMenuItem.Name = "lockInstanceToolStripMenuItem"; - this.lockInstanceToolStripMenuItem.Size = new System.Drawing.Size(325, 34); + this.lockInstanceToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.lockInstanceToolStripMenuItem.Text = "Lock instance"; this.lockInstanceToolStripMenuItem.ToolTipText = "When enabled all new launched LogExpert instances will redirect to this window"; this.lockInstanceToolStripMenuItem.Click += new System.EventHandler(this.OnLockInstanceToolStripMenuItemClick); @@ -674,7 +676,7 @@ private void InitializeComponent() this.configureToolStripMenuItem, this.configureToolStripSeparator}); this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.Size = new System.Drawing.Size(69, 29); + this.toolsToolStripMenuItem.Size = new System.Drawing.Size(58, 24); this.toolsToolStripMenuItem.Text = "Tools"; this.toolsToolStripMenuItem.ToolTipText = "Launch external tools (configure in the settings)"; this.toolsToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.OnToolsToolStripMenuItemDropDownItemClicked); @@ -682,14 +684,14 @@ private void InitializeComponent() // configureToolStripMenuItem // this.configureToolStripMenuItem.Name = "configureToolStripMenuItem"; - this.configureToolStripMenuItem.Size = new System.Drawing.Size(204, 34); + this.configureToolStripMenuItem.Size = new System.Drawing.Size(166, 26); this.configureToolStripMenuItem.Text = "Configure..."; this.configureToolStripMenuItem.Click += new System.EventHandler(this.OnConfigureToolStripMenuItemClick); // // configureToolStripSeparator // this.configureToolStripSeparator.Name = "configureToolStripSeparator"; - this.configureToolStripSeparator.Size = new System.Drawing.Size(201, 6); + this.configureToolStripSeparator.Size = new System.Drawing.Size(163, 6); // // helpToolStripMenuItem // @@ -698,26 +700,26 @@ private void InitializeComponent() this.toolStripSeparator5, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(65, 29); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(55, 24); this.helpToolStripMenuItem.Text = "Help"; // // showHelpToolStripMenuItem // this.showHelpToolStripMenuItem.Name = "showHelpToolStripMenuItem"; this.showHelpToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1; - this.showHelpToolStripMenuItem.Size = new System.Drawing.Size(228, 34); + this.showHelpToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.showHelpToolStripMenuItem.Text = "Show help"; this.showHelpToolStripMenuItem.Click += new System.EventHandler(this.OnShowHelpToolStripMenuItemClick); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(225, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(182, 6); // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(228, 34); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.aboutToolStripMenuItem.Text = "About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.OnAboutToolStripMenuItemClick); // @@ -737,67 +739,67 @@ private void InitializeComponent() this.loglevelToolStripMenuItem, this.disableWordHighlightModeToolStripMenuItem}); this.debugToolStripMenuItem.Name = "debugToolStripMenuItem"; - this.debugToolStripMenuItem.Size = new System.Drawing.Size(82, 29); + this.debugToolStripMenuItem.Size = new System.Drawing.Size(68, 24); this.debugToolStripMenuItem.Text = "Debug"; // // dumpLogBufferInfoToolStripMenuItem // this.dumpLogBufferInfoToolStripMenuItem.Name = "dumpLogBufferInfoToolStripMenuItem"; - this.dumpLogBufferInfoToolStripMenuItem.Size = new System.Drawing.Size(411, 34); + this.dumpLogBufferInfoToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.dumpLogBufferInfoToolStripMenuItem.Text = "Dump LogBuffer info"; this.dumpLogBufferInfoToolStripMenuItem.Click += new System.EventHandler(this.OnDumpLogBufferInfoToolStripMenuItemClick); // // dumpBufferDiagnosticToolStripMenuItem // this.dumpBufferDiagnosticToolStripMenuItem.Name = "dumpBufferDiagnosticToolStripMenuItem"; - this.dumpBufferDiagnosticToolStripMenuItem.Size = new System.Drawing.Size(411, 34); + this.dumpBufferDiagnosticToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.dumpBufferDiagnosticToolStripMenuItem.Text = "Dump buffer diagnostic"; this.dumpBufferDiagnosticToolStripMenuItem.Click += new System.EventHandler(this.OnDumpBufferDiagnosticToolStripMenuItemClick); // // runGCToolStripMenuItem // this.runGCToolStripMenuItem.Name = "runGCToolStripMenuItem"; - this.runGCToolStripMenuItem.Size = new System.Drawing.Size(411, 34); + this.runGCToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.runGCToolStripMenuItem.Text = "Run GC"; this.runGCToolStripMenuItem.Click += new System.EventHandler(this.OnRunGCToolStripMenuItemClick); // // gCInfoToolStripMenuItem // this.gCInfoToolStripMenuItem.Name = "gCInfoToolStripMenuItem"; - this.gCInfoToolStripMenuItem.Size = new System.Drawing.Size(411, 34); + this.gCInfoToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.gCInfoToolStripMenuItem.Text = "Dump GC info"; this.gCInfoToolStripMenuItem.Click += new System.EventHandler(this.OnGCInfoToolStripMenuItemClick); // // toolStripSeparator18 // this.toolStripSeparator18.Name = "toolStripSeparator18"; - this.toolStripSeparator18.Size = new System.Drawing.Size(408, 6); + this.toolStripSeparator18.Size = new System.Drawing.Size(339, 6); // // throwExceptionGUIThreadToolStripMenuItem // this.throwExceptionGUIThreadToolStripMenuItem.Name = "throwExceptionGUIThreadToolStripMenuItem"; - this.throwExceptionGUIThreadToolStripMenuItem.Size = new System.Drawing.Size(411, 34); + this.throwExceptionGUIThreadToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.throwExceptionGUIThreadToolStripMenuItem.Text = "Throw exception (GUI Thread)"; this.throwExceptionGUIThreadToolStripMenuItem.Click += new System.EventHandler(this.OnThrowExceptionGUIThreadToolStripMenuItemClick); // // throwExceptionbackgroundThToolStripMenuItem // this.throwExceptionbackgroundThToolStripMenuItem.Name = "throwExceptionbackgroundThToolStripMenuItem"; - this.throwExceptionbackgroundThToolStripMenuItem.Size = new System.Drawing.Size(411, 34); + this.throwExceptionbackgroundThToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.throwExceptionbackgroundThToolStripMenuItem.Text = "Throw exception (Async delegate)"; this.throwExceptionbackgroundThToolStripMenuItem.Click += new System.EventHandler(this.OnThrowExceptionBackgroundThToolStripMenuItemClick); // // throwExceptionBackgroundThreadToolStripMenuItem // this.throwExceptionBackgroundThreadToolStripMenuItem.Name = "throwExceptionBackgroundThreadToolStripMenuItem"; - this.throwExceptionBackgroundThreadToolStripMenuItem.Size = new System.Drawing.Size(411, 34); + this.throwExceptionBackgroundThreadToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.throwExceptionBackgroundThreadToolStripMenuItem.Text = "Throw exception (background thread)"; this.throwExceptionBackgroundThreadToolStripMenuItem.Click += new System.EventHandler(this.OnThrowExceptionBackgroundThreadToolStripMenuItemClick); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(408, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(339, 6); // // loglevelToolStripMenuItem // @@ -806,7 +808,7 @@ private void InitializeComponent() this.infoToolStripMenuItem, this.debugToolStripMenuItem1}); this.loglevelToolStripMenuItem.Name = "loglevelToolStripMenuItem"; - this.loglevelToolStripMenuItem.Size = new System.Drawing.Size(411, 34); + this.loglevelToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.loglevelToolStripMenuItem.Text = "Loglevel"; this.loglevelToolStripMenuItem.DropDownOpening += new System.EventHandler(this.OnLogLevelToolStripMenuItemDropDownOpening); this.loglevelToolStripMenuItem.Click += new System.EventHandler(this.OnLogLevelToolStripMenuItemClick); @@ -814,21 +816,21 @@ private void InitializeComponent() // warnToolStripMenuItem // this.warnToolStripMenuItem.Name = "warnToolStripMenuItem"; - this.warnToolStripMenuItem.Size = new System.Drawing.Size(168, 34); + this.warnToolStripMenuItem.Size = new System.Drawing.Size(137, 26); this.warnToolStripMenuItem.Text = "Warn"; this.warnToolStripMenuItem.Click += new System.EventHandler(this.OnWarnToolStripMenuItemClick); // // infoToolStripMenuItem // this.infoToolStripMenuItem.Name = "infoToolStripMenuItem"; - this.infoToolStripMenuItem.Size = new System.Drawing.Size(168, 34); + this.infoToolStripMenuItem.Size = new System.Drawing.Size(137, 26); this.infoToolStripMenuItem.Text = "Info"; this.infoToolStripMenuItem.Click += new System.EventHandler(this.OnInfoToolStripMenuItemClick); // // debugToolStripMenuItem1 // this.debugToolStripMenuItem1.Name = "debugToolStripMenuItem1"; - this.debugToolStripMenuItem1.Size = new System.Drawing.Size(168, 34); + this.debugToolStripMenuItem1.Size = new System.Drawing.Size(137, 26); this.debugToolStripMenuItem1.Text = "Debug"; this.debugToolStripMenuItem1.Click += new System.EventHandler(this.OnDebugToolStripMenuItemClick); // @@ -836,7 +838,7 @@ private void InitializeComponent() // this.disableWordHighlightModeToolStripMenuItem.CheckOnClick = true; this.disableWordHighlightModeToolStripMenuItem.Name = "disableWordHighlightModeToolStripMenuItem"; - this.disableWordHighlightModeToolStripMenuItem.Size = new System.Drawing.Size(411, 34); + this.disableWordHighlightModeToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.disableWordHighlightModeToolStripMenuItem.Text = "Disable word highlight mode"; this.disableWordHighlightModeToolStripMenuItem.Click += new System.EventHandler(this.OnDisableWordHighlightModeToolStripMenuItemClick); // @@ -862,15 +864,18 @@ private void InitializeComponent() // // toolStripContainer.ContentPanel // - this.toolStripContainer.ContentPanel.BackColor = System.Drawing.SystemColors.Control; + this.toolStripContainer.ContentPanel.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripContainer.ContentPanel.Controls.Add(this.dockPanel); + this.toolStripContainer.ContentPanel.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.toolStripContainer.ContentPanel.Margin = new System.Windows.Forms.Padding(0); - this.toolStripContainer.ContentPanel.Size = new System.Drawing.Size(1443, 712); + this.toolStripContainer.ContentPanel.Size = new System.Drawing.Size(1283, 564); this.toolStripContainer.Dock = System.Windows.Forms.DockStyle.Fill; // // toolStripContainer.LeftToolStripPanel // + this.toolStripContainer.LeftToolStripPanel.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripContainer.LeftToolStripPanel.Enabled = false; + this.toolStripContainer.LeftToolStripPanel.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.toolStripContainer.LeftToolStripPanelVisible = false; this.toolStripContainer.Location = new System.Drawing.Point(0, 0); this.toolStripContainer.Margin = new System.Windows.Forms.Padding(0); @@ -878,32 +883,36 @@ private void InitializeComponent() // // toolStripContainer.RightToolStripPanel // + this.toolStripContainer.RightToolStripPanel.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripContainer.RightToolStripPanel.Enabled = false; + this.toolStripContainer.RightToolStripPanel.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.toolStripContainer.RightToolStripPanelVisible = false; - this.toolStripContainer.Size = new System.Drawing.Size(1443, 779); + this.toolStripContainer.Size = new System.Drawing.Size(1283, 623); this.toolStripContainer.TabIndex = 13; this.toolStripContainer.Text = "toolStripContainer1"; // // toolStripContainer.TopToolStripPanel // - this.toolStripContainer.TopToolStripPanel.BackColor = System.Drawing.SystemColors.ControlLight; + this.toolStripContainer.TopToolStripPanel.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripContainer.TopToolStripPanel.Controls.Add(this.buttonToolStrip); this.toolStripContainer.TopToolStripPanel.Controls.Add(this.mainMenuStrip); this.toolStripContainer.TopToolStripPanel.Controls.Add(this.externalToolsToolStrip); + this.toolStripContainer.TopToolStripPanel.ForeColor = System.Drawing.SystemColors.ControlLightLight; // // dockPanel // this.dockPanel.ActiveAutoHideContent = null; - this.dockPanel.BackColor = System.Drawing.SystemColors.Control; + this.dockPanel.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.dockPanel.DefaultFloatWindowSize = new System.Drawing.Size(600, 400); this.dockPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.dockPanel.DockBackColor = System.Drawing.SystemColors.Control; + this.dockPanel.DockBackColor = System.Drawing.SystemColors.ControlDarkDark; this.dockPanel.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow; + this.dockPanel.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.dockPanel.Location = new System.Drawing.Point(0, 0); this.dockPanel.Margin = new System.Windows.Forms.Padding(0); this.dockPanel.Name = "dockPanel"; this.dockPanel.ShowDocumentIcon = true; - this.dockPanel.Size = new System.Drawing.Size(1443, 712); + this.dockPanel.Size = new System.Drawing.Size(1283, 564); dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight; dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight; autoHideStripSkin1.DockStripGradient = dockPanelGradient1; @@ -956,7 +965,7 @@ private void InitializeComponent() // buttonToolStrip // this.buttonToolStrip.AllowMerge = false; - this.buttonToolStrip.BackColor = System.Drawing.SystemColors.ControlLight; + this.buttonToolStrip.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.buttonToolStrip.Dock = System.Windows.Forms.DockStyle.None; this.buttonToolStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.buttonToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -977,7 +986,7 @@ private void InitializeComponent() this.buttonToolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; this.buttonToolStrip.Location = new System.Drawing.Point(4, 0); this.buttonToolStrip.Name = "buttonToolStrip"; - this.buttonToolStrip.Size = new System.Drawing.Size(463, 34); + this.buttonToolStrip.Size = new System.Drawing.Size(420, 31); this.buttonToolStrip.TabIndex = 7; // // toolStripButtonOpen @@ -987,7 +996,7 @@ private void InitializeComponent() this.toolStripButtonOpen.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripButtonOpen.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonOpen.Name = "toolStripButtonOpen"; - this.toolStripButtonOpen.Size = new System.Drawing.Size(34, 18); + this.toolStripButtonOpen.Size = new System.Drawing.Size(29, 18); this.toolStripButtonOpen.Text = "toolStripButton1"; this.toolStripButtonOpen.ToolTipText = "Open file"; this.toolStripButtonOpen.Click += new System.EventHandler(this.OnToolStripButtonOpenClick); @@ -1004,7 +1013,7 @@ private void InitializeComponent() this.toolStripButtonSearch.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripButtonSearch.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonSearch.Name = "toolStripButtonSearch"; - this.toolStripButtonSearch.Size = new System.Drawing.Size(34, 18); + this.toolStripButtonSearch.Size = new System.Drawing.Size(29, 18); this.toolStripButtonSearch.Text = "toolStripButtonSearch"; this.toolStripButtonSearch.ToolTipText = "Search"; this.toolStripButtonSearch.Click += new System.EventHandler(this.OnToolStripButtonSearchClick); @@ -1016,7 +1025,7 @@ private void InitializeComponent() this.toolStripButtonFilter.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripButtonFilter.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonFilter.Name = "toolStripButtonFilter"; - this.toolStripButtonFilter.Size = new System.Drawing.Size(34, 18); + this.toolStripButtonFilter.Size = new System.Drawing.Size(29, 18); this.toolStripButtonFilter.Text = "toolStripButton1"; this.toolStripButtonFilter.ToolTipText = "Filter window"; this.toolStripButtonFilter.Click += new System.EventHandler(this.OnToolStripButtonFilterClick); @@ -1033,7 +1042,7 @@ private void InitializeComponent() this.toolStripButtonBookmark.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripButtonBookmark.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonBookmark.Name = "toolStripButtonBookmark"; - this.toolStripButtonBookmark.Size = new System.Drawing.Size(34, 18); + this.toolStripButtonBookmark.Size = new System.Drawing.Size(29, 18); this.toolStripButtonBookmark.Text = "toolStripButton1"; this.toolStripButtonBookmark.ToolTipText = "Toggle bookmark"; this.toolStripButtonBookmark.Click += new System.EventHandler(this.OnToolStripButtonBookmarkClick); @@ -1045,7 +1054,7 @@ private void InitializeComponent() this.toolStripButtonUp.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripButtonUp.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonUp.Name = "toolStripButtonUp"; - this.toolStripButtonUp.Size = new System.Drawing.Size(34, 18); + this.toolStripButtonUp.Size = new System.Drawing.Size(29, 18); this.toolStripButtonUp.Text = "toolStripButton1"; this.toolStripButtonUp.ToolTipText = "Go to previous bookmark"; this.toolStripButtonUp.Click += new System.EventHandler(this.OnToolStripButtonUpClick); @@ -1057,7 +1066,7 @@ private void InitializeComponent() this.toolStripButtonDown.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripButtonDown.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonDown.Name = "toolStripButtonDown"; - this.toolStripButtonDown.Size = new System.Drawing.Size(34, 18); + this.toolStripButtonDown.Size = new System.Drawing.Size(29, 18); this.toolStripButtonDown.Text = "toolStripButton1"; this.toolStripButtonDown.ToolTipText = "Go to next bookmark"; this.toolStripButtonDown.Click += new System.EventHandler(this.OnToolStripButtonDownClick); @@ -1075,7 +1084,7 @@ private void InitializeComponent() this.toolStripButtonBubbles.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; this.toolStripButtonBubbles.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonBubbles.Name = "toolStripButtonBubbles"; - this.toolStripButtonBubbles.Size = new System.Drawing.Size(34, 28); + this.toolStripButtonBubbles.Size = new System.Drawing.Size(29, 28); this.toolStripButtonBubbles.Text = "Show bookmark bubbles"; this.toolStripButtonBubbles.Click += new System.EventHandler(this.OnToolStripButtonBubblesClick); // @@ -1090,7 +1099,7 @@ private void InitializeComponent() this.toolStripButtonTail.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonTail.Image"))); this.toolStripButtonTail.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonTail.Name = "toolStripButtonTail"; - this.toolStripButtonTail.Size = new System.Drawing.Size(39, 29); + this.toolStripButtonTail.Size = new System.Drawing.Size(34, 24); this.toolStripButtonTail.Text = "tail"; // // toolStripSeparator17 @@ -1104,7 +1113,7 @@ private void InitializeComponent() this.groupsComboBoxHighlightGroups.DropDownWidth = 250; this.groupsComboBoxHighlightGroups.FlatStyle = System.Windows.Forms.FlatStyle.Standard; this.groupsComboBoxHighlightGroups.Name = "groupsComboBoxHighlightGroups"; - this.groupsComboBoxHighlightGroups.Size = new System.Drawing.Size(150, 33); + this.groupsComboBoxHighlightGroups.Size = new System.Drawing.Size(150, 28); this.groupsComboBoxHighlightGroups.ToolTipText = "Select the current highlight settings for the log file (right-click to open highl" + "ight settings)"; this.groupsComboBoxHighlightGroups.DropDownClosed += new System.EventHandler(this.OnHighlightGroupsComboBoxDropDownClosed); @@ -1118,9 +1127,9 @@ private void InitializeComponent() this.externalToolsToolStrip.Dock = System.Windows.Forms.DockStyle.None; this.externalToolsToolStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.externalToolsToolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; - this.externalToolsToolStrip.Location = new System.Drawing.Point(148, 67); + this.externalToolsToolStrip.Location = new System.Drawing.Point(148, 59); this.externalToolsToolStrip.Name = "externalToolsToolStrip"; - this.externalToolsToolStrip.Size = new System.Drawing.Size(2, 0); + this.externalToolsToolStrip.Size = new System.Drawing.Size(1, 0); this.externalToolsToolStrip.TabIndex = 8; this.externalToolsToolStrip.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.OnExternalToolsToolStripItemClicked); // @@ -1132,10 +1141,10 @@ private void InitializeComponent() // checkBoxFollowTail // this.checkBoxFollowTail.AutoSize = true; - this.checkBoxFollowTail.Location = new System.Drawing.Point(596, 788); - this.checkBoxFollowTail.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxFollowTail.Location = new System.Drawing.Point(530, 630); + this.checkBoxFollowTail.Margin = new System.Windows.Forms.Padding(4); this.checkBoxFollowTail.Name = "checkBoxFollowTail"; - this.checkBoxFollowTail.Size = new System.Drawing.Size(104, 24); + this.checkBoxFollowTail.Size = new System.Drawing.Size(91, 21); this.checkBoxFollowTail.TabIndex = 14; this.checkBoxFollowTail.Text = "Follow tail"; this.checkBoxFollowTail.UseVisualStyleBackColor = true; @@ -1155,19 +1164,19 @@ private void InitializeComponent() this.copyPathToClipboardToolStripMenuItem, this.findInExplorerToolStripMenuItem}); this.tabContextMenuStrip.Name = "tabContextMenuStrip"; - this.tabContextMenuStrip.Size = new System.Drawing.Size(270, 240); + this.tabContextMenuStrip.Size = new System.Drawing.Size(233, 184); // // closeThisTabToolStripMenuItem // this.closeThisTabToolStripMenuItem.Name = "closeThisTabToolStripMenuItem"; - this.closeThisTabToolStripMenuItem.Size = new System.Drawing.Size(269, 32); + this.closeThisTabToolStripMenuItem.Size = new System.Drawing.Size(232, 24); this.closeThisTabToolStripMenuItem.Text = "Close this tab"; this.closeThisTabToolStripMenuItem.Click += new System.EventHandler(this.OnCloseThisTabToolStripMenuItemClick); // // closeOtherTabsToolStripMenuItem // this.closeOtherTabsToolStripMenuItem.Name = "closeOtherTabsToolStripMenuItem"; - this.closeOtherTabsToolStripMenuItem.Size = new System.Drawing.Size(269, 32); + this.closeOtherTabsToolStripMenuItem.Size = new System.Drawing.Size(232, 24); this.closeOtherTabsToolStripMenuItem.Text = "Close other tabs"; this.closeOtherTabsToolStripMenuItem.ToolTipText = "Close all tabs except of this one"; this.closeOtherTabsToolStripMenuItem.Click += new System.EventHandler(this.OnCloseOtherTabsToolStripMenuItemClick); @@ -1175,7 +1184,7 @@ private void InitializeComponent() // closeAllTabsToolStripMenuItem // this.closeAllTabsToolStripMenuItem.Name = "closeAllTabsToolStripMenuItem"; - this.closeAllTabsToolStripMenuItem.Size = new System.Drawing.Size(269, 32); + this.closeAllTabsToolStripMenuItem.Size = new System.Drawing.Size(232, 24); this.closeAllTabsToolStripMenuItem.Text = "Close all tabs"; this.closeAllTabsToolStripMenuItem.ToolTipText = "Close all tabs"; this.closeAllTabsToolStripMenuItem.Click += new System.EventHandler(this.OnCloseAllTabsToolStripMenuItemClick); @@ -1183,12 +1192,12 @@ private void InitializeComponent() // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(266, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(229, 6); // // tabColorToolStripMenuItem // this.tabColorToolStripMenuItem.Name = "tabColorToolStripMenuItem"; - this.tabColorToolStripMenuItem.Size = new System.Drawing.Size(269, 32); + this.tabColorToolStripMenuItem.Size = new System.Drawing.Size(232, 24); this.tabColorToolStripMenuItem.Text = "Tab color..."; this.tabColorToolStripMenuItem.ToolTipText = "Sets the tab color"; this.tabColorToolStripMenuItem.Click += new System.EventHandler(this.OnTabColorToolStripMenuItemClick); @@ -1196,7 +1205,7 @@ private void InitializeComponent() // tabRenameToolStripMenuItem // this.tabRenameToolStripMenuItem.Name = "tabRenameToolStripMenuItem"; - this.tabRenameToolStripMenuItem.Size = new System.Drawing.Size(269, 32); + this.tabRenameToolStripMenuItem.Size = new System.Drawing.Size(232, 24); this.tabRenameToolStripMenuItem.Text = "Tab rename..."; this.tabRenameToolStripMenuItem.ToolTipText = "Set the text which is shown on the tab"; this.tabRenameToolStripMenuItem.Click += new System.EventHandler(this.OnTabRenameToolStripMenuItemClick); @@ -1204,12 +1213,12 @@ private void InitializeComponent() // toolStripSeparator16 // this.toolStripSeparator16.Name = "toolStripSeparator16"; - this.toolStripSeparator16.Size = new System.Drawing.Size(266, 6); + this.toolStripSeparator16.Size = new System.Drawing.Size(229, 6); // // copyPathToClipboardToolStripMenuItem // this.copyPathToClipboardToolStripMenuItem.Name = "copyPathToClipboardToolStripMenuItem"; - this.copyPathToClipboardToolStripMenuItem.Size = new System.Drawing.Size(269, 32); + this.copyPathToClipboardToolStripMenuItem.Size = new System.Drawing.Size(232, 24); this.copyPathToClipboardToolStripMenuItem.Text = "Copy path to clipboard"; this.copyPathToClipboardToolStripMenuItem.ToolTipText = "The complete file name (incl. path) is copied to clipboard"; this.copyPathToClipboardToolStripMenuItem.Click += new System.EventHandler(this.OnCopyPathToClipboardToolStripMenuItemClick); @@ -1217,7 +1226,7 @@ private void InitializeComponent() // findInExplorerToolStripMenuItem // this.findInExplorerToolStripMenuItem.Name = "findInExplorerToolStripMenuItem"; - this.findInExplorerToolStripMenuItem.Size = new System.Drawing.Size(269, 32); + this.findInExplorerToolStripMenuItem.Size = new System.Drawing.Size(232, 24); this.findInExplorerToolStripMenuItem.Text = "Find in Explorer"; this.findInExplorerToolStripMenuItem.ToolTipText = "Opens an Explorer window and selects the log file"; this.findInExplorerToolStripMenuItem.Click += new System.EventHandler(this.OnFindInExplorerToolStripMenuItemClick); @@ -1225,17 +1234,18 @@ private void InitializeComponent() // dragControlDateTime // this.dragControlDateTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.dragControlDateTime.BackColor = System.Drawing.SystemColors.Control; + this.dragControlDateTime.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.dragControlDateTime.DateTime = new System.DateTime(((long)(0))); this.dragControlDateTime.DragOrientation = LogExpert.Dialogs.DateTimeDragControl.DragOrientations.Vertical; this.dragControlDateTime.Font = new System.Drawing.Font("Courier New", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dragControlDateTime.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.dragControlDateTime.HoverColor = System.Drawing.Color.LightGray; - this.dragControlDateTime.Location = new System.Drawing.Point(916, 782); + this.dragControlDateTime.Location = new System.Drawing.Point(814, 626); this.dragControlDateTime.Margin = new System.Windows.Forms.Padding(0); this.dragControlDateTime.MaxDateTime = new System.DateTime(9999, 12, 31, 23, 59, 59, 999); this.dragControlDateTime.MinDateTime = new System.DateTime(((long)(0))); this.dragControlDateTime.Name = "dragControlDateTime"; - this.dragControlDateTime.Size = new System.Drawing.Size(282, 31); + this.dragControlDateTime.Size = new System.Drawing.Size(251, 25); this.dragControlDateTime.TabIndex = 14; this.dragControlDateTime.ValueChanged += new LogExpert.Dialogs.DateTimeDragControl.ValueChangedEventHandler(this.OnDateTimeDragControlValueChanged); this.dragControlDateTime.ValueDragged += new LogExpert.Dialogs.DateTimeDragControl.ValueDraggedEventHandler(this.OnDateTimeDragControlValueDragged); @@ -1243,18 +1253,20 @@ private void InitializeComponent() // LogTabWindow // this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1443, 814); + this.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.ClientSize = new System.Drawing.Size(1283, 651); this.Controls.Add(this.checkBoxFollowTail); this.Controls.Add(this.dragControlDateTime); this.Controls.Add(this.toolStripContainer); this.Controls.Add(this.statusStrip); this.DoubleBuffered = true; + this.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.MainMenuStrip = this.mainMenuStrip; - this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "LogTabWindow"; this.Text = "LogExpert"; this.Activated += new System.EventHandler(this.OnLogTabWindowActivated); diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.resx b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.resx index dec5097a..99080256 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.resx +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.resx @@ -130,7 +130,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADRSURBVDhPvZEhDoQwEEU5D5ID4LkAHo/BIbFIHBaLRqKQ + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADRSURBVDhPvZEhDoQwEEU5D5ID4LkAHo/BIbFIHBaLRqKQ CDyCs8zmNQNT0SzNin3Jz5Tmvya0yc2yLDJNU1ToqmaM4yjXdUWFQ1QzOOA8z6jQVc0YhkGO43AFf4b2 6Kpm9H0v+74/kr/2v5l0VTO6rpNt21zhbdJVzWiaRtZ1jQpd1Yy6rt3zxISuakZVVTLPc1ToqmaUZen+ 774o3prnYvr7TLqqGW3bSlEUT5AJkr9P6KoWJs9z91TcOuvgpX0jyzInM4MX9gZSmqa/yX8mST5z+a54 @@ -140,7 +140,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs index 3584cfcb..1ffacac8 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs @@ -31,8 +31,6 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LogWindow)); this.splitContainerLogWindow = new System.Windows.Forms.SplitContainer(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); @@ -68,13 +66,13 @@ private void InitializeComponent() this.filterRangeComboBox = new System.Windows.Forms.ComboBox(); this.columnNamesLabel = new System.Windows.Forms.Label(); this.fuzzyLabel = new System.Windows.Forms.Label(); - this.fuzzyKnobControl = new KnobControl(); + this.fuzzyKnobControl = new LogExpert.Controls.KnobControl(); this.invertFilterCheckBox = new System.Windows.Forms.CheckBox(); this.pnlProFilterLabel = new System.Windows.Forms.Panel(); this.lblBackSpread = new System.Windows.Forms.Label(); - this.filterKnobBackSpread = new KnobControl(); + this.filterKnobBackSpread = new LogExpert.Controls.KnobControl(); this.lblForeSpread = new System.Windows.Forms.Label(); - this.filterKnobForeSpread = new KnobControl(); + this.filterKnobForeSpread = new LogExpert.Controls.KnobControl(); this.btnFilterToTab = new System.Windows.Forms.Button(); this.btnToggleHighlightPanel = new System.Windows.Forms.Button(); this.highlightSplitContainer = new System.Windows.Forms.SplitContainer(); @@ -182,15 +180,16 @@ private void InitializeComponent() // // tableLayoutPanel1 // + this.tableLayoutPanel1.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 181F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 183F)); this.tableLayoutPanel1.Controls.Add(this.columnFinderPanel, 0, 0); this.tableLayoutPanel1.Controls.Add(this.dataGridView, 0, 1); this.tableLayoutPanel1.Controls.Add(this.timeSpreadingControl, 1, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.ForeColor = System.Drawing.SystemColors.ControlText; + this.tableLayoutPanel1.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; @@ -216,7 +215,7 @@ private void InitializeComponent() this.columnComboBox.Location = new System.Drawing.Point(88, 1); this.columnComboBox.MaxDropDownItems = 15; this.columnComboBox.Name = "columnComboBox"; - this.columnComboBox.Size = new System.Drawing.Size(181, 21); + this.columnComboBox.Size = new System.Drawing.Size(181, 25); this.columnComboBox.TabIndex = 1; this.helpToolTip.SetToolTip(this.columnComboBox, "Select column to scroll to"); this.columnComboBox.SelectionChangeCommitted += new System.EventHandler(this.OnColumnComboBoxSelectionChangeCommitted); @@ -228,7 +227,7 @@ private void InitializeComponent() this.lblColumnName.AutoSize = true; this.lblColumnName.Location = new System.Drawing.Point(8, 4); this.lblColumnName.Name = "lblColumnName"; - this.lblColumnName.Size = new System.Drawing.Size(74, 13); + this.lblColumnName.Size = new System.Drawing.Size(98, 17); this.lblColumnName.TabIndex = 0; this.lblColumnName.Text = "Column name:"; // @@ -238,20 +237,12 @@ private void InitializeComponent() this.dataGridView.AllowUserToDeleteRows = false; this.dataGridView.AllowUserToOrderColumns = true; this.dataGridView.AllowUserToResizeRows = false; - this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window; + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlDarkDark; this.dataGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.dataGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText; this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView.ContextMenuStrip = this.dataGridContextMenuStrip; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridView.DefaultCellStyle = dataGridViewCellStyle1; this.dataGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dataGridView.EditModeMenuStrip = null; @@ -261,6 +252,7 @@ private void InitializeComponent() this.dataGridView.Name = "dataGridView"; this.dataGridView.PaintWithOverlays = false; this.dataGridView.RowHeadersVisible = false; + this.dataGridView.RowHeadersWidth = 51; this.dataGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.BottomLeft; this.dataGridView.RowTemplate.DefaultCellStyle.Padding = new System.Windows.Forms.Padding(2, 0, 0, 0); this.dataGridView.RowTemplate.Height = 15; @@ -291,6 +283,7 @@ private void InitializeComponent() // // dataGridContextMenuStrip // + this.dataGridContextMenuStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.dataGridContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.copyToolStripMenuItem, this.copyToTabToolStripMenuItem, @@ -308,14 +301,14 @@ private void InitializeComponent() this.markCurrentFilterRangeToolStripMenuItem, this.pluginSeparator}); this.dataGridContextMenuStrip.Name = "dataGridContextMenuStrip"; - this.dataGridContextMenuStrip.Size = new System.Drawing.Size(287, 270); + this.dataGridContextMenuStrip.Size = new System.Drawing.Size(348, 292); this.dataGridContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.OnDataGridContextMenuStripOpening); // // copyToolStripMenuItem // this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.copyToolStripMenuItem.Size = new System.Drawing.Size(286, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(347, 24); this.copyToolStripMenuItem.Text = "Copy to clipboard"; this.copyToolStripMenuItem.Click += new System.EventHandler(this.OnCopyToolStripMenuItemClick); // @@ -323,7 +316,7 @@ private void InitializeComponent() // this.copyToTabToolStripMenuItem.Name = "copyToTabToolStripMenuItem"; this.copyToTabToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); - this.copyToTabToolStripMenuItem.Size = new System.Drawing.Size(286, 22); + this.copyToTabToolStripMenuItem.Size = new System.Drawing.Size(347, 24); this.copyToTabToolStripMenuItem.Text = "Copy to new tab"; this.copyToTabToolStripMenuItem.ToolTipText = "Copy marked lines into a new tab window"; this.copyToTabToolStripMenuItem.Click += new System.EventHandler(this.OnCopyToTabToolStripMenuItemClick); @@ -331,12 +324,12 @@ private void InitializeComponent() // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(283, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(344, 6); // // scrollAllTabsToTimestampToolStripMenuItem // this.scrollAllTabsToTimestampToolStripMenuItem.Name = "scrollAllTabsToTimestampToolStripMenuItem"; - this.scrollAllTabsToTimestampToolStripMenuItem.Size = new System.Drawing.Size(286, 22); + this.scrollAllTabsToTimestampToolStripMenuItem.Size = new System.Drawing.Size(347, 24); this.scrollAllTabsToTimestampToolStripMenuItem.Text = "Scroll all tabs to current timestamp"; this.scrollAllTabsToTimestampToolStripMenuItem.ToolTipText = "Scolls all open tabs to the selected timestamp, if possible"; this.scrollAllTabsToTimestampToolStripMenuItem.Click += new System.EventHandler(this.OnScrollAllTabsToTimestampToolStripMenuItemClick); @@ -344,13 +337,13 @@ private void InitializeComponent() // syncTimestampsToToolStripMenuItem // this.syncTimestampsToToolStripMenuItem.Name = "syncTimestampsToToolStripMenuItem"; - this.syncTimestampsToToolStripMenuItem.Size = new System.Drawing.Size(286, 22); + this.syncTimestampsToToolStripMenuItem.Size = new System.Drawing.Size(347, 24); this.syncTimestampsToToolStripMenuItem.Text = "Time synced files"; // // freeThisWindowFromTimeSyncToolStripMenuItem // this.freeThisWindowFromTimeSyncToolStripMenuItem.Name = "freeThisWindowFromTimeSyncToolStripMenuItem"; - this.freeThisWindowFromTimeSyncToolStripMenuItem.Size = new System.Drawing.Size(286, 22); + this.freeThisWindowFromTimeSyncToolStripMenuItem.Size = new System.Drawing.Size(347, 24); this.freeThisWindowFromTimeSyncToolStripMenuItem.Text = "Free this window from time sync"; this.freeThisWindowFromTimeSyncToolStripMenuItem.Click += new System.EventHandler(this.OnFreeThisWindowFromTimeSyncToolStripMenuItemClick); // @@ -358,20 +351,20 @@ private void InitializeComponent() // this.locateLineInOriginalFileToolStripMenuItem.Name = "locateLineInOriginalFileToolStripMenuItem"; this.locateLineInOriginalFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L))); - this.locateLineInOriginalFileToolStripMenuItem.Size = new System.Drawing.Size(286, 22); + this.locateLineInOriginalFileToolStripMenuItem.Size = new System.Drawing.Size(347, 24); this.locateLineInOriginalFileToolStripMenuItem.Text = "Locate filtered line in original file"; this.locateLineInOriginalFileToolStripMenuItem.Click += new System.EventHandler(this.OnLocateLineInOriginalFileToolStripMenuItemClick); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(283, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(344, 6); // // toggleBoomarkToolStripMenuItem // this.toggleBoomarkToolStripMenuItem.Name = "toggleBoomarkToolStripMenuItem"; this.toggleBoomarkToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F2))); - this.toggleBoomarkToolStripMenuItem.Size = new System.Drawing.Size(286, 22); + this.toggleBoomarkToolStripMenuItem.Size = new System.Drawing.Size(347, 24); this.toggleBoomarkToolStripMenuItem.Text = "Toggle Boomark"; this.toggleBoomarkToolStripMenuItem.Click += new System.EventHandler(this.OnToggleBoomarkToolStripMenuItemClick); // @@ -379,7 +372,7 @@ private void InitializeComponent() // this.bookmarkCommentToolStripMenuItem.Name = "bookmarkCommentToolStripMenuItem"; this.bookmarkCommentToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F2))); - this.bookmarkCommentToolStripMenuItem.Size = new System.Drawing.Size(286, 22); + this.bookmarkCommentToolStripMenuItem.Size = new System.Drawing.Size(347, 24); this.bookmarkCommentToolStripMenuItem.Text = "Bookmark comment..."; this.bookmarkCommentToolStripMenuItem.ToolTipText = "Edit the comment for a bookmark"; this.bookmarkCommentToolStripMenuItem.Click += new System.EventHandler(this.OnBookmarkCommentToolStripMenuItemClick); @@ -387,13 +380,13 @@ private void InitializeComponent() // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(283, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(344, 6); // // markEditModeToolStripMenuItem // this.markEditModeToolStripMenuItem.Name = "markEditModeToolStripMenuItem"; this.markEditModeToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); - this.markEditModeToolStripMenuItem.Size = new System.Drawing.Size(286, 22); + this.markEditModeToolStripMenuItem.Size = new System.Drawing.Size(347, 24); this.markEditModeToolStripMenuItem.Text = "Mark/Edit-Mode"; this.markEditModeToolStripMenuItem.Click += new System.EventHandler(this.OnMarkEditModeToolStripMenuItemClick); // @@ -403,7 +396,7 @@ private void InitializeComponent() this.removeAllToolStripMenuItem, this.makePermanentToolStripMenuItem}); this.tempHighlightsToolStripMenuItem.Name = "tempHighlightsToolStripMenuItem"; - this.tempHighlightsToolStripMenuItem.Size = new System.Drawing.Size(286, 22); + this.tempHighlightsToolStripMenuItem.Size = new System.Drawing.Size(347, 24); this.tempHighlightsToolStripMenuItem.Text = "Temp Highlights"; // // removeAllToolStripMenuItem @@ -411,14 +404,14 @@ private void InitializeComponent() this.removeAllToolStripMenuItem.Name = "removeAllToolStripMenuItem"; this.removeAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.H))); - this.removeAllToolStripMenuItem.Size = new System.Drawing.Size(207, 22); + this.removeAllToolStripMenuItem.Size = new System.Drawing.Size(259, 26); this.removeAllToolStripMenuItem.Text = "Remove all"; this.removeAllToolStripMenuItem.Click += new System.EventHandler(this.OnRemoveAllToolStripMenuItemClick); // // makePermanentToolStripMenuItem // this.makePermanentToolStripMenuItem.Name = "makePermanentToolStripMenuItem"; - this.makePermanentToolStripMenuItem.Size = new System.Drawing.Size(207, 22); + this.makePermanentToolStripMenuItem.Size = new System.Drawing.Size(259, 26); this.makePermanentToolStripMenuItem.Text = "Make all permanent"; this.makePermanentToolStripMenuItem.Click += new System.EventHandler(this.OnMakePermanentToolStripMenuItemClick); // @@ -426,14 +419,14 @@ private void InitializeComponent() // this.markCurrentFilterRangeToolStripMenuItem.Name = "markCurrentFilterRangeToolStripMenuItem"; this.markCurrentFilterRangeToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); - this.markCurrentFilterRangeToolStripMenuItem.Size = new System.Drawing.Size(286, 22); + this.markCurrentFilterRangeToolStripMenuItem.Size = new System.Drawing.Size(347, 24); this.markCurrentFilterRangeToolStripMenuItem.Text = "Mark current filter range"; this.markCurrentFilterRangeToolStripMenuItem.Click += new System.EventHandler(this.OnMarkCurrentFilterRangeToolStripMenuItemClick); // // pluginSeparator // this.pluginSeparator.Name = "pluginSeparator"; - this.pluginSeparator.Size = new System.Drawing.Size(283, 6); + this.pluginSeparator.Size = new System.Drawing.Size(344, 6); // // timeSpreadingControl // @@ -441,7 +434,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.timeSpreadingControl.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.timeSpreadingControl.ForeColor = System.Drawing.Color.Teal; - this.timeSpreadingControl.Location = new System.Drawing.Point(1013, 30); + this.timeSpreadingControl.Location = new System.Drawing.Point(1015, 30); this.timeSpreadingControl.Margin = new System.Windows.Forms.Padding(2, 0, 1, 0); this.timeSpreadingControl.Name = "timeSpreadingControl"; this.timeSpreadingControl.ReverseAlpha = false; @@ -524,7 +517,7 @@ private void InitializeComponent() this.columnRestrictCheckBox.AutoSize = true; this.columnRestrictCheckBox.Location = new System.Drawing.Point(527, 37); this.columnRestrictCheckBox.Name = "columnRestrictCheckBox"; - this.columnRestrictCheckBox.Size = new System.Drawing.Size(95, 17); + this.columnRestrictCheckBox.Size = new System.Drawing.Size(124, 21); this.columnRestrictCheckBox.TabIndex = 14; this.columnRestrictCheckBox.Text = "Column restrict"; this.helpToolTip.SetToolTip(this.columnRestrictCheckBox, "Restrict search to columns"); @@ -536,7 +529,7 @@ private void InitializeComponent() this.rangeCheckBox.AutoSize = true; this.rangeCheckBox.Location = new System.Drawing.Point(75, 36); this.rangeCheckBox.Name = "rangeCheckBox"; - this.rangeCheckBox.Size = new System.Drawing.Size(93, 17); + this.rangeCheckBox.Size = new System.Drawing.Size(119, 21); this.rangeCheckBox.TabIndex = 13; this.rangeCheckBox.Text = "Range search"; this.helpToolTip.SetToolTip(this.rangeCheckBox, "Enable a special search mode which filters all content between the 2 given search" + @@ -550,7 +543,7 @@ private void InitializeComponent() this.filterRangeComboBox.FormattingEnabled = true; this.filterRangeComboBox.Location = new System.Drawing.Point(73, 11); this.filterRangeComboBox.Name = "filterRangeComboBox"; - this.filterRangeComboBox.Size = new System.Drawing.Size(207, 21); + this.filterRangeComboBox.Size = new System.Drawing.Size(207, 25); this.filterRangeComboBox.TabIndex = 12; this.helpToolTip.SetToolTip(this.filterRangeComboBox, "2nd search string (\'end string\') when using the range search"); this.filterRangeComboBox.TextChanged += new System.EventHandler(this.OnFilterRangeComboBoxTextChanged); @@ -560,7 +553,7 @@ private void InitializeComponent() this.columnNamesLabel.AutoSize = true; this.columnNamesLabel.Location = new System.Drawing.Point(732, 35); this.columnNamesLabel.Name = "columnNamesLabel"; - this.columnNamesLabel.Size = new System.Drawing.Size(75, 13); + this.columnNamesLabel.Size = new System.Drawing.Size(99, 17); this.columnNamesLabel.TabIndex = 11; this.columnNamesLabel.Text = "column names"; // @@ -569,7 +562,7 @@ private void InitializeComponent() this.fuzzyLabel.AutoSize = true; this.fuzzyLabel.Location = new System.Drawing.Point(435, 38); this.fuzzyLabel.Name = "fuzzyLabel"; - this.fuzzyLabel.Size = new System.Drawing.Size(56, 13); + this.fuzzyLabel.Size = new System.Drawing.Size(75, 17); this.fuzzyLabel.TabIndex = 11; this.fuzzyLabel.Text = "Fuzzyness"; // @@ -578,7 +571,7 @@ private void InitializeComponent() this.fuzzyKnobControl.DragSensitivity = 6; this.fuzzyKnobControl.Font = new System.Drawing.Font("Verdana", 6F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.fuzzyKnobControl.Location = new System.Drawing.Point(454, 7); - this.fuzzyKnobControl.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.fuzzyKnobControl.Margin = new System.Windows.Forms.Padding(2); this.fuzzyKnobControl.MaxValue = 0; this.fuzzyKnobControl.MinValue = 0; this.fuzzyKnobControl.Name = "fuzzyKnobControl"; @@ -586,14 +579,14 @@ private void InitializeComponent() this.fuzzyKnobControl.TabIndex = 10; this.helpToolTip.SetToolTip(this.fuzzyKnobControl, "Fuzzy search level (0 = fuzzy off)"); this.fuzzyKnobControl.Value = 0; - this.fuzzyKnobControl.ValueChanged += new KnobControl.ValueChangedEventHandler(this.OnFuzzyKnobControlValueChanged); + this.fuzzyKnobControl.ValueChanged += new LogExpert.Controls.KnobControl.ValueChangedEventHandler(this.OnFuzzyKnobControlValueChanged); // // invertFilterCheckBox // this.invertFilterCheckBox.AutoSize = true; this.invertFilterCheckBox.Location = new System.Drawing.Point(527, 13); this.invertFilterCheckBox.Name = "invertFilterCheckBox"; - this.invertFilterCheckBox.Size = new System.Drawing.Size(86, 17); + this.invertFilterCheckBox.Size = new System.Drawing.Size(107, 21); this.invertFilterCheckBox.TabIndex = 8; this.invertFilterCheckBox.Text = "Invert Match"; this.helpToolTip.SetToolTip(this.invertFilterCheckBox, "Invert the search result"); @@ -614,7 +607,7 @@ private void InitializeComponent() this.lblBackSpread.AutoSize = true; this.lblBackSpread.Location = new System.Drawing.Point(273, 38); this.lblBackSpread.Name = "lblBackSpread"; - this.lblBackSpread.Size = new System.Drawing.Size(72, 13); + this.lblBackSpread.Size = new System.Drawing.Size(93, 17); this.lblBackSpread.TabIndex = 6; this.lblBackSpread.Text = "Back Spread "; // @@ -623,7 +616,7 @@ private void InitializeComponent() this.filterKnobBackSpread.DragSensitivity = 3; this.filterKnobBackSpread.Font = new System.Drawing.Font("Verdana", 6F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.filterKnobBackSpread.Location = new System.Drawing.Point(299, 7); - this.filterKnobBackSpread.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.filterKnobBackSpread.Margin = new System.Windows.Forms.Padding(2); this.filterKnobBackSpread.MaxValue = 0; this.filterKnobBackSpread.MinValue = 0; this.filterKnobBackSpread.Name = "filterKnobBackSpread"; @@ -637,7 +630,7 @@ private void InitializeComponent() this.lblForeSpread.AutoSize = true; this.lblForeSpread.Location = new System.Drawing.Point(342, 38); this.lblForeSpread.Name = "lblForeSpread"; - this.lblForeSpread.Size = new System.Drawing.Size(65, 13); + this.lblForeSpread.Size = new System.Drawing.Size(87, 17); this.lblForeSpread.TabIndex = 2; this.lblForeSpread.Text = "Fore Spread"; // @@ -646,7 +639,7 @@ private void InitializeComponent() this.filterKnobForeSpread.DragSensitivity = 3; this.filterKnobForeSpread.Font = new System.Drawing.Font("Verdana", 6F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.filterKnobForeSpread.Location = new System.Drawing.Point(365, 7); - this.filterKnobForeSpread.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.filterKnobForeSpread.Margin = new System.Windows.Forms.Padding(2); this.filterKnobForeSpread.MaxValue = 0; this.filterKnobForeSpread.MinValue = 0; this.filterKnobForeSpread.Name = "filterKnobForeSpread"; @@ -697,7 +690,7 @@ private void InitializeComponent() // this.highlightSplitContainer.Panel2.Controls.Add(this.highlightSplitContainerBackPanel); this.highlightSplitContainer.Panel2MinSize = 30; - this.highlightSplitContainer.Size = new System.Drawing.Size(981, 175); + this.highlightSplitContainer.Size = new System.Drawing.Size(981, 179); this.highlightSplitContainer.SplitterDistance = 612; this.highlightSplitContainer.TabIndex = 2; // @@ -707,20 +700,13 @@ private void InitializeComponent() this.filterGridView.AllowUserToDeleteRows = false; this.filterGridView.AllowUserToOrderColumns = true; this.filterGridView.AllowUserToResizeRows = false; - this.filterGridView.BackgroundColor = System.Drawing.SystemColors.Window; + this.filterGridView.BackgroundColor = System.Drawing.SystemColors.ControlDarkDark; + this.filterGridView.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.filterGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.filterGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.filterGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText; this.filterGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.filterGridView.ContextMenuStrip = this.filterContextMenuStrip; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.filterGridView.DefaultCellStyle = dataGridViewCellStyle2; this.filterGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.filterGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.filterGridView.EditModeMenuStrip = null; @@ -731,6 +717,7 @@ private void InitializeComponent() this.filterGridView.PaintWithOverlays = false; this.filterGridView.ReadOnly = true; this.filterGridView.RowHeadersVisible = false; + this.filterGridView.RowHeadersWidth = 51; this.filterGridView.RowTemplate.Height = 15; this.filterGridView.RowTemplate.ReadOnly = true; this.filterGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -738,7 +725,7 @@ private void InitializeComponent() this.filterGridView.ShowCellToolTips = false; this.filterGridView.ShowEditingIcon = false; this.filterGridView.ShowRowErrors = false; - this.filterGridView.Size = new System.Drawing.Size(610, 173); + this.filterGridView.Size = new System.Drawing.Size(610, 177); this.filterGridView.TabIndex = 1; this.filterGridView.VirtualMode = true; this.filterGridView.CellContextMenuStripNeeded += new System.Windows.Forms.DataGridViewCellContextMenuStripNeededEventHandler(this.OnFilterGridViewCellContextMenuStripNeeded); @@ -751,17 +738,18 @@ private void InitializeComponent() // // filterContextMenuStrip // + this.filterContextMenuStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.filterContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.setBookmarksOnSelectedLinesToolStripMenuItem, this.filterToTabToolStripMenuItem, this.markFilterHitsInLogViewToolStripMenuItem}); this.filterContextMenuStrip.Name = "filterContextMenuStrip"; - this.filterContextMenuStrip.Size = new System.Drawing.Size(243, 70); + this.filterContextMenuStrip.Size = new System.Drawing.Size(291, 76); // // setBookmarksOnSelectedLinesToolStripMenuItem // this.setBookmarksOnSelectedLinesToolStripMenuItem.Name = "setBookmarksOnSelectedLinesToolStripMenuItem"; - this.setBookmarksOnSelectedLinesToolStripMenuItem.Size = new System.Drawing.Size(242, 22); + this.setBookmarksOnSelectedLinesToolStripMenuItem.Size = new System.Drawing.Size(290, 24); this.setBookmarksOnSelectedLinesToolStripMenuItem.Text = "Set bookmarks on selected lines"; this.setBookmarksOnSelectedLinesToolStripMenuItem.Click += new System.EventHandler(this.OnSetBookmarksOnSelectedLinesToolStripMenuItemClick); // @@ -770,14 +758,14 @@ private void InitializeComponent() this.filterToTabToolStripMenuItem.Name = "filterToTabToolStripMenuItem"; this.filterToTabToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.T))); - this.filterToTabToolStripMenuItem.Size = new System.Drawing.Size(242, 22); + this.filterToTabToolStripMenuItem.Size = new System.Drawing.Size(290, 24); this.filterToTabToolStripMenuItem.Text = "Filter to new tab"; this.filterToTabToolStripMenuItem.Click += new System.EventHandler(this.OnFilterToTabToolStripMenuItemClick); // // markFilterHitsInLogViewToolStripMenuItem // this.markFilterHitsInLogViewToolStripMenuItem.Name = "markFilterHitsInLogViewToolStripMenuItem"; - this.markFilterHitsInLogViewToolStripMenuItem.Size = new System.Drawing.Size(242, 22); + this.markFilterHitsInLogViewToolStripMenuItem.Size = new System.Drawing.Size(290, 24); this.markFilterHitsInLogViewToolStripMenuItem.Text = "Mark filter hits in log view"; this.markFilterHitsInLogViewToolStripMenuItem.Click += new System.EventHandler(this.OnMarkFilterHitsInLogViewToolStripMenuItemClick); // @@ -793,7 +781,7 @@ private void InitializeComponent() this.highlightSplitContainerBackPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.highlightSplitContainerBackPanel.Location = new System.Drawing.Point(0, 0); this.highlightSplitContainerBackPanel.Name = "highlightSplitContainerBackPanel"; - this.highlightSplitContainerBackPanel.Size = new System.Drawing.Size(363, 173); + this.highlightSplitContainerBackPanel.Size = new System.Drawing.Size(363, 177); this.highlightSplitContainerBackPanel.TabIndex = 1; // // hideFilterListOnLoadCheckBox @@ -801,7 +789,7 @@ private void InitializeComponent() this.hideFilterListOnLoadCheckBox.AutoSize = true; this.hideFilterListOnLoadCheckBox.Location = new System.Drawing.Point(287, 134); this.hideFilterListOnLoadCheckBox.Name = "hideFilterListOnLoadCheckBox"; - this.hideFilterListOnLoadCheckBox.Size = new System.Drawing.Size(71, 17); + this.hideFilterListOnLoadCheckBox.Size = new System.Drawing.Size(90, 21); this.hideFilterListOnLoadCheckBox.TabIndex = 20; this.hideFilterListOnLoadCheckBox.Text = "Auto hide"; this.helpToolTip.SetToolTip(this.hideFilterListOnLoadCheckBox, "Hides the filter list after loading a filter"); @@ -835,7 +823,7 @@ private void InitializeComponent() this.filterOnLoadCheckBox.AutoSize = true; this.filterOnLoadCheckBox.Location = new System.Drawing.Point(287, 110); this.filterOnLoadCheckBox.Name = "filterOnLoadCheckBox"; - this.filterOnLoadCheckBox.Size = new System.Drawing.Size(71, 17); + this.filterOnLoadCheckBox.Size = new System.Drawing.Size(91, 21); this.filterOnLoadCheckBox.TabIndex = 17; this.filterOnLoadCheckBox.Text = "Auto start"; this.helpToolTip.SetToolTip(this.filterOnLoadCheckBox, "Start immediate filtering after loading a saved filter"); @@ -876,7 +864,7 @@ private void InitializeComponent() this.filterListBox.IntegralHeight = false; this.filterListBox.Location = new System.Drawing.Point(3, 3); this.filterListBox.Name = "filterListBox"; - this.filterListBox.Size = new System.Drawing.Size(278, 168); + this.filterListBox.Size = new System.Drawing.Size(278, 172); this.filterListBox.TabIndex = 0; this.helpToolTip.SetToolTip(this.filterListBox, "Doubleclick to load a saved filter"); this.filterListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.OnFilterListBoxDrawItem); @@ -884,15 +872,16 @@ private void InitializeComponent() // // filterListContextMenuStrip // + this.filterListContextMenuStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.filterListContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.colorToolStripMenuItem}); this.filterListContextMenuStrip.Name = "filterListContextMenuStrip"; - this.filterListContextMenuStrip.Size = new System.Drawing.Size(113, 26); + this.filterListContextMenuStrip.Size = new System.Drawing.Size(124, 28); // // colorToolStripMenuItem // this.colorToolStripMenuItem.Name = "colorToolStripMenuItem"; - this.colorToolStripMenuItem.Size = new System.Drawing.Size(112, 22); + this.colorToolStripMenuItem.Size = new System.Drawing.Size(123, 24); this.colorToolStripMenuItem.Text = "Color..."; this.colorToolStripMenuItem.Click += new System.EventHandler(this.OnColorToolStripMenuItemClick); // @@ -914,12 +903,15 @@ private void InitializeComponent() // // filterSplitContainer.Panel1 // + this.filterSplitContainer.Panel1.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.filterSplitContainer.Panel1.Controls.Add(this.lblTextFilter); this.filterSplitContainer.Panel1.Controls.Add(this.filterComboBox); + this.filterSplitContainer.Panel1.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.filterSplitContainer.Panel1MinSize = 200; // // filterSplitContainer.Panel2 // + this.filterSplitContainer.Panel2.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.filterSplitContainer.Panel2.Controls.Add(this.advancedButton); this.filterSplitContainer.Panel2.Controls.Add(this.syncFilterCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.lblFilterCount); @@ -927,6 +919,7 @@ private void InitializeComponent() this.filterSplitContainer.Panel2.Controls.Add(this.filterRegexCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.filterCaseSensitiveCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.filterSearchButton); + this.filterSplitContainer.Panel2.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.filterSplitContainer.Panel2MinSize = 550; this.filterSplitContainer.Size = new System.Drawing.Size(1007, 32); this.filterSplitContainer.SplitterDistance = 282; @@ -941,7 +934,7 @@ private void InitializeComponent() this.lblTextFilter.AutoSize = true; this.lblTextFilter.Location = new System.Drawing.Point(5, 9); this.lblTextFilter.Name = "lblTextFilter"; - this.lblTextFilter.Size = new System.Drawing.Size(53, 13); + this.lblTextFilter.Size = new System.Drawing.Size(70, 17); this.lblTextFilter.TabIndex = 3; this.lblTextFilter.Text = "Text &filter:"; // @@ -953,7 +946,7 @@ private void InitializeComponent() this.filterComboBox.FormattingEnabled = true; this.filterComboBox.Location = new System.Drawing.Point(73, 5); this.filterComboBox.Name = "filterComboBox"; - this.filterComboBox.Size = new System.Drawing.Size(206, 22); + this.filterComboBox.Size = new System.Drawing.Size(206, 25); this.filterComboBox.TabIndex = 4; this.helpToolTip.SetToolTip(this.filterComboBox, "Search string for the filter"); this.filterComboBox.TextChanged += new System.EventHandler(this.OnFilterComboBoxTextChanged); @@ -978,7 +971,7 @@ private void InitializeComponent() this.syncFilterCheckBox.AutoSize = true; this.syncFilterCheckBox.Location = new System.Drawing.Point(306, 7); this.syncFilterCheckBox.Name = "syncFilterCheckBox"; - this.syncFilterCheckBox.Size = new System.Drawing.Size(50, 17); + this.syncFilterCheckBox.Size = new System.Drawing.Size(61, 21); this.syncFilterCheckBox.TabIndex = 16; this.syncFilterCheckBox.Text = "Sync"; this.helpToolTip.SetToolTip(this.syncFilterCheckBox, "Sync the current selected line in the filter view to the selection in the log fil" + @@ -1002,7 +995,7 @@ private void InitializeComponent() this.filterTailCheckBox.AutoSize = true; this.filterTailCheckBox.Location = new System.Drawing.Point(235, 7); this.filterTailCheckBox.Name = "filterTailCheckBox"; - this.filterTailCheckBox.Size = new System.Drawing.Size(64, 17); + this.filterTailCheckBox.Size = new System.Drawing.Size(83, 21); this.filterTailCheckBox.TabIndex = 14; this.filterTailCheckBox.Text = "Filter tail"; this.helpToolTip.SetToolTip(this.filterTailCheckBox, "Filter tailed file content (keeps filter view up to date on file changes)"); @@ -1013,7 +1006,7 @@ private void InitializeComponent() this.filterRegexCheckBox.AutoSize = true; this.filterRegexCheckBox.Location = new System.Drawing.Point(172, 7); this.filterRegexCheckBox.Name = "filterRegexCheckBox"; - this.filterRegexCheckBox.Size = new System.Drawing.Size(57, 17); + this.filterRegexCheckBox.Size = new System.Drawing.Size(70, 21); this.filterRegexCheckBox.TabIndex = 13; this.filterRegexCheckBox.Text = "Regex"; this.helpToolTip.SetToolTip(this.filterRegexCheckBox, "Use regular expressions. (right-click for RegEx helper window)"); @@ -1026,7 +1019,7 @@ private void InitializeComponent() this.filterCaseSensitiveCheckBox.AutoSize = true; this.filterCaseSensitiveCheckBox.Location = new System.Drawing.Point(72, 7); this.filterCaseSensitiveCheckBox.Name = "filterCaseSensitiveCheckBox"; - this.filterCaseSensitiveCheckBox.Size = new System.Drawing.Size(94, 17); + this.filterCaseSensitiveCheckBox.Size = new System.Drawing.Size(121, 21); this.filterCaseSensitiveCheckBox.TabIndex = 12; this.filterCaseSensitiveCheckBox.Text = "Case sensitive"; this.helpToolTip.SetToolTip(this.filterCaseSensitiveCheckBox, "Makes the filter case sensitive"); @@ -1048,18 +1041,20 @@ private void InitializeComponent() // // bookmarkContextMenuStrip // + this.bookmarkContextMenuStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.bookmarkContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.deleteBookmarksToolStripMenuItem}); this.bookmarkContextMenuStrip.Name = "bookmarkContextMenuStrip"; - this.bookmarkContextMenuStrip.Size = new System.Drawing.Size(68, 26); + this.bookmarkContextMenuStrip.Size = new System.Drawing.Size(70, 26); // // deleteBookmarksToolStripMenuItem // this.deleteBookmarksToolStripMenuItem.Name = "deleteBookmarksToolStripMenuItem"; - this.deleteBookmarksToolStripMenuItem.Size = new System.Drawing.Size(67, 22); + this.deleteBookmarksToolStripMenuItem.Size = new System.Drawing.Size(69, 22); // // columnContextMenuStrip // + this.columnContextMenuStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.columnContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.freezeLeftColumnsUntilHereToolStripMenuItem, this.toolStripSeparator3, @@ -1072,25 +1067,25 @@ private void InitializeComponent() this.toolStripSeparator6, this.allColumnsToolStripMenuItem}); this.columnContextMenuStrip.Name = "columnContextMenuStrip"; - this.columnContextMenuStrip.Size = new System.Drawing.Size(230, 176); + this.columnContextMenuStrip.Size = new System.Drawing.Size(273, 190); this.columnContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.OnColumnContextMenuStripOpening); // // freezeLeftColumnsUntilHereToolStripMenuItem // this.freezeLeftColumnsUntilHereToolStripMenuItem.Name = "freezeLeftColumnsUntilHereToolStripMenuItem"; - this.freezeLeftColumnsUntilHereToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.freezeLeftColumnsUntilHereToolStripMenuItem.Size = new System.Drawing.Size(272, 24); this.freezeLeftColumnsUntilHereToolStripMenuItem.Text = "Freeze left columns until here"; this.freezeLeftColumnsUntilHereToolStripMenuItem.Click += new System.EventHandler(this.OnFreezeLeftColumnsUntilHereToolStripMenuItemClick); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(226, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(269, 6); // // moveToLastColumnToolStripMenuItem // this.moveToLastColumnToolStripMenuItem.Name = "moveToLastColumnToolStripMenuItem"; - this.moveToLastColumnToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.moveToLastColumnToolStripMenuItem.Size = new System.Drawing.Size(272, 24); this.moveToLastColumnToolStripMenuItem.Text = "Move to last column"; this.moveToLastColumnToolStripMenuItem.ToolTipText = "Move this column to the last position"; this.moveToLastColumnToolStripMenuItem.Click += new System.EventHandler(this.OnMoveToLastColumnToolStripMenuItemClick); @@ -1098,26 +1093,26 @@ private void InitializeComponent() // moveLeftToolStripMenuItem // this.moveLeftToolStripMenuItem.Name = "moveLeftToolStripMenuItem"; - this.moveLeftToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.moveLeftToolStripMenuItem.Size = new System.Drawing.Size(272, 24); this.moveLeftToolStripMenuItem.Text = "Move left"; this.moveLeftToolStripMenuItem.Click += new System.EventHandler(this.OnMoveLeftToolStripMenuItemClick); // // moveRightToolStripMenuItem // this.moveRightToolStripMenuItem.Name = "moveRightToolStripMenuItem"; - this.moveRightToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.moveRightToolStripMenuItem.Size = new System.Drawing.Size(272, 24); this.moveRightToolStripMenuItem.Text = "Move right"; this.moveRightToolStripMenuItem.Click += new System.EventHandler(this.OnMoveRightToolStripMenuItemClick); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(226, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(269, 6); // // hideColumnToolStripMenuItem // this.hideColumnToolStripMenuItem.Name = "hideColumnToolStripMenuItem"; - this.hideColumnToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.hideColumnToolStripMenuItem.Size = new System.Drawing.Size(272, 24); this.hideColumnToolStripMenuItem.Text = "Hide column"; this.hideColumnToolStripMenuItem.ToolTipText = "Hide this column"; this.hideColumnToolStripMenuItem.Click += new System.EventHandler(this.OnHideColumnToolStripMenuItemClick); @@ -1125,23 +1120,24 @@ private void InitializeComponent() // restoreColumnsToolStripMenuItem // this.restoreColumnsToolStripMenuItem.Name = "restoreColumnsToolStripMenuItem"; - this.restoreColumnsToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.restoreColumnsToolStripMenuItem.Size = new System.Drawing.Size(272, 24); this.restoreColumnsToolStripMenuItem.Text = "Restore columns"; this.restoreColumnsToolStripMenuItem.Click += new System.EventHandler(this.OnRestoreColumnsToolStripMenuItemClick); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(226, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(269, 6); // // allColumnsToolStripMenuItem // this.allColumnsToolStripMenuItem.Name = "allColumnsToolStripMenuItem"; - this.allColumnsToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.allColumnsToolStripMenuItem.Size = new System.Drawing.Size(272, 24); this.allColumnsToolStripMenuItem.Text = "Scroll to column..."; // // editModeContextMenuStrip // + this.editModeContextMenuStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.editModeContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.editModecopyToolStripMenuItem, this.highlightSelectionInLogFileToolStripMenuItem, @@ -1149,13 +1145,13 @@ private void InitializeComponent() this.filterForSelectionToolStripMenuItem, this.setSelectedTextAsBookmarkCommentToolStripMenuItem}); this.editModeContextMenuStrip.Name = "editModeContextMenuStrip"; - this.editModeContextMenuStrip.Size = new System.Drawing.Size(344, 114); + this.editModeContextMenuStrip.Size = new System.Drawing.Size(418, 124); // // editModecopyToolStripMenuItem // this.editModecopyToolStripMenuItem.Name = "editModecopyToolStripMenuItem"; this.editModecopyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.editModecopyToolStripMenuItem.Size = new System.Drawing.Size(343, 22); + this.editModecopyToolStripMenuItem.Size = new System.Drawing.Size(417, 24); this.editModecopyToolStripMenuItem.Text = "Copy"; this.editModecopyToolStripMenuItem.Click += new System.EventHandler(this.OnEditModeCopyToolStripMenuItemClick); // @@ -1163,7 +1159,7 @@ private void InitializeComponent() // this.highlightSelectionInLogFileToolStripMenuItem.Name = "highlightSelectionInLogFileToolStripMenuItem"; this.highlightSelectionInLogFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.H))); - this.highlightSelectionInLogFileToolStripMenuItem.Size = new System.Drawing.Size(343, 22); + this.highlightSelectionInLogFileToolStripMenuItem.Size = new System.Drawing.Size(417, 24); this.highlightSelectionInLogFileToolStripMenuItem.Text = "Highlight selection in log file (full line)"; this.highlightSelectionInLogFileToolStripMenuItem.Click += new System.EventHandler(this.OnHighlightSelectionInLogFileToolStripMenuItemClick); // @@ -1171,7 +1167,7 @@ private void InitializeComponent() // this.highlightSelectionInLogFilewordModeToolStripMenuItem.Name = "highlightSelectionInLogFilewordModeToolStripMenuItem"; this.highlightSelectionInLogFilewordModeToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W))); - this.highlightSelectionInLogFilewordModeToolStripMenuItem.Size = new System.Drawing.Size(343, 22); + this.highlightSelectionInLogFilewordModeToolStripMenuItem.Size = new System.Drawing.Size(417, 24); this.highlightSelectionInLogFilewordModeToolStripMenuItem.Text = "Highlight selection in log file (word mode)"; this.highlightSelectionInLogFilewordModeToolStripMenuItem.Click += new System.EventHandler(this.OnHighlightSelectionInLogFilewordModeToolStripMenuItemClick); // @@ -1179,7 +1175,7 @@ private void InitializeComponent() // this.filterForSelectionToolStripMenuItem.Name = "filterForSelectionToolStripMenuItem"; this.filterForSelectionToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); - this.filterForSelectionToolStripMenuItem.Size = new System.Drawing.Size(343, 22); + this.filterForSelectionToolStripMenuItem.Size = new System.Drawing.Size(417, 24); this.filterForSelectionToolStripMenuItem.Text = "Filter for selection"; this.filterForSelectionToolStripMenuItem.Click += new System.EventHandler(this.OnFilterForSelectionToolStripMenuItemClick); // @@ -1187,15 +1183,16 @@ private void InitializeComponent() // this.setSelectedTextAsBookmarkCommentToolStripMenuItem.Name = "setSelectedTextAsBookmarkCommentToolStripMenuItem"; this.setSelectedTextAsBookmarkCommentToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B))); - this.setSelectedTextAsBookmarkCommentToolStripMenuItem.Size = new System.Drawing.Size(343, 22); + this.setSelectedTextAsBookmarkCommentToolStripMenuItem.Size = new System.Drawing.Size(417, 24); this.setSelectedTextAsBookmarkCommentToolStripMenuItem.Text = "Set selected text as bookmark comment"; this.setSelectedTextAsBookmarkCommentToolStripMenuItem.Click += new System.EventHandler(this.OnSetSelectedTextAsBookmarkCommentToolStripMenuItemClick); // // LogWindow // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.ClientSize = new System.Drawing.Size(1014, 656); this.ControlBox = false; this.Controls.Add(this.splitContainerLogWindow); diff --git a/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs b/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs index 171cbdfe..5254e50d 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs @@ -1497,5 +1497,6 @@ private void OnDataGridViewRowUnshared(object sender, DataGridViewRowEventArgs e #endregion #endregion + } } \ No newline at end of file diff --git a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs index 2bc1d4e2..90ced46f 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs @@ -3713,5 +3713,6 @@ private void SelectColumn() } #endregion + } } \ No newline at end of file diff --git a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs index 25a274e1..88ab055d 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs @@ -1785,5 +1785,7 @@ public void RefreshLogView() } #endregion + + } } \ No newline at end of file diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj index fc5aa1f1..8cfe193b 100644 --- a/src/LogExpert/LogExpert.csproj +++ b/src/LogExpert/LogExpert.csproj @@ -85,6 +85,7 @@ + Form From d59bff96b8c960a36008f1f7c8d679543ec57bab Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 14:39:38 +0200 Subject: [PATCH 04/33] implement dark mode as setting --- src/LogExpert/Config/Preferences.cs | 2 + src/LogExpert/Controls/DarkTitleBar.cs | 37 - .../LogTabWindow/LogTabWindow.designer.cs | 44 +- .../Controls/LogWindow/LogWindow.designer.cs | 22 +- .../Dialogs/SettingsDialog.Designer.cs | 712 +++++++++--------- src/LogExpert/Dialogs/SettingsDialog.cs | 4 + src/LogExpert/Dialogs/SettingsDialog.resx | 6 +- src/LogExpert/Interface/ColorMode.cs | 76 ++ src/LogExpert/LogExpert.csproj | 2 +- src/LogExpert/Program.cs | 3 + 10 files changed, 486 insertions(+), 422 deletions(-) delete mode 100644 src/LogExpert/Controls/DarkTitleBar.cs create mode 100644 src/LogExpert/Interface/ColorMode.cs diff --git a/src/LogExpert/Config/Preferences.cs b/src/LogExpert/Config/Preferences.cs index 6e4c99b0..4c7bd9cc 100644 --- a/src/LogExpert/Config/Preferences.cs +++ b/src/LogExpert/Config/Preferences.cs @@ -15,6 +15,8 @@ public class Preferences public bool askForClose = false; + public bool darkMode = false; + public int bufferCount = 100; public List columnizerMaskList = new List(); diff --git a/src/LogExpert/Controls/DarkTitleBar.cs b/src/LogExpert/Controls/DarkTitleBar.cs deleted file mode 100644 index 3a68e690..00000000 --- a/src/LogExpert/Controls/DarkTitleBar.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.InteropServices; -using System.Text; -using System.Threading.Tasks; - -namespace LogExpert.Controls -{ - class DarkTitleBar - { - [DllImport("dwmapi.dll")] - private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int attrValue, int attrSize); - - private const int DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19; - private const int DWMWA_USE_IMMERSIVE_DARK_MODE = 20; - - public static bool UseImmersiveDarkMode(IntPtr handle, bool enabled) - { - - var attribute = DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1; - if (IsWindows10OrGreater(18985)) - { - attribute = DWMWA_USE_IMMERSIVE_DARK_MODE; - } - - int useImmersiveDarkMode = enabled ? 1 : 0; - return DwmSetWindowAttribute(handle, (int)attribute, ref useImmersiveDarkMode, sizeof(int)) == 0; - - } - - private static bool IsWindows10OrGreater(int build = -1) - { - return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= build; - } - } -} diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index 226714c5..e480ab11 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -170,7 +170,7 @@ private void InitializeComponent() // statusStrip // this.statusStrip.AutoSize = false; - this.statusStrip.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.statusStrip.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.statusStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.labelLines, @@ -233,7 +233,7 @@ private void InitializeComponent() // mainMenuStrip // this.mainMenuStrip.AllowMerge = false; - this.mainMenuStrip.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.mainMenuStrip.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.mainMenuStrip.Dock = System.Windows.Forms.DockStyle.None; this.mainMenuStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -864,18 +864,18 @@ private void InitializeComponent() // // toolStripContainer.ContentPanel // - this.toolStripContainer.ContentPanel.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.toolStripContainer.ContentPanel.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.toolStripContainer.ContentPanel.Controls.Add(this.dockPanel); - this.toolStripContainer.ContentPanel.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.toolStripContainer.ContentPanel.ForeColor = LogExpert.Interface.ColorMode.foreColor; this.toolStripContainer.ContentPanel.Margin = new System.Windows.Forms.Padding(0); this.toolStripContainer.ContentPanel.Size = new System.Drawing.Size(1283, 564); this.toolStripContainer.Dock = System.Windows.Forms.DockStyle.Fill; // // toolStripContainer.LeftToolStripPanel // - this.toolStripContainer.LeftToolStripPanel.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.toolStripContainer.LeftToolStripPanel.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.toolStripContainer.LeftToolStripPanel.Enabled = false; - this.toolStripContainer.LeftToolStripPanel.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.toolStripContainer.LeftToolStripPanel.ForeColor = LogExpert.Interface.ColorMode.foreColor; this.toolStripContainer.LeftToolStripPanelVisible = false; this.toolStripContainer.Location = new System.Drawing.Point(0, 0); this.toolStripContainer.Margin = new System.Windows.Forms.Padding(0); @@ -883,9 +883,9 @@ private void InitializeComponent() // // toolStripContainer.RightToolStripPanel // - this.toolStripContainer.RightToolStripPanel.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.toolStripContainer.RightToolStripPanel.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.toolStripContainer.RightToolStripPanel.Enabled = false; - this.toolStripContainer.RightToolStripPanel.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.toolStripContainer.RightToolStripPanel.ForeColor = LogExpert.Interface.ColorMode.foreColor; this.toolStripContainer.RightToolStripPanelVisible = false; this.toolStripContainer.Size = new System.Drawing.Size(1283, 623); this.toolStripContainer.TabIndex = 13; @@ -893,21 +893,21 @@ private void InitializeComponent() // // toolStripContainer.TopToolStripPanel // - this.toolStripContainer.TopToolStripPanel.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.toolStripContainer.TopToolStripPanel.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.toolStripContainer.TopToolStripPanel.Controls.Add(this.buttonToolStrip); this.toolStripContainer.TopToolStripPanel.Controls.Add(this.mainMenuStrip); this.toolStripContainer.TopToolStripPanel.Controls.Add(this.externalToolsToolStrip); - this.toolStripContainer.TopToolStripPanel.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.toolStripContainer.TopToolStripPanel.ForeColor = LogExpert.Interface.ColorMode.foreColor; // // dockPanel // this.dockPanel.ActiveAutoHideContent = null; - this.dockPanel.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.dockPanel.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.dockPanel.DefaultFloatWindowSize = new System.Drawing.Size(600, 400); this.dockPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.dockPanel.DockBackColor = System.Drawing.SystemColors.ControlDarkDark; + this.dockPanel.DockBackColor = LogExpert.Interface.ColorMode.backgroundColor; this.dockPanel.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow; - this.dockPanel.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.dockPanel.ForeColor = LogExpert.Interface.ColorMode.foreColor; this.dockPanel.Location = new System.Drawing.Point(0, 0); this.dockPanel.Margin = new System.Windows.Forms.Padding(0); this.dockPanel.Name = "dockPanel"; @@ -918,12 +918,12 @@ private void InitializeComponent() autoHideStripSkin1.DockStripGradient = dockPanelGradient1; tabGradient1.EndColor = System.Drawing.SystemColors.Control; tabGradient1.StartColor = System.Drawing.SystemColors.Control; - tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark; + tabGradient1.TextColor = LogExpert.Interface.ColorMode.backgroundColor; autoHideStripSkin1.TabGradient = tabGradient1; autoHideStripSkin1.TextFont = new System.Drawing.Font("Segoe UI", 9F); dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; - tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient2.EndColor = LogExpert.Interface.ColorMode.foreColor; + tabGradient2.StartColor = LogExpert.Interface.ColorMode.foreColor; tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; dockPaneStripGradient1.ActiveTabGradient = tabGradient2; dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; @@ -954,7 +954,7 @@ private void InitializeComponent() dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6; tabGradient7.EndColor = System.Drawing.Color.Transparent; tabGradient7.StartColor = System.Drawing.Color.Transparent; - tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark; + tabGradient7.TextColor = LogExpert.Interface.ColorMode.backgroundColor; dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7; dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1; dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; @@ -965,7 +965,7 @@ private void InitializeComponent() // buttonToolStrip // this.buttonToolStrip.AllowMerge = false; - this.buttonToolStrip.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.buttonToolStrip.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.buttonToolStrip.Dock = System.Windows.Forms.DockStyle.None; this.buttonToolStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.buttonToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1234,11 +1234,11 @@ private void InitializeComponent() // dragControlDateTime // this.dragControlDateTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.dragControlDateTime.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.dragControlDateTime.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.dragControlDateTime.DateTime = new System.DateTime(((long)(0))); this.dragControlDateTime.DragOrientation = LogExpert.Dialogs.DateTimeDragControl.DragOrientations.Vertical; this.dragControlDateTime.Font = new System.Drawing.Font("Courier New", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.dragControlDateTime.ForeColor = System.Drawing.SystemColors.ButtonHighlight; + this.dragControlDateTime.ForeColor = LogExpert.Interface.ColorMode.foreColor; this.dragControlDateTime.HoverColor = System.Drawing.Color.LightGray; this.dragControlDateTime.Location = new System.Drawing.Point(814, 626); this.dragControlDateTime.Margin = new System.Windows.Forms.Padding(0); @@ -1255,14 +1255,14 @@ private void InitializeComponent() this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.ClientSize = new System.Drawing.Size(1283, 651); this.Controls.Add(this.checkBoxFollowTail); this.Controls.Add(this.dragControlDateTime); this.Controls.Add(this.toolStripContainer); this.Controls.Add(this.statusStrip); this.DoubleBuffered = true; - this.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.ForeColor = LogExpert.Interface.ColorMode.foreColor; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.MainMenuStrip = this.mainMenuStrip; diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs index 1ffacac8..f28d150f 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs @@ -180,7 +180,7 @@ private void InitializeComponent() // // tableLayoutPanel1 // - this.tableLayoutPanel1.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.tableLayoutPanel1.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); @@ -189,7 +189,7 @@ private void InitializeComponent() this.tableLayoutPanel1.Controls.Add(this.dataGridView, 0, 1); this.tableLayoutPanel1.Controls.Add(this.timeSpreadingControl, 1, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.tableLayoutPanel1.ForeColor = LogExpert.Interface.ColorMode.foreColor; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; @@ -237,7 +237,7 @@ private void InitializeComponent() this.dataGridView.AllowUserToDeleteRows = false; this.dataGridView.AllowUserToOrderColumns = true; this.dataGridView.AllowUserToResizeRows = false; - this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlDarkDark; + this.dataGridView.BackgroundColor = LogExpert.Interface.ColorMode.backgroundColor; this.dataGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.dataGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText; @@ -700,8 +700,8 @@ private void InitializeComponent() this.filterGridView.AllowUserToDeleteRows = false; this.filterGridView.AllowUserToOrderColumns = true; this.filterGridView.AllowUserToResizeRows = false; - this.filterGridView.BackgroundColor = System.Drawing.SystemColors.ControlDarkDark; - this.filterGridView.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.filterGridView.BackgroundColor = LogExpert.Interface.ColorMode.backgroundColor; + this.filterGridView.ForeColor = LogExpert.Interface.ColorMode.foreColor; this.filterGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.filterGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.filterGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText; @@ -903,15 +903,15 @@ private void InitializeComponent() // // filterSplitContainer.Panel1 // - this.filterSplitContainer.Panel1.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.filterSplitContainer.Panel1.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.filterSplitContainer.Panel1.Controls.Add(this.lblTextFilter); this.filterSplitContainer.Panel1.Controls.Add(this.filterComboBox); - this.filterSplitContainer.Panel1.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.filterSplitContainer.Panel1.ForeColor = LogExpert.Interface.ColorMode.foreColor; this.filterSplitContainer.Panel1MinSize = 200; // // filterSplitContainer.Panel2 // - this.filterSplitContainer.Panel2.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.filterSplitContainer.Panel2.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.filterSplitContainer.Panel2.Controls.Add(this.advancedButton); this.filterSplitContainer.Panel2.Controls.Add(this.syncFilterCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.lblFilterCount); @@ -919,7 +919,7 @@ private void InitializeComponent() this.filterSplitContainer.Panel2.Controls.Add(this.filterRegexCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.filterCaseSensitiveCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.filterSearchButton); - this.filterSplitContainer.Panel2.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.filterSplitContainer.Panel2.ForeColor = LogExpert.Interface.ColorMode.foreColor; this.filterSplitContainer.Panel2MinSize = 550; this.filterSplitContainer.Size = new System.Drawing.Size(1007, 32); this.filterSplitContainer.SplitterDistance = 282; @@ -1191,8 +1191,8 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.ControlDarkDark; - this.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.ForeColor = LogExpert.Interface.ColorMode.foreColor; this.ClientSize = new System.Drawing.Size(1014, 656); this.ControlBox = false; this.Controls.Add(this.splitContainerLogWindow); diff --git a/src/LogExpert/Dialogs/SettingsDialog.Designer.cs b/src/LogExpert/Dialogs/SettingsDialog.Designer.cs index d9a8b28f..e41a826c 100644 --- a/src/LogExpert/Dialogs/SettingsDialog.Designer.cs +++ b/src/LogExpert/Dialogs/SettingsDialog.Designer.cs @@ -47,6 +47,7 @@ private void InitializeComponent() this.checkBoxSingleInstance = new System.Windows.Forms.CheckBox(); this.checkBoxAskCloseTabs = new System.Windows.Forms.CheckBox(); this.groupBoxDefaults = new System.Windows.Forms.GroupBox(); + this.checkBoxDarkMode = new System.Windows.Forms.CheckBox(); this.checkBoxFollowTail = new System.Windows.Forms.CheckBox(); this.checkBoxColumnFinder = new System.Windows.Forms.CheckBox(); this.checkBoxSyncFilter = new System.Windows.Forms.CheckBox(); @@ -199,11 +200,11 @@ private void InitializeComponent() this.tabControlSettings.Controls.Add(this.tabPagePlugins); this.tabControlSettings.Controls.Add(this.tabPageSessions); this.tabControlSettings.Controls.Add(this.tabPageMemory); - this.tabControlSettings.Location = new System.Drawing.Point(2, 3); - this.tabControlSettings.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabControlSettings.Location = new System.Drawing.Point(2, 2); + this.tabControlSettings.Margin = new System.Windows.Forms.Padding(4); this.tabControlSettings.Name = "tabControlSettings"; this.tabControlSettings.SelectedIndex = 0; - this.tabControlSettings.Size = new System.Drawing.Size(950, 468); + this.tabControlSettings.Size = new System.Drawing.Size(844, 374); this.tabControlSettings.TabIndex = 0; // // tabPageViewSettings @@ -217,19 +218,19 @@ private void InitializeComponent() this.tabPageViewSettings.Controls.Add(this.groupBoxMisc); this.tabPageViewSettings.Controls.Add(this.groupBoxDefaults); this.tabPageViewSettings.Controls.Add(this.groupBoxFont); - this.tabPageViewSettings.Location = new System.Drawing.Point(4, 29); - this.tabPageViewSettings.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPageViewSettings.Location = new System.Drawing.Point(4, 25); + this.tabPageViewSettings.Margin = new System.Windows.Forms.Padding(4); this.tabPageViewSettings.Name = "tabPageViewSettings"; - this.tabPageViewSettings.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPageViewSettings.Size = new System.Drawing.Size(942, 435); + this.tabPageViewSettings.Padding = new System.Windows.Forms.Padding(4); + this.tabPageViewSettings.Size = new System.Drawing.Size(836, 345); this.tabPageViewSettings.TabIndex = 0; this.tabPageViewSettings.Text = "View settings"; this.tabPageViewSettings.UseVisualStyleBackColor = true; // // upDownMaximumFilterEntriesDisplayed // - this.upDownMaximumFilterEntriesDisplayed.Location = new System.Drawing.Point(762, 114); - this.upDownMaximumFilterEntriesDisplayed.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.upDownMaximumFilterEntriesDisplayed.Location = new System.Drawing.Point(677, 91); + this.upDownMaximumFilterEntriesDisplayed.Margin = new System.Windows.Forms.Padding(4); this.upDownMaximumFilterEntriesDisplayed.Maximum = new decimal(new int[] { 30, 0, @@ -241,7 +242,7 @@ private void InitializeComponent() 0, 0}); this.upDownMaximumFilterEntriesDisplayed.Name = "upDownMaximumFilterEntriesDisplayed"; - this.upDownMaximumFilterEntriesDisplayed.Size = new System.Drawing.Size(80, 26); + this.upDownMaximumFilterEntriesDisplayed.Size = new System.Drawing.Size(71, 22); this.upDownMaximumFilterEntriesDisplayed.TabIndex = 13; this.upDownMaximumFilterEntriesDisplayed.Value = new decimal(new int[] { 20, @@ -252,24 +253,24 @@ private void InitializeComponent() // labelMaximumFilterEntriesDisplayed // this.labelMaximumFilterEntriesDisplayed.AutoSize = true; - this.labelMaximumFilterEntriesDisplayed.Location = new System.Drawing.Point(462, 117); + this.labelMaximumFilterEntriesDisplayed.Location = new System.Drawing.Point(411, 94); this.labelMaximumFilterEntriesDisplayed.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelMaximumFilterEntriesDisplayed.Name = "labelMaximumFilterEntriesDisplayed"; - this.labelMaximumFilterEntriesDisplayed.Size = new System.Drawing.Size(232, 20); + this.labelMaximumFilterEntriesDisplayed.Size = new System.Drawing.Size(208, 17); this.labelMaximumFilterEntriesDisplayed.TabIndex = 12; this.labelMaximumFilterEntriesDisplayed.Text = "Maximum filter entries displayed"; // // upDownMaximumFilterEntries // - this.upDownMaximumFilterEntries.Location = new System.Drawing.Point(762, 71); - this.upDownMaximumFilterEntries.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.upDownMaximumFilterEntries.Location = new System.Drawing.Point(677, 57); + this.upDownMaximumFilterEntries.Margin = new System.Windows.Forms.Padding(4); this.upDownMaximumFilterEntries.Minimum = new decimal(new int[] { 10, 0, 0, 0}); this.upDownMaximumFilterEntries.Name = "upDownMaximumFilterEntries"; - this.upDownMaximumFilterEntries.Size = new System.Drawing.Size(80, 26); + this.upDownMaximumFilterEntries.Size = new System.Drawing.Size(71, 22); this.upDownMaximumFilterEntries.TabIndex = 11; this.upDownMaximumFilterEntries.Value = new decimal(new int[] { 30, @@ -280,20 +281,20 @@ private void InitializeComponent() // labelMaximumFilterEntries // this.labelMaximumFilterEntries.AutoSize = true; - this.labelMaximumFilterEntries.Location = new System.Drawing.Point(462, 74); + this.labelMaximumFilterEntries.Location = new System.Drawing.Point(411, 59); this.labelMaximumFilterEntries.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelMaximumFilterEntries.Name = "labelMaximumFilterEntries"; - this.labelMaximumFilterEntries.Size = new System.Drawing.Size(162, 20); + this.labelMaximumFilterEntries.Size = new System.Drawing.Size(144, 17); this.labelMaximumFilterEntries.TabIndex = 10; this.labelMaximumFilterEntries.Text = "Maximum filter entries"; // // labelDefaultEncoding // this.labelDefaultEncoding.AutoSize = true; - this.labelDefaultEncoding.Location = new System.Drawing.Point(462, 34); + this.labelDefaultEncoding.Location = new System.Drawing.Point(411, 27); this.labelDefaultEncoding.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDefaultEncoding.Name = "labelDefaultEncoding"; - this.labelDefaultEncoding.Size = new System.Drawing.Size(130, 20); + this.labelDefaultEncoding.Size = new System.Drawing.Size(115, 17); this.labelDefaultEncoding.TabIndex = 9; this.labelDefaultEncoding.Text = "Default encoding"; // @@ -301,10 +302,10 @@ private void InitializeComponent() // this.comboBoxEncoding.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxEncoding.FormattingEnabled = true; - this.comboBoxEncoding.Location = new System.Drawing.Point(688, 29); - this.comboBoxEncoding.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.comboBoxEncoding.Location = new System.Drawing.Point(612, 23); + this.comboBoxEncoding.Margin = new System.Windows.Forms.Padding(4); this.comboBoxEncoding.Name = "comboBoxEncoding"; - this.comboBoxEncoding.Size = new System.Drawing.Size(151, 28); + this.comboBoxEncoding.Size = new System.Drawing.Size(135, 24); this.comboBoxEncoding.TabIndex = 8; this.toolTip.SetToolTip(this.comboBoxEncoding, "Encoding to be used when no BOM header and no persistence data is available."); // @@ -317,19 +318,19 @@ private void InitializeComponent() this.groupBoxMisc.Controls.Add(this.checkBoxOpenLastFiles); this.groupBoxMisc.Controls.Add(this.checkBoxSingleInstance); this.groupBoxMisc.Controls.Add(this.checkBoxAskCloseTabs); - this.groupBoxMisc.Location = new System.Drawing.Point(458, 171); - this.groupBoxMisc.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxMisc.Location = new System.Drawing.Point(407, 137); + this.groupBoxMisc.Margin = new System.Windows.Forms.Padding(4); this.groupBoxMisc.Name = "groupBoxMisc"; - this.groupBoxMisc.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxMisc.Size = new System.Drawing.Size(384, 226); + this.groupBoxMisc.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxMisc.Size = new System.Drawing.Size(341, 181); this.groupBoxMisc.TabIndex = 7; this.groupBoxMisc.TabStop = false; this.groupBoxMisc.Text = "Misc"; // // cpDownColumnWidth // - this.cpDownColumnWidth.Location = new System.Drawing.Point(231, 174); - this.cpDownColumnWidth.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.cpDownColumnWidth.Location = new System.Drawing.Point(205, 139); + this.cpDownColumnWidth.Margin = new System.Windows.Forms.Padding(4); this.cpDownColumnWidth.Maximum = new decimal(new int[] { 9000, 0, @@ -341,7 +342,7 @@ private void InitializeComponent() 0, 0}); this.cpDownColumnWidth.Name = "cpDownColumnWidth"; - this.cpDownColumnWidth.Size = new System.Drawing.Size(84, 26); + this.cpDownColumnWidth.Size = new System.Drawing.Size(75, 22); this.cpDownColumnWidth.TabIndex = 6; this.cpDownColumnWidth.Value = new decimal(new int[] { 2000, @@ -352,10 +353,10 @@ private void InitializeComponent() // checkBoxColumnSize // this.checkBoxColumnSize.AutoSize = true; - this.checkBoxColumnSize.Location = new System.Drawing.Point(9, 177); - this.checkBoxColumnSize.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxColumnSize.Location = new System.Drawing.Point(8, 142); + this.checkBoxColumnSize.Margin = new System.Windows.Forms.Padding(4); this.checkBoxColumnSize.Name = "checkBoxColumnSize"; - this.checkBoxColumnSize.Size = new System.Drawing.Size(185, 24); + this.checkBoxColumnSize.Size = new System.Drawing.Size(162, 21); this.checkBoxColumnSize.TabIndex = 5; this.checkBoxColumnSize.Text = "Set last column width"; this.checkBoxColumnSize.UseVisualStyleBackColor = true; @@ -363,10 +364,10 @@ private void InitializeComponent() // // buttonTailColor // - this.buttonTailColor.Location = new System.Drawing.Point(231, 134); - this.buttonTailColor.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonTailColor.Location = new System.Drawing.Point(205, 107); + this.buttonTailColor.Margin = new System.Windows.Forms.Padding(4); this.buttonTailColor.Name = "buttonTailColor"; - this.buttonTailColor.Size = new System.Drawing.Size(84, 32); + this.buttonTailColor.Size = new System.Drawing.Size(75, 26); this.buttonTailColor.TabIndex = 4; this.buttonTailColor.Text = "Color..."; this.buttonTailColor.UseVisualStyleBackColor = true; @@ -375,10 +376,10 @@ private void InitializeComponent() // checkBoxTailState // this.checkBoxTailState.AutoSize = true; - this.checkBoxTailState.Location = new System.Drawing.Point(9, 140); - this.checkBoxTailState.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxTailState.Location = new System.Drawing.Point(8, 112); + this.checkBoxTailState.Margin = new System.Windows.Forms.Padding(4); this.checkBoxTailState.Name = "checkBoxTailState"; - this.checkBoxTailState.Size = new System.Drawing.Size(196, 24); + this.checkBoxTailState.Size = new System.Drawing.Size(172, 21); this.checkBoxTailState.TabIndex = 3; this.checkBoxTailState.Text = "Show tail state on tabs"; this.checkBoxTailState.UseVisualStyleBackColor = true; @@ -386,10 +387,10 @@ private void InitializeComponent() // checkBoxOpenLastFiles // this.checkBoxOpenLastFiles.AutoSize = true; - this.checkBoxOpenLastFiles.Location = new System.Drawing.Point(9, 103); - this.checkBoxOpenLastFiles.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxOpenLastFiles.Location = new System.Drawing.Point(8, 82); + this.checkBoxOpenLastFiles.Margin = new System.Windows.Forms.Padding(4); this.checkBoxOpenLastFiles.Name = "checkBoxOpenLastFiles"; - this.checkBoxOpenLastFiles.Size = new System.Drawing.Size(197, 24); + this.checkBoxOpenLastFiles.Size = new System.Drawing.Size(175, 21); this.checkBoxOpenLastFiles.TabIndex = 2; this.checkBoxOpenLastFiles.Text = "Re-open last used files"; this.checkBoxOpenLastFiles.UseVisualStyleBackColor = true; @@ -397,10 +398,10 @@ private void InitializeComponent() // checkBoxSingleInstance // this.checkBoxSingleInstance.AutoSize = true; - this.checkBoxSingleInstance.Location = new System.Drawing.Point(9, 66); - this.checkBoxSingleInstance.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxSingleInstance.Location = new System.Drawing.Point(8, 53); + this.checkBoxSingleInstance.Margin = new System.Windows.Forms.Padding(4); this.checkBoxSingleInstance.Name = "checkBoxSingleInstance"; - this.checkBoxSingleInstance.Size = new System.Drawing.Size(183, 24); + this.checkBoxSingleInstance.Size = new System.Drawing.Size(161, 21); this.checkBoxSingleInstance.TabIndex = 1; this.checkBoxSingleInstance.Text = "Allow only 1 Instance"; this.checkBoxSingleInstance.UseVisualStyleBackColor = true; @@ -408,47 +409,61 @@ private void InitializeComponent() // checkBoxAskCloseTabs // this.checkBoxAskCloseTabs.AutoSize = true; - this.checkBoxAskCloseTabs.Location = new System.Drawing.Point(9, 29); - this.checkBoxAskCloseTabs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxAskCloseTabs.Location = new System.Drawing.Point(8, 23); + this.checkBoxAskCloseTabs.Margin = new System.Windows.Forms.Padding(4); this.checkBoxAskCloseTabs.Name = "checkBoxAskCloseTabs"; - this.checkBoxAskCloseTabs.Size = new System.Drawing.Size(200, 24); + this.checkBoxAskCloseTabs.Size = new System.Drawing.Size(177, 21); this.checkBoxAskCloseTabs.TabIndex = 0; this.checkBoxAskCloseTabs.Text = "Ask before closing tabs"; this.checkBoxAskCloseTabs.UseVisualStyleBackColor = true; // // groupBoxDefaults // + this.groupBoxDefaults.Controls.Add(this.checkBoxDarkMode); this.groupBoxDefaults.Controls.Add(this.checkBoxFollowTail); this.groupBoxDefaults.Controls.Add(this.checkBoxColumnFinder); this.groupBoxDefaults.Controls.Add(this.checkBoxSyncFilter); this.groupBoxDefaults.Controls.Add(this.checkBoxFilterTail); - this.groupBoxDefaults.Location = new System.Drawing.Point(10, 171); - this.groupBoxDefaults.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxDefaults.Location = new System.Drawing.Point(9, 137); + this.groupBoxDefaults.Margin = new System.Windows.Forms.Padding(4); this.groupBoxDefaults.Name = "groupBoxDefaults"; - this.groupBoxDefaults.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxDefaults.Size = new System.Drawing.Size(411, 226); + this.groupBoxDefaults.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxDefaults.Size = new System.Drawing.Size(365, 181); this.groupBoxDefaults.TabIndex = 6; this.groupBoxDefaults.TabStop = false; this.groupBoxDefaults.Text = "Defaults"; + // + // checkBoxDarkMode + // + this.checkBoxDarkMode.AutoSize = true; + this.checkBoxDarkMode.Location = new System.Drawing.Point(7, 141); + this.checkBoxDarkMode.Margin = new System.Windows.Forms.Padding(4); + this.checkBoxDarkMode.Name = "checkBoxDarkMode"; + this.checkBoxDarkMode.Size = new System.Drawing.Size(264, 26); + this.checkBoxDarkMode.TabIndex = 6; + this.checkBoxDarkMode.Text = "Dark Mode (restart required)"; + this.checkBoxDarkMode.UseVisualStyleBackColor = true; + // // checkBoxFollowTail // this.checkBoxFollowTail.AutoSize = true; - this.checkBoxFollowTail.Location = new System.Drawing.Point(9, 29); - this.checkBoxFollowTail.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxFollowTail.Location = new System.Drawing.Point(8, 23); + this.checkBoxFollowTail.Margin = new System.Windows.Forms.Padding(4); this.checkBoxFollowTail.Name = "checkBoxFollowTail"; - this.checkBoxFollowTail.Size = new System.Drawing.Size(165, 24); + this.checkBoxFollowTail.Size = new System.Drawing.Size(146, 21); this.checkBoxFollowTail.TabIndex = 3; this.checkBoxFollowTail.Text = "Follow tail enabled"; this.checkBoxFollowTail.UseVisualStyleBackColor = true; + // // checkBoxColumnFinder // this.checkBoxColumnFinder.AutoSize = true; - this.checkBoxColumnFinder.Location = new System.Drawing.Point(9, 140); - this.checkBoxColumnFinder.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxColumnFinder.Location = new System.Drawing.Point(8, 112); + this.checkBoxColumnFinder.Margin = new System.Windows.Forms.Padding(4); this.checkBoxColumnFinder.Name = "checkBoxColumnFinder"; - this.checkBoxColumnFinder.Size = new System.Drawing.Size(174, 24); + this.checkBoxColumnFinder.Size = new System.Drawing.Size(153, 21); this.checkBoxColumnFinder.TabIndex = 5; this.checkBoxColumnFinder.Text = "Show column finder"; this.checkBoxColumnFinder.UseVisualStyleBackColor = true; @@ -456,10 +471,10 @@ private void InitializeComponent() // checkBoxSyncFilter // this.checkBoxSyncFilter.AutoSize = true; - this.checkBoxSyncFilter.Location = new System.Drawing.Point(9, 103); - this.checkBoxSyncFilter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxSyncFilter.Location = new System.Drawing.Point(8, 82); + this.checkBoxSyncFilter.Margin = new System.Windows.Forms.Padding(4); this.checkBoxSyncFilter.Name = "checkBoxSyncFilter"; - this.checkBoxSyncFilter.Size = new System.Drawing.Size(188, 24); + this.checkBoxSyncFilter.Size = new System.Drawing.Size(168, 21); this.checkBoxSyncFilter.TabIndex = 5; this.checkBoxSyncFilter.Text = "Sync filter list enabled"; this.checkBoxSyncFilter.UseVisualStyleBackColor = true; @@ -467,10 +482,10 @@ private void InitializeComponent() // checkBoxFilterTail // this.checkBoxFilterTail.AutoSize = true; - this.checkBoxFilterTail.Location = new System.Drawing.Point(9, 66); - this.checkBoxFilterTail.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxFilterTail.Location = new System.Drawing.Point(8, 53); + this.checkBoxFilterTail.Margin = new System.Windows.Forms.Padding(4); this.checkBoxFilterTail.Name = "checkBoxFilterTail"; - this.checkBoxFilterTail.Size = new System.Drawing.Size(155, 24); + this.checkBoxFilterTail.Size = new System.Drawing.Size(138, 21); this.checkBoxFilterTail.TabIndex = 4; this.checkBoxFilterTail.Text = "Filter tail enabled"; this.checkBoxFilterTail.UseVisualStyleBackColor = true; @@ -479,21 +494,21 @@ private void InitializeComponent() // this.groupBoxFont.Controls.Add(this.buttonChangeFont); this.groupBoxFont.Controls.Add(this.labelFont); - this.groupBoxFont.Location = new System.Drawing.Point(10, 9); - this.groupBoxFont.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxFont.Location = new System.Drawing.Point(9, 7); + this.groupBoxFont.Margin = new System.Windows.Forms.Padding(4); this.groupBoxFont.Name = "groupBoxFont"; - this.groupBoxFont.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxFont.Size = new System.Drawing.Size(408, 128); + this.groupBoxFont.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxFont.Size = new System.Drawing.Size(363, 102); this.groupBoxFont.TabIndex = 1; this.groupBoxFont.TabStop = false; this.groupBoxFont.Text = "Font"; // // buttonChangeFont // - this.buttonChangeFont.Location = new System.Drawing.Point(9, 77); - this.buttonChangeFont.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonChangeFont.Location = new System.Drawing.Point(8, 62); + this.buttonChangeFont.Margin = new System.Windows.Forms.Padding(4); this.buttonChangeFont.Name = "buttonChangeFont"; - this.buttonChangeFont.Size = new System.Drawing.Size(112, 35); + this.buttonChangeFont.Size = new System.Drawing.Size(100, 28); this.buttonChangeFont.TabIndex = 1; this.buttonChangeFont.Text = "Change..."; this.buttonChangeFont.UseVisualStyleBackColor = true; @@ -501,10 +516,10 @@ private void InitializeComponent() // // labelFont // - this.labelFont.Location = new System.Drawing.Point(9, 25); + this.labelFont.Location = new System.Drawing.Point(8, 20); this.labelFont.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelFont.Name = "labelFont"; - this.labelFont.Size = new System.Drawing.Size(312, 48); + this.labelFont.Size = new System.Drawing.Size(277, 38); this.labelFont.TabIndex = 0; this.labelFont.Text = "Font"; this.labelFont.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -513,11 +528,11 @@ private void InitializeComponent() // this.tabPageTimeStampFeatures.Controls.Add(this.groupBoxTimeSpreadDisplay); this.tabPageTimeStampFeatures.Controls.Add(this.groupBoxTimeStampNavigationControl); - this.tabPageTimeStampFeatures.Location = new System.Drawing.Point(4, 29); - this.tabPageTimeStampFeatures.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPageTimeStampFeatures.Location = new System.Drawing.Point(4, 25); + this.tabPageTimeStampFeatures.Margin = new System.Windows.Forms.Padding(4); this.tabPageTimeStampFeatures.Name = "tabPageTimeStampFeatures"; - this.tabPageTimeStampFeatures.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPageTimeStampFeatures.Size = new System.Drawing.Size(942, 435); + this.tabPageTimeStampFeatures.Padding = new System.Windows.Forms.Padding(4); + this.tabPageTimeStampFeatures.Size = new System.Drawing.Size(836, 345); this.tabPageTimeStampFeatures.TabIndex = 1; this.tabPageTimeStampFeatures.Text = "Timestamp features"; this.tabPageTimeStampFeatures.UseVisualStyleBackColor = true; @@ -528,11 +543,11 @@ private void InitializeComponent() this.groupBoxTimeSpreadDisplay.Controls.Add(this.checkBoxReverseAlpha); this.groupBoxTimeSpreadDisplay.Controls.Add(this.buttonTimespreadColor); this.groupBoxTimeSpreadDisplay.Controls.Add(this.checkBoxTimeSpread); - this.groupBoxTimeSpreadDisplay.Location = new System.Drawing.Point(490, 25); - this.groupBoxTimeSpreadDisplay.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxTimeSpreadDisplay.Location = new System.Drawing.Point(436, 20); + this.groupBoxTimeSpreadDisplay.Margin = new System.Windows.Forms.Padding(4); this.groupBoxTimeSpreadDisplay.Name = "groupBoxTimeSpreadDisplay"; - this.groupBoxTimeSpreadDisplay.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxTimeSpreadDisplay.Size = new System.Drawing.Size(300, 246); + this.groupBoxTimeSpreadDisplay.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxTimeSpreadDisplay.Size = new System.Drawing.Size(267, 197); this.groupBoxTimeSpreadDisplay.TabIndex = 8; this.groupBoxTimeSpreadDisplay.TabStop = false; this.groupBoxTimeSpreadDisplay.Text = "Time spread display"; @@ -541,11 +556,11 @@ private void InitializeComponent() // this.groupBoxDisplayMode.Controls.Add(this.radioButtonLineView); this.groupBoxDisplayMode.Controls.Add(this.radioButtonTimeView); - this.groupBoxDisplayMode.Location = new System.Drawing.Point(22, 109); - this.groupBoxDisplayMode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxDisplayMode.Location = new System.Drawing.Point(20, 87); + this.groupBoxDisplayMode.Margin = new System.Windows.Forms.Padding(4); this.groupBoxDisplayMode.Name = "groupBoxDisplayMode"; - this.groupBoxDisplayMode.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxDisplayMode.Size = new System.Drawing.Size(188, 118); + this.groupBoxDisplayMode.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxDisplayMode.Size = new System.Drawing.Size(167, 94); this.groupBoxDisplayMode.TabIndex = 11; this.groupBoxDisplayMode.TabStop = false; this.groupBoxDisplayMode.Text = "Display mode"; @@ -553,10 +568,10 @@ private void InitializeComponent() // radioButtonLineView // this.radioButtonLineView.AutoSize = true; - this.radioButtonLineView.Location = new System.Drawing.Point(9, 65); - this.radioButtonLineView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonLineView.Location = new System.Drawing.Point(8, 52); + this.radioButtonLineView.Margin = new System.Windows.Forms.Padding(4); this.radioButtonLineView.Name = "radioButtonLineView"; - this.radioButtonLineView.Size = new System.Drawing.Size(98, 24); + this.radioButtonLineView.Size = new System.Drawing.Size(87, 21); this.radioButtonLineView.TabIndex = 9; this.radioButtonLineView.TabStop = true; this.radioButtonLineView.Text = "Line view"; @@ -565,10 +580,10 @@ private void InitializeComponent() // radioButtonTimeView // this.radioButtonTimeView.AutoSize = true; - this.radioButtonTimeView.Location = new System.Drawing.Point(9, 29); - this.radioButtonTimeView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonTimeView.Location = new System.Drawing.Point(8, 23); + this.radioButtonTimeView.Margin = new System.Windows.Forms.Padding(4); this.radioButtonTimeView.Name = "radioButtonTimeView"; - this.radioButtonTimeView.Size = new System.Drawing.Size(102, 24); + this.radioButtonTimeView.Size = new System.Drawing.Size(91, 21); this.radioButtonTimeView.TabIndex = 10; this.radioButtonTimeView.TabStop = true; this.radioButtonTimeView.Text = "Time view"; @@ -577,20 +592,20 @@ private void InitializeComponent() // checkBoxReverseAlpha // this.checkBoxReverseAlpha.AutoSize = true; - this.checkBoxReverseAlpha.Location = new System.Drawing.Point(22, 74); - this.checkBoxReverseAlpha.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxReverseAlpha.Location = new System.Drawing.Point(20, 59); + this.checkBoxReverseAlpha.Margin = new System.Windows.Forms.Padding(4); this.checkBoxReverseAlpha.Name = "checkBoxReverseAlpha"; - this.checkBoxReverseAlpha.Size = new System.Drawing.Size(137, 24); + this.checkBoxReverseAlpha.Size = new System.Drawing.Size(122, 21); this.checkBoxReverseAlpha.TabIndex = 8; this.checkBoxReverseAlpha.Text = "Reverse alpha"; this.checkBoxReverseAlpha.UseVisualStyleBackColor = true; // // buttonTimespreadColor // - this.buttonTimespreadColor.Location = new System.Drawing.Point(207, 32); - this.buttonTimespreadColor.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonTimespreadColor.Location = new System.Drawing.Point(184, 26); + this.buttonTimespreadColor.Margin = new System.Windows.Forms.Padding(4); this.buttonTimespreadColor.Name = "buttonTimespreadColor"; - this.buttonTimespreadColor.Size = new System.Drawing.Size(84, 32); + this.buttonTimespreadColor.Size = new System.Drawing.Size(75, 26); this.buttonTimespreadColor.TabIndex = 7; this.buttonTimespreadColor.Text = "Color..."; this.buttonTimespreadColor.UseVisualStyleBackColor = true; @@ -599,10 +614,10 @@ private void InitializeComponent() // checkBoxTimeSpread // this.checkBoxTimeSpread.AutoSize = true; - this.checkBoxTimeSpread.Location = new System.Drawing.Point(22, 37); - this.checkBoxTimeSpread.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxTimeSpread.Location = new System.Drawing.Point(20, 30); + this.checkBoxTimeSpread.Margin = new System.Windows.Forms.Padding(4); this.checkBoxTimeSpread.Name = "checkBoxTimeSpread"; - this.checkBoxTimeSpread.Size = new System.Drawing.Size(162, 24); + this.checkBoxTimeSpread.Size = new System.Drawing.Size(142, 21); this.checkBoxTimeSpread.TabIndex = 6; this.checkBoxTimeSpread.Text = "Show time spread"; this.checkBoxTimeSpread.UseVisualStyleBackColor = true; @@ -611,11 +626,11 @@ private void InitializeComponent() // this.groupBoxTimeStampNavigationControl.Controls.Add(this.checkBoxTimestamp); this.groupBoxTimeStampNavigationControl.Controls.Add(this.groupBoxMouseDragDefaults); - this.groupBoxTimeStampNavigationControl.Location = new System.Drawing.Point(10, 25); - this.groupBoxTimeStampNavigationControl.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxTimeStampNavigationControl.Location = new System.Drawing.Point(9, 20); + this.groupBoxTimeStampNavigationControl.Margin = new System.Windows.Forms.Padding(4); this.groupBoxTimeStampNavigationControl.Name = "groupBoxTimeStampNavigationControl"; - this.groupBoxTimeStampNavigationControl.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxTimeStampNavigationControl.Size = new System.Drawing.Size(450, 246); + this.groupBoxTimeStampNavigationControl.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxTimeStampNavigationControl.Size = new System.Drawing.Size(400, 197); this.groupBoxTimeStampNavigationControl.TabIndex = 7; this.groupBoxTimeStampNavigationControl.TabStop = false; this.groupBoxTimeStampNavigationControl.Text = "Timestamp navigation control"; @@ -623,10 +638,10 @@ private void InitializeComponent() // checkBoxTimestamp // this.checkBoxTimestamp.AutoSize = true; - this.checkBoxTimestamp.Location = new System.Drawing.Point(27, 37); - this.checkBoxTimestamp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxTimestamp.Location = new System.Drawing.Point(24, 30); + this.checkBoxTimestamp.Margin = new System.Windows.Forms.Padding(4); this.checkBoxTimestamp.Name = "checkBoxTimestamp"; - this.checkBoxTimestamp.Size = new System.Drawing.Size(397, 24); + this.checkBoxTimestamp.Size = new System.Drawing.Size(353, 21); this.checkBoxTimestamp.TabIndex = 3; this.checkBoxTimestamp.Text = "Show timestamp control, if supported by columnizer"; this.checkBoxTimestamp.UseVisualStyleBackColor = true; @@ -636,11 +651,11 @@ private void InitializeComponent() this.groupBoxMouseDragDefaults.Controls.Add(this.radioButtonVerticalMouseDragInverted); this.groupBoxMouseDragDefaults.Controls.Add(this.radioButtonHorizMouseDrag); this.groupBoxMouseDragDefaults.Controls.Add(this.radioButtonVerticalMouseDrag); - this.groupBoxMouseDragDefaults.Location = new System.Drawing.Point(27, 80); - this.groupBoxMouseDragDefaults.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxMouseDragDefaults.Location = new System.Drawing.Point(24, 64); + this.groupBoxMouseDragDefaults.Margin = new System.Windows.Forms.Padding(4); this.groupBoxMouseDragDefaults.Name = "groupBoxMouseDragDefaults"; - this.groupBoxMouseDragDefaults.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxMouseDragDefaults.Size = new System.Drawing.Size(186, 148); + this.groupBoxMouseDragDefaults.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxMouseDragDefaults.Size = new System.Drawing.Size(165, 118); this.groupBoxMouseDragDefaults.TabIndex = 5; this.groupBoxMouseDragDefaults.TabStop = false; this.groupBoxMouseDragDefaults.Text = "Mouse Drag Default"; @@ -648,10 +663,10 @@ private void InitializeComponent() // radioButtonVerticalMouseDragInverted // this.radioButtonVerticalMouseDragInverted.AutoSize = true; - this.radioButtonVerticalMouseDragInverted.Location = new System.Drawing.Point(9, 102); - this.radioButtonVerticalMouseDragInverted.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonVerticalMouseDragInverted.Location = new System.Drawing.Point(8, 82); + this.radioButtonVerticalMouseDragInverted.Margin = new System.Windows.Forms.Padding(4); this.radioButtonVerticalMouseDragInverted.Name = "radioButtonVerticalMouseDragInverted"; - this.radioButtonVerticalMouseDragInverted.Size = new System.Drawing.Size(149, 24); + this.radioButtonVerticalMouseDragInverted.Size = new System.Drawing.Size(131, 21); this.radioButtonVerticalMouseDragInverted.TabIndex = 6; this.radioButtonVerticalMouseDragInverted.TabStop = true; this.radioButtonVerticalMouseDragInverted.Text = "Vertical Inverted"; @@ -660,10 +675,10 @@ private void InitializeComponent() // radioButtonHorizMouseDrag // this.radioButtonHorizMouseDrag.AutoSize = true; - this.radioButtonHorizMouseDrag.Location = new System.Drawing.Point(9, 29); - this.radioButtonHorizMouseDrag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonHorizMouseDrag.Location = new System.Drawing.Point(8, 23); + this.radioButtonHorizMouseDrag.Margin = new System.Windows.Forms.Padding(4); this.radioButtonHorizMouseDrag.Name = "radioButtonHorizMouseDrag"; - this.radioButtonHorizMouseDrag.Size = new System.Drawing.Size(106, 24); + this.radioButtonHorizMouseDrag.Size = new System.Drawing.Size(93, 21); this.radioButtonHorizMouseDrag.TabIndex = 5; this.radioButtonHorizMouseDrag.TabStop = true; this.radioButtonHorizMouseDrag.Text = "Horizontal"; @@ -672,10 +687,10 @@ private void InitializeComponent() // radioButtonVerticalMouseDrag // this.radioButtonVerticalMouseDrag.AutoSize = true; - this.radioButtonVerticalMouseDrag.Location = new System.Drawing.Point(9, 65); - this.radioButtonVerticalMouseDrag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonVerticalMouseDrag.Location = new System.Drawing.Point(8, 52); + this.radioButtonVerticalMouseDrag.Margin = new System.Windows.Forms.Padding(4); this.radioButtonVerticalMouseDrag.Name = "radioButtonVerticalMouseDrag"; - this.radioButtonVerticalMouseDrag.Size = new System.Drawing.Size(87, 24); + this.radioButtonVerticalMouseDrag.Size = new System.Drawing.Size(76, 21); this.radioButtonVerticalMouseDrag.TabIndex = 4; this.radioButtonVerticalMouseDrag.TabStop = true; this.radioButtonVerticalMouseDrag.Text = "Vertical"; @@ -690,31 +705,31 @@ private void InitializeComponent() this.tabPageExternalTools.Controls.Add(this.buttonToolUp); this.tabPageExternalTools.Controls.Add(this.listBoxTools); this.tabPageExternalTools.Controls.Add(this.groupBoxToolSettings); - this.tabPageExternalTools.Location = new System.Drawing.Point(4, 29); - this.tabPageExternalTools.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPageExternalTools.Location = new System.Drawing.Point(4, 25); + this.tabPageExternalTools.Margin = new System.Windows.Forms.Padding(4); this.tabPageExternalTools.Name = "tabPageExternalTools"; - this.tabPageExternalTools.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPageExternalTools.Size = new System.Drawing.Size(942, 435); + this.tabPageExternalTools.Padding = new System.Windows.Forms.Padding(4); + this.tabPageExternalTools.Size = new System.Drawing.Size(836, 345); this.tabPageExternalTools.TabIndex = 2; this.tabPageExternalTools.Text = "External Tools"; this.tabPageExternalTools.UseVisualStyleBackColor = true; // // labelToolsDescription // - this.labelToolsDescription.Location = new System.Drawing.Point(546, 102); + this.labelToolsDescription.Location = new System.Drawing.Point(485, 82); this.labelToolsDescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelToolsDescription.Name = "labelToolsDescription"; - this.labelToolsDescription.Size = new System.Drawing.Size(376, 80); + this.labelToolsDescription.Size = new System.Drawing.Size(334, 64); this.labelToolsDescription.TabIndex = 6; this.labelToolsDescription.Text = "You can configure as many tools as you want. \r\nChecked tools will appear in the i" + "con bar. All other tools are available in the tools menu."; // // buttonToolDelete // - this.buttonToolDelete.Location = new System.Drawing.Point(550, 14); - this.buttonToolDelete.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonToolDelete.Location = new System.Drawing.Point(489, 11); + this.buttonToolDelete.Margin = new System.Windows.Forms.Padding(4); this.buttonToolDelete.Name = "buttonToolDelete"; - this.buttonToolDelete.Size = new System.Drawing.Size(112, 35); + this.buttonToolDelete.Size = new System.Drawing.Size(100, 28); this.buttonToolDelete.TabIndex = 2; this.buttonToolDelete.Text = "Remove"; this.buttonToolDelete.UseVisualStyleBackColor = true; @@ -722,10 +737,10 @@ private void InitializeComponent() // // buttonToolAdd // - this.buttonToolAdd.Location = new System.Drawing.Point(429, 14); - this.buttonToolAdd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonToolAdd.Location = new System.Drawing.Point(381, 11); + this.buttonToolAdd.Margin = new System.Windows.Forms.Padding(4); this.buttonToolAdd.Name = "buttonToolAdd"; - this.buttonToolAdd.Size = new System.Drawing.Size(112, 35); + this.buttonToolAdd.Size = new System.Drawing.Size(100, 28); this.buttonToolAdd.TabIndex = 1; this.buttonToolAdd.Text = "Add new"; this.buttonToolAdd.UseVisualStyleBackColor = true; @@ -733,10 +748,10 @@ private void InitializeComponent() // // buttonToolDown // - this.buttonToolDown.Location = new System.Drawing.Point(429, 146); - this.buttonToolDown.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonToolDown.Location = new System.Drawing.Point(381, 117); + this.buttonToolDown.Margin = new System.Windows.Forms.Padding(4); this.buttonToolDown.Name = "buttonToolDown"; - this.buttonToolDown.Size = new System.Drawing.Size(64, 35); + this.buttonToolDown.Size = new System.Drawing.Size(57, 28); this.buttonToolDown.TabIndex = 4; this.buttonToolDown.Text = "Down"; this.buttonToolDown.UseVisualStyleBackColor = true; @@ -744,10 +759,10 @@ private void InitializeComponent() // // buttonToolUp // - this.buttonToolUp.Location = new System.Drawing.Point(429, 102); - this.buttonToolUp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonToolUp.Location = new System.Drawing.Point(381, 82); + this.buttonToolUp.Margin = new System.Windows.Forms.Padding(4); this.buttonToolUp.Name = "buttonToolUp"; - this.buttonToolUp.Size = new System.Drawing.Size(64, 35); + this.buttonToolUp.Size = new System.Drawing.Size(57, 28); this.buttonToolUp.TabIndex = 3; this.buttonToolUp.Text = "Up"; this.buttonToolUp.UseVisualStyleBackColor = true; @@ -756,10 +771,10 @@ private void InitializeComponent() // listBoxTools // this.listBoxTools.FormattingEnabled = true; - this.listBoxTools.Location = new System.Drawing.Point(10, 14); - this.listBoxTools.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.listBoxTools.Location = new System.Drawing.Point(9, 11); + this.listBoxTools.Margin = new System.Windows.Forms.Padding(4); this.listBoxTools.Name = "listBoxTools"; - this.listBoxTools.Size = new System.Drawing.Size(406, 165); + this.listBoxTools.Size = new System.Drawing.Size(361, 123); this.listBoxTools.TabIndex = 0; this.listBoxTools.SelectedIndexChanged += new System.EventHandler(this.toolListBox_SelectedIndexChanged); // @@ -780,11 +795,11 @@ private void InitializeComponent() this.groupBoxToolSettings.Controls.Add(this.textBoxTool); this.groupBoxToolSettings.Controls.Add(this.labelArguments); this.groupBoxToolSettings.Controls.Add(this.textBoxArguments); - this.groupBoxToolSettings.Location = new System.Drawing.Point(10, 191); - this.groupBoxToolSettings.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxToolSettings.Location = new System.Drawing.Point(9, 153); + this.groupBoxToolSettings.Margin = new System.Windows.Forms.Padding(4); this.groupBoxToolSettings.Name = "groupBoxToolSettings"; - this.groupBoxToolSettings.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxToolSettings.Size = new System.Drawing.Size(912, 228); + this.groupBoxToolSettings.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxToolSettings.Size = new System.Drawing.Size(811, 182); this.groupBoxToolSettings.TabIndex = 0; this.groupBoxToolSettings.TabStop = false; this.groupBoxToolSettings.Text = "Tool settings"; @@ -792,19 +807,19 @@ private void InitializeComponent() // labelWorkingDir // this.labelWorkingDir.AutoSize = true; - this.labelWorkingDir.Location = new System.Drawing.Point(474, 86); + this.labelWorkingDir.Location = new System.Drawing.Point(421, 69); this.labelWorkingDir.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelWorkingDir.Name = "labelWorkingDir"; - this.labelWorkingDir.Size = new System.Drawing.Size(92, 20); + this.labelWorkingDir.Size = new System.Drawing.Size(84, 17); this.labelWorkingDir.TabIndex = 11; this.labelWorkingDir.Text = "Working dir:"; // // buttonWorkingDir // - this.buttonWorkingDir.Location = new System.Drawing.Point(856, 80); - this.buttonWorkingDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonWorkingDir.Location = new System.Drawing.Point(761, 64); + this.buttonWorkingDir.Margin = new System.Windows.Forms.Padding(4); this.buttonWorkingDir.Name = "buttonWorkingDir"; - this.buttonWorkingDir.Size = new System.Drawing.Size(45, 31); + this.buttonWorkingDir.Size = new System.Drawing.Size(40, 25); this.buttonWorkingDir.TabIndex = 10; this.buttonWorkingDir.Text = "..."; this.buttonWorkingDir.UseVisualStyleBackColor = true; @@ -812,19 +827,19 @@ private void InitializeComponent() // // textBoxWorkingDir // - this.textBoxWorkingDir.Location = new System.Drawing.Point(576, 82); - this.textBoxWorkingDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBoxWorkingDir.Location = new System.Drawing.Point(512, 66); + this.textBoxWorkingDir.Margin = new System.Windows.Forms.Padding(4); this.textBoxWorkingDir.Name = "textBoxWorkingDir"; - this.textBoxWorkingDir.Size = new System.Drawing.Size(270, 26); + this.textBoxWorkingDir.Size = new System.Drawing.Size(240, 22); this.textBoxWorkingDir.TabIndex = 9; // // buttonIcon // this.buttonIcon.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.buttonIcon.Location = new System.Drawing.Point(418, 26); - this.buttonIcon.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonIcon.Location = new System.Drawing.Point(372, 21); + this.buttonIcon.Margin = new System.Windows.Forms.Padding(4); this.buttonIcon.Name = "buttonIcon"; - this.buttonIcon.Size = new System.Drawing.Size(112, 35); + this.buttonIcon.Size = new System.Drawing.Size(100, 28); this.buttonIcon.TabIndex = 1; this.buttonIcon.Text = " Icon..."; this.buttonIcon.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -834,47 +849,47 @@ private void InitializeComponent() // labelToolName // this.labelToolName.AutoSize = true; - this.labelToolName.Location = new System.Drawing.Point(9, 34); + this.labelToolName.Location = new System.Drawing.Point(8, 27); this.labelToolName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelToolName.Name = "labelToolName"; - this.labelToolName.Size = new System.Drawing.Size(55, 20); + this.labelToolName.Size = new System.Drawing.Size(49, 17); this.labelToolName.TabIndex = 8; this.labelToolName.Text = "Name:"; // // labelToolColumnizerForOutput // this.labelToolColumnizerForOutput.AutoSize = true; - this.labelToolColumnizerForOutput.Location = new System.Drawing.Point(404, 185); + this.labelToolColumnizerForOutput.Location = new System.Drawing.Point(359, 148); this.labelToolColumnizerForOutput.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelToolColumnizerForOutput.Name = "labelToolColumnizerForOutput"; - this.labelToolColumnizerForOutput.Size = new System.Drawing.Size(165, 20); + this.labelToolColumnizerForOutput.Size = new System.Drawing.Size(147, 17); this.labelToolColumnizerForOutput.TabIndex = 6; this.labelToolColumnizerForOutput.Text = "Columnizer for output:"; // // comboBoxColumnizer // this.comboBoxColumnizer.FormattingEnabled = true; - this.comboBoxColumnizer.Location = new System.Drawing.Point(576, 180); - this.comboBoxColumnizer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.comboBoxColumnizer.Location = new System.Drawing.Point(512, 144); + this.comboBoxColumnizer.Margin = new System.Windows.Forms.Padding(4); this.comboBoxColumnizer.Name = "comboBoxColumnizer"; - this.comboBoxColumnizer.Size = new System.Drawing.Size(270, 28); + this.comboBoxColumnizer.Size = new System.Drawing.Size(240, 24); this.comboBoxColumnizer.TabIndex = 7; // // textBoxToolName // - this.textBoxToolName.Location = new System.Drawing.Point(108, 29); - this.textBoxToolName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBoxToolName.Location = new System.Drawing.Point(96, 23); + this.textBoxToolName.Margin = new System.Windows.Forms.Padding(4); this.textBoxToolName.Name = "textBoxToolName"; - this.textBoxToolName.Size = new System.Drawing.Size(298, 26); + this.textBoxToolName.Size = new System.Drawing.Size(265, 22); this.textBoxToolName.TabIndex = 0; // // checkBoxSysout // this.checkBoxSysout.AutoSize = true; - this.checkBoxSysout.Location = new System.Drawing.Point(108, 183); - this.checkBoxSysout.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxSysout.Location = new System.Drawing.Point(96, 146); + this.checkBoxSysout.Margin = new System.Windows.Forms.Padding(4); this.checkBoxSysout.Name = "checkBoxSysout"; - this.checkBoxSysout.Size = new System.Drawing.Size(161, 24); + this.checkBoxSysout.Size = new System.Drawing.Size(143, 21); this.checkBoxSysout.TabIndex = 6; this.checkBoxSysout.Text = "Pipe sysout to tab"; this.checkBoxSysout.UseVisualStyleBackColor = true; @@ -882,10 +897,10 @@ private void InitializeComponent() // // buttonArguments // - this.buttonArguments.Location = new System.Drawing.Point(856, 128); - this.buttonArguments.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonArguments.Location = new System.Drawing.Point(761, 102); + this.buttonArguments.Margin = new System.Windows.Forms.Padding(4); this.buttonArguments.Name = "buttonArguments"; - this.buttonArguments.Size = new System.Drawing.Size(46, 32); + this.buttonArguments.Size = new System.Drawing.Size(41, 26); this.buttonArguments.TabIndex = 5; this.buttonArguments.Text = "..."; this.buttonArguments.UseVisualStyleBackColor = true; @@ -894,19 +909,19 @@ private void InitializeComponent() // labelTool // this.labelTool.AutoSize = true; - this.labelTool.Location = new System.Drawing.Point(9, 86); + this.labelTool.Location = new System.Drawing.Point(8, 69); this.labelTool.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelTool.Name = "labelTool"; - this.labelTool.Size = new System.Drawing.Size(73, 20); + this.labelTool.Size = new System.Drawing.Size(66, 17); this.labelTool.TabIndex = 4; this.labelTool.Text = "Program:"; // // buttonTool // - this.buttonTool.Location = new System.Drawing.Point(418, 78); - this.buttonTool.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonTool.Location = new System.Drawing.Point(372, 62); + this.buttonTool.Margin = new System.Windows.Forms.Padding(4); this.buttonTool.Name = "buttonTool"; - this.buttonTool.Size = new System.Drawing.Size(45, 31); + this.buttonTool.Size = new System.Drawing.Size(40, 25); this.buttonTool.TabIndex = 3; this.buttonTool.Text = "..."; this.buttonTool.UseVisualStyleBackColor = true; @@ -914,28 +929,28 @@ private void InitializeComponent() // // textBoxTool // - this.textBoxTool.Location = new System.Drawing.Point(108, 80); - this.textBoxTool.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBoxTool.Location = new System.Drawing.Point(96, 64); + this.textBoxTool.Margin = new System.Windows.Forms.Padding(4); this.textBoxTool.Name = "textBoxTool"; - this.textBoxTool.Size = new System.Drawing.Size(298, 26); + this.textBoxTool.Size = new System.Drawing.Size(265, 22); this.textBoxTool.TabIndex = 2; // // labelArguments // this.labelArguments.AutoSize = true; - this.labelArguments.Location = new System.Drawing.Point(9, 134); + this.labelArguments.Location = new System.Drawing.Point(8, 107); this.labelArguments.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelArguments.Name = "labelArguments"; - this.labelArguments.Size = new System.Drawing.Size(91, 20); + this.labelArguments.Size = new System.Drawing.Size(80, 17); this.labelArguments.TabIndex = 1; this.labelArguments.Text = "Arguments:"; // // textBoxArguments // - this.textBoxArguments.Location = new System.Drawing.Point(108, 129); - this.textBoxArguments.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBoxArguments.Location = new System.Drawing.Point(96, 103); + this.textBoxArguments.Margin = new System.Windows.Forms.Padding(4); this.textBoxArguments.Name = "textBoxArguments"; - this.textBoxArguments.Size = new System.Drawing.Size(738, 26); + this.textBoxArguments.Size = new System.Drawing.Size(656, 22); this.textBoxArguments.TabIndex = 4; // // tabPageColumnizers @@ -944,11 +959,11 @@ private void InitializeComponent() this.tabPageColumnizers.Controls.Add(this.checkBoxMaskPrio); this.tabPageColumnizers.Controls.Add(this.buttonDelete); this.tabPageColumnizers.Controls.Add(this.dataGridViewColumnizer); - this.tabPageColumnizers.Location = new System.Drawing.Point(4, 29); - this.tabPageColumnizers.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPageColumnizers.Location = new System.Drawing.Point(4, 25); + this.tabPageColumnizers.Margin = new System.Windows.Forms.Padding(4); this.tabPageColumnizers.Name = "tabPageColumnizers"; - this.tabPageColumnizers.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPageColumnizers.Size = new System.Drawing.Size(942, 435); + this.tabPageColumnizers.Padding = new System.Windows.Forms.Padding(4); + this.tabPageColumnizers.Size = new System.Drawing.Size(836, 345); this.tabPageColumnizers.TabIndex = 3; this.tabPageColumnizers.Text = "Columnizers"; this.tabPageColumnizers.UseVisualStyleBackColor = true; @@ -958,10 +973,10 @@ private void InitializeComponent() this.checkBoxAutoPick.AutoSize = true; this.checkBoxAutoPick.Checked = true; this.checkBoxAutoPick.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBoxAutoPick.Location = new System.Drawing.Point(530, 386); - this.checkBoxAutoPick.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxAutoPick.Location = new System.Drawing.Point(471, 309); + this.checkBoxAutoPick.Margin = new System.Windows.Forms.Padding(4); this.checkBoxAutoPick.Name = "checkBoxAutoPick"; - this.checkBoxAutoPick.Size = new System.Drawing.Size(249, 24); + this.checkBoxAutoPick.Size = new System.Drawing.Size(221, 21); this.checkBoxAutoPick.TabIndex = 5; this.checkBoxAutoPick.Text = "Automatically pick for new files"; this.checkBoxAutoPick.UseVisualStyleBackColor = true; @@ -969,20 +984,20 @@ private void InitializeComponent() // checkBoxMaskPrio // this.checkBoxMaskPrio.AutoSize = true; - this.checkBoxMaskPrio.Location = new System.Drawing.Point(213, 388); - this.checkBoxMaskPrio.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxMaskPrio.Location = new System.Drawing.Point(189, 310); + this.checkBoxMaskPrio.Margin = new System.Windows.Forms.Padding(4); this.checkBoxMaskPrio.Name = "checkBoxMaskPrio"; - this.checkBoxMaskPrio.Size = new System.Drawing.Size(253, 24); + this.checkBoxMaskPrio.Size = new System.Drawing.Size(228, 21); this.checkBoxMaskPrio.TabIndex = 4; this.checkBoxMaskPrio.Text = "Mask has priority before history"; this.checkBoxMaskPrio.UseVisualStyleBackColor = true; // // buttonDelete // - this.buttonDelete.Location = new System.Drawing.Point(12, 380); - this.buttonDelete.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonDelete.Location = new System.Drawing.Point(11, 304); + this.buttonDelete.Margin = new System.Windows.Forms.Padding(4); this.buttonDelete.Name = "buttonDelete"; - this.buttonDelete.Size = new System.Drawing.Size(112, 35); + this.buttonDelete.Size = new System.Drawing.Size(100, 28); this.buttonDelete.TabIndex = 3; this.buttonDelete.Text = "Delete"; this.buttonDelete.UseVisualStyleBackColor = true; @@ -999,11 +1014,11 @@ private void InitializeComponent() this.columnColumnizer}); this.dataGridViewColumnizer.Dock = System.Windows.Forms.DockStyle.Top; this.dataGridViewColumnizer.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; - this.dataGridViewColumnizer.Location = new System.Drawing.Point(4, 5); - this.dataGridViewColumnizer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.dataGridViewColumnizer.Location = new System.Drawing.Point(4, 4); + this.dataGridViewColumnizer.Margin = new System.Windows.Forms.Padding(4); this.dataGridViewColumnizer.Name = "dataGridViewColumnizer"; this.dataGridViewColumnizer.RowHeadersWidth = 62; - this.dataGridViewColumnizer.Size = new System.Drawing.Size(934, 365); + this.dataGridViewColumnizer.Size = new System.Drawing.Size(828, 292); this.dataGridViewColumnizer.TabIndex = 2; this.dataGridViewColumnizer.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.columnizerDataGridView_RowsAdded); // @@ -1022,11 +1037,11 @@ private void InitializeComponent() // tabPageHighlightMask // this.tabPageHighlightMask.Controls.Add(this.dataGridViewHighlightMask); - this.tabPageHighlightMask.Location = new System.Drawing.Point(4, 29); - this.tabPageHighlightMask.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPageHighlightMask.Location = new System.Drawing.Point(4, 25); + this.tabPageHighlightMask.Margin = new System.Windows.Forms.Padding(4); this.tabPageHighlightMask.Name = "tabPageHighlightMask"; - this.tabPageHighlightMask.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPageHighlightMask.Size = new System.Drawing.Size(942, 435); + this.tabPageHighlightMask.Padding = new System.Windows.Forms.Padding(4); + this.tabPageHighlightMask.Size = new System.Drawing.Size(836, 345); this.tabPageHighlightMask.TabIndex = 8; this.tabPageHighlightMask.Text = "Highlight"; this.tabPageHighlightMask.UseVisualStyleBackColor = true; @@ -1039,11 +1054,11 @@ private void InitializeComponent() this.columnFileName, this.columnHighlightGroup}); this.dataGridViewHighlightMask.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewHighlightMask.Location = new System.Drawing.Point(4, 5); - this.dataGridViewHighlightMask.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.dataGridViewHighlightMask.Location = new System.Drawing.Point(4, 4); + this.dataGridViewHighlightMask.Margin = new System.Windows.Forms.Padding(4); this.dataGridViewHighlightMask.Name = "dataGridViewHighlightMask"; this.dataGridViewHighlightMask.RowHeadersWidth = 62; - this.dataGridViewHighlightMask.Size = new System.Drawing.Size(934, 425); + this.dataGridViewHighlightMask.Size = new System.Drawing.Size(828, 337); this.dataGridViewHighlightMask.TabIndex = 0; // // columnFileName @@ -1064,11 +1079,11 @@ private void InitializeComponent() this.tabPageMultiFile.Controls.Add(this.labelHintMultiFile); this.tabPageMultiFile.Controls.Add(this.labelNoteMultiFile); this.tabPageMultiFile.Controls.Add(this.groupBoxWhenOpeningMultiFile); - this.tabPageMultiFile.Location = new System.Drawing.Point(4, 29); - this.tabPageMultiFile.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPageMultiFile.Location = new System.Drawing.Point(4, 25); + this.tabPageMultiFile.Margin = new System.Windows.Forms.Padding(4); this.tabPageMultiFile.Name = "tabPageMultiFile"; - this.tabPageMultiFile.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPageMultiFile.Size = new System.Drawing.Size(942, 435); + this.tabPageMultiFile.Padding = new System.Windows.Forms.Padding(4); + this.tabPageMultiFile.Size = new System.Drawing.Size(836, 345); this.tabPageMultiFile.TabIndex = 4; this.tabPageMultiFile.Text = "MultiFile"; this.tabPageMultiFile.UseVisualStyleBackColor = true; @@ -1079,11 +1094,11 @@ private void InitializeComponent() this.groupBoxDefaultFileNamePattern.Controls.Add(this.labelPattern); this.groupBoxDefaultFileNamePattern.Controls.Add(this.upDownMultifileDays); this.groupBoxDefaultFileNamePattern.Controls.Add(this.textBoxMultifilePattern); - this.groupBoxDefaultFileNamePattern.Location = new System.Drawing.Point(364, 28); - this.groupBoxDefaultFileNamePattern.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxDefaultFileNamePattern.Location = new System.Drawing.Point(324, 22); + this.groupBoxDefaultFileNamePattern.Margin = new System.Windows.Forms.Padding(4); this.groupBoxDefaultFileNamePattern.Name = "groupBoxDefaultFileNamePattern"; - this.groupBoxDefaultFileNamePattern.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxDefaultFileNamePattern.Size = new System.Drawing.Size(436, 154); + this.groupBoxDefaultFileNamePattern.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxDefaultFileNamePattern.Size = new System.Drawing.Size(388, 123); this.groupBoxDefaultFileNamePattern.TabIndex = 3; this.groupBoxDefaultFileNamePattern.TabStop = false; this.groupBoxDefaultFileNamePattern.Text = "Default filename pattern"; @@ -1091,27 +1106,27 @@ private void InitializeComponent() // labelMaxDays // this.labelMaxDays.AutoSize = true; - this.labelMaxDays.Location = new System.Drawing.Point(10, 75); + this.labelMaxDays.Location = new System.Drawing.Point(9, 60); this.labelMaxDays.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelMaxDays.Name = "labelMaxDays"; - this.labelMaxDays.Size = new System.Drawing.Size(79, 20); + this.labelMaxDays.Size = new System.Drawing.Size(71, 17); this.labelMaxDays.TabIndex = 3; this.labelMaxDays.Text = "Max days:"; // // labelPattern // this.labelPattern.AutoSize = true; - this.labelPattern.Location = new System.Drawing.Point(10, 37); + this.labelPattern.Location = new System.Drawing.Point(9, 30); this.labelPattern.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelPattern.Name = "labelPattern"; - this.labelPattern.Size = new System.Drawing.Size(65, 20); + this.labelPattern.Size = new System.Drawing.Size(58, 17); this.labelPattern.TabIndex = 2; this.labelPattern.Text = "Pattern:"; // // upDownMultifileDays // - this.upDownMultifileDays.Location = new System.Drawing.Point(102, 72); - this.upDownMultifileDays.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.upDownMultifileDays.Location = new System.Drawing.Point(91, 58); + this.upDownMultifileDays.Margin = new System.Windows.Forms.Padding(4); this.upDownMultifileDays.Maximum = new decimal(new int[] { 40, 0, @@ -1119,7 +1134,7 @@ private void InitializeComponent() 0}); this.upDownMultifileDays.Name = "upDownMultifileDays"; this.helpProvider.SetShowHelp(this.upDownMultifileDays, false); - this.upDownMultifileDays.Size = new System.Drawing.Size(92, 26); + this.upDownMultifileDays.Size = new System.Drawing.Size(82, 22); this.upDownMultifileDays.TabIndex = 1; this.upDownMultifileDays.Value = new decimal(new int[] { 1, @@ -1129,29 +1144,29 @@ private void InitializeComponent() // // textBoxMultifilePattern // - this.textBoxMultifilePattern.Location = new System.Drawing.Point(102, 32); - this.textBoxMultifilePattern.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBoxMultifilePattern.Location = new System.Drawing.Point(91, 26); + this.textBoxMultifilePattern.Margin = new System.Windows.Forms.Padding(4); this.textBoxMultifilePattern.Name = "textBoxMultifilePattern"; - this.textBoxMultifilePattern.Size = new System.Drawing.Size(278, 26); + this.textBoxMultifilePattern.Size = new System.Drawing.Size(248, 22); this.textBoxMultifilePattern.TabIndex = 0; this.textBoxMultifilePattern.TextChanged += new System.EventHandler(this.OnMultiFilePatternTextChanged); // // labelHintMultiFile // - this.labelHintMultiFile.Location = new System.Drawing.Point(6, 203); + this.labelHintMultiFile.Location = new System.Drawing.Point(5, 162); this.labelHintMultiFile.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelHintMultiFile.Name = "labelHintMultiFile"; - this.labelHintMultiFile.Size = new System.Drawing.Size(304, 111); + this.labelHintMultiFile.Size = new System.Drawing.Size(270, 89); this.labelHintMultiFile.TabIndex = 2; this.labelHintMultiFile.Text = "Hint: Pressing the Shift key while dropping files onto LogExpert will switch the " + "behaviour from single to multi and vice versa."; // // labelNoteMultiFile // - this.labelNoteMultiFile.Location = new System.Drawing.Point(6, 314); + this.labelNoteMultiFile.Location = new System.Drawing.Point(5, 251); this.labelNoteMultiFile.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelNoteMultiFile.Name = "labelNoteMultiFile"; - this.labelNoteMultiFile.Size = new System.Drawing.Size(705, 82); + this.labelNoteMultiFile.Size = new System.Drawing.Size(627, 66); this.labelNoteMultiFile.TabIndex = 1; this.labelNoteMultiFile.Text = resources.GetString("labelNoteMultiFile.Text"); // @@ -1160,11 +1175,11 @@ private void InitializeComponent() this.groupBoxWhenOpeningMultiFile.Controls.Add(this.radioButtonAskWhatToDo); this.groupBoxWhenOpeningMultiFile.Controls.Add(this.radioButtonTreatAllFilesAsOneMultifile); this.groupBoxWhenOpeningMultiFile.Controls.Add(this.radioButtonLoadEveryFileIntoSeperatedTab); - this.groupBoxWhenOpeningMultiFile.Location = new System.Drawing.Point(10, 28); - this.groupBoxWhenOpeningMultiFile.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxWhenOpeningMultiFile.Location = new System.Drawing.Point(9, 22); + this.groupBoxWhenOpeningMultiFile.Margin = new System.Windows.Forms.Padding(4); this.groupBoxWhenOpeningMultiFile.Name = "groupBoxWhenOpeningMultiFile"; - this.groupBoxWhenOpeningMultiFile.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxWhenOpeningMultiFile.Size = new System.Drawing.Size(300, 154); + this.groupBoxWhenOpeningMultiFile.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxWhenOpeningMultiFile.Size = new System.Drawing.Size(267, 123); this.groupBoxWhenOpeningMultiFile.TabIndex = 0; this.groupBoxWhenOpeningMultiFile.TabStop = false; this.groupBoxWhenOpeningMultiFile.Text = "When opening multiple files..."; @@ -1172,10 +1187,10 @@ private void InitializeComponent() // radioButtonAskWhatToDo // this.radioButtonAskWhatToDo.AutoSize = true; - this.radioButtonAskWhatToDo.Location = new System.Drawing.Point(10, 105); - this.radioButtonAskWhatToDo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonAskWhatToDo.Location = new System.Drawing.Point(9, 84); + this.radioButtonAskWhatToDo.Margin = new System.Windows.Forms.Padding(4); this.radioButtonAskWhatToDo.Name = "radioButtonAskWhatToDo"; - this.radioButtonAskWhatToDo.Size = new System.Drawing.Size(139, 24); + this.radioButtonAskWhatToDo.Size = new System.Drawing.Size(121, 21); this.radioButtonAskWhatToDo.TabIndex = 2; this.radioButtonAskWhatToDo.TabStop = true; this.radioButtonAskWhatToDo.Text = "Ask what to do"; @@ -1184,10 +1199,10 @@ private void InitializeComponent() // radioButtonTreatAllFilesAsOneMultifile // this.radioButtonTreatAllFilesAsOneMultifile.AutoSize = true; - this.radioButtonTreatAllFilesAsOneMultifile.Location = new System.Drawing.Point(10, 68); - this.radioButtonTreatAllFilesAsOneMultifile.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonTreatAllFilesAsOneMultifile.Location = new System.Drawing.Point(9, 54); + this.radioButtonTreatAllFilesAsOneMultifile.Margin = new System.Windows.Forms.Padding(4); this.radioButtonTreatAllFilesAsOneMultifile.Name = "radioButtonTreatAllFilesAsOneMultifile"; - this.radioButtonTreatAllFilesAsOneMultifile.Size = new System.Drawing.Size(242, 24); + this.radioButtonTreatAllFilesAsOneMultifile.Size = new System.Drawing.Size(218, 21); this.radioButtonTreatAllFilesAsOneMultifile.TabIndex = 1; this.radioButtonTreatAllFilesAsOneMultifile.TabStop = true; this.radioButtonTreatAllFilesAsOneMultifile.Text = "Treat all files as one \'MultiFile\'"; @@ -1196,10 +1211,10 @@ private void InitializeComponent() // radioButtonLoadEveryFileIntoSeperatedTab // this.radioButtonLoadEveryFileIntoSeperatedTab.AutoSize = true; - this.radioButtonLoadEveryFileIntoSeperatedTab.Location = new System.Drawing.Point(10, 31); - this.radioButtonLoadEveryFileIntoSeperatedTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonLoadEveryFileIntoSeperatedTab.Location = new System.Drawing.Point(9, 25); + this.radioButtonLoadEveryFileIntoSeperatedTab.Margin = new System.Windows.Forms.Padding(4); this.radioButtonLoadEveryFileIntoSeperatedTab.Name = "radioButtonLoadEveryFileIntoSeperatedTab"; - this.radioButtonLoadEveryFileIntoSeperatedTab.Size = new System.Drawing.Size(272, 24); + this.radioButtonLoadEveryFileIntoSeperatedTab.Size = new System.Drawing.Size(245, 21); this.radioButtonLoadEveryFileIntoSeperatedTab.TabIndex = 0; this.radioButtonLoadEveryFileIntoSeperatedTab.TabStop = true; this.radioButtonLoadEveryFileIntoSeperatedTab.Text = "Load every file into a separate tab"; @@ -1209,11 +1224,11 @@ private void InitializeComponent() // this.tabPagePlugins.Controls.Add(this.groupBoxPlugins); this.tabPagePlugins.Controls.Add(this.groupBoxSettings); - this.tabPagePlugins.Location = new System.Drawing.Point(4, 29); - this.tabPagePlugins.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPagePlugins.Location = new System.Drawing.Point(4, 25); + this.tabPagePlugins.Margin = new System.Windows.Forms.Padding(4); this.tabPagePlugins.Name = "tabPagePlugins"; - this.tabPagePlugins.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPagePlugins.Size = new System.Drawing.Size(942, 435); + this.tabPagePlugins.Padding = new System.Windows.Forms.Padding(4); + this.tabPagePlugins.Size = new System.Drawing.Size(836, 345); this.tabPagePlugins.TabIndex = 5; this.tabPagePlugins.Text = "Plugins"; this.tabPagePlugins.UseVisualStyleBackColor = true; @@ -1224,11 +1239,11 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBoxPlugins.Controls.Add(this.listBoxPlugin); - this.groupBoxPlugins.Location = new System.Drawing.Point(10, 23); - this.groupBoxPlugins.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxPlugins.Location = new System.Drawing.Point(9, 18); + this.groupBoxPlugins.Margin = new System.Windows.Forms.Padding(4); this.groupBoxPlugins.Name = "groupBoxPlugins"; - this.groupBoxPlugins.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxPlugins.Size = new System.Drawing.Size(342, 395); + this.groupBoxPlugins.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxPlugins.Size = new System.Drawing.Size(304, 316); this.groupBoxPlugins.TabIndex = 3; this.groupBoxPlugins.TabStop = false; this.groupBoxPlugins.Text = "Plugins"; @@ -1240,11 +1255,11 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.listBoxPlugin.DisplayMember = "Text"; this.listBoxPlugin.FormattingEnabled = true; - this.listBoxPlugin.ItemHeight = 20; - this.listBoxPlugin.Location = new System.Drawing.Point(9, 29); - this.listBoxPlugin.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.listBoxPlugin.ItemHeight = 16; + this.listBoxPlugin.Location = new System.Drawing.Point(8, 23); + this.listBoxPlugin.Margin = new System.Windows.Forms.Padding(4); this.listBoxPlugin.Name = "listBoxPlugin"; - this.listBoxPlugin.Size = new System.Drawing.Size(322, 344); + this.listBoxPlugin.Size = new System.Drawing.Size(287, 276); this.listBoxPlugin.TabIndex = 0; this.listBoxPlugin.ValueMember = "Text"; this.listBoxPlugin.SelectedIndexChanged += new System.EventHandler(this.pluginListBox_SelectedIndexChanged); @@ -1255,11 +1270,11 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBoxSettings.Controls.Add(this.panelPlugin); - this.groupBoxSettings.Location = new System.Drawing.Point(362, 23); - this.groupBoxSettings.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxSettings.Location = new System.Drawing.Point(322, 18); + this.groupBoxSettings.Margin = new System.Windows.Forms.Padding(4); this.groupBoxSettings.Name = "groupBoxSettings"; - this.groupBoxSettings.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxSettings.Size = new System.Drawing.Size(567, 395); + this.groupBoxSettings.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxSettings.Size = new System.Drawing.Size(504, 316); this.groupBoxSettings.TabIndex = 2; this.groupBoxSettings.TabStop = false; this.groupBoxSettings.Text = "Settings"; @@ -1271,18 +1286,18 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.panelPlugin.AutoScroll = true; this.panelPlugin.Controls.Add(this.buttonConfigPlugin); - this.panelPlugin.Location = new System.Drawing.Point(9, 29); - this.panelPlugin.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panelPlugin.Location = new System.Drawing.Point(8, 23); + this.panelPlugin.Margin = new System.Windows.Forms.Padding(4); this.panelPlugin.Name = "panelPlugin"; - this.panelPlugin.Size = new System.Drawing.Size(549, 357); + this.panelPlugin.Size = new System.Drawing.Size(488, 286); this.panelPlugin.TabIndex = 1; // // buttonConfigPlugin // - this.buttonConfigPlugin.Location = new System.Drawing.Point(164, 163); - this.buttonConfigPlugin.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonConfigPlugin.Location = new System.Drawing.Point(146, 130); + this.buttonConfigPlugin.Margin = new System.Windows.Forms.Padding(4); this.buttonConfigPlugin.Name = "buttonConfigPlugin"; - this.buttonConfigPlugin.Size = new System.Drawing.Size(170, 35); + this.buttonConfigPlugin.Size = new System.Drawing.Size(151, 28); this.buttonConfigPlugin.TabIndex = 0; this.buttonConfigPlugin.Text = "Configure..."; this.buttonConfigPlugin.UseVisualStyleBackColor = true; @@ -1294,11 +1309,11 @@ private void InitializeComponent() this.tabPageSessions.Controls.Add(this.checkBoxSaveFilter); this.tabPageSessions.Controls.Add(this.groupBoxPersistantFileLocation); this.tabPageSessions.Controls.Add(this.checkBoxSaveSessions); - this.tabPageSessions.Location = new System.Drawing.Point(4, 29); - this.tabPageSessions.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPageSessions.Location = new System.Drawing.Point(4, 25); + this.tabPageSessions.Margin = new System.Windows.Forms.Padding(4); this.tabPageSessions.Name = "tabPageSessions"; - this.tabPageSessions.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPageSessions.Size = new System.Drawing.Size(942, 435); + this.tabPageSessions.Padding = new System.Windows.Forms.Padding(4); + this.tabPageSessions.Size = new System.Drawing.Size(836, 345); this.tabPageSessions.TabIndex = 6; this.tabPageSessions.Text = "Persistence"; this.tabPageSessions.UseVisualStyleBackColor = true; @@ -1306,10 +1321,10 @@ private void InitializeComponent() // checkBoxPortableMode // this.checkBoxPortableMode.AutoSize = true; - this.checkBoxPortableMode.Location = new System.Drawing.Point(34, 377); - this.checkBoxPortableMode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxPortableMode.Location = new System.Drawing.Point(30, 302); + this.checkBoxPortableMode.Margin = new System.Windows.Forms.Padding(4); this.checkBoxPortableMode.Name = "checkBoxPortableMode"; - this.checkBoxPortableMode.Size = new System.Drawing.Size(199, 24); + this.checkBoxPortableMode.Size = new System.Drawing.Size(176, 21); this.checkBoxPortableMode.TabIndex = 3; this.checkBoxPortableMode.Text = "Activate Portable Mode"; this.toolTip.SetToolTip(this.checkBoxPortableMode, "If this mode is activated, the save file will be loaded from the Executable Locat" + @@ -1320,10 +1335,10 @@ private void InitializeComponent() // checkBoxSaveFilter // this.checkBoxSaveFilter.AutoSize = true; - this.checkBoxSaveFilter.Location = new System.Drawing.Point(34, 74); - this.checkBoxSaveFilter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxSaveFilter.Location = new System.Drawing.Point(30, 59); + this.checkBoxSaveFilter.Margin = new System.Windows.Forms.Padding(4); this.checkBoxSaveFilter.Name = "checkBoxSaveFilter"; - this.checkBoxSaveFilter.Size = new System.Drawing.Size(294, 24); + this.checkBoxSaveFilter.Size = new System.Drawing.Size(264, 21); this.checkBoxSaveFilter.TabIndex = 2; this.checkBoxSaveFilter.Text = " Save and restore filter and filter tabs"; this.checkBoxSaveFilter.UseVisualStyleBackColor = true; @@ -1336,30 +1351,30 @@ private void InitializeComponent() this.groupBoxPersistantFileLocation.Controls.Add(this.radioButtonsessionSaveDocuments); this.groupBoxPersistantFileLocation.Controls.Add(this.radioButtonSessionSameDir); this.groupBoxPersistantFileLocation.Controls.Add(this.radioButtonSessionApplicationStartupDir); - this.groupBoxPersistantFileLocation.Location = new System.Drawing.Point(34, 134); - this.groupBoxPersistantFileLocation.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxPersistantFileLocation.Location = new System.Drawing.Point(30, 107); + this.groupBoxPersistantFileLocation.Margin = new System.Windows.Forms.Padding(4); this.groupBoxPersistantFileLocation.Name = "groupBoxPersistantFileLocation"; - this.groupBoxPersistantFileLocation.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxPersistantFileLocation.Size = new System.Drawing.Size(411, 211); + this.groupBoxPersistantFileLocation.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxPersistantFileLocation.Size = new System.Drawing.Size(365, 169); this.groupBoxPersistantFileLocation.TabIndex = 1; this.groupBoxPersistantFileLocation.TabStop = false; this.groupBoxPersistantFileLocation.Text = "Persistence file location"; // // labelSessionSaveOwnDir // - this.labelSessionSaveOwnDir.Location = new System.Drawing.Point(39, 142); + this.labelSessionSaveOwnDir.Location = new System.Drawing.Point(35, 114); this.labelSessionSaveOwnDir.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelSessionSaveOwnDir.Name = "labelSessionSaveOwnDir"; - this.labelSessionSaveOwnDir.Size = new System.Drawing.Size(252, 31); + this.labelSessionSaveOwnDir.Size = new System.Drawing.Size(224, 25); this.labelSessionSaveOwnDir.TabIndex = 4; this.labelSessionSaveOwnDir.Text = "sessionSaveOwnDirLabel"; // // buttonSessionSaveDir // - this.buttonSessionSaveDir.Location = new System.Drawing.Point(357, 102); - this.buttonSessionSaveDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonSessionSaveDir.Location = new System.Drawing.Point(317, 82); + this.buttonSessionSaveDir.Margin = new System.Windows.Forms.Padding(4); this.buttonSessionSaveDir.Name = "buttonSessionSaveDir"; - this.buttonSessionSaveDir.Size = new System.Drawing.Size(45, 31); + this.buttonSessionSaveDir.Size = new System.Drawing.Size(40, 25); this.buttonSessionSaveDir.TabIndex = 3; this.buttonSessionSaveDir.Text = "..."; this.buttonSessionSaveDir.UseVisualStyleBackColor = true; @@ -1368,10 +1383,10 @@ private void InitializeComponent() // radioButtonSessionSaveOwn // this.radioButtonSessionSaveOwn.AutoSize = true; - this.radioButtonSessionSaveOwn.Location = new System.Drawing.Point(10, 105); - this.radioButtonSessionSaveOwn.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonSessionSaveOwn.Location = new System.Drawing.Point(9, 84); + this.radioButtonSessionSaveOwn.Margin = new System.Windows.Forms.Padding(4); this.radioButtonSessionSaveOwn.Name = "radioButtonSessionSaveOwn"; - this.radioButtonSessionSaveOwn.Size = new System.Drawing.Size(130, 24); + this.radioButtonSessionSaveOwn.Size = new System.Drawing.Size(116, 21); this.radioButtonSessionSaveOwn.TabIndex = 2; this.radioButtonSessionSaveOwn.TabStop = true; this.radioButtonSessionSaveOwn.Text = "Own directory"; @@ -1380,10 +1395,10 @@ private void InitializeComponent() // radioButtonsessionSaveDocuments // this.radioButtonsessionSaveDocuments.AutoSize = true; - this.radioButtonsessionSaveDocuments.Location = new System.Drawing.Point(10, 68); - this.radioButtonsessionSaveDocuments.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonsessionSaveDocuments.Location = new System.Drawing.Point(9, 54); + this.radioButtonsessionSaveDocuments.Margin = new System.Windows.Forms.Padding(4); this.radioButtonsessionSaveDocuments.Name = "radioButtonsessionSaveDocuments"; - this.radioButtonsessionSaveDocuments.Size = new System.Drawing.Size(213, 24); + this.radioButtonsessionSaveDocuments.Size = new System.Drawing.Size(186, 21); this.radioButtonsessionSaveDocuments.TabIndex = 1; this.radioButtonsessionSaveDocuments.TabStop = true; this.radioButtonsessionSaveDocuments.Text = "MyDocuments/LogExpert"; @@ -1392,10 +1407,10 @@ private void InitializeComponent() // radioButtonSessionSameDir // this.radioButtonSessionSameDir.AutoSize = true; - this.radioButtonSessionSameDir.Location = new System.Drawing.Point(10, 31); - this.radioButtonSessionSameDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonSessionSameDir.Location = new System.Drawing.Point(9, 25); + this.radioButtonSessionSameDir.Margin = new System.Windows.Forms.Padding(4); this.radioButtonSessionSameDir.Name = "radioButtonSessionSameDir"; - this.radioButtonSessionSameDir.Size = new System.Drawing.Size(210, 24); + this.radioButtonSessionSameDir.Size = new System.Drawing.Size(188, 21); this.radioButtonSessionSameDir.TabIndex = 0; this.radioButtonSessionSameDir.TabStop = true; this.radioButtonSessionSameDir.Text = "Same directory as log file"; @@ -1404,10 +1419,10 @@ private void InitializeComponent() // radioButtonSessionApplicationStartupDir // this.radioButtonSessionApplicationStartupDir.AutoSize = true; - this.radioButtonSessionApplicationStartupDir.Location = new System.Drawing.Point(8, 177); - this.radioButtonSessionApplicationStartupDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.radioButtonSessionApplicationStartupDir.Location = new System.Drawing.Point(7, 142); + this.radioButtonSessionApplicationStartupDir.Margin = new System.Windows.Forms.Padding(4); this.radioButtonSessionApplicationStartupDir.Name = "radioButtonSessionApplicationStartupDir"; - this.radioButtonSessionApplicationStartupDir.Size = new System.Drawing.Size(230, 24); + this.radioButtonSessionApplicationStartupDir.Size = new System.Drawing.Size(205, 21); this.radioButtonSessionApplicationStartupDir.TabIndex = 5; this.radioButtonSessionApplicationStartupDir.TabStop = true; this.radioButtonSessionApplicationStartupDir.Text = "Application startup directory"; @@ -1417,10 +1432,10 @@ private void InitializeComponent() // checkBoxSaveSessions // this.checkBoxSaveSessions.AutoSize = true; - this.checkBoxSaveSessions.Location = new System.Drawing.Point(34, 38); - this.checkBoxSaveSessions.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxSaveSessions.Location = new System.Drawing.Point(30, 30); + this.checkBoxSaveSessions.Margin = new System.Windows.Forms.Padding(4); this.checkBoxSaveSessions.Name = "checkBoxSaveSessions"; - this.checkBoxSaveSessions.Size = new System.Drawing.Size(321, 24); + this.checkBoxSaveSessions.Size = new System.Drawing.Size(288, 21); this.checkBoxSaveSessions.TabIndex = 0; this.checkBoxSaveSessions.Text = "Automatically save persistence files (.lxp)"; this.checkBoxSaveSessions.UseVisualStyleBackColor = true; @@ -1429,11 +1444,11 @@ private void InitializeComponent() // this.tabPageMemory.Controls.Add(this.groupBoxCPUAndStuff); this.tabPageMemory.Controls.Add(this.groupBoxLineBufferUsage); - this.tabPageMemory.Location = new System.Drawing.Point(4, 29); - this.tabPageMemory.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPageMemory.Location = new System.Drawing.Point(4, 25); + this.tabPageMemory.Margin = new System.Windows.Forms.Padding(4); this.tabPageMemory.Name = "tabPageMemory"; - this.tabPageMemory.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPageMemory.Size = new System.Drawing.Size(942, 435); + this.tabPageMemory.Padding = new System.Windows.Forms.Padding(4); + this.tabPageMemory.Size = new System.Drawing.Size(836, 345); this.tabPageMemory.TabIndex = 7; this.tabPageMemory.Text = "Memory/CPU"; this.tabPageMemory.UseVisualStyleBackColor = true; @@ -1444,11 +1459,11 @@ private void InitializeComponent() this.groupBoxCPUAndStuff.Controls.Add(this.checkBoxMultiThread); this.groupBoxCPUAndStuff.Controls.Add(this.labelFilePollingInterval); this.groupBoxCPUAndStuff.Controls.Add(this.upDownPollingInterval); - this.groupBoxCPUAndStuff.Location = new System.Drawing.Point(408, 29); - this.groupBoxCPUAndStuff.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxCPUAndStuff.Location = new System.Drawing.Point(363, 23); + this.groupBoxCPUAndStuff.Margin = new System.Windows.Forms.Padding(4); this.groupBoxCPUAndStuff.Name = "groupBoxCPUAndStuff"; - this.groupBoxCPUAndStuff.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxCPUAndStuff.Size = new System.Drawing.Size(300, 197); + this.groupBoxCPUAndStuff.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxCPUAndStuff.Size = new System.Drawing.Size(267, 158); this.groupBoxCPUAndStuff.TabIndex = 8; this.groupBoxCPUAndStuff.TabStop = false; this.groupBoxCPUAndStuff.Text = "CPU and stuff"; @@ -1456,10 +1471,10 @@ private void InitializeComponent() // checkBoxLegacyReader // this.checkBoxLegacyReader.AutoSize = true; - this.checkBoxLegacyReader.Location = new System.Drawing.Point(14, 138); - this.checkBoxLegacyReader.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxLegacyReader.Location = new System.Drawing.Point(12, 110); + this.checkBoxLegacyReader.Margin = new System.Windows.Forms.Padding(4); this.checkBoxLegacyReader.Name = "checkBoxLegacyReader"; - this.checkBoxLegacyReader.Size = new System.Drawing.Size(246, 24); + this.checkBoxLegacyReader.Size = new System.Drawing.Size(222, 21); this.checkBoxLegacyReader.TabIndex = 9; this.checkBoxLegacyReader.Text = "Use legacy file reader (slower)"; this.toolTip.SetToolTip(this.checkBoxLegacyReader, "Slower but more compatible with strange linefeeds and encodings"); @@ -1468,10 +1483,10 @@ private void InitializeComponent() // checkBoxMultiThread // this.checkBoxMultiThread.AutoSize = true; - this.checkBoxMultiThread.Location = new System.Drawing.Point(14, 103); - this.checkBoxMultiThread.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxMultiThread.Location = new System.Drawing.Point(12, 82); + this.checkBoxMultiThread.Margin = new System.Windows.Forms.Padding(4); this.checkBoxMultiThread.Name = "checkBoxMultiThread"; - this.checkBoxMultiThread.Size = new System.Drawing.Size(170, 24); + this.checkBoxMultiThread.Size = new System.Drawing.Size(151, 21); this.checkBoxMultiThread.TabIndex = 5; this.checkBoxMultiThread.Text = "Multi threaded filter"; this.checkBoxMultiThread.UseVisualStyleBackColor = true; @@ -1479,17 +1494,17 @@ private void InitializeComponent() // labelFilePollingInterval // this.labelFilePollingInterval.AutoSize = true; - this.labelFilePollingInterval.Location = new System.Drawing.Point(9, 52); + this.labelFilePollingInterval.Location = new System.Drawing.Point(8, 42); this.labelFilePollingInterval.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelFilePollingInterval.Name = "labelFilePollingInterval"; - this.labelFilePollingInterval.Size = new System.Drawing.Size(176, 20); + this.labelFilePollingInterval.Size = new System.Drawing.Size(161, 17); this.labelFilePollingInterval.TabIndex = 7; this.labelFilePollingInterval.Text = "File polling interval (ms):"; // // upDownPollingInterval // - this.upDownPollingInterval.Location = new System.Drawing.Point(190, 49); - this.upDownPollingInterval.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.upDownPollingInterval.Location = new System.Drawing.Point(169, 39); + this.upDownPollingInterval.Margin = new System.Windows.Forms.Padding(4); this.upDownPollingInterval.Maximum = new decimal(new int[] { 5000, 0, @@ -1501,7 +1516,7 @@ private void InitializeComponent() 0, 0}); this.upDownPollingInterval.Name = "upDownPollingInterval"; - this.upDownPollingInterval.Size = new System.Drawing.Size(86, 26); + this.upDownPollingInterval.Size = new System.Drawing.Size(76, 22); this.upDownPollingInterval.TabIndex = 6; this.upDownPollingInterval.Value = new decimal(new int[] { 20, @@ -1516,11 +1531,11 @@ private void InitializeComponent() this.groupBoxLineBufferUsage.Controls.Add(this.upDownLinesPerBlock); this.groupBoxLineBufferUsage.Controls.Add(this.upDownBlockCount); this.groupBoxLineBufferUsage.Controls.Add(this.labelLinesPerBlock); - this.groupBoxLineBufferUsage.Location = new System.Drawing.Point(10, 29); - this.groupBoxLineBufferUsage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxLineBufferUsage.Location = new System.Drawing.Point(9, 23); + this.groupBoxLineBufferUsage.Margin = new System.Windows.Forms.Padding(4); this.groupBoxLineBufferUsage.Name = "groupBoxLineBufferUsage"; - this.groupBoxLineBufferUsage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBoxLineBufferUsage.Size = new System.Drawing.Size(326, 197); + this.groupBoxLineBufferUsage.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxLineBufferUsage.Size = new System.Drawing.Size(290, 158); this.groupBoxLineBufferUsage.TabIndex = 4; this.groupBoxLineBufferUsage.TabStop = false; this.groupBoxLineBufferUsage.Text = "Line buffer usage"; @@ -1528,27 +1543,27 @@ private void InitializeComponent() // labelInfo // this.labelInfo.AutoSize = true; - this.labelInfo.Location = new System.Drawing.Point(9, 145); + this.labelInfo.Location = new System.Drawing.Point(8, 116); this.labelInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelInfo.Name = "labelInfo"; - this.labelInfo.Size = new System.Drawing.Size(291, 20); + this.labelInfo.Size = new System.Drawing.Size(259, 17); this.labelInfo.TabIndex = 4; this.labelInfo.Text = "Changes will take effect on next file load"; // // labelNumberOfBlocks // this.labelNumberOfBlocks.AutoSize = true; - this.labelNumberOfBlocks.Location = new System.Drawing.Point(9, 52); + this.labelNumberOfBlocks.Location = new System.Drawing.Point(8, 42); this.labelNumberOfBlocks.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelNumberOfBlocks.Name = "labelNumberOfBlocks"; - this.labelNumberOfBlocks.Size = new System.Drawing.Size(132, 20); + this.labelNumberOfBlocks.Size = new System.Drawing.Size(118, 17); this.labelNumberOfBlocks.TabIndex = 1; this.labelNumberOfBlocks.Text = "Number of blocks"; // // upDownLinesPerBlock // - this.upDownLinesPerBlock.Location = new System.Drawing.Point(210, 102); - this.upDownLinesPerBlock.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.upDownLinesPerBlock.Location = new System.Drawing.Point(187, 82); + this.upDownLinesPerBlock.Margin = new System.Windows.Forms.Padding(4); this.upDownLinesPerBlock.Maximum = new decimal(new int[] { 5000, 0, @@ -1560,7 +1575,7 @@ private void InitializeComponent() 0, 0}); this.upDownLinesPerBlock.Name = "upDownLinesPerBlock"; - this.upDownLinesPerBlock.Size = new System.Drawing.Size(94, 26); + this.upDownLinesPerBlock.Size = new System.Drawing.Size(84, 22); this.upDownLinesPerBlock.TabIndex = 3; this.upDownLinesPerBlock.Value = new decimal(new int[] { 500, @@ -1571,8 +1586,8 @@ private void InitializeComponent() // // upDownBlockCount // - this.upDownBlockCount.Location = new System.Drawing.Point(210, 49); - this.upDownBlockCount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.upDownBlockCount.Location = new System.Drawing.Point(187, 39); + this.upDownBlockCount.Margin = new System.Windows.Forms.Padding(4); this.upDownBlockCount.Maximum = new decimal(new int[] { 5000, 0, @@ -1584,7 +1599,7 @@ private void InitializeComponent() 0, 0}); this.upDownBlockCount.Name = "upDownBlockCount"; - this.upDownBlockCount.Size = new System.Drawing.Size(94, 26); + this.upDownBlockCount.Size = new System.Drawing.Size(84, 22); this.upDownBlockCount.TabIndex = 0; this.upDownBlockCount.Value = new decimal(new int[] { 100, @@ -1595,20 +1610,20 @@ private void InitializeComponent() // labelLinesPerBlock // this.labelLinesPerBlock.AutoSize = true; - this.labelLinesPerBlock.Location = new System.Drawing.Point(9, 105); + this.labelLinesPerBlock.Location = new System.Drawing.Point(8, 84); this.labelLinesPerBlock.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelLinesPerBlock.Name = "labelLinesPerBlock"; - this.labelLinesPerBlock.Size = new System.Drawing.Size(88, 20); + this.labelLinesPerBlock.Size = new System.Drawing.Size(79, 17); this.labelLinesPerBlock.TabIndex = 2; this.labelLinesPerBlock.Text = "Lines/block"; // // buttonCancel // this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonCancel.Location = new System.Drawing.Point(818, 509); - this.buttonCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonCancel.Location = new System.Drawing.Point(727, 407); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(4); this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(112, 35); + this.buttonCancel.Size = new System.Drawing.Size(100, 28); this.buttonCancel.TabIndex = 1; this.buttonCancel.Text = "Cancel"; this.buttonCancel.UseVisualStyleBackColor = true; @@ -1617,10 +1632,10 @@ private void InitializeComponent() // buttonOk // this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonOk.Location = new System.Drawing.Point(696, 509); - this.buttonOk.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonOk.Location = new System.Drawing.Point(619, 407); + this.buttonOk.Margin = new System.Windows.Forms.Padding(4); this.buttonOk.Name = "buttonOk"; - this.buttonOk.Size = new System.Drawing.Size(112, 35); + this.buttonOk.Size = new System.Drawing.Size(100, 28); this.buttonOk.TabIndex = 0; this.buttonOk.Text = "OK"; this.buttonOk.UseVisualStyleBackColor = true; @@ -1632,10 +1647,10 @@ private void InitializeComponent() // // buttonExport // - this.buttonExport.Location = new System.Drawing.Point(20, 509); - this.buttonExport.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonExport.Location = new System.Drawing.Point(18, 407); + this.buttonExport.Margin = new System.Windows.Forms.Padding(4); this.buttonExport.Name = "buttonExport"; - this.buttonExport.Size = new System.Drawing.Size(112, 35); + this.buttonExport.Size = new System.Drawing.Size(100, 28); this.buttonExport.TabIndex = 2; this.buttonExport.Text = "Export..."; this.buttonExport.UseVisualStyleBackColor = true; @@ -1643,10 +1658,10 @@ private void InitializeComponent() // // buttonImport // - this.buttonImport.Location = new System.Drawing.Point(142, 509); - this.buttonImport.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonImport.Location = new System.Drawing.Point(126, 407); + this.buttonImport.Margin = new System.Windows.Forms.Padding(4); this.buttonImport.Name = "buttonImport"; - this.buttonImport.Size = new System.Drawing.Size(112, 35); + this.buttonImport.Size = new System.Drawing.Size(100, 28); this.buttonImport.TabIndex = 3; this.buttonImport.Text = "Import..."; this.buttonImport.UseVisualStyleBackColor = true; @@ -1669,10 +1684,10 @@ private void InitializeComponent() // SettingsDialog // this.AcceptButton = this.buttonOk; - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.buttonCancel; - this.ClientSize = new System.Drawing.Size(956, 563); + this.ClientSize = new System.Drawing.Size(850, 450); this.Controls.Add(this.buttonImport); this.Controls.Add(this.buttonExport); this.Controls.Add(this.buttonOk); @@ -1682,7 +1697,7 @@ private void InitializeComponent() this.helpProvider.SetHelpKeyword(this, "Settings.htm"); this.helpProvider.SetHelpNavigator(this, System.Windows.Forms.HelpNavigator.Topic); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.Margin = new System.Windows.Forms.Padding(4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "SettingsDialog"; @@ -1867,5 +1882,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox checkBoxAutoPick; private System.Windows.Forms.CheckBox checkBoxPortableMode; private System.Windows.Forms.RadioButton radioButtonSessionApplicationStartupDir; + private System.Windows.Forms.CheckBox checkBoxDarkMode; } } diff --git a/src/LogExpert/Dialogs/SettingsDialog.cs b/src/LogExpert/Dialogs/SettingsDialog.cs index b1f528ae..6714978b 100644 --- a/src/LogExpert/Dialogs/SettingsDialog.cs +++ b/src/LogExpert/Dialogs/SettingsDialog.cs @@ -75,6 +75,7 @@ private void FillDialog() checkBoxSyncFilter.Checked = Preferences.filterSync; checkBoxFilterTail.Checked = Preferences.filterTail; checkBoxFollowTail.Checked = Preferences.followTail; + checkBoxDarkMode.Checked = Preferences.darkMode; radioButtonHorizMouseDrag.Checked = Preferences.timestampControlDragOrientation == DateTimeDragControl.DragOrientations.Horizontal; radioButtonVerticalMouseDrag.Checked = Preferences.timestampControlDragOrientation == DateTimeDragControl.DragOrientations.Vertical; @@ -594,12 +595,14 @@ private void changeFontButton_Click(object sender, EventArgs e) DisplayFontName(); } + private void OnOkButtonClick(object sender, EventArgs e) { Preferences.timestampControl = checkBoxTimestamp.Checked; Preferences.filterSync = checkBoxSyncFilter.Checked; Preferences.filterTail = checkBoxFilterTail.Checked; Preferences.followTail = checkBoxFollowTail.Checked; + Preferences.darkMode = checkBoxDarkMode.Checked; if (radioButtonVerticalMouseDrag.Checked) { @@ -1001,6 +1004,7 @@ private void OnImportButtonClick(object sender, EventArgs e) } } + #endregion } } \ No newline at end of file diff --git a/src/LogExpert/Dialogs/SettingsDialog.resx b/src/LogExpert/Dialogs/SettingsDialog.resx index ded11c9a..aa74df7a 100644 --- a/src/LogExpert/Dialogs/SettingsDialog.resx +++ b/src/LogExpert/Dialogs/SettingsDialog.resx @@ -120,9 +120,6 @@ 144, 17 - - 144, 17 - True @@ -156,6 +153,9 @@ 17, 17 + + 144, 17 + diff --git a/src/LogExpert/Interface/ColorMode.cs b/src/LogExpert/Interface/ColorMode.cs new file mode 100644 index 00000000..471dd767 --- /dev/null +++ b/src/LogExpert/Interface/ColorMode.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace LogExpert.Interface +{ + //LogExpert.Interface.ColorMode.backgroundColor System.Drawing.SystemColors.ControlDarkDark + //LogExpert.Interface.ColorMode.foreColor LogExpert.Interface.ColorMode.foreColor + + public static class ColorMode + { + public static System.Drawing.Color backgroundColor = System.Drawing.SystemColors.Control; + public static System.Drawing.Color foreColor = System.Drawing.SystemColors.ControlDarkDark; + + private static System.Drawing.Color whiteBackgroundColor = System.Drawing.SystemColors.Control; + private static System.Drawing.Color whiteForeColor = System.Drawing.SystemColors.ControlDarkDark; + + private static System.Drawing.Color darkBackgroundColor = System.Drawing.SystemColors.ControlDarkDark; + private static System.Drawing.Color darkForeColor = LogExpert.Interface.ColorMode.foreColor; + + public static void LoadColorMode() + { + var preferences = Config.ConfigManager.Settings.preferences; + + if (preferences.darkMode) + { + SetDarkMode(); + } + else + { + SetDefaultMode(); + } + } + + private static void SetDarkMode() + { + backgroundColor = darkBackgroundColor; + foreColor = darkForeColor; + } + + private static void SetDefaultMode() + { + backgroundColor = whiteBackgroundColor; + foreColor = whiteForeColor; + } + + [DllImport("dwmapi.dll")] + private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int attrValue, int attrSize); + + private const int DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19; + private const int DWMWA_USE_IMMERSIVE_DARK_MODE = 20; + + public static bool UseImmersiveDarkMode(IntPtr handle, bool enabled) + { + + var attribute = DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1; + if (IsWindows10OrGreater(18985)) + { + attribute = DWMWA_USE_IMMERSIVE_DARK_MODE; + } + + int useImmersiveDarkMode = enabled ? 1 : 0; + return DwmSetWindowAttribute(handle, (int)attribute, ref useImmersiveDarkMode, sizeof(int)) == 0; + + } + + private static bool IsWindows10OrGreater(int build = -1) + { + return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= build; + } + + } +} diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj index 8cfe193b..50e0cf3b 100644 --- a/src/LogExpert/LogExpert.csproj +++ b/src/LogExpert/LogExpert.csproj @@ -85,7 +85,6 @@ - Form @@ -190,6 +189,7 @@ + diff --git a/src/LogExpert/Program.cs b/src/LogExpert/Program.cs index 599e5ef7..35c02cd1 100644 --- a/src/LogExpert/Program.cs +++ b/src/LogExpert/Program.cs @@ -97,6 +97,9 @@ private static void Sub_Main(string[] orgArgs) { Settings settings = ConfigManager.Settings; Mutex mutex = new Mutex(false, "Local\\LogExpertInstanceMutex" + pId, out var isCreated); + + LogExpert.Interface.ColorMode.LoadColorMode(); + if (isCreated) { // first application instance From 92c3a8607550f457bb3f143b03fe0cdc905bd791 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 14:53:03 +0200 Subject: [PATCH 05/33] Converting more to dark mode --- .../LogTabWindow/LogTabWindow.designer.cs | 64 +++++++++++++++++++ src/LogExpert/Interface/ColorMode.cs | 2 +- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index e480ab11..0b3fe6bc 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -553,6 +553,8 @@ private void InitializeComponent() // this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Size = new System.Drawing.Size(218, 6); + this.toolStripSeparator4.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripSeparator4.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // timeshiftToolStripMenuItem // @@ -562,6 +564,8 @@ private void InitializeComponent() this.timeshiftToolStripMenuItem.Text = "Timeshift"; this.timeshiftToolStripMenuItem.ToolTipText = "If supported by the columnizer, you can set an offset to the displayed log time"; this.timeshiftToolStripMenuItem.CheckStateChanged += new System.EventHandler(this.OnTimeShiftToolStripMenuItemCheckStateChanged); + this.timeshiftToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.timeshiftToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // timeshiftMenuTextBox // @@ -578,6 +582,8 @@ private void InitializeComponent() // this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Size = new System.Drawing.Size(218, 6); + this.toolStripSeparator3.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripSeparator3.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // copyMarkedLinesIntoNewTabToolStripMenuItem // @@ -587,6 +593,8 @@ private void InitializeComponent() this.copyMarkedLinesIntoNewTabToolStripMenuItem.Text = "Copy to Tab"; this.copyMarkedLinesIntoNewTabToolStripMenuItem.ToolTipText = "Copies all selected lines into a new tab page"; this.copyMarkedLinesIntoNewTabToolStripMenuItem.Click += new System.EventHandler(this.OnCopyMarkedLinesIntoNewTabToolStripMenuItemClick); + this.copyMarkedLinesIntoNewTabToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.copyMarkedLinesIntoNewTabToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // optionToolStripMenuItem // @@ -604,6 +612,8 @@ private void InitializeComponent() this.optionToolStripMenuItem.Size = new System.Drawing.Size(75, 24); this.optionToolStripMenuItem.Text = "Options"; this.optionToolStripMenuItem.DropDownOpening += new System.EventHandler(this.OnOptionToolStripMenuItemDropDownOpening); + this.optionToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.optionToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // columnizerToolStripMenuItem // @@ -612,6 +622,8 @@ private void InitializeComponent() this.columnizerToolStripMenuItem.Text = "Columnizer..."; this.columnizerToolStripMenuItem.ToolTipText = "Splits various kinds of logfiles into fixed columns"; this.columnizerToolStripMenuItem.Click += new System.EventHandler(this.OnSelectFilterToolStripMenuItemClick); + this.columnizerToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.columnizerToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // hilightingToolStripMenuItem1 // @@ -619,6 +631,8 @@ private void InitializeComponent() this.hilightingToolStripMenuItem1.Size = new System.Drawing.Size(268, 26); this.hilightingToolStripMenuItem1.Text = "Highlighting and triggers..."; this.hilightingToolStripMenuItem1.Click += new System.EventHandler(this.OnHighlightingToolStripMenuItemClick); + this.hilightingToolStripMenuItem1.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.hilightingToolStripMenuItem1.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // settingsToolStripMenuItem // @@ -626,11 +640,15 @@ private void InitializeComponent() this.settingsToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.settingsToolStripMenuItem.Text = "Settings..."; this.settingsToolStripMenuItem.Click += new System.EventHandler(this.OnSettingsToolStripMenuItemClick); + this.settingsToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.settingsToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Size = new System.Drawing.Size(265, 6); + this.toolStripSeparator6.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripSeparator6.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // cellSelectModeToolStripMenuItem // @@ -640,6 +658,8 @@ private void InitializeComponent() this.cellSelectModeToolStripMenuItem.Text = "Cell select mode"; this.cellSelectModeToolStripMenuItem.ToolTipText = "Switches between foll row selection and single cell selection mode"; this.cellSelectModeToolStripMenuItem.Click += new System.EventHandler(this.OnCellSelectModeToolStripMenuItemClick); + this.cellSelectModeToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.cellSelectModeToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // alwaysOnTopToolStripMenuItem // @@ -648,6 +668,8 @@ private void InitializeComponent() this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.alwaysOnTopToolStripMenuItem.Text = "Always on top"; this.alwaysOnTopToolStripMenuItem.Click += new System.EventHandler(this.OnAlwaysOnTopToolStripMenuItemClick); + this.alwaysOnTopToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.alwaysOnTopToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // hideLineColumnToolStripMenuItem // @@ -656,11 +678,15 @@ private void InitializeComponent() this.hideLineColumnToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.hideLineColumnToolStripMenuItem.Text = "Hide line column"; this.hideLineColumnToolStripMenuItem.Click += new System.EventHandler(this.OnHideLineColumnToolStripMenuItemClick); + this.hideLineColumnToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.hideLineColumnToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator19 // this.toolStripSeparator19.Name = "toolStripSeparator19"; this.toolStripSeparator19.Size = new System.Drawing.Size(265, 6); + this.toolStripSeparator19.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripSeparator19.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // lockInstanceToolStripMenuItem // @@ -669,6 +695,8 @@ private void InitializeComponent() this.lockInstanceToolStripMenuItem.Text = "Lock instance"; this.lockInstanceToolStripMenuItem.ToolTipText = "When enabled all new launched LogExpert instances will redirect to this window"; this.lockInstanceToolStripMenuItem.Click += new System.EventHandler(this.OnLockInstanceToolStripMenuItemClick); + this.lockInstanceToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.lockInstanceToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolsToolStripMenuItem // @@ -676,6 +704,8 @@ private void InitializeComponent() this.configureToolStripMenuItem, this.configureToolStripSeparator}); this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; + this.toolsToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolsToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.toolsToolStripMenuItem.Size = new System.Drawing.Size(58, 24); this.toolsToolStripMenuItem.Text = "Tools"; this.toolsToolStripMenuItem.ToolTipText = "Launch external tools (configure in the settings)"; @@ -686,12 +716,16 @@ private void InitializeComponent() this.configureToolStripMenuItem.Name = "configureToolStripMenuItem"; this.configureToolStripMenuItem.Size = new System.Drawing.Size(166, 26); this.configureToolStripMenuItem.Text = "Configure..."; + this.configureToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.configureToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.configureToolStripMenuItem.Click += new System.EventHandler(this.OnConfigureToolStripMenuItemClick); // // configureToolStripSeparator // this.configureToolStripSeparator.Name = "configureToolStripSeparator"; this.configureToolStripSeparator.Size = new System.Drawing.Size(163, 6); + this.configureToolStripSeparator.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.configureToolStripSeparator.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // helpToolStripMenuItem // @@ -702,6 +736,8 @@ private void InitializeComponent() this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; this.helpToolStripMenuItem.Size = new System.Drawing.Size(55, 24); this.helpToolStripMenuItem.Text = "Help"; + this.helpToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.helpToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // showHelpToolStripMenuItem // @@ -710,11 +746,15 @@ private void InitializeComponent() this.showHelpToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.showHelpToolStripMenuItem.Text = "Show help"; this.showHelpToolStripMenuItem.Click += new System.EventHandler(this.OnShowHelpToolStripMenuItemClick); + this.showHelpToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.showHelpToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Size = new System.Drawing.Size(182, 6); + this.toolStripSeparator5.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripSeparator5.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // aboutToolStripMenuItem // @@ -722,6 +762,8 @@ private void InitializeComponent() this.aboutToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.aboutToolStripMenuItem.Text = "About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.OnAboutToolStripMenuItemClick); + this.aboutToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.aboutToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // debugToolStripMenuItem // @@ -741,6 +783,8 @@ private void InitializeComponent() this.debugToolStripMenuItem.Name = "debugToolStripMenuItem"; this.debugToolStripMenuItem.Size = new System.Drawing.Size(68, 24); this.debugToolStripMenuItem.Text = "Debug"; + this.debugToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.debugToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // dumpLogBufferInfoToolStripMenuItem // @@ -748,6 +792,8 @@ private void InitializeComponent() this.dumpLogBufferInfoToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.dumpLogBufferInfoToolStripMenuItem.Text = "Dump LogBuffer info"; this.dumpLogBufferInfoToolStripMenuItem.Click += new System.EventHandler(this.OnDumpLogBufferInfoToolStripMenuItemClick); + this.dumpLogBufferInfoToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.dumpLogBufferInfoToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // dumpBufferDiagnosticToolStripMenuItem // @@ -755,6 +801,8 @@ private void InitializeComponent() this.dumpBufferDiagnosticToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.dumpBufferDiagnosticToolStripMenuItem.Text = "Dump buffer diagnostic"; this.dumpBufferDiagnosticToolStripMenuItem.Click += new System.EventHandler(this.OnDumpBufferDiagnosticToolStripMenuItemClick); + this.dumpBufferDiagnosticToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.dumpBufferDiagnosticToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // runGCToolStripMenuItem // @@ -762,6 +810,8 @@ private void InitializeComponent() this.runGCToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.runGCToolStripMenuItem.Text = "Run GC"; this.runGCToolStripMenuItem.Click += new System.EventHandler(this.OnRunGCToolStripMenuItemClick); + this.runGCToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.runGCToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // gCInfoToolStripMenuItem // @@ -769,11 +819,15 @@ private void InitializeComponent() this.gCInfoToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.gCInfoToolStripMenuItem.Text = "Dump GC info"; this.gCInfoToolStripMenuItem.Click += new System.EventHandler(this.OnGCInfoToolStripMenuItemClick); + this.gCInfoToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.gCInfoToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator18 // this.toolStripSeparator18.Name = "toolStripSeparator18"; this.toolStripSeparator18.Size = new System.Drawing.Size(339, 6); + this.toolStripSeparator18.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripSeparator18.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // throwExceptionGUIThreadToolStripMenuItem // @@ -781,6 +835,8 @@ private void InitializeComponent() this.throwExceptionGUIThreadToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.throwExceptionGUIThreadToolStripMenuItem.Text = "Throw exception (GUI Thread)"; this.throwExceptionGUIThreadToolStripMenuItem.Click += new System.EventHandler(this.OnThrowExceptionGUIThreadToolStripMenuItemClick); + this.throwExceptionGUIThreadToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.throwExceptionGUIThreadToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // throwExceptionbackgroundThToolStripMenuItem // @@ -788,6 +844,8 @@ private void InitializeComponent() this.throwExceptionbackgroundThToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.throwExceptionbackgroundThToolStripMenuItem.Text = "Throw exception (Async delegate)"; this.throwExceptionbackgroundThToolStripMenuItem.Click += new System.EventHandler(this.OnThrowExceptionBackgroundThToolStripMenuItemClick); + this.throwExceptionbackgroundThToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.throwExceptionbackgroundThToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // throwExceptionBackgroundThreadToolStripMenuItem // @@ -795,11 +853,15 @@ private void InitializeComponent() this.throwExceptionBackgroundThreadToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.throwExceptionBackgroundThreadToolStripMenuItem.Text = "Throw exception (background thread)"; this.throwExceptionBackgroundThreadToolStripMenuItem.Click += new System.EventHandler(this.OnThrowExceptionBackgroundThreadToolStripMenuItemClick); + this.throwExceptionBackgroundThreadToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.throwExceptionBackgroundThreadToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; this.toolStripSeparator12.Size = new System.Drawing.Size(339, 6); + this.toolStripSeparator12.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripSeparator12.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // loglevelToolStripMenuItem // @@ -812,6 +874,8 @@ private void InitializeComponent() this.loglevelToolStripMenuItem.Text = "Loglevel"; this.loglevelToolStripMenuItem.DropDownOpening += new System.EventHandler(this.OnLogLevelToolStripMenuItemDropDownOpening); this.loglevelToolStripMenuItem.Click += new System.EventHandler(this.OnLogLevelToolStripMenuItemClick); + this.loglevelToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.loglevelToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // warnToolStripMenuItem // diff --git a/src/LogExpert/Interface/ColorMode.cs b/src/LogExpert/Interface/ColorMode.cs index 471dd767..1888cc1b 100644 --- a/src/LogExpert/Interface/ColorMode.cs +++ b/src/LogExpert/Interface/ColorMode.cs @@ -19,7 +19,7 @@ public static class ColorMode private static System.Drawing.Color whiteForeColor = System.Drawing.SystemColors.ControlDarkDark; private static System.Drawing.Color darkBackgroundColor = System.Drawing.SystemColors.ControlDarkDark; - private static System.Drawing.Color darkForeColor = LogExpert.Interface.ColorMode.foreColor; + private static System.Drawing.Color darkForeColor = System.Drawing.SystemColors.ControlLightLight; public static void LoadColorMode() { From 8a9522071a63347020bff8ab1fe523f0f3d2bc7a Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 15:00:02 +0200 Subject: [PATCH 06/33] Added more menu items --- .../LogTabWindow/LogTabWindow.designer.cs | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index 0b3fe6bc..7dc17385 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -271,6 +271,8 @@ private void InitializeComponent() this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24); this.fileToolStripMenuItem.Text = "File"; this.fileToolStripMenuItem.DropDownOpening += new System.EventHandler(this.OnFileToolStripMenuItemDropDownOpening); + this.fileToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.fileToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // openToolStripMenuItem // @@ -280,6 +282,8 @@ private void InitializeComponent() this.openToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.openToolStripMenuItem.Text = "Open..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.OnOpenToolStripMenuItemClick); + this.openToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.openToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // openURIToolStripMenuItem // @@ -289,6 +293,8 @@ private void InitializeComponent() this.openURIToolStripMenuItem.Text = "Open URL..."; this.openURIToolStripMenuItem.ToolTipText = "Opens a file by entering a URL which is supported by a file system plugin"; this.openURIToolStripMenuItem.Click += new System.EventHandler(this.OnOpenURIToolStripMenuItemClick); + this.openURIToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.openURIToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // closeFileToolStripMenuItem // @@ -297,6 +303,8 @@ private void InitializeComponent() this.closeFileToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.closeFileToolStripMenuItem.Text = "Close File"; this.closeFileToolStripMenuItem.Click += new System.EventHandler(this.OnCloseFileToolStripMenuItemClick); + this.closeFileToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.closeFileToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // reloadToolStripMenuItem // @@ -305,6 +313,8 @@ private void InitializeComponent() this.reloadToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.reloadToolStripMenuItem.Text = "Reload"; this.reloadToolStripMenuItem.Click += new System.EventHandler(this.OnReloadToolStripMenuItemClick); + this.reloadToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.reloadToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // newFromClipboardToolStripMenuItem // @@ -314,11 +324,15 @@ private void InitializeComponent() this.newFromClipboardToolStripMenuItem.Text = "New tab from clipboard"; this.newFromClipboardToolStripMenuItem.ToolTipText = "Creates a new tab with content from clipboard"; this.newFromClipboardToolStripMenuItem.Click += new System.EventHandler(this.OnNewFromClipboardToolStripMenuItemClick); + this.newFromClipboardToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.newFromClipboardToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; this.toolStripSeparator8.Size = new System.Drawing.Size(302, 6); + this.toolStripSeparator8.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripSeparator8.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // multiFileToolStripMenuItem // @@ -332,6 +346,8 @@ private void InitializeComponent() this.multiFileToolStripMenuItem.ToolTipText = "Treat multiple files as one large file (e.g. data.log, data.log.1, data.log.2,..." + ")"; this.multiFileToolStripMenuItem.Click += new System.EventHandler(this.OnMultiFileToolStripMenuItemClick); + this.multiFileToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.multiFileToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // multiFileEnabledStripMenuItem // @@ -340,6 +356,8 @@ private void InitializeComponent() this.multiFileEnabledStripMenuItem.Size = new System.Drawing.Size(203, 26); this.multiFileEnabledStripMenuItem.Text = "Enable MultiFile"; this.multiFileEnabledStripMenuItem.Click += new System.EventHandler(this.OnMultiFileEnabledStripMenuItemClick); + this.multiFileEnabledStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.multiFileEnabledStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // multifileMaskToolStripMenuItem // @@ -347,6 +365,8 @@ private void InitializeComponent() this.multifileMaskToolStripMenuItem.Size = new System.Drawing.Size(203, 26); this.multifileMaskToolStripMenuItem.Text = "File name mask..."; this.multifileMaskToolStripMenuItem.Click += new System.EventHandler(this.OnMultiFileMaskToolStripMenuItemClick); + this.multifileMaskToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.multifileMaskToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator7 // @@ -360,6 +380,8 @@ private void InitializeComponent() this.loadProjectToolStripMenuItem.Text = "Load session..."; this.loadProjectToolStripMenuItem.ToolTipText = "Load a saved session (list of log files)"; this.loadProjectToolStripMenuItem.Click += new System.EventHandler(this.OnLoadProjectToolStripMenuItemClick); + this.loadProjectToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.loadProjectToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // saveProjectToolStripMenuItem // @@ -368,6 +390,8 @@ private void InitializeComponent() this.saveProjectToolStripMenuItem.Text = "Save session..."; this.saveProjectToolStripMenuItem.ToolTipText = "Save a session (all open tabs)"; this.saveProjectToolStripMenuItem.Click += new System.EventHandler(this.OnSaveProjectToolStripMenuItemClick); + this.saveProjectToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.saveProjectToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // exportBookmarksToolStripMenuItem // @@ -376,6 +400,8 @@ private void InitializeComponent() this.exportBookmarksToolStripMenuItem.Text = "Export bookmarks..."; this.exportBookmarksToolStripMenuItem.ToolTipText = "Write a list of bookmarks and their comments to a CSV file"; this.exportBookmarksToolStripMenuItem.Click += new System.EventHandler(this.OnExportBookmarksToolStripMenuItemClick); + this.exportBookmarksToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.exportBookmarksToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator14 // @@ -387,6 +413,8 @@ private void InitializeComponent() this.lastUsedToolStripMenuItem.Name = "lastUsedToolStripMenuItem"; this.lastUsedToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.lastUsedToolStripMenuItem.Text = "Last used"; + this.lastUsedToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.lastUsedToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // exitToolStripMenuItem // @@ -395,6 +423,8 @@ private void InitializeComponent() this.exitToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.OnExitToolStripMenuItemClick); + this.exitToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.exitToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // viewNavigateToolStripMenuItem // @@ -414,6 +444,8 @@ private void InitializeComponent() this.viewNavigateToolStripMenuItem.Name = "viewNavigateToolStripMenuItem"; this.viewNavigateToolStripMenuItem.Size = new System.Drawing.Size(121, 24); this.viewNavigateToolStripMenuItem.Text = "View/Navigate"; + this.viewNavigateToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.viewNavigateToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // goToLineToolStripMenuItem // @@ -422,6 +454,8 @@ private void InitializeComponent() this.goToLineToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.goToLineToolStripMenuItem.Text = "Go to line..."; this.goToLineToolStripMenuItem.Click += new System.EventHandler(this.OnGoToLineToolStripMenuItemClick); + this.goToLineToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.goToLineToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // searchToolStripMenuItem // @@ -430,6 +464,8 @@ private void InitializeComponent() this.searchToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.searchToolStripMenuItem.Text = "Search..."; this.searchToolStripMenuItem.Click += new System.EventHandler(this.OnSearchToolStripMenuItemClick); + this.searchToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.searchToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // filterToolStripMenuItem // @@ -439,6 +475,8 @@ private void InitializeComponent() this.filterToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.filterToolStripMenuItem.Text = "Filter"; this.filterToolStripMenuItem.Click += new System.EventHandler(this.OnFilterToolStripMenuItemClick); + this.filterToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.filterToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // bookmarksToolStripMenuItem // @@ -450,6 +488,8 @@ private void InitializeComponent() this.bookmarksToolStripMenuItem.Name = "bookmarksToolStripMenuItem"; this.bookmarksToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.bookmarksToolStripMenuItem.Text = "Bookmarks"; + this.bookmarksToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.bookmarksToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toggleBookmarkToolStripMenuItem // @@ -459,6 +499,8 @@ private void InitializeComponent() this.toggleBookmarkToolStripMenuItem.Size = new System.Drawing.Size(266, 26); this.toggleBookmarkToolStripMenuItem.Text = "Toggle Bookmark"; this.toggleBookmarkToolStripMenuItem.Click += new System.EventHandler(this.OnToggleBookmarkToolStripMenuItemClick); + this.toggleBookmarkToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toggleBookmarkToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // jumpToNextToolStripMenuItem // @@ -468,6 +510,8 @@ private void InitializeComponent() this.jumpToNextToolStripMenuItem.Size = new System.Drawing.Size(266, 26); this.jumpToNextToolStripMenuItem.Text = "Jump to next"; this.jumpToNextToolStripMenuItem.Click += new System.EventHandler(this.OnJumpToNextToolStripMenuItemClick); + this.jumpToNextToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.jumpToNextToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // jumpToPrevToolStripMenuItem // @@ -477,6 +521,8 @@ private void InitializeComponent() this.jumpToPrevToolStripMenuItem.Size = new System.Drawing.Size(266, 26); this.jumpToPrevToolStripMenuItem.Text = "Jump to prev"; this.jumpToPrevToolStripMenuItem.Click += new System.EventHandler(this.OnJumpToPrevToolStripMenuItemClick); + this.jumpToPrevToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.jumpToPrevToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // showBookmarkListToolStripMenuItem // @@ -485,6 +531,8 @@ private void InitializeComponent() this.showBookmarkListToolStripMenuItem.Size = new System.Drawing.Size(266, 26); this.showBookmarkListToolStripMenuItem.Text = "Bookmark list"; this.showBookmarkListToolStripMenuItem.Click += new System.EventHandler(this.OnShowBookmarkListToolStripMenuItemClick); + this.showBookmarkListToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.showBookmarkListToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // columnFinderToolStripMenuItem // @@ -494,6 +542,8 @@ private void InitializeComponent() this.columnFinderToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.columnFinderToolStripMenuItem.Text = "Column finder"; this.columnFinderToolStripMenuItem.Click += new System.EventHandler(this.OnColumnFinderToolStripMenuItemClick); + this.columnFinderToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.columnFinderToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator2 // @@ -511,6 +561,8 @@ private void InitializeComponent() this.toolStripEncodingMenuItem.Name = "toolStripEncodingMenuItem"; this.toolStripEncodingMenuItem.Size = new System.Drawing.Size(221, 26); this.toolStripEncodingMenuItem.Text = "Encoding"; + this.toolStripEncodingMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripEncodingMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripEncodingASCIIItem // @@ -519,6 +571,8 @@ private void InitializeComponent() this.toolStripEncodingASCIIItem.Tag = ""; this.toolStripEncodingASCIIItem.Text = "ASCII"; this.toolStripEncodingASCIIItem.Click += new System.EventHandler(this.OnASCIIToolStripMenuItemClick); + this.toolStripEncodingASCIIItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripEncodingASCIIItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripEncodingANSIItem // @@ -527,6 +581,8 @@ private void InitializeComponent() this.toolStripEncodingANSIItem.Tag = ""; this.toolStripEncodingANSIItem.Text = "ANSI"; this.toolStripEncodingANSIItem.Click += new System.EventHandler(this.OnANSIToolStripMenuItemClick); + this.toolStripEncodingANSIItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripEncodingANSIItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripEncodingISO88591Item // @@ -534,6 +590,8 @@ private void InitializeComponent() this.toolStripEncodingISO88591Item.Size = new System.Drawing.Size(167, 26); this.toolStripEncodingISO88591Item.Text = "ISO-8859-1"; this.toolStripEncodingISO88591Item.Click += new System.EventHandler(this.OnISO88591ToolStripMenuItemClick); + this.toolStripEncodingISO88591Item.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripEncodingISO88591Item.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripEncodingUTF8Item // @@ -541,6 +599,8 @@ private void InitializeComponent() this.toolStripEncodingUTF8Item.Size = new System.Drawing.Size(167, 26); this.toolStripEncodingUTF8Item.Text = "UTF8"; this.toolStripEncodingUTF8Item.Click += new System.EventHandler(this.OnUTF8ToolStripMenuItemClick); + this.toolStripEncodingUTF8Item.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripEncodingUTF8Item.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripEncodingUTF16Item // @@ -548,6 +608,8 @@ private void InitializeComponent() this.toolStripEncodingUTF16Item.Size = new System.Drawing.Size(167, 26); this.toolStripEncodingUTF16Item.Text = "Unicode"; this.toolStripEncodingUTF16Item.Click += new System.EventHandler(this.OnUTF16ToolStripMenuItemClick); + this.toolStripEncodingUTF16Item.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripEncodingUTF16Item.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator4 // @@ -883,6 +945,8 @@ private void InitializeComponent() this.warnToolStripMenuItem.Size = new System.Drawing.Size(137, 26); this.warnToolStripMenuItem.Text = "Warn"; this.warnToolStripMenuItem.Click += new System.EventHandler(this.OnWarnToolStripMenuItemClick); + this.warnToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.warnToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // infoToolStripMenuItem // @@ -890,6 +954,8 @@ private void InitializeComponent() this.infoToolStripMenuItem.Size = new System.Drawing.Size(137, 26); this.infoToolStripMenuItem.Text = "Info"; this.infoToolStripMenuItem.Click += new System.EventHandler(this.OnInfoToolStripMenuItemClick); + this.infoToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.infoToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // debugToolStripMenuItem1 // @@ -897,6 +963,8 @@ private void InitializeComponent() this.debugToolStripMenuItem1.Size = new System.Drawing.Size(137, 26); this.debugToolStripMenuItem1.Text = "Debug"; this.debugToolStripMenuItem1.Click += new System.EventHandler(this.OnDebugToolStripMenuItemClick); + this.debugToolStripMenuItem1.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.debugToolStripMenuItem1.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // disableWordHighlightModeToolStripMenuItem // @@ -905,6 +973,8 @@ private void InitializeComponent() this.disableWordHighlightModeToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.disableWordHighlightModeToolStripMenuItem.Text = "Disable word highlight mode"; this.disableWordHighlightModeToolStripMenuItem.Click += new System.EventHandler(this.OnDisableWordHighlightModeToolStripMenuItemClick); + this.disableWordHighlightModeToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.disableWordHighlightModeToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // host // From b0af787bf484c3a015ce3990c29ce287b1c0f888 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 15:08:42 +0200 Subject: [PATCH 07/33] move color mode to config --- .../{Interface => Config}/ColorMode.cs | 6 +- .../Controls/LogTabWindow/LogTabWindow.cs | 1 - .../LogTabWindow/LogTabWindow.designer.cs | 319 +++++++++--------- .../Controls/LogWindow/LogWindow.designer.cs | 22 +- src/LogExpert/LogExpert.csproj | 2 +- src/LogExpert/Program.cs | 2 +- 6 files changed, 177 insertions(+), 175 deletions(-) rename src/LogExpert/{Interface => Config}/ColorMode.cs (91%) diff --git a/src/LogExpert/Interface/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs similarity index 91% rename from src/LogExpert/Interface/ColorMode.cs rename to src/LogExpert/Config/ColorMode.cs index 1888cc1b..0eccf4e4 100644 --- a/src/LogExpert/Interface/ColorMode.cs +++ b/src/LogExpert/Config/ColorMode.cs @@ -5,10 +5,10 @@ using System.Text; using System.Threading.Tasks; -namespace LogExpert.Interface +namespace LogExpert.Config { - //LogExpert.Interface.ColorMode.backgroundColor System.Drawing.SystemColors.ControlDarkDark - //LogExpert.Interface.ColorMode.foreColor LogExpert.Interface.ColorMode.foreColor + //LogExpert.Config.ColorMode.backgroundColor System.Drawing.SystemColors.ControlDarkDark + //LogExpert.Config.ColorMode.foreColor LogExpert.Config.ColorMode.foreColor public static class ColorMode { diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index 9ede13bd..6a6842ed 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -254,6 +254,5 @@ internal class StaticLogTabWindowData #endregion } - } } \ No newline at end of file diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index 7dc17385..f35e142d 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -170,7 +170,7 @@ private void InitializeComponent() // statusStrip // this.statusStrip.AutoSize = false; - this.statusStrip.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.statusStrip.BackColor = LogExpert.Config.ColorMode.backgroundColor; this.statusStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.labelLines, @@ -233,7 +233,7 @@ private void InitializeComponent() // mainMenuStrip // this.mainMenuStrip.AllowMerge = false; - this.mainMenuStrip.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.mainMenuStrip.BackColor = LogExpert.Config.ColorMode.backgroundColor; this.mainMenuStrip.Dock = System.Windows.Forms.DockStyle.None; this.mainMenuStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -252,6 +252,7 @@ private void InitializeComponent() // // fileToolStripMenuItem // + this.fileToolStripMenuItem.BackColor = LogExpert.Config.ColorMode.backgroundColor; this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.openToolStripMenuItem, this.openURIToolStripMenuItem, @@ -267,106 +268,105 @@ private void InitializeComponent() this.toolStripSeparator14, this.lastUsedToolStripMenuItem, this.exitToolStripMenuItem}); + this.fileToolStripMenuItem.ForeColor = LogExpert.Config.ColorMode.foreColor; this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24); this.fileToolStripMenuItem.Text = "File"; this.fileToolStripMenuItem.DropDownOpening += new System.EventHandler(this.OnFileToolStripMenuItemDropDownOpening); - this.fileToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.fileToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // openToolStripMenuItem // + this.openToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.openToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.openToolStripMenuItem.Image = global::LogExpert.Properties.Resources.folder_blue; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.openToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.openToolStripMenuItem.Text = "Open..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.OnOpenToolStripMenuItemClick); - this.openToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.openToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // openURIToolStripMenuItem // + this.openURIToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.openURIToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.openURIToolStripMenuItem.Name = "openURIToolStripMenuItem"; this.openURIToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); this.openURIToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.openURIToolStripMenuItem.Text = "Open URL..."; this.openURIToolStripMenuItem.ToolTipText = "Opens a file by entering a URL which is supported by a file system plugin"; this.openURIToolStripMenuItem.Click += new System.EventHandler(this.OnOpenURIToolStripMenuItemClick); - this.openURIToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.openURIToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // closeFileToolStripMenuItem // + this.closeFileToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.closeFileToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.closeFileToolStripMenuItem.Name = "closeFileToolStripMenuItem"; this.closeFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F4))); this.closeFileToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.closeFileToolStripMenuItem.Text = "Close File"; this.closeFileToolStripMenuItem.Click += new System.EventHandler(this.OnCloseFileToolStripMenuItemClick); - this.closeFileToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.closeFileToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // reloadToolStripMenuItem // + this.reloadToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.reloadToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.reloadToolStripMenuItem.Name = "reloadToolStripMenuItem"; this.reloadToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; this.reloadToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.reloadToolStripMenuItem.Text = "Reload"; this.reloadToolStripMenuItem.Click += new System.EventHandler(this.OnReloadToolStripMenuItemClick); - this.reloadToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.reloadToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // newFromClipboardToolStripMenuItem // + this.newFromClipboardToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.newFromClipboardToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.newFromClipboardToolStripMenuItem.Name = "newFromClipboardToolStripMenuItem"; this.newFromClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); this.newFromClipboardToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.newFromClipboardToolStripMenuItem.Text = "New tab from clipboard"; this.newFromClipboardToolStripMenuItem.ToolTipText = "Creates a new tab with content from clipboard"; this.newFromClipboardToolStripMenuItem.Click += new System.EventHandler(this.OnNewFromClipboardToolStripMenuItemClick); - this.newFromClipboardToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.newFromClipboardToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator8 // + this.toolStripSeparator8.BackColor = System.Drawing.SystemColors.Control; + this.toolStripSeparator8.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripSeparator8.Name = "toolStripSeparator8"; this.toolStripSeparator8.Size = new System.Drawing.Size(302, 6); - this.toolStripSeparator8.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripSeparator8.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // multiFileToolStripMenuItem // + this.multiFileToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.multiFileToolStripMenuItem.CheckOnClick = true; this.multiFileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.multiFileEnabledStripMenuItem, this.multifileMaskToolStripMenuItem}); + this.multiFileToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.multiFileToolStripMenuItem.Name = "multiFileToolStripMenuItem"; this.multiFileToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.multiFileToolStripMenuItem.Text = "MultiFile"; this.multiFileToolStripMenuItem.ToolTipText = "Treat multiple files as one large file (e.g. data.log, data.log.1, data.log.2,..." + ")"; this.multiFileToolStripMenuItem.Click += new System.EventHandler(this.OnMultiFileToolStripMenuItemClick); - this.multiFileToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.multiFileToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // multiFileEnabledStripMenuItem // + this.multiFileEnabledStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.multiFileEnabledStripMenuItem.CheckOnClick = true; + this.multiFileEnabledStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.multiFileEnabledStripMenuItem.Name = "multiFileEnabledStripMenuItem"; this.multiFileEnabledStripMenuItem.Size = new System.Drawing.Size(203, 26); this.multiFileEnabledStripMenuItem.Text = "Enable MultiFile"; this.multiFileEnabledStripMenuItem.Click += new System.EventHandler(this.OnMultiFileEnabledStripMenuItemClick); - this.multiFileEnabledStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.multiFileEnabledStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // multifileMaskToolStripMenuItem // + this.multifileMaskToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.multifileMaskToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.multifileMaskToolStripMenuItem.Name = "multifileMaskToolStripMenuItem"; this.multifileMaskToolStripMenuItem.Size = new System.Drawing.Size(203, 26); this.multifileMaskToolStripMenuItem.Text = "File name mask..."; this.multifileMaskToolStripMenuItem.Click += new System.EventHandler(this.OnMultiFileMaskToolStripMenuItemClick); - this.multifileMaskToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.multifileMaskToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator7 // @@ -375,33 +375,33 @@ private void InitializeComponent() // // loadProjectToolStripMenuItem // + this.loadProjectToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.loadProjectToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.loadProjectToolStripMenuItem.Name = "loadProjectToolStripMenuItem"; this.loadProjectToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.loadProjectToolStripMenuItem.Text = "Load session..."; this.loadProjectToolStripMenuItem.ToolTipText = "Load a saved session (list of log files)"; this.loadProjectToolStripMenuItem.Click += new System.EventHandler(this.OnLoadProjectToolStripMenuItemClick); - this.loadProjectToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.loadProjectToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // saveProjectToolStripMenuItem // + this.saveProjectToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.saveProjectToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.saveProjectToolStripMenuItem.Name = "saveProjectToolStripMenuItem"; this.saveProjectToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.saveProjectToolStripMenuItem.Text = "Save session..."; this.saveProjectToolStripMenuItem.ToolTipText = "Save a session (all open tabs)"; this.saveProjectToolStripMenuItem.Click += new System.EventHandler(this.OnSaveProjectToolStripMenuItemClick); - this.saveProjectToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.saveProjectToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // exportBookmarksToolStripMenuItem // + this.exportBookmarksToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.exportBookmarksToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.exportBookmarksToolStripMenuItem.Name = "exportBookmarksToolStripMenuItem"; this.exportBookmarksToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.exportBookmarksToolStripMenuItem.Text = "Export bookmarks..."; this.exportBookmarksToolStripMenuItem.ToolTipText = "Write a list of bookmarks and their comments to a CSV file"; this.exportBookmarksToolStripMenuItem.Click += new System.EventHandler(this.OnExportBookmarksToolStripMenuItemClick); - this.exportBookmarksToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.exportBookmarksToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator14 // @@ -410,24 +410,25 @@ private void InitializeComponent() // // lastUsedToolStripMenuItem // + this.lastUsedToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.lastUsedToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.lastUsedToolStripMenuItem.Name = "lastUsedToolStripMenuItem"; this.lastUsedToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.lastUsedToolStripMenuItem.Text = "Last used"; - this.lastUsedToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.lastUsedToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // exitToolStripMenuItem // + this.exitToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.exitToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); this.exitToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.OnExitToolStripMenuItemClick); - this.exitToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.exitToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // viewNavigateToolStripMenuItem // + this.viewNavigateToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.viewNavigateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.goToLineToolStripMenuItem, this.searchToolStripMenuItem, @@ -441,109 +442,108 @@ private void InitializeComponent() this.timeshiftMenuTextBox, this.toolStripSeparator3, this.copyMarkedLinesIntoNewTabToolStripMenuItem}); + this.viewNavigateToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.viewNavigateToolStripMenuItem.Name = "viewNavigateToolStripMenuItem"; this.viewNavigateToolStripMenuItem.Size = new System.Drawing.Size(121, 24); this.viewNavigateToolStripMenuItem.Text = "View/Navigate"; - this.viewNavigateToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.viewNavigateToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // goToLineToolStripMenuItem // + this.goToLineToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.goToLineToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.goToLineToolStripMenuItem.Name = "goToLineToolStripMenuItem"; this.goToLineToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); this.goToLineToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.goToLineToolStripMenuItem.Text = "Go to line..."; this.goToLineToolStripMenuItem.Click += new System.EventHandler(this.OnGoToLineToolStripMenuItemClick); - this.goToLineToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.goToLineToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // searchToolStripMenuItem // + this.searchToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.searchToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.searchToolStripMenuItem.Name = "searchToolStripMenuItem"; this.searchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); this.searchToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.searchToolStripMenuItem.Text = "Search..."; this.searchToolStripMenuItem.Click += new System.EventHandler(this.OnSearchToolStripMenuItemClick); - this.searchToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.searchToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // filterToolStripMenuItem // + this.filterToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.filterToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.filterToolStripMenuItem.Image = global::LogExpert.Properties.Resources.search_blue; this.filterToolStripMenuItem.Name = "filterToolStripMenuItem"; this.filterToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F4; this.filterToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.filterToolStripMenuItem.Text = "Filter"; this.filterToolStripMenuItem.Click += new System.EventHandler(this.OnFilterToolStripMenuItemClick); - this.filterToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.filterToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // bookmarksToolStripMenuItem // + this.bookmarksToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.bookmarksToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toggleBookmarkToolStripMenuItem, this.jumpToNextToolStripMenuItem, this.jumpToPrevToolStripMenuItem, this.showBookmarkListToolStripMenuItem}); + this.bookmarksToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.bookmarksToolStripMenuItem.Name = "bookmarksToolStripMenuItem"; this.bookmarksToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.bookmarksToolStripMenuItem.Text = "Bookmarks"; - this.bookmarksToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.bookmarksToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toggleBookmarkToolStripMenuItem // + this.toggleBookmarkToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.toggleBookmarkToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toggleBookmarkToolStripMenuItem.Image = global::LogExpert.Properties.Resources.check_blue; this.toggleBookmarkToolStripMenuItem.Name = "toggleBookmarkToolStripMenuItem"; this.toggleBookmarkToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F2))); this.toggleBookmarkToolStripMenuItem.Size = new System.Drawing.Size(266, 26); this.toggleBookmarkToolStripMenuItem.Text = "Toggle Bookmark"; this.toggleBookmarkToolStripMenuItem.Click += new System.EventHandler(this.OnToggleBookmarkToolStripMenuItemClick); - this.toggleBookmarkToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toggleBookmarkToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // jumpToNextToolStripMenuItem // + this.jumpToNextToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.jumpToNextToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.jumpToNextToolStripMenuItem.Image = global::LogExpert.Properties.Resources.down_blue; this.jumpToNextToolStripMenuItem.Name = "jumpToNextToolStripMenuItem"; this.jumpToNextToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F2; this.jumpToNextToolStripMenuItem.Size = new System.Drawing.Size(266, 26); this.jumpToNextToolStripMenuItem.Text = "Jump to next"; this.jumpToNextToolStripMenuItem.Click += new System.EventHandler(this.OnJumpToNextToolStripMenuItemClick); - this.jumpToNextToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.jumpToNextToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // jumpToPrevToolStripMenuItem // + this.jumpToPrevToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.jumpToPrevToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.jumpToPrevToolStripMenuItem.Image = global::LogExpert.Properties.Resources.up_blue; this.jumpToPrevToolStripMenuItem.Name = "jumpToPrevToolStripMenuItem"; this.jumpToPrevToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F2))); this.jumpToPrevToolStripMenuItem.Size = new System.Drawing.Size(266, 26); this.jumpToPrevToolStripMenuItem.Text = "Jump to prev"; this.jumpToPrevToolStripMenuItem.Click += new System.EventHandler(this.OnJumpToPrevToolStripMenuItemClick); - this.jumpToPrevToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.jumpToPrevToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // showBookmarkListToolStripMenuItem // + this.showBookmarkListToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.showBookmarkListToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.showBookmarkListToolStripMenuItem.Name = "showBookmarkListToolStripMenuItem"; this.showBookmarkListToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F6; this.showBookmarkListToolStripMenuItem.Size = new System.Drawing.Size(266, 26); this.showBookmarkListToolStripMenuItem.Text = "Bookmark list"; this.showBookmarkListToolStripMenuItem.Click += new System.EventHandler(this.OnShowBookmarkListToolStripMenuItemClick); - this.showBookmarkListToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.showBookmarkListToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // columnFinderToolStripMenuItem // + this.columnFinderToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.columnFinderToolStripMenuItem.CheckOnClick = true; + this.columnFinderToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.columnFinderToolStripMenuItem.Name = "columnFinderToolStripMenuItem"; this.columnFinderToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F8; this.columnFinderToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.columnFinderToolStripMenuItem.Text = "Column finder"; this.columnFinderToolStripMenuItem.Click += new System.EventHandler(this.OnColumnFinderToolStripMenuItemClick); - this.columnFinderToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.columnFinderToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator2 // @@ -552,88 +552,90 @@ private void InitializeComponent() // // toolStripEncodingMenuItem // + this.toolStripEncodingMenuItem.BackColor = System.Drawing.SystemColors.Control; this.toolStripEncodingMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripEncodingASCIIItem, this.toolStripEncodingANSIItem, this.toolStripEncodingISO88591Item, this.toolStripEncodingUTF8Item, this.toolStripEncodingUTF16Item}); + this.toolStripEncodingMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripEncodingMenuItem.Name = "toolStripEncodingMenuItem"; this.toolStripEncodingMenuItem.Size = new System.Drawing.Size(221, 26); this.toolStripEncodingMenuItem.Text = "Encoding"; - this.toolStripEncodingMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripEncodingMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripEncodingASCIIItem // + this.toolStripEncodingASCIIItem.BackColor = System.Drawing.SystemColors.Control; + this.toolStripEncodingASCIIItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripEncodingASCIIItem.Name = "toolStripEncodingASCIIItem"; this.toolStripEncodingASCIIItem.Size = new System.Drawing.Size(167, 26); this.toolStripEncodingASCIIItem.Tag = ""; this.toolStripEncodingASCIIItem.Text = "ASCII"; this.toolStripEncodingASCIIItem.Click += new System.EventHandler(this.OnASCIIToolStripMenuItemClick); - this.toolStripEncodingASCIIItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripEncodingASCIIItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripEncodingANSIItem // + this.toolStripEncodingANSIItem.BackColor = System.Drawing.SystemColors.Control; + this.toolStripEncodingANSIItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripEncodingANSIItem.Name = "toolStripEncodingANSIItem"; this.toolStripEncodingANSIItem.Size = new System.Drawing.Size(167, 26); this.toolStripEncodingANSIItem.Tag = ""; this.toolStripEncodingANSIItem.Text = "ANSI"; this.toolStripEncodingANSIItem.Click += new System.EventHandler(this.OnANSIToolStripMenuItemClick); - this.toolStripEncodingANSIItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripEncodingANSIItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripEncodingISO88591Item // + this.toolStripEncodingISO88591Item.BackColor = System.Drawing.SystemColors.Control; + this.toolStripEncodingISO88591Item.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripEncodingISO88591Item.Name = "toolStripEncodingISO88591Item"; this.toolStripEncodingISO88591Item.Size = new System.Drawing.Size(167, 26); this.toolStripEncodingISO88591Item.Text = "ISO-8859-1"; this.toolStripEncodingISO88591Item.Click += new System.EventHandler(this.OnISO88591ToolStripMenuItemClick); - this.toolStripEncodingISO88591Item.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripEncodingISO88591Item.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripEncodingUTF8Item // + this.toolStripEncodingUTF8Item.BackColor = System.Drawing.SystemColors.Control; + this.toolStripEncodingUTF8Item.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripEncodingUTF8Item.Name = "toolStripEncodingUTF8Item"; this.toolStripEncodingUTF8Item.Size = new System.Drawing.Size(167, 26); this.toolStripEncodingUTF8Item.Text = "UTF8"; this.toolStripEncodingUTF8Item.Click += new System.EventHandler(this.OnUTF8ToolStripMenuItemClick); - this.toolStripEncodingUTF8Item.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripEncodingUTF8Item.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripEncodingUTF16Item // + this.toolStripEncodingUTF16Item.BackColor = System.Drawing.SystemColors.Control; + this.toolStripEncodingUTF16Item.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripEncodingUTF16Item.Name = "toolStripEncodingUTF16Item"; this.toolStripEncodingUTF16Item.Size = new System.Drawing.Size(167, 26); this.toolStripEncodingUTF16Item.Text = "Unicode"; this.toolStripEncodingUTF16Item.Click += new System.EventHandler(this.OnUTF16ToolStripMenuItemClick); - this.toolStripEncodingUTF16Item.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripEncodingUTF16Item.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator4 // + this.toolStripSeparator4.BackColor = System.Drawing.SystemColors.Control; + this.toolStripSeparator4.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Size = new System.Drawing.Size(218, 6); - this.toolStripSeparator4.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripSeparator4.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // timeshiftToolStripMenuItem // + this.timeshiftToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.timeshiftToolStripMenuItem.CheckOnClick = true; + this.timeshiftToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.timeshiftToolStripMenuItem.Name = "timeshiftToolStripMenuItem"; this.timeshiftToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.timeshiftToolStripMenuItem.Text = "Timeshift"; this.timeshiftToolStripMenuItem.ToolTipText = "If supported by the columnizer, you can set an offset to the displayed log time"; this.timeshiftToolStripMenuItem.CheckStateChanged += new System.EventHandler(this.OnTimeShiftToolStripMenuItemCheckStateChanged); - this.timeshiftToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.timeshiftToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // timeshiftMenuTextBox // + this.timeshiftMenuTextBox.BackColor = System.Drawing.SystemColors.Control; this.timeshiftMenuTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.timeshiftMenuTextBox.Enabled = false; this.timeshiftMenuTextBox.Font = new System.Drawing.Font("Segoe UI", 9F); + this.timeshiftMenuTextBox.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.timeshiftMenuTextBox.Name = "timeshiftMenuTextBox"; this.timeshiftMenuTextBox.Size = new System.Drawing.Size(100, 27); this.timeshiftMenuTextBox.Text = "+00:00:00.000"; @@ -642,24 +644,25 @@ private void InitializeComponent() // // toolStripSeparator3 // + this.toolStripSeparator3.BackColor = System.Drawing.SystemColors.Control; + this.toolStripSeparator3.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Size = new System.Drawing.Size(218, 6); - this.toolStripSeparator3.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripSeparator3.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // copyMarkedLinesIntoNewTabToolStripMenuItem // + this.copyMarkedLinesIntoNewTabToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.copyMarkedLinesIntoNewTabToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.copyMarkedLinesIntoNewTabToolStripMenuItem.Name = "copyMarkedLinesIntoNewTabToolStripMenuItem"; this.copyMarkedLinesIntoNewTabToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); this.copyMarkedLinesIntoNewTabToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.copyMarkedLinesIntoNewTabToolStripMenuItem.Text = "Copy to Tab"; this.copyMarkedLinesIntoNewTabToolStripMenuItem.ToolTipText = "Copies all selected lines into a new tab page"; this.copyMarkedLinesIntoNewTabToolStripMenuItem.Click += new System.EventHandler(this.OnCopyMarkedLinesIntoNewTabToolStripMenuItemClick); - this.copyMarkedLinesIntoNewTabToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.copyMarkedLinesIntoNewTabToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // optionToolStripMenuItem // + this.optionToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.optionToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.columnizerToolStripMenuItem, this.hilightingToolStripMenuItem1, @@ -670,104 +673,103 @@ private void InitializeComponent() this.hideLineColumnToolStripMenuItem, this.toolStripSeparator19, this.lockInstanceToolStripMenuItem}); + this.optionToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.optionToolStripMenuItem.Name = "optionToolStripMenuItem"; this.optionToolStripMenuItem.Size = new System.Drawing.Size(75, 24); this.optionToolStripMenuItem.Text = "Options"; this.optionToolStripMenuItem.DropDownOpening += new System.EventHandler(this.OnOptionToolStripMenuItemDropDownOpening); - this.optionToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.optionToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // columnizerToolStripMenuItem // + this.columnizerToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.columnizerToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.columnizerToolStripMenuItem.Name = "columnizerToolStripMenuItem"; this.columnizerToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.columnizerToolStripMenuItem.Text = "Columnizer..."; this.columnizerToolStripMenuItem.ToolTipText = "Splits various kinds of logfiles into fixed columns"; this.columnizerToolStripMenuItem.Click += new System.EventHandler(this.OnSelectFilterToolStripMenuItemClick); - this.columnizerToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.columnizerToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // hilightingToolStripMenuItem1 // + this.hilightingToolStripMenuItem1.BackColor = System.Drawing.SystemColors.Control; + this.hilightingToolStripMenuItem1.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.hilightingToolStripMenuItem1.Name = "hilightingToolStripMenuItem1"; this.hilightingToolStripMenuItem1.Size = new System.Drawing.Size(268, 26); this.hilightingToolStripMenuItem1.Text = "Highlighting and triggers..."; this.hilightingToolStripMenuItem1.Click += new System.EventHandler(this.OnHighlightingToolStripMenuItemClick); - this.hilightingToolStripMenuItem1.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.hilightingToolStripMenuItem1.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // settingsToolStripMenuItem // + this.settingsToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.settingsToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; this.settingsToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.settingsToolStripMenuItem.Text = "Settings..."; this.settingsToolStripMenuItem.Click += new System.EventHandler(this.OnSettingsToolStripMenuItemClick); - this.settingsToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.settingsToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator6 // + this.toolStripSeparator6.BackColor = System.Drawing.SystemColors.Control; + this.toolStripSeparator6.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Size = new System.Drawing.Size(265, 6); - this.toolStripSeparator6.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripSeparator6.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // cellSelectModeToolStripMenuItem // + this.cellSelectModeToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.cellSelectModeToolStripMenuItem.CheckOnClick = true; + this.cellSelectModeToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.cellSelectModeToolStripMenuItem.Name = "cellSelectModeToolStripMenuItem"; this.cellSelectModeToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.cellSelectModeToolStripMenuItem.Text = "Cell select mode"; this.cellSelectModeToolStripMenuItem.ToolTipText = "Switches between foll row selection and single cell selection mode"; this.cellSelectModeToolStripMenuItem.Click += new System.EventHandler(this.OnCellSelectModeToolStripMenuItemClick); - this.cellSelectModeToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.cellSelectModeToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // alwaysOnTopToolStripMenuItem // + this.alwaysOnTopToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.alwaysOnTopToolStripMenuItem.CheckOnClick = true; + this.alwaysOnTopToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.alwaysOnTopToolStripMenuItem.Name = "alwaysOnTopToolStripMenuItem"; this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.alwaysOnTopToolStripMenuItem.Text = "Always on top"; this.alwaysOnTopToolStripMenuItem.Click += new System.EventHandler(this.OnAlwaysOnTopToolStripMenuItemClick); - this.alwaysOnTopToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.alwaysOnTopToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // hideLineColumnToolStripMenuItem // + this.hideLineColumnToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.hideLineColumnToolStripMenuItem.CheckOnClick = true; + this.hideLineColumnToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.hideLineColumnToolStripMenuItem.Name = "hideLineColumnToolStripMenuItem"; this.hideLineColumnToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.hideLineColumnToolStripMenuItem.Text = "Hide line column"; this.hideLineColumnToolStripMenuItem.Click += new System.EventHandler(this.OnHideLineColumnToolStripMenuItemClick); - this.hideLineColumnToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.hideLineColumnToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator19 // + this.toolStripSeparator19.BackColor = System.Drawing.SystemColors.Control; + this.toolStripSeparator19.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripSeparator19.Name = "toolStripSeparator19"; this.toolStripSeparator19.Size = new System.Drawing.Size(265, 6); - this.toolStripSeparator19.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripSeparator19.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // lockInstanceToolStripMenuItem // + this.lockInstanceToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.lockInstanceToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.lockInstanceToolStripMenuItem.Name = "lockInstanceToolStripMenuItem"; this.lockInstanceToolStripMenuItem.Size = new System.Drawing.Size(268, 26); this.lockInstanceToolStripMenuItem.Text = "Lock instance"; this.lockInstanceToolStripMenuItem.ToolTipText = "When enabled all new launched LogExpert instances will redirect to this window"; this.lockInstanceToolStripMenuItem.Click += new System.EventHandler(this.OnLockInstanceToolStripMenuItemClick); - this.lockInstanceToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.lockInstanceToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolsToolStripMenuItem // + this.toolsToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.configureToolStripMenuItem, this.configureToolStripSeparator}); + this.toolsToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolsToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.toolsToolStripMenuItem.Size = new System.Drawing.Size(58, 24); this.toolsToolStripMenuItem.Text = "Tools"; this.toolsToolStripMenuItem.ToolTipText = "Launch external tools (configure in the settings)"; @@ -775,61 +777,63 @@ private void InitializeComponent() // // configureToolStripMenuItem // + this.configureToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.configureToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.configureToolStripMenuItem.Name = "configureToolStripMenuItem"; - this.configureToolStripMenuItem.Size = new System.Drawing.Size(166, 26); + this.configureToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.configureToolStripMenuItem.Text = "Configure..."; - this.configureToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.configureToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; this.configureToolStripMenuItem.Click += new System.EventHandler(this.OnConfigureToolStripMenuItemClick); // // configureToolStripSeparator // + this.configureToolStripSeparator.BackColor = System.Drawing.SystemColors.Control; + this.configureToolStripSeparator.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.configureToolStripSeparator.Name = "configureToolStripSeparator"; - this.configureToolStripSeparator.Size = new System.Drawing.Size(163, 6); - this.configureToolStripSeparator.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.configureToolStripSeparator.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.configureToolStripSeparator.Size = new System.Drawing.Size(221, 6); + // // helpToolStripMenuItem // + this.helpToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.showHelpToolStripMenuItem, this.toolStripSeparator5, this.aboutToolStripMenuItem}); + this.helpToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; this.helpToolStripMenuItem.Size = new System.Drawing.Size(55, 24); this.helpToolStripMenuItem.Text = "Help"; - this.helpToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.helpToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // showHelpToolStripMenuItem // + this.showHelpToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.showHelpToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.showHelpToolStripMenuItem.Name = "showHelpToolStripMenuItem"; this.showHelpToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1; this.showHelpToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.showHelpToolStripMenuItem.Text = "Show help"; this.showHelpToolStripMenuItem.Click += new System.EventHandler(this.OnShowHelpToolStripMenuItemClick); - this.showHelpToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.showHelpToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator5 // + this.toolStripSeparator5.BackColor = System.Drawing.SystemColors.Control; + this.toolStripSeparator5.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Size = new System.Drawing.Size(182, 6); - this.toolStripSeparator5.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripSeparator5.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // aboutToolStripMenuItem // + this.aboutToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.aboutToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; this.aboutToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.aboutToolStripMenuItem.Text = "About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.OnAboutToolStripMenuItemClick); - this.aboutToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.aboutToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // debugToolStripMenuItem // this.debugToolStripMenuItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.debugToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.debugToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.dumpLogBufferInfoToolStripMenuItem, this.dumpBufferDiagnosticToolStripMenuItem, @@ -842,139 +846,138 @@ private void InitializeComponent() this.toolStripSeparator12, this.loglevelToolStripMenuItem, this.disableWordHighlightModeToolStripMenuItem}); + this.debugToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.debugToolStripMenuItem.Name = "debugToolStripMenuItem"; this.debugToolStripMenuItem.Size = new System.Drawing.Size(68, 24); this.debugToolStripMenuItem.Text = "Debug"; - this.debugToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.debugToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // dumpLogBufferInfoToolStripMenuItem // + this.dumpLogBufferInfoToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.dumpLogBufferInfoToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.dumpLogBufferInfoToolStripMenuItem.Name = "dumpLogBufferInfoToolStripMenuItem"; this.dumpLogBufferInfoToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.dumpLogBufferInfoToolStripMenuItem.Text = "Dump LogBuffer info"; this.dumpLogBufferInfoToolStripMenuItem.Click += new System.EventHandler(this.OnDumpLogBufferInfoToolStripMenuItemClick); - this.dumpLogBufferInfoToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.dumpLogBufferInfoToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // dumpBufferDiagnosticToolStripMenuItem // + this.dumpBufferDiagnosticToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.dumpBufferDiagnosticToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.dumpBufferDiagnosticToolStripMenuItem.Name = "dumpBufferDiagnosticToolStripMenuItem"; this.dumpBufferDiagnosticToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.dumpBufferDiagnosticToolStripMenuItem.Text = "Dump buffer diagnostic"; this.dumpBufferDiagnosticToolStripMenuItem.Click += new System.EventHandler(this.OnDumpBufferDiagnosticToolStripMenuItemClick); - this.dumpBufferDiagnosticToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.dumpBufferDiagnosticToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // runGCToolStripMenuItem // + this.runGCToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.runGCToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.runGCToolStripMenuItem.Name = "runGCToolStripMenuItem"; this.runGCToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.runGCToolStripMenuItem.Text = "Run GC"; this.runGCToolStripMenuItem.Click += new System.EventHandler(this.OnRunGCToolStripMenuItemClick); - this.runGCToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.runGCToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // gCInfoToolStripMenuItem // + this.gCInfoToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.gCInfoToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.gCInfoToolStripMenuItem.Name = "gCInfoToolStripMenuItem"; this.gCInfoToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.gCInfoToolStripMenuItem.Text = "Dump GC info"; this.gCInfoToolStripMenuItem.Click += new System.EventHandler(this.OnGCInfoToolStripMenuItemClick); - this.gCInfoToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.gCInfoToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator18 // + this.toolStripSeparator18.BackColor = System.Drawing.SystemColors.Control; + this.toolStripSeparator18.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripSeparator18.Name = "toolStripSeparator18"; this.toolStripSeparator18.Size = new System.Drawing.Size(339, 6); - this.toolStripSeparator18.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripSeparator18.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // throwExceptionGUIThreadToolStripMenuItem // + this.throwExceptionGUIThreadToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.throwExceptionGUIThreadToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.throwExceptionGUIThreadToolStripMenuItem.Name = "throwExceptionGUIThreadToolStripMenuItem"; this.throwExceptionGUIThreadToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.throwExceptionGUIThreadToolStripMenuItem.Text = "Throw exception (GUI Thread)"; this.throwExceptionGUIThreadToolStripMenuItem.Click += new System.EventHandler(this.OnThrowExceptionGUIThreadToolStripMenuItemClick); - this.throwExceptionGUIThreadToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.throwExceptionGUIThreadToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // throwExceptionbackgroundThToolStripMenuItem // + this.throwExceptionbackgroundThToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.throwExceptionbackgroundThToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.throwExceptionbackgroundThToolStripMenuItem.Name = "throwExceptionbackgroundThToolStripMenuItem"; this.throwExceptionbackgroundThToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.throwExceptionbackgroundThToolStripMenuItem.Text = "Throw exception (Async delegate)"; this.throwExceptionbackgroundThToolStripMenuItem.Click += new System.EventHandler(this.OnThrowExceptionBackgroundThToolStripMenuItemClick); - this.throwExceptionbackgroundThToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.throwExceptionbackgroundThToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // throwExceptionBackgroundThreadToolStripMenuItem // + this.throwExceptionBackgroundThreadToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.throwExceptionBackgroundThreadToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.throwExceptionBackgroundThreadToolStripMenuItem.Name = "throwExceptionBackgroundThreadToolStripMenuItem"; this.throwExceptionBackgroundThreadToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.throwExceptionBackgroundThreadToolStripMenuItem.Text = "Throw exception (background thread)"; this.throwExceptionBackgroundThreadToolStripMenuItem.Click += new System.EventHandler(this.OnThrowExceptionBackgroundThreadToolStripMenuItemClick); - this.throwExceptionBackgroundThreadToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.throwExceptionBackgroundThreadToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // toolStripSeparator12 // + this.toolStripSeparator12.BackColor = System.Drawing.SystemColors.Control; + this.toolStripSeparator12.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripSeparator12.Name = "toolStripSeparator12"; this.toolStripSeparator12.Size = new System.Drawing.Size(339, 6); - this.toolStripSeparator12.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.toolStripSeparator12.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // loglevelToolStripMenuItem // + this.loglevelToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.loglevelToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.warnToolStripMenuItem, this.infoToolStripMenuItem, this.debugToolStripMenuItem1}); + this.loglevelToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.loglevelToolStripMenuItem.Name = "loglevelToolStripMenuItem"; this.loglevelToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.loglevelToolStripMenuItem.Text = "Loglevel"; this.loglevelToolStripMenuItem.DropDownOpening += new System.EventHandler(this.OnLogLevelToolStripMenuItemDropDownOpening); this.loglevelToolStripMenuItem.Click += new System.EventHandler(this.OnLogLevelToolStripMenuItemClick); - this.loglevelToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.loglevelToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // warnToolStripMenuItem // + this.warnToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.warnToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.warnToolStripMenuItem.Name = "warnToolStripMenuItem"; this.warnToolStripMenuItem.Size = new System.Drawing.Size(137, 26); this.warnToolStripMenuItem.Text = "Warn"; this.warnToolStripMenuItem.Click += new System.EventHandler(this.OnWarnToolStripMenuItemClick); - this.warnToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.warnToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // infoToolStripMenuItem // + this.infoToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.infoToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.infoToolStripMenuItem.Name = "infoToolStripMenuItem"; this.infoToolStripMenuItem.Size = new System.Drawing.Size(137, 26); this.infoToolStripMenuItem.Text = "Info"; this.infoToolStripMenuItem.Click += new System.EventHandler(this.OnInfoToolStripMenuItemClick); - this.infoToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.infoToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // debugToolStripMenuItem1 // + this.debugToolStripMenuItem1.BackColor = System.Drawing.SystemColors.Control; + this.debugToolStripMenuItem1.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.debugToolStripMenuItem1.Name = "debugToolStripMenuItem1"; this.debugToolStripMenuItem1.Size = new System.Drawing.Size(137, 26); this.debugToolStripMenuItem1.Text = "Debug"; this.debugToolStripMenuItem1.Click += new System.EventHandler(this.OnDebugToolStripMenuItemClick); - this.debugToolStripMenuItem1.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.debugToolStripMenuItem1.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // disableWordHighlightModeToolStripMenuItem // + this.disableWordHighlightModeToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.disableWordHighlightModeToolStripMenuItem.CheckOnClick = true; + this.disableWordHighlightModeToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.disableWordHighlightModeToolStripMenuItem.Name = "disableWordHighlightModeToolStripMenuItem"; this.disableWordHighlightModeToolStripMenuItem.Size = new System.Drawing.Size(342, 26); this.disableWordHighlightModeToolStripMenuItem.Text = "Disable word highlight mode"; this.disableWordHighlightModeToolStripMenuItem.Click += new System.EventHandler(this.OnDisableWordHighlightModeToolStripMenuItemClick); - this.disableWordHighlightModeToolStripMenuItem.ForeColor = LogExpert.Interface.ColorMode.foreColor; - this.disableWordHighlightModeToolStripMenuItem.BackColor = LogExpert.Interface.ColorMode.backgroundColor; // // host // @@ -998,18 +1001,18 @@ private void InitializeComponent() // // toolStripContainer.ContentPanel // - this.toolStripContainer.ContentPanel.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.toolStripContainer.ContentPanel.BackColor = System.Drawing.SystemColors.Control; this.toolStripContainer.ContentPanel.Controls.Add(this.dockPanel); - this.toolStripContainer.ContentPanel.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripContainer.ContentPanel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripContainer.ContentPanel.Margin = new System.Windows.Forms.Padding(0); this.toolStripContainer.ContentPanel.Size = new System.Drawing.Size(1283, 564); this.toolStripContainer.Dock = System.Windows.Forms.DockStyle.Fill; // // toolStripContainer.LeftToolStripPanel // - this.toolStripContainer.LeftToolStripPanel.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.toolStripContainer.LeftToolStripPanel.BackColor = System.Drawing.SystemColors.Control; this.toolStripContainer.LeftToolStripPanel.Enabled = false; - this.toolStripContainer.LeftToolStripPanel.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripContainer.LeftToolStripPanel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripContainer.LeftToolStripPanelVisible = false; this.toolStripContainer.Location = new System.Drawing.Point(0, 0); this.toolStripContainer.Margin = new System.Windows.Forms.Padding(0); @@ -1017,9 +1020,9 @@ private void InitializeComponent() // // toolStripContainer.RightToolStripPanel // - this.toolStripContainer.RightToolStripPanel.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.toolStripContainer.RightToolStripPanel.BackColor = System.Drawing.SystemColors.Control; this.toolStripContainer.RightToolStripPanel.Enabled = false; - this.toolStripContainer.RightToolStripPanel.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripContainer.RightToolStripPanel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripContainer.RightToolStripPanelVisible = false; this.toolStripContainer.Size = new System.Drawing.Size(1283, 623); this.toolStripContainer.TabIndex = 13; @@ -1027,21 +1030,21 @@ private void InitializeComponent() // // toolStripContainer.TopToolStripPanel // - this.toolStripContainer.TopToolStripPanel.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.toolStripContainer.TopToolStripPanel.BackColor = System.Drawing.SystemColors.Control; this.toolStripContainer.TopToolStripPanel.Controls.Add(this.buttonToolStrip); this.toolStripContainer.TopToolStripPanel.Controls.Add(this.mainMenuStrip); this.toolStripContainer.TopToolStripPanel.Controls.Add(this.externalToolsToolStrip); - this.toolStripContainer.TopToolStripPanel.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.toolStripContainer.TopToolStripPanel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; // // dockPanel // this.dockPanel.ActiveAutoHideContent = null; - this.dockPanel.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.dockPanel.BackColor = System.Drawing.SystemColors.Control; this.dockPanel.DefaultFloatWindowSize = new System.Drawing.Size(600, 400); this.dockPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.dockPanel.DockBackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.dockPanel.DockBackColor = System.Drawing.SystemColors.Control; this.dockPanel.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow; - this.dockPanel.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.dockPanel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.dockPanel.Location = new System.Drawing.Point(0, 0); this.dockPanel.Margin = new System.Windows.Forms.Padding(0); this.dockPanel.Name = "dockPanel"; @@ -1052,12 +1055,12 @@ private void InitializeComponent() autoHideStripSkin1.DockStripGradient = dockPanelGradient1; tabGradient1.EndColor = System.Drawing.SystemColors.Control; tabGradient1.StartColor = System.Drawing.SystemColors.Control; - tabGradient1.TextColor = LogExpert.Interface.ColorMode.backgroundColor; + tabGradient1.TextColor = System.Drawing.SystemColors.Control; autoHideStripSkin1.TabGradient = tabGradient1; autoHideStripSkin1.TextFont = new System.Drawing.Font("Segoe UI", 9F); dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; - tabGradient2.EndColor = LogExpert.Interface.ColorMode.foreColor; - tabGradient2.StartColor = LogExpert.Interface.ColorMode.foreColor; + tabGradient2.EndColor = System.Drawing.SystemColors.ControlDarkDark; + tabGradient2.StartColor = System.Drawing.SystemColors.ControlDarkDark; tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; dockPaneStripGradient1.ActiveTabGradient = tabGradient2; dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; @@ -1088,7 +1091,7 @@ private void InitializeComponent() dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6; tabGradient7.EndColor = System.Drawing.Color.Transparent; tabGradient7.StartColor = System.Drawing.Color.Transparent; - tabGradient7.TextColor = LogExpert.Interface.ColorMode.backgroundColor; + tabGradient7.TextColor = System.Drawing.SystemColors.Control; dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7; dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1; dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; @@ -1099,7 +1102,7 @@ private void InitializeComponent() // buttonToolStrip // this.buttonToolStrip.AllowMerge = false; - this.buttonToolStrip.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.buttonToolStrip.BackColor = System.Drawing.SystemColors.Control; this.buttonToolStrip.Dock = System.Windows.Forms.DockStyle.None; this.buttonToolStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.buttonToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1368,11 +1371,11 @@ private void InitializeComponent() // dragControlDateTime // this.dragControlDateTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.dragControlDateTime.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.dragControlDateTime.BackColor = System.Drawing.SystemColors.Control; this.dragControlDateTime.DateTime = new System.DateTime(((long)(0))); this.dragControlDateTime.DragOrientation = LogExpert.Dialogs.DateTimeDragControl.DragOrientations.Vertical; this.dragControlDateTime.Font = new System.Drawing.Font("Courier New", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.dragControlDateTime.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.dragControlDateTime.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.dragControlDateTime.HoverColor = System.Drawing.Color.LightGray; this.dragControlDateTime.Location = new System.Drawing.Point(814, 626); this.dragControlDateTime.Margin = new System.Windows.Forms.Padding(0); @@ -1389,14 +1392,14 @@ private void InitializeComponent() this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.BackColor = System.Drawing.SystemColors.Control; this.ClientSize = new System.Drawing.Size(1283, 651); this.Controls.Add(this.checkBoxFollowTail); this.Controls.Add(this.dragControlDateTime); this.Controls.Add(this.toolStripContainer); this.Controls.Add(this.statusStrip); this.DoubleBuffered = true; - this.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.MainMenuStrip = this.mainMenuStrip; diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs index f28d150f..64730579 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs @@ -180,7 +180,7 @@ private void InitializeComponent() // // tableLayoutPanel1 // - this.tableLayoutPanel1.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.tableLayoutPanel1.BackColor = LogExpert.Config.ColorMode.backgroundColor; this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); @@ -189,7 +189,7 @@ private void InitializeComponent() this.tableLayoutPanel1.Controls.Add(this.dataGridView, 0, 1); this.tableLayoutPanel1.Controls.Add(this.timeSpreadingControl, 1, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.tableLayoutPanel1.ForeColor = LogExpert.Config.ColorMode.foreColor; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; @@ -237,7 +237,7 @@ private void InitializeComponent() this.dataGridView.AllowUserToDeleteRows = false; this.dataGridView.AllowUserToOrderColumns = true; this.dataGridView.AllowUserToResizeRows = false; - this.dataGridView.BackgroundColor = LogExpert.Interface.ColorMode.backgroundColor; + this.dataGridView.BackgroundColor = LogExpert.Config.ColorMode.backgroundColor; this.dataGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.dataGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText; @@ -700,8 +700,8 @@ private void InitializeComponent() this.filterGridView.AllowUserToDeleteRows = false; this.filterGridView.AllowUserToOrderColumns = true; this.filterGridView.AllowUserToResizeRows = false; - this.filterGridView.BackgroundColor = LogExpert.Interface.ColorMode.backgroundColor; - this.filterGridView.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.filterGridView.BackgroundColor = LogExpert.Config.ColorMode.backgroundColor; + this.filterGridView.ForeColor = LogExpert.Config.ColorMode.foreColor; this.filterGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.filterGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.filterGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText; @@ -903,15 +903,15 @@ private void InitializeComponent() // // filterSplitContainer.Panel1 // - this.filterSplitContainer.Panel1.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.filterSplitContainer.Panel1.BackColor = LogExpert.Config.ColorMode.backgroundColor; this.filterSplitContainer.Panel1.Controls.Add(this.lblTextFilter); this.filterSplitContainer.Panel1.Controls.Add(this.filterComboBox); - this.filterSplitContainer.Panel1.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.filterSplitContainer.Panel1.ForeColor = LogExpert.Config.ColorMode.foreColor; this.filterSplitContainer.Panel1MinSize = 200; // // filterSplitContainer.Panel2 // - this.filterSplitContainer.Panel2.BackColor = LogExpert.Interface.ColorMode.backgroundColor; + this.filterSplitContainer.Panel2.BackColor = LogExpert.Config.ColorMode.backgroundColor; this.filterSplitContainer.Panel2.Controls.Add(this.advancedButton); this.filterSplitContainer.Panel2.Controls.Add(this.syncFilterCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.lblFilterCount); @@ -919,7 +919,7 @@ private void InitializeComponent() this.filterSplitContainer.Panel2.Controls.Add(this.filterRegexCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.filterCaseSensitiveCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.filterSearchButton); - this.filterSplitContainer.Panel2.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.filterSplitContainer.Panel2.ForeColor = LogExpert.Config.ColorMode.foreColor; this.filterSplitContainer.Panel2MinSize = 550; this.filterSplitContainer.Size = new System.Drawing.Size(1007, 32); this.filterSplitContainer.SplitterDistance = 282; @@ -1191,8 +1191,8 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = LogExpert.Interface.ColorMode.backgroundColor; - this.ForeColor = LogExpert.Interface.ColorMode.foreColor; + this.BackColor = LogExpert.Config.ColorMode.backgroundColor; + this.ForeColor = LogExpert.Config.ColorMode.foreColor; this.ClientSize = new System.Drawing.Size(1014, 656); this.ControlBox = false; this.Controls.Add(this.splitContainerLogWindow); diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj index 50e0cf3b..45a51318 100644 --- a/src/LogExpert/LogExpert.csproj +++ b/src/LogExpert/LogExpert.csproj @@ -189,7 +189,7 @@ - + diff --git a/src/LogExpert/Program.cs b/src/LogExpert/Program.cs index 35c02cd1..73c610f2 100644 --- a/src/LogExpert/Program.cs +++ b/src/LogExpert/Program.cs @@ -98,7 +98,7 @@ private static void Sub_Main(string[] orgArgs) Settings settings = ConfigManager.Settings; Mutex mutex = new Mutex(false, "Local\\LogExpertInstanceMutex" + pId, out var isCreated); - LogExpert.Interface.ColorMode.LoadColorMode(); + LogExpert.Config.ColorMode.LoadColorMode(); if (isCreated) { From d3b758cfd3ae075cb2052a2282bb304de2e4e322 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 15:56:40 +0200 Subject: [PATCH 08/33] Change approach: update colors after initizalize --- .../Config/ExtendedToolStripSeparator.cs | 38 +++++++++++ .../Controls/LogTabWindow/LogTabWindow.cs | 66 ++++++++++++++++--- .../LogTabWindow/LogTabWindow.designer.cs | 46 ++++++------- src/LogExpert/LogExpert.csproj | 3 + 4 files changed, 121 insertions(+), 32 deletions(-) create mode 100644 src/LogExpert/Config/ExtendedToolStripSeparator.cs diff --git a/src/LogExpert/Config/ExtendedToolStripSeparator.cs b/src/LogExpert/Config/ExtendedToolStripSeparator.cs new file mode 100644 index 00000000..23981538 --- /dev/null +++ b/src/LogExpert/Config/ExtendedToolStripSeparator.cs @@ -0,0 +1,38 @@ +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.Config +{ + public class ExtendedToolStripSeparator : ToolStripSeparator + { + public ExtendedToolStripSeparator() + { + this.Paint += ExtendedToolStripSeparator_Paint; + } + + private void ExtendedToolStripSeparator_Paint(object sender, PaintEventArgs e) + { + // Get the separator's width and height. + ToolStripSeparator toolStripSeparator = (ToolStripSeparator)sender; + int width = toolStripSeparator.Width; + int height = toolStripSeparator.Height; + + // Choose the colors for drawing. + // I've used Color.White as the foreColor. + Color foreColor = Color.FromName(Config.ColorMode.foreColor.Name); + // Color.Teal as the backColor. + Color backColor = Color.FromName(Config.ColorMode.backgroundColor.Name); + + // Fill the background. + e.Graphics.FillRectangle(new SolidBrush(backColor), 0, 0, width, height); + + // Draw the line. + e.Graphics.DrawLine(new Pen(foreColor), 4, height / 2, width - 4, height / 2); + } + } +} diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index 6a6842ed..f230c191 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -73,6 +73,9 @@ public partial class LogTabWindow : Form public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNumbers) { InitializeComponent(); + + ChangeTheme(this.Controls); + _startupFileNames = fileNames; this._instanceNumber = instanceNumber; this._showInstanceNumbers = showInstanceNumbers; @@ -83,7 +86,7 @@ public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNum HilightGroupList = ConfigManager.Settings.hilightGroupList; Rectangle led = new Rectangle(0, 0, 8, 2); - + for (int i = 0; i < _leds.Length; ++i) { _leds[i] = led; @@ -97,27 +100,27 @@ public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNum _ledBrushes[2] = new SolidBrush(Color.FromArgb(255, 0, 220, 0)); _ledBrushes[3] = new SolidBrush(Color.FromArgb(255, 0, 220, 0)); _ledBrushes[4] = new SolidBrush(Color.FromArgb(255, 0, 220, 0)); - + _offLedBrush = new SolidBrush(Color.FromArgb(grayAlpha, 160, 160, 160)); - + _dirtyLedBrush = new SolidBrush(Color.FromArgb(255, 220, 0, 00)); - + _tailLedBrush[0] = new SolidBrush(Color.FromArgb(255, 50, 100, 250)); // Follow tail: blue-ish _tailLedBrush[1] = new SolidBrush(Color.FromArgb(grayAlpha, 160, 160, 160)); // Don't follow tail: gray _tailLedBrush[2] = new SolidBrush(Color.FromArgb(255, 220, 220, 0)); // Stop follow tail (trigger): yellow-ish - + _syncLedBrush = new SolidBrush(Color.FromArgb(255, 250, 145, 30)); - + CreateIcons(); - + _tabStringFormat.LineAlignment = StringAlignment.Center; _tabStringFormat.Alignment = StringAlignment.Near; ToolStripControlHost host = new ToolStripControlHost(checkBoxFollowTail); - + host.Padding = new Padding(20, 0, 0, 0); host.BackColor = Color.FromKnownColor(KnownColor.Transparent); - + int index = buttonToolStrip.Items.IndexOfKey("toolStripButtonTail"); toolStripEncodingASCIIItem.Text = Encoding.ASCII.HeaderName; @@ -151,6 +154,51 @@ public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNum #endregion + #region ColorTheme + public void ChangeTheme(Control.ControlCollection container) + { + + foreach (Control component in container) + { + if (component is MenuStrip) + { + var menu = (MenuStrip)component; + + foreach (ToolStripMenuItem item in menu.Items) + { + item.ForeColor = LogExpert.Config.ColorMode.foreColor; + item.BackColor = LogExpert.Config.ColorMode.backgroundColor; + + try + { + foreach (dynamic children in item.DropDownItems) + { + children.ForeColor = LogExpert.Config.ColorMode.foreColor; + children.BackColor = LogExpert.Config.ColorMode.backgroundColor; + } + } + catch + { + // Ignore + } + } + } + + if (component.Controls != null && component.Controls.Count > 0) + { + ChangeTheme(component.Controls); + component.BackColor = LogExpert.Config.ColorMode.backgroundColor; + component.ForeColor = LogExpert.Config.ColorMode.foreColor; + } + else + { + component.BackColor = LogExpert.Config.ColorMode.backgroundColor; + component.ForeColor = LogExpert.Config.ColorMode.foreColor; + } + } + } + #endregion + #region Delegates private delegate void AddFileTabsDelegate(string[] fileNames); diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index f35e142d..6ce6795a 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -1,4 +1,5 @@ using System.Windows.Forms; +using LogExpert.Config; using LogExpert.Dialogs; namespace LogExpert.Controls.LogTabWindow @@ -138,7 +139,7 @@ private void InitializeComponent() this.toolStripButtonBookmark = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonUp = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonDown = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator1 = new LogExpert.Config.ExtendedToolStripSeparator(); this.toolStripButtonBubbles = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButtonTail = new System.Windows.Forms.ToolStripButton(); @@ -170,7 +171,7 @@ private void InitializeComponent() // statusStrip // this.statusStrip.AutoSize = false; - this.statusStrip.BackColor = LogExpert.Config.ColorMode.backgroundColor; + this.statusStrip.BackColor = System.Drawing.SystemColors.Control; this.statusStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.labelLines, @@ -233,7 +234,7 @@ private void InitializeComponent() // mainMenuStrip // this.mainMenuStrip.AllowMerge = false; - this.mainMenuStrip.BackColor = LogExpert.Config.ColorMode.backgroundColor; + this.mainMenuStrip.BackColor = System.Drawing.SystemColors.Control; this.mainMenuStrip.Dock = System.Windows.Forms.DockStyle.None; this.mainMenuStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -252,7 +253,7 @@ private void InitializeComponent() // // fileToolStripMenuItem // - this.fileToolStripMenuItem.BackColor = LogExpert.Config.ColorMode.backgroundColor; + this.fileToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.openToolStripMenuItem, this.openURIToolStripMenuItem, @@ -268,7 +269,7 @@ private void InitializeComponent() this.toolStripSeparator14, this.lastUsedToolStripMenuItem, this.exitToolStripMenuItem}); - this.fileToolStripMenuItem.ForeColor = LogExpert.Config.ColorMode.foreColor; + this.fileToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24); this.fileToolStripMenuItem.Text = "File"; @@ -281,7 +282,7 @@ private void InitializeComponent() this.openToolStripMenuItem.Image = global::LogExpert.Properties.Resources.folder_blue; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(305, 26); + this.openToolStripMenuItem.Size = new System.Drawing.Size(309, 30); this.openToolStripMenuItem.Text = "Open..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.OnOpenToolStripMenuItemClick); // @@ -291,7 +292,7 @@ private void InitializeComponent() this.openURIToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.openURIToolStripMenuItem.Name = "openURIToolStripMenuItem"; this.openURIToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); - this.openURIToolStripMenuItem.Size = new System.Drawing.Size(305, 26); + this.openURIToolStripMenuItem.Size = new System.Drawing.Size(309, 30); this.openURIToolStripMenuItem.Text = "Open URL..."; this.openURIToolStripMenuItem.ToolTipText = "Opens a file by entering a URL which is supported by a file system plugin"; this.openURIToolStripMenuItem.Click += new System.EventHandler(this.OnOpenURIToolStripMenuItemClick); @@ -302,7 +303,7 @@ private void InitializeComponent() this.closeFileToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.closeFileToolStripMenuItem.Name = "closeFileToolStripMenuItem"; this.closeFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F4))); - this.closeFileToolStripMenuItem.Size = new System.Drawing.Size(305, 26); + this.closeFileToolStripMenuItem.Size = new System.Drawing.Size(309, 30); this.closeFileToolStripMenuItem.Text = "Close File"; this.closeFileToolStripMenuItem.Click += new System.EventHandler(this.OnCloseFileToolStripMenuItemClick); // @@ -312,7 +313,7 @@ private void InitializeComponent() this.reloadToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.reloadToolStripMenuItem.Name = "reloadToolStripMenuItem"; this.reloadToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; - this.reloadToolStripMenuItem.Size = new System.Drawing.Size(305, 26); + this.reloadToolStripMenuItem.Size = new System.Drawing.Size(309, 30); this.reloadToolStripMenuItem.Text = "Reload"; this.reloadToolStripMenuItem.Click += new System.EventHandler(this.OnReloadToolStripMenuItemClick); // @@ -322,7 +323,7 @@ private void InitializeComponent() this.newFromClipboardToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.newFromClipboardToolStripMenuItem.Name = "newFromClipboardToolStripMenuItem"; this.newFromClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.newFromClipboardToolStripMenuItem.Size = new System.Drawing.Size(305, 26); + this.newFromClipboardToolStripMenuItem.Size = new System.Drawing.Size(309, 30); this.newFromClipboardToolStripMenuItem.Text = "New tab from clipboard"; this.newFromClipboardToolStripMenuItem.ToolTipText = "Creates a new tab with content from clipboard"; this.newFromClipboardToolStripMenuItem.Click += new System.EventHandler(this.OnNewFromClipboardToolStripMenuItemClick); @@ -332,7 +333,7 @@ private void InitializeComponent() this.toolStripSeparator8.BackColor = System.Drawing.SystemColors.Control; this.toolStripSeparator8.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(302, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(306, 6); // // multiFileToolStripMenuItem // @@ -343,7 +344,7 @@ private void InitializeComponent() this.multifileMaskToolStripMenuItem}); this.multiFileToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.multiFileToolStripMenuItem.Name = "multiFileToolStripMenuItem"; - this.multiFileToolStripMenuItem.Size = new System.Drawing.Size(305, 26); + this.multiFileToolStripMenuItem.Size = new System.Drawing.Size(309, 30); this.multiFileToolStripMenuItem.Text = "MultiFile"; this.multiFileToolStripMenuItem.ToolTipText = "Treat multiple files as one large file (e.g. data.log, data.log.1, data.log.2,..." + ")"; @@ -371,14 +372,14 @@ private void InitializeComponent() // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(302, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(306, 6); // // loadProjectToolStripMenuItem // this.loadProjectToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.loadProjectToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.loadProjectToolStripMenuItem.Name = "loadProjectToolStripMenuItem"; - this.loadProjectToolStripMenuItem.Size = new System.Drawing.Size(305, 26); + this.loadProjectToolStripMenuItem.Size = new System.Drawing.Size(309, 30); this.loadProjectToolStripMenuItem.Text = "Load session..."; this.loadProjectToolStripMenuItem.ToolTipText = "Load a saved session (list of log files)"; this.loadProjectToolStripMenuItem.Click += new System.EventHandler(this.OnLoadProjectToolStripMenuItemClick); @@ -388,7 +389,7 @@ private void InitializeComponent() this.saveProjectToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.saveProjectToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.saveProjectToolStripMenuItem.Name = "saveProjectToolStripMenuItem"; - this.saveProjectToolStripMenuItem.Size = new System.Drawing.Size(305, 26); + this.saveProjectToolStripMenuItem.Size = new System.Drawing.Size(309, 30); this.saveProjectToolStripMenuItem.Text = "Save session..."; this.saveProjectToolStripMenuItem.ToolTipText = "Save a session (all open tabs)"; this.saveProjectToolStripMenuItem.Click += new System.EventHandler(this.OnSaveProjectToolStripMenuItemClick); @@ -398,7 +399,7 @@ private void InitializeComponent() this.exportBookmarksToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.exportBookmarksToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.exportBookmarksToolStripMenuItem.Name = "exportBookmarksToolStripMenuItem"; - this.exportBookmarksToolStripMenuItem.Size = new System.Drawing.Size(305, 26); + this.exportBookmarksToolStripMenuItem.Size = new System.Drawing.Size(309, 30); this.exportBookmarksToolStripMenuItem.Text = "Export bookmarks..."; this.exportBookmarksToolStripMenuItem.ToolTipText = "Write a list of bookmarks and their comments to a CSV file"; this.exportBookmarksToolStripMenuItem.Click += new System.EventHandler(this.OnExportBookmarksToolStripMenuItemClick); @@ -406,14 +407,14 @@ private void InitializeComponent() // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(302, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(306, 6); // // lastUsedToolStripMenuItem // this.lastUsedToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.lastUsedToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.lastUsedToolStripMenuItem.Name = "lastUsedToolStripMenuItem"; - this.lastUsedToolStripMenuItem.Size = new System.Drawing.Size(305, 26); + this.lastUsedToolStripMenuItem.Size = new System.Drawing.Size(309, 30); this.lastUsedToolStripMenuItem.Text = "Last used"; // // exitToolStripMenuItem @@ -422,7 +423,7 @@ private void InitializeComponent() this.exitToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(305, 26); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(309, 30); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.OnExitToolStripMenuItemClick); // @@ -780,7 +781,7 @@ private void InitializeComponent() this.configureToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.configureToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.configureToolStripMenuItem.Name = "configureToolStripMenuItem"; - this.configureToolStripMenuItem.Size = new System.Drawing.Size(224, 26); + this.configureToolStripMenuItem.Size = new System.Drawing.Size(166, 26); this.configureToolStripMenuItem.Text = "Configure..."; this.configureToolStripMenuItem.Click += new System.EventHandler(this.OnConfigureToolStripMenuItemClick); // @@ -789,8 +790,7 @@ private void InitializeComponent() this.configureToolStripSeparator.BackColor = System.Drawing.SystemColors.Control; this.configureToolStripSeparator.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.configureToolStripSeparator.Name = "configureToolStripSeparator"; - this.configureToolStripSeparator.Size = new System.Drawing.Size(221, 6); - + this.configureToolStripSeparator.Size = new System.Drawing.Size(163, 6); // // helpToolStripMenuItem // @@ -1488,7 +1488,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripButton toolStripButtonBookmark; private System.Windows.Forms.ToolStripButton toolStripButtonUp; private System.Windows.Forms.ToolStripButton toolStripButtonDown; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private CheckBox host; private CheckBox checkBoxFollowTail; private ToolStripButton toolStripButtonTail; @@ -1542,6 +1541,7 @@ private void InitializeComponent() private ToolStripMenuItem columnFinderToolStripMenuItem; private WeifenLuo.WinFormsUI.Docking.DockPanel dockPanel; private ToolStripMenuItem tabRenameToolStripMenuItem; + private ExtendedToolStripSeparator toolStripSeparator1; } } diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj index 45a51318..1c2cdb9d 100644 --- a/src/LogExpert/LogExpert.csproj +++ b/src/LogExpert/LogExpert.csproj @@ -77,6 +77,9 @@ + + Component + From 12df0bcf870e5edef1929d26a8671293d85b730f Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 16:01:32 +0200 Subject: [PATCH 09/33] Set title bar dark mode --- src/LogExpert/Config/ColorMode.cs | 24 +++++++++++-------- .../Config/ExtendedToolStripSeparator.cs | 4 ++-- .../Controls/LogTabWindow/LogTabWindow.cs | 20 +++++++++------- .../Controls/LogWindow/LogWindow.designer.cs | 22 ++++++++--------- src/LogExpert/Program.cs | 4 +--- 5 files changed, 39 insertions(+), 35 deletions(-) diff --git a/src/LogExpert/Config/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs index 0eccf4e4..3257a669 100644 --- a/src/LogExpert/Config/ColorMode.cs +++ b/src/LogExpert/Config/ColorMode.cs @@ -12,14 +12,16 @@ namespace LogExpert.Config public static class ColorMode { - public static System.Drawing.Color backgroundColor = System.Drawing.SystemColors.Control; - public static System.Drawing.Color foreColor = System.Drawing.SystemColors.ControlDarkDark; + public static System.Drawing.Color BackgroundColor = System.Drawing.SystemColors.Control; + public static System.Drawing.Color ForeColor = System.Drawing.SystemColors.ControlText; - private static System.Drawing.Color whiteBackgroundColor = System.Drawing.SystemColors.Control; - private static System.Drawing.Color whiteForeColor = System.Drawing.SystemColors.ControlDarkDark; + private static System.Drawing.Color WhiteBackgroundColor = System.Drawing.SystemColors.Control; + private static System.Drawing.Color WhiteForeColor = System.Drawing.SystemColors.ControlText; - private static System.Drawing.Color darkBackgroundColor = System.Drawing.SystemColors.ControlDarkDark; - private static System.Drawing.Color darkForeColor = System.Drawing.SystemColors.ControlLightLight; + private static System.Drawing.Color DarkBackgroundColor = System.Drawing.SystemColors.ControlDarkDark; + private static System.Drawing.Color DarkForeColor = System.Drawing.SystemColors.ControlLightLight; + + public static bool DarkModeEnabled = false; public static void LoadColorMode() { @@ -37,14 +39,16 @@ public static void LoadColorMode() private static void SetDarkMode() { - backgroundColor = darkBackgroundColor; - foreColor = darkForeColor; + BackgroundColor = DarkBackgroundColor; + ForeColor = DarkForeColor; + DarkModeEnabled = true; } private static void SetDefaultMode() { - backgroundColor = whiteBackgroundColor; - foreColor = whiteForeColor; + BackgroundColor = WhiteBackgroundColor; + ForeColor = WhiteForeColor; + DarkModeEnabled = false; } [DllImport("dwmapi.dll")] diff --git a/src/LogExpert/Config/ExtendedToolStripSeparator.cs b/src/LogExpert/Config/ExtendedToolStripSeparator.cs index 23981538..7b910780 100644 --- a/src/LogExpert/Config/ExtendedToolStripSeparator.cs +++ b/src/LogExpert/Config/ExtendedToolStripSeparator.cs @@ -24,9 +24,9 @@ private void ExtendedToolStripSeparator_Paint(object sender, PaintEventArgs e) // Choose the colors for drawing. // I've used Color.White as the foreColor. - Color foreColor = Color.FromName(Config.ColorMode.foreColor.Name); + Color foreColor = Color.FromName(Config.ColorMode.ForeColor.Name); // Color.Teal as the backColor. - Color backColor = Color.FromName(Config.ColorMode.backgroundColor.Name); + Color backColor = Color.FromName(Config.ColorMode.BackgroundColor.Name); // Fill the background. e.Graphics.FillRectangle(new SolidBrush(backColor), 0, 0, width, height); diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index f230c191..e4c91b3e 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -72,7 +72,7 @@ public partial class LogTabWindow : Form public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNumbers) { - InitializeComponent(); + InitializeComponent(); ChangeTheme(this.Controls); @@ -157,6 +157,8 @@ public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNum #region ColorTheme public void ChangeTheme(Control.ControlCollection container) { + LogExpert.Config.ColorMode.LoadColorMode(); + LogExpert.Config.ColorMode.UseImmersiveDarkMode(this.Handle, LogExpert.Config.ColorMode.DarkModeEnabled); foreach (Control component in container) { @@ -166,15 +168,15 @@ public void ChangeTheme(Control.ControlCollection container) foreach (ToolStripMenuItem item in menu.Items) { - item.ForeColor = LogExpert.Config.ColorMode.foreColor; - item.BackColor = LogExpert.Config.ColorMode.backgroundColor; + item.ForeColor = LogExpert.Config.ColorMode.ForeColor; + item.BackColor = LogExpert.Config.ColorMode.BackgroundColor; try { foreach (dynamic children in item.DropDownItems) { - children.ForeColor = LogExpert.Config.ColorMode.foreColor; - children.BackColor = LogExpert.Config.ColorMode.backgroundColor; + children.ForeColor = LogExpert.Config.ColorMode.ForeColor; + children.BackColor = LogExpert.Config.ColorMode.BackgroundColor; } } catch @@ -187,13 +189,13 @@ public void ChangeTheme(Control.ControlCollection container) if (component.Controls != null && component.Controls.Count > 0) { ChangeTheme(component.Controls); - component.BackColor = LogExpert.Config.ColorMode.backgroundColor; - component.ForeColor = LogExpert.Config.ColorMode.foreColor; + component.BackColor = LogExpert.Config.ColorMode.BackgroundColor; + component.ForeColor = LogExpert.Config.ColorMode.ForeColor; } else { - component.BackColor = LogExpert.Config.ColorMode.backgroundColor; - component.ForeColor = LogExpert.Config.ColorMode.foreColor; + component.BackColor = LogExpert.Config.ColorMode.BackgroundColor; + component.ForeColor = LogExpert.Config.ColorMode.ForeColor; } } } diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs index 64730579..2bf30271 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs @@ -180,7 +180,7 @@ private void InitializeComponent() // // tableLayoutPanel1 // - this.tableLayoutPanel1.BackColor = LogExpert.Config.ColorMode.backgroundColor; + this.tableLayoutPanel1.BackColor = LogExpert.Config.ColorMode.BackgroundColor; this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); @@ -189,7 +189,7 @@ private void InitializeComponent() this.tableLayoutPanel1.Controls.Add(this.dataGridView, 0, 1); this.tableLayoutPanel1.Controls.Add(this.timeSpreadingControl, 1, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.ForeColor = LogExpert.Config.ColorMode.foreColor; + this.tableLayoutPanel1.ForeColor = LogExpert.Config.ColorMode.ForeColor; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; @@ -237,7 +237,7 @@ private void InitializeComponent() this.dataGridView.AllowUserToDeleteRows = false; this.dataGridView.AllowUserToOrderColumns = true; this.dataGridView.AllowUserToResizeRows = false; - this.dataGridView.BackgroundColor = LogExpert.Config.ColorMode.backgroundColor; + this.dataGridView.BackgroundColor = LogExpert.Config.ColorMode.BackgroundColor; this.dataGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.dataGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText; @@ -700,8 +700,8 @@ private void InitializeComponent() this.filterGridView.AllowUserToDeleteRows = false; this.filterGridView.AllowUserToOrderColumns = true; this.filterGridView.AllowUserToResizeRows = false; - this.filterGridView.BackgroundColor = LogExpert.Config.ColorMode.backgroundColor; - this.filterGridView.ForeColor = LogExpert.Config.ColorMode.foreColor; + this.filterGridView.BackgroundColor = LogExpert.Config.ColorMode.BackgroundColor; + this.filterGridView.ForeColor = LogExpert.Config.ColorMode.ForeColor; this.filterGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.filterGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.filterGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText; @@ -903,15 +903,15 @@ private void InitializeComponent() // // filterSplitContainer.Panel1 // - this.filterSplitContainer.Panel1.BackColor = LogExpert.Config.ColorMode.backgroundColor; + this.filterSplitContainer.Panel1.BackColor = LogExpert.Config.ColorMode.BackgroundColor; this.filterSplitContainer.Panel1.Controls.Add(this.lblTextFilter); this.filterSplitContainer.Panel1.Controls.Add(this.filterComboBox); - this.filterSplitContainer.Panel1.ForeColor = LogExpert.Config.ColorMode.foreColor; + this.filterSplitContainer.Panel1.ForeColor = LogExpert.Config.ColorMode.ForeColor; this.filterSplitContainer.Panel1MinSize = 200; // // filterSplitContainer.Panel2 // - this.filterSplitContainer.Panel2.BackColor = LogExpert.Config.ColorMode.backgroundColor; + this.filterSplitContainer.Panel2.BackColor = LogExpert.Config.ColorMode.BackgroundColor; this.filterSplitContainer.Panel2.Controls.Add(this.advancedButton); this.filterSplitContainer.Panel2.Controls.Add(this.syncFilterCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.lblFilterCount); @@ -919,7 +919,7 @@ private void InitializeComponent() this.filterSplitContainer.Panel2.Controls.Add(this.filterRegexCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.filterCaseSensitiveCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.filterSearchButton); - this.filterSplitContainer.Panel2.ForeColor = LogExpert.Config.ColorMode.foreColor; + this.filterSplitContainer.Panel2.ForeColor = LogExpert.Config.ColorMode.ForeColor; this.filterSplitContainer.Panel2MinSize = 550; this.filterSplitContainer.Size = new System.Drawing.Size(1007, 32); this.filterSplitContainer.SplitterDistance = 282; @@ -1191,8 +1191,8 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = LogExpert.Config.ColorMode.backgroundColor; - this.ForeColor = LogExpert.Config.ColorMode.foreColor; + this.BackColor = LogExpert.Config.ColorMode.BackgroundColor; + this.ForeColor = LogExpert.Config.ColorMode.ForeColor; this.ClientSize = new System.Drawing.Size(1014, 656); this.ControlBox = false; this.Controls.Add(this.splitContainerLogWindow); diff --git a/src/LogExpert/Program.cs b/src/LogExpert/Program.cs index 73c610f2..91d80cd9 100644 --- a/src/LogExpert/Program.cs +++ b/src/LogExpert/Program.cs @@ -96,9 +96,7 @@ private static void Sub_Main(string[] orgArgs) try { Settings settings = ConfigManager.Settings; - Mutex mutex = new Mutex(false, "Local\\LogExpertInstanceMutex" + pId, out var isCreated); - - LogExpert.Config.ColorMode.LoadColorMode(); + Mutex mutex = new Mutex(false, "Local\\LogExpertInstanceMutex" + pId, out var isCreated); if (isCreated) { From f898e2a610fcc3332a54d2e2cee937ab39f1aa95 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 16:47:10 +0200 Subject: [PATCH 10/33] improve menus parsing --- src/LogExpert/Config/ColorMode.cs | 6 ++ ...oolStripSeparator.cs => FormsExtenders.cs} | 20 ++++++ .../Controls/LogTabWindow/LogTabWindow.cs | 68 +++++++++++++++---- .../LogTabWindow/LogTabWindow.designer.cs | 56 ++++++++------- src/LogExpert/LogExpert.csproj | 2 +- 5 files changed, 112 insertions(+), 40 deletions(-) rename src/LogExpert/Config/{ExtendedToolStripSeparator.cs => FormsExtenders.cs} (70%) diff --git a/src/LogExpert/Config/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs index 3257a669..b1bcc59d 100644 --- a/src/LogExpert/Config/ColorMode.cs +++ b/src/LogExpert/Config/ColorMode.cs @@ -15,11 +15,15 @@ public static class ColorMode public static System.Drawing.Color BackgroundColor = System.Drawing.SystemColors.Control; public static System.Drawing.Color ForeColor = System.Drawing.SystemColors.ControlText; + public static System.Drawing.Color MenuBackgroundColor = System.Drawing.SystemColors.ControlLight; + private static System.Drawing.Color WhiteBackgroundColor = System.Drawing.SystemColors.Control; private static System.Drawing.Color WhiteForeColor = System.Drawing.SystemColors.ControlText; + private static System.Drawing.Color WhiterBackgroundColor = System.Drawing.SystemColors.ControlLightLight; private static System.Drawing.Color DarkBackgroundColor = System.Drawing.SystemColors.ControlDarkDark; private static System.Drawing.Color DarkForeColor = System.Drawing.SystemColors.ControlLightLight; + private static System.Drawing.Color DarkerBackgroundColor = System.Drawing.SystemColors.InfoText; public static bool DarkModeEnabled = false; @@ -41,6 +45,7 @@ private static void SetDarkMode() { BackgroundColor = DarkBackgroundColor; ForeColor = DarkForeColor; + MenuBackgroundColor = DarkerBackgroundColor; DarkModeEnabled = true; } @@ -48,6 +53,7 @@ private static void SetDefaultMode() { BackgroundColor = WhiteBackgroundColor; ForeColor = WhiteForeColor; + MenuBackgroundColor = WhiterBackgroundColor; DarkModeEnabled = false; } diff --git a/src/LogExpert/Config/ExtendedToolStripSeparator.cs b/src/LogExpert/Config/FormsExtenders.cs similarity index 70% rename from src/LogExpert/Config/ExtendedToolStripSeparator.cs rename to src/LogExpert/Config/FormsExtenders.cs index 7b910780..76a5f597 100644 --- a/src/LogExpert/Config/ExtendedToolStripSeparator.cs +++ b/src/LogExpert/Config/FormsExtenders.cs @@ -35,4 +35,24 @@ private void ExtendedToolStripSeparator_Paint(object sender, PaintEventArgs e) e.Graphics.DrawLine(new Pen(foreColor), 4, height / 2, width - 4, height / 2); } } + + + public class ExtendedMenuItemRenderer : ToolStripProfessionalRenderer + { + public ExtendedMenuItemRenderer() : base(new MenuSelectedColors()) { } + } + + public class MenuSelectedColors : ProfessionalColorTable + { + public override Color MenuItemPressedGradientBegin + { + get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } + } + + public override Color MenuItemPressedGradientEnd + { + get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } + } + } + } diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index e4c91b3e..080553fb 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -160,8 +160,23 @@ public void ChangeTheme(Control.ControlCollection container) LogExpert.Config.ColorMode.LoadColorMode(); LogExpert.Config.ColorMode.UseImmersiveDarkMode(this.Handle, LogExpert.Config.ColorMode.DarkModeEnabled); + // Colors for selected menus + this.mainMenuStrip.Renderer = new LogExpert.Config.ExtendedMenuItemRenderer(); + foreach (Control component in container) { + if (component.Controls != null && component.Controls.Count > 0) + { + ChangeTheme(component.Controls); + component.BackColor = LogExpert.Config.ColorMode.BackgroundColor; + component.ForeColor = LogExpert.Config.ColorMode.ForeColor; + } + else + { + component.BackColor = LogExpert.Config.ColorMode.BackgroundColor; + component.ForeColor = LogExpert.Config.ColorMode.ForeColor; + } + if (component is MenuStrip) { var menu = (MenuStrip)component; @@ -173,30 +188,57 @@ public void ChangeTheme(Control.ControlCollection container) try { - foreach (dynamic children in item.DropDownItems) + for(var x = 0; x< item.DropDownItems.Count; x++) { + var children = item.DropDownItems[x]; children.ForeColor = LogExpert.Config.ColorMode.ForeColor; - children.BackColor = LogExpert.Config.ColorMode.BackgroundColor; + children.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; + + + if(children is ToolStripDropDownItem) { + + for (var y = 0; y < ((ToolStripDropDownItem)children).DropDownItems.Count; y++) + { + var subChildren = ((ToolStripDropDownItem)children).DropDownItems[y]; + subChildren.ForeColor = LogExpert.Config.ColorMode.ForeColor; + subChildren.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; + } + } } } - catch + catch (Exception ex) { - // Ignore + Console.WriteLine(ex.Message); } } } - if (component.Controls != null && component.Controls.Count > 0) + #region ContextMenuStripForTabs + // Does not seem to detect any ContextMenuStrip, it is used by the library WeifenLuo.WinFormsUI.Docking? + if (component is ContextMenuStrip) { - ChangeTheme(component.Controls); - component.BackColor = LogExpert.Config.ColorMode.BackgroundColor; - component.ForeColor = LogExpert.Config.ColorMode.ForeColor; - } - else - { - component.BackColor = LogExpert.Config.ColorMode.BackgroundColor; - component.ForeColor = LogExpert.Config.ColorMode.ForeColor; + var menu = (ContextMenuStrip)component; + + foreach (ToolStripMenuItem item in menu.Items) + { + item.ForeColor = LogExpert.Config.ColorMode.ForeColor; + item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; + + try + { + foreach (dynamic children in item.DropDownItems) + { + children.ForeColor = LogExpert.Config.ColorMode.ForeColor; + children.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; + } + } + catch + { + // Ignore + } + } } + #endregion ContextMenuStripForTabs } } #endregion diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index 6ce6795a..2143a3e8 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -62,15 +62,15 @@ private void InitializeComponent() this.closeFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.reloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.newFromClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator8 = new LogExpert.Config.ExtendedToolStripSeparator(); this.multiFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.multiFileEnabledStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.multifileMaskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator7 = new LogExpert.Config.ExtendedToolStripSeparator(); this.loadProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportBookmarksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator14 = new LogExpert.Config.ExtendedToolStripSeparator(); this.lastUsedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.viewNavigateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -83,45 +83,45 @@ private void InitializeComponent() this.jumpToPrevToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showBookmarkListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.columnFinderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator2 = new LogExpert.Config.ExtendedToolStripSeparator(); this.toolStripEncodingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingASCIIItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingANSIItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingISO88591Item = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingUTF8Item = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingUTF16Item = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator4 = new LogExpert.Config.ExtendedToolStripSeparator(); this.timeshiftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.timeshiftMenuTextBox = new System.Windows.Forms.ToolStripTextBox(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator3 = new LogExpert.Config.ExtendedToolStripSeparator(); this.copyMarkedLinesIntoNewTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.columnizerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.hilightingToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator6 = new LogExpert.Config.ExtendedToolStripSeparator(); this.cellSelectModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.alwaysOnTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.hideLineColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator19 = new LogExpert.Config.ExtendedToolStripSeparator(); this.lockInstanceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.configureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.configureToolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.configureToolStripSeparator = new LogExpert.Config.ExtendedToolStripSeparator(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showHelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator5 = new LogExpert.Config.ExtendedToolStripSeparator(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dumpLogBufferInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dumpBufferDiagnosticToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.runGCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.gCInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator18 = new LogExpert.Config.ExtendedToolStripSeparator(); this.throwExceptionGUIThreadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.throwExceptionbackgroundThToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.throwExceptionBackgroundThreadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator12 = new LogExpert.Config.ExtendedToolStripSeparator(); this.loglevelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.warnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.infoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -132,30 +132,30 @@ private void InitializeComponent() this.dockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel(); this.buttonToolStrip = new System.Windows.Forms.ToolStrip(); this.toolStripButtonOpen = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator10 = new LogExpert.Config.ExtendedToolStripSeparator(); this.toolStripButtonSearch = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonFilter = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator11 = new LogExpert.Config.ExtendedToolStripSeparator(); this.toolStripButtonBookmark = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonUp = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonDown = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new LogExpert.Config.ExtendedToolStripSeparator(); this.toolStripButtonBubbles = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator15 = new LogExpert.Config.ExtendedToolStripSeparator(); this.toolStripButtonTail = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator17 = new LogExpert.Config.ExtendedToolStripSeparator(); this.groupsComboBoxHighlightGroups = new System.Windows.Forms.ToolStripComboBox(); this.externalToolsToolStrip = new System.Windows.Forms.ToolStrip(); - this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator9 = new LogExpert.Config.ExtendedToolStripSeparator(); this.checkBoxFollowTail = new System.Windows.Forms.CheckBox(); this.tabContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.closeThisTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.closeOtherTabsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.closeAllTabsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator13 = new LogExpert.Config.ExtendedToolStripSeparator(); this.tabColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabRenameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator16 = new LogExpert.Config.ExtendedToolStripSeparator(); this.copyPathToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.findInExplorerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dragControlDateTime = new LogExpert.Dialogs.DateTimeDragControl(); @@ -1042,25 +1042,25 @@ private void InitializeComponent() this.dockPanel.BackColor = System.Drawing.SystemColors.Control; this.dockPanel.DefaultFloatWindowSize = new System.Drawing.Size(600, 400); this.dockPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.dockPanel.DockBackColor = System.Drawing.SystemColors.Control; + this.dockPanel.DockBackColor = LogExpert.Config.ColorMode.BackgroundColor; this.dockPanel.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow; - this.dockPanel.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.dockPanel.ForeColor = LogExpert.Config.ColorMode.BackgroundColor; this.dockPanel.Location = new System.Drawing.Point(0, 0); this.dockPanel.Margin = new System.Windows.Forms.Padding(0); this.dockPanel.Name = "dockPanel"; this.dockPanel.ShowDocumentIcon = true; this.dockPanel.Size = new System.Drawing.Size(1283, 564); - dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient1.EndColor = System.Drawing.SystemColors.Control; + dockPanelGradient1.StartColor = System.Drawing.SystemColors.Control; autoHideStripSkin1.DockStripGradient = dockPanelGradient1; tabGradient1.EndColor = System.Drawing.SystemColors.Control; tabGradient1.StartColor = System.Drawing.SystemColors.Control; - tabGradient1.TextColor = System.Drawing.SystemColors.Control; + tabGradient1.TextColor = System.Drawing.SystemColors.ControlText; autoHideStripSkin1.TabGradient = tabGradient1; autoHideStripSkin1.TextFont = new System.Drawing.Font("Segoe UI", 9F); dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; - tabGradient2.EndColor = System.Drawing.SystemColors.ControlDarkDark; - tabGradient2.StartColor = System.Drawing.SystemColors.ControlDarkDark; + tabGradient2.EndColor = System.Drawing.SystemColors.Control; + tabGradient2.StartColor = System.Drawing.SystemColors.Control; tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; dockPaneStripGradient1.ActiveTabGradient = tabGradient2; dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; @@ -1302,6 +1302,8 @@ private void InitializeComponent() this.findInExplorerToolStripMenuItem}); this.tabContextMenuStrip.Name = "tabContextMenuStrip"; this.tabContextMenuStrip.Size = new System.Drawing.Size(233, 184); + this.tabContextMenuStrip.ForeColor = LogExpert.Config.ColorMode.ForeColor; + this.tabContextMenuStrip.BackColor = LogExpert.Config.ColorMode.BackgroundColor; // // closeThisTabToolStripMenuItem // @@ -1309,6 +1311,8 @@ private void InitializeComponent() this.closeThisTabToolStripMenuItem.Size = new System.Drawing.Size(232, 24); this.closeThisTabToolStripMenuItem.Text = "Close this tab"; this.closeThisTabToolStripMenuItem.Click += new System.EventHandler(this.OnCloseThisTabToolStripMenuItemClick); + this.closeThisTabToolStripMenuItem.ForeColor = LogExpert.Config.ColorMode.ForeColor; + this.closeThisTabToolStripMenuItem.BackColor = LogExpert.Config.ColorMode.BackgroundColor; // // closeOtherTabsToolStripMenuItem // diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj index 1c2cdb9d..2d2916bc 100644 --- a/src/LogExpert/LogExpert.csproj +++ b/src/LogExpert/LogExpert.csproj @@ -77,7 +77,7 @@ - + Component From 346195744f5412f0dbf0ec37ddf588d99c0cf5a9 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 17:48:20 +0200 Subject: [PATCH 11/33] separate forms extensions and move to correct folder --- .../Controls/LogTabWindow/LogTabWindow.cs | 2 +- .../LogTabWindow/LogTabWindow.designer.cs | 51 ++++++++++--------- src/LogExpert/Extensions/MenuItemExtension.cs | 28 ++++++++++ .../ToolStripSeparatorExtenstion.cs} | 28 ++-------- 4 files changed, 59 insertions(+), 50 deletions(-) create mode 100644 src/LogExpert/Extensions/MenuItemExtension.cs rename src/LogExpert/{Config/FormsExtenders.cs => Extensions/ToolStripSeparatorExtenstion.cs} (62%) diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index 080553fb..aa08a441 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -161,7 +161,7 @@ public void ChangeTheme(Control.ControlCollection container) LogExpert.Config.ColorMode.UseImmersiveDarkMode(this.Handle, LogExpert.Config.ColorMode.DarkModeEnabled); // Colors for selected menus - this.mainMenuStrip.Renderer = new LogExpert.Config.ExtendedMenuItemRenderer(); + this.mainMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuItemRenderer(); foreach (Control component in container) { diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index 2143a3e8..fb15ab01 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -1,6 +1,7 @@ using System.Windows.Forms; using LogExpert.Config; using LogExpert.Dialogs; +using LogExpert.Extensions; namespace LogExpert.Controls.LogTabWindow { @@ -62,15 +63,15 @@ private void InitializeComponent() this.closeFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.reloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.newFromClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator8 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator8 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.multiFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.multiFileEnabledStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.multifileMaskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator7 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator7 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.loadProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportBookmarksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator14 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator14 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.lastUsedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.viewNavigateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -83,45 +84,45 @@ private void InitializeComponent() this.jumpToPrevToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showBookmarkListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.columnFinderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator2 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.toolStripEncodingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingASCIIItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingANSIItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingISO88591Item = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingUTF8Item = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingUTF16Item = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator4 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.timeshiftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.timeshiftMenuTextBox = new System.Windows.Forms.ToolStripTextBox(); - this.toolStripSeparator3 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator3 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.copyMarkedLinesIntoNewTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.columnizerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.hilightingToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator6 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator6 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.cellSelectModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.alwaysOnTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.hideLineColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator19 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator19 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.lockInstanceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.configureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.configureToolStripSeparator = new LogExpert.Config.ExtendedToolStripSeparator(); + this.configureToolStripSeparator = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showHelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator5 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dumpLogBufferInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dumpBufferDiagnosticToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.runGCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.gCInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator18 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator18 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.throwExceptionGUIThreadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.throwExceptionbackgroundThToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.throwExceptionBackgroundThreadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator12 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator12 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.loglevelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.warnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.infoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -132,30 +133,30 @@ private void InitializeComponent() this.dockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel(); this.buttonToolStrip = new System.Windows.Forms.ToolStrip(); this.toolStripButtonOpen = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator10 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator10 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.toolStripButtonSearch = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonFilter = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator11 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator11 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.toolStripButtonBookmark = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonUp = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonDown = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator1 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator1 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.toolStripButtonBubbles = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator15 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator15 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.toolStripButtonTail = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator17 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator17 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.groupsComboBoxHighlightGroups = new System.Windows.Forms.ToolStripComboBox(); this.externalToolsToolStrip = new System.Windows.Forms.ToolStrip(); - this.toolStripSeparator9 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator9 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.checkBoxFollowTail = new System.Windows.Forms.CheckBox(); this.tabContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.closeThisTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.closeOtherTabsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.closeAllTabsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator13 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator13 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.tabColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabRenameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator16 = new LogExpert.Config.ExtendedToolStripSeparator(); + this.toolStripSeparator16 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.copyPathToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.findInExplorerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dragControlDateTime = new LogExpert.Dialogs.DateTimeDragControl(); @@ -621,9 +622,9 @@ private void InitializeComponent() // // timeshiftToolStripMenuItem // - this.timeshiftToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.timeshiftToolStripMenuItem.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.timeshiftToolStripMenuItem.CheckOnClick = true; - this.timeshiftToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.timeshiftToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.timeshiftToolStripMenuItem.Name = "timeshiftToolStripMenuItem"; this.timeshiftToolStripMenuItem.Size = new System.Drawing.Size(221, 26); this.timeshiftToolStripMenuItem.Text = "Timeshift"; @@ -632,11 +633,11 @@ private void InitializeComponent() // // timeshiftMenuTextBox // - this.timeshiftMenuTextBox.BackColor = System.Drawing.SystemColors.Control; + this.timeshiftMenuTextBox.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.timeshiftMenuTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.timeshiftMenuTextBox.Enabled = false; this.timeshiftMenuTextBox.Font = new System.Drawing.Font("Segoe UI", 9F); - this.timeshiftMenuTextBox.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.timeshiftMenuTextBox.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.timeshiftMenuTextBox.Name = "timeshiftMenuTextBox"; this.timeshiftMenuTextBox.Size = new System.Drawing.Size(100, 27); this.timeshiftMenuTextBox.Text = "+00:00:00.000"; @@ -1545,7 +1546,7 @@ private void InitializeComponent() private ToolStripMenuItem columnFinderToolStripMenuItem; private WeifenLuo.WinFormsUI.Docking.DockPanel dockPanel; private ToolStripMenuItem tabRenameToolStripMenuItem; - private ExtendedToolStripSeparator toolStripSeparator1; + private ToolStripSeparatorExtension toolStripSeparator1; } } diff --git a/src/LogExpert/Extensions/MenuItemExtension.cs b/src/LogExpert/Extensions/MenuItemExtension.cs new file mode 100644 index 00000000..1b121fd8 --- /dev/null +++ b/src/LogExpert/Extensions/MenuItemExtension.cs @@ -0,0 +1,28 @@ +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 ExtendedMenuItemRenderer : ToolStripProfessionalRenderer + { + public ExtendedMenuItemRenderer() : base(new MenuSelectedColors()) { } + } + + public class MenuSelectedColors : ProfessionalColorTable + { + public override Color MenuItemPressedGradientBegin + { + get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } + } + + public override Color MenuItemPressedGradientEnd + { + get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } + } + } +} diff --git a/src/LogExpert/Config/FormsExtenders.cs b/src/LogExpert/Extensions/ToolStripSeparatorExtenstion.cs similarity index 62% rename from src/LogExpert/Config/FormsExtenders.cs rename to src/LogExpert/Extensions/ToolStripSeparatorExtenstion.cs index 76a5f597..2109d81a 100644 --- a/src/LogExpert/Config/FormsExtenders.cs +++ b/src/LogExpert/Extensions/ToolStripSeparatorExtenstion.cs @@ -6,11 +6,11 @@ using System.Threading.Tasks; using System.Windows.Forms; -namespace LogExpert.Config +namespace LogExpert.Extensions { - public class ExtendedToolStripSeparator : ToolStripSeparator + public class ToolStripSeparatorExtension : ToolStripSeparator { - public ExtendedToolStripSeparator() + public ToolStripSeparatorExtension() { this.Paint += ExtendedToolStripSeparator_Paint; } @@ -34,25 +34,5 @@ private void ExtendedToolStripSeparator_Paint(object sender, PaintEventArgs e) // Draw the line. e.Graphics.DrawLine(new Pen(foreColor), 4, height / 2, width - 4, height / 2); } - } - - - public class ExtendedMenuItemRenderer : ToolStripProfessionalRenderer - { - public ExtendedMenuItemRenderer() : base(new MenuSelectedColors()) { } - } - - public class MenuSelectedColors : ProfessionalColorTable - { - public override Color MenuItemPressedGradientBegin - { - get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } - } - - public override Color MenuItemPressedGradientEnd - { - get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } - } - } - + } } From c1386814bec5696a064c3721db3073dcdfcee410 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 17:48:38 +0200 Subject: [PATCH 12/33] update project file --- src/LogExpert/LogExpert.csproj | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj index 2d2916bc..0aec3102 100644 --- a/src/LogExpert/LogExpert.csproj +++ b/src/LogExpert/LogExpert.csproj @@ -77,9 +77,6 @@ - - Component - @@ -112,6 +109,10 @@ + + + Component + From a0407db6494fc13c0ac061778556fcfefba4f3fe Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 18:00:37 +0200 Subject: [PATCH 13/33] Apply dark / bright theme based on color palette --- src/LogExpert/Config/ColorMode.cs | 36 ++++++++++--------- .../ToolStripSeparatorExtenstion.cs | 4 +-- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/LogExpert/Config/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs index b1bcc59d..856d3052 100644 --- a/src/LogExpert/Config/ColorMode.cs +++ b/src/LogExpert/Config/ColorMode.cs @@ -7,23 +7,24 @@ namespace LogExpert.Config { - //LogExpert.Config.ColorMode.backgroundColor System.Drawing.SystemColors.ControlDarkDark - //LogExpert.Config.ColorMode.foreColor LogExpert.Config.ColorMode.foreColor - public static class ColorMode { + // Default public static System.Drawing.Color BackgroundColor = System.Drawing.SystemColors.Control; public static System.Drawing.Color ForeColor = System.Drawing.SystemColors.ControlText; + public static System.Drawing.Color MenuBackgroundColor = System.Drawing.SystemColors.ControlLight; - public static System.Drawing.Color MenuBackgroundColor = System.Drawing.SystemColors.ControlLight; - - private static System.Drawing.Color WhiteBackgroundColor = System.Drawing.SystemColors.Control; - private static System.Drawing.Color WhiteForeColor = System.Drawing.SystemColors.ControlText; - private static System.Drawing.Color WhiterBackgroundColor = System.Drawing.SystemColors.ControlLightLight; + // Bright Theme + // https://paletton.com/#uid=15-0u0k00sH00kJ0pq+00RL00RL + private static System.Drawing.Color BrightBackgroundColor = System.Drawing.Color.FromArgb(221, 221, 221); + private static System.Drawing.Color BrightForeColor = System.Drawing.Color.FromArgb(0,0,0); + private static System.Drawing.Color BrighterBackgroundColor = System.Drawing.Color.FromArgb(253, 253, 253); - private static System.Drawing.Color DarkBackgroundColor = System.Drawing.SystemColors.ControlDarkDark; - private static System.Drawing.Color DarkForeColor = System.Drawing.SystemColors.ControlLightLight; - private static System.Drawing.Color DarkerBackgroundColor = System.Drawing.SystemColors.InfoText; + // Dark Theme + // https://paletton.com/#uid=15-0u0k005U0670008J003Y003Y + private static System.Drawing.Color DarkBackgroundColor = System.Drawing.Color.FromArgb(45, 45, 45); + private static System.Drawing.Color DarkForeColor = System.Drawing.Color.FromArgb(255,255,255); + private static System.Drawing.Color DarkerBackgroundColor = System.Drawing.Color.FromArgb(30, 30, 30); public static bool DarkModeEnabled = false; @@ -37,7 +38,7 @@ public static void LoadColorMode() } else { - SetDefaultMode(); + SetBrightMode(); } } @@ -49,14 +50,15 @@ private static void SetDarkMode() DarkModeEnabled = true; } - private static void SetDefaultMode() + private static void SetBrightMode() { - BackgroundColor = WhiteBackgroundColor; - ForeColor = WhiteForeColor; - MenuBackgroundColor = WhiterBackgroundColor; + BackgroundColor = BrightBackgroundColor; + ForeColor = BrightForeColor; + MenuBackgroundColor = BrighterBackgroundColor; DarkModeEnabled = false; } + #region TitleBarDarkMode [DllImport("dwmapi.dll")] private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int attrValue, int attrSize); @@ -82,5 +84,7 @@ private static bool IsWindows10OrGreater(int build = -1) return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= build; } + #endregion TitleBarDarkMode + } } diff --git a/src/LogExpert/Extensions/ToolStripSeparatorExtenstion.cs b/src/LogExpert/Extensions/ToolStripSeparatorExtenstion.cs index 2109d81a..ba75495b 100644 --- a/src/LogExpert/Extensions/ToolStripSeparatorExtenstion.cs +++ b/src/LogExpert/Extensions/ToolStripSeparatorExtenstion.cs @@ -24,9 +24,9 @@ private void ExtendedToolStripSeparator_Paint(object sender, PaintEventArgs e) // Choose the colors for drawing. // I've used Color.White as the foreColor. - Color foreColor = Color.FromName(Config.ColorMode.ForeColor.Name); + Color foreColor = Config.ColorMode.ForeColor; // Color.Teal as the backColor. - Color backColor = Color.FromName(Config.ColorMode.BackgroundColor.Name); + Color backColor = Config.ColorMode.BackgroundColor; // Fill the background. e.Graphics.FillRectangle(new SolidBrush(backColor), 0, 0, width, height); From e2e98ea39fe72defdcbb60a0c9a709868776d502 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 20:19:34 +0200 Subject: [PATCH 14/33] Apply style to menu in datagrid --- src/LogExpert/Config/ColorMode.cs | 20 +++-- .../Controls/LogTabWindow/LogTabWindow.cs | 13 ++- .../LogTabWindow/LogTabWindow.designer.cs | 79 +++++++++---------- src/LogExpert/Controls/LogWindow/LogWindow.cs | 47 +++++++++++ .../Controls/LogWindow/LogWindow.designer.cs | 39 ++++----- src/LogExpert/Dialogs/BufferedDataGridView.cs | 24 +++++- .../Dialogs/SettingsDialog.Designer.cs | 6 +- src/LogExpert/Dialogs/SettingsDialog.resx | 18 ----- 8 files changed, 147 insertions(+), 99 deletions(-) diff --git a/src/LogExpert/Config/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs index 856d3052..f2f14053 100644 --- a/src/LogExpert/Config/ColorMode.cs +++ b/src/LogExpert/Config/ColorMode.cs @@ -9,22 +9,26 @@ namespace LogExpert.Config { public static class ColorMode { - // Default - public static System.Drawing.Color BackgroundColor = System.Drawing.SystemColors.Control; - public static System.Drawing.Color ForeColor = System.Drawing.SystemColors.ControlText; - public static System.Drawing.Color MenuBackgroundColor = System.Drawing.SystemColors.ControlLight; - // Bright Theme // https://paletton.com/#uid=15-0u0k00sH00kJ0pq+00RL00RL + private static System.Drawing.Color LessBrightBackgroundColor = System.Drawing.Color.FromArgb(208, 205, 206); private static System.Drawing.Color BrightBackgroundColor = System.Drawing.Color.FromArgb(221, 221, 221); - private static System.Drawing.Color BrightForeColor = System.Drawing.Color.FromArgb(0,0,0); private static System.Drawing.Color BrighterBackgroundColor = System.Drawing.Color.FromArgb(253, 253, 253); + private static System.Drawing.Color BrightForeColor = System.Drawing.Color.FromArgb(0,0,0); // Dark Theme // https://paletton.com/#uid=15-0u0k005U0670008J003Y003Y + private static System.Drawing.Color LessDarkBackgroundColor = System.Drawing.Color.FromArgb(67, 67, 67); private static System.Drawing.Color DarkBackgroundColor = System.Drawing.Color.FromArgb(45, 45, 45); - private static System.Drawing.Color DarkForeColor = System.Drawing.Color.FromArgb(255,255,255); private static System.Drawing.Color DarkerBackgroundColor = System.Drawing.Color.FromArgb(30, 30, 30); + private static System.Drawing.Color DarkForeColor = System.Drawing.Color.FromArgb(255,255,255); + + // Default + public static System.Drawing.Color BackgroundColor = BrightBackgroundColor; + public static System.Drawing.Color DockBackgroundColor = LessBrightBackgroundColor; + public static System.Drawing.Color ForeColor = BrightForeColor; + public static System.Drawing.Color MenuBackgroundColor = BrighterBackgroundColor; + public static bool DarkModeEnabled = false; @@ -47,6 +51,7 @@ private static void SetDarkMode() BackgroundColor = DarkBackgroundColor; ForeColor = DarkForeColor; MenuBackgroundColor = DarkerBackgroundColor; + DockBackgroundColor = LessDarkBackgroundColor; DarkModeEnabled = true; } @@ -55,6 +60,7 @@ private static void SetBrightMode() BackgroundColor = BrightBackgroundColor; ForeColor = BrightForeColor; MenuBackgroundColor = BrighterBackgroundColor; + DockBackgroundColor = LessBrightBackgroundColor; DarkModeEnabled = false; } diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index aa08a441..d34731d8 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -160,9 +160,7 @@ public void ChangeTheme(Control.ControlCollection container) LogExpert.Config.ColorMode.LoadColorMode(); LogExpert.Config.ColorMode.UseImmersiveDarkMode(this.Handle, LogExpert.Config.ColorMode.DarkModeEnabled); - // Colors for selected menus - this.mainMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuItemRenderer(); - + #region ApplyColorToAllControls foreach (Control component in container) { if (component.Controls != null && component.Controls.Count > 0) @@ -213,6 +211,8 @@ public void ChangeTheme(Control.ControlCollection container) } } + + #region ContextMenuStripForTabs // Does not seem to detect any ContextMenuStrip, it is used by the library WeifenLuo.WinFormsUI.Docking? if (component is ContextMenuStrip) @@ -240,6 +240,13 @@ public void ChangeTheme(Control.ControlCollection container) } #endregion ContextMenuStripForTabs } + #endregion + + // Colors for selected menus + this.mainMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuItemRenderer(); + + // Dock special color + this.dockPanel.DockBackColor = LogExpert.Config.ColorMode.DockBackgroundColor; } #endregion diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index fb15ab01..132c17d2 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -283,7 +283,7 @@ private void InitializeComponent() this.openToolStripMenuItem.Image = global::LogExpert.Properties.Resources.folder_blue; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(309, 30); + this.openToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.openToolStripMenuItem.Text = "Open..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.OnOpenToolStripMenuItemClick); // @@ -293,7 +293,7 @@ private void InitializeComponent() this.openURIToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.openURIToolStripMenuItem.Name = "openURIToolStripMenuItem"; this.openURIToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); - this.openURIToolStripMenuItem.Size = new System.Drawing.Size(309, 30); + this.openURIToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.openURIToolStripMenuItem.Text = "Open URL..."; this.openURIToolStripMenuItem.ToolTipText = "Opens a file by entering a URL which is supported by a file system plugin"; this.openURIToolStripMenuItem.Click += new System.EventHandler(this.OnOpenURIToolStripMenuItemClick); @@ -304,7 +304,7 @@ private void InitializeComponent() this.closeFileToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.closeFileToolStripMenuItem.Name = "closeFileToolStripMenuItem"; this.closeFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F4))); - this.closeFileToolStripMenuItem.Size = new System.Drawing.Size(309, 30); + this.closeFileToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.closeFileToolStripMenuItem.Text = "Close File"; this.closeFileToolStripMenuItem.Click += new System.EventHandler(this.OnCloseFileToolStripMenuItemClick); // @@ -314,7 +314,7 @@ private void InitializeComponent() this.reloadToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.reloadToolStripMenuItem.Name = "reloadToolStripMenuItem"; this.reloadToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; - this.reloadToolStripMenuItem.Size = new System.Drawing.Size(309, 30); + this.reloadToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.reloadToolStripMenuItem.Text = "Reload"; this.reloadToolStripMenuItem.Click += new System.EventHandler(this.OnReloadToolStripMenuItemClick); // @@ -324,7 +324,7 @@ private void InitializeComponent() this.newFromClipboardToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.newFromClipboardToolStripMenuItem.Name = "newFromClipboardToolStripMenuItem"; this.newFromClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.newFromClipboardToolStripMenuItem.Size = new System.Drawing.Size(309, 30); + this.newFromClipboardToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.newFromClipboardToolStripMenuItem.Text = "New tab from clipboard"; this.newFromClipboardToolStripMenuItem.ToolTipText = "Creates a new tab with content from clipboard"; this.newFromClipboardToolStripMenuItem.Click += new System.EventHandler(this.OnNewFromClipboardToolStripMenuItemClick); @@ -334,7 +334,7 @@ private void InitializeComponent() this.toolStripSeparator8.BackColor = System.Drawing.SystemColors.Control; this.toolStripSeparator8.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(306, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(302, 6); // // multiFileToolStripMenuItem // @@ -345,7 +345,7 @@ private void InitializeComponent() this.multifileMaskToolStripMenuItem}); this.multiFileToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.multiFileToolStripMenuItem.Name = "multiFileToolStripMenuItem"; - this.multiFileToolStripMenuItem.Size = new System.Drawing.Size(309, 30); + this.multiFileToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.multiFileToolStripMenuItem.Text = "MultiFile"; this.multiFileToolStripMenuItem.ToolTipText = "Treat multiple files as one large file (e.g. data.log, data.log.1, data.log.2,..." + ")"; @@ -373,14 +373,14 @@ private void InitializeComponent() // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(306, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(302, 6); // // loadProjectToolStripMenuItem // this.loadProjectToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.loadProjectToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.loadProjectToolStripMenuItem.Name = "loadProjectToolStripMenuItem"; - this.loadProjectToolStripMenuItem.Size = new System.Drawing.Size(309, 30); + this.loadProjectToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.loadProjectToolStripMenuItem.Text = "Load session..."; this.loadProjectToolStripMenuItem.ToolTipText = "Load a saved session (list of log files)"; this.loadProjectToolStripMenuItem.Click += new System.EventHandler(this.OnLoadProjectToolStripMenuItemClick); @@ -390,7 +390,7 @@ private void InitializeComponent() this.saveProjectToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.saveProjectToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.saveProjectToolStripMenuItem.Name = "saveProjectToolStripMenuItem"; - this.saveProjectToolStripMenuItem.Size = new System.Drawing.Size(309, 30); + this.saveProjectToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.saveProjectToolStripMenuItem.Text = "Save session..."; this.saveProjectToolStripMenuItem.ToolTipText = "Save a session (all open tabs)"; this.saveProjectToolStripMenuItem.Click += new System.EventHandler(this.OnSaveProjectToolStripMenuItemClick); @@ -400,7 +400,7 @@ private void InitializeComponent() this.exportBookmarksToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.exportBookmarksToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.exportBookmarksToolStripMenuItem.Name = "exportBookmarksToolStripMenuItem"; - this.exportBookmarksToolStripMenuItem.Size = new System.Drawing.Size(309, 30); + this.exportBookmarksToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.exportBookmarksToolStripMenuItem.Text = "Export bookmarks..."; this.exportBookmarksToolStripMenuItem.ToolTipText = "Write a list of bookmarks and their comments to a CSV file"; this.exportBookmarksToolStripMenuItem.Click += new System.EventHandler(this.OnExportBookmarksToolStripMenuItemClick); @@ -408,14 +408,14 @@ private void InitializeComponent() // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(306, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(302, 6); // // lastUsedToolStripMenuItem // this.lastUsedToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.lastUsedToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.lastUsedToolStripMenuItem.Name = "lastUsedToolStripMenuItem"; - this.lastUsedToolStripMenuItem.Size = new System.Drawing.Size(309, 30); + this.lastUsedToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.lastUsedToolStripMenuItem.Text = "Last used"; // // exitToolStripMenuItem @@ -424,7 +424,7 @@ private void InitializeComponent() this.exitToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(309, 30); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(305, 26); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.OnExitToolStripMenuItemClick); // @@ -636,7 +636,6 @@ private void InitializeComponent() this.timeshiftMenuTextBox.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.timeshiftMenuTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.timeshiftMenuTextBox.Enabled = false; - this.timeshiftMenuTextBox.Font = new System.Drawing.Font("Segoe UI", 9F); this.timeshiftMenuTextBox.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.timeshiftMenuTextBox.Name = "timeshiftMenuTextBox"; this.timeshiftMenuTextBox.Size = new System.Drawing.Size(100, 27); @@ -1043,9 +1042,9 @@ private void InitializeComponent() this.dockPanel.BackColor = System.Drawing.SystemColors.Control; this.dockPanel.DefaultFloatWindowSize = new System.Drawing.Size(600, 400); this.dockPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.dockPanel.DockBackColor = LogExpert.Config.ColorMode.BackgroundColor; + this.dockPanel.DockBackColor = System.Drawing.SystemColors.ControlLight; this.dockPanel.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow; - this.dockPanel.ForeColor = LogExpert.Config.ColorMode.BackgroundColor; + this.dockPanel.ForeColor = System.Drawing.SystemColors.Control; this.dockPanel.Location = new System.Drawing.Point(0, 0); this.dockPanel.Margin = new System.Windows.Forms.Padding(0); this.dockPanel.Name = "dockPanel"; @@ -1290,6 +1289,8 @@ private void InitializeComponent() // // tabContextMenuStrip // + this.tabContextMenuStrip.BackColor = System.Drawing.SystemColors.Control; + this.tabContextMenuStrip.ForeColor = System.Drawing.SystemColors.ControlText; this.tabContextMenuStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.tabContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.closeThisTabToolStripMenuItem, @@ -1303,17 +1304,15 @@ private void InitializeComponent() this.findInExplorerToolStripMenuItem}); this.tabContextMenuStrip.Name = "tabContextMenuStrip"; this.tabContextMenuStrip.Size = new System.Drawing.Size(233, 184); - this.tabContextMenuStrip.ForeColor = LogExpert.Config.ColorMode.ForeColor; - this.tabContextMenuStrip.BackColor = LogExpert.Config.ColorMode.BackgroundColor; // // closeThisTabToolStripMenuItem // + this.closeThisTabToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.closeThisTabToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlText; this.closeThisTabToolStripMenuItem.Name = "closeThisTabToolStripMenuItem"; this.closeThisTabToolStripMenuItem.Size = new System.Drawing.Size(232, 24); this.closeThisTabToolStripMenuItem.Text = "Close this tab"; this.closeThisTabToolStripMenuItem.Click += new System.EventHandler(this.OnCloseThisTabToolStripMenuItemClick); - this.closeThisTabToolStripMenuItem.ForeColor = LogExpert.Config.ColorMode.ForeColor; - this.closeThisTabToolStripMenuItem.BackColor = LogExpert.Config.ColorMode.BackgroundColor; // // closeOtherTabsToolStripMenuItem // @@ -1462,8 +1461,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem hilightingToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem cellSelectModeToolStripMenuItem; private System.Windows.Forms.ToolStripTextBox timeshiftMenuTextBox; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripMenuItem alwaysOnTopToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem bookmarksToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem toggleBookmarkToolStripMenuItem; @@ -1474,22 +1471,15 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem toolStripEncodingANSIItem; private System.Windows.Forms.ToolStripMenuItem toolStripEncodingUTF8Item; private System.Windows.Forms.ToolStripMenuItem toolStripEncodingUTF16Item; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripMenuItem reloadToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem columnizerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; private DateTimeDragControl dragControlDateTime; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; private System.Windows.Forms.ToolStripMenuItem showBookmarkListToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator7; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator9; private System.Windows.Forms.ToolStrip buttonToolStrip; private System.Windows.Forms.ToolStripButton toolStripButtonOpen; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator10; private System.Windows.Forms.ToolStripButton toolStripButtonSearch; private System.Windows.Forms.ToolStripButton toolStripButtonFilter; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator11; private System.Windows.Forms.ToolStripButton toolStripButtonBookmark; private System.Windows.Forms.ToolStripButton toolStripButtonUp; private System.Windows.Forms.ToolStripButton toolStripButtonDown; @@ -1497,7 +1487,6 @@ private void InitializeComponent() private CheckBox checkBoxFollowTail; private ToolStripButton toolStripButtonTail; private ToolStripMenuItem showHelpToolStripMenuItem; - private ToolStripSeparator toolStripSeparator5; private ToolStripMenuItem hideLineColumnToolStripMenuItem; private ToolStripMenuItem lastUsedToolStripMenuItem; private ContextMenuStrip tabContextMenuStrip; @@ -1505,17 +1494,12 @@ private void InitializeComponent() private ToolStripMenuItem closeOtherTabsToolStripMenuItem; private ToolStripMenuItem closeAllTabsToolStripMenuItem; private ToolStripMenuItem tabColorToolStripMenuItem; - private ToolStripSeparator toolStripSeparator13; private ToolStripMenuItem loadProjectToolStripMenuItem; private ToolStripMenuItem saveProjectToolStripMenuItem; - private ToolStripSeparator toolStripSeparator14; private ToolStripButton toolStripButtonBubbles; - private ToolStripSeparator toolStripSeparator15; - private ToolStripSeparator toolStripSeparator16; private ToolStripMenuItem copyPathToClipboardToolStripMenuItem; private ToolStripMenuItem findInExplorerToolStripMenuItem; private ToolStripMenuItem exportBookmarksToolStripMenuItem; - private ToolStripSeparator toolStripSeparator17; private ToolStripComboBox groupsComboBoxHighlightGroups; private ToolStripMenuItem debugToolStripMenuItem; private ToolStripMenuItem dumpLogBufferInfoToolStripMenuItem; @@ -1525,7 +1509,6 @@ private void InitializeComponent() private ToolStrip externalToolsToolStrip; private ToolStripMenuItem toolsToolStripMenuItem; private ToolStripMenuItem configureToolStripMenuItem; - private ToolStripSeparator configureToolStripSeparator; private ToolStripMenuItem throwExceptionGUIThreadToolStripMenuItem; private ToolStripMenuItem throwExceptionbackgroundThToolStripMenuItem; private ToolStripMenuItem throwExceptionBackgroundThreadToolStripMenuItem; @@ -1533,13 +1516,10 @@ private void InitializeComponent() private ToolStripMenuItem warnToolStripMenuItem; private ToolStripMenuItem infoToolStripMenuItem; private ToolStripMenuItem debugToolStripMenuItem1; - private ToolStripSeparator toolStripSeparator12; - private ToolStripSeparator toolStripSeparator18; private ToolStripMenuItem disableWordHighlightModeToolStripMenuItem; private ToolStripMenuItem multifileMaskToolStripMenuItem; private ToolStripMenuItem multiFileEnabledStripMenuItem; private ToolStripMenuItem toolStripEncodingISO88591Item; - private ToolStripSeparator toolStripSeparator19; private ToolStripMenuItem lockInstanceToolStripMenuItem; private ToolStripMenuItem newFromClipboardToolStripMenuItem; private ToolStripMenuItem openURIToolStripMenuItem; @@ -1547,6 +1527,25 @@ private void InitializeComponent() private WeifenLuo.WinFormsUI.Docking.DockPanel dockPanel; private ToolStripMenuItem tabRenameToolStripMenuItem; private ToolStripSeparatorExtension toolStripSeparator1; + private ToolStripSeparatorExtension toolStripSeparator2; + private ToolStripSeparatorExtension toolStripSeparator3; + private ToolStripSeparatorExtension toolStripSeparator4; + private ToolStripSeparatorExtension toolStripSeparator6; + private ToolStripSeparatorExtension toolStripSeparator8; + private ToolStripSeparatorExtension toolStripSeparator7; + private ToolStripSeparatorExtension toolStripSeparator9; + private ToolStripSeparatorExtension toolStripSeparator10; + private ToolStripSeparatorExtension toolStripSeparator11; + private ToolStripSeparatorExtension toolStripSeparator5; + private ToolStripSeparatorExtension toolStripSeparator13; + private ToolStripSeparatorExtension toolStripSeparator14; + private ToolStripSeparatorExtension toolStripSeparator15; + private ToolStripSeparatorExtension toolStripSeparator16; + private ToolStripSeparatorExtension toolStripSeparator17; + private ToolStripSeparatorExtension configureToolStripSeparator; + private ToolStripSeparatorExtension toolStripSeparator12; + private ToolStripSeparatorExtension toolStripSeparator18; + private ToolStripSeparatorExtension toolStripSeparator19; } } diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs index 3128f014..5958da46 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs @@ -135,6 +135,8 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF InitializeComponent(); + + columnNamesLabel.Text = ""; // no filtering on columns by default _parentLogTabWin = parent; @@ -243,6 +245,51 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF _statusLineTrigger.Signal += OnStatusLineTriggerSignal; _selectionChangedTrigger.Signal += OnSelectionChangedTriggerSignal; + + ChangeTheme(this.Controls); + } + + public void ChangeTheme(Control.ControlCollection container) + { + LogExpert.Config.ColorMode.LoadColorMode(); + LogExpert.Config.ColorMode.UseImmersiveDarkMode(this.Handle, LogExpert.Config.ColorMode.DarkModeEnabled); + + #region ApplyColorToAllControls + foreach (Control component in container) + { + if (component.Controls != null && component.Controls.Count > 0) + { + ChangeTheme(component.Controls); + component.BackColor = LogExpert.Config.ColorMode.BackgroundColor; + component.ForeColor = LogExpert.Config.ColorMode.ForeColor; + } + else + { + component.BackColor = LogExpert.Config.ColorMode.BackgroundColor; + component.ForeColor = LogExpert.Config.ColorMode.ForeColor; + } + + } + #endregion + + // Colors for selected menus + this.dataGridContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuItemRenderer(); + + for (var y = 0; y < this.dataGridContextMenuStrip.Items.Count; y++) + { + var item = this.dataGridContextMenuStrip.Items[y]; + item.ForeColor = LogExpert.Config.ColorMode.ForeColor; + item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; + + var type = item.GetType(); + if(type == typeof(System.Windows.Forms.ToolStripSeparator)) + { + + } + } + + // Dock special color + this.dataGridView.BackgroundColor = LogExpert.Config.ColorMode.DockBackgroundColor; } #endregion diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs index 2bf30271..994b0654 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs @@ -41,21 +41,21 @@ private void InitializeComponent() this.dataGridContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.copyToTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator1 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.scrollAllTabsToTimestampToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.syncTimestampsToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.freeThisWindowFromTimeSyncToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.locateLineInOriginalFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator2 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.toggleBoomarkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bookmarkCommentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator4 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.markEditModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tempHighlightsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.removeAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.makePermanentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.markCurrentFilterRangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pluginSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.pluginSeparator = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.timeSpreadingControl = new LogExpert.Dialogs.TimeSpreadingControl(); this.advancedBackPanel = new System.Windows.Forms.Panel(); this.advancedFilterSplitContainer = new System.Windows.Forms.SplitContainer(); @@ -106,14 +106,14 @@ private void InitializeComponent() this.deleteBookmarksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.columnContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.freezeLeftColumnsUntilHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator3 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.moveToLastColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.moveLeftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.moveRightToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator5 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.hideColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.restoreColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator6 = new LogExpert.Extensions.ToolStripSeparatorExtension(); this.allColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.editModeContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.editModecopyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -180,16 +180,14 @@ private void InitializeComponent() // // tableLayoutPanel1 // - this.tableLayoutPanel1.BackColor = LogExpert.Config.ColorMode.BackgroundColor; this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 183F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 184F)); this.tableLayoutPanel1.Controls.Add(this.columnFinderPanel, 0, 0); this.tableLayoutPanel1.Controls.Add(this.dataGridView, 0, 1); this.tableLayoutPanel1.Controls.Add(this.timeSpreadingControl, 1, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.ForeColor = LogExpert.Config.ColorMode.ForeColor; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; @@ -237,7 +235,7 @@ private void InitializeComponent() this.dataGridView.AllowUserToDeleteRows = false; this.dataGridView.AllowUserToOrderColumns = true; this.dataGridView.AllowUserToResizeRows = false; - this.dataGridView.BackgroundColor = LogExpert.Config.ColorMode.BackgroundColor; + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLight; this.dataGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.dataGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText; @@ -434,7 +432,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.timeSpreadingControl.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.timeSpreadingControl.ForeColor = System.Drawing.Color.Teal; - this.timeSpreadingControl.Location = new System.Drawing.Point(1015, 30); + this.timeSpreadingControl.Location = new System.Drawing.Point(1016, 30); this.timeSpreadingControl.Margin = new System.Windows.Forms.Padding(2, 0, 1, 0); this.timeSpreadingControl.Name = "timeSpreadingControl"; this.timeSpreadingControl.ReverseAlpha = false; @@ -690,7 +688,7 @@ private void InitializeComponent() // this.highlightSplitContainer.Panel2.Controls.Add(this.highlightSplitContainerBackPanel); this.highlightSplitContainer.Panel2MinSize = 30; - this.highlightSplitContainer.Size = new System.Drawing.Size(981, 179); + this.highlightSplitContainer.Size = new System.Drawing.Size(981, 181); this.highlightSplitContainer.SplitterDistance = 612; this.highlightSplitContainer.TabIndex = 2; // @@ -700,8 +698,7 @@ private void InitializeComponent() this.filterGridView.AllowUserToDeleteRows = false; this.filterGridView.AllowUserToOrderColumns = true; this.filterGridView.AllowUserToResizeRows = false; - this.filterGridView.BackgroundColor = LogExpert.Config.ColorMode.BackgroundColor; - this.filterGridView.ForeColor = LogExpert.Config.ColorMode.ForeColor; + this.filterGridView.BackgroundColor = System.Drawing.SystemColors.ControlLight; this.filterGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.filterGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; this.filterGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText; @@ -725,7 +722,7 @@ private void InitializeComponent() this.filterGridView.ShowCellToolTips = false; this.filterGridView.ShowEditingIcon = false; this.filterGridView.ShowRowErrors = false; - this.filterGridView.Size = new System.Drawing.Size(610, 177); + this.filterGridView.Size = new System.Drawing.Size(610, 179); this.filterGridView.TabIndex = 1; this.filterGridView.VirtualMode = true; this.filterGridView.CellContextMenuStripNeeded += new System.Windows.Forms.DataGridViewCellContextMenuStripNeededEventHandler(this.OnFilterGridViewCellContextMenuStripNeeded); @@ -781,7 +778,7 @@ private void InitializeComponent() this.highlightSplitContainerBackPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.highlightSplitContainerBackPanel.Location = new System.Drawing.Point(0, 0); this.highlightSplitContainerBackPanel.Name = "highlightSplitContainerBackPanel"; - this.highlightSplitContainerBackPanel.Size = new System.Drawing.Size(363, 177); + this.highlightSplitContainerBackPanel.Size = new System.Drawing.Size(363, 179); this.highlightSplitContainerBackPanel.TabIndex = 1; // // hideFilterListOnLoadCheckBox @@ -864,7 +861,7 @@ private void InitializeComponent() this.filterListBox.IntegralHeight = false; this.filterListBox.Location = new System.Drawing.Point(3, 3); this.filterListBox.Name = "filterListBox"; - this.filterListBox.Size = new System.Drawing.Size(278, 172); + this.filterListBox.Size = new System.Drawing.Size(278, 174); this.filterListBox.TabIndex = 0; this.helpToolTip.SetToolTip(this.filterListBox, "Doubleclick to load a saved filter"); this.filterListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.OnFilterListBoxDrawItem); @@ -903,15 +900,12 @@ private void InitializeComponent() // // filterSplitContainer.Panel1 // - this.filterSplitContainer.Panel1.BackColor = LogExpert.Config.ColorMode.BackgroundColor; this.filterSplitContainer.Panel1.Controls.Add(this.lblTextFilter); this.filterSplitContainer.Panel1.Controls.Add(this.filterComboBox); - this.filterSplitContainer.Panel1.ForeColor = LogExpert.Config.ColorMode.ForeColor; this.filterSplitContainer.Panel1MinSize = 200; // // filterSplitContainer.Panel2 // - this.filterSplitContainer.Panel2.BackColor = LogExpert.Config.ColorMode.BackgroundColor; this.filterSplitContainer.Panel2.Controls.Add(this.advancedButton); this.filterSplitContainer.Panel2.Controls.Add(this.syncFilterCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.lblFilterCount); @@ -919,7 +913,6 @@ private void InitializeComponent() this.filterSplitContainer.Panel2.Controls.Add(this.filterRegexCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.filterCaseSensitiveCheckBox); this.filterSplitContainer.Panel2.Controls.Add(this.filterSearchButton); - this.filterSplitContainer.Panel2.ForeColor = LogExpert.Config.ColorMode.ForeColor; this.filterSplitContainer.Panel2MinSize = 550; this.filterSplitContainer.Size = new System.Drawing.Size(1007, 32); this.filterSplitContainer.SplitterDistance = 282; @@ -1191,8 +1184,6 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = LogExpert.Config.ColorMode.BackgroundColor; - this.ForeColor = LogExpert.Config.ColorMode.ForeColor; this.ClientSize = new System.Drawing.Size(1014, 656); this.ControlBox = false; this.Controls.Add(this.splitContainerLogWindow); diff --git a/src/LogExpert/Dialogs/BufferedDataGridView.cs b/src/LogExpert/Dialogs/BufferedDataGridView.cs index 676c1967..08595eba 100644 --- a/src/LogExpert/Dialogs/BufferedDataGridView.cs +++ b/src/LogExpert/Dialogs/BufferedDataGridView.cs @@ -43,10 +43,28 @@ public BufferedDataGridView() InitializeComponent(); DoubleBuffered = true; VirtualMode = true; + + DefaultColors(); + this.BackgroundColor = LogExpert.Config.ColorMode.DockBackgroundColor; } #endregion + private void DefaultColors() + { + for (var x = 0; x < this.Rows.Count; x++) + { + var row = this.Rows[x]; + + for (var y = 0; y < row.Cells.Count; y++) + { + var cell = row.Cells[y]; + cell.Style.BackColor = System.Drawing.Color.Black; + } + } + + } + #region Delegates public delegate void OverlayDoubleClickedEventHandler(object sender, OverlayEventArgs e); @@ -94,7 +112,7 @@ protected override void OnPaint(PaintEventArgs e) { if (PaintWithOverlays) { - PaintOverlays(e); + PaintOverlays(e); } else { @@ -104,7 +122,7 @@ protected override void OnPaint(PaintEventArgs e) catch (Exception ex) { _logger.Error(ex); - } + } } protected override void OnEditingControlShowing(DataGridViewEditingControlShowingEventArgs e) @@ -227,7 +245,7 @@ private void PaintOverlays(PaintEventArgs e) myBuffer.Graphics.SetClip(ClientRectangle, CombineMode.Union); e.Graphics.SetClip(ClientRectangle, CombineMode.Union); - PaintEventArgs args = new PaintEventArgs(myBuffer.Graphics, e.ClipRectangle); + PaintEventArgs args = new PaintEventArgs(myBuffer.Graphics, e.ClipRectangle); base.OnPaint(args); diff --git a/src/LogExpert/Dialogs/SettingsDialog.Designer.cs b/src/LogExpert/Dialogs/SettingsDialog.Designer.cs index e41a826c..cf1a5a64 100644 --- a/src/LogExpert/Dialogs/SettingsDialog.Designer.cs +++ b/src/LogExpert/Dialogs/SettingsDialog.Designer.cs @@ -439,11 +439,10 @@ private void InitializeComponent() this.checkBoxDarkMode.Location = new System.Drawing.Point(7, 141); this.checkBoxDarkMode.Margin = new System.Windows.Forms.Padding(4); this.checkBoxDarkMode.Name = "checkBoxDarkMode"; - this.checkBoxDarkMode.Size = new System.Drawing.Size(264, 26); + this.checkBoxDarkMode.Size = new System.Drawing.Size(374, 26); this.checkBoxDarkMode.TabIndex = 6; - this.checkBoxDarkMode.Text = "Dark Mode (restart required)"; + this.checkBoxDarkMode.Text = "Dark Mode (experimental, restart required)"; this.checkBoxDarkMode.UseVisualStyleBackColor = true; - // // checkBoxFollowTail // @@ -455,7 +454,6 @@ private void InitializeComponent() this.checkBoxFollowTail.TabIndex = 3; this.checkBoxFollowTail.Text = "Follow tail enabled"; this.checkBoxFollowTail.UseVisualStyleBackColor = true; - // // checkBoxColumnFinder // diff --git a/src/LogExpert/Dialogs/SettingsDialog.resx b/src/LogExpert/Dialogs/SettingsDialog.resx index aa74df7a..9426b76c 100644 --- a/src/LogExpert/Dialogs/SettingsDialog.resx +++ b/src/LogExpert/Dialogs/SettingsDialog.resx @@ -126,18 +126,6 @@ True - - True - - - True - - - True - - - True - True @@ -150,12 +138,6 @@ Note: You can always load your logfiles as MultiFile automatically if the files names follow the MultiFile naming rule (<filename>, <filename>.1, <filename>.2, ...). Simply choose 'MultiFile' from the File menu after loading the first file. - - 17, 17 - - - 144, 17 - From 272fc32677053f3516cb48fd319f8d2931be37de Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 20:32:21 +0200 Subject: [PATCH 15/33] Adjust default line background --- src/LogExpert/Config/ColorMode.cs | 8 +++--- src/LogExpert/Controls/LogWindow/LogWindow.cs | 8 ------ .../Controls/LogWindow/LogWindow.designer.cs | 27 +++++++++---------- .../Controls/LogWindow/LogWindowsPublic.cs | 11 +++++--- 4 files changed, 24 insertions(+), 30 deletions(-) diff --git a/src/LogExpert/Config/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs index f2f14053..8880201f 100644 --- a/src/LogExpert/Config/ColorMode.cs +++ b/src/LogExpert/Config/ColorMode.cs @@ -24,8 +24,8 @@ public static class ColorMode private static System.Drawing.Color DarkForeColor = System.Drawing.Color.FromArgb(255,255,255); // Default - public static System.Drawing.Color BackgroundColor = BrightBackgroundColor; - public static System.Drawing.Color DockBackgroundColor = LessBrightBackgroundColor; + public static System.Drawing.Color BackgroundColor = LessBrightBackgroundColor; + public static System.Drawing.Color DockBackgroundColor = BrighterBackgroundColor; public static System.Drawing.Color ForeColor = BrightForeColor; public static System.Drawing.Color MenuBackgroundColor = BrighterBackgroundColor; @@ -57,10 +57,10 @@ private static void SetDarkMode() private static void SetBrightMode() { - BackgroundColor = BrightBackgroundColor; + BackgroundColor = LessBrightBackgroundColor; ForeColor = BrightForeColor; MenuBackgroundColor = BrighterBackgroundColor; - DockBackgroundColor = LessBrightBackgroundColor; + DockBackgroundColor = BrighterBackgroundColor; DarkModeEnabled = false; } diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs index 5958da46..6ad9002f 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs @@ -135,8 +135,6 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF InitializeComponent(); - - columnNamesLabel.Text = ""; // no filtering on columns by default _parentLogTabWin = parent; @@ -280,12 +278,6 @@ public void ChangeTheme(Control.ControlCollection container) var item = this.dataGridContextMenuStrip.Items[y]; item.ForeColor = LogExpert.Config.ColorMode.ForeColor; item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; - - var type = item.GetType(); - if(type == typeof(System.Windows.Forms.ToolStripSeparator)) - { - - } } // Dock special color diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs index 994b0654..40175063 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs @@ -183,7 +183,7 @@ private void InitializeComponent() this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 184F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 185F)); this.tableLayoutPanel1.Controls.Add(this.columnFinderPanel, 0, 0); this.tableLayoutPanel1.Controls.Add(this.dataGridView, 0, 1); this.tableLayoutPanel1.Controls.Add(this.timeSpreadingControl, 1, 1); @@ -432,7 +432,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.timeSpreadingControl.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.timeSpreadingControl.ForeColor = System.Drawing.Color.Teal; - this.timeSpreadingControl.Location = new System.Drawing.Point(1016, 30); + this.timeSpreadingControl.Location = new System.Drawing.Point(1017, 30); this.timeSpreadingControl.Margin = new System.Windows.Forms.Padding(2, 0, 1, 0); this.timeSpreadingControl.Name = "timeSpreadingControl"; this.timeSpreadingControl.ReverseAlpha = false; @@ -688,7 +688,7 @@ private void InitializeComponent() // this.highlightSplitContainer.Panel2.Controls.Add(this.highlightSplitContainerBackPanel); this.highlightSplitContainer.Panel2MinSize = 30; - this.highlightSplitContainer.Size = new System.Drawing.Size(981, 181); + this.highlightSplitContainer.Size = new System.Drawing.Size(981, 183); this.highlightSplitContainer.SplitterDistance = 612; this.highlightSplitContainer.TabIndex = 2; // @@ -722,7 +722,7 @@ private void InitializeComponent() this.filterGridView.ShowCellToolTips = false; this.filterGridView.ShowEditingIcon = false; this.filterGridView.ShowRowErrors = false; - this.filterGridView.Size = new System.Drawing.Size(610, 179); + this.filterGridView.Size = new System.Drawing.Size(610, 181); this.filterGridView.TabIndex = 1; this.filterGridView.VirtualMode = true; this.filterGridView.CellContextMenuStripNeeded += new System.Windows.Forms.DataGridViewCellContextMenuStripNeededEventHandler(this.OnFilterGridViewCellContextMenuStripNeeded); @@ -778,7 +778,7 @@ private void InitializeComponent() this.highlightSplitContainerBackPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.highlightSplitContainerBackPanel.Location = new System.Drawing.Point(0, 0); this.highlightSplitContainerBackPanel.Name = "highlightSplitContainerBackPanel"; - this.highlightSplitContainerBackPanel.Size = new System.Drawing.Size(363, 179); + this.highlightSplitContainerBackPanel.Size = new System.Drawing.Size(363, 181); this.highlightSplitContainerBackPanel.TabIndex = 1; // // hideFilterListOnLoadCheckBox @@ -861,7 +861,7 @@ private void InitializeComponent() this.filterListBox.IntegralHeight = false; this.filterListBox.Location = new System.Drawing.Point(3, 3); this.filterListBox.Name = "filterListBox"; - this.filterListBox.Size = new System.Drawing.Size(278, 174); + this.filterListBox.Size = new System.Drawing.Size(278, 176); this.filterListBox.TabIndex = 0; this.helpToolTip.SetToolTip(this.filterListBox, "Doubleclick to load a saved filter"); this.filterListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.OnFilterListBoxDrawItem); @@ -1266,9 +1266,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem locateLineInOriginalFileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem toggleBoomarkToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem markEditModeToolStripMenuItem; - //private BufferedDataGridView boomarkDataGridView; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ContextMenuStrip bookmarkContextMenuStrip; private System.Windows.Forms.ToolStripMenuItem deleteBookmarksToolStripMenuItem; private System.Windows.Forms.CheckBox columnRestrictCheckBox; @@ -1276,14 +1273,11 @@ private void InitializeComponent() private System.Windows.Forms.ContextMenuStrip columnContextMenuStrip; private System.Windows.Forms.ToolStripMenuItem freezeLeftColumnsUntilHereToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem moveToLastColumnToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripMenuItem moveLeftToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem moveRightToolStripMenuItem; private TimeSpreadingControl timeSpreadingControl; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private System.Windows.Forms.ToolStripSeparator pluginSeparator; private System.Windows.Forms.ToolStripMenuItem bookmarkCommentToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ContextMenuStrip editModeContextMenuStrip; private System.Windows.Forms.ToolStripMenuItem highlightSelectionInLogFileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem editModecopyToolStripMenuItem; @@ -1315,8 +1309,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem markFilterHitsInLogViewToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem highlightSelectionInLogFilewordModeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem hideColumnToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; private System.Windows.Forms.ToolStripMenuItem restoreColumnsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem allColumnsToolStripMenuItem; private System.Windows.Forms.Label columnNamesLabel; @@ -1333,5 +1325,12 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox filterRegexCheckBox; private System.Windows.Forms.CheckBox filterCaseSensitiveCheckBox; private System.Windows.Forms.Button filterSearchButton; + private Extensions.ToolStripSeparatorExtension toolStripSeparator1; + private Extensions.ToolStripSeparatorExtension toolStripSeparator2; + private Extensions.ToolStripSeparatorExtension toolStripSeparator3; + private Extensions.ToolStripSeparatorExtension pluginSeparator; + private Extensions.ToolStripSeparatorExtension toolStripSeparator4; + private Extensions.ToolStripSeparatorExtension toolStripSeparator5; + private Extensions.ToolStripSeparatorExtension toolStripSeparator6; } } diff --git a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs index 88ab055d..8b491cc6 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs @@ -402,7 +402,7 @@ public void CellPainting(DataGridView gridView, int rowIndex, DataGridViewCellPa if ((e.State & DataGridViewElementStates.Selected) == DataGridViewElementStates.Selected) { - Color backColor = e.CellStyle.SelectionBackColor; + Color backColor = LogExpert.Config.ColorMode.BackgroundColor; Brush brush; if (gridView.Focused) @@ -411,7 +411,7 @@ public void CellPainting(DataGridView gridView, int rowIndex, DataGridViewCellPa } else { - Color color = Color.FromArgb(255, 170, 170, 170); + Color color = backColor; brush = new SolidBrush(color); } @@ -420,8 +420,9 @@ public void CellPainting(DataGridView gridView, int rowIndex, DataGridViewCellPa } else { - Color bgColor = Color.White; - + Color bgColor = LogExpert.Config.ColorMode.DockBackgroundColor; + Color foreColor = LogExpert.Config.ColorMode.ForeColor; + if (!DebugOptions.disableWordHighlight) { if (entry != null) @@ -437,6 +438,8 @@ public void CellPainting(DataGridView gridView, int rowIndex, DataGridViewCellPa } } e.CellStyle.BackColor = bgColor; + e.CellStyle.ForeColor = foreColor; + e.PaintBackground(e.ClipBounds, false); } From 52052e612f0f1987081f58acccf5c5928727e386 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 20:54:30 +0200 Subject: [PATCH 16/33] Color dataGrid columns, trying foreground no success --- src/LogExpert/Classes/PaintHelper.cs | 2 +- src/LogExpert/Controls/LogWindow/LogWindow.cs | 28 ++++++++++++++++--- .../LogWindow/LogWindowEventHandlers.cs | 9 ++++-- .../Controls/LogWindow/LogWindowsPublic.cs | 4 ++- src/LogExpert/Dialogs/BufferedDataGridView.cs | 20 +------------ 5 files changed, 35 insertions(+), 28 deletions(-) diff --git a/src/LogExpert/Classes/PaintHelper.cs b/src/LogExpert/Classes/PaintHelper.cs index bb87f832..3538321c 100644 --- a/src/LogExpert/Classes/PaintHelper.cs +++ b/src/LogExpert/Classes/PaintHelper.cs @@ -311,7 +311,7 @@ private static void PaintHighlightedCell(ILogPaintContext logPaintCtx, DataGridV HilightMatchEntry hme = new HilightMatchEntry(); hme.StartPos = 0; hme.Length = column.FullValue.Length; - hme.HilightEntry = new HilightEntry(column.FullValue, groundEntry?.ForegroundColor ?? Color.FromKnownColor(KnownColor.Black), groundEntry?.BackgroundColor ?? Color.Empty, false); + hme.HilightEntry = new HilightEntry(column.FullValue, groundEntry?.ForegroundColor ?? LogExpert.Config.ColorMode.ForeColor, groundEntry?.BackgroundColor ?? Color.Empty, false); matchList = MergeHighlightMatchEntries(matchList, hme); } } diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs index 6ad9002f..98ddf241 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs @@ -268,9 +268,17 @@ public void ChangeTheme(Control.ControlCollection container) } } - #endregion + #endregion - // Colors for selected menus + #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; + + // Colors for menu this.dataGridContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuItemRenderer(); for (var y = 0; y < this.dataGridContextMenuStrip.Items.Count; y++) @@ -280,8 +288,20 @@ public void ChangeTheme(Control.ControlCollection container) item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; } - // Dock special color - this.dataGridView.BackgroundColor = LogExpert.Config.ColorMode.DockBackgroundColor; + // Filter dataGridView + this.filterGridView.BackgroundColor = LogExpert.Config.ColorMode.DockBackgroundColor; + + // Colors for menu + this.filterContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuItemRenderer(); + + for (var y = 0; y < this.filterContextMenuStrip.Items.Count; y++) + { + var item = this.filterContextMenuStrip.Items[y]; + item.ForeColor = LogExpert.Config.ColorMode.ForeColor; + item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; + } + + #endregion DataGridView } #endregion diff --git a/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs b/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs index 5254e50d..88c2db91 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs @@ -361,7 +361,7 @@ private void OnFilterGridViewCellPainting(object sender, DataGridViewCellPaintin e.Graphics.SetClip(e.CellBounds); if ((e.State & DataGridViewElementStates.Selected) == DataGridViewElementStates.Selected) { - Color backColor = e.CellStyle.SelectionBackColor; + Color backColor = LogExpert.Config.ColorMode.DockBackgroundColor; Brush brush; if (gridView.Focused) { @@ -369,7 +369,7 @@ private void OnFilterGridViewCellPainting(object sender, DataGridViewCellPaintin } else { - Color color = Color.FromArgb(255, 170, 170, 170); + Color color = backColor; brush = new SolidBrush(color); } @@ -378,7 +378,8 @@ private void OnFilterGridViewCellPainting(object sender, DataGridViewCellPaintin } else { - Color bgColor = Color.White; + Color bgColor = LogExpert.Config.ColorMode.DockBackgroundColor; + Color foreColor = LogExpert.Config.ColorMode.ForeColor; // paint direct filter hits with different bg color //if (this.filterParams.SpreadEnabled && this.filterHitList.Contains(lineNum)) //{ @@ -394,6 +395,8 @@ private void OnFilterGridViewCellPainting(object sender, DataGridViewCellPaintin } e.CellStyle.BackColor = bgColor; + e.CellStyle.ForeColor = foreColor; // Not working? + e.PaintBackground(e.ClipBounds, false); } diff --git a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs index 8b491cc6..56763ebd 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs @@ -403,6 +403,7 @@ public void CellPainting(DataGridView gridView, int rowIndex, DataGridViewCellPa if ((e.State & DataGridViewElementStates.Selected) == DataGridViewElementStates.Selected) { Color backColor = LogExpert.Config.ColorMode.BackgroundColor; + Brush brush; if (gridView.Focused) @@ -437,8 +438,9 @@ public void CellPainting(DataGridView gridView, int rowIndex, DataGridViewCellPa bgColor = entry.BackgroundColor; } } + e.CellStyle.BackColor = bgColor; - e.CellStyle.ForeColor = foreColor; + e.CellStyle.ForeColor = foreColor; // Not working? e.PaintBackground(e.ClipBounds, false); } diff --git a/src/LogExpert/Dialogs/BufferedDataGridView.cs b/src/LogExpert/Dialogs/BufferedDataGridView.cs index 08595eba..63dafa61 100644 --- a/src/LogExpert/Dialogs/BufferedDataGridView.cs +++ b/src/LogExpert/Dialogs/BufferedDataGridView.cs @@ -42,29 +42,11 @@ public BufferedDataGridView() InitializeComponent(); DoubleBuffered = true; - VirtualMode = true; - - DefaultColors(); - this.BackgroundColor = LogExpert.Config.ColorMode.DockBackgroundColor; + VirtualMode = true; } #endregion - private void DefaultColors() - { - for (var x = 0; x < this.Rows.Count; x++) - { - var row = this.Rows[x]; - - for (var y = 0; y < row.Cells.Count; y++) - { - var cell = row.Cells[y]; - cell.Style.BackColor = System.Drawing.Color.Black; - } - } - - } - #region Delegates public delegate void OverlayDoubleClickedEventHandler(object sender, OverlayEventArgs e); From 0a78ecd1958394e537591a3c166854f627343335 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Tue, 26 Jul 2022 21:11:58 +0200 Subject: [PATCH 17/33] Fixed specific separators --- src/LogExpert/Config/ColorMode.cs | 2 +- .../LogTabWindow/LogTabWindow.designer.cs | 87 ++++++++++--------- src/LogExpert/Controls/LogWindow/LogWindow.cs | 3 - .../Controls/LogWindow/LogWindow.designer.cs | 28 +++--- ....cs => LineToolStripSeparatorExtension.cs} | 4 +- .../MenuToolStripSeparatorExtension.cs | 38 ++++++++ src/LogExpert/LogExpert.csproj | 5 +- 7 files changed, 103 insertions(+), 64 deletions(-) rename src/LogExpert/Extensions/{ToolStripSeparatorExtenstion.cs => LineToolStripSeparatorExtension.cs} (90%) create mode 100644 src/LogExpert/Extensions/MenuToolStripSeparatorExtension.cs diff --git a/src/LogExpert/Config/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs index 8880201f..f919d804 100644 --- a/src/LogExpert/Config/ColorMode.cs +++ b/src/LogExpert/Config/ColorMode.cs @@ -57,7 +57,7 @@ private static void SetDarkMode() private static void SetBrightMode() { - BackgroundColor = LessBrightBackgroundColor; + BackgroundColor = BrightBackgroundColor; ForeColor = BrightForeColor; MenuBackgroundColor = BrighterBackgroundColor; DockBackgroundColor = BrighterBackgroundColor; diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index 132c17d2..889c3be7 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -63,15 +63,15 @@ private void InitializeComponent() this.closeFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.reloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.newFromClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator8 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator8 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.multiFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.multiFileEnabledStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.multifileMaskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator7 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator7 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.loadProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportBookmarksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator14 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator14 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.lastUsedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.viewNavigateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -84,45 +84,45 @@ private void InitializeComponent() this.jumpToPrevToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showBookmarkListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.columnFinderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator2 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.toolStripEncodingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingASCIIItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingANSIItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingISO88591Item = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingUTF8Item = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripEncodingUTF16Item = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator4 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.timeshiftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.timeshiftMenuTextBox = new System.Windows.Forms.ToolStripTextBox(); - this.toolStripSeparator3 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator3 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.copyMarkedLinesIntoNewTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.columnizerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.hilightingToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator6 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator6 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.cellSelectModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.alwaysOnTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.hideLineColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator19 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator19 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.lockInstanceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.configureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.configureToolStripSeparator = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.configureToolStripSeparator = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showHelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator5 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dumpLogBufferInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dumpBufferDiagnosticToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.runGCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.gCInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator18 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator18 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.throwExceptionGUIThreadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.throwExceptionbackgroundThToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.throwExceptionBackgroundThreadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator12 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator12 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.loglevelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.warnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.infoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -133,30 +133,30 @@ private void InitializeComponent() this.dockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel(); this.buttonToolStrip = new System.Windows.Forms.ToolStrip(); this.toolStripButtonOpen = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator10 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator10 = new LogExpert.Extensions.LineToolStripSeparatorExtension(); this.toolStripButtonSearch = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonFilter = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator11 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator11 = new LogExpert.Extensions.LineToolStripSeparatorExtension(); this.toolStripButtonBookmark = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonUp = new System.Windows.Forms.ToolStripButton(); this.toolStripButtonDown = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator1 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator1 = new LogExpert.Extensions.LineToolStripSeparatorExtension(); this.toolStripButtonBubbles = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator15 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator15 = new LogExpert.Extensions.LineToolStripSeparatorExtension(); this.toolStripButtonTail = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator17 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator17 = new LogExpert.Extensions.LineToolStripSeparatorExtension(); this.groupsComboBoxHighlightGroups = new System.Windows.Forms.ToolStripComboBox(); this.externalToolsToolStrip = new System.Windows.Forms.ToolStrip(); - this.toolStripSeparator9 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator9 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.checkBoxFollowTail = new System.Windows.Forms.CheckBox(); this.tabContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.closeThisTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.closeOtherTabsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.closeAllTabsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator13 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator13 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.tabColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabRenameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator16 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator16 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.copyPathToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.findInExplorerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dragControlDateTime = new LogExpert.Dialogs.DateTimeDragControl(); @@ -241,8 +241,8 @@ private void InitializeComponent() this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.viewNavigateToolStripMenuItem, - this.optionToolStripMenuItem, this.toolsToolStripMenuItem, + this.optionToolStripMenuItem, this.helpToolStripMenuItem, this.debugToolStripMenuItem}); this.mainMenuStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; @@ -636,6 +636,7 @@ private void InitializeComponent() this.timeshiftMenuTextBox.BackColor = System.Drawing.SystemColors.ControlDarkDark; this.timeshiftMenuTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.timeshiftMenuTextBox.Enabled = false; + this.timeshiftMenuTextBox.Font = new System.Drawing.Font("Segoe UI", 9F); this.timeshiftMenuTextBox.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.timeshiftMenuTextBox.Name = "timeshiftMenuTextBox"; this.timeshiftMenuTextBox.Size = new System.Drawing.Size(100, 27); @@ -781,7 +782,7 @@ private void InitializeComponent() this.configureToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.configureToolStripMenuItem.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.configureToolStripMenuItem.Name = "configureToolStripMenuItem"; - this.configureToolStripMenuItem.Size = new System.Drawing.Size(166, 26); + this.configureToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.configureToolStripMenuItem.Text = "Configure..."; this.configureToolStripMenuItem.Click += new System.EventHandler(this.OnConfigureToolStripMenuItemClick); // @@ -790,7 +791,7 @@ private void InitializeComponent() this.configureToolStripSeparator.BackColor = System.Drawing.SystemColors.Control; this.configureToolStripSeparator.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.configureToolStripSeparator.Name = "configureToolStripSeparator"; - this.configureToolStripSeparator.Size = new System.Drawing.Size(163, 6); + this.configureToolStripSeparator.Size = new System.Drawing.Size(221, 6); // // helpToolStripMenuItem // @@ -1526,26 +1527,26 @@ private void InitializeComponent() private ToolStripMenuItem columnFinderToolStripMenuItem; private WeifenLuo.WinFormsUI.Docking.DockPanel dockPanel; private ToolStripMenuItem tabRenameToolStripMenuItem; - private ToolStripSeparatorExtension toolStripSeparator1; - private ToolStripSeparatorExtension toolStripSeparator2; - private ToolStripSeparatorExtension toolStripSeparator3; - private ToolStripSeparatorExtension toolStripSeparator4; - private ToolStripSeparatorExtension toolStripSeparator6; - private ToolStripSeparatorExtension toolStripSeparator8; - private ToolStripSeparatorExtension toolStripSeparator7; - private ToolStripSeparatorExtension toolStripSeparator9; - private ToolStripSeparatorExtension toolStripSeparator10; - private ToolStripSeparatorExtension toolStripSeparator11; - private ToolStripSeparatorExtension toolStripSeparator5; - private ToolStripSeparatorExtension toolStripSeparator13; - private ToolStripSeparatorExtension toolStripSeparator14; - private ToolStripSeparatorExtension toolStripSeparator15; - private ToolStripSeparatorExtension toolStripSeparator16; - private ToolStripSeparatorExtension toolStripSeparator17; - private ToolStripSeparatorExtension configureToolStripSeparator; - private ToolStripSeparatorExtension toolStripSeparator12; - private ToolStripSeparatorExtension toolStripSeparator18; - private ToolStripSeparatorExtension toolStripSeparator19; + private LineToolStripSeparatorExtension toolStripSeparator1; + private MenuToolStripSeparatorExtension toolStripSeparator2; + private MenuToolStripSeparatorExtension toolStripSeparator3; + private MenuToolStripSeparatorExtension toolStripSeparator4; + private MenuToolStripSeparatorExtension toolStripSeparator6; + private MenuToolStripSeparatorExtension toolStripSeparator8; + private MenuToolStripSeparatorExtension toolStripSeparator7; + private MenuToolStripSeparatorExtension toolStripSeparator9; + private LineToolStripSeparatorExtension toolStripSeparator10; + private LineToolStripSeparatorExtension toolStripSeparator11; + private MenuToolStripSeparatorExtension toolStripSeparator5; + private MenuToolStripSeparatorExtension toolStripSeparator13; + private MenuToolStripSeparatorExtension toolStripSeparator14; + private LineToolStripSeparatorExtension toolStripSeparator15; + private MenuToolStripSeparatorExtension toolStripSeparator16; + private LineToolStripSeparatorExtension toolStripSeparator17; + private MenuToolStripSeparatorExtension configureToolStripSeparator; + private MenuToolStripSeparatorExtension toolStripSeparator12; + private MenuToolStripSeparatorExtension toolStripSeparator18; + private MenuToolStripSeparatorExtension toolStripSeparator19; } } diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs index 98ddf241..3e8f9958 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs @@ -249,9 +249,6 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF public void ChangeTheme(Control.ControlCollection container) { - LogExpert.Config.ColorMode.LoadColorMode(); - LogExpert.Config.ColorMode.UseImmersiveDarkMode(this.Handle, LogExpert.Config.ColorMode.DarkModeEnabled); - #region ApplyColorToAllControls foreach (Control component in container) { diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs index 40175063..d8b5f4c8 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs @@ -41,21 +41,21 @@ private void InitializeComponent() this.dataGridContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.copyToTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator1 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.scrollAllTabsToTimestampToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.syncTimestampsToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.freeThisWindowFromTimeSyncToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.locateLineInOriginalFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator2 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.toggleBoomarkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bookmarkCommentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator4 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.markEditModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tempHighlightsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.removeAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.makePermanentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.markCurrentFilterRangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pluginSeparator = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.pluginSeparator = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.timeSpreadingControl = new LogExpert.Dialogs.TimeSpreadingControl(); this.advancedBackPanel = new System.Windows.Forms.Panel(); this.advancedFilterSplitContainer = new System.Windows.Forms.SplitContainer(); @@ -106,14 +106,14 @@ private void InitializeComponent() this.deleteBookmarksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.columnContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.freezeLeftColumnsUntilHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator3 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.moveToLastColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.moveLeftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.moveRightToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator5 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.hideColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.restoreColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator6 = new LogExpert.Extensions.ToolStripSeparatorExtension(); + this.toolStripSeparator6 = new LogExpert.Extensions.MenuToolStripSeparatorExtension(); this.allColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.editModeContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.editModecopyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -1325,12 +1325,12 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox filterRegexCheckBox; private System.Windows.Forms.CheckBox filterCaseSensitiveCheckBox; private System.Windows.Forms.Button filterSearchButton; - private Extensions.ToolStripSeparatorExtension toolStripSeparator1; - private Extensions.ToolStripSeparatorExtension toolStripSeparator2; - private Extensions.ToolStripSeparatorExtension toolStripSeparator3; - private Extensions.ToolStripSeparatorExtension pluginSeparator; - private Extensions.ToolStripSeparatorExtension toolStripSeparator4; - private Extensions.ToolStripSeparatorExtension toolStripSeparator5; - private Extensions.ToolStripSeparatorExtension toolStripSeparator6; + private Extensions.MenuToolStripSeparatorExtension toolStripSeparator1; + private Extensions.MenuToolStripSeparatorExtension toolStripSeparator2; + private Extensions.MenuToolStripSeparatorExtension toolStripSeparator3; + private Extensions.MenuToolStripSeparatorExtension pluginSeparator; + private Extensions.MenuToolStripSeparatorExtension toolStripSeparator4; + private Extensions.MenuToolStripSeparatorExtension toolStripSeparator5; + private Extensions.MenuToolStripSeparatorExtension toolStripSeparator6; } } diff --git a/src/LogExpert/Extensions/ToolStripSeparatorExtenstion.cs b/src/LogExpert/Extensions/LineToolStripSeparatorExtension.cs similarity index 90% rename from src/LogExpert/Extensions/ToolStripSeparatorExtenstion.cs rename to src/LogExpert/Extensions/LineToolStripSeparatorExtension.cs index ba75495b..62c426a3 100644 --- a/src/LogExpert/Extensions/ToolStripSeparatorExtenstion.cs +++ b/src/LogExpert/Extensions/LineToolStripSeparatorExtension.cs @@ -8,9 +8,9 @@ namespace LogExpert.Extensions { - public class ToolStripSeparatorExtension : ToolStripSeparator + public class LineToolStripSeparatorExtension : ToolStripSeparator { - public ToolStripSeparatorExtension() + public LineToolStripSeparatorExtension() { this.Paint += ExtendedToolStripSeparator_Paint; } diff --git a/src/LogExpert/Extensions/MenuToolStripSeparatorExtension.cs b/src/LogExpert/Extensions/MenuToolStripSeparatorExtension.cs new file mode 100644 index 00000000..113c54a2 --- /dev/null +++ b/src/LogExpert/Extensions/MenuToolStripSeparatorExtension.cs @@ -0,0 +1,38 @@ +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 MenuToolStripSeparatorExtension : ToolStripSeparator + { + public MenuToolStripSeparatorExtension() + { + this.Paint += ExtendedToolStripSeparator_Paint; + } + + private void ExtendedToolStripSeparator_Paint(object sender, PaintEventArgs e) + { + // Get the separator's width and height. + ToolStripSeparator toolStripSeparator = (ToolStripSeparator)sender; + int width = toolStripSeparator.Width; + int height = toolStripSeparator.Height; + + // Choose the colors for drawing. + // I've used Color.White as the foreColor. + Color foreColor = Config.ColorMode.ForeColor; + // Color.Teal as the backColor. + Color backColor = Config.ColorMode.MenuBackgroundColor; + + // Fill the background. + e.Graphics.FillRectangle(new SolidBrush(backColor), 0, 0, width, height); + + // Draw the line. + e.Graphics.DrawLine(new Pen(foreColor), 4, height / 2, width - 4, height / 2); + } + } +} diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj index 0aec3102..a4c3c948 100644 --- a/src/LogExpert/LogExpert.csproj +++ b/src/LogExpert/LogExpert.csproj @@ -110,7 +110,10 @@ - + + Component + + Component From 9e1ebfdc418af0f4b9e1e1e2ff9b51c70b4baac7 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Wed, 27 Jul 2022 12:02:04 +0200 Subject: [PATCH 18/33] fix default text color --- src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs | 5 +---- src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs index 90ced46f..6af1798c 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs @@ -1176,10 +1176,7 @@ private void PaintHighlightedCell(DataGridViewCellPaintingEventArgs e, DataGridV } else { - if (foreColor.Equals(Color.Black)) - { - foreColor = Color.White; - } + foreColor = LogExpert.Config.ColorMode.ForeColor; } TextRenderer.DrawText(e.Graphics, matchWord, font, wordRect, diff --git a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs index 56763ebd..b996e9cf 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs @@ -422,7 +422,6 @@ public void CellPainting(DataGridView gridView, int rowIndex, DataGridViewCellPa else { Color bgColor = LogExpert.Config.ColorMode.DockBackgroundColor; - Color foreColor = LogExpert.Config.ColorMode.ForeColor; if (!DebugOptions.disableWordHighlight) { @@ -439,8 +438,7 @@ public void CellPainting(DataGridView gridView, int rowIndex, DataGridViewCellPa } } - e.CellStyle.BackColor = bgColor; - e.CellStyle.ForeColor = foreColor; // Not working? + e.CellStyle.BackColor = bgColor; e.PaintBackground(e.ClipBounds, false); } From ab188a183fa3c814cb45472179b9dd815166c008 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Wed, 27 Jul 2022 12:16:33 +0200 Subject: [PATCH 19/33] Apply theme to tabs menu and bookmarks --- .../Controls/LogTabWindow/LogTabWindow.cs | 37 ++++------------ src/LogExpert/Controls/LogWindow/LogWindow.cs | 3 ++ .../Controls/LogWindow/LogWindowPrivate.cs | 5 +-- src/LogExpert/Dialogs/BookmarkWindow.cs | 43 +++++++++++++++++++ 4 files changed, 56 insertions(+), 32 deletions(-) diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index d34731d8..8cfb8523 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -210,35 +210,6 @@ public void ChangeTheme(Control.ControlCollection container) } } } - - - - #region ContextMenuStripForTabs - // Does not seem to detect any ContextMenuStrip, it is used by the library WeifenLuo.WinFormsUI.Docking? - if (component is ContextMenuStrip) - { - var menu = (ContextMenuStrip)component; - - foreach (ToolStripMenuItem item in menu.Items) - { - item.ForeColor = LogExpert.Config.ColorMode.ForeColor; - item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; - - try - { - foreach (dynamic children in item.DropDownItems) - { - children.ForeColor = LogExpert.Config.ColorMode.ForeColor; - children.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; - } - } - catch - { - // Ignore - } - } - } - #endregion ContextMenuStripForTabs } #endregion @@ -247,6 +218,14 @@ public void ChangeTheme(Control.ControlCollection container) // Dock special color this.dockPanel.DockBackColor = LogExpert.Config.ColorMode.DockBackgroundColor; + + // Tabs menu + for (var y = 0; y < this.tabContextMenuStrip.Items.Count; y++) + { + var item = this.tabContextMenuStrip.Items[y]; + item.ForeColor = LogExpert.Config.ColorMode.ForeColor; + item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; + } } #endregion diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs index 3e8f9958..b08d7def 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs @@ -287,6 +287,9 @@ public void ChangeTheme(Control.ControlCollection container) // 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; // Colors for menu this.filterContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuItemRenderer(); diff --git a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs index 6af1798c..d5d5eda4 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs @@ -1174,10 +1174,9 @@ private void PaintHighlightedCell(DataGridViewCellPaintingEventArgs e, DataGridV e.Graphics.FillRectangle(bgBrush, wordRect); } } - else - { + + if (foreColor == System.Drawing.Color.Black) foreColor = LogExpert.Config.ColorMode.ForeColor; - } TextRenderer.DrawText(e.Graphics, matchWord, font, wordRect, foreColor, flags); diff --git a/src/LogExpert/Dialogs/BookmarkWindow.cs b/src/LogExpert/Dialogs/BookmarkWindow.cs index e33a5aca..42814ecd 100644 --- a/src/LogExpert/Dialogs/BookmarkWindow.cs +++ b/src/LogExpert/Dialogs/BookmarkWindow.cs @@ -31,6 +31,49 @@ public BookmarkWindow() InitializeComponent(); bookmarkDataGridView.CellValueNeeded += boomarkDataGridView_CellValueNeeded; bookmarkDataGridView.CellPainting += boomarkDataGridView_CellPainting; + + ChangeTheme(this.Controls); + } + + public void ChangeTheme(Control.ControlCollection container) + { + #region ApplyColorToAllControls + foreach (Control component in container) + { + if (component.Controls != null && component.Controls.Count > 0) + { + ChangeTheme(component.Controls); + component.BackColor = LogExpert.Config.ColorMode.BackgroundColor; + component.ForeColor = LogExpert.Config.ColorMode.ForeColor; + } + else + { + component.BackColor = LogExpert.Config.ColorMode.BackgroundColor; + component.ForeColor = LogExpert.Config.ColorMode.ForeColor; + } + + } + #endregion + + #region DataGridView + + // 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; + + // Colors for menu + this.contextMenuStrip1.Renderer = new LogExpert.Extensions.ExtendedMenuItemRenderer(); + + for (var y = 0; y < this.contextMenuStrip1.Items.Count; y++) + { + var item = this.contextMenuStrip1.Items[y]; + item.ForeColor = LogExpert.Config.ColorMode.ForeColor; + item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; + } + + #endregion DataGridView } #endregion From dbc112df67bbc42c7e6560e19fc1cddb98bc8270 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Wed, 27 Jul 2022 12:55:16 +0200 Subject: [PATCH 20/33] Improve menus hover colors --- src/LogExpert/Config/ColorMode.cs | 3 +++ .../LogTabWindow/LogTabWindow.designer.cs | 2 +- .../Controls/LogTabWindow/LogTabWindowPublic.cs | 2 +- src/LogExpert/Extensions/MenuItemExtension.cs | 16 ++++++++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/LogExpert/Config/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs index f919d804..4ba836e9 100644 --- a/src/LogExpert/Config/ColorMode.cs +++ b/src/LogExpert/Config/ColorMode.cs @@ -28,6 +28,7 @@ public static class ColorMode public static System.Drawing.Color DockBackgroundColor = BrighterBackgroundColor; public static System.Drawing.Color ForeColor = BrightForeColor; public static System.Drawing.Color MenuBackgroundColor = BrighterBackgroundColor; + public static System.Drawing.Color HoverMenuBackgroundColor = LessBrightBackgroundColor; public static bool DarkModeEnabled = false; @@ -52,6 +53,7 @@ private static void SetDarkMode() ForeColor = DarkForeColor; MenuBackgroundColor = DarkerBackgroundColor; DockBackgroundColor = LessDarkBackgroundColor; + HoverMenuBackgroundColor = LessDarkBackgroundColor; DarkModeEnabled = true; } @@ -61,6 +63,7 @@ private static void SetBrightMode() ForeColor = BrightForeColor; MenuBackgroundColor = BrighterBackgroundColor; DockBackgroundColor = BrighterBackgroundColor; + HoverMenuBackgroundColor = LessBrightBackgroundColor; DarkModeEnabled = false; } diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index 889c3be7..06ca1e93 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -639,7 +639,7 @@ private void InitializeComponent() this.timeshiftMenuTextBox.Font = new System.Drawing.Font("Segoe UI", 9F); this.timeshiftMenuTextBox.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.timeshiftMenuTextBox.Name = "timeshiftMenuTextBox"; - this.timeshiftMenuTextBox.Size = new System.Drawing.Size(100, 27); + this.timeshiftMenuTextBox.Size = new System.Drawing.Size(150, 27); this.timeshiftMenuTextBox.Text = "+00:00:00.000"; this.timeshiftMenuTextBox.ToolTipText = "Time offset (hh:mm:ss.fff)"; this.timeshiftMenuTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnTimeShiftMenuTextBoxKeyDown); diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs index 26d018f7..f1456bd0 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs @@ -87,7 +87,7 @@ public LogWindow.LogWindow AddFileTab(string givenFileName, bool isTempFile, str AddToFileHistory(givenFileName); } - LogWindowData data = logWindow.Tag as LogWindowData; + LogWindowData data = logWindow.Tag as LogWindowData; data.color = _defaultTabColor; SetTabColor(logWindow, _defaultTabColor); //data.tabPage.BorderColor = this.defaultTabBorderColor; diff --git a/src/LogExpert/Extensions/MenuItemExtension.cs b/src/LogExpert/Extensions/MenuItemExtension.cs index 1b121fd8..fd787ab9 100644 --- a/src/LogExpert/Extensions/MenuItemExtension.cs +++ b/src/LogExpert/Extensions/MenuItemExtension.cs @@ -15,6 +15,22 @@ public ExtendedMenuItemRenderer() : base(new MenuSelectedColors()) { } public class MenuSelectedColors : ProfessionalColorTable { + + public override Color MenuItemSelected + { + get { return LogExpert.Config.ColorMode.HoverMenuBackgroundColor; } + } + + public override Color MenuItemSelectedGradientBegin + { + get { return LogExpert.Config.ColorMode.HoverMenuBackgroundColor; } + } + + public override Color MenuItemSelectedGradientEnd + { + get { return LogExpert.Config.ColorMode.HoverMenuBackgroundColor; } + } + public override Color MenuItemPressedGradientBegin { get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } From c22f57a70e7eb46255e2dd5222e1b86f79a1c386 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Wed, 27 Jul 2022 13:45:20 +0200 Subject: [PATCH 21/33] Apply style to tabs --- src/LogExpert/Config/ColorMode.cs | 17 +++++-- src/LogExpert/Controls/LogTabControl.cs | 6 +++ .../Controls/LogTabWindow/LogTabWindow.cs | 49 +++++++++++++++++++ .../LogTabWindow/LogTabWindow.designer.cs | 3 ++ .../Dialogs/SettingsDialog.Designer.cs | 2 +- 5 files changed, 73 insertions(+), 4 deletions(-) diff --git a/src/LogExpert/Config/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs index 4ba836e9..8784db3f 100644 --- a/src/LogExpert/Config/ColorMode.cs +++ b/src/LogExpert/Config/ColorMode.cs @@ -14,14 +14,16 @@ public static class ColorMode private static System.Drawing.Color LessBrightBackgroundColor = System.Drawing.Color.FromArgb(208, 205, 206); private static System.Drawing.Color BrightBackgroundColor = System.Drawing.Color.FromArgb(221, 221, 221); private static System.Drawing.Color BrighterBackgroundColor = System.Drawing.Color.FromArgb(253, 253, 253); - private static System.Drawing.Color BrightForeColor = System.Drawing.Color.FromArgb(0,0,0); + private static System.Drawing.Color BrightForeColor = System.Drawing.Color.FromArgb(0, 0, 0); // Dark Theme // https://paletton.com/#uid=15-0u0k005U0670008J003Y003Y + private static System.Drawing.Color NearBlackColor = System.Drawing.Color.Black; + private static System.Drawing.Color LessLessDarkBackgroundColor = System.Drawing.Color.FromArgb(90, 90, 90); private static System.Drawing.Color LessDarkBackgroundColor = System.Drawing.Color.FromArgb(67, 67, 67); - private static System.Drawing.Color DarkBackgroundColor = System.Drawing.Color.FromArgb(45, 45, 45); + private static System.Drawing.Color DarkBackgroundColor = System.Drawing.Color.FromArgb(45, 45, 45); private static System.Drawing.Color DarkerBackgroundColor = System.Drawing.Color.FromArgb(30, 30, 30); - private static System.Drawing.Color DarkForeColor = System.Drawing.Color.FromArgb(255,255,255); + private static System.Drawing.Color DarkForeColor = System.Drawing.Color.FromArgb(255, 255, 255); // Default public static System.Drawing.Color BackgroundColor = LessBrightBackgroundColor; @@ -29,6 +31,9 @@ public static class ColorMode public static System.Drawing.Color ForeColor = BrightForeColor; public static System.Drawing.Color MenuBackgroundColor = BrighterBackgroundColor; public static System.Drawing.Color HoverMenuBackgroundColor = LessBrightBackgroundColor; + public static System.Drawing.Color ActiveTabColor = BrighterBackgroundColor; + public static System.Drawing.Color InactiveTabColor = LessBrightBackgroundColor; + public static System.Drawing.Color TabsBackgroundStripColor = LessBrightBackgroundColor; public static bool DarkModeEnabled = false; @@ -54,6 +59,9 @@ private static void SetDarkMode() MenuBackgroundColor = DarkerBackgroundColor; DockBackgroundColor = LessDarkBackgroundColor; HoverMenuBackgroundColor = LessDarkBackgroundColor; + TabsBackgroundStripColor = LessDarkBackgroundColor; + ActiveTabColor = LessLessDarkBackgroundColor; + InactiveTabColor = LessDarkBackgroundColor; DarkModeEnabled = true; } @@ -64,6 +72,9 @@ private static void SetBrightMode() MenuBackgroundColor = BrighterBackgroundColor; DockBackgroundColor = BrighterBackgroundColor; HoverMenuBackgroundColor = LessBrightBackgroundColor; + TabsBackgroundStripColor = BrighterBackgroundColor; + ActiveTabColor = BrighterBackgroundColor; + InactiveTabColor = LessBrightBackgroundColor; DarkModeEnabled = false; } diff --git a/src/LogExpert/Controls/LogTabControl.cs b/src/LogExpert/Controls/LogTabControl.cs index 44039c8b..39f42ad8 100644 --- a/src/LogExpert/Controls/LogTabControl.cs +++ b/src/LogExpert/Controls/LogTabControl.cs @@ -19,6 +19,12 @@ public LogTabControl() //SetStyle(ControlStyles.AllPaintingInWmPaint, true); //SetStyle(ControlStyles.UserPaint, true); //SetStyle(ControlStyles.DoubleBuffer, true); + + //foreach(TabPage tabPage in base.TabPages) + //{ + // tabPage.BackColor = LogExpert.Config.ColorMode.BackgroundColor; + // tabPage.ForeColor = LogExpert.Config.ColorMode.ForeColor; + //} } #endregion diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index 8cfb8523..7991da56 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -226,6 +226,55 @@ public void ChangeTheme(Control.ControlCollection container) item.ForeColor = LogExpert.Config.ColorMode.ForeColor; item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; } + + #region Tabs + // Tabs line + this.dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBackgroundStripColor; + this.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; + + // 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; + + 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; + + 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; + + //autoHideStripSkin1.TabGradient.StartColor = LogExpert.Config.ColorMode.TabsBarColor; + //autoHideStripSkin1.TabGradient.EndColor = LogExpert.Config.ColorMode.TabsBarColor; + + //autoHideStripSkin1.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBarColor; + //autoHideStripSkin1.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBarColor; + + //dockPaneStripSkin1.ToolWindowGradient.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBarColor; + //dockPaneStripSkin1.ToolWindowGradient.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBarColor; + + //dockPaneStripSkin1.DocumentGradient.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBarColor; + //dockPaneStripSkin1.DocumentGradient.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBarColor; + + //dockPaneStripToolWindowGradient1.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBarColor; + //dockPaneStripToolWindowGradient1.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBarColor; + + //dockPaneStripGradient1.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBarColor; + //dockPaneStripGradient1.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBarColor; + + //dockPanelGradient1.StartColor = LogExpert.Config.ColorMode.TabsBarColor; + //dockPanelGradient1.EndColor = LogExpert.Config.ColorMode.TabsBarColor; + + //dockPanelGradient2.StartColor = LogExpert.Config.ColorMode.TabsBarColor; + //dockPanelGradient3.EndColor = LogExpert.Config.ColorMode.TabsBarColor; + + //dockPanelGradient3.StartColor = LogExpert.Config.ColorMode.TabsBarColor; + //dockPanelGradient3.EndColor = LogExpert.Config.ColorMode.TabsBarColor; + #endregion Tabs } #endregion diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index 06ca1e93..ee6d83c8 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -50,6 +50,9 @@ private void InitializeComponent() WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LogTabWindow)); + + + this.statusStrip = new System.Windows.Forms.StatusStrip(); this.labelLines = new System.Windows.Forms.ToolStripStatusLabel(); this.labelSize = new System.Windows.Forms.ToolStripStatusLabel(); diff --git a/src/LogExpert/Dialogs/SettingsDialog.Designer.cs b/src/LogExpert/Dialogs/SettingsDialog.Designer.cs index cf1a5a64..1066ef2a 100644 --- a/src/LogExpert/Dialogs/SettingsDialog.Designer.cs +++ b/src/LogExpert/Dialogs/SettingsDialog.Designer.cs @@ -441,7 +441,7 @@ private void InitializeComponent() this.checkBoxDarkMode.Name = "checkBoxDarkMode"; this.checkBoxDarkMode.Size = new System.Drawing.Size(374, 26); this.checkBoxDarkMode.TabIndex = 6; - this.checkBoxDarkMode.Text = "Dark Mode (experimental, restart required)"; + this.checkBoxDarkMode.Text = "Dark Mode (restart required)"; this.checkBoxDarkMode.UseVisualStyleBackColor = true; // // checkBoxFollowTail From 7855d4ba52e6eb2c17ba5676cc14953e7014788a Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Wed, 27 Jul 2022 14:38:55 +0200 Subject: [PATCH 22/33] Rename class --- .../Controls/LogTabWindow/LogTabWindow.cs | 32 ++----------------- src/LogExpert/Controls/LogWindow/LogWindow.cs | 4 +-- src/LogExpert/Dialogs/BookmarkWindow.cs | 2 +- ...ItemExtension.cs => MenuStripExtension.cs} | 14 ++++++-- src/LogExpert/LogExpert.csproj | 2 +- 5 files changed, 19 insertions(+), 35 deletions(-) rename src/LogExpert/Extensions/{MenuItemExtension.cs => MenuStripExtension.cs} (69%) diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index 7991da56..5d8791b4 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -214,7 +214,8 @@ public void ChangeTheme(Control.ControlCollection container) #endregion // Colors for selected menus - this.mainMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuItemRenderer(); + this.mainMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer(); + this.tabContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer(); // Dock special color this.dockPanel.DockBackColor = LogExpert.Config.ColorMode.DockBackgroundColor; @@ -246,34 +247,7 @@ public void ChangeTheme(Control.ControlCollection container) 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; - - //autoHideStripSkin1.TabGradient.StartColor = LogExpert.Config.ColorMode.TabsBarColor; - //autoHideStripSkin1.TabGradient.EndColor = LogExpert.Config.ColorMode.TabsBarColor; - - //autoHideStripSkin1.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBarColor; - //autoHideStripSkin1.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBarColor; - - //dockPaneStripSkin1.ToolWindowGradient.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBarColor; - //dockPaneStripSkin1.ToolWindowGradient.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBarColor; - - //dockPaneStripSkin1.DocumentGradient.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBarColor; - //dockPaneStripSkin1.DocumentGradient.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBarColor; - - //dockPaneStripToolWindowGradient1.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBarColor; - //dockPaneStripToolWindowGradient1.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBarColor; - - //dockPaneStripGradient1.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBarColor; - //dockPaneStripGradient1.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBarColor; - - //dockPanelGradient1.StartColor = LogExpert.Config.ColorMode.TabsBarColor; - //dockPanelGradient1.EndColor = LogExpert.Config.ColorMode.TabsBarColor; - - //dockPanelGradient2.StartColor = LogExpert.Config.ColorMode.TabsBarColor; - //dockPanelGradient3.EndColor = LogExpert.Config.ColorMode.TabsBarColor; - - //dockPanelGradient3.StartColor = LogExpert.Config.ColorMode.TabsBarColor; - //dockPanelGradient3.EndColor = LogExpert.Config.ColorMode.TabsBarColor; + this.dockPanel.Skin.DockPaneStripSkin.DocumentGradient.InactiveTabGradient.TextColor = LogExpert.Config.ColorMode.ForeColor; #endregion Tabs } #endregion diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs index b08d7def..d9a20752 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs @@ -276,7 +276,7 @@ public void ChangeTheme(Control.ControlCollection container) this.dataGridView.EnableHeadersVisualStyles = false; // Colors for menu - this.dataGridContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuItemRenderer(); + this.dataGridContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer(); for (var y = 0; y < this.dataGridContextMenuStrip.Items.Count; y++) { @@ -292,7 +292,7 @@ public void ChangeTheme(Control.ControlCollection container) this.filterGridView.EnableHeadersVisualStyles = false; // Colors for menu - this.filterContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuItemRenderer(); + this.filterContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer(); for (var y = 0; y < this.filterContextMenuStrip.Items.Count; y++) { diff --git a/src/LogExpert/Dialogs/BookmarkWindow.cs b/src/LogExpert/Dialogs/BookmarkWindow.cs index 42814ecd..b525a389 100644 --- a/src/LogExpert/Dialogs/BookmarkWindow.cs +++ b/src/LogExpert/Dialogs/BookmarkWindow.cs @@ -64,7 +64,7 @@ public void ChangeTheme(Control.ControlCollection container) this.bookmarkDataGridView.EnableHeadersVisualStyles = false; // Colors for menu - this.contextMenuStrip1.Renderer = new LogExpert.Extensions.ExtendedMenuItemRenderer(); + this.contextMenuStrip1.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer(); for (var y = 0; y < this.contextMenuStrip1.Items.Count; y++) { diff --git a/src/LogExpert/Extensions/MenuItemExtension.cs b/src/LogExpert/Extensions/MenuStripExtension.cs similarity index 69% rename from src/LogExpert/Extensions/MenuItemExtension.cs rename to src/LogExpert/Extensions/MenuStripExtension.cs index fd787ab9..f59a4b00 100644 --- a/src/LogExpert/Extensions/MenuItemExtension.cs +++ b/src/LogExpert/Extensions/MenuStripExtension.cs @@ -8,13 +8,23 @@ namespace LogExpert.Extensions { - public class ExtendedMenuItemRenderer : ToolStripProfessionalRenderer + public class ExtendedMenuStripRenderer : ToolStripProfessionalRenderer { - public ExtendedMenuItemRenderer() : base(new MenuSelectedColors()) { } + public ExtendedMenuStripRenderer() : base(new MenuSelectedColors()) { } } public class MenuSelectedColors : ProfessionalColorTable { + // Not doing anything? + public override Color MenuBorder + { + get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } + } + + public override Color MenuItemBorder + { + get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } + } public override Color MenuItemSelected { diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj index a4c3c948..2034ae69 100644 --- a/src/LogExpert/LogExpert.csproj +++ b/src/LogExpert/LogExpert.csproj @@ -109,7 +109,7 @@ - + Component From 8b26241c304842d8dd4bd3d65b49e991d7105381 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Wed, 27 Jul 2022 14:41:37 +0200 Subject: [PATCH 23/33] Fixed menus borders and timeshift background --- .../Extensions/MenuStripExtension.cs | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/LogExpert/Extensions/MenuStripExtension.cs b/src/LogExpert/Extensions/MenuStripExtension.cs index f59a4b00..735a7247 100644 --- a/src/LogExpert/Extensions/MenuStripExtension.cs +++ b/src/LogExpert/Extensions/MenuStripExtension.cs @@ -15,7 +15,26 @@ public ExtendedMenuStripRenderer() : base(new MenuSelectedColors()) { } public class MenuSelectedColors : ProfessionalColorTable { - // Not doing anything? + public override Color ImageMarginGradientBegin + { + get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } + } + + public override Color ImageMarginGradientMiddle + { + get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } + } + + public override Color ImageMarginGradientEnd + { + get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } + } + + public override Color ToolStripDropDownBackground + { + get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } + } + public override Color MenuBorder { get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } From 076c1032e515601d4654478a0a3910a22b0fcb80 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Wed, 27 Jul 2022 14:46:05 +0200 Subject: [PATCH 24/33] Moved tab code in region --- src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index 5d8791b4..6b1f9b77 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -215,11 +215,13 @@ public void ChangeTheme(Control.ControlCollection container) // Colors for selected menus this.mainMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer(); - this.tabContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer(); - + // Dock special color this.dockPanel.DockBackColor = LogExpert.Config.ColorMode.DockBackgroundColor; + #region Tabs + this.tabContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer(); + // Tabs menu for (var y = 0; y < this.tabContextMenuStrip.Items.Count; y++) { @@ -228,7 +230,6 @@ public void ChangeTheme(Control.ControlCollection container) item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; } - #region Tabs // Tabs line this.dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.StartColor = LogExpert.Config.ColorMode.TabsBackgroundStripColor; this.dockPanel.Skin.DockPaneStripSkin.ToolWindowGradient.DockStripGradient.EndColor = LogExpert.Config.ColorMode.TabsBackgroundStripColor; From 027cd526c3738be97754000c8bb628618b42fab3 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Wed, 27 Jul 2022 14:51:30 +0200 Subject: [PATCH 25/33] fix toolstrip visible border --- .../Controls/LogTabWindow/LogTabWindow.cs | 3 +++ .../Extensions/ToolStripRendererExtension.cs | 19 +++++++++++++++++++ src/LogExpert/LogExpert.csproj | 1 + 3 files changed, 23 insertions(+) create mode 100644 src/LogExpert/Extensions/ToolStripRendererExtension.cs diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index 6b1f9b77..8b7e6086 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -219,6 +219,9 @@ public void ChangeTheme(Control.ControlCollection container) // Dock special color this.dockPanel.DockBackColor = LogExpert.Config.ColorMode.DockBackgroundColor; + // Remove toolstrip bottom border + this.buttonToolStrip.Renderer = new LogExpert.Extensions.ToolStripRendererExtension(); + #region Tabs this.tabContextMenuStrip.Renderer = new LogExpert.Extensions.ExtendedMenuStripRenderer(); diff --git a/src/LogExpert/Extensions/ToolStripRendererExtension.cs b/src/LogExpert/Extensions/ToolStripRendererExtension.cs new file mode 100644 index 00000000..759f1a99 --- /dev/null +++ b/src/LogExpert/Extensions/ToolStripRendererExtension.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace LogExpert.Extensions +{ + public class ToolStripRendererExtension : ToolStripSystemRenderer + { + public ToolStripRendererExtension() { } + + protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e) + { + //base.OnRenderToolStripBorder(e); + } + } +} diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj index 2034ae69..3f305247 100644 --- a/src/LogExpert/LogExpert.csproj +++ b/src/LogExpert/LogExpert.csproj @@ -117,6 +117,7 @@ Component + From a91007d2f68340d24fb5d88a71c6e3764317be28 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Wed, 27 Jul 2022 14:57:05 +0200 Subject: [PATCH 26/33] Apply style to no bookmarks background --- src/LogExpert/Config/ColorMode.cs | 6 +++++- src/LogExpert/Dialogs/BookmarkWindow.cs | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/LogExpert/Config/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs index 8784db3f..53c6e771 100644 --- a/src/LogExpert/Config/ColorMode.cs +++ b/src/LogExpert/Config/ColorMode.cs @@ -11,6 +11,7 @@ public static class ColorMode { // Bright Theme // https://paletton.com/#uid=15-0u0k00sH00kJ0pq+00RL00RL + private static System.Drawing.Color BrightBookmarkDefaultSystemColor = System.Drawing.SystemColors.Control; // Important: only supports SystemColors private static System.Drawing.Color LessBrightBackgroundColor = System.Drawing.Color.FromArgb(208, 205, 206); private static System.Drawing.Color BrightBackgroundColor = System.Drawing.Color.FromArgb(221, 221, 221); private static System.Drawing.Color BrighterBackgroundColor = System.Drawing.Color.FromArgb(253, 253, 253); @@ -18,7 +19,7 @@ public static class ColorMode // Dark Theme // https://paletton.com/#uid=15-0u0k005U0670008J003Y003Y - private static System.Drawing.Color NearBlackColor = System.Drawing.Color.Black; + private static System.Drawing.Color DarkBookmarkDefaultSystemColor = System.Drawing.SystemColors.ControlDarkDark; // Important: only supports SystemColors private static System.Drawing.Color LessLessDarkBackgroundColor = System.Drawing.Color.FromArgb(90, 90, 90); private static System.Drawing.Color LessDarkBackgroundColor = System.Drawing.Color.FromArgb(67, 67, 67); private static System.Drawing.Color DarkBackgroundColor = System.Drawing.Color.FromArgb(45, 45, 45); @@ -28,6 +29,7 @@ public static class ColorMode // Default public static System.Drawing.Color BackgroundColor = LessBrightBackgroundColor; public static System.Drawing.Color DockBackgroundColor = BrighterBackgroundColor; + public static System.Drawing.Color BookmarksDefaultBackgroundColor = BrightBookmarkDefaultSystemColor; public static System.Drawing.Color ForeColor = BrightForeColor; public static System.Drawing.Color MenuBackgroundColor = BrighterBackgroundColor; public static System.Drawing.Color HoverMenuBackgroundColor = LessBrightBackgroundColor; @@ -59,6 +61,7 @@ private static void SetDarkMode() MenuBackgroundColor = DarkerBackgroundColor; DockBackgroundColor = LessDarkBackgroundColor; HoverMenuBackgroundColor = LessDarkBackgroundColor; + BookmarksDefaultBackgroundColor = DarkBookmarkDefaultSystemColor; TabsBackgroundStripColor = LessDarkBackgroundColor; ActiveTabColor = LessLessDarkBackgroundColor; InactiveTabColor = LessDarkBackgroundColor; @@ -71,6 +74,7 @@ private static void SetBrightMode() ForeColor = BrightForeColor; MenuBackgroundColor = BrighterBackgroundColor; DockBackgroundColor = BrighterBackgroundColor; + BookmarksDefaultBackgroundColor = BrightBookmarkDefaultSystemColor; HoverMenuBackgroundColor = LessBrightBackgroundColor; TabsBackgroundStripColor = BrighterBackgroundColor; ActiveTabColor = BrighterBackgroundColor; diff --git a/src/LogExpert/Dialogs/BookmarkWindow.cs b/src/LogExpert/Dialogs/BookmarkWindow.cs index b525a389..ce64d2fb 100644 --- a/src/LogExpert/Dialogs/BookmarkWindow.cs +++ b/src/LogExpert/Dialogs/BookmarkWindow.cs @@ -57,6 +57,8 @@ public void ChangeTheme(Control.ControlCollection container) #region DataGridView + this.BackColor = LogExpert.Config.ColorMode.DockBackgroundColor; + // Main DataGridView this.bookmarkDataGridView.BackgroundColor = LogExpert.Config.ColorMode.DockBackgroundColor; this.bookmarkDataGridView.ColumnHeadersDefaultCellStyle.BackColor = LogExpert.Config.ColorMode.BackgroundColor; @@ -238,7 +240,7 @@ protected override void OnPaint(PaintEventArgs e) if (!splitContainer1.Visible) { Rectangle r = ClientRectangle; - e.Graphics.FillRectangle(SystemBrushes.ControlLight, r); + e.Graphics.FillRectangle(SystemBrushes.FromSystemColor(LogExpert.Config.ColorMode.BookmarksDefaultBackgroundColor), r); RectangleF rect = r; StringFormat sf = new StringFormat(); sf.Alignment = StringAlignment.Center; From 875c8afb0b447f0215da035ac36f35d2df0bdb25 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Wed, 27 Jul 2022 15:00:43 +0200 Subject: [PATCH 27/33] Apply style to more menu strips --- src/LogExpert/Controls/LogWindow/LogWindow.cs | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs index d9a20752..60ab28d5 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs @@ -277,6 +277,11 @@ public void ChangeTheme(Control.ControlCollection container) // 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++) { @@ -285,6 +290,41 @@ public void ChangeTheme(Control.ControlCollection container) item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor; } + for (var y = 0; y < this.bookmarkContextMenuStrip.Items.Count; y++) + { + var item = this.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++) + { + var item = this.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++) + { + var item = this.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++) + { + var item = this.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++) + { + var item = this.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; From f820fc5ec2218412ec27e4c290976c5604ea93ce Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Wed, 27 Jul 2022 15:17:47 +0200 Subject: [PATCH 28/33] Fixed pro filters alignment and logo for colors --- src/LogExpert/Controls/LogWindow/LogWindow.cs | 3 + .../Controls/LogWindow/LogWindow.designer.cs | 72 ++++++++++++------- 2 files changed, 48 insertions(+), 27 deletions(-) diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs index 60ab28d5..a266ef4c 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs @@ -342,6 +342,9 @@ public void ChangeTheme(Control.ControlCollection container) } #endregion DataGridView + + this.proFiltersRichTextBox.BackColor = LogExpert.Config.ColorMode.BackgroundColor; + this.proFiltersRichTextBox.ForeColor = LogExpert.Config.ColorMode.ForeColor; } #endregion diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs index d8b5f4c8..f6188aaa 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.designer.cs @@ -63,6 +63,7 @@ private void InitializeComponent() this.columnButton = new System.Windows.Forms.Button(); this.columnRestrictCheckBox = new System.Windows.Forms.CheckBox(); this.rangeCheckBox = new System.Windows.Forms.CheckBox(); + this.proFiltersRichTextBox = new System.Windows.Forms.RichTextBox(); this.filterRangeComboBox = new System.Windows.Forms.ComboBox(); this.columnNamesLabel = new System.Windows.Forms.Label(); this.fuzzyLabel = new System.Windows.Forms.Label(); @@ -183,7 +184,7 @@ private void InitializeComponent() this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 185F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 196F)); this.tableLayoutPanel1.Controls.Add(this.columnFinderPanel, 0, 0); this.tableLayoutPanel1.Controls.Add(this.dataGridView, 0, 1); this.tableLayoutPanel1.Controls.Add(this.timeSpreadingControl, 1, 1); @@ -432,7 +433,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.timeSpreadingControl.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.timeSpreadingControl.ForeColor = System.Drawing.Color.Teal; - this.timeSpreadingControl.Location = new System.Drawing.Point(1017, 30); + this.timeSpreadingControl.Location = new System.Drawing.Point(1028, 30); this.timeSpreadingControl.Margin = new System.Windows.Forms.Padding(2, 0, 1, 0); this.timeSpreadingControl.Name = "timeSpreadingControl"; this.timeSpreadingControl.ReverseAlpha = false; @@ -482,6 +483,7 @@ private void InitializeComponent() this.pnlProFilter.Controls.Add(this.columnButton); this.pnlProFilter.Controls.Add(this.columnRestrictCheckBox); this.pnlProFilter.Controls.Add(this.rangeCheckBox); + this.pnlProFilter.Controls.Add(this.proFiltersRichTextBox); this.pnlProFilter.Controls.Add(this.filterRangeComboBox); this.pnlProFilter.Controls.Add(this.columnNamesLabel); this.pnlProFilter.Controls.Add(this.fuzzyLabel); @@ -493,17 +495,18 @@ private void InitializeComponent() this.pnlProFilter.Controls.Add(this.lblForeSpread); this.pnlProFilter.Controls.Add(this.filterKnobForeSpread); this.pnlProFilter.Controls.Add(this.btnFilterToTab); - this.pnlProFilter.Location = new System.Drawing.Point(0, 3); + this.pnlProFilter.Location = new System.Drawing.Point(0, 1); this.pnlProFilter.Name = "pnlProFilter"; - this.pnlProFilter.Size = new System.Drawing.Size(1004, 69); + this.pnlProFilter.Size = new System.Drawing.Size(1004, 71); this.pnlProFilter.TabIndex = 0; // // columnButton // this.columnButton.Enabled = false; - this.columnButton.Location = new System.Drawing.Point(655, 30); + this.columnButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 6F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.columnButton.Location = new System.Drawing.Point(683, 30); this.columnButton.Name = "columnButton"; - this.columnButton.Size = new System.Drawing.Size(71, 23); + this.columnButton.Size = new System.Drawing.Size(100, 23); this.columnButton.TabIndex = 15; this.columnButton.Text = "Columns..."; this.helpToolTip.SetToolTip(this.columnButton, "Choose columns for \'Column restrict\'"); @@ -513,7 +516,7 @@ private void InitializeComponent() // columnRestrictCheckBox // this.columnRestrictCheckBox.AutoSize = true; - this.columnRestrictCheckBox.Location = new System.Drawing.Point(527, 37); + this.columnRestrictCheckBox.Location = new System.Drawing.Point(555, 37); this.columnRestrictCheckBox.Name = "columnRestrictCheckBox"; this.columnRestrictCheckBox.Size = new System.Drawing.Size(124, 21); this.columnRestrictCheckBox.TabIndex = 14; @@ -535,6 +538,16 @@ private void InitializeComponent() this.rangeCheckBox.UseVisualStyleBackColor = true; this.rangeCheckBox.CheckedChanged += new System.EventHandler(this.OnRangeCheckBoxCheckedChanged); // + // proFiltersRichTextBox + // + this.proFiltersRichTextBox.Font = new System.Drawing.Font("Microsoft YaHei", 9F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.proFiltersRichTextBox.Location = new System.Drawing.Point(3, 7); + this.proFiltersRichTextBox.Name = "proFiltersRichTextBox"; + this.proFiltersRichTextBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; + this.proFiltersRichTextBox.Size = new System.Drawing.Size(66, 61); + this.proFiltersRichTextBox.TabIndex = 3; + this.proFiltersRichTextBox.Text = " Pro\nFilters"; + // // filterRangeComboBox // this.filterRangeComboBox.Enabled = false; @@ -549,7 +562,7 @@ private void InitializeComponent() // columnNamesLabel // this.columnNamesLabel.AutoSize = true; - this.columnNamesLabel.Location = new System.Drawing.Point(732, 35); + this.columnNamesLabel.Location = new System.Drawing.Point(787, 34); this.columnNamesLabel.Name = "columnNamesLabel"; this.columnNamesLabel.Size = new System.Drawing.Size(99, 17); this.columnNamesLabel.TabIndex = 11; @@ -558,7 +571,7 @@ private void InitializeComponent() // fuzzyLabel // this.fuzzyLabel.AutoSize = true; - this.fuzzyLabel.Location = new System.Drawing.Point(435, 38); + this.fuzzyLabel.Location = new System.Drawing.Point(463, 38); this.fuzzyLabel.Name = "fuzzyLabel"; this.fuzzyLabel.Size = new System.Drawing.Size(75, 17); this.fuzzyLabel.TabIndex = 11; @@ -568,7 +581,7 @@ private void InitializeComponent() // this.fuzzyKnobControl.DragSensitivity = 6; this.fuzzyKnobControl.Font = new System.Drawing.Font("Verdana", 6F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.fuzzyKnobControl.Location = new System.Drawing.Point(454, 7); + this.fuzzyKnobControl.Location = new System.Drawing.Point(488, 7); this.fuzzyKnobControl.Margin = new System.Windows.Forms.Padding(2); this.fuzzyKnobControl.MaxValue = 0; this.fuzzyKnobControl.MinValue = 0; @@ -582,7 +595,7 @@ private void InitializeComponent() // invertFilterCheckBox // this.invertFilterCheckBox.AutoSize = true; - this.invertFilterCheckBox.Location = new System.Drawing.Point(527, 13); + this.invertFilterCheckBox.Location = new System.Drawing.Point(555, 13); this.invertFilterCheckBox.Name = "invertFilterCheckBox"; this.invertFilterCheckBox.Size = new System.Drawing.Size(107, 21); this.invertFilterCheckBox.TabIndex = 8; @@ -599,11 +612,12 @@ private void InitializeComponent() this.pnlProFilterLabel.Name = "pnlProFilterLabel"; this.pnlProFilterLabel.Size = new System.Drawing.Size(60, 44); this.pnlProFilterLabel.TabIndex = 7; + this.pnlProFilterLabel.Visible = false; // // lblBackSpread // this.lblBackSpread.AutoSize = true; - this.lblBackSpread.Location = new System.Drawing.Point(273, 38); + this.lblBackSpread.Location = new System.Drawing.Point(280, 38); this.lblBackSpread.Name = "lblBackSpread"; this.lblBackSpread.Size = new System.Drawing.Size(93, 17); this.lblBackSpread.TabIndex = 6; @@ -613,7 +627,7 @@ private void InitializeComponent() // this.filterKnobBackSpread.DragSensitivity = 3; this.filterKnobBackSpread.Font = new System.Drawing.Font("Verdana", 6F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.filterKnobBackSpread.Location = new System.Drawing.Point(299, 7); + this.filterKnobBackSpread.Location = new System.Drawing.Point(315, 7); this.filterKnobBackSpread.Margin = new System.Windows.Forms.Padding(2); this.filterKnobBackSpread.MaxValue = 0; this.filterKnobBackSpread.MinValue = 0; @@ -626,7 +640,7 @@ private void InitializeComponent() // lblForeSpread // this.lblForeSpread.AutoSize = true; - this.lblForeSpread.Location = new System.Drawing.Point(342, 38); + this.lblForeSpread.Location = new System.Drawing.Point(370, 38); this.lblForeSpread.Name = "lblForeSpread"; this.lblForeSpread.Size = new System.Drawing.Size(87, 17); this.lblForeSpread.TabIndex = 2; @@ -636,7 +650,7 @@ private void InitializeComponent() // this.filterKnobForeSpread.DragSensitivity = 3; this.filterKnobForeSpread.Font = new System.Drawing.Font("Verdana", 6F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.filterKnobForeSpread.Location = new System.Drawing.Point(365, 7); + this.filterKnobForeSpread.Location = new System.Drawing.Point(401, 7); this.filterKnobForeSpread.Margin = new System.Windows.Forms.Padding(2); this.filterKnobForeSpread.MaxValue = 0; this.filterKnobForeSpread.MinValue = 0; @@ -648,9 +662,10 @@ private void InitializeComponent() // // btnFilterToTab // - this.btnFilterToTab.Location = new System.Drawing.Point(655, 3); + this.btnFilterToTab.Font = new System.Drawing.Font("Microsoft Sans Serif", 6F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnFilterToTab.Location = new System.Drawing.Point(683, 3); this.btnFilterToTab.Name = "btnFilterToTab"; - this.btnFilterToTab.Size = new System.Drawing.Size(71, 23); + this.btnFilterToTab.Size = new System.Drawing.Size(100, 23); this.btnFilterToTab.TabIndex = 0; this.btnFilterToTab.Text = "Filter to Tab"; this.helpToolTip.SetToolTip(this.btnFilterToTab, "Launch a new tab with filtered content"); @@ -688,7 +703,7 @@ private void InitializeComponent() // this.highlightSplitContainer.Panel2.Controls.Add(this.highlightSplitContainerBackPanel); this.highlightSplitContainer.Panel2MinSize = 30; - this.highlightSplitContainer.Size = new System.Drawing.Size(981, 183); + this.highlightSplitContainer.Size = new System.Drawing.Size(981, 205); this.highlightSplitContainer.SplitterDistance = 612; this.highlightSplitContainer.TabIndex = 2; // @@ -722,7 +737,7 @@ private void InitializeComponent() this.filterGridView.ShowCellToolTips = false; this.filterGridView.ShowEditingIcon = false; this.filterGridView.ShowRowErrors = false; - this.filterGridView.Size = new System.Drawing.Size(610, 181); + this.filterGridView.Size = new System.Drawing.Size(610, 203); this.filterGridView.TabIndex = 1; this.filterGridView.VirtualMode = true; this.filterGridView.CellContextMenuStripNeeded += new System.Windows.Forms.DataGridViewCellContextMenuStripNeededEventHandler(this.OnFilterGridViewCellContextMenuStripNeeded); @@ -778,7 +793,7 @@ private void InitializeComponent() this.highlightSplitContainerBackPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.highlightSplitContainerBackPanel.Location = new System.Drawing.Point(0, 0); this.highlightSplitContainerBackPanel.Name = "highlightSplitContainerBackPanel"; - this.highlightSplitContainerBackPanel.Size = new System.Drawing.Size(363, 181); + this.highlightSplitContainerBackPanel.Size = new System.Drawing.Size(363, 203); this.highlightSplitContainerBackPanel.TabIndex = 1; // // hideFilterListOnLoadCheckBox @@ -861,7 +876,7 @@ private void InitializeComponent() this.filterListBox.IntegralHeight = false; this.filterListBox.Location = new System.Drawing.Point(3, 3); this.filterListBox.Name = "filterListBox"; - this.filterListBox.Size = new System.Drawing.Size(278, 176); + this.filterListBox.Size = new System.Drawing.Size(278, 198); this.filterListBox.TabIndex = 0; this.helpToolTip.SetToolTip(this.filterListBox, "Doubleclick to load a saved filter"); this.filterListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.OnFilterListBoxDrawItem); @@ -948,11 +963,12 @@ private void InitializeComponent() // advancedButton // this.advancedButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.advancedButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 6F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.advancedButton.Image = global::LogExpert.Properties.Resources.AdvancedIcon2; this.advancedButton.ImageAlign = System.Drawing.ContentAlignment.BottomRight; - this.advancedButton.Location = new System.Drawing.Point(363, 5); + this.advancedButton.Location = new System.Drawing.Point(411, 5); this.advancedButton.Name = "advancedButton"; - this.advancedButton.Size = new System.Drawing.Size(110, 21); + this.advancedButton.Size = new System.Drawing.Size(134, 21); this.advancedButton.TabIndex = 17; this.advancedButton.Text = "Show advanced..."; this.helpToolTip.SetToolTip(this.advancedButton, "Togge the advanced filter options panel"); @@ -962,7 +978,7 @@ private void InitializeComponent() // syncFilterCheckBox // this.syncFilterCheckBox.AutoSize = true; - this.syncFilterCheckBox.Location = new System.Drawing.Point(306, 7); + this.syncFilterCheckBox.Location = new System.Drawing.Point(349, 7); this.syncFilterCheckBox.Name = "syncFilterCheckBox"; this.syncFilterCheckBox.Size = new System.Drawing.Size(61, 21); this.syncFilterCheckBox.TabIndex = 16; @@ -986,7 +1002,7 @@ private void InitializeComponent() // filterTailCheckBox // this.filterTailCheckBox.AutoSize = true; - this.filterTailCheckBox.Location = new System.Drawing.Point(235, 7); + this.filterTailCheckBox.Location = new System.Drawing.Point(263, 7); this.filterTailCheckBox.Name = "filterTailCheckBox"; this.filterTailCheckBox.Size = new System.Drawing.Size(83, 21); this.filterTailCheckBox.TabIndex = 14; @@ -997,7 +1013,7 @@ private void InitializeComponent() // filterRegexCheckBox // this.filterRegexCheckBox.AutoSize = true; - this.filterRegexCheckBox.Location = new System.Drawing.Point(172, 7); + this.filterRegexCheckBox.Location = new System.Drawing.Point(191, 7); this.filterRegexCheckBox.Name = "filterRegexCheckBox"; this.filterRegexCheckBox.Size = new System.Drawing.Size(70, 21); this.filterRegexCheckBox.TabIndex = 13; @@ -1021,11 +1037,12 @@ private void InitializeComponent() // // filterSearchButton // + this.filterSearchButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 6F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.filterSearchButton.Image = global::LogExpert.Properties.Resources.AdvancedIcon2; this.filterSearchButton.ImageAlign = System.Drawing.ContentAlignment.BottomRight; this.filterSearchButton.Location = new System.Drawing.Point(3, 5); this.filterSearchButton.Name = "filterSearchButton"; - this.filterSearchButton.Size = new System.Drawing.Size(50, 21); + this.filterSearchButton.Size = new System.Drawing.Size(63, 22); this.filterSearchButton.TabIndex = 11; this.filterSearchButton.Text = "Search"; this.helpToolTip.SetToolTip(this.filterSearchButton, "Start the filter search"); @@ -1332,5 +1349,6 @@ private void InitializeComponent() private Extensions.MenuToolStripSeparatorExtension toolStripSeparator4; private Extensions.MenuToolStripSeparatorExtension toolStripSeparator5; private Extensions.MenuToolStripSeparatorExtension toolStripSeparator6; + private System.Windows.Forms.RichTextBox proFiltersRichTextBox; } } From face6f04efcfa7529771c78154c383e30b2b50de Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Wed, 27 Jul 2022 15:20:20 +0200 Subject: [PATCH 29/33] Fix filter textbox background --- src/LogExpert/Controls/LogWindow/LogWindow.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs index a266ef4c..0f9abca3 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs @@ -345,6 +345,8 @@ public void ChangeTheme(Control.ControlCollection container) this.proFiltersRichTextBox.BackColor = LogExpert.Config.ColorMode.BackgroundColor; this.proFiltersRichTextBox.ForeColor = LogExpert.Config.ColorMode.ForeColor; + + this.filterComboBox.BackColor = LogExpert.Config.ColorMode.DockBackgroundColor; } #endregion From 0d0791a026c6c5aa2b7e7264c3ec09e8e822aeb6 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Wed, 27 Jul 2022 15:38:04 +0200 Subject: [PATCH 30/33] Apply color to bookmark cells --- src/LogExpert/Classes/PaintHelper.cs | 2 +- src/LogExpert/Dialogs/BookmarkWindow.cs | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/LogExpert/Classes/PaintHelper.cs b/src/LogExpert/Classes/PaintHelper.cs index 3538321c..294a4927 100644 --- a/src/LogExpert/Classes/PaintHelper.cs +++ b/src/LogExpert/Classes/PaintHelper.cs @@ -60,7 +60,7 @@ public static void CellPainting(ILogPaintContext logPaintCtx, DataGridView gridV } else { - Color bgColor = Color.White; + Color bgColor = LogExpert.Config.ColorMode.DockBackgroundColor; if (!DebugOptions.disableWordHighlight) { if (entry != null) diff --git a/src/LogExpert/Dialogs/BookmarkWindow.cs b/src/LogExpert/Dialogs/BookmarkWindow.cs index ce64d2fb..6d9c3dd0 100644 --- a/src/LogExpert/Dialogs/BookmarkWindow.cs +++ b/src/LogExpert/Dialogs/BookmarkWindow.cs @@ -268,14 +268,15 @@ private void SetFont(string fontName, float fontSize) private void CommentPainting(DataGridView gridView, int rowIndex, DataGridViewCellPaintingEventArgs e) { + Color backColor = LogExpert.Config.ColorMode.DockBackgroundColor; + if ((e.State & DataGridViewElementStates.Selected) == DataGridViewElementStates.Selected) - { - Color backColor = e.CellStyle.SelectionBackColor; + { Brush brush; if (gridView.Focused) { // _logger.logDebug("CellPaint Focus"); - brush = new SolidBrush(e.CellStyle.SelectionBackColor); + brush = new SolidBrush(backColor); } else { @@ -289,7 +290,7 @@ private void CommentPainting(DataGridView gridView, int rowIndex, DataGridViewCe } else { - e.CellStyle.BackColor = Color.White; + e.CellStyle.BackColor = backColor; e.PaintBackground(e.CellBounds, false); } From c70d9087d7c5b74746fb6b50990559d10910cee2 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Thu, 28 Jul 2022 10:24:18 +0200 Subject: [PATCH 31/33] Remove unused new comment code --- src/LogExpert/Controls/LogTabControl.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/LogExpert/Controls/LogTabControl.cs b/src/LogExpert/Controls/LogTabControl.cs index 39f42ad8..44039c8b 100644 --- a/src/LogExpert/Controls/LogTabControl.cs +++ b/src/LogExpert/Controls/LogTabControl.cs @@ -19,12 +19,6 @@ public LogTabControl() //SetStyle(ControlStyles.AllPaintingInWmPaint, true); //SetStyle(ControlStyles.UserPaint, true); //SetStyle(ControlStyles.DoubleBuffer, true); - - //foreach(TabPage tabPage in base.TabPages) - //{ - // tabPage.BackColor = LogExpert.Config.ColorMode.BackgroundColor; - // tabPage.ForeColor = LogExpert.Config.ColorMode.ForeColor; - //} } #endregion From 6e88e1964c04045a07700a1f65f06a271f1dfec3 Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Thu, 28 Jul 2022 10:33:40 +0200 Subject: [PATCH 32/33] Log error if happens Removed unecessary this. Other code cleaning --- .../Controls/LogTabWindow/LogTabWindow.cs | 42 +++++------ src/LogExpert/Controls/LogWindow/LogWindow.cs | 71 +++++++++--------- .../Controls/LogWindow/LogWindowPrivate.cs | 3 +- src/LogExpert/Dialogs/BookmarkWindow.cs | 22 +++--- .../LineToolStripSeparatorExtension.cs | 0 .../Extensions/Forms/MenuStripExtension.cs | 40 ++++++++++ .../MenuToolStripSeparatorExtension.cs | 0 .../{ => Forms}/ToolStripRendererExtension.cs | 1 + .../Extensions/MenuStripExtension.cs | 73 ------------------- src/LogExpert/LogExpert.csproj | 8 +- 10 files changed, 118 insertions(+), 142 deletions(-) rename src/LogExpert/Extensions/{ => Forms}/LineToolStripSeparatorExtension.cs (100%) create mode 100644 src/LogExpert/Extensions/Forms/MenuStripExtension.cs rename src/LogExpert/Extensions/{ => Forms}/MenuToolStripSeparatorExtension.cs (100%) rename src/LogExpert/Extensions/{ => Forms}/ToolStripRendererExtension.cs (78%) delete mode 100644 src/LogExpert/Extensions/MenuStripExtension.cs diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index 8b7e6086..953b39c0 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -74,7 +74,7 @@ public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNum { InitializeComponent(); - ChangeTheme(this.Controls); + ChangeTheme(Controls); _startupFileNames = fileNames; this._instanceNumber = instanceNumber; @@ -206,7 +206,7 @@ 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:"); } } } @@ -214,44 +214,44 @@ public void ChangeTheme(Control.ControlCollection container) #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 diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs index 0f9abca3..4c0d1181 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs @@ -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 @@ -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 diff --git a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs index d5d5eda4..c7ca1b7b 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs @@ -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); diff --git a/src/LogExpert/Dialogs/BookmarkWindow.cs b/src/LogExpert/Dialogs/BookmarkWindow.cs index 6d9c3dd0..22ec7a8a 100644 --- a/src/LogExpert/Dialogs/BookmarkWindow.cs +++ b/src/LogExpert/Dialogs/BookmarkWindow.cs @@ -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 @@ -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; } diff --git a/src/LogExpert/Extensions/LineToolStripSeparatorExtension.cs b/src/LogExpert/Extensions/Forms/LineToolStripSeparatorExtension.cs similarity index 100% rename from src/LogExpert/Extensions/LineToolStripSeparatorExtension.cs rename to src/LogExpert/Extensions/Forms/LineToolStripSeparatorExtension.cs diff --git a/src/LogExpert/Extensions/Forms/MenuStripExtension.cs b/src/LogExpert/Extensions/Forms/MenuStripExtension.cs new file mode 100644 index 00000000..028d7bf1 --- /dev/null +++ b/src/LogExpert/Extensions/Forms/MenuStripExtension.cs @@ -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; + } +} diff --git a/src/LogExpert/Extensions/MenuToolStripSeparatorExtension.cs b/src/LogExpert/Extensions/Forms/MenuToolStripSeparatorExtension.cs similarity index 100% rename from src/LogExpert/Extensions/MenuToolStripSeparatorExtension.cs rename to src/LogExpert/Extensions/Forms/MenuToolStripSeparatorExtension.cs diff --git a/src/LogExpert/Extensions/ToolStripRendererExtension.cs b/src/LogExpert/Extensions/Forms/ToolStripRendererExtension.cs similarity index 78% rename from src/LogExpert/Extensions/ToolStripRendererExtension.cs rename to src/LogExpert/Extensions/Forms/ToolStripRendererExtension.cs index 759f1a99..6c7215e1 100644 --- a/src/LogExpert/Extensions/ToolStripRendererExtension.cs +++ b/src/LogExpert/Extensions/Forms/ToolStripRendererExtension.cs @@ -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); } } diff --git a/src/LogExpert/Extensions/MenuStripExtension.cs b/src/LogExpert/Extensions/MenuStripExtension.cs deleted file mode 100644 index 735a7247..00000000 --- a/src/LogExpert/Extensions/MenuStripExtension.cs +++ /dev/null @@ -1,73 +0,0 @@ -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 - { - get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } - } - - public override Color ImageMarginGradientMiddle - { - get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } - } - - public override Color ImageMarginGradientEnd - { - get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } - } - - public override Color ToolStripDropDownBackground - { - get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } - } - - public override Color MenuBorder - { - get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } - } - - public override Color MenuItemBorder - { - get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } - } - - public override Color MenuItemSelected - { - get { return LogExpert.Config.ColorMode.HoverMenuBackgroundColor; } - } - - public override Color MenuItemSelectedGradientBegin - { - get { return LogExpert.Config.ColorMode.HoverMenuBackgroundColor; } - } - - public override Color MenuItemSelectedGradientEnd - { - get { return LogExpert.Config.ColorMode.HoverMenuBackgroundColor; } - } - - public override Color MenuItemPressedGradientBegin - { - get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } - } - - public override Color MenuItemPressedGradientEnd - { - get { return LogExpert.Config.ColorMode.MenuBackgroundColor; } - } - } -} diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj index 3f305247..36059f81 100644 --- a/src/LogExpert/LogExpert.csproj +++ b/src/LogExpert/LogExpert.csproj @@ -109,15 +109,15 @@ - - + + Component - + Component - + From adbcd03a61e3ecad805c3004e00fa5b65ab9f62b Mon Sep 17 00:00:00 2001 From: ROUZIES Jean-Laurent Date: Thu, 28 Jul 2022 10:40:12 +0200 Subject: [PATCH 33/33] Small code cleaning --- src/LogExpert/Config/ColorMode.cs | 41 ++++++++++++++++--------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/LogExpert/Config/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs index 53c6e771..444ad857 100644 --- a/src/LogExpert/Config/ColorMode.cs +++ b/src/LogExpert/Config/ColorMode.cs @@ -4,6 +4,7 @@ using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; +using System.Drawing; namespace LogExpert.Config { @@ -11,31 +12,31 @@ public static class ColorMode { // Bright Theme // https://paletton.com/#uid=15-0u0k00sH00kJ0pq+00RL00RL - private static System.Drawing.Color BrightBookmarkDefaultSystemColor = System.Drawing.SystemColors.Control; // Important: only supports SystemColors - private static System.Drawing.Color LessBrightBackgroundColor = System.Drawing.Color.FromArgb(208, 205, 206); - private static System.Drawing.Color BrightBackgroundColor = System.Drawing.Color.FromArgb(221, 221, 221); - private static System.Drawing.Color BrighterBackgroundColor = System.Drawing.Color.FromArgb(253, 253, 253); - private static System.Drawing.Color BrightForeColor = System.Drawing.Color.FromArgb(0, 0, 0); + private static readonly Color BrightBookmarkDefaultSystemColor = SystemColors.Control; // Important: only supports SystemColors + private static readonly Color LessBrightBackgroundColor = Color.FromArgb(208, 205, 206); + private static readonly Color BrightBackgroundColor = Color.FromArgb(221, 221, 221); + private static readonly Color BrighterBackgroundColor = Color.FromArgb(253, 253, 253); + private static readonly Color BrightForeColor = Color.FromArgb(0, 0, 0); // Dark Theme // https://paletton.com/#uid=15-0u0k005U0670008J003Y003Y - private static System.Drawing.Color DarkBookmarkDefaultSystemColor = System.Drawing.SystemColors.ControlDarkDark; // Important: only supports SystemColors - private static System.Drawing.Color LessLessDarkBackgroundColor = System.Drawing.Color.FromArgb(90, 90, 90); - private static System.Drawing.Color LessDarkBackgroundColor = System.Drawing.Color.FromArgb(67, 67, 67); - private static System.Drawing.Color DarkBackgroundColor = System.Drawing.Color.FromArgb(45, 45, 45); - private static System.Drawing.Color DarkerBackgroundColor = System.Drawing.Color.FromArgb(30, 30, 30); - private static System.Drawing.Color DarkForeColor = System.Drawing.Color.FromArgb(255, 255, 255); + private static readonly Color DarkBookmarkDefaultSystemColor = SystemColors.ControlDarkDark; // Important: only supports SystemColors + private static readonly Color LessLessDarkBackgroundColor = Color.FromArgb(90, 90, 90); + private static readonly Color LessDarkBackgroundColor = Color.FromArgb(67, 67, 67); + private static readonly Color DarkBackgroundColor = Color.FromArgb(45, 45, 45); + private static readonly Color DarkerBackgroundColor = Color.FromArgb(30, 30, 30); + private static readonly Color DarkForeColor = Color.FromArgb(255, 255, 255); // Default - public static System.Drawing.Color BackgroundColor = LessBrightBackgroundColor; - public static System.Drawing.Color DockBackgroundColor = BrighterBackgroundColor; - public static System.Drawing.Color BookmarksDefaultBackgroundColor = BrightBookmarkDefaultSystemColor; - public static System.Drawing.Color ForeColor = BrightForeColor; - public static System.Drawing.Color MenuBackgroundColor = BrighterBackgroundColor; - public static System.Drawing.Color HoverMenuBackgroundColor = LessBrightBackgroundColor; - public static System.Drawing.Color ActiveTabColor = BrighterBackgroundColor; - public static System.Drawing.Color InactiveTabColor = LessBrightBackgroundColor; - public static System.Drawing.Color TabsBackgroundStripColor = LessBrightBackgroundColor; + public static Color BackgroundColor = LessBrightBackgroundColor; + public static Color DockBackgroundColor = BrighterBackgroundColor; + public static Color BookmarksDefaultBackgroundColor = BrightBookmarkDefaultSystemColor; + public static Color ForeColor = BrightForeColor; + public static Color MenuBackgroundColor = BrighterBackgroundColor; + public static Color HoverMenuBackgroundColor = LessBrightBackgroundColor; + public static Color ActiveTabColor = BrighterBackgroundColor; + public static Color InactiveTabColor = LessBrightBackgroundColor; + public static Color TabsBackgroundStripColor = LessBrightBackgroundColor; public static bool DarkModeEnabled = false;