Skip to content

Use dark-themed images and colors in dark mode #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mfkeeq199458 wants to merge 6 commits into
base: Development
Choose a base branch
from
Open

Use dark-themed images and colors in dark mode #746

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
beb5701
Use dark-themed images and colors in dark mode
mfkeeq199458 Oct 23, 2026
6277580
Address review feedback for dark theme color tuning
mfkeeq199458 Oct 23, 2026
3048b64
Merge branch 'LogExperts:Development' into feature/dark-theme-color-t…
mfkeeq199458 Oct 24, 2026
e48c0cf
fix: address PR review feedback round 3
mfkeeq199458 Oct 24, 2026
9474536
fix: regenerate Designer and use nameof for themed images
mfkeeq199458 Oct 28, 2026
746c9b3
refactor: pass darkMode explicitly in ApplyThemedImages
mfkeeq199458 Oct 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 78 additions & 0 deletions src/LogExpert.Resources/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,75 +122,141 @@
<value>images\png\48\Add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<comment>Add</comment>
</data>
<data name="Add_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ArrowDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\ArrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<comment>ArrowDown</comment>
</data>
<data name="ArrowDown_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\ArrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ArrowLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\ArrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ArrowLeft_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\ArrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ArrowRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\ArrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ArrowRight_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\ArrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ArrowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\ArrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ArrowUp_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\ArrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Arrow_menu_close" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Arrow_menu_close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<comment>Arrow_menu_close</comment>
</data>
<data name="Arrow_menu_close_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Arrow_menu_close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Arrow_menu_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Arrow_menu_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<comment>Arrow_menu_open</comment>
</data>
<data name="Arrow_menu_open_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Arrow_menu_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bookmarks" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Bookmarks.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bookmarks_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Bookmarks.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bookmark_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Bookmark_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bookmark_add_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Bookmark_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bookmark_added" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Bookmark_added.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bookmark_added_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Bookmark_added.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SettingsDialog_UI_Label_labelMaxDisplayLength" xml:space="preserve">
<value>Maximum Display Length (restart required)</value>
</data>
<data name="bookmark_bubbles" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\bookmark_bubbles.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bookmark_bubbles_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\bookmark_bubbles.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bookmark_manager" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Bookmark_manager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bookmark_manager_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Bookmark_manager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bookmark_remove" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Bookmark_remove.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bookmark_remove_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Bookmark_remove.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Check_circle" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Check_circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Check_circle_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Check_circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Close" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Close_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Deceased" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Deceased.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Deceased_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Deceased.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Delete_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Exit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Exit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Exit_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Exit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Favorite" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Favorite.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Favorite_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Favorite.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="File_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\File_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="File_open_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\File_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Filter" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Filter_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Folder_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Folder_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Folder_open_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Folder_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="LogExpert_Common_UI_Message_ClipboardInUse" xml:space="preserve">
<value>Could not copy to the clipboard. It is in use by another application. Please try again.</value>
</data>
Expand All @@ -215,16 +281,28 @@
<data name="Restart_alt" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Restart_alt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Restart_alt_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Restart_alt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Search_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<comment>Settings Logo</comment>
</data>
<data name="Settings_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Star" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48\Star.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Star_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>images\png\48_dark\Star.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="LogExpert_Common_UI_Title_Error" xml:space="preserve">
<value>LogExpert Error</value>
<comment>LogExpert Error Title</comment>
Expand Down
19 changes: 19 additions & 0 deletions src/LogExpert.Resources/ThemedImages.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System.Drawing;

namespace LogExpert;

public static class ThemedImages
{
public static Bitmap Get (string name, bool darkMode)
{
if (darkMode)
{
if (Resources.ResourceManager.GetObject(name + "_dark") is Bitmap dark)
{
return dark;
}
}

return (Bitmap)Resources.ResourceManager.GetObject(name);
}
}
Binary file added src/LogExpert.Resources/images/png/48_dark/Add.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/ArrowDown.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/ArrowLeft.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/ArrowRight.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/ArrowUp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Arrow_menu_close.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Arrow_menu_open.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Bookmark_add.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Bookmark_added.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Bookmark_manager.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Bookmark_remove.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Bookmarks.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Check_circle.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Close.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Deceased.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Delete.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Exit.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Favorite.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/File_open.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Filter.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Folder_open.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Restart_alt.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Search.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Settings.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/Star.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/LogExpert.Resources/images/png/48_dark/bookmark_bubbles.png
View file
Open in desktop
13 changes: 9 additions & 4 deletions src/LogExpert.UI/Controls/ColorComboBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,28 @@ private void OnColorComboBoxDrawItem (object sender, DrawItemEventArgs e)
e.DrawBackground();
if (e.Index >= 0)
{
var darkMode = Application.IsDarkModeEnabled;
var textBrush = darkMode ? Brushes.White : Brushes.Black;
var borderPen = darkMode ? Pens.White : Pens.Black;

Rectangle rectangle = new(4, e.Bounds.Top + 2, 30, e.Bounds.Height - 4);
var rectColor = (Color)Items[e.Index];
e.Graphics.FillRectangle(new SolidBrush(rectColor), rectangle);
e.Graphics.DrawRectangle(Pens.Black, rectangle);
e.Graphics.DrawRectangle(borderPen, rectangle);

if (e.Index == 0)
{
e.Graphics.DrawString(Resources.ColorComboBox_UI_ColorComboBox_Text_Custom, e.Font, Brushes.Black, new PointF(42, e.Bounds.Top + 2));
e.Graphics.DrawString(Resources.ColorComboBox_UI_ColorComboBox_Text_Custom, e.Font, textBrush, new PointF(42, e.Bounds.Top + 2));
}
else
{
e.Graphics.DrawString(((Color)Items[e.Index]).Name, e.Font, Brushes.Black, new PointF(42, e.Bounds.Top + 2));
e.Graphics.DrawString(((Color)Items[e.Index]).Name, e.Font, textBrush, new PointF(42, e.Bounds.Top + 2));
}

if (!Enabled)
{
HatchBrush brush = new(HatchStyle.Percent50, Color.LightGray, Color.FromArgb(10, Color.LightGray));
var hatchLight = darkMode ? Color.DarkGray : Color.LightGray;
HatchBrush brush = new(HatchStyle.Percent50, hatchLight, Color.FromArgb(10, hatchLight));
rectangle.Inflate(1, 1);
e.Graphics.FillRectangle(brush, rectangle);
brush.Dispose();
Expand Down
21 changes: 15 additions & 6 deletions src/LogExpert.UI/Controls/LogWindow/LogWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ internal partial class LogWindow : DockContent, ILogPaintContextUI, ILogView, IL
private const string FONT_VERDANA = "Verdana";
private static readonly Logger _logger = LogManager.GetCurrentClassLogger();

private static readonly Color _bookmarkColor = Color.FromArgb(165, 200, 225);
private static readonly Color _autoBookmarkColor = Color.FromArgb(180, 210, 180);
private static readonly Color _bookmarkColorDark = Color.FromArgb(140, 195, 240);
private static readonly Color _autoBookmarkColorDark = Color.FromArgb(150, 215, 150);

private readonly Image _advancedButtonImage;

private readonly BookmarkDataProvider _bookmarkProvider = new();
Expand Down Expand Up @@ -267,8 +272,9 @@ public LogWindow (ILogWindowCoordinator logWindowCoordinator, string fileName, b
dataGridView.EditModeMenuStrip = editModeContextMenuStrip;
markEditModeToolStripMenuItem.Enabled = true;

_panelOpenButtonImage = Resources.Arrow_menu_open;
_panelCloseButtonImage = Resources.Arrow_menu_close;
var darkImages = Application.IsDarkModeEnabled;
_panelOpenButtonImage = ThemedImages.Get("Arrow_menu_open", darkImages);
_panelCloseButtonImage = ThemedImages.Get("Arrow_menu_close", darkImages);

var settings = configManager.Settings;

Expand Down Expand Up @@ -352,14 +358,14 @@ public LogWindow (ILogWindowCoordinator logWindowCoordinator, string fileName, b
#region Properties

[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public Color BookmarkColor { get; set; } = Color.FromArgb(165, 200, 225);
public Color BookmarkColor { get; set; } = _bookmarkColor;

/// <summary>
/// Color used to paint the bookmark marker in column 0 for auto-generated (highlight-triggered) bookmarks. Uses a
/// lighter/more desaturated shade to distinguish from manual bookmarks.
/// </summary>
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public Color AutoBookmarkColor { get; set; } = Color.FromArgb(180, 210, 180);
public Color AutoBookmarkColor { get; set; } = _autoBookmarkColor;

public ILogLineMemoryColumnizer CurrentColumnizer
{
Expand Down Expand Up @@ -528,7 +534,7 @@ private void ApplyResourceImages ()
pnlProFilterLabel.BackgroundImage = Resources.Pro_Filter;
btnFilterDown.BackgroundImage = Resources.ArrowDown;
btnFilterUp.BackgroundImage = Resources.ArrowUp;
btnToggleHighlightPanel.Image = Resources.Arrow_menu_open;
btnToggleHighlightPanel.Image = ThemedImages.Get("Arrow_menu_open", Application.IsDarkModeEnabled);
}

private void ApplyCheckBoxResources ()
Expand Down Expand Up @@ -2741,6 +2747,9 @@ private void CreateDefaultViewStyle ()
filterGridView.RowsDefaultCellStyle = PaintHelper.GetDataGridDefaultRowStyle(darkMode);
PaintHelper.ApplyGridViewTheme(dataGridView, darkMode);
PaintHelper.ApplyGridViewTheme(filterGridView, darkMode);

BookmarkColor = darkMode ? _bookmarkColorDark : _bookmarkColor;
AutoBookmarkColor = darkMode ? _autoBookmarkColorDark : _autoBookmarkColor;
}

[SupportedOSPlatform("windows")]
Expand Down Expand Up @@ -6635,7 +6644,7 @@ public void CellPainting (bool focused, int rowIndex, int columnIndex, bool isFi
var fontName = isFilteredGridView ? FONT_VERDANA : FONT_COURIER_NEW;
var stringToDraw = isFilteredGridView ? "!" : "i";

using var brush2 = new SolidBrush(Color.FromArgb(255, 190, 100, 0)); //dark orange
using var brush2 = new SolidBrush(PaintHelper.BookmarkMarkerTextColor);
using var font = new Font(fontName, Preferences.Font.Size, FontStyle.Bold);
e.Graphics.DrawString(stringToDraw, font, brush2, new RectangleF(rect.Left, rect.Top, rect.Width, rect.Height), _format);
}
Expand Down
Loading
Loading