From 9af412e29a055dcfabfe9292f6f83c5c1392d086 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Tue, 2 Jun 2020 20:32:47 +0200 Subject: [PATCH] Added some icons to the outline view --- nw/assets/icons/fallback/hash-dark.svg | 55 +++++++++++++++++++ nw/assets/icons/fallback/hash.svg | 55 +++++++++++++++++++ nw/assets/icons/typicons_colour_dark/hash.svg | 55 +++++++++++++++++++ .../icons/typicons_colour_dark/icons.conf | 10 ++-- .../icons/typicons_colour_light/hash.svg | 55 +++++++++++++++++++ .../icons/typicons_colour_light/icons.conf | 10 ++-- nw/assets/icons/typicons_grey_dark/hash.svg | 55 +++++++++++++++++++ nw/assets/icons/typicons_grey_dark/icons.conf | 9 ++- nw/assets/icons/typicons_grey_light/hash.svg | 55 +++++++++++++++++++ .../icons/typicons_grey_light/icons.conf | 9 ++- nw/gui/outline.py | 3 +- nw/gui/theme.py | 1 + 12 files changed, 357 insertions(+), 15 deletions(-) create mode 100644 nw/assets/icons/fallback/hash-dark.svg create mode 100644 nw/assets/icons/fallback/hash.svg create mode 100644 nw/assets/icons/typicons_colour_dark/hash.svg create mode 100644 nw/assets/icons/typicons_colour_light/hash.svg create mode 100644 nw/assets/icons/typicons_grey_dark/hash.svg create mode 100644 nw/assets/icons/typicons_grey_light/hash.svg diff --git a/nw/assets/icons/fallback/hash-dark.svg b/nw/assets/icons/fallback/hash-dark.svg new file mode 100644 index 00000000..551d7993 --- /dev/null +++ b/nw/assets/icons/fallback/hash-dark.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/nw/assets/icons/fallback/hash.svg b/nw/assets/icons/fallback/hash.svg new file mode 100644 index 00000000..1553201b --- /dev/null +++ b/nw/assets/icons/fallback/hash.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/nw/assets/icons/typicons_colour_dark/hash.svg b/nw/assets/icons/typicons_colour_dark/hash.svg new file mode 100644 index 00000000..b1c34da8 --- /dev/null +++ b/nw/assets/icons/typicons_colour_dark/hash.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/nw/assets/icons/typicons_colour_dark/icons.conf b/nw/assets/icons/typicons_colour_dark/icons.conf index f3c96935..76290410 100644 --- a/nw/assets/icons/typicons_colour_dark/icons.conf +++ b/nw/assets/icons/typicons_colour_dark/icons.conf @@ -1,8 +1,9 @@ ## -# Icons: Typicons Colour Dark -# Source: https://github.com/stephenhutchings/typicons.font -# Credit: Stephen Hutchings -# Modified: Veronica Berglyd Olsen +# Icons: Typicons Colour Dark +# Source: https://github.com/stephenhutchings/typicons.font +# Credit: Stephen Hutchings +# Modified: Veronica Berglyd Olsen +# Additions: hash.svg ## [Main] @@ -39,3 +40,4 @@ save = download.svg edit = pencil.svg check = tick.svg cross = times.svg +hash = hash.svg diff --git a/nw/assets/icons/typicons_colour_light/hash.svg b/nw/assets/icons/typicons_colour_light/hash.svg new file mode 100644 index 00000000..e191e8b4 --- /dev/null +++ b/nw/assets/icons/typicons_colour_light/hash.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/nw/assets/icons/typicons_colour_light/icons.conf b/nw/assets/icons/typicons_colour_light/icons.conf index d3df7d01..08042fc9 100644 --- a/nw/assets/icons/typicons_colour_light/icons.conf +++ b/nw/assets/icons/typicons_colour_light/icons.conf @@ -1,8 +1,9 @@ ## -# Icons: Typicons Colour Light -# Source: https://github.com/stephenhutchings/typicons.font -# Credit: Stephen Hutchings -# Modified: Veronica Berglyd Olsen +# Icons: Typicons Colour Light +# Source: https://github.com/stephenhutchings/typicons.font +# Credit: Stephen Hutchings +# Modified: Veronica Berglyd Olsen +# Additions: hash.svg ## [Main] @@ -39,3 +40,4 @@ save = download.svg edit = pencil.svg check = tick.svg cross = times.svg +hash = hash.svg diff --git a/nw/assets/icons/typicons_grey_dark/hash.svg b/nw/assets/icons/typicons_grey_dark/hash.svg new file mode 100644 index 00000000..a6b9a654 --- /dev/null +++ b/nw/assets/icons/typicons_grey_dark/hash.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/nw/assets/icons/typicons_grey_dark/icons.conf b/nw/assets/icons/typicons_grey_dark/icons.conf index 75268e23..d81f4adf 100644 --- a/nw/assets/icons/typicons_grey_dark/icons.conf +++ b/nw/assets/icons/typicons_grey_dark/icons.conf @@ -1,7 +1,9 @@ ## -# Icons: Typicons Grey Dark -# Source: https://github.com/stephenhutchings/typicons.font -# Credit: Stephen Hutchings +# Icons: Typicons Grey Dark +# Source: https://github.com/stephenhutchings/typicons.font +# Credit: Stephen Hutchings +# Modified: Veronica Berglyd Olsen +# Additions: hash.svg ## [Main] @@ -38,3 +40,4 @@ save = download.svg edit = pencil.svg check = tick.svg cross = times.svg +hash = hash.svg diff --git a/nw/assets/icons/typicons_grey_light/hash.svg b/nw/assets/icons/typicons_grey_light/hash.svg new file mode 100644 index 00000000..1553201b --- /dev/null +++ b/nw/assets/icons/typicons_grey_light/hash.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/nw/assets/icons/typicons_grey_light/icons.conf b/nw/assets/icons/typicons_grey_light/icons.conf index 766aed98..2b26abc8 100644 --- a/nw/assets/icons/typicons_grey_light/icons.conf +++ b/nw/assets/icons/typicons_grey_light/icons.conf @@ -1,7 +1,9 @@ ## -# Icons: Typicons Grey Light -# Source: https://github.com/stephenhutchings/typicons.font -# Credit: Stephen Hutchings +# Icons: Typicons Grey Light +# Source: https://github.com/stephenhutchings/typicons.font +# Credit: Stephen Hutchings +# Modified: Veronica Berglyd Olsen +# Additions: hash.svg ## [Main] @@ -38,3 +40,4 @@ save = download.svg edit = pencil.svg check = tick.svg cross = times.svg +hash = hash.svg diff --git a/nw/gui/outline.py b/nw/gui/outline.py index 0636cddc..12c26383 100644 --- a/nw/gui/outline.py +++ b/nw/gui/outline.py @@ -410,9 +410,10 @@ class GuiProjectOutline(QTreeWidget): newItem.setText(self.colIndex[nwOutline.TITLE], novIdx["title"]) newItem.setData(self.colIndex[nwOutline.TITLE], Qt.UserRole, tHandle) - newItem.setIcon(self.colIndex[nwOutline.TITLE], self.theTheme.getIcon("proj_document")) + newItem.setIcon(self.colIndex[nwOutline.TITLE], self.theTheme.getIcon("hash")) newItem.setText(self.colIndex[nwOutline.LEVEL], novIdx["level"]) newItem.setText(self.colIndex[nwOutline.LABEL], nwItem.itemName) + newItem.setIcon(self.colIndex[nwOutline.LABEL], self.theTheme.getIcon("proj_document")) newItem.setText(self.colIndex[nwOutline.LINE], sTitle[1:].lstrip("0")) newItem.setText(self.colIndex[nwOutline.SYNOP], novIdx["synopsis"]) newItem.setText(self.colIndex[nwOutline.CCOUNT], str(novIdx["cCount"])) diff --git a/nw/gui/theme.py b/nw/gui/theme.py index 8613c683..49ea367c 100644 --- a/nw/gui/theme.py +++ b/nw/gui/theme.py @@ -516,6 +516,7 @@ class GuiIcons: "edit" : (None, None), "check" : (None, None), "cross" : (None, None), + "hash" : (None, None), ## Other Icons "warning" : (QStyle.SP_MessageBoxWarning, "dialog-warning"),