diff --git a/CHANGELOG.md b/CHANGELOG.md index c8462f0e..fc4ed868 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,7 @@ functionality has been added to the main setup script to create desktop and star batch file, `setup_windows.bat`, has also been added. Running this file from the source folder, either by command line or by double-click, will install dependencies from PyPi and set up the icons and file association with novelWriter project files. This should make it easier to run - novelWriter from the source folder on Windows. PRs #634 and #641. + novelWriter from the source folder on Windows. PRs #634, #641 and #642. **Documentation** diff --git a/docs/source/setup_windows.rst b/docs/source/setup_windows.rst index 858286ff..4a2f35a9 100644 --- a/docs/source/setup_windows.rst +++ b/docs/source/setup_windows.rst @@ -21,7 +21,7 @@ Using the Installer =================== The installer for Windows is no longer provided. You can still create it yourself if you want to. -It can be generated with the provided `setup.py` script. use the script's `help` command to get +It can be generated with the provided ``setup.py`` script. use the script's ``help`` command to get further instructions. Please use the "Running from Source" option below instead. @@ -33,11 +33,12 @@ Running from Source =================== To run novelWriter from source, download the latest source zip file from the release page on -GitHub_ or the `main website`_, or if you have git running on your computer, you can also clone the -repository. +GitHub_ or the `main website`_. The file named ``novelWriter-x.y.z-minimal.zip``, where ``x.y.z`` +is the version number, is ideal for this. You can also download the full source. In order to make novelWriter run on your system, you must first have Python installed (Step 1). -Thereafter, a script will do the rest of the job (Step 2). or you can do it yourself manually. +Thereafter, a script will do the rest of the job (Step 2). or you can do it yourself manually if +you wish to. .. _GitHub: https://github.com/vkbo/novelWriter/releases .. _main website: https://novelwriter.io @@ -50,8 +51,8 @@ If you already have Python installed, you can skip this step. If you don't have can download it from the python.org_ website. novelWriter should work with Python 3.6 or higher, but it is recommended that you install the latest version of Python. -Also, make sure you select the "Add Python to PATH" option during installation, otherwise the -``python`` command will not work in the command line window. +Make sure you select the "Add Python to PATH" option during installation, otherwise the ``python`` +command will not work in the command line window. .. image:: images/python_win_install.png :width: 600 @@ -66,8 +67,8 @@ Step 2: Dependencies and Icons Open the folder where you extracted the novelWriter source, and double-click the file named ``setup_windows`` or ``setup_windows.bat``. This should open a command line window and run the -setup script to install dependencies, and desktop and start menu icons. It will also check that it -can find Python from Step 1. +setup script to install dependencies, and add desktop and start menu icons. It will also check that +it can find Python from Step 1. .. note:: If you upgrade Python to a newer version and the path to ``pythonw.exe`` changes, you may need diff --git a/nw/__init__.py b/nw/__init__.py index 7f91572e..5900aeaa 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -65,7 +65,7 @@ __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" __version__ = "1.0.4" __hexversion__ = "0x010004f0" -__date__ = "2021-02-07" +__date__ = "2021-02-03" __status__ = "Stable" __domain__ = "novelwriter.io" __url__ = "https://novelwriter.io" diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm index 7052b51c..789ef644 100644 --- a/nw/assets/text/release_notes.htm +++ b/nw/assets/text/release_notes.htm @@ -2,6 +2,20 @@ +

Release Notes for 1.0.4

+

Released on 3 February 2021

+

This patch release fixes a couple of minor issues with the Preferences dialog and the behaviour +of one of the keyboard shortcuts.

+

Aside from these fixes, the main point of this patch is to add new setup features for +novelWriter on Windows. A Windows installer will no longer be provided for the foreseeable future, +and instead functionality has been added to the main setup script to create desktop and start menu +icons.

+ +

The full changelog is available +here.

+ +
+

Release Notes for 1.0.3

Released on 24 January 2021

This patch release fixes a minor bug sometimes encountered when running novelWriter from command @@ -14,9 +28,6 @@ file .pyz. The executable would often be mistakenly flagged by virus cont the packaging tools. This is a known problem with pyinstaller and similar tools, but such warnings are always concerning even if they are false positives.

-

The full changelog is available -here.

-

Release Notes for 1.0.2

diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index fd136fe7..c9c19a12 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,13 +1,13 @@ - + Sample Project Sample Project Jane Smith Jay Doh - 830 + 832 153 - 39583 + 39614 False