From 2c4c711a43ba6299f12ed542698af04c63ff7e5b Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Fri, 8 Nov 2019 13:40:07 +0100 Subject: [PATCH] Moved graphics and themes folders to assets --- MANIFEST.in | 2 -- nw/{ => assets}/graphics/export.svg | 0 nw/{ => assets}/graphics/export.txt | 0 nw/{ => assets}/graphics/gear.svg | 0 nw/{ => assets}/graphics/novelWriter.ico | Bin nw/{ => assets}/graphics/novelWriter.svg | 0 nw/{ => assets}/themes/gui/default/style.qss | 0 nw/{ => assets}/themes/gui/default/theme.conf | 0 .../themes/gui/default_dark/icons/add.png | Bin .../themes/gui/default_dark/icons/close.png | Bin .../themes/gui/default_dark/icons/document.png | Bin .../themes/gui/default_dark/icons/folder.png | Bin .../themes/gui/default_dark/icons/orphan.png | Bin .../themes/gui/default_dark/icons/remove.png | Bin .../themes/gui/default_dark/icons/replace.png | Bin .../themes/gui/default_dark/icons/root.png | Bin .../themes/gui/default_dark/icons/save.png | Bin .../themes/gui/default_dark/icons/search.png | Bin .../themes/gui/default_dark/icons/trash.png | Bin nw/{ => assets}/themes/gui/default_dark/styles.qss | 0 nw/{ => assets}/themes/gui/default_dark/theme.conf | 0 nw/{ => assets}/themes/syntax/default_dark.conf | 0 nw/{ => assets}/themes/syntax/default_light.conf | 0 nw/{ => assets}/themes/syntax/light_owl.conf | 0 nw/{ => assets}/themes/syntax/night_owl.conf | 0 nw/{ => assets}/themes/syntax/tomorrow.conf | 0 nw/{ => assets}/themes/syntax/tomorrow_night.conf | 0 .../themes/syntax/tomorrow_night_blue.conf | 0 .../themes/syntax/tomorrow_night_bright.conf | 0 .../themes/syntax/tomorrow_night_eighties.conf | 0 nw/config.py | 4 ++-- 31 files changed, 2 insertions(+), 4 deletions(-) rename nw/{ => assets}/graphics/export.svg (100%) rename nw/{ => assets}/graphics/export.txt (100%) rename nw/{ => assets}/graphics/gear.svg (100%) rename nw/{ => assets}/graphics/novelWriter.ico (100%) rename nw/{ => assets}/graphics/novelWriter.svg (100%) rename nw/{ => assets}/themes/gui/default/style.qss (100%) rename nw/{ => assets}/themes/gui/default/theme.conf (100%) rename nw/{ => assets}/themes/gui/default_dark/icons/add.png (100%) rename nw/{ => assets}/themes/gui/default_dark/icons/close.png (100%) rename nw/{ => assets}/themes/gui/default_dark/icons/document.png (100%) rename nw/{ => assets}/themes/gui/default_dark/icons/folder.png (100%) rename nw/{ => assets}/themes/gui/default_dark/icons/orphan.png (100%) rename nw/{ => assets}/themes/gui/default_dark/icons/remove.png (100%) rename nw/{ => assets}/themes/gui/default_dark/icons/replace.png (100%) rename nw/{ => assets}/themes/gui/default_dark/icons/root.png (100%) rename nw/{ => assets}/themes/gui/default_dark/icons/save.png (100%) rename nw/{ => assets}/themes/gui/default_dark/icons/search.png (100%) rename nw/{ => assets}/themes/gui/default_dark/icons/trash.png (100%) rename nw/{ => assets}/themes/gui/default_dark/styles.qss (100%) rename nw/{ => assets}/themes/gui/default_dark/theme.conf (100%) rename nw/{ => assets}/themes/syntax/default_dark.conf (100%) rename nw/{ => assets}/themes/syntax/default_light.conf (100%) rename nw/{ => assets}/themes/syntax/light_owl.conf (100%) rename nw/{ => assets}/themes/syntax/night_owl.conf (100%) rename nw/{ => assets}/themes/syntax/tomorrow.conf (100%) rename nw/{ => assets}/themes/syntax/tomorrow_night.conf (100%) rename nw/{ => assets}/themes/syntax/tomorrow_night_blue.conf (100%) rename nw/{ => assets}/themes/syntax/tomorrow_night_bright.conf (100%) rename nw/{ => assets}/themes/syntax/tomorrow_night_eighties.conf (100%) diff --git a/MANIFEST.in b/MANIFEST.in index f46cec23..024e5f29 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,2 @@ include LICENSE.md recursive-include nw/assets * -recursive-include nw/graphics * -recursive-include nw/themes * diff --git a/nw/graphics/export.svg b/nw/assets/graphics/export.svg similarity index 100% rename from nw/graphics/export.svg rename to nw/assets/graphics/export.svg diff --git a/nw/graphics/export.txt b/nw/assets/graphics/export.txt similarity index 100% rename from nw/graphics/export.txt rename to nw/assets/graphics/export.txt diff --git a/nw/graphics/gear.svg b/nw/assets/graphics/gear.svg similarity index 100% rename from nw/graphics/gear.svg rename to nw/assets/graphics/gear.svg diff --git a/nw/graphics/novelWriter.ico b/nw/assets/graphics/novelWriter.ico similarity index 100% rename from nw/graphics/novelWriter.ico rename to nw/assets/graphics/novelWriter.ico diff --git a/nw/graphics/novelWriter.svg b/nw/assets/graphics/novelWriter.svg similarity index 100% rename from nw/graphics/novelWriter.svg rename to nw/assets/graphics/novelWriter.svg diff --git a/nw/themes/gui/default/style.qss b/nw/assets/themes/gui/default/style.qss similarity index 100% rename from nw/themes/gui/default/style.qss rename to nw/assets/themes/gui/default/style.qss diff --git a/nw/themes/gui/default/theme.conf b/nw/assets/themes/gui/default/theme.conf similarity index 100% rename from nw/themes/gui/default/theme.conf rename to nw/assets/themes/gui/default/theme.conf diff --git a/nw/themes/gui/default_dark/icons/add.png b/nw/assets/themes/gui/default_dark/icons/add.png similarity index 100% rename from nw/themes/gui/default_dark/icons/add.png rename to nw/assets/themes/gui/default_dark/icons/add.png diff --git a/nw/themes/gui/default_dark/icons/close.png b/nw/assets/themes/gui/default_dark/icons/close.png similarity index 100% rename from nw/themes/gui/default_dark/icons/close.png rename to nw/assets/themes/gui/default_dark/icons/close.png diff --git a/nw/themes/gui/default_dark/icons/document.png b/nw/assets/themes/gui/default_dark/icons/document.png similarity index 100% rename from nw/themes/gui/default_dark/icons/document.png rename to nw/assets/themes/gui/default_dark/icons/document.png diff --git a/nw/themes/gui/default_dark/icons/folder.png b/nw/assets/themes/gui/default_dark/icons/folder.png similarity index 100% rename from nw/themes/gui/default_dark/icons/folder.png rename to nw/assets/themes/gui/default_dark/icons/folder.png diff --git a/nw/themes/gui/default_dark/icons/orphan.png b/nw/assets/themes/gui/default_dark/icons/orphan.png similarity index 100% rename from nw/themes/gui/default_dark/icons/orphan.png rename to nw/assets/themes/gui/default_dark/icons/orphan.png diff --git a/nw/themes/gui/default_dark/icons/remove.png b/nw/assets/themes/gui/default_dark/icons/remove.png similarity index 100% rename from nw/themes/gui/default_dark/icons/remove.png rename to nw/assets/themes/gui/default_dark/icons/remove.png diff --git a/nw/themes/gui/default_dark/icons/replace.png b/nw/assets/themes/gui/default_dark/icons/replace.png similarity index 100% rename from nw/themes/gui/default_dark/icons/replace.png rename to nw/assets/themes/gui/default_dark/icons/replace.png diff --git a/nw/themes/gui/default_dark/icons/root.png b/nw/assets/themes/gui/default_dark/icons/root.png similarity index 100% rename from nw/themes/gui/default_dark/icons/root.png rename to nw/assets/themes/gui/default_dark/icons/root.png diff --git a/nw/themes/gui/default_dark/icons/save.png b/nw/assets/themes/gui/default_dark/icons/save.png similarity index 100% rename from nw/themes/gui/default_dark/icons/save.png rename to nw/assets/themes/gui/default_dark/icons/save.png diff --git a/nw/themes/gui/default_dark/icons/search.png b/nw/assets/themes/gui/default_dark/icons/search.png similarity index 100% rename from nw/themes/gui/default_dark/icons/search.png rename to nw/assets/themes/gui/default_dark/icons/search.png diff --git a/nw/themes/gui/default_dark/icons/trash.png b/nw/assets/themes/gui/default_dark/icons/trash.png similarity index 100% rename from nw/themes/gui/default_dark/icons/trash.png rename to nw/assets/themes/gui/default_dark/icons/trash.png diff --git a/nw/themes/gui/default_dark/styles.qss b/nw/assets/themes/gui/default_dark/styles.qss similarity index 100% rename from nw/themes/gui/default_dark/styles.qss rename to nw/assets/themes/gui/default_dark/styles.qss diff --git a/nw/themes/gui/default_dark/theme.conf b/nw/assets/themes/gui/default_dark/theme.conf similarity index 100% rename from nw/themes/gui/default_dark/theme.conf rename to nw/assets/themes/gui/default_dark/theme.conf diff --git a/nw/themes/syntax/default_dark.conf b/nw/assets/themes/syntax/default_dark.conf similarity index 100% rename from nw/themes/syntax/default_dark.conf rename to nw/assets/themes/syntax/default_dark.conf diff --git a/nw/themes/syntax/default_light.conf b/nw/assets/themes/syntax/default_light.conf similarity index 100% rename from nw/themes/syntax/default_light.conf rename to nw/assets/themes/syntax/default_light.conf diff --git a/nw/themes/syntax/light_owl.conf b/nw/assets/themes/syntax/light_owl.conf similarity index 100% rename from nw/themes/syntax/light_owl.conf rename to nw/assets/themes/syntax/light_owl.conf diff --git a/nw/themes/syntax/night_owl.conf b/nw/assets/themes/syntax/night_owl.conf similarity index 100% rename from nw/themes/syntax/night_owl.conf rename to nw/assets/themes/syntax/night_owl.conf diff --git a/nw/themes/syntax/tomorrow.conf b/nw/assets/themes/syntax/tomorrow.conf similarity index 100% rename from nw/themes/syntax/tomorrow.conf rename to nw/assets/themes/syntax/tomorrow.conf diff --git a/nw/themes/syntax/tomorrow_night.conf b/nw/assets/themes/syntax/tomorrow_night.conf similarity index 100% rename from nw/themes/syntax/tomorrow_night.conf rename to nw/assets/themes/syntax/tomorrow_night.conf diff --git a/nw/themes/syntax/tomorrow_night_blue.conf b/nw/assets/themes/syntax/tomorrow_night_blue.conf similarity index 100% rename from nw/themes/syntax/tomorrow_night_blue.conf rename to nw/assets/themes/syntax/tomorrow_night_blue.conf diff --git a/nw/themes/syntax/tomorrow_night_bright.conf b/nw/assets/themes/syntax/tomorrow_night_bright.conf similarity index 100% rename from nw/themes/syntax/tomorrow_night_bright.conf rename to nw/assets/themes/syntax/tomorrow_night_bright.conf diff --git a/nw/themes/syntax/tomorrow_night_eighties.conf b/nw/assets/themes/syntax/tomorrow_night_eighties.conf similarity index 100% rename from nw/themes/syntax/tomorrow_night_eighties.conf rename to nw/assets/themes/syntax/tomorrow_night_eighties.conf diff --git a/nw/config.py b/nw/config.py index 7047354b..57c61d7f 100644 --- a/nw/config.py +++ b/nw/config.py @@ -172,8 +172,8 @@ class Config: self.appPath = getattr(sys, "_MEIPASS", path.abspath(path.dirname(__file__))) self.appRoot = path.join(self.appPath,path.pardir) self.assetPath = path.join(self.appPath,"assets") - self.themeRoot = path.join(self.appPath,"themes") - self.graphPath = path.join(self.appPath,"graphics") + self.themeRoot = path.join(self.assetPath,"themes") + self.graphPath = path.join(self.assetPath,"graphics") self.dictPath = path.join(self.assetPath,"dict") self.appIcon = path.join(self.graphPath, nwFiles.APP_ICON)