From 93104d6a65e6e2ad700dcc1810ec68806d1b3580 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 22 Jan 2025 16:40:54 +0100 Subject: [PATCH 1/3] Separate sidebar icons from other icons --- novelwriter/gui/sidebar.py | 4 ++-- pkgutils.py | 4 ++-- utils/icon_themes.py | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/novelwriter/gui/sidebar.py b/novelwriter/gui/sidebar.py index 71e06973..be08f86a 100644 --- a/novelwriter/gui/sidebar.py +++ b/novelwriter/gui/sidebar.py @@ -145,8 +145,8 @@ class GuiSideBar(QWidget): self.tbSearch.setThemeIcon("sb_search") self.tbOutline.setThemeIcon("sb_outline") self.tbBuild.setThemeIcon("sb_build") - self.tbDetails.setThemeIcon("list") - self.tbStats.setThemeIcon("stats") + self.tbDetails.setThemeIcon("sb_details") + self.tbStats.setThemeIcon("sb_stats") self.tbSettings.setThemeIcon("settings") return diff --git a/pkgutils.py b/pkgutils.py index a4153e8b..794ce640 100755 --- a/pkgutils.py +++ b/pkgutils.py @@ -173,8 +173,8 @@ if __name__ == "__main__": cmdIcons = parsers.add_parser( "icons", help="Build icon theme files from source." ) - cmdIcons.add_argument("--sources", help="Working directory for sources.") - cmdIcons.add_argument("--style", help="What icon style to build.") + cmdIcons.add_argument("sources", help="Working directory for sources.") + cmdIcons.add_argument("style", help="What icon style to build.") cmdIcons.set_defaults(func=utils.icon_themes.main) # Import Translations diff --git a/utils/icon_themes.py b/utils/icon_themes.py index 681956c6..54044bf7 100644 --- a/utils/icon_themes.py +++ b/utils/icon_themes.py @@ -83,10 +83,12 @@ ICONS = [ "unfold-show", "sb_build", + "sb_details", "sb_novel", "sb_outline", "sb_project", "sb_search", + "sb_stats", "add", "bookmarks", From 033bccf2425572a8651a7eb390c77b3e6a95544b Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 22 Jan 2025 16:41:07 +0100 Subject: [PATCH 2/3] Update icons themes --- novelwriter/assets/icons/font_awesome.icons | 4 +++- novelwriter/assets/icons/material_filled_bold.icons | 4 +++- novelwriter/assets/icons/material_filled_normal.icons | 4 +++- novelwriter/assets/icons/material_filled_thin.icons | 4 +++- novelwriter/assets/icons/material_rounded_bold.icons | 4 +++- novelwriter/assets/icons/material_rounded_normal.icons | 4 +++- novelwriter/assets/icons/material_rounded_thin.icons | 4 +++- novelwriter/assets/icons/remix_filled.icons | 4 +++- novelwriter/assets/icons/remix_outline.icons | 4 +++- utils/icon_themes/font_awesome.json | 4 +++- utils/icon_themes/material_symbols.json | 4 +++- utils/icon_themes/remix.json | 4 +++- 12 files changed, 36 insertions(+), 12 deletions(-) diff --git a/novelwriter/assets/icons/font_awesome.icons b/novelwriter/assets/icons/font_awesome.icons index a216a561..550fd857 100644 --- a/novelwriter/assets/icons/font_awesome.icons +++ b/novelwriter/assets/icons/font_awesome.icons @@ -50,10 +50,12 @@ icon:bullet-on = icon:unfold-show = icon:sb_build = +icon:sb_details = icon:sb_novel = icon:sb_outline = icon:sb_project = icon:sb_search = +icon:sb_stats = icon:add = icon:bookmarks = icon:browse = @@ -99,7 +101,7 @@ icon:remove = icon:settings = icon:star = -icon:stats = +icon:stats = icon:text = icon:timer_off = icon:timer = diff --git a/novelwriter/assets/icons/material_filled_bold.icons b/novelwriter/assets/icons/material_filled_bold.icons index 0fb07866..bc902698 100644 --- a/novelwriter/assets/icons/material_filled_bold.icons +++ b/novelwriter/assets/icons/material_filled_bold.icons @@ -50,10 +50,12 @@ icon:bullet-on = icon:unfold-show = icon:sb_build = +icon:sb_details = icon:sb_novel = icon:sb_outline = icon:sb_project = icon:sb_search = +icon:sb_stats = icon:add = icon:bookmarks = icon:browse = @@ -99,7 +101,7 @@ icon:remove = icon:settings = icon:star = -icon:stats = +icon:stats = icon:text = icon:timer_off = icon:timer = diff --git a/novelwriter/assets/icons/material_filled_normal.icons b/novelwriter/assets/icons/material_filled_normal.icons index 2c97b623..ce666d14 100644 --- a/novelwriter/assets/icons/material_filled_normal.icons +++ b/novelwriter/assets/icons/material_filled_normal.icons @@ -50,10 +50,12 @@ icon:bullet-on = icon:unfold-show = icon:sb_build = +icon:sb_details = icon:sb_novel = icon:sb_outline = icon:sb_project = icon:sb_search = +icon:sb_stats = icon:add = icon:bookmarks = icon:browse = @@ -99,7 +101,7 @@ icon:remove = icon:settings = icon:star = -icon:stats = +icon:stats = icon:text = icon:timer_off = icon:timer = diff --git a/novelwriter/assets/icons/material_filled_thin.icons b/novelwriter/assets/icons/material_filled_thin.icons index bcd4ef97..70c4f364 100644 --- a/novelwriter/assets/icons/material_filled_thin.icons +++ b/novelwriter/assets/icons/material_filled_thin.icons @@ -50,10 +50,12 @@ icon:bullet-on = icon:unfold-show = icon:sb_build = +icon:sb_details = icon:sb_novel = icon:sb_outline = icon:sb_project = icon:sb_search = +icon:sb_stats = icon:add = icon:bookmarks = icon:browse = @@ -99,7 +101,7 @@ icon:remove = icon:settings = icon:star = -icon:stats = +icon:stats = icon:text = icon:timer_off = icon:timer = diff --git a/novelwriter/assets/icons/material_rounded_bold.icons b/novelwriter/assets/icons/material_rounded_bold.icons index 6b7eb336..08564be2 100644 --- a/novelwriter/assets/icons/material_rounded_bold.icons +++ b/novelwriter/assets/icons/material_rounded_bold.icons @@ -50,10 +50,12 @@ icon:bullet-on = icon:unfold-show = icon:sb_build = +icon:sb_details = icon:sb_novel = icon:sb_outline = icon:sb_project = icon:sb_search = +icon:sb_stats = icon:add = icon:bookmarks = icon:browse = @@ -99,7 +101,7 @@ icon:remove = icon:settings = icon:star = -icon:stats = +icon:stats = icon:text = icon:timer_off = icon:timer = diff --git a/novelwriter/assets/icons/material_rounded_normal.icons b/novelwriter/assets/icons/material_rounded_normal.icons index 945a8c6b..3da2739e 100644 --- a/novelwriter/assets/icons/material_rounded_normal.icons +++ b/novelwriter/assets/icons/material_rounded_normal.icons @@ -50,10 +50,12 @@ icon:bullet-on = icon:unfold-show = icon:sb_build = +icon:sb_details = icon:sb_novel = icon:sb_outline = icon:sb_project = icon:sb_search = +icon:sb_stats = icon:add = icon:bookmarks = icon:browse = @@ -99,7 +101,7 @@ icon:remove = icon:settings = icon:star = -icon:stats = +icon:stats = icon:text = icon:timer_off = icon:timer = diff --git a/novelwriter/assets/icons/material_rounded_thin.icons b/novelwriter/assets/icons/material_rounded_thin.icons index cb6f05b5..61fcd5fa 100644 --- a/novelwriter/assets/icons/material_rounded_thin.icons +++ b/novelwriter/assets/icons/material_rounded_thin.icons @@ -50,10 +50,12 @@ icon:bullet-on = icon:unfold-show = icon:sb_build = +icon:sb_details = icon:sb_novel = icon:sb_outline = icon:sb_project = icon:sb_search = +icon:sb_stats = icon:add = icon:bookmarks = icon:browse = @@ -99,7 +101,7 @@ icon:remove = icon:settings = icon:star = -icon:stats = +icon:stats = icon:text = icon:timer_off = icon:timer = diff --git a/novelwriter/assets/icons/remix_filled.icons b/novelwriter/assets/icons/remix_filled.icons index 8e0b23a9..14c8a9fd 100644 --- a/novelwriter/assets/icons/remix_filled.icons +++ b/novelwriter/assets/icons/remix_filled.icons @@ -50,10 +50,12 @@ icon:bullet-on = icon:unfold-show = icon:sb_build = +icon:sb_details = icon:sb_novel = icon:sb_outline = icon:sb_project = icon:sb_search = +icon:sb_stats = icon:add = icon:bookmarks = icon:browse = @@ -98,7 +100,7 @@ icon:remove = icon:settings = icon:star = -icon:stats = +icon:stats = icon:text = icon:timer_off = icon:timer = diff --git a/novelwriter/assets/icons/remix_outline.icons b/novelwriter/assets/icons/remix_outline.icons index bbb82732..bde0b111 100644 --- a/novelwriter/assets/icons/remix_outline.icons +++ b/novelwriter/assets/icons/remix_outline.icons @@ -50,10 +50,12 @@ icon:bullet-on = icon:unfold-show = icon:sb_build = +icon:sb_details = icon:sb_novel = icon:sb_outline = icon:sb_project = icon:sb_search = +icon:sb_stats = icon:add = icon:bookmarks = icon:browse = @@ -98,7 +100,7 @@ icon:remove = icon:settings = icon:star = -icon:stats = +icon:stats = icon:text = icon:timer_off = icon:timer = diff --git a/utils/icon_themes/font_awesome.json b/utils/icon_themes/font_awesome.json index d33c95a6..5ed09376 100644 --- a/utils/icon_themes/font_awesome.json +++ b/utils/icon_themes/font_awesome.json @@ -49,10 +49,12 @@ "unfold-show": "caret-down", "sb_build": "up-right-from-square", + "sb_details": "list", "sb_novel": "book-open", "sb_outline": "table-list", "sb_project": "pen-to-square", "sb_search": "magnifying-glass", + "sb_stats": "chart-simple", "add": "plus", "bookmarks": "bookmark", @@ -99,7 +101,7 @@ "revert": "arrow-rotate-left", "settings": "gear", "star": "star", - "stats": "chart-simple", + "stats": "chart-line", "text": "file-lines", "timer_off": "pause", "timer": "clock", diff --git a/utils/icon_themes/material_symbols.json b/utils/icon_themes/material_symbols.json index 6dbc752c..230f5c60 100644 --- a/utils/icon_themes/material_symbols.json +++ b/utils/icon_themes/material_symbols.json @@ -49,10 +49,12 @@ "unfold-show": "arrow_drop_down", "sb_build": "export_notes", + "sb_details": "format_list_bulleted", "sb_novel": "book_4_spark", "sb_outline": "summarize", "sb_project": "bookmark_manager", "sb_search": "search", + "sb_stats": "bar_chart", "add": "add", "bookmarks": "bookmarks", @@ -99,7 +101,7 @@ "revert": "settings_backup_restore", "settings": "settings", "star": "star", - "stats": "bar_chart", + "stats": "stacked_line_chart", "text": "subject", "timer_off": "timer_off", "timer": "timer", diff --git a/utils/icon_themes/remix.json b/utils/icon_themes/remix.json index 8c7d8ff9..e14aa701 100644 --- a/utils/icon_themes/remix.json +++ b/utils/icon_themes/remix.json @@ -49,10 +49,12 @@ "unfold-show": "arrow-down-s-fill", "sb_build": "stack", + "sb_details": "pages", "sb_novel": "booklet", "sb_outline": "timeline-view", "sb_project": "file-edit", "sb_search": "file-search", + "sb_stats": "bar-chart-fill", "add": "add", "bookmarks": "bookmark", @@ -99,7 +101,7 @@ "revert": "reset-left", "settings": "settings-2", "star": "star-fill", - "stats": "numbers", + "stats": "line-chart", "text": "file-text", "timer_off": "zzz", "timer": "timer", From 2735f30eab6d0a16b8d961ecf6e11e08eb23e4ad Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:01:20 +0100 Subject: [PATCH 3/3] Fix side panel header margins --- novelwriter/gui/noveltree.py | 4 ++-- novelwriter/gui/projtree.py | 2 +- novelwriter/gui/search.py | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/novelwriter/gui/noveltree.py b/novelwriter/gui/noveltree.py index 619700cb..8ce78da3 100644 --- a/novelwriter/gui/noveltree.py +++ b/novelwriter/gui/noveltree.py @@ -248,7 +248,7 @@ class GuiNovelToolBar(QWidget): self.outerBox.addWidget(self.tbNovel) self.outerBox.addWidget(self.tbRefresh) self.outerBox.addWidget(self.tbMore) - self.outerBox.setContentsMargins(2, 2, 0, 2) + self.outerBox.setContentsMargins(4, 2, 0, 2) self.outerBox.setSpacing(0) self.setLayout(self.outerBox) @@ -393,7 +393,7 @@ class GuiNovelTree(QTreeWidget): self.setUniformRowHeights(True) self.setAllColumnsShowFocus(True) self.setHeaderHidden(True) - self.setIndentation(0) + self.setIndentation(2) self.setColumnCount(4) self.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) self.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) diff --git a/novelwriter/gui/projtree.py b/novelwriter/gui/projtree.py index b32bae4b..0be15929 100644 --- a/novelwriter/gui/projtree.py +++ b/novelwriter/gui/projtree.py @@ -335,7 +335,7 @@ class GuiProjectToolBar(QWidget): self.outerBox.addWidget(self.tbMoveD) self.outerBox.addWidget(self.tbAdd) self.outerBox.addWidget(self.tbMore) - self.outerBox.setContentsMargins(2, 2, 0, 2) + self.outerBox.setContentsMargins(4, 2, 0, 2) self.outerBox.setSpacing(0) self.setLayout(self.outerBox) diff --git a/novelwriter/gui/search.py b/novelwriter/gui/search.py index 3c44c82a..fdf5dbe7 100644 --- a/novelwriter/gui/search.py +++ b/novelwriter/gui/search.py @@ -28,7 +28,7 @@ import logging from time import time from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot -from PyQt6.QtGui import QAction, QCursor, QKeyEvent +from PyQt6.QtGui import QAction, QCursor, QKeyEvent, QPalette from PyQt6.QtWidgets import ( QApplication, QFrame, QHBoxLayout, QLabel, QLineEdit, QToolBar, QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget @@ -74,7 +74,7 @@ class GuiProjectSearch(QWidget): # Header self.viewLabel = QLabel(self.tr("Project Search"), self) self.viewLabel.setFont(SHARED.theme.guiFontB) - self.viewLabel.setContentsMargins(2, 4, 0, 2) + self.viewLabel.setContentsMargins(4, 4, 0, 2) # Options self.searchOpt = QToolBar(self) @@ -138,6 +138,7 @@ class GuiProjectSearch(QWidget): self.outerBox.setContentsMargins(0, 0, 0, 0) self.outerBox.setSpacing(2) + self.setAutoFillBackground(True) self.setLayout(self.outerBox) self.updateTheme() @@ -155,6 +156,8 @@ class GuiProjectSearch(QWidget): qPalette = self.palette() colBase = cssCol(qPalette.base().color()) colFocus = cssCol(qPalette.highlight().color()) + qPalette.setBrush(QPalette.ColorRole.Window, qPalette.base()) + self.setPalette(qPalette) self.setStyleSheet( "QToolBar {padding: 0; background: none;} "