From 6bd2da5e72fe4cbf537ab3cea250fe2b8a375c9d Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <code@vkbo.net>
Date: Mon, 22 Apr 2019 21:39:19 +0200
Subject: [PATCH] Working text bold shortcut and toolbar

---
 nw/gui/doceditor.py | 19 ++++++++++++-
 nw/gui/winmain.py   | 68 ++++++++++++++++++++++-----------------------
 2 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/nw/gui/doceditor.py b/nw/gui/doceditor.py
index 1201de1e..99e77018 100644
--- a/nw/gui/doceditor.py
+++ b/nw/gui/doceditor.py
@@ -230,6 +230,22 @@ class GuiDocEditor(QWidget):
 
         return
 
+    ##
+    #  Key Shortcut Handlers
+    ##
+
+    def _doBold(self):
+        theCursor = self.guiEditor.textCursor()
+        if theCursor.hasSelection():
+            selBeg = theCursor.selectionStart()
+            selEnd = theCursor.selectionEnd()
+            selText = theCursor.selectedText()
+            theText = "**%s**" % theCursor.selectedText()
+            theCursor.removeSelectedText()
+            theCursor.setPosition(selBeg)
+            self.guiEditor.textCursor().insertText(theText)
+        return
+
     ##
     #  GUI Builder
     ##
@@ -241,8 +257,9 @@ class GuiDocEditor(QWidget):
 
         # Text > Bold
         tbTextBold = QAction(QIcon.fromTheme("format-text-bold"), "Bold (Ctrl+B)", toolBar)
-        tbTextBold.setShortcut("Ctrl+B")
         tbTextBold.setStatusTip("Toggle Selected Text Bold")
+        tbTextBold.setShortcut("Ctrl+B")
+        tbTextBold.triggered.connect(self._doBold)
         toolBar.addAction(tbTextBold)
 
         # Text > Italics
diff --git a/nw/gui/winmain.py b/nw/gui/winmain.py
index c4283d6d..dd25182c 100644
--- a/nw/gui/winmain.py
+++ b/nw/gui/winmain.py
@@ -377,48 +377,48 @@ class GuiMain(QMainWindow):
 
         ############################################################################################
 
-        # Format
-        formatMenu = menuBar.addMenu("&Format")
+        # # Format
+        # formatMenu = menuBar.addMenu("&Format")
 
-        # Format > Font Style
-        menuFont = QAction(QIcon.fromTheme("preferences-desktop-font"), "Font Family", menuBar)
-        menuFont.setStatusTip("Set Font for Selected text")
-        formatMenu.addAction(menuFont)
+        # # Format > Font Style
+        # menuFont = QAction(QIcon.fromTheme("preferences-desktop-font"), "Font Family", menuBar)
+        # menuFont.setStatusTip("Set Font for Selected text")
+        # formatMenu.addAction(menuFont)
 
-        # Format > Separator
-        formatMenu.addSeparator()
+        # # Format > Separator
+        # formatMenu.addSeparator()
 
-        # Format > Bold
-        menuBold = QAction(QIcon.fromTheme("format-text-bold"), "Bold Text", menuBar)
-        menuBold.setShortcut("Ctrl+B")
-        menuBold.setStatusTip("Toggle Bold for Selected Text")
-        formatMenu.addAction(menuBold)
+        # # Format > Bold
+        # menuBold = QAction(QIcon.fromTheme("format-text-bold"), "Bold Text", menuBar)
+        # menuBold.setShortcut("Ctrl+B")
+        # menuBold.setStatusTip("Toggle Bold for Selected Text")
+        # formatMenu.addAction(menuBold)
 
-        # Format > Italic
-        menuItalic = QAction(QIcon.fromTheme("format-text-italic"), "Italic Text", menuBar)
-        menuItalic.setShortcut("Ctrl+I")
-        menuItalic.setStatusTip("Toggle Italic for Selected Text")
-        formatMenu.addAction(menuItalic)
+        # # Format > Italic
+        # menuItalic = QAction(QIcon.fromTheme("format-text-italic"), "Italic Text", menuBar)
+        # menuItalic.setShortcut("Ctrl+I")
+        # menuItalic.setStatusTip("Toggle Italic for Selected Text")
+        # formatMenu.addAction(menuItalic)
 
-        # Format > Underline
-        menuUnderline = QAction(QIcon.fromTheme("format-text-underline"), "Underline Text", menuBar)
-        menuUnderline.setShortcut("Ctrl+U")
-        menuUnderline.setStatusTip("Toggle Underline for Selected Text")
-        formatMenu.addAction(menuUnderline)
+        # # Format > Underline
+        # menuUnderline = QAction(QIcon.fromTheme("format-text-underline"), "Underline Text", menuBar)
+        # menuUnderline.setShortcut("Ctrl+U")
+        # menuUnderline.setStatusTip("Toggle Underline for Selected Text")
+        # formatMenu.addAction(menuUnderline)
 
-        # Format > Strikethrough
-        menuStrikethrough = QAction(QIcon.fromTheme("format-text-strikethrough"), "Strikethrough Text", menuBar)
-        menuStrikethrough.setShortcut("Ctrl+D")
-        menuStrikethrough.setStatusTip("Toggle Strikethrough for Selected Text")
-        formatMenu.addAction(menuStrikethrough)
+        # # Format > Strikethrough
+        # menuStrikethrough = QAction(QIcon.fromTheme("format-text-strikethrough"), "Strikethrough Text", menuBar)
+        # menuStrikethrough.setShortcut("Ctrl+D")
+        # menuStrikethrough.setStatusTip("Toggle Strikethrough for Selected Text")
+        # formatMenu.addAction(menuStrikethrough)
 
-        # Format > Separator
-        formatMenu.addSeparator()
+        # # Format > Separator
+        # formatMenu.addSeparator()
 
-        # Format > Clear
-        menuClear = QAction(QIcon.fromTheme("edit-clear"), "Clear Formatting", menuBar)
-        menuClear.setStatusTip("Clear Formatting for Selected Text")
-        formatMenu.addAction(menuClear)
+        # # Format > Clear
+        # menuClear = QAction(QIcon.fromTheme("edit-clear"), "Clear Formatting", menuBar)
+        # menuClear.setStatusTip("Clear Formatting for Selected Text")
+        # formatMenu.addAction(menuClear)
 
         ############################################################################################