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

Rename emph and strong to italic and bold for consistency and add tooltips to editor toolbar

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2023-12-03 17:33:15 +01:00
parent 776eedc5f2
commit fff6ba98bc
6 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/enum.py
+3 -3
View File
@@ -95,9 +95,9 @@ class nwDocAction(Enum):
CUT = 3 CUT = 3
COPY = 4 COPY = 4
PASTE = 5 PASTE = 5
EMPH = 6 MD_ITALIC = 6
STRONG = 7 MD_BOLD = 7
STRIKE = 8 MD_STRIKE = 8
S_QUOTE = 9 S_QUOTE = 9
D_QUOTE = 10 D_QUOTE = 10
SEL_ALL = 11 SEL_ALL = 11
novelwriter/gui/doceditor.py
+15 -6
View File
@@ -718,11 +718,11 @@ class GuiDocEditor(QPlainTextEdit):
self.copy() self.copy()
elif action == nwDocAction.PASTE: elif action == nwDocAction.PASTE:
self.paste() self.paste()
elif action == nwDocAction.EMPH: elif action == nwDocAction.MD_ITALIC:
self._toggleFormat(1, "_") self._toggleFormat(1, "_")
elif action == nwDocAction.STRONG: elif action == nwDocAction.MD_BOLD:
self._toggleFormat(2, "*") self._toggleFormat(2, "*")
elif action == nwDocAction.STRIKE: elif action == nwDocAction.MD_STRIKE:
self._toggleFormat(2, "~") self._toggleFormat(2, "~")
elif action == nwDocAction.S_QUOTE: elif action == nwDocAction.S_QUOTE:
self._wrapSelection(self._typSQuoteO, self._typSQuoteC) self._wrapSelection(self._typSQuoteO, self._typSQuoteC)
@@ -2239,54 +2239,63 @@ class GuiDocToolBar(QWidget):
self.tbBoldMD = QToolButton(self) self.tbBoldMD = QToolButton(self)
self.tbBoldMD.setIconSize(iconSize) self.tbBoldMD.setIconSize(iconSize)
self.tbBoldMD.setToolTip(self.tr("Markdown Bold"))
self.tbBoldMD.clicked.connect( self.tbBoldMD.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.STRONG) lambda: self.requestDocAction.emit(nwDocAction.MD_BOLD)
) )
self.tbItalicMD = QToolButton(self) self.tbItalicMD = QToolButton(self)
self.tbItalicMD.setIconSize(iconSize) self.tbItalicMD.setIconSize(iconSize)
self.tbItalicMD.setToolTip(self.tr("Markdown Italic"))
self.tbItalicMD.clicked.connect( self.tbItalicMD.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.EMPH) lambda: self.requestDocAction.emit(nwDocAction.MD_ITALIC)
) )
self.tbStrikeMD = QToolButton(self) self.tbStrikeMD = QToolButton(self)
self.tbStrikeMD.setIconSize(iconSize) self.tbStrikeMD.setIconSize(iconSize)
self.tbStrikeMD.setToolTip(self.tr("Markdown Strikethrough"))
self.tbStrikeMD.clicked.connect( self.tbStrikeMD.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.STRIKE) lambda: self.requestDocAction.emit(nwDocAction.MD_STRIKE)
) )
self.tbBold = QToolButton(self) self.tbBold = QToolButton(self)
self.tbBold.setIconSize(iconSize) self.tbBold.setIconSize(iconSize)
self.tbBold.setToolTip(self.tr("Shortcode Bold"))
self.tbBold.clicked.connect( self.tbBold.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.SC_BOLD) lambda: self.requestDocAction.emit(nwDocAction.SC_BOLD)
) )
self.tbItalic = QToolButton(self) self.tbItalic = QToolButton(self)
self.tbItalic.setIconSize(iconSize) self.tbItalic.setIconSize(iconSize)
self.tbItalic.setToolTip(self.tr("Shortcode Italic"))
self.tbItalic.clicked.connect( self.tbItalic.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.SC_ITALIC) lambda: self.requestDocAction.emit(nwDocAction.SC_ITALIC)
) )
self.tbStrike = QToolButton(self) self.tbStrike = QToolButton(self)
self.tbStrike.setIconSize(iconSize) self.tbStrike.setIconSize(iconSize)
self.tbStrike.setToolTip(self.tr("Shortcode Strikethrough"))
self.tbStrike.clicked.connect( self.tbStrike.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.SC_STRIKE) lambda: self.requestDocAction.emit(nwDocAction.SC_STRIKE)
) )
self.tbUnderline = QToolButton(self) self.tbUnderline = QToolButton(self)
self.tbUnderline.setIconSize(iconSize) self.tbUnderline.setIconSize(iconSize)
self.tbUnderline.setToolTip(self.tr("Shortcode Underline"))
self.tbUnderline.clicked.connect( self.tbUnderline.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.SC_ULINE) lambda: self.requestDocAction.emit(nwDocAction.SC_ULINE)
) )
self.tbSuperscript = QToolButton(self) self.tbSuperscript = QToolButton(self)
self.tbSuperscript.setIconSize(iconSize) self.tbSuperscript.setIconSize(iconSize)
self.tbSuperscript.setToolTip(self.tr("Shortcode Superscript"))
self.tbSuperscript.clicked.connect( self.tbSuperscript.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.SC_SUP) lambda: self.requestDocAction.emit(nwDocAction.SC_SUP)
) )
self.tbSubscript = QToolButton(self) self.tbSubscript = QToolButton(self)
self.tbSubscript.setIconSize(iconSize) self.tbSubscript.setIconSize(iconSize)
self.tbSubscript.setToolTip(self.tr("Shortcode Subscript"))
self.tbSubscript.clicked.connect( self.tbSubscript.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.SC_SUB) lambda: self.requestDocAction.emit(nwDocAction.SC_SUB)
) )
novelwriter/gui/mainmenu.py
+11 -11
View File
@@ -608,25 +608,25 @@ class GuiMainMenu(QMenuBar):
# Format # Format
self.fmtMenu = self.addMenu(self.tr("&Format")) self.fmtMenu = self.addMenu(self.tr("&Format"))
# Format > Emphasis # Format > Bold
self.aFmtEmph = self.fmtMenu.addAction(self.tr("Emphasis")) self.aFmtBold = self.fmtMenu.addAction(self.tr("Bold"))
self.aFmtEmph.setShortcut("Ctrl+I") self.aFmtBold.setShortcut("Ctrl+B")
self.aFmtEmph.triggered.connect( self.aFmtBold.triggered.connect(
lambda: self.requestDocAction.emit(nwDocAction.EMPH) lambda: self.requestDocAction.emit(nwDocAction.MD_BOLD)
) )
# Format > Strong Emphasis # Format > Italic
self.aFmtStrong = self.fmtMenu.addAction(self.tr("Strong Emphasis")) self.aFmtItalic = self.fmtMenu.addAction(self.tr("Italic"))
self.aFmtStrong.setShortcut("Ctrl+B") self.aFmtItalic.setShortcut("Ctrl+I")
self.aFmtStrong.triggered.connect( self.aFmtItalic.triggered.connect(
lambda: self.requestDocAction.emit(nwDocAction.STRONG) lambda: self.requestDocAction.emit(nwDocAction.MD_ITALIC)
) )
# Format > Strikethrough # Format > Strikethrough
self.aFmtStrike = self.fmtMenu.addAction(self.tr("Strikethrough")) self.aFmtStrike = self.fmtMenu.addAction(self.tr("Strikethrough"))
self.aFmtStrike.setShortcut("Ctrl+D") self.aFmtStrike.setShortcut("Ctrl+D")
self.aFmtStrike.triggered.connect( self.aFmtStrike.triggered.connect(
lambda: self.requestDocAction.emit(nwDocAction.STRIKE) lambda: self.requestDocAction.emit(nwDocAction.MD_STRIKE)
) )
# Edit > Separator # Edit > Separator
novelwriter/guimain.py
+2 -2
View File
@@ -1422,8 +1422,8 @@ class GuiMain(QMainWindow):
self.addAction(self.mainMenu.aReplaceNext) self.addAction(self.mainMenu.aReplaceNext)
# Format # Format
self.addAction(self.mainMenu.aFmtEmph) self.addAction(self.mainMenu.aFmtItalic)
self.addAction(self.mainMenu.aFmtStrong) self.addAction(self.mainMenu.aFmtBold)
self.addAction(self.mainMenu.aFmtStrike) self.addAction(self.mainMenu.aFmtStrike)
self.addAction(self.mainMenu.aFmtDQuote) self.addAction(self.mainMenu.aFmtDQuote)
self.addAction(self.mainMenu.aFmtSQuote) self.addAction(self.mainMenu.aFmtSQuote)
tests/test_gui/test_gui_doceditor.py
+3 -3
View File
@@ -432,21 +432,21 @@ def testGuiEditor_Actions(qtbot, nwGUI, projPath, ipsumText, mockRnd):
# Emphasis # Emphasis
nwGUI.docEditor.setCursorPosition(50) nwGUI.docEditor.setCursorPosition(50)
assert nwGUI.docEditor.docAction(nwDocAction.EMPH) is True assert nwGUI.docEditor.docAction(nwDocAction.MD_ITALIC) is True
assert nwGUI.docEditor.getText() == text.replace("consectetur", "_consectetur_") assert nwGUI.docEditor.getText() == text.replace("consectetur", "_consectetur_")
assert nwGUI.docEditor.docAction(nwDocAction.UNDO) is True assert nwGUI.docEditor.docAction(nwDocAction.UNDO) is True
assert nwGUI.docEditor.getText() == text assert nwGUI.docEditor.getText() == text
# Strong # Strong
nwGUI.docEditor.setCursorPosition(50) nwGUI.docEditor.setCursorPosition(50)
assert nwGUI.docEditor.docAction(nwDocAction.STRONG) is True assert nwGUI.docEditor.docAction(nwDocAction.MD_BOLD) is True
assert nwGUI.docEditor.getText() == text.replace("consectetur", "**consectetur**") assert nwGUI.docEditor.getText() == text.replace("consectetur", "**consectetur**")
assert nwGUI.docEditor.docAction(nwDocAction.UNDO) is True assert nwGUI.docEditor.docAction(nwDocAction.UNDO) is True
assert nwGUI.docEditor.getText() == text assert nwGUI.docEditor.getText() == text
# Strikeout # Strikeout
nwGUI.docEditor.setCursorPosition(50) nwGUI.docEditor.setCursorPosition(50)
assert nwGUI.docEditor.docAction(nwDocAction.STRIKE) is True assert nwGUI.docEditor.docAction(nwDocAction.MD_STRIKE) is True
assert nwGUI.docEditor.getText() == text.replace("consectetur", "~~consectetur~~") assert nwGUI.docEditor.getText() == text.replace("consectetur", "~~consectetur~~")
assert nwGUI.docEditor.docAction(nwDocAction.UNDO) is True assert nwGUI.docEditor.docAction(nwDocAction.UNDO) is True
assert nwGUI.docEditor.getText() == text assert nwGUI.docEditor.getText() == text
tests/test_gui/test_gui_mainmenu.py
+8 -8
View File
@@ -50,17 +50,17 @@ def testGuiMenu_EditFormat(qtbot, monkeypatch, nwGUI, prjLipsum):
cleanText = nwGUI.docEditor.getText()[39:86] cleanText = nwGUI.docEditor.getText()[39:86]
# Bold # Bold
nwGUI.mainMenu.aFmtStrong.activate(QAction.Trigger) nwGUI.mainMenu.aFmtBold.activate(QAction.Trigger)
fmtStr = "**Pellentesque** nec erat ut nulla posuere commodo." fmtStr = "**Pellentesque** nec erat ut nulla posuere commodo."
assert nwGUI.docEditor.getText()[39:90] == fmtStr assert nwGUI.docEditor.getText()[39:90] == fmtStr
nwGUI.mainMenu.aFmtStrong.activate(QAction.Trigger) nwGUI.mainMenu.aFmtBold.activate(QAction.Trigger)
assert nwGUI.docEditor.getText()[39:86] == cleanText assert nwGUI.docEditor.getText()[39:86] == cleanText
# Italic # Italic
nwGUI.mainMenu.aFmtEmph.activate(QAction.Trigger) nwGUI.mainMenu.aFmtItalic.activate(QAction.Trigger)
fmtStr = "_Pellentesque_ nec erat ut nulla posuere commodo." fmtStr = "_Pellentesque_ nec erat ut nulla posuere commodo."
assert nwGUI.docEditor.getText()[39:88] == fmtStr assert nwGUI.docEditor.getText()[39:88] == fmtStr
nwGUI.mainMenu.aFmtEmph.activate(QAction.Trigger) nwGUI.mainMenu.aFmtItalic.activate(QAction.Trigger)
assert nwGUI.docEditor.getText()[39:86] == cleanText assert nwGUI.docEditor.getText()[39:86] == cleanText
# Strikethrough # Strikethrough
@@ -71,10 +71,10 @@ def testGuiMenu_EditFormat(qtbot, monkeypatch, nwGUI, prjLipsum):
assert nwGUI.docEditor.getText()[39:86] == cleanText assert nwGUI.docEditor.getText()[39:86] == cleanText
# Should get us back to plain # Should get us back to plain
nwGUI.mainMenu.aFmtStrong.activate(QAction.Trigger) nwGUI.mainMenu.aFmtBold.activate(QAction.Trigger)
nwGUI.mainMenu.aFmtEmph.activate(QAction.Trigger) nwGUI.mainMenu.aFmtItalic.activate(QAction.Trigger)
nwGUI.mainMenu.aFmtEmph.activate(QAction.Trigger) nwGUI.mainMenu.aFmtItalic.activate(QAction.Trigger)
nwGUI.mainMenu.aFmtStrong.activate(QAction.Trigger) nwGUI.mainMenu.aFmtBold.activate(QAction.Trigger)
assert nwGUI.docEditor.getText()[39:86] == cleanText assert nwGUI.docEditor.getText()[39:86] == cleanText
# Double Quotes # Double Quotes