diff --git a/MANIFEST.in b/MANIFEST.in index 36a99646..b3004fc3 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ include LICENSE.md -recursive-include assets * +recursive-include setup * recursive-include nw/assets * recursive-include sample *.nwx *.nwd diff --git a/README.md b/README.md index 46273c44..3b7835ed 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![pypi](https://img.shields.io/pypi/v/novelwriter)](https://pypi.org/project/novelWriter) [![python](https://img.shields.io/pypi/pyversions/novelwriter)](https://pypi.org/project/novelWriter) - + novelWriter is a Markdown-like text editor designed for writing novels and larger projects of many smaller plain text documents. It uses its own flavour of Markdown that supports a meta data syntax @@ -81,7 +81,7 @@ You can also provide a path to a folder containing a novelWriter project as the ### Launcher and Icons -In the root assets folder there are icons and scripts and a template for setting up a launcher on +In the root setup folder there are icons and scripts and a template for setting up a launcher on Gnome desktops. You may need to modify those scripts slightly, but as they are, they work on Debian and Ubuntu. For other operating systems, please consult your operating system documentation for how to make those. Feel free to submit more if you are able to make them. diff --git a/docs/source/int_started.rst b/docs/source/int_started.rst index e96a0285..0d0236c8 100644 --- a/docs/source/int_started.rst +++ b/docs/source/int_started.rst @@ -140,7 +140,7 @@ encountered. To list all options, run: python novelWriter.py --help -There are also a couple of install scripts in the assets folder which will assist in setting up a +There are also a couple of install scripts in the setup folder which will assist in setting up a launch icon and the novelWriter project file mimetype for Gnome desktops on Linux. Currently, there's one script for Debian and one for Ubuntu. diff --git a/assets/icons/1024x1024/novelwriter.png b/setup/icons/1024x1024/novelwriter.png similarity index 100% rename from assets/icons/1024x1024/novelwriter.png rename to setup/icons/1024x1024/novelwriter.png diff --git a/assets/icons/1024x1024/x-novelwriter-project.png b/setup/icons/1024x1024/x-novelwriter-project.png similarity index 100% rename from assets/icons/1024x1024/x-novelwriter-project.png rename to setup/icons/1024x1024/x-novelwriter-project.png diff --git a/assets/icons/128x128/novelwriter.png b/setup/icons/128x128/novelwriter.png similarity index 100% rename from assets/icons/128x128/novelwriter.png rename to setup/icons/128x128/novelwriter.png diff --git a/assets/icons/128x128/x-novelwriter-project.png b/setup/icons/128x128/x-novelwriter-project.png similarity index 100% rename from assets/icons/128x128/x-novelwriter-project.png rename to setup/icons/128x128/x-novelwriter-project.png diff --git a/assets/icons/16x16/novelwriter.png b/setup/icons/16x16/novelwriter.png similarity index 100% rename from assets/icons/16x16/novelwriter.png rename to setup/icons/16x16/novelwriter.png diff --git a/assets/icons/16x16/x-novelwriter-project.png b/setup/icons/16x16/x-novelwriter-project.png similarity index 100% rename from assets/icons/16x16/x-novelwriter-project.png rename to setup/icons/16x16/x-novelwriter-project.png diff --git a/assets/icons/16x16@2x/novelwriter.png b/setup/icons/16x16@2x/novelwriter.png similarity index 100% rename from assets/icons/16x16@2x/novelwriter.png rename to setup/icons/16x16@2x/novelwriter.png diff --git a/assets/icons/16x16@2x/x-novelwriter-project.png b/setup/icons/16x16@2x/x-novelwriter-project.png similarity index 100% rename from assets/icons/16x16@2x/x-novelwriter-project.png rename to setup/icons/16x16@2x/x-novelwriter-project.png diff --git a/assets/icons/18x18@2x/novelwriter.png b/setup/icons/18x18@2x/novelwriter.png similarity index 100% rename from assets/icons/18x18@2x/novelwriter.png rename to setup/icons/18x18@2x/novelwriter.png diff --git a/assets/icons/18x18@2x/x-novelwriter-project.png b/setup/icons/18x18@2x/x-novelwriter-project.png similarity index 100% rename from assets/icons/18x18@2x/x-novelwriter-project.png rename to setup/icons/18x18@2x/x-novelwriter-project.png diff --git a/assets/icons/24x24/novelwriter.png b/setup/icons/24x24/novelwriter.png similarity index 100% rename from assets/icons/24x24/novelwriter.png rename to setup/icons/24x24/novelwriter.png diff --git a/assets/icons/24x24/x-novelwriter-project.png b/setup/icons/24x24/x-novelwriter-project.png similarity index 100% rename from assets/icons/24x24/x-novelwriter-project.png rename to setup/icons/24x24/x-novelwriter-project.png diff --git a/assets/icons/256x256/novelwriter.png b/setup/icons/256x256/novelwriter.png similarity index 100% rename from assets/icons/256x256/novelwriter.png rename to setup/icons/256x256/novelwriter.png diff --git a/assets/icons/256x256/x-novelwriter-project.png b/setup/icons/256x256/x-novelwriter-project.png similarity index 100% rename from assets/icons/256x256/x-novelwriter-project.png rename to setup/icons/256x256/x-novelwriter-project.png diff --git a/assets/icons/32x32/novelwriter.png b/setup/icons/32x32/novelwriter.png similarity index 100% rename from assets/icons/32x32/novelwriter.png rename to setup/icons/32x32/novelwriter.png diff --git a/assets/icons/32x32/x-novelwriter-project.png b/setup/icons/32x32/x-novelwriter-project.png similarity index 100% rename from assets/icons/32x32/x-novelwriter-project.png rename to setup/icons/32x32/x-novelwriter-project.png diff --git a/assets/icons/32x32@2x/novelwriter.png b/setup/icons/32x32@2x/novelwriter.png similarity index 100% rename from assets/icons/32x32@2x/novelwriter.png rename to setup/icons/32x32@2x/novelwriter.png diff --git a/assets/icons/32x32@2x/x-novelwriter-project.png b/setup/icons/32x32@2x/x-novelwriter-project.png similarity index 100% rename from assets/icons/32x32@2x/x-novelwriter-project.png rename to setup/icons/32x32@2x/x-novelwriter-project.png diff --git a/assets/icons/48x48/novelwriter.png b/setup/icons/48x48/novelwriter.png similarity index 100% rename from assets/icons/48x48/novelwriter.png rename to setup/icons/48x48/novelwriter.png diff --git a/assets/icons/48x48/x-novelwriter-project.png b/setup/icons/48x48/x-novelwriter-project.png similarity index 100% rename from assets/icons/48x48/x-novelwriter-project.png rename to setup/icons/48x48/x-novelwriter-project.png diff --git a/assets/icons/512x512/novelwriter.png b/setup/icons/512x512/novelwriter.png similarity index 100% rename from assets/icons/512x512/novelwriter.png rename to setup/icons/512x512/novelwriter.png diff --git a/assets/icons/512x512/x-novelwriter-project.png b/setup/icons/512x512/x-novelwriter-project.png similarity index 100% rename from assets/icons/512x512/x-novelwriter-project.png rename to setup/icons/512x512/x-novelwriter-project.png diff --git a/assets/icons/64x64/novelwriter.png b/setup/icons/64x64/novelwriter.png similarity index 100% rename from assets/icons/64x64/novelwriter.png rename to setup/icons/64x64/novelwriter.png diff --git a/assets/icons/64x64/x-novelwriter-project.png b/setup/icons/64x64/x-novelwriter-project.png similarity index 100% rename from assets/icons/64x64/x-novelwriter-project.png rename to setup/icons/64x64/x-novelwriter-project.png diff --git a/assets/icons/96x96/novelwriter.png b/setup/icons/96x96/novelwriter.png similarity index 100% rename from assets/icons/96x96/novelwriter.png rename to setup/icons/96x96/novelwriter.png diff --git a/assets/icons/96x96/x-novelwriter-project.png b/setup/icons/96x96/x-novelwriter-project.png similarity index 100% rename from assets/icons/96x96/x-novelwriter-project.png rename to setup/icons/96x96/x-novelwriter-project.png diff --git a/assets/icons/novelwriter.ico b/setup/icons/novelwriter.ico similarity index 100% rename from assets/icons/novelwriter.ico rename to setup/icons/novelwriter.ico diff --git a/assets/icons/novelwriter.svg b/setup/icons/novelwriter.svg similarity index 100% rename from assets/icons/novelwriter.svg rename to setup/icons/novelwriter.svg diff --git a/assets/icons/x-novelwriter-project.svg b/setup/icons/x-novelwriter-project.svg similarity index 100% rename from assets/icons/x-novelwriter-project.svg rename to setup/icons/x-novelwriter-project.svg diff --git a/assets/installDebianUbuntu.sh b/setup/installDebianUbuntu.sh similarity index 54% rename from assets/installDebianUbuntu.sh rename to setup/installDebianUbuntu.sh index 91e78409..c47f4d26 100755 --- a/assets/installDebianUbuntu.sh +++ b/setup/installDebianUbuntu.sh @@ -5,7 +5,7 @@ cd .. EXEC=$(pwd)/novelWriter.py EXEC=$(echo $EXEC | sed 's_/_\\/_g') -sed "s/%%exec%%/$EXEC/g" assets/novelwriter.desktop > /usr/share/applications/novelwriter.desktop +sed "s/%%exec%%/$EXEC/g" setup/novelwriter.desktop > /usr/share/applications/novelwriter.desktop if [ ! -d /usr/share/icons/hicolor/24x24/apps ]; then mkdir -pv /usr/share/icons/hicolor/24x24/apps @@ -29,14 +29,14 @@ if [ ! -d /usr/share/icons/hicolor/scalable/mimetypes ]; then mkdir -pv /usr/share/icons/hicolor/scalable/mimetypes fi -cp -v assets/icons/24x24/novelwriter.png /usr/share/icons/hicolor/24x24/apps/ -cp -v assets/icons/48x48/novelwriter.png /usr/share/icons/hicolor/48x48/apps/ -cp -v assets/icons/96x96/novelwriter.png /usr/share/icons/hicolor/96x96/apps/ -cp -v assets/icons/256x256/novelwriter.png /usr/share/icons/hicolor/256x256/apps/ -cp -v assets/icons/512x512/novelwriter.png /usr/share/icons/hicolor/512x512/apps/ -cp -v assets/icons/novelwriter.svg /usr/share/icons/hicolor/scalable/apps/ -cp -v assets/icons/x-novelwriter-project.svg /usr/share/icons/hicolor/scalable/mimetypes/application-x-novelwriter-project.svg -cp -v assets/mime/x-novelwriter-project.xml /usr/share/mime/packages/ +cp -v setup/icons/24x24/novelwriter.png /usr/share/icons/hicolor/24x24/apps/ +cp -v setup/icons/48x48/novelwriter.png /usr/share/icons/hicolor/48x48/apps/ +cp -v setup/icons/96x96/novelwriter.png /usr/share/icons/hicolor/96x96/apps/ +cp -v setup/icons/256x256/novelwriter.png /usr/share/icons/hicolor/256x256/apps/ +cp -v setup/icons/512x512/novelwriter.png /usr/share/icons/hicolor/512x512/apps/ +cp -v setup/icons/novelwriter.svg /usr/share/icons/hicolor/scalable/apps/ +cp -v setup/icons/x-novelwriter-project.svg /usr/share/icons/hicolor/scalable/mimetypes/application-x-novelwriter-project.svg +cp -v setup/mime/x-novelwriter-project.xml /usr/share/mime/packages/ update-mime-database /usr/share/mime/ update-icon-caches /usr/share/icons/* diff --git a/assets/mime/x-novelwriter-project.xml b/setup/mime/x-novelwriter-project.xml similarity index 100% rename from assets/mime/x-novelwriter-project.xml rename to setup/mime/x-novelwriter-project.xml diff --git a/assets/novelwriter.desktop b/setup/novelwriter.desktop similarity index 100% rename from assets/novelwriter.desktop rename to setup/novelwriter.desktop