From 4c4139078adab5485ecfd50d58dca58ab0993972 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 7 May 2023 19:36:52 +0200 Subject: [PATCH] Add icons to document filters --- novelwriter/extensions/switchbox.py | 2 +- novelwriter/gui/theme.py | 2 +- novelwriter/tools/mbuild.py | 23 ++++++++++++++++++----- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/novelwriter/extensions/switchbox.py b/novelwriter/extensions/switchbox.py index 57e43f7e..d036ccb6 100644 --- a/novelwriter/extensions/switchbox.py +++ b/novelwriter/extensions/switchbox.py @@ -43,7 +43,7 @@ class NSwitchBox(QScrollArea): self._index = 0 self._hSwitch = baseSize self._wSwitch = 2*self._hSwitch - self._sIcon = int(round(0.8*baseSize)) + self._sIcon = baseSize self.clear() diff --git a/novelwriter/gui/theme.py b/novelwriter/gui/theme.py index e7473ef0..bfb6c3de 100644 --- a/novelwriter/gui/theme.py +++ b/novelwriter/gui/theme.py @@ -444,7 +444,7 @@ class GuiIcons: """ ICON_KEYS = { - # Project and GUI icons + # Project and GUI Icons "novelwriter", "build_excluded", "build_filtered", "build_included", "cls_archive", "cls_character", "cls_custom", "cls_entity", "cls_none", "cls_novel", "cls_object", "cls_plot", "cls_timeline", "cls_trash", "cls_world", "proj_chapter", "proj_details", diff --git a/novelwriter/tools/mbuild.py b/novelwriter/tools/mbuild.py index 8eed17bb..f9a1de6b 100644 --- a/novelwriter/tools/mbuild.py +++ b/novelwriter/tools/mbuild.py @@ -333,11 +333,24 @@ class GuiBuildFilterTab(QWidget): buildSettings = self.buildOpts["settings"] self.filterOpt.addLabel(buildSettings.getLabel("filter")) - for key in ["filter.includeNovel", "filter.includeNotes", "filter.includeInactive"]: - label = buildSettings.getLabel(key) - value = buildSettings.getValue(key) - if isinstance(value, bool): - self.filterOpt.addItem(QIcon(), label, f"doc:{key}", default=value) + self.filterOpt.addItem( + self.mainTheme.getIcon("proj_scene"), + buildSettings.getLabel("filter.includeNovel"), + "doc:filter.includeNovel", + default=buildSettings.getValue("filter.includeNovel") or False + ) + self.filterOpt.addItem( + self.mainTheme.getIcon("proj_note"), + buildSettings.getLabel("filter.includeNotes"), + "doc:filter.includeNotes", + default=buildSettings.getValue("filter.includeNotes") or False + ) + self.filterOpt.addItem( + self.mainTheme.getIcon("unchecked"), + buildSettings.getLabel("filter.includeInactive"), + "doc:filter.includeInactive", + default=buildSettings.getValue("filter.includeInactive") or False + ) self.filterOpt.addSeparator()