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

Renamed italic and bold to emphasis and strong emphasis

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-06-27 20:45:24 +02:00
parent 4d88b20fc1
commit a15af30578
4 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/constants/enum.py
+3 -3
View File
@@ -74,9 +74,9 @@ class nwDocAction(Enum):
CUT = 3 CUT = 3
COPY = 4 COPY = 4
PASTE = 5 PASTE = 5
ITALIC = 6 ENPH = 6
BOLD = 7 STRONG = 7
BOLDITALIC = 8 STRONGEMPH = 8
STRIKE = 9 STRIKE = 9
S_QUOTE = 10 S_QUOTE = 10
D_QUOTE = 11 D_QUOTE = 11
nw/gui/doceditor.py
+3 -3
View File
@@ -514,11 +514,11 @@ class GuiDocEditor(QTextEdit):
self.copy() self.copy()
elif theAction == nwDocAction.PASTE: elif theAction == nwDocAction.PASTE:
self.paste() self.paste()
elif theAction == nwDocAction.ITALIC: elif theAction == nwDocAction.ENPH:
self._toggleEmph(1) self._toggleEmph(1)
elif theAction == nwDocAction.BOLD: elif theAction == nwDocAction.STRONG:
self._toggleEmph(2) self._toggleEmph(2)
elif theAction == nwDocAction.BOLDITALIC: elif theAction == nwDocAction.STRONGEMPH:
self._toggleEmph(3) self._toggleEmph(3)
elif theAction == nwDocAction.STRIKE: elif theAction == nwDocAction.STRIKE:
self._toggleStrike() self._toggleStrike()
nw/gui/mainmenu.py
+20 -20
View File
@@ -526,30 +526,30 @@ class GuiMainMenu(QMenuBar):
# Format # Format
self.fmtMenu = self.addMenu("&Format") self.fmtMenu = self.addMenu("&Format")
# Format > Italic Text # Format > Emphasis
self.aFmtItalic = QAction("Italic Text", self) self.aFmtEmph = QAction("Emphasis", self)
self.aFmtItalic.setStatusTip("Make selected text italic") self.aFmtEmph.setStatusTip("Add emphasis to selected text (italic)")
self.aFmtItalic.setShortcut("Ctrl+I") self.aFmtEmph.setShortcut("Ctrl+I")
self.aFmtItalic.triggered.connect(lambda: self._docAction(nwDocAction.ITALIC)) self.aFmtEmph.triggered.connect(lambda: self._docAction(nwDocAction.ENPH))
self.fmtMenu.addAction(self.aFmtItalic) self.fmtMenu.addAction(self.aFmtEmph)
# Format > Bold Text # Format > Strong Emphasis
self.aFmtBold = QAction("Bold Text", self) self.aFmtStrong = QAction("Strong Emphasis", self)
self.aFmtBold.setStatusTip("Make selected text bold") self.aFmtStrong.setStatusTip("Add strong emphasis to selected text (bold)")
self.aFmtBold.setShortcut("Ctrl+B") self.aFmtStrong.setShortcut("Ctrl+B")
self.aFmtBold.triggered.connect(lambda: self._docAction(nwDocAction.BOLD)) self.aFmtStrong.triggered.connect(lambda: self._docAction(nwDocAction.STRONG))
self.fmtMenu.addAction(self.aFmtBold) self.fmtMenu.addAction(self.aFmtStrong)
# Format > Underline Text # Format > Very Strong Emphasis
self.aFmtBoldIt = QAction("Bold Italic Text", self) self.aFmtStrongEmph = QAction("Very Strong Emphasis", self)
self.aFmtBoldIt.setStatusTip("Make selected text bold and italic") self.aFmtStrongEmph.setStatusTip("Add very strong emphasis to selected text (bold and italic)")
self.aFmtBoldIt.setShortcut("Ctrl+Shift+B") self.aFmtStrongEmph.setShortcut("Ctrl+Shift+B")
self.aFmtBoldIt.triggered.connect(lambda: self._docAction(nwDocAction.BOLDITALIC)) self.aFmtStrongEmph.triggered.connect(lambda: self._docAction(nwDocAction.STRONGEMPH))
self.fmtMenu.addAction(self.aFmtBoldIt) self.fmtMenu.addAction(self.aFmtStrongEmph)
# Format > Strikethrough # Format > Strikethrough
self.aFmtStrike = QAction("Strikethrough Text", self) self.aFmtStrike = QAction("Strikethrough", self)
self.aFmtStrike.setStatusTip("Strikethrough selected text") self.aFmtStrike.setStatusTip("Add strikethrough to selected text")
self.aFmtStrike.setShortcut("Ctrl+-") self.aFmtStrike.setShortcut("Ctrl+-")
self.aFmtStrike.triggered.connect(lambda: self._docAction(nwDocAction.STRIKE)) self.aFmtStrike.triggered.connect(lambda: self._docAction(nwDocAction.STRIKE))
self.fmtMenu.addAction(self.aFmtStrike) self.fmtMenu.addAction(self.aFmtStrike)
nw/guimain.py
+4 -3
View File
@@ -1003,9 +1003,10 @@ class GuiMain(QMainWindow):
self.addAction(self.mainMenu.aInsThinNBSpace) self.addAction(self.mainMenu.aInsThinNBSpace)
# Format # Format
self.addAction(self.mainMenu.aFmtItalic) self.addAction(self.mainMenu.aFmtEmph)
self.addAction(self.mainMenu.aFmtBold) self.addAction(self.mainMenu.aFmtStrong)
self.addAction(self.mainMenu.aFmtBoldIt) self.addAction(self.mainMenu.aFmtStrongEmph)
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)
self.addAction(self.mainMenu.aFmtHead1) self.addAction(self.mainMenu.aFmtHead1)