From 1fb9648c6c667ea08540d55091c97f9388d88016 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 26 Aug 2021 18:01:52 +0200 Subject: [PATCH] Drop grey icon themes (#869) * Add settings translator for icon themes * Rename `typicons_colour_*` to `typicons_*` * Delete grey icon themes * Delete outdated paragraph in main README * Fix tests --- README.md | 5 +- .../README.md | 0 .../arrow-maximise.svg | 0 .../arrow-minimise.svg | 0 .../at.svg | 0 .../backspace.svg | 0 .../book.svg | 0 .../bookmark.svg | 0 .../calendar.svg | 0 .../cancel.svg | 0 .../chevron-left.svg | 0 .../chevron-right.svg | 0 .../delete.svg | 0 .../document-chapter.svg | 0 .../document-note.svg | 0 .../document-scene.svg | 0 .../document-text.svg | 0 .../document-title.svg | 0 .../download.svg | 0 .../flag.svg | 0 .../folder.svg | 0 .../globe.svg | 0 .../hash.svg | 0 .../heading0.svg | 0 .../heading1.svg | 0 .../heading2.svg | 0 .../heading3.svg | 0 .../heading4.svg | 0 .../icons.conf | 4 +- .../input-checked.svg | 0 .../key.svg | 0 .../location.svg | 0 .../media-record-outline.svg | 0 .../media-record.svg | 0 .../minus.svg | 0 .../pencil.svg | 0 .../pin-outline.svg | 0 .../pin.svg | 0 .../plus.svg | 0 .../puzzle.svg | 0 .../refresh.svg | 0 .../search-replace.svg | 0 .../search.svg | 0 .../star.svg | 0 .../stopwatch.svg | 0 .../tick.svg | 0 .../times.svg | 0 .../trash.svg | 0 .../user.svg | 0 .../assets/icons/typicons_grey_dark/README.md | 5 -- .../typicons_grey_dark/arrow-maximise.svg | 56 ----------------- .../typicons_grey_dark/arrow-minimise.svg | 55 ---------------- .../assets/icons/typicons_grey_dark/at.svg | 31 --------- .../icons/typicons_grey_dark/backspace.svg | 31 --------- .../assets/icons/typicons_grey_dark/book.svg | 31 --------- .../icons/typicons_grey_dark/bookmark.svg | 31 --------- .../icons/typicons_grey_dark/calendar.svg | 31 --------- .../icons/typicons_grey_dark/cancel.svg | 31 --------- .../icons/typicons_grey_dark/chevron-left.svg | 31 --------- .../typicons_grey_dark/chevron-right.svg | 31 --------- .../icons/typicons_grey_dark/delete.svg | 31 --------- .../typicons_grey_dark/document-text.svg | 39 ------------ .../typicons_grey_dark/document-title.svg | 47 -------------- .../icons/typicons_grey_dark/download.svg | 31 --------- .../assets/icons/typicons_grey_dark/flag.svg | 31 --------- .../icons/typicons_grey_dark/folder.svg | 31 --------- .../assets/icons/typicons_grey_dark/globe.svg | 31 --------- .../assets/icons/typicons_grey_dark/hash.svg | 31 --------- .../icons/typicons_grey_dark/heading0.svg | 31 --------- .../icons/typicons_grey_dark/heading1.svg | 37 ----------- .../icons/typicons_grey_dark/heading2.svg | 43 ------------- .../icons/typicons_grey_dark/heading3.svg | 49 --------------- .../icons/typicons_grey_dark/heading4.svg | 55 ---------------- .../icons/typicons_grey_dark/icons.conf | 63 ------------------- .../typicons_grey_dark/input-checked.svg | 31 --------- .../assets/icons/typicons_grey_dark/key.svg | 31 --------- .../icons/typicons_grey_dark/location.svg | 31 --------- .../media-record-outline.svg | 31 --------- .../icons/typicons_grey_dark/media-record.svg | 31 --------- .../assets/icons/typicons_grey_dark/minus.svg | 31 --------- .../icons/typicons_grey_dark/pencil.svg | 31 --------- .../icons/typicons_grey_dark/pin-outline.svg | 31 --------- .../assets/icons/typicons_grey_dark/pin.svg | 31 --------- .../assets/icons/typicons_grey_dark/plus.svg | 31 --------- .../icons/typicons_grey_dark/puzzle.svg | 31 --------- .../icons/typicons_grey_dark/refresh.svg | 56 ----------------- .../typicons_grey_dark/search-replace.svg | 34 ---------- .../icons/typicons_grey_dark/search.svg | 31 --------- .../assets/icons/typicons_grey_dark/star.svg | 31 --------- .../icons/typicons_grey_dark/stopwatch.svg | 36 ----------- .../assets/icons/typicons_grey_dark/tick.svg | 31 --------- .../assets/icons/typicons_grey_dark/times.svg | 31 --------- .../assets/icons/typicons_grey_dark/trash.svg | 31 --------- .../assets/icons/typicons_grey_dark/user.svg | 31 --------- .../icons/typicons_grey_light/README.md | 5 -- .../typicons_grey_light/arrow-maximise.svg | 56 ----------------- .../typicons_grey_light/arrow-minimise.svg | 55 ---------------- .../assets/icons/typicons_grey_light/at.svg | 31 --------- .../icons/typicons_grey_light/backspace.svg | 31 --------- .../assets/icons/typicons_grey_light/book.svg | 31 --------- .../icons/typicons_grey_light/bookmark.svg | 31 --------- .../icons/typicons_grey_light/calendar.svg | 31 --------- .../icons/typicons_grey_light/cancel.svg | 31 --------- .../typicons_grey_light/chevron-left.svg | 31 --------- .../typicons_grey_light/chevron-right.svg | 31 --------- .../icons/typicons_grey_light/delete.svg | 31 --------- .../typicons_grey_light/document-text.svg | 39 ------------ .../typicons_grey_light/document-title.svg | 47 -------------- .../icons/typicons_grey_light/download.svg | 31 --------- .../assets/icons/typicons_grey_light/flag.svg | 31 --------- .../icons/typicons_grey_light/folder.svg | 31 --------- .../icons/typicons_grey_light/globe.svg | 31 --------- .../assets/icons/typicons_grey_light/hash.svg | 31 --------- .../icons/typicons_grey_light/heading0.svg | 31 --------- .../icons/typicons_grey_light/heading1.svg | 37 ----------- .../icons/typicons_grey_light/heading2.svg | 43 ------------- .../icons/typicons_grey_light/heading3.svg | 49 --------------- .../icons/typicons_grey_light/heading4.svg | 55 ---------------- .../icons/typicons_grey_light/icons.conf | 63 ------------------- .../typicons_grey_light/input-checked.svg | 31 --------- .../assets/icons/typicons_grey_light/key.svg | 31 --------- .../icons/typicons_grey_light/location.svg | 31 --------- .../media-record-outline.svg | 31 --------- .../typicons_grey_light/media-record.svg | 31 --------- .../icons/typicons_grey_light/minus.svg | 31 --------- .../icons/typicons_grey_light/pencil.svg | 31 --------- .../icons/typicons_grey_light/pin-outline.svg | 31 --------- .../assets/icons/typicons_grey_light/pin.svg | 31 --------- .../assets/icons/typicons_grey_light/plus.svg | 31 --------- .../icons/typicons_grey_light/puzzle.svg | 31 --------- .../icons/typicons_grey_light/refresh.svg | 56 ----------------- .../typicons_grey_light/search-replace.svg | 34 ---------- .../icons/typicons_grey_light/search.svg | 31 --------- .../assets/icons/typicons_grey_light/star.svg | 31 --------- .../icons/typicons_grey_light/stopwatch.svg | 36 ----------- .../assets/icons/typicons_grey_light/tick.svg | 31 --------- .../icons/typicons_grey_light/times.svg | 31 --------- .../icons/typicons_grey_light/trash.svg | 31 --------- .../assets/icons/typicons_grey_light/user.svg | 31 --------- .../README.md | 0 .../arrow-maximise.svg | 0 .../arrow-minimise.svg | 0 .../at.svg | 0 .../backspace.svg | 0 .../book.svg | 0 .../bookmark.svg | 0 .../calendar.svg | 0 .../cancel.svg | 0 .../chevron-left.svg | 0 .../chevron-right.svg | 0 .../delete.svg | 0 .../document-chapter.svg | 0 .../document-note.svg | 0 .../document-scene.svg | 0 .../document-text.svg | 0 .../document-title.svg | 0 .../download.svg | 0 .../flag.svg | 0 .../folder.svg | 0 .../globe.svg | 0 .../hash.svg | 0 .../heading0.svg | 0 .../heading1.svg | 0 .../heading2.svg | 0 .../heading3.svg | 0 .../heading4.svg | 0 .../icons.conf | 4 +- .../input-checked.svg | 0 .../key.svg | 0 .../location.svg | 0 .../media-record-outline.svg | 0 .../media-record.svg | 0 .../minus.svg | 0 .../pencil.svg | 0 .../pin-outline.svg | 0 .../pin.svg | 0 .../plus.svg | 0 .../puzzle.svg | 0 .../refresh.svg | 0 .../search-replace.svg | 0 .../search.svg | 0 .../star.svg | 0 .../stopwatch.svg | 0 .../tick.svg | 0 .../times.svg | 0 .../trash.svg | 0 .../user.svg | 0 novelwriter/config.py | 8 ++- tests/reference/baseConfig_novelwriter.conf | 4 +- .../reference/guiPreferences_novelwriter.conf | 6 +- tests/test_base/test_base_config.py | 42 ++++++++++--- tests/test_gui/test_gui_theme.py | 4 +- 192 files changed, 53 insertions(+), 3158 deletions(-) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/README.md (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/arrow-maximise.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/arrow-minimise.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/at.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/backspace.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/book.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/bookmark.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/calendar.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/cancel.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/chevron-left.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/chevron-right.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/delete.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/document-chapter.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/document-note.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/document-scene.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/document-text.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/document-title.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/download.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/flag.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/folder.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/globe.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/hash.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/heading0.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/heading1.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/heading2.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/heading3.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/heading4.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/icons.conf (96%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/input-checked.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/key.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/location.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/media-record-outline.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/media-record.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/minus.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/pencil.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/pin-outline.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/pin.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/plus.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/puzzle.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/refresh.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/search-replace.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/search.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/star.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/stopwatch.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/tick.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/times.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/trash.svg (100%) rename novelwriter/assets/icons/{typicons_colour_dark => typicons_dark}/user.svg (100%) delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/README.md delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/arrow-maximise.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/arrow-minimise.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/at.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/backspace.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/book.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/bookmark.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/calendar.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/cancel.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/chevron-left.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/chevron-right.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/delete.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/document-text.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/document-title.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/download.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/flag.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/folder.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/globe.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/hash.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/heading0.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/heading1.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/heading2.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/heading3.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/heading4.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/icons.conf delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/input-checked.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/key.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/location.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/media-record-outline.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/media-record.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/minus.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/pencil.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/pin-outline.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/pin.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/plus.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/puzzle.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/refresh.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/search-replace.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/search.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/star.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/stopwatch.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/tick.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/times.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/trash.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_dark/user.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/README.md delete mode 100644 novelwriter/assets/icons/typicons_grey_light/arrow-maximise.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/arrow-minimise.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/at.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/backspace.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/book.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/bookmark.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/calendar.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/cancel.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/chevron-left.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/chevron-right.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/delete.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/document-text.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/document-title.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/download.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/flag.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/folder.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/globe.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/hash.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/heading0.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/heading1.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/heading2.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/heading3.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/heading4.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/icons.conf delete mode 100644 novelwriter/assets/icons/typicons_grey_light/input-checked.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/key.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/location.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/media-record-outline.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/media-record.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/minus.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/pencil.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/pin-outline.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/pin.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/plus.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/puzzle.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/refresh.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/search-replace.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/search.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/star.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/stopwatch.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/tick.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/times.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/trash.svg delete mode 100644 novelwriter/assets/icons/typicons_grey_light/user.svg rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/README.md (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/arrow-maximise.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/arrow-minimise.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/at.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/backspace.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/book.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/bookmark.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/calendar.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/cancel.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/chevron-left.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/chevron-right.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/delete.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/document-chapter.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/document-note.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/document-scene.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/document-text.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/document-title.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/download.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/flag.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/folder.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/globe.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/hash.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/heading0.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/heading1.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/heading2.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/heading3.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/heading4.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/icons.conf (96%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/input-checked.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/key.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/location.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/media-record-outline.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/media-record.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/minus.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/pencil.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/pin-outline.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/pin.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/plus.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/puzzle.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/refresh.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/search-replace.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/search.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/star.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/stopwatch.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/tick.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/times.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/trash.svg (100%) rename novelwriter/assets/icons/{typicons_colour_light => typicons_light}/user.svg (100%) diff --git a/README.md b/README.md index 6d589bf0..bd26bf9c 100644 --- a/README.md +++ b/README.md @@ -114,10 +114,7 @@ to. Headings of level one signify a book or partition title. Headings of level t start of a new chapter. Headings of level three signify the start of a new scene. Headings of level four can be used internally in each scene to create separate sections. -Each novel file can be assigned a layout format, which shows up as a flag next to the item in the -project tree. These are mostly to help the user track what they contain, but they also have some -impact on the layout of the exported document. See the -[documentation](https://novelwriter.readthedocs.io) for further details. +See the [documentation](https://novelwriter.readthedocs.io) for further details. ### Project Notes diff --git a/novelwriter/assets/icons/typicons_colour_dark/README.md b/novelwriter/assets/icons/typicons_dark/README.md similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/README.md rename to novelwriter/assets/icons/typicons_dark/README.md diff --git a/novelwriter/assets/icons/typicons_colour_dark/arrow-maximise.svg b/novelwriter/assets/icons/typicons_dark/arrow-maximise.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/arrow-maximise.svg rename to novelwriter/assets/icons/typicons_dark/arrow-maximise.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/arrow-minimise.svg b/novelwriter/assets/icons/typicons_dark/arrow-minimise.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/arrow-minimise.svg rename to novelwriter/assets/icons/typicons_dark/arrow-minimise.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/at.svg b/novelwriter/assets/icons/typicons_dark/at.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/at.svg rename to novelwriter/assets/icons/typicons_dark/at.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/backspace.svg b/novelwriter/assets/icons/typicons_dark/backspace.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/backspace.svg rename to novelwriter/assets/icons/typicons_dark/backspace.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/book.svg b/novelwriter/assets/icons/typicons_dark/book.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/book.svg rename to novelwriter/assets/icons/typicons_dark/book.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/bookmark.svg b/novelwriter/assets/icons/typicons_dark/bookmark.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/bookmark.svg rename to novelwriter/assets/icons/typicons_dark/bookmark.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/calendar.svg b/novelwriter/assets/icons/typicons_dark/calendar.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/calendar.svg rename to novelwriter/assets/icons/typicons_dark/calendar.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/cancel.svg b/novelwriter/assets/icons/typicons_dark/cancel.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/cancel.svg rename to novelwriter/assets/icons/typicons_dark/cancel.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/chevron-left.svg b/novelwriter/assets/icons/typicons_dark/chevron-left.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/chevron-left.svg rename to novelwriter/assets/icons/typicons_dark/chevron-left.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/chevron-right.svg b/novelwriter/assets/icons/typicons_dark/chevron-right.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/chevron-right.svg rename to novelwriter/assets/icons/typicons_dark/chevron-right.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/delete.svg b/novelwriter/assets/icons/typicons_dark/delete.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/delete.svg rename to novelwriter/assets/icons/typicons_dark/delete.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/document-chapter.svg b/novelwriter/assets/icons/typicons_dark/document-chapter.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/document-chapter.svg rename to novelwriter/assets/icons/typicons_dark/document-chapter.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/document-note.svg b/novelwriter/assets/icons/typicons_dark/document-note.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/document-note.svg rename to novelwriter/assets/icons/typicons_dark/document-note.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/document-scene.svg b/novelwriter/assets/icons/typicons_dark/document-scene.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/document-scene.svg rename to novelwriter/assets/icons/typicons_dark/document-scene.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/document-text.svg b/novelwriter/assets/icons/typicons_dark/document-text.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/document-text.svg rename to novelwriter/assets/icons/typicons_dark/document-text.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/document-title.svg b/novelwriter/assets/icons/typicons_dark/document-title.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/document-title.svg rename to novelwriter/assets/icons/typicons_dark/document-title.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/download.svg b/novelwriter/assets/icons/typicons_dark/download.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/download.svg rename to novelwriter/assets/icons/typicons_dark/download.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/flag.svg b/novelwriter/assets/icons/typicons_dark/flag.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/flag.svg rename to novelwriter/assets/icons/typicons_dark/flag.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/folder.svg b/novelwriter/assets/icons/typicons_dark/folder.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/folder.svg rename to novelwriter/assets/icons/typicons_dark/folder.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/globe.svg b/novelwriter/assets/icons/typicons_dark/globe.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/globe.svg rename to novelwriter/assets/icons/typicons_dark/globe.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/hash.svg b/novelwriter/assets/icons/typicons_dark/hash.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/hash.svg rename to novelwriter/assets/icons/typicons_dark/hash.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/heading0.svg b/novelwriter/assets/icons/typicons_dark/heading0.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/heading0.svg rename to novelwriter/assets/icons/typicons_dark/heading0.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/heading1.svg b/novelwriter/assets/icons/typicons_dark/heading1.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/heading1.svg rename to novelwriter/assets/icons/typicons_dark/heading1.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/heading2.svg b/novelwriter/assets/icons/typicons_dark/heading2.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/heading2.svg rename to novelwriter/assets/icons/typicons_dark/heading2.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/heading3.svg b/novelwriter/assets/icons/typicons_dark/heading3.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/heading3.svg rename to novelwriter/assets/icons/typicons_dark/heading3.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/heading4.svg b/novelwriter/assets/icons/typicons_dark/heading4.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/heading4.svg rename to novelwriter/assets/icons/typicons_dark/heading4.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/icons.conf b/novelwriter/assets/icons/typicons_dark/icons.conf similarity index 96% rename from novelwriter/assets/icons/typicons_colour_dark/icons.conf rename to novelwriter/assets/icons/typicons_dark/icons.conf index bbfe8468..99bee3fe 100644 --- a/novelwriter/assets/icons/typicons_colour_dark/icons.conf +++ b/novelwriter/assets/icons/typicons_dark/icons.conf @@ -1,5 +1,5 @@ ## -# Icons: Typicons Colour Dark +# Icons: Typicons Dark # Source: https://github.com/stephenhutchings/typicons.font # Credit: Stephen Hutchings # Modified: Veronica Berglyd Olsen @@ -7,7 +7,7 @@ ## [Main] -name = Typicons Colour Dark +name = Typicons Dark description = Colourised icons for dark GUI theme based on Typicons. author = Veronica Berglyd Olsen (adaptation) credit = Stephen Hutchings (icon design) diff --git a/novelwriter/assets/icons/typicons_colour_dark/input-checked.svg b/novelwriter/assets/icons/typicons_dark/input-checked.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/input-checked.svg rename to novelwriter/assets/icons/typicons_dark/input-checked.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/key.svg b/novelwriter/assets/icons/typicons_dark/key.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/key.svg rename to novelwriter/assets/icons/typicons_dark/key.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/location.svg b/novelwriter/assets/icons/typicons_dark/location.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/location.svg rename to novelwriter/assets/icons/typicons_dark/location.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/media-record-outline.svg b/novelwriter/assets/icons/typicons_dark/media-record-outline.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/media-record-outline.svg rename to novelwriter/assets/icons/typicons_dark/media-record-outline.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/media-record.svg b/novelwriter/assets/icons/typicons_dark/media-record.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/media-record.svg rename to novelwriter/assets/icons/typicons_dark/media-record.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/minus.svg b/novelwriter/assets/icons/typicons_dark/minus.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/minus.svg rename to novelwriter/assets/icons/typicons_dark/minus.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/pencil.svg b/novelwriter/assets/icons/typicons_dark/pencil.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/pencil.svg rename to novelwriter/assets/icons/typicons_dark/pencil.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/pin-outline.svg b/novelwriter/assets/icons/typicons_dark/pin-outline.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/pin-outline.svg rename to novelwriter/assets/icons/typicons_dark/pin-outline.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/pin.svg b/novelwriter/assets/icons/typicons_dark/pin.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/pin.svg rename to novelwriter/assets/icons/typicons_dark/pin.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/plus.svg b/novelwriter/assets/icons/typicons_dark/plus.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/plus.svg rename to novelwriter/assets/icons/typicons_dark/plus.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/puzzle.svg b/novelwriter/assets/icons/typicons_dark/puzzle.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/puzzle.svg rename to novelwriter/assets/icons/typicons_dark/puzzle.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/refresh.svg b/novelwriter/assets/icons/typicons_dark/refresh.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/refresh.svg rename to novelwriter/assets/icons/typicons_dark/refresh.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/search-replace.svg b/novelwriter/assets/icons/typicons_dark/search-replace.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/search-replace.svg rename to novelwriter/assets/icons/typicons_dark/search-replace.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/search.svg b/novelwriter/assets/icons/typicons_dark/search.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/search.svg rename to novelwriter/assets/icons/typicons_dark/search.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/star.svg b/novelwriter/assets/icons/typicons_dark/star.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/star.svg rename to novelwriter/assets/icons/typicons_dark/star.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/stopwatch.svg b/novelwriter/assets/icons/typicons_dark/stopwatch.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/stopwatch.svg rename to novelwriter/assets/icons/typicons_dark/stopwatch.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/tick.svg b/novelwriter/assets/icons/typicons_dark/tick.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/tick.svg rename to novelwriter/assets/icons/typicons_dark/tick.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/times.svg b/novelwriter/assets/icons/typicons_dark/times.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/times.svg rename to novelwriter/assets/icons/typicons_dark/times.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/trash.svg b/novelwriter/assets/icons/typicons_dark/trash.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/trash.svg rename to novelwriter/assets/icons/typicons_dark/trash.svg diff --git a/novelwriter/assets/icons/typicons_colour_dark/user.svg b/novelwriter/assets/icons/typicons_dark/user.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_dark/user.svg rename to novelwriter/assets/icons/typicons_dark/user.svg diff --git a/novelwriter/assets/icons/typicons_grey_dark/README.md b/novelwriter/assets/icons/typicons_grey_dark/README.md deleted file mode 100644 index cfa5ea08..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/README.md +++ /dev/null @@ -1,5 +0,0 @@ -## Typicons - -Copyright: Stephen Hutchings -Source: https://github.com/stephenhutchings/typicons.font -License: [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) diff --git a/novelwriter/assets/icons/typicons_grey_dark/arrow-maximise.svg b/novelwriter/assets/icons/typicons_grey_dark/arrow-maximise.svg deleted file mode 100644 index 1ce767a3..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/arrow-maximise.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/arrow-minimise.svg b/novelwriter/assets/icons/typicons_grey_dark/arrow-minimise.svg deleted file mode 100644 index 4bc48ce2..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/arrow-minimise.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/at.svg b/novelwriter/assets/icons/typicons_grey_dark/at.svg deleted file mode 100644 index 4d98eb91..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/at.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/backspace.svg b/novelwriter/assets/icons/typicons_grey_dark/backspace.svg deleted file mode 100644 index 986a811a..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/backspace.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/book.svg b/novelwriter/assets/icons/typicons_grey_dark/book.svg deleted file mode 100644 index 0d2c4b15..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/book.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/bookmark.svg b/novelwriter/assets/icons/typicons_grey_dark/bookmark.svg deleted file mode 100644 index e57b19b0..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/bookmark.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/calendar.svg b/novelwriter/assets/icons/typicons_grey_dark/calendar.svg deleted file mode 100644 index ee172d24..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/calendar.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/cancel.svg b/novelwriter/assets/icons/typicons_grey_dark/cancel.svg deleted file mode 100644 index 92d956e6..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/cancel.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/chevron-left.svg b/novelwriter/assets/icons/typicons_grey_dark/chevron-left.svg deleted file mode 100644 index bc1c987f..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/chevron-left.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/chevron-right.svg b/novelwriter/assets/icons/typicons_grey_dark/chevron-right.svg deleted file mode 100644 index 18eafe98..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/chevron-right.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/delete.svg b/novelwriter/assets/icons/typicons_grey_dark/delete.svg deleted file mode 100644 index 2bed1483..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/delete.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/document-text.svg b/novelwriter/assets/icons/typicons_grey_dark/document-text.svg deleted file mode 100644 index 551239c3..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/document-text.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/document-title.svg b/novelwriter/assets/icons/typicons_grey_dark/document-title.svg deleted file mode 100644 index 9dbdfb81..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/document-title.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/download.svg b/novelwriter/assets/icons/typicons_grey_dark/download.svg deleted file mode 100644 index 16e66c44..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/download.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/flag.svg b/novelwriter/assets/icons/typicons_grey_dark/flag.svg deleted file mode 100644 index af492a48..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/flag.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/folder.svg b/novelwriter/assets/icons/typicons_grey_dark/folder.svg deleted file mode 100644 index b2db161c..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/folder.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/globe.svg b/novelwriter/assets/icons/typicons_grey_dark/globe.svg deleted file mode 100644 index aef68b3b..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/globe.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/hash.svg b/novelwriter/assets/icons/typicons_grey_dark/hash.svg deleted file mode 100644 index 9f3db253..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/hash.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/heading0.svg b/novelwriter/assets/icons/typicons_grey_dark/heading0.svg deleted file mode 100644 index 4cf4dcc3..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/heading0.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/heading1.svg b/novelwriter/assets/icons/typicons_grey_dark/heading1.svg deleted file mode 100644 index 28bcaaaa..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/heading1.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/heading2.svg b/novelwriter/assets/icons/typicons_grey_dark/heading2.svg deleted file mode 100644 index 0183b97f..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/heading2.svg +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/heading3.svg b/novelwriter/assets/icons/typicons_grey_dark/heading3.svg deleted file mode 100644 index 498cc9a1..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/heading3.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/heading4.svg b/novelwriter/assets/icons/typicons_grey_dark/heading4.svg deleted file mode 100644 index 0470a292..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/heading4.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/icons.conf b/novelwriter/assets/icons/typicons_grey_dark/icons.conf deleted file mode 100644 index e66d3cf5..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/icons.conf +++ /dev/null @@ -1,63 +0,0 @@ -## -# Icons: Typicons Grey Dark -# Source: https://github.com/stephenhutchings/typicons.font -# Credit: Stephen Hutchings -# Modified: Veronica Berglyd Olsen -# Additions: hash.svg -## - -[Main] -name = Typicons Grey Dark -description = Greyscaled icons for dark GUI theme based on Typicons. -author = Veronica Berglyd Olsen (adaptation) -credit = Stephen Hutchings (icon design) -url = https://github.com/stephenhutchings/typicons.font -license = CC BY-SA 4.0 -licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ - -[Map] -cls_none = cancel.svg -cls_novel = book.svg -cls_plot = puzzle.svg -cls_character = user.svg -cls_world = location.svg -cls_timeline = calendar.svg -cls_object = key.svg -cls_entity = flag.svg -cls_custom = star.svg -cls_archive = delete.svg -cls_trash = trash.svg -proj_document = document-text.svg -proj_title = document-title.svg -proj_chapter = document-title.svg -proj_scene = document-title.svg -proj_note = document-text.svg -proj_folder = folder.svg -doc_h0 = heading0.svg -doc_h1 = heading1.svg -doc_h2 = heading2.svg -doc_h3 = heading3.svg -doc_h4 = heading4.svg -delete = delete.svg -add = plus.svg -remove = minus.svg -close = times.svg -refresh = refresh.svg -maximise = arrow-maximise.svg -minimise = arrow-minimise.svg -done = input-checked.svg -search = search.svg -search-replace = search-replace.svg -clear = backspace.svg -save = download.svg -edit = pencil.svg -check = tick.svg -cross = times.svg -hash = hash.svg -reference = at.svg -backward = chevron-left.svg -forward = chevron-right.svg -sticky-on = pin.svg -sticky-off = pin-outline.svg -bullet-on = media-record.svg -bullet-off = media-record-outline.svg diff --git a/novelwriter/assets/icons/typicons_grey_dark/input-checked.svg b/novelwriter/assets/icons/typicons_grey_dark/input-checked.svg deleted file mode 100644 index d3187cc4..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/input-checked.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/key.svg b/novelwriter/assets/icons/typicons_grey_dark/key.svg deleted file mode 100644 index c1414292..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/key.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/location.svg b/novelwriter/assets/icons/typicons_grey_dark/location.svg deleted file mode 100644 index 606ee954..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/location.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/media-record-outline.svg b/novelwriter/assets/icons/typicons_grey_dark/media-record-outline.svg deleted file mode 100644 index 46e56070..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/media-record-outline.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/media-record.svg b/novelwriter/assets/icons/typicons_grey_dark/media-record.svg deleted file mode 100644 index ba3d9739..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/media-record.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/minus.svg b/novelwriter/assets/icons/typicons_grey_dark/minus.svg deleted file mode 100644 index 799e4ff3..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/minus.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/pencil.svg b/novelwriter/assets/icons/typicons_grey_dark/pencil.svg deleted file mode 100644 index f7665c6b..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/pencil.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/pin-outline.svg b/novelwriter/assets/icons/typicons_grey_dark/pin-outline.svg deleted file mode 100644 index f571d5c9..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/pin-outline.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/pin.svg b/novelwriter/assets/icons/typicons_grey_dark/pin.svg deleted file mode 100644 index 62c6a66b..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/pin.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/plus.svg b/novelwriter/assets/icons/typicons_grey_dark/plus.svg deleted file mode 100644 index 0846263d..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/plus.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/puzzle.svg b/novelwriter/assets/icons/typicons_grey_dark/puzzle.svg deleted file mode 100644 index 2065d392..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/puzzle.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/refresh.svg b/novelwriter/assets/icons/typicons_grey_dark/refresh.svg deleted file mode 100644 index 31367a18..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/refresh.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/search-replace.svg b/novelwriter/assets/icons/typicons_grey_dark/search-replace.svg deleted file mode 100644 index 193ffb49..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/search-replace.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/search.svg b/novelwriter/assets/icons/typicons_grey_dark/search.svg deleted file mode 100644 index ecf47350..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/search.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/star.svg b/novelwriter/assets/icons/typicons_grey_dark/star.svg deleted file mode 100644 index 638606c8..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/star.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/stopwatch.svg b/novelwriter/assets/icons/typicons_grey_dark/stopwatch.svg deleted file mode 100644 index 345a74d0..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/stopwatch.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/tick.svg b/novelwriter/assets/icons/typicons_grey_dark/tick.svg deleted file mode 100644 index 0c1bea67..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/tick.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/times.svg b/novelwriter/assets/icons/typicons_grey_dark/times.svg deleted file mode 100644 index f863c42b..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/times.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/trash.svg b/novelwriter/assets/icons/typicons_grey_dark/trash.svg deleted file mode 100644 index 77bdba7c..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/trash.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_dark/user.svg b/novelwriter/assets/icons/typicons_grey_dark/user.svg deleted file mode 100644 index e83ff20e..00000000 --- a/novelwriter/assets/icons/typicons_grey_dark/user.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/README.md b/novelwriter/assets/icons/typicons_grey_light/README.md deleted file mode 100644 index cfa5ea08..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/README.md +++ /dev/null @@ -1,5 +0,0 @@ -## Typicons - -Copyright: Stephen Hutchings -Source: https://github.com/stephenhutchings/typicons.font -License: [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) diff --git a/novelwriter/assets/icons/typicons_grey_light/arrow-maximise.svg b/novelwriter/assets/icons/typicons_grey_light/arrow-maximise.svg deleted file mode 100644 index 0e1d4a86..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/arrow-maximise.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/arrow-minimise.svg b/novelwriter/assets/icons/typicons_grey_light/arrow-minimise.svg deleted file mode 100644 index b0a1972f..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/arrow-minimise.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/at.svg b/novelwriter/assets/icons/typicons_grey_light/at.svg deleted file mode 100644 index b39357c9..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/at.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/backspace.svg b/novelwriter/assets/icons/typicons_grey_light/backspace.svg deleted file mode 100644 index b99866b9..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/backspace.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/book.svg b/novelwriter/assets/icons/typicons_grey_light/book.svg deleted file mode 100644 index 946f5252..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/book.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/bookmark.svg b/novelwriter/assets/icons/typicons_grey_light/bookmark.svg deleted file mode 100644 index 42556b6b..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/bookmark.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/calendar.svg b/novelwriter/assets/icons/typicons_grey_light/calendar.svg deleted file mode 100644 index 094ab0e3..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/calendar.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/cancel.svg b/novelwriter/assets/icons/typicons_grey_light/cancel.svg deleted file mode 100644 index d0e3c0ec..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/cancel.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/chevron-left.svg b/novelwriter/assets/icons/typicons_grey_light/chevron-left.svg deleted file mode 100644 index 2e7af570..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/chevron-left.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/chevron-right.svg b/novelwriter/assets/icons/typicons_grey_light/chevron-right.svg deleted file mode 100644 index 8da983ca..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/chevron-right.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/delete.svg b/novelwriter/assets/icons/typicons_grey_light/delete.svg deleted file mode 100644 index 42e41518..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/delete.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/document-text.svg b/novelwriter/assets/icons/typicons_grey_light/document-text.svg deleted file mode 100644 index 551239c3..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/document-text.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/document-title.svg b/novelwriter/assets/icons/typicons_grey_light/document-title.svg deleted file mode 100644 index 4d746749..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/document-title.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/download.svg b/novelwriter/assets/icons/typicons_grey_light/download.svg deleted file mode 100644 index 67a588de..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/download.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/flag.svg b/novelwriter/assets/icons/typicons_grey_light/flag.svg deleted file mode 100644 index 63775fec..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/flag.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/folder.svg b/novelwriter/assets/icons/typicons_grey_light/folder.svg deleted file mode 100644 index 5cb0aeec..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/folder.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/globe.svg b/novelwriter/assets/icons/typicons_grey_light/globe.svg deleted file mode 100644 index 2838efa1..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/globe.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/hash.svg b/novelwriter/assets/icons/typicons_grey_light/hash.svg deleted file mode 100644 index 99fddb80..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/hash.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/heading0.svg b/novelwriter/assets/icons/typicons_grey_light/heading0.svg deleted file mode 100644 index b6377afe..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/heading0.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/heading1.svg b/novelwriter/assets/icons/typicons_grey_light/heading1.svg deleted file mode 100644 index 4bb013d7..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/heading1.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/heading2.svg b/novelwriter/assets/icons/typicons_grey_light/heading2.svg deleted file mode 100644 index 25ec3e05..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/heading2.svg +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/heading3.svg b/novelwriter/assets/icons/typicons_grey_light/heading3.svg deleted file mode 100644 index 942ceb60..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/heading3.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/heading4.svg b/novelwriter/assets/icons/typicons_grey_light/heading4.svg deleted file mode 100644 index 39613ceb..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/heading4.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/icons.conf b/novelwriter/assets/icons/typicons_grey_light/icons.conf deleted file mode 100644 index a0afad76..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/icons.conf +++ /dev/null @@ -1,63 +0,0 @@ -## -# Icons: Typicons Grey Light -# Source: https://github.com/stephenhutchings/typicons.font -# Credit: Stephen Hutchings -# Modified: Veronica Berglyd Olsen -# Additions: hash.svg -## - -[Main] -name = Typicons Grey Light -description = Greyscaled icons for light GUI theme based on Typicons. -author = Veronica Berglyd Olsen (adaptation) -credit = Stephen Hutchings (icon design) -url = https://github.com/stephenhutchings/typicons.font -license = CC BY-SA 4.0 -licenseurl = https://creativecommons.org/licenses/by-sa/4.0/ - -[Map] -cls_none = cancel.svg -cls_novel = book.svg -cls_plot = puzzle.svg -cls_character = user.svg -cls_world = location.svg -cls_timeline = calendar.svg -cls_object = key.svg -cls_entity = flag.svg -cls_custom = star.svg -cls_archive = delete.svg -cls_trash = trash.svg -proj_document = document-text.svg -proj_title = document-title.svg -proj_chapter = document-title.svg -proj_scene = document-title.svg -proj_note = document-text.svg -proj_folder = folder.svg -doc_h0 = heading0.svg -doc_h1 = heading1.svg -doc_h2 = heading2.svg -doc_h3 = heading3.svg -doc_h4 = heading4.svg -delete = delete.svg -add = plus.svg -remove = minus.svg -close = times.svg -refresh = refresh.svg -maximise = arrow-maximise.svg -minimise = arrow-minimise.svg -done = input-checked.svg -search = search.svg -search-replace = search-replace.svg -clear = backspace.svg -save = download.svg -edit = pencil.svg -check = tick.svg -cross = times.svg -hash = hash.svg -reference = at.svg -backward = chevron-left.svg -forward = chevron-right.svg -sticky-on = pin.svg -sticky-off = pin-outline.svg -bullet-on = media-record.svg -bullet-off = media-record-outline.svg diff --git a/novelwriter/assets/icons/typicons_grey_light/input-checked.svg b/novelwriter/assets/icons/typicons_grey_light/input-checked.svg deleted file mode 100644 index 21c84640..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/input-checked.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/key.svg b/novelwriter/assets/icons/typicons_grey_light/key.svg deleted file mode 100644 index 7ea1f027..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/key.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/location.svg b/novelwriter/assets/icons/typicons_grey_light/location.svg deleted file mode 100644 index bea3e44e..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/location.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/media-record-outline.svg b/novelwriter/assets/icons/typicons_grey_light/media-record-outline.svg deleted file mode 100644 index 2e2712be..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/media-record-outline.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/media-record.svg b/novelwriter/assets/icons/typicons_grey_light/media-record.svg deleted file mode 100644 index 7a077ddd..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/media-record.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/minus.svg b/novelwriter/assets/icons/typicons_grey_light/minus.svg deleted file mode 100644 index eb40a0e2..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/minus.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/pencil.svg b/novelwriter/assets/icons/typicons_grey_light/pencil.svg deleted file mode 100644 index ddd96f64..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/pencil.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/pin-outline.svg b/novelwriter/assets/icons/typicons_grey_light/pin-outline.svg deleted file mode 100644 index 57b2b498..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/pin-outline.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/pin.svg b/novelwriter/assets/icons/typicons_grey_light/pin.svg deleted file mode 100644 index 3473b82f..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/pin.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/plus.svg b/novelwriter/assets/icons/typicons_grey_light/plus.svg deleted file mode 100644 index e7399157..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/plus.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/puzzle.svg b/novelwriter/assets/icons/typicons_grey_light/puzzle.svg deleted file mode 100644 index fe19c682..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/puzzle.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/refresh.svg b/novelwriter/assets/icons/typicons_grey_light/refresh.svg deleted file mode 100644 index c87d3257..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/refresh.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/search-replace.svg b/novelwriter/assets/icons/typicons_grey_light/search-replace.svg deleted file mode 100644 index cbf10912..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/search-replace.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/search.svg b/novelwriter/assets/icons/typicons_grey_light/search.svg deleted file mode 100644 index d541d53b..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/search.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/star.svg b/novelwriter/assets/icons/typicons_grey_light/star.svg deleted file mode 100644 index efbe0c24..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/star.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/stopwatch.svg b/novelwriter/assets/icons/typicons_grey_light/stopwatch.svg deleted file mode 100644 index 850d0fd2..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/stopwatch.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/tick.svg b/novelwriter/assets/icons/typicons_grey_light/tick.svg deleted file mode 100644 index 894c6186..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/tick.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/times.svg b/novelwriter/assets/icons/typicons_grey_light/times.svg deleted file mode 100644 index bc451278..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/times.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/trash.svg b/novelwriter/assets/icons/typicons_grey_light/trash.svg deleted file mode 100644 index 24cba136..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/trash.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_grey_light/user.svg b/novelwriter/assets/icons/typicons_grey_light/user.svg deleted file mode 100644 index fffcabf1..00000000 --- a/novelwriter/assets/icons/typicons_grey_light/user.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_colour_light/README.md b/novelwriter/assets/icons/typicons_light/README.md similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/README.md rename to novelwriter/assets/icons/typicons_light/README.md diff --git a/novelwriter/assets/icons/typicons_colour_light/arrow-maximise.svg b/novelwriter/assets/icons/typicons_light/arrow-maximise.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/arrow-maximise.svg rename to novelwriter/assets/icons/typicons_light/arrow-maximise.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/arrow-minimise.svg b/novelwriter/assets/icons/typicons_light/arrow-minimise.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/arrow-minimise.svg rename to novelwriter/assets/icons/typicons_light/arrow-minimise.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/at.svg b/novelwriter/assets/icons/typicons_light/at.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/at.svg rename to novelwriter/assets/icons/typicons_light/at.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/backspace.svg b/novelwriter/assets/icons/typicons_light/backspace.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/backspace.svg rename to novelwriter/assets/icons/typicons_light/backspace.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/book.svg b/novelwriter/assets/icons/typicons_light/book.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/book.svg rename to novelwriter/assets/icons/typicons_light/book.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/bookmark.svg b/novelwriter/assets/icons/typicons_light/bookmark.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/bookmark.svg rename to novelwriter/assets/icons/typicons_light/bookmark.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/calendar.svg b/novelwriter/assets/icons/typicons_light/calendar.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/calendar.svg rename to novelwriter/assets/icons/typicons_light/calendar.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/cancel.svg b/novelwriter/assets/icons/typicons_light/cancel.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/cancel.svg rename to novelwriter/assets/icons/typicons_light/cancel.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/chevron-left.svg b/novelwriter/assets/icons/typicons_light/chevron-left.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/chevron-left.svg rename to novelwriter/assets/icons/typicons_light/chevron-left.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/chevron-right.svg b/novelwriter/assets/icons/typicons_light/chevron-right.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/chevron-right.svg rename to novelwriter/assets/icons/typicons_light/chevron-right.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/delete.svg b/novelwriter/assets/icons/typicons_light/delete.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/delete.svg rename to novelwriter/assets/icons/typicons_light/delete.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/document-chapter.svg b/novelwriter/assets/icons/typicons_light/document-chapter.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/document-chapter.svg rename to novelwriter/assets/icons/typicons_light/document-chapter.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/document-note.svg b/novelwriter/assets/icons/typicons_light/document-note.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/document-note.svg rename to novelwriter/assets/icons/typicons_light/document-note.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/document-scene.svg b/novelwriter/assets/icons/typicons_light/document-scene.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/document-scene.svg rename to novelwriter/assets/icons/typicons_light/document-scene.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/document-text.svg b/novelwriter/assets/icons/typicons_light/document-text.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/document-text.svg rename to novelwriter/assets/icons/typicons_light/document-text.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/document-title.svg b/novelwriter/assets/icons/typicons_light/document-title.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/document-title.svg rename to novelwriter/assets/icons/typicons_light/document-title.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/download.svg b/novelwriter/assets/icons/typicons_light/download.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/download.svg rename to novelwriter/assets/icons/typicons_light/download.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/flag.svg b/novelwriter/assets/icons/typicons_light/flag.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/flag.svg rename to novelwriter/assets/icons/typicons_light/flag.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/folder.svg b/novelwriter/assets/icons/typicons_light/folder.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/folder.svg rename to novelwriter/assets/icons/typicons_light/folder.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/globe.svg b/novelwriter/assets/icons/typicons_light/globe.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/globe.svg rename to novelwriter/assets/icons/typicons_light/globe.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/hash.svg b/novelwriter/assets/icons/typicons_light/hash.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/hash.svg rename to novelwriter/assets/icons/typicons_light/hash.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/heading0.svg b/novelwriter/assets/icons/typicons_light/heading0.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/heading0.svg rename to novelwriter/assets/icons/typicons_light/heading0.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/heading1.svg b/novelwriter/assets/icons/typicons_light/heading1.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/heading1.svg rename to novelwriter/assets/icons/typicons_light/heading1.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/heading2.svg b/novelwriter/assets/icons/typicons_light/heading2.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/heading2.svg rename to novelwriter/assets/icons/typicons_light/heading2.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/heading3.svg b/novelwriter/assets/icons/typicons_light/heading3.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/heading3.svg rename to novelwriter/assets/icons/typicons_light/heading3.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/heading4.svg b/novelwriter/assets/icons/typicons_light/heading4.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/heading4.svg rename to novelwriter/assets/icons/typicons_light/heading4.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/icons.conf b/novelwriter/assets/icons/typicons_light/icons.conf similarity index 96% rename from novelwriter/assets/icons/typicons_colour_light/icons.conf rename to novelwriter/assets/icons/typicons_light/icons.conf index 003809a6..64d6ec29 100644 --- a/novelwriter/assets/icons/typicons_colour_light/icons.conf +++ b/novelwriter/assets/icons/typicons_light/icons.conf @@ -1,5 +1,5 @@ ## -# Icons: Typicons Colour Light +# Icons: Typicons Light # Source: https://github.com/stephenhutchings/typicons.font # Credit: Stephen Hutchings # Modified: Veronica Berglyd Olsen @@ -7,7 +7,7 @@ ## [Main] -name = Typicons Colour Light +name = Typicons Light description = Colourised icons for light GUI theme based on Typicons. author = Veronica Berglyd Olsen (adaptation) credit = Stephen Hutchings (icon design) diff --git a/novelwriter/assets/icons/typicons_colour_light/input-checked.svg b/novelwriter/assets/icons/typicons_light/input-checked.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/input-checked.svg rename to novelwriter/assets/icons/typicons_light/input-checked.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/key.svg b/novelwriter/assets/icons/typicons_light/key.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/key.svg rename to novelwriter/assets/icons/typicons_light/key.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/location.svg b/novelwriter/assets/icons/typicons_light/location.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/location.svg rename to novelwriter/assets/icons/typicons_light/location.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/media-record-outline.svg b/novelwriter/assets/icons/typicons_light/media-record-outline.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/media-record-outline.svg rename to novelwriter/assets/icons/typicons_light/media-record-outline.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/media-record.svg b/novelwriter/assets/icons/typicons_light/media-record.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/media-record.svg rename to novelwriter/assets/icons/typicons_light/media-record.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/minus.svg b/novelwriter/assets/icons/typicons_light/minus.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/minus.svg rename to novelwriter/assets/icons/typicons_light/minus.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/pencil.svg b/novelwriter/assets/icons/typicons_light/pencil.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/pencil.svg rename to novelwriter/assets/icons/typicons_light/pencil.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/pin-outline.svg b/novelwriter/assets/icons/typicons_light/pin-outline.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/pin-outline.svg rename to novelwriter/assets/icons/typicons_light/pin-outline.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/pin.svg b/novelwriter/assets/icons/typicons_light/pin.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/pin.svg rename to novelwriter/assets/icons/typicons_light/pin.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/plus.svg b/novelwriter/assets/icons/typicons_light/plus.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/plus.svg rename to novelwriter/assets/icons/typicons_light/plus.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/puzzle.svg b/novelwriter/assets/icons/typicons_light/puzzle.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/puzzle.svg rename to novelwriter/assets/icons/typicons_light/puzzle.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/refresh.svg b/novelwriter/assets/icons/typicons_light/refresh.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/refresh.svg rename to novelwriter/assets/icons/typicons_light/refresh.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/search-replace.svg b/novelwriter/assets/icons/typicons_light/search-replace.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/search-replace.svg rename to novelwriter/assets/icons/typicons_light/search-replace.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/search.svg b/novelwriter/assets/icons/typicons_light/search.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/search.svg rename to novelwriter/assets/icons/typicons_light/search.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/star.svg b/novelwriter/assets/icons/typicons_light/star.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/star.svg rename to novelwriter/assets/icons/typicons_light/star.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/stopwatch.svg b/novelwriter/assets/icons/typicons_light/stopwatch.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/stopwatch.svg rename to novelwriter/assets/icons/typicons_light/stopwatch.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/tick.svg b/novelwriter/assets/icons/typicons_light/tick.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/tick.svg rename to novelwriter/assets/icons/typicons_light/tick.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/times.svg b/novelwriter/assets/icons/typicons_light/times.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/times.svg rename to novelwriter/assets/icons/typicons_light/times.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/trash.svg b/novelwriter/assets/icons/typicons_light/trash.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/trash.svg rename to novelwriter/assets/icons/typicons_light/trash.svg diff --git a/novelwriter/assets/icons/typicons_colour_light/user.svg b/novelwriter/assets/icons/typicons_light/user.svg similarity index 100% rename from novelwriter/assets/icons/typicons_colour_light/user.svg rename to novelwriter/assets/icons/typicons_light/user.svg diff --git a/novelwriter/config.py b/novelwriter/config.py index 42bbe5d3..c081412a 100644 --- a/novelwriter/config.py +++ b/novelwriter/config.py @@ -79,7 +79,7 @@ class Config: # General self.guiTheme = "default" self.guiSyntax = "default_light" - self.guiIcons = "typicons_colour_light" + self.guiIcons = "typicons_light" self.guiDark = False # Load icons for dark backgrounds, if available self.guiFont = "" # Defaults to system default font self.guiFontSize = 11 # Is overridden if system default is loaded @@ -548,6 +548,12 @@ class Config: logger.info("Using straight double quotes, so disabling auto-replace") self.doReplaceDQuote = False + # Check deprecated settings + if self.guiIcons in ("typicons_colour_dark", "typicons_grey_dark"): + self.guiIcons = "typicons_dark" + elif self.guiIcons in ("typicons_colour_light", "typicons_grey_light"): + self.guiIcons = "typicons_light" + return True def saveConfig(self): diff --git a/tests/reference/baseConfig_novelwriter.conf b/tests/reference/baseConfig_novelwriter.conf index 521d4b8c..b790e933 100644 --- a/tests/reference/baseConfig_novelwriter.conf +++ b/tests/reference/baseConfig_novelwriter.conf @@ -1,8 +1,8 @@ [Main] -timestamp = 2021-08-17 20:59:39 +timestamp = 2021-08-26 17:48:02 theme = default syntax = default_light -icons = typicons_colour_light +icons = typicons_light guidark = False guifont = guifontsize = 11 diff --git a/tests/reference/guiPreferences_novelwriter.conf b/tests/reference/guiPreferences_novelwriter.conf index 600f5fb9..7cbf7384 100644 --- a/tests/reference/guiPreferences_novelwriter.conf +++ b/tests/reference/guiPreferences_novelwriter.conf @@ -1,8 +1,8 @@ [Main] -timestamp = 2021-08-17 20:59:42 +timestamp = 2021-08-26 17:48:04 theme = default syntax = default_light -icons = typicons_colour_light +icons = typicons_light guidark = True guifont = Sans guifontsize = 12 @@ -13,7 +13,7 @@ hidehscroll = True [Sizes] geometry = 1200, 650 -preferences = 700, 615 +preferences = 670, 589 treecols = 200, 50, 30 novelcols = 200, 50 projcols = 200, 60, 140 diff --git a/tests/test_base/test_base_config.py b/tests/test_base/test_base_config.py index 7c1fa78b..7cde0fab 100644 --- a/tests/test_base/test_base_config.py +++ b/tests/test_base/test_base_config.py @@ -126,8 +126,8 @@ def testBaseConfig_Init(monkeypatch, tmpDir, fncDir, outDir, refDir, filesDir): # Test load/save with no path tstConf.confPath = None - assert not tstConf.loadConfig() - assert not tstConf.saveConfig() + assert tstConf.loadConfig() is False + assert tstConf.saveConfig() is False # Run again and set the paths directly and correctly # This should create a config file as well @@ -174,8 +174,8 @@ def testBaseConfig_Init(monkeypatch, tmpDir, fncDir, outDir, refDir, filesDir): assert tstConf.appRoot == os.path.dirname(appRoot) assert tstConf.appPath == os.path.dirname(appRoot) - assert tstConf.loadConfig() - assert tstConf.saveConfig() + assert tstConf.loadConfig() is True + assert tstConf.saveConfig() is True # Test Correcting Quote Settings origDbl = tstConf.fmtDoubleQuotes @@ -187,16 +187,42 @@ def testBaseConfig_Init(monkeypatch, tmpDir, fncDir, outDir, refDir, filesDir): tstConf.fmtSingleQuotes = ["'", "'"] tstConf.doReplaceDQuote = True tstConf.doReplaceSQuote = True - assert tstConf.saveConfig() + assert tstConf.saveConfig() is True - assert tstConf.loadConfig() - assert not tstConf.doReplaceDQuote - assert not tstConf.doReplaceSQuote + assert tstConf.loadConfig() is True + assert tstConf.doReplaceDQuote is False + assert tstConf.doReplaceSQuote is False tstConf.fmtDoubleQuotes = origDbl tstConf.fmtSingleQuotes = origSng tstConf.doReplaceDQuote = orDoDbl tstConf.doReplaceSQuote = orDoSng + assert tstConf.saveConfig() is True + + # Test Correcting icon theme + origIcons = tstConf.guiIcons + + tstConf.guiIcons = "typicons_colour_dark" + assert tstConf.saveConfig() is True + assert tstConf.loadConfig() is True + assert tstConf.guiIcons == "typicons_dark" + + tstConf.guiIcons = "typicons_grey_dark" + assert tstConf.saveConfig() is True + assert tstConf.loadConfig() is True + assert tstConf.guiIcons == "typicons_dark" + + tstConf.guiIcons = "typicons_colour_light" + assert tstConf.saveConfig() is True + assert tstConf.loadConfig() is True + assert tstConf.guiIcons == "typicons_light" + + tstConf.guiIcons = "typicons_grey_light" + assert tstConf.saveConfig() is True + assert tstConf.loadConfig() is True + assert tstConf.guiIcons == "typicons_light" + + tstConf.guiIcons = origIcons assert tstConf.saveConfig() # Localisation diff --git a/tests/test_gui/test_gui_theme.py b/tests/test_gui/test_gui_theme.py index bc99d900..150b3af6 100644 --- a/tests/test_gui/test_gui_theme.py +++ b/tests/test_gui/test_gui_theme.py @@ -72,7 +72,7 @@ def testGuiTheme_Main(qtbot, monkeypatch, nwMinimal, tmpDir): assert novelwriter.CONFIG.guiTheme == "default_dark" assert novelwriter.CONFIG.guiSyntax == "tomorrow_night_eighties" - assert novelwriter.CONFIG.guiIcons == "typicons_colour_dark" + assert novelwriter.CONFIG.guiIcons == "typicons_dark" assert novelwriter.CONFIG.guiDark is True assert novelwriter.CONFIG.guiFont == "Cantarell" assert novelwriter.CONFIG.guiFontSize == 11 @@ -120,7 +120,7 @@ def testGuiTheme_Main(qtbot, monkeypatch, nwMinimal, tmpDir): theIcons = nwGUI.theTheme.theIcons novelwriter.CONFIG.guiIcons = "invalid" assert not theIcons.updateTheme() - novelwriter.CONFIG.guiIcons = "typicons_colour_dark" + novelwriter.CONFIG.guiIcons = "typicons_dark" assert theIcons.updateTheme() # Ask for a non-existent key