Merge branch 'master' into dev_0.6
This commit is contained in:
Veronica K. B. Olsen
+16
-8
@@ -2,20 +2,28 @@
|
||||
|
||||
## Version 0.6 [2020-xx-xx]
|
||||
|
||||
**Bugfixes**
|
||||
|
||||
* Added more fallback icons so that all icons are properly set also on Windows 10. PR #211
|
||||
|
||||
**User Interface**
|
||||
|
||||
* The Export Tool has been removed and replaced by a new tool called "Build Novel Project". The new tool has the same filtering options as the Export Tool, but with more formatting options for titles. It also has a preview window to display the generated document. A Save As button provides exports to HTML, novelWriter Markdown. plain text, PDF and Open Document format. LaTeX export has not been ported over, and interfacing with Pandoc is no longer supported either. Although. as before, the HTML export can be converted with Pandoc still. The new tool also supports printing. PR #204
|
||||
* The statusbar has been reorganised a bit. The stats section has been separated from the save status icons, and the save status icons replaced with generated LED-looking widgets. The amount of statistics has been reduced to three numbers, and the rest moved to a tooltip. PR #210
|
||||
* The Project Settings, Preferences, Item Editor, Merge Documents, and Split Documents dialogs have been redesigned. The ones with tabs, now have vertical tabs on the left with horizontal labels. The dialog design should be more compact, and have room for more tabs for future settings. PR #212
|
||||
|
||||
**Other Improvements**
|
||||
## Version 0.5.2 [2020-05-21]
|
||||
|
||||
* Some of the package and version checks have been moved to a later point in the start-up so that a dialog can alert the user that the system is missing dependencies. This is only possible after the core PyQt5 elements have been imported, so if these are missing, the dialog will never show. PR #210
|
||||
* With a few minor changes, novelWriter was successfully tested on Ubuntu 14.04 with Python 3.4.3 and Qt 5.2.1. This is not necessarily a level of legacy compatibility that will be maintained, but it does currently work. PR #210
|
||||
**Bugfixes**
|
||||
|
||||
* When running on Windows 10, some of the buttons were missing icons. More fallback icons have been added to ensure that all current buttons have a fallback path that always ends in an icon. PR #211
|
||||
|
||||
**User Interface**
|
||||
|
||||
* The statusbar has been redesigned a bit. The block icons showing document and project saved status have been replaced by LED icons. The statistics has been moved to a separate label, and most of the detailed stats moved to its tooltip. PR #210
|
||||
* Default icon theme is now `Typicons Grey Light`. PR #211
|
||||
* Clicking on the document header selects the document in the project tree, but this functionality has been enhanced to also ensure the document is expanded and visible in the tree. If it's scrolled out of view, the tree will scroll it into view. PR #215
|
||||
* Syntax highlighting of text in quotes can now be turned off in Preferences. #215
|
||||
|
||||
**Core Functionality**
|
||||
|
||||
* Checking for version dependencies and a few packages (aside from PyQt5) is now done later in the start-up so that it is possible to alert the user with a dialog box instead of terminal error messages. PR #210
|
||||
* Made a few minor changes to the code so novelWriter can run with Python 3.4.3 and Qt 5.2.1, that is, it runs on last version of Ubuntu 14.04. This level of compatibility is not guaranteed to remain in the future, but for now, the changes have no impact on functionality. PR #210
|
||||
|
||||
## Version 0.5.1 [2020-05-14]
|
||||
|
||||
|
||||
+2
-2
@@ -24,9 +24,9 @@ copyright = "2018-2020, Veronica Berglyd Olsen"
|
||||
author = "Veronica Berglyd Olsen"
|
||||
|
||||
# The short X.Y version
|
||||
version = "0.5.1"
|
||||
version = "0.5.2"
|
||||
# The full version, including alpha/beta/rc tags
|
||||
release = "0.5.1"
|
||||
release = "0.5.2"
|
||||
|
||||
|
||||
# -- General configuration ---------------------------------------------------
|
||||
|
||||
@@ -6,8 +6,8 @@ You can download novelWriter from https://github.com/vkbo/novelWriter/releases
|
||||
|
||||
Latest version is |version|:
|
||||
|
||||
* ZIP file: https://github.com/vkbo/novelWriter/archive/v0.5.1.zip
|
||||
* TAR file: https://github.com/vkbo/novelWriter/archive/v0.5.1.tar.gz
|
||||
* ZIP file: https://github.com/vkbo/novelWriter/archive/v0.5.2.zip
|
||||
* TAR file: https://github.com/vkbo/novelWriter/archive/v0.5.2.tar.gz
|
||||
|
||||
Extract the archive to a location of your choice.
|
||||
|
||||
|
||||
+3
-3
@@ -40,9 +40,9 @@ __package__ = "novelWriter"
|
||||
__author__ = "Veronica Berglyd Olsen"
|
||||
__copyright__ = "Copyright 2018–2020, Veronica Berglyd Olsen"
|
||||
__license__ = "GPLv3"
|
||||
__version__ = "0.5.1"
|
||||
__hexversion__ = "0x000501f0"
|
||||
__date__ = "2020-05-14"
|
||||
__version__ = "0.5.2"
|
||||
__hexversion__ = "0x000502f0"
|
||||
__date__ = "2020-05-21"
|
||||
__maintainer__ = "Veronica Berglyd Olsen"
|
||||
__email__ = "code@vkbo.net"
|
||||
__status__ = "Pre-Release"
|
||||
|
||||
@@ -120,6 +120,7 @@ class Config:
|
||||
self.showLineEndings = False
|
||||
self.bigDocLimit = 800
|
||||
self.showFullPath = True
|
||||
self.highlightQuotes = True
|
||||
|
||||
self.fmtApostrophe = nwUnicode.U_RSQUO
|
||||
self.fmtSingleQuotes = [nwUnicode.U_LSQUO,nwUnicode.U_RSQUO]
|
||||
@@ -415,6 +416,9 @@ class Config:
|
||||
self.showFullPath = self._parseLine(
|
||||
cnfParse, cnfSec, "showfullpath", self.CNF_BOOL, self.showFullPath
|
||||
)
|
||||
self.highlightQuotes = self._parseLine(
|
||||
cnfParse, cnfSec, "highlightquotes", self.CNF_BOOL, self.highlightQuotes
|
||||
)
|
||||
|
||||
## Backup
|
||||
cnfSec = "Backup"
|
||||
@@ -505,6 +509,7 @@ class Config:
|
||||
cnfParse.set(cnfSec,"showlineendings", str(self.showLineEndings))
|
||||
cnfParse.set(cnfSec,"bigdoclimit", str(self.bigDocLimit))
|
||||
cnfParse.set(cnfSec,"showfullpath", str(self.showFullPath))
|
||||
cnfParse.set(cnfSec,"highlightquotes", str(self.highlightQuotes))
|
||||
|
||||
## Backup
|
||||
cnfSec = "Backup"
|
||||
|
||||
@@ -210,6 +210,13 @@ class GuiConfigEditGeneralTab(QWidget):
|
||||
self.showFullPath
|
||||
)
|
||||
|
||||
self.highlightQuotes = QSwitch()
|
||||
self.highlightQuotes.setChecked(self.mainConf.highlightQuotes)
|
||||
self.mainForm.addRow(
|
||||
"Add highlighting to text in quotes",
|
||||
self.highlightQuotes
|
||||
)
|
||||
|
||||
# AutoSave Settings
|
||||
# =================
|
||||
self.mainForm.addGroupLabel("Automatic Save")
|
||||
@@ -284,6 +291,7 @@ class GuiConfigEditGeneralTab(QWidget):
|
||||
guiIcons = self.selectIcons.currentData()
|
||||
guiDark = self.preferDarkIcons.isChecked()
|
||||
showFullPath = self.showFullPath.isChecked()
|
||||
highlightQuotes = self.highlightQuotes.isChecked()
|
||||
autoSaveDoc = self.autoSaveDoc.value()
|
||||
autoSaveProj = self.autoSaveProj.value()
|
||||
backupPath = self.backupPath
|
||||
@@ -299,6 +307,7 @@ class GuiConfigEditGeneralTab(QWidget):
|
||||
self.mainConf.guiIcons = guiIcons
|
||||
self.mainConf.guiDark = guiDark
|
||||
self.mainConf.showFullPath = showFullPath
|
||||
self.mainConf.highlightQuotes = highlightQuotes
|
||||
self.mainConf.autoSaveDoc = autoSaveDoc
|
||||
self.mainConf.autoSaveProj = autoSaveProj
|
||||
self.mainConf.backupPath = backupPath
|
||||
|
||||
@@ -498,6 +498,11 @@ class GuiDocTree(QTreeWidget):
|
||||
if tHandle in self.theMap:
|
||||
self.clearSelection()
|
||||
self.theMap[tHandle].setSelected(True)
|
||||
selItems = self.selectedIndexes()
|
||||
if selItems:
|
||||
self.scrollTo(
|
||||
selItems[0], QAbstractItemView.PositionAtCenter
|
||||
)
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
@@ -159,22 +159,24 @@ class GuiDocHighlighter(QSyntaxHighlighter):
|
||||
))
|
||||
|
||||
# Quoted Strings
|
||||
self.hRules.append((
|
||||
"{:s}(.+?){:s}".format('"','"'), {
|
||||
0 : self.hStyles["dialogue1"],
|
||||
}
|
||||
))
|
||||
self.hRules.append((
|
||||
"{:s}(.+?){:s}".format(*self.mainConf.fmtDoubleQuotes), {
|
||||
0 : self.hStyles["dialogue2"],
|
||||
}
|
||||
))
|
||||
self.hRules.append((
|
||||
"{:s}(.+?){:s}".format(*self.mainConf.fmtSingleQuotes), {
|
||||
0 : self.hStyles["dialogue3"],
|
||||
}
|
||||
))
|
||||
if self.mainConf.highlightQuotes:
|
||||
self.hRules.append((
|
||||
"{:s}(.+?){:s}".format('"','"'), {
|
||||
0 : self.hStyles["dialogue1"],
|
||||
}
|
||||
))
|
||||
self.hRules.append((
|
||||
"{:s}(.+?){:s}".format(*self.mainConf.fmtDoubleQuotes), {
|
||||
0 : self.hStyles["dialogue2"],
|
||||
}
|
||||
))
|
||||
self.hRules.append((
|
||||
"{:s}(.+?){:s}".format(*self.mainConf.fmtSingleQuotes), {
|
||||
0 : self.hStyles["dialogue3"],
|
||||
}
|
||||
))
|
||||
|
||||
# Auto-Replace Tags
|
||||
self.hRules.append((
|
||||
r"<(\S+?)>", {
|
||||
0 : self.hStyles["replace"],
|
||||
|
||||
@@ -6,7 +6,7 @@ with open("README.md", "r") as inFile:
|
||||
|
||||
setuptools.setup(
|
||||
name = "novelWriter",
|
||||
version = "0.5.1",
|
||||
version = "0.5.2",
|
||||
author = "Veronica Berglyd Olsen",
|
||||
author_email = "code@vkbo.net",
|
||||
description = "A markdown-like document editor for writing novels",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[Main]
|
||||
timestamp = 2020-05-01 21:28:25
|
||||
timestamp = 2020-05-21 14:52:36
|
||||
theme = default
|
||||
syntax = default_light
|
||||
icons = typicons_grey_light
|
||||
@@ -40,6 +40,7 @@ showtabsnspaces = False
|
||||
showlineendings = False
|
||||
bigdoclimit = 800
|
||||
showfullpath = True
|
||||
highlightquotes = True
|
||||
|
||||
[Backup]
|
||||
backuppath =
|
||||
|
||||
Reference in New Issue
Block a user