From a1b5acd46a3f93f141d95f3a39c80306d1f9a9ec Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Sun, 23 Aug 2020 18:18:11 +0200
Subject: [PATCH] Fix type signature: models is passed because it's a method

---
 qt/aqt/gui_hooks.py      | 29 +++++++++--------------------
 qt/aqt/models.py         |  7 ++++---
 qt/tools/genhooks_gui.py |  7 +++++--
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/qt/aqt/gui_hooks.py b/qt/aqt/gui_hooks.py
index 0e1e82b4b..65b16e5f7 100644
--- a/qt/aqt/gui_hooks.py
+++ b/qt/aqt/gui_hooks.py
@@ -1874,35 +1874,26 @@ class _ModelsDidInitButtonsFilter:
 
     _hooks: List[
         Callable[
-            [
-                "List[Tuple[str, Callable[[aqt.models.Models], None]]]",
-                "aqt.models.Models",
-            ],
-            List[Tuple[str, Callable[[aqt.models.Models], None]]],
+            [List[Tuple[str, Callable[[], None]]], "aqt.models.Models"],
+            List[Tuple[str, Callable[[], None]]],
         ]
     ] = []
 
     def append(
         self,
         cb: Callable[
-            [
-                "List[Tuple[str, Callable[[aqt.models.Models], None]]]",
-                "aqt.models.Models",
-            ],
-            List[Tuple[str, Callable[[aqt.models.Models], None]]],
+            [List[Tuple[str, Callable[[], None]]], "aqt.models.Models"],
+            List[Tuple[str, Callable[[], None]]],
         ],
     ) -> None:
-        """(buttons: List[Tuple[str, Callable[[aqt.models.Models], None]]], models: aqt.models.Models)"""
+        """(buttons: List[Tuple[str, Callable[[], None]]], models: aqt.models.Models)"""
         self._hooks.append(cb)
 
     def remove(
         self,
         cb: Callable[
-            [
-                "List[Tuple[str, Callable[[aqt.models.Models], None]]]",
-                "aqt.models.Models",
-            ],
-            List[Tuple[str, Callable[[aqt.models.Models], None]]],
+            [List[Tuple[str, Callable[[], None]]], "aqt.models.Models"],
+            List[Tuple[str, Callable[[], None]]],
         ],
     ) -> None:
         if cb in self._hooks:
@@ -1912,10 +1903,8 @@ class _ModelsDidInitButtonsFilter:
         return len(self._hooks)
 
     def __call__(
-        self,
-        buttons: List[Tuple[str, Callable[[aqt.models.Models], None]]],
-        models: aqt.models.Models,
-    ) -> List[Tuple[str, Callable[[aqt.models.Models], None]]]:
+        self, buttons: List[Tuple[str, Callable[[], None]]], models: aqt.models.Models
+    ) -> List[Tuple[str, Callable[[], None]]]:
         for filter in self._hooks:
             try:
                 buttons = filter(buttons, models)
diff --git a/qt/aqt/models.py b/qt/aqt/models.py
index 6af0eefa1..a4a005ae0 100644
--- a/qt/aqt/models.py
+++ b/qt/aqt/models.py
@@ -54,15 +54,16 @@ class Models(QDialog):
             ("Add", self.onAdd),
             ("Rename", self.onRename),
             ("Delete", self.onDelete),
+            ("Options...", self.onAdvanced),
         ]
 
         if self.fromMain:
-            default_buttons.extend([
+            from_main_buttons = [
                 ("Fields...", self.onFields),
                 ("Cards...", self.onCards),
-            ])
+            ]
 
-        default_buttons.append(("Options...", self.onAdvanced))
+            default_buttons[-1:-1] = from_main_buttons
 
         for label, func in gui_hooks.models_did_init_buttons(default_buttons, self):
             button = box.addButton(_(label), QDialogButtonBox.ActionRole)
diff --git a/qt/tools/genhooks_gui.py b/qt/tools/genhooks_gui.py
index 9267ff92d..81b69a7e2 100644
--- a/qt/tools/genhooks_gui.py
+++ b/qt/tools/genhooks_gui.py
@@ -688,8 +688,11 @@ hooks = [
     Hook(name="models_advanced_will_show", args=["advanced: QDialog"],),
     Hook(
         name="models_did_init_buttons",
-        args=["buttons: List[Tuple[str, Callable[[aqt.models.Models], None]]]", "models: aqt.models.Models"],
-        return_type="List[Tuple[str, Callable[[aqt.models.Models], None]]]",
+        args=[
+            "buttons: List[Tuple[str, Callable[[], None]]]",
+            "models: aqt.models.Models",
+        ],
+        return_type="List[Tuple[str, Callable[[], None]]]",
         doc="""Allows adding buttons to the Model dialog""",
     ),
     # Stats