From 30d1d57c78a2b949e09da9a0c28fac487e9a01b5 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Sun, 4 Oct 2020 22:41:18 +0200
Subject: [PATCH 1/5] Rewrite so all editor toolbar buttons use _addButton

---
 qt/aqt/editor.py | 103 ++++++++++++++++++++++++-----------------------
 1 file changed, 52 insertions(+), 51 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index ec7fe117a..8e27fe45f 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -118,6 +118,25 @@ class Editor:
         self.web.set_bridge_command(self.onBridgeCmd, self)
         self.outerLayout.addWidget(self.web, 1)
 
+        lefttopbtns: List[str] = [
+            self._addButton(
+                None,
+                "fields",
+                _("Customize Fields"),
+                _("Fields") + "...",
+                class_="",
+                disables=False,
+            ),
+            self._addButton(
+                None,
+                "cards",
+                _("Customize Card Templates (Ctrl+L)"),
+                _("Cards") + "...",
+                class_="",
+                disables=False,
+            ),
+        ]
+
         righttopbtns: List[str] = [
             self._addButton("text_bold", "bold", _("Bold text (Ctrl+B)"), id="bold"),
             self._addButton(
@@ -131,68 +150,47 @@ class Editor:
             ),
             self._addButton("text_sub", "sub", _("Subscript (Ctrl+=)"), id="subscript"),
             self._addButton("text_clear", "clear", _("Remove formatting (Ctrl+R)")),
+            self._addButton(
+                None,
+                "colour",
+                _("Set foreground colour (F7)"),
+                """
+<div id="forecolor"
+     style="display: inline-block; background: #000; border-radius: 5px;"
+     class="topbut"
+>""",
+            ),
+            self._addButton(
+                None,
+                "changeCol",
+                _("Change colour (F8)"),
+                """
+<div style="display: inline-block; border-radius: 5px;"
+     class="topbut rainbow"
+>""",
+            ),
+            self._addButton("text_cloze", "cloze", _("Cloze deletion (Ctrl+Shift+C)")),
+            self._addButton(
+                "paperclip", "attach", _("Attach pictures/audio/video (F3)")
+            ),
+            self._addButton("media-record", "record", _("Record audio (F5)")),
+            self._addButton("more", "more"),
         ]
-        # The color selection buttons do not use an icon so the HTML must be specified manually
-        tip = _("Set foreground colour (F7)")
-        righttopbtns.append(
-            """ <button tabindex=-1
-                        class=linkb
-                        title="{}"
-                        type="button"
-                        onclick="pycmd('colour'); return false;"
-                >
-                    <div id=forecolor
-                         style="display:inline-block; background: #000;border-radius: 5px;"
-                         class=topbut
-                    >
-                    </div>
-                </button>""".format(
-                tip
-            )
-        )
-        tip = _("Change colour (F8)")
-        righttopbtns.extend(
-            [
-                """<button tabindex=-1
-                        class=linkb
-                        title="{}"
-                        type="button"
-                        onclick="pycmd('changeCol');return false;"
-                >
-                    <div style="display:inline-block; border-radius: 5px;"
-                         class="topbut rainbow"
-                    >
-                    </div>
-                </button>""".format(
-                    tip
-                ),
-                self._addButton(
-                    "text_cloze", "cloze", _("Cloze deletion (Ctrl+Shift+C)")
-                ),
-                self._addButton(
-                    "paperclip", "attach", _("Attach pictures/audio/video (F3)")
-                ),
-                self._addButton("media-record", "record", _("Record audio (F5)")),
-                self._addButton("more", "more"),
-            ]
-        )
+
         gui_hooks.editor_did_init_buttons(righttopbtns, self)
         # legacy filter
         righttopbtns = runFilter("setupEditorButtons", righttopbtns, self)
+
         topbuts = """
             <div id="topbutsleft" style="float:left;">
-                <button title='%(fldsTitle)s' onclick="pycmd('fields')">%(flds)s...</button>
-                <button title='%(cardsTitle)s' onclick="pycmd('cards')">%(cards)s...</button>
+                %(leftbts)s
             </div>
             <div id="topbutsright" style="float:right;">
                 %(rightbts)s
             </div>
         """ % dict(
-            flds=_("Fields"),
-            cards=_("Cards"),
+            leftbts="".join(lefttopbtns),
             rightbts="".join(righttopbtns),
-            fldsTitle=_("Customize Fields"),
-            cardsTitle=shortcut(_("Customize Card Templates (Ctrl+L)")),
         )
         bgcol = self.mw.app.palette().window().color().name()  # type: ignore
         # then load page
@@ -227,6 +225,7 @@ class Editor:
         toggleable: bool = False,
         keys: str = None,
         disables: bool = True,
+        class_: str = "linkb",
     ):
         """Assign func to bridge cmd, register shortcut, return button"""
         if func:
@@ -245,6 +244,7 @@ class Editor:
             id=id,
             toggleable=toggleable,
             disables=disables,
+            class_=class_,
         )
         return btn
 
@@ -257,6 +257,7 @@ class Editor:
         id: Optional[str] = None,
         toggleable: bool = False,
         disables: bool = True,
+        class_: str = "linkb",
     ) -> str:
         if icon:
             if icon.startswith("qrc:/"):
@@ -281,7 +282,7 @@ class Editor:
         else:
             toggleScript = ""
         tip = shortcut(tip)
-        theclass = "linkb"
+        theclass = class_
         if not disables:
             theclass += " perm"
         return """ <button tabindex=-1

From bf29fb8e8348e33cca7858b434659be8dfc63587 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Sun, 4 Oct 2020 22:42:28 +0200
Subject: [PATCH 2/5] Make icon Optional explicitly in function signature

---
 qt/aqt/editor.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 8e27fe45f..268240326 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -216,7 +216,7 @@ class Editor:
 
     def addButton(
         self,
-        icon: str,
+        icon: Optional[str],
         cmd: str,
         func: Callable[["Editor"], None],
         tip: str = "",
@@ -250,7 +250,7 @@ class Editor:
 
     def _addButton(
         self,
-        icon: str,
+        icon: Optional[str],
         cmd: str,
         tip: str = "",
         label: str = "",

From 4c255b02893659f490f4ee4229ad629591f92345 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Sun, 4 Oct 2020 22:50:02 +0200
Subject: [PATCH 3/5] Add editor_did_init_left_buttons gui_hook

---
 qt/aqt/editor.py         |  2 ++
 qt/aqt/gui_hooks.py      | 27 +++++++++++++++++++++++++++
 qt/tools/genhooks_gui.py |  4 ++++
 3 files changed, 33 insertions(+)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 268240326..2ed6f84d1 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -137,6 +137,8 @@ class Editor:
             ),
         ]
 
+        gui_hooks.editor_did_init_left_buttons(lefttopbtns, self)
+
         righttopbtns: List[str] = [
             self._addButton("text_bold", "bold", _("Bold text (Ctrl+B)"), id="bold"),
             self._addButton(
diff --git a/qt/aqt/gui_hooks.py b/qt/aqt/gui_hooks.py
index 265f3de98..a06c737f8 100644
--- a/qt/aqt/gui_hooks.py
+++ b/qt/aqt/gui_hooks.py
@@ -1401,6 +1401,33 @@ class _EditorDidInitButtonsHook:
 editor_did_init_buttons = _EditorDidInitButtonsHook()
 
 
+class _EditorDidInitLeftButtonsHook:
+    _hooks: List[Callable[[List[str], "aqt.editor.Editor"], None]] = []
+
+    def append(self, cb: Callable[[List[str], "aqt.editor.Editor"], None]) -> None:
+        """(buttons: List[str], editor: aqt.editor.Editor)"""
+        self._hooks.append(cb)
+
+    def remove(self, cb: Callable[[List[str], "aqt.editor.Editor"], None]) -> None:
+        if cb in self._hooks:
+            self._hooks.remove(cb)
+
+    def count(self) -> int:
+        return len(self._hooks)
+
+    def __call__(self, buttons: List[str], editor: aqt.editor.Editor) -> None:
+        for hook in self._hooks:
+            try:
+                hook(buttons, editor)
+            except:
+                # if the hook fails, remove it
+                self._hooks.remove(hook)
+                raise
+
+
+editor_did_init_left_buttons = _EditorDidInitLeftButtonsHook()
+
+
 class _EditorDidInitShortcutsHook:
     _hooks: List[Callable[[List[Tuple], "aqt.editor.Editor"], None]] = []
 
diff --git a/qt/tools/genhooks_gui.py b/qt/tools/genhooks_gui.py
index 41eb9382c..ebcf3155c 100644
--- a/qt/tools/genhooks_gui.py
+++ b/qt/tools/genhooks_gui.py
@@ -606,6 +606,10 @@ gui_hooks.webview_did_inject_style_into_page.append(mytest)
     ),
     # Editing
     ###################
+    Hook(
+        name="editor_did_init_left_buttons",
+        args=["buttons: List[str]", "editor: aqt.editor.Editor"],
+    ),
     Hook(
         name="editor_did_init_buttons",
         args=["buttons: List[str]", "editor: aqt.editor.Editor"],

From e8c80174eb48a5412bde90c35a497e74fa74f5f1 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Sun, 4 Oct 2020 22:51:34 +0200
Subject: [PATCH 4/5] Refactor out theclass assignment

---
 qt/aqt/editor.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 2ed6f84d1..e315c5fd3 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -284,12 +284,11 @@ class Editor:
         else:
             toggleScript = ""
         tip = shortcut(tip)
-        theclass = class_
         if not disables:
-            theclass += " perm"
+            class_ += " perm"
         return """ <button tabindex=-1
                         {id}
-                        class="{theclass}"
+                        class="{class_}"
                         type="button"
                         title="{tip}"
                         onclick="pycmd('{cmd}');{togglesc}return false;"
@@ -303,7 +302,7 @@ class Editor:
             labelelm=labelelm,
             id=idstr,
             togglesc=toggleScript,
-            theclass=theclass,
+            class_=class_,
         )
 
     def setupShortcuts(self) -> None:

From e9ca17b1b3a032be704b2df0db1a66c014e345ac Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Sun, 4 Oct 2020 23:03:37 +0200
Subject: [PATCH 5/5] Turn _class into rightside boolean flag

---
 qt/aqt/editor.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index e315c5fd3..3ae5ef093 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -124,16 +124,16 @@ class Editor:
                 "fields",
                 _("Customize Fields"),
                 _("Fields") + "...",
-                class_="",
                 disables=False,
+                rightside=False,
             ),
             self._addButton(
                 None,
                 "cards",
                 _("Customize Card Templates (Ctrl+L)"),
                 _("Cards") + "...",
-                class_="",
                 disables=False,
+                rightside=False,
             ),
         ]
 
@@ -227,7 +227,7 @@ class Editor:
         toggleable: bool = False,
         keys: str = None,
         disables: bool = True,
-        class_: str = "linkb",
+        rightside: bool = True,
     ):
         """Assign func to bridge cmd, register shortcut, return button"""
         if func:
@@ -246,7 +246,7 @@ class Editor:
             id=id,
             toggleable=toggleable,
             disables=disables,
-            class_=class_,
+            rightside=rightside,
         )
         return btn
 
@@ -259,7 +259,7 @@ class Editor:
         id: Optional[str] = None,
         toggleable: bool = False,
         disables: bool = True,
-        class_: str = "linkb",
+        rightside: bool = True,
     ) -> str:
         if icon:
             if icon.startswith("qrc:/"):
@@ -284,6 +284,10 @@ class Editor:
         else:
             toggleScript = ""
         tip = shortcut(tip)
+        if rightside:
+            class_ = "linkb"
+        else:
+            class_ = ""
         if not disables:
             class_ += " perm"
         return """ <button tabindex=-1