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

Drop the markdown/shortcode toggle feature from editor toolbar and update icons (#1636, #1637)

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2023-12-03 16:56:36 +01:00
parent f2eaaa09b6
commit 776eedc5f2
27 changed files with 116 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/gui/doceditor.py
+33 -46
View File
@@ -2237,24 +2237,41 @@ class GuiDocToolBar(QWidget):
# General Buttons
# ===============
self.tbMode = QToolButton(self)
self.tbMode.setToolTip(self.tr("Toggle Markdown or Shortcodes Mode"))
self.tbMode.setIconSize(iconSize)
self.tbMode.setCheckable(True)
self.tbMode.setChecked(CONFIG.useShortcodes)
self.tbMode.toggled.connect(self._toggleFormatMode)
self.tbBoldMD = QToolButton(self)
self.tbBoldMD.setIconSize(iconSize)
self.tbBoldMD.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.STRONG)
)
self.tbItalicMD = QToolButton(self)
self.tbItalicMD.setIconSize(iconSize)
self.tbItalicMD.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.EMPH)
)
self.tbStrikeMD = QToolButton(self)
self.tbStrikeMD.setIconSize(iconSize)
self.tbStrikeMD.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.STRIKE)
)
self.tbBold = QToolButton(self)
self.tbBold.setIconSize(iconSize)
self.tbBold.clicked.connect(self._formatBold)
self.tbBold.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.SC_BOLD)
)
self.tbItalic = QToolButton(self)
self.tbItalic.setIconSize(iconSize)
self.tbItalic.clicked.connect(self._formatItalic)
self.tbItalic.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.SC_ITALIC)
)
self.tbStrike = QToolButton(self)
self.tbStrike.setIconSize(iconSize)
self.tbStrike.clicked.connect(self._formatStrike)
self.tbStrike.clicked.connect(
lambda: self.requestDocAction.emit(nwDocAction.SC_STRIKE)
)
self.tbUnderline = QToolButton(self)
self.tbUnderline.setIconSize(iconSize)
@@ -2278,7 +2295,10 @@ class GuiDocToolBar(QWidget):
# ========
self.outerBox = QVBoxLayout()
self.outerBox.addWidget(self.tbMode)
self.outerBox.addWidget(self.tbBoldMD)
self.outerBox.addWidget(self.tbItalicMD)
self.outerBox.addWidget(self.tbStrikeMD)
self.outerBox.addSpacing(cM)
self.outerBox.addWidget(self.tbBold)
self.outerBox.addWidget(self.tbItalic)
self.outerBox.addWidget(self.tbStrike)
@@ -2306,8 +2326,9 @@ class GuiDocToolBar(QWidget):
palette.setColor(QPalette.ColorRole.Text, QColor(*SHARED.theme.colText))
self.setPalette(palette)
tPx = int(0.8*SHARED.theme.fontPixelSize)
self.tbMode.setIcon(SHARED.theme.getToggleIcon("fmt_mode", (tPx, tPx)))
self.tbBoldMD.setIcon(SHARED.theme.getIcon("fmt_bold-md"))
self.tbItalicMD.setIcon(SHARED.theme.getIcon("fmt_italic-md"))
self.tbStrikeMD.setIcon(SHARED.theme.getIcon("fmt_strike-md"))
self.tbBold.setIcon(SHARED.theme.getIcon("fmt_bold"))
self.tbItalic.setIcon(SHARED.theme.getIcon("fmt_italic"))
self.tbStrike.setIcon(SHARED.theme.getIcon("fmt_strike"))
@@ -2317,40 +2338,6 @@ class GuiDocToolBar(QWidget):
return
##
# Private Slots
##
@pyqtSlot(bool)
def _toggleFormatMode(self, checked: bool) -> None:
"""Toggle the formatting mode."""
CONFIG.useShortcodes = checked
return
@pyqtSlot()
def _formatBold(self):
"""Call the bold format action."""
self.requestDocAction.emit(
nwDocAction.SC_BOLD if self.tbMode.isChecked() else nwDocAction.STRONG
)
return
@pyqtSlot()
def _formatItalic(self):
"""Call the italic format action."""
self.requestDocAction.emit(
nwDocAction.SC_ITALIC if self.tbMode.isChecked() else nwDocAction.EMPH
)
return
@pyqtSlot()
def _formatStrike(self):
"""Call the strikethrough format action."""
self.requestDocAction.emit(
nwDocAction.SC_STRIKE if self.tbMode.isChecked() else nwDocAction.STRIKE
)
return
# END Class GuiDocToolBar