Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into bugfixes

Browse Source
This commit is contained in:
Veronica K. Berglyd Olsen
2020-08-16 11:52:22 +02:00
committed by GitHub
parent 287e083b0a 9b7bf1918d
commit 2c023e4733
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/source/conf.py
+1 -1
View File
@@ -28,7 +28,7 @@ author = "Veronica Berglyd Olsen"
# The short X.Y version # The short X.Y version
version = "1.0" version = "1.0"
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
release = "1.0b1" release = "1.0-beta1"
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
nw/__init__.py
+1 -1
View File
@@ -41,7 +41,7 @@ __package__ = "nw"
__author__ = "Veronica Berglyd Olsen" __author__ = "Veronica Berglyd Olsen"
__copyright__ = "Copyright 2018–2020, Veronica Berglyd Olsen" __copyright__ = "Copyright 2018–2020, Veronica Berglyd Olsen"
__license__ = "GPLv3" __license__ = "GPLv3"
__version__ = "1.0b1" __version__ = "1.0-beta1"
__hexversion__ = "0x010000b1" __hexversion__ = "0x010000b1"
__date__ = "2020-08-23" __date__ = "2020-08-23"
__maintainer__ = "Veronica Berglyd Olsen" __maintainer__ = "Veronica Berglyd Olsen"
nw/gui/doceditor.py
+10 -8
View File
@@ -593,21 +593,21 @@ class GuiDocEditor(QTextEdit):
theText = theInsert theText = theInsert
elif theInsert in nwDocInsert: elif theInsert in nwDocInsert:
if theInsert == nwDocInsert.NO_INSERT: if theInsert == nwDocInsert.NO_INSERT:
theText = "", theText = ""
elif theInsert == nwDocInsert.HARD_BREAK: elif theInsert == nwDocInsert.HARD_BREAK:
theText = " \n", theText = " \n"
elif theInsert == nwDocInsert.NB_SPACE: elif theInsert == nwDocInsert.NB_SPACE:
theText = nwUnicode.U_NBSP, theText = nwUnicode.U_NBSP
elif theInsert == nwDocInsert.THIN_SPACE: elif theInsert == nwDocInsert.THIN_SPACE:
theText = nwUnicode.U_THNSP, theText = nwUnicode.U_THNSP
elif theInsert == nwDocInsert.THIN_NB_SPACE: elif theInsert == nwDocInsert.THIN_NB_SPACE:
theText = nwUnicode.U_THNBSP, theText = nwUnicode.U_THNBSP
elif theInsert == nwDocInsert.SHORT_DASH: elif theInsert == nwDocInsert.SHORT_DASH:
theText = nwUnicode.U_ENDASH, theText = nwUnicode.U_ENDASH
elif theInsert == nwDocInsert.LONG_DASH: elif theInsert == nwDocInsert.LONG_DASH:
theText = nwUnicode.U_EMDASH, theText = nwUnicode.U_EMDASH
elif theInsert == nwDocInsert.ELLIPSIS: elif theInsert == nwDocInsert.ELLIPSIS:
theText = nwUnicode.U_HELLIP, theText = nwUnicode.U_HELLIP
elif theInsert == nwDocInsert.QUOTE_LS: elif theInsert == nwDocInsert.QUOTE_LS:
theText = self.typSQOpen theText = self.typSQOpen
elif theInsert == nwDocInsert.QUOTE_RS: elif theInsert == nwDocInsert.QUOTE_RS:
@@ -620,10 +620,12 @@ class GuiDocEditor(QTextEdit):
return False return False
else: else:
return False return False
theCursor = self.textCursor() theCursor = self.textCursor()
theCursor.beginEditBlock() theCursor.beginEditBlock()
theCursor.insertText(theText) theCursor.insertText(theText)
theCursor.endEditBlock() theCursor.endEditBlock()
return True return True
def closeSearch(self): def closeSearch(self):