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

Replaced underline format with bold-italic, and all formats now use star, not underscore

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-06-12 22:00:14 +02:00
parent 3c8cf6829a
commit 1f434718ec
4 changed files with 116 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/constants/enum.py
+24 -24
View File
@@ -68,30 +68,30 @@ class nwItemLayout(Enum):
class nwDocAction(Enum): class nwDocAction(Enum):
NO_ACTION = 0 NO_ACTION = 0
UNDO = 1 UNDO = 1
REDO = 2 REDO = 2
CUT = 3 CUT = 3
COPY = 4 COPY = 4
PASTE = 5 PASTE = 5
BOLD = 6 ITALIC = 6
ITALIC = 7 BOLD = 7
U_LINE = 8 BOLDITALIC = 8
S_QUOTE = 9 S_QUOTE = 9
D_QUOTE = 10 D_QUOTE = 10
SEL_ALL = 11 SEL_ALL = 11
SEL_PARA = 12 SEL_PARA = 12
FIND = 13 FIND = 13
REPLACE = 14 REPLACE = 14
GO_NEXT = 15 GO_NEXT = 15
GO_PREV = 16 GO_PREV = 16
REPL_NEXT = 17 REPL_NEXT = 17
BLOCK_H1 = 18 BLOCK_H1 = 18
BLOCK_H2 = 19 BLOCK_H2 = 19
BLOCK_H3 = 20 BLOCK_H3 = 20
BLOCK_H4 = 21 BLOCK_H4 = 21
BLOCK_COM = 22 BLOCK_COM = 22
BLOCK_TXT = 23 BLOCK_TXT = 23
# END Enum nwDocAction # END Enum nwDocAction
nw/gui/doceditor.py
+78 -11
View File
@@ -509,16 +509,16 @@ class GuiDocEditor(QTextEdit):
self.copy() self.copy()
elif theAction == nwDocAction.PASTE: elif theAction == nwDocAction.PASTE:
self.paste() self.paste()
elif theAction == nwDocAction.BOLD:
self._wrapSelection("**","**")
elif theAction == nwDocAction.ITALIC: elif theAction == nwDocAction.ITALIC:
self._wrapSelection("_","_") self._toggleEmph(1)
elif theAction == nwDocAction.U_LINE: elif theAction == nwDocAction.BOLD:
self._wrapSelection("__","__") self._toggleEmph(2)
elif theAction == nwDocAction.BOLDITALIC:
self._toggleEmph(3)
elif theAction == nwDocAction.S_QUOTE: elif theAction == nwDocAction.S_QUOTE:
self._wrapSelection(self.typSQOpen,self.typSQClose) self._wrapSelection(self.typSQOpen, self.typSQClose)
elif theAction == nwDocAction.D_QUOTE: elif theAction == nwDocAction.D_QUOTE:
self._wrapSelection(self.typDQOpen,self.typDQClose) self._wrapSelection(self.typDQOpen, self.typDQClose)
elif theAction == nwDocAction.SEL_ALL: elif theAction == nwDocAction.SEL_ALL:
self._makeSelection(QTextCursor.Document) self._makeSelection(QTextCursor.Document)
elif theAction == nwDocAction.SEL_PARA: elif theAction == nwDocAction.SEL_PARA:
@@ -881,18 +881,20 @@ class GuiDocEditor(QTextEdit):
self.bigDoc = False self.bigDoc = False
return return
def _wrapSelection(self, tBefore, tAfter): def _wrapSelection(self, tBefore, tAfter=None):
"""Wraps the selected text in whatever is in tBefore and tAfter. """Wraps the selected text in whatever is in tBefore and tAfter.
If there is no selection, the autoSelect setting decides the If there is no selection, the autoSelect setting decides the
action. AutoSelect will select the word under the cursor before action. AutoSelect will select the word under the cursor before
wrapping it. If this feature is disabled, nothing is done. wrapping it. If this feature is disabled, nothing is done.
""" """
theCursor = self.textCursor() if tAfter is None:
if self.mainConf.autoSelect and not theCursor.hasSelection(): tAfter = tBefore
theCursor.select(QTextCursor.WordUnderCursor)
theCursor = self._autoSelect()
if theCursor.hasSelection(): if theCursor.hasSelection():
posS = theCursor.selectionStart() posS = theCursor.selectionStart()
posE = theCursor.selectionEnd() posE = theCursor.selectionEnd()
theCursor.clearSelection() theCursor.clearSelection()
theCursor.beginEditBlock() theCursor.beginEditBlock()
theCursor.setPosition(posE) theCursor.setPosition(posE)
@@ -900,10 +902,75 @@ class GuiDocEditor(QTextEdit):
theCursor.setPosition(posS) theCursor.setPosition(posS)
theCursor.insertText(tBefore) theCursor.insertText(tBefore)
theCursor.endEditBlock() theCursor.endEditBlock()
theCursor.setPosition(posE + len(tBefore))
theCursor.movePosition(QTextCursor.Left, QTextCursor.KeepAnchor, posE-posS)
self.setTextCursor(theCursor)
else: else:
logger.warning("No selection made, nothing to do") logger.warning("No selection made, nothing to do")
return return
def _clearSurrounding(self, theCursor, nChars):
"""Clears n characters before and after the cursor.
"""
if theCursor.hasSelection():
posS = theCursor.selectionStart()
posE = theCursor.selectionEnd()
theCursor.clearSelection()
theCursor.beginEditBlock()
theCursor.setPosition(posS)
for i in range(nChars):
theCursor.deletePreviousChar()
theCursor.setPosition(posE)
for i in range(nChars):
theCursor.deletePreviousChar()
theCursor.endEditBlock()
theCursor.clearSelection()
else:
logger.warning("No selection made, nothing to do")
return
def _autoSelect(self):
"""Returns a cursor which may or may not have a selection based
on user settings and document action.
"""
theCursor = self.textCursor()
if self.mainConf.autoSelect and not theCursor.hasSelection():
theCursor.select(QTextCursor.WordUnderCursor)
self.setTextCursor(theCursor)
return theCursor
def _toggleEmph(self, eLevel):
"""Toggle emphasis of a given level.
"""
theCursor = self._autoSelect()
if theCursor.hasSelection():
posS = theCursor.selectionStart()
posE = theCursor.selectionEnd()
numB = 0
for n in range(4):
if self.qDocument.characterAt(posS-n-1) == "*":
numB += 1
else:
break
numA = 0
for n in range(4):
if self.qDocument.characterAt(posE+n) == "*":
numA += 1
else:
break
cLevel = min(numB, numA)
if cLevel == eLevel:
self._clearSurrounding(theCursor, eLevel)
else:
self._wrapSelection("*"*(eLevel - cLevel))
return
def _formatBlock(self, docAction): def _formatBlock(self, docAction):
"""Changes the block format of the block under the cursor. """Changes the block format of the block under the cursor.
""" """
nw/gui/mainmenu.py
+12 -12
View File
@@ -515,13 +515,6 @@ class GuiMainMenu(QMenuBar):
# Format # Format
self.fmtMenu = self.addMenu("&Format") self.fmtMenu = self.addMenu("&Format")
# Format > Bold Text
self.aFmtBold = QAction("Bold Text", self)
self.aFmtBold.setStatusTip("Make selected text bold")
self.aFmtBold.setShortcut("Ctrl+B")
self.aFmtBold.triggered.connect(lambda: self._docAction(nwDocAction.BOLD))
self.fmtMenu.addAction(self.aFmtBold)
# Format > Italic Text # Format > Italic Text
self.aFmtItalic = QAction("Italic Text", self) self.aFmtItalic = QAction("Italic Text", self)
self.aFmtItalic.setStatusTip("Make selected text italic") self.aFmtItalic.setStatusTip("Make selected text italic")
@@ -529,12 +522,19 @@ class GuiMainMenu(QMenuBar):
self.aFmtItalic.triggered.connect(lambda: self._docAction(nwDocAction.ITALIC)) self.aFmtItalic.triggered.connect(lambda: self._docAction(nwDocAction.ITALIC))
self.fmtMenu.addAction(self.aFmtItalic) self.fmtMenu.addAction(self.aFmtItalic)
# Format > Bold Text
self.aFmtBold = QAction("Bold Text", self)
self.aFmtBold.setStatusTip("Make selected text bold")
self.aFmtBold.setShortcut("Ctrl+B")
self.aFmtBold.triggered.connect(lambda: self._docAction(nwDocAction.BOLD))
self.fmtMenu.addAction(self.aFmtBold)
# Format > Underline Text # Format > Underline Text
self.aFmtULine = QAction("Underline Text", self) self.aFmtBoldIt = QAction("Bold Italic Text", self)
self.aFmtULine.setStatusTip("Underline selected text") self.aFmtBoldIt.setStatusTip("Make selected text bold and italic")
self.aFmtULine.setShortcut("Ctrl+U") self.aFmtBoldIt.setShortcut("Ctrl+Shift+B")
self.aFmtULine.triggered.connect(lambda: self._docAction(nwDocAction.U_LINE)) self.aFmtBoldIt.triggered.connect(lambda: self._docAction(nwDocAction.BOLDITALIC))
self.fmtMenu.addAction(self.aFmtULine) self.fmtMenu.addAction(self.aFmtBoldIt)
# Edit > Separator # Edit > Separator
self.fmtMenu.addSeparator() self.fmtMenu.addSeparator()
nw/guimain.py
+2 -2
View File
@@ -961,9 +961,9 @@ class GuiMain(QMainWindow):
self.addAction(self.mainMenu.aEditPaste) self.addAction(self.mainMenu.aEditPaste)
self.addAction(self.mainMenu.aSelectAll) self.addAction(self.mainMenu.aSelectAll)
self.addAction(self.mainMenu.aSelectPar) self.addAction(self.mainMenu.aSelectPar)
self.addAction(self.mainMenu.aFmtBold)
self.addAction(self.mainMenu.aFmtItalic) self.addAction(self.mainMenu.aFmtItalic)
self.addAction(self.mainMenu.aFmtULine) self.addAction(self.mainMenu.aFmtBold)
self.addAction(self.mainMenu.aFmtBoldIt)
self.addAction(self.mainMenu.aFmtDQuote) self.addAction(self.mainMenu.aFmtDQuote)
self.addAction(self.mainMenu.aFmtSQuote) self.addAction(self.mainMenu.aFmtSQuote)
self.addAction(self.mainMenu.aFmtHead1) self.addAction(self.mainMenu.aFmtHead1)