From 248373ef304cc2b063ea652d516664dda1e47e61 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Fri, 30 Apr 2021 17:30:48 +1000
Subject: [PATCH] undoing of notetype templates

---
 qt/aqt/browser/browser.py |  6 ------
 qt/aqt/clayout.py         | 21 +++++++--------------
 qt/aqt/fields.py          |  2 +-
 qt/tools/genhooks_gui.py  |  2 +-
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/qt/aqt/browser/browser.py b/qt/aqt/browser/browser.py
index 85bea2883..d5fa1436d 100644
--- a/qt/aqt/browser/browser.py
+++ b/qt/aqt/browser/browser.py
@@ -839,8 +839,6 @@ where id in %s"""
 
     def setupHooks(self) -> None:
         gui_hooks.undo_state_did_change.append(self.onUndoState)
-        # fixme: remove this once all items are using `operation_did_execute`
-        gui_hooks.sidebar_should_refresh_notetypes.append(self.on_item_added)
         gui_hooks.backend_will_block.append(self.table.on_backend_will_block)
         gui_hooks.backend_did_block.append(self.table.on_backend_did_block)
         gui_hooks.operation_did_execute.append(self.on_operation_did_execute)
@@ -848,15 +846,11 @@ where id in %s"""
 
     def teardownHooks(self) -> None:
         gui_hooks.undo_state_did_change.remove(self.onUndoState)
-        gui_hooks.sidebar_should_refresh_notetypes.remove(self.on_item_added)
         gui_hooks.backend_will_block.remove(self.table.on_backend_will_block)
         gui_hooks.backend_did_block.remove(self.table.on_backend_will_block)
         gui_hooks.operation_did_execute.remove(self.on_operation_did_execute)
         gui_hooks.focus_did_change.remove(self.on_focus_change)
 
-    def on_item_added(self, item: Any = None) -> None:
-        self.sidebar.refresh()
-
     # Undo
     ######################################################################
 
diff --git a/qt/aqt/clayout.py b/qt/aqt/clayout.py
index bf0d4718c..b3a7cc47f 100644
--- a/qt/aqt/clayout.py
+++ b/qt/aqt/clayout.py
@@ -6,12 +6,13 @@ from concurrent.futures import Future
 from typing import Any, Dict, List, Match, Optional
 
 import aqt
+from anki.collection import OpChanges
 from anki.consts import *
-from anki.errors import TemplateError
 from anki.lang import without_unicode_isolation
 from anki.notes import Note
 from aqt import AnkiQt, gui_hooks
 from aqt.forms.browserdisp import Ui_Dialog
+from aqt.operations.notetype import update_notetype_legacy
 from aqt.qt import *
 from aqt.schema_change_tracker import ChangeTracker
 from aqt.sound import av_player, play_clicked_audio
@@ -29,7 +30,6 @@ from aqt.utils import (
     saveSplitter,
     shortcut,
     showInfo,
-    showWarning,
     tooltip,
     tr,
 )
@@ -784,22 +784,15 @@ class CardLayout(QDialog):
     ######################################################################
 
     def accept(self) -> None:
-        def save() -> None:
-            self.mm.save(self.model)
-
-        def on_done(fut: Future) -> None:
-            try:
-                fut.result()
-            except TemplateError as e:
-                showWarning(str(e))
-                return
-            self.mw.reset()
+        def on_done(changes: OpChanges) -> None:
             tooltip(tr.card_templates_changes_saved(), parent=self.parentWidget())
             self.cleanup()
             gui_hooks.sidebar_should_refresh_notetypes()
-            return QDialog.accept(self)
+            QDialog.accept(self)
 
-        self.mw.taskman.with_progress(save, on_done)
+        update_notetype_legacy(parent=self.mw, notetype=self.model).success(
+            on_done
+        ).run_in_background()
 
     def reject(self) -> None:
         if self.change_tracker.changed():
diff --git a/qt/aqt/fields.py b/qt/aqt/fields.py
index 5f50b3ff7..c88360b6c 100644
--- a/qt/aqt/fields.py
+++ b/qt/aqt/fields.py
@@ -234,7 +234,7 @@ class FieldDialog(QDialog):
         self.saveField()
 
         def on_done(changes: OpChanges) -> None:
-            tooltip("Changes saved.", parent=self.mw)
+            tooltip(tr.card_templates_changes_saved(), parent=self.parentWidget())
             QDialog.accept(self)
 
         update_notetype_legacy(parent=self.mw, notetype=self.model).success(
diff --git a/qt/tools/genhooks_gui.py b/qt/tools/genhooks_gui.py
index 0a480c74b..8d194dbce 100644
--- a/qt/tools/genhooks_gui.py
+++ b/qt/tools/genhooks_gui.py
@@ -916,7 +916,7 @@ gui_hooks.webview_did_inject_style_into_page.append(mytest)
         legacy_no_args=True,
     ),
     Hook(name="sidebar_should_refresh_decks", doc="Legacy, do not use."),
-    Hook(name="sidebar_should_refresh_notetypes"),
+    Hook(name="sidebar_should_refresh_notetypes", doc="Legacy, do not use."),
     Hook(
         name="deck_browser_will_show_options_menu",
         args=["menu: QMenu", "deck_id: int"],