diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ad67b29..a8131905 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,13 @@ * Dropped the usage of .bak copies of document files. This was the old method to ensure the document data was written successfully, but it uses twice the storage space. Instead, writing via a temp file is the safe way to save files. PR #248. +## Version 0.6.4 [2020-xx-xx] + +**User Interface** + +* Updated the unit for Preferences > Editor > Big document limit from `kb` to `kb`. Issue #258, PR #260. + + ## Version 0.6.3 [2020-05-28] **Bugfixes** diff --git a/nw/constants/constants.py b/nw/constants/constants.py index 09622650..bc20af31 100644 --- a/nw/constants/constants.py +++ b/nw/constants/constants.py @@ -183,10 +183,11 @@ class nwQuotes(): # END Class nwQuotes class nwUnicode: - """Suppoted unicode character constants and translation maps. + """Suppoted unicode character constants and translation maps for HTML. """ # Unicode Constants + # ================= ## Quotation Marks U_QUOT = "\u0022" # Quotation mark @@ -216,7 +217,6 @@ class nwUnicode: ## Other U_NBSP = "\u00a0" # Non-breaking space - U_PARA = "\u2029" # Paragraph separator U_CHECK = "\u2714" # Heavy check mark U_MULT = "\u2715" # Multiplication x @@ -231,6 +231,7 @@ class nwUnicode: U_LTRIS = "\u25c2" # Left-pointing triangle, small # HTML Equivalents + # ================ ## Quotes H_QUOT = """ diff --git a/nw/gui/dialogs/preferences.py b/nw/gui/dialogs/preferences.py index 34b5d280..eaa034d1 100644 --- a/nw/gui/dialogs/preferences.py +++ b/nw/gui/dialogs/preferences.py @@ -573,7 +573,7 @@ class GuiConfigEditEditingTab(QWidget): "Big document limit", self.bigDocLimit, "Disables full spell checking over the size limit.", - theUnit="kb" + theUnit="kB" ) return diff --git a/nw/gui/elements/doceditor.py b/nw/gui/elements/doceditor.py index 667d4845..aa3ea1c0 100644 --- a/nw/gui/elements/doceditor.py +++ b/nw/gui/elements/doceditor.py @@ -391,9 +391,13 @@ class GuiDocEditor(QTextEdit): uses QTextEdit->toPlainText for Qt versions lower than 5.9, and the QDocument->toRawText for higher version. The latter preserves non-breaking spaces, which the former does not. + We still want to get rid of page and line separators though. + See: https://doc.qt.io/qt-5/qtextdocument.html#toPlainText """ if self.mainConf.verQtValue >= 50900: - theText = self.qDocument.toRawText().replace(nwUnicode.U_PARA,"\n") + theText = self.qDocument.toRawText() + theText = theText.replace("\u2028", "\n") # Line separators + theText = theText.replace("\u2029", "\n") # Paragraph separators else: theText = self.toPlainText() return theText