Use default flag name when flag is renamed to empty string (ankitects#3826)

mumtazrifai · web-flow · commit e373b0ed9ba4 · 2025-02-21T16:38:04.000+07:00
* Add function to restore the default name of a flag * Call function to restore default flag name if flag renamed to empty string * Update _load_flags to use the default_flag_names dict * Add name to contributors file * Add trailing comma to pass tests * Update to follow python style guide * Update about.py * Revert "Update _load_flags to use the default_flag_names dict" This reverts commit caa8fea. * Use require_refresh() instead of storing default flag names
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -213,6 +213,7 @@ wackbyte <wackbyte@protonmail.com>
 GithubAnon0000 <GithubAnon0000@users.noreply.github.com>
 Mike Hardy <github@mikehardy.net>
 Danika_Dakika <https://github.com/Danika-Dakika>
+Mumtaz Hajjo Alrifai <mumtazrifai@protonmail.com>
 
 ********************
 
diff --git a/qt/aqt/about.py b/qt/aqt/about.py
@@ -214,6 +214,7 @@ def on_dialog_destroyed() -> None:
             "Gregory Abrasaldo",
             "Danika_Dakika",
             "Marcelo Vasconcelos",
+            "Mumtaz Hajjo Alrifai",
         )
     )
 
diff --git a/qt/aqt/browser/sidebar/tree.py b/qt/aqt/browser/sidebar/tree.py
@@ -453,7 +453,9 @@ def _on_search(self, index: QModelIndex) -> None:
 
     def _on_rename(self, item: SidebarItem, text: str) -> bool:
         new_name = text.replace('"', "")
-        if new_name and new_name != item.name:
+        if not new_name and item.item_type == SidebarItemType.FLAG:
+            self.restore_default_flag_name(item)
+        elif new_name and new_name != item.name:
             if item.item_type == SidebarItemType.DECK:
                 self.rename_deck(item, new_name)
             elif item.item_type == SidebarItemType.SAVED_SEARCH:
@@ -1089,6 +1091,10 @@ def rename_flag(self, item: SidebarItem, new_name: str) -> None:
         item.name = new_name
         self.mw.flags.rename_flag(item.id, new_name)
 
+    def restore_default_flag_name(self, item: SidebarItem) -> None:
+        self.mw.flags.restore_default_flag_name(item.id)
+        item.name = self.mw.flags.get_flag(item.id).label
+
     # Decks
     ###########################
 
diff --git a/qt/aqt/flags.py b/qt/aqt/flags.py
@@ -55,6 +55,15 @@ def rename_flag(self, flag_index: int, new_name: str) -> None:
         self.mw.col.set_config("flagLabels", labels)
         gui_hooks.flag_label_did_change()
 
+    def restore_default_flag_name(self, flag_index: int) -> None:
+        labels = self.mw.col.get_config("flagLabels", {})
+        if str(flag_index) not in labels:
+            return
+        del labels[str(flag_index)]
+        self.mw.col.set_config("flagLabels", labels)
+        self.require_refresh()
+        gui_hooks.flag_label_did_change()
+
     def require_refresh(self) -> None:
         "Discard cached labels."
         self._flags = []

-Original file line number
+Diff line change
 GithubAnon0000 <[email protected]>
 Mike Hardy <[email protected]>
 Danika_Dakika <https://github.com/Danika-Dakika>
 +Mumtaz Hajjo Alrifai <[email protected]>
 ********************
Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,7 @@ def on_dialog_destroyed() -> None:`
`214`	`214`	`"Gregory Abrasaldo",`
`215`	`215`	`"Danika_Dakika",`
`216`	`216`	`"Marcelo Vasconcelos",`
	`217`	`+ "Mumtaz Hajjo Alrifai",`
`217`	`218`	`)`
`218`	`219`	`)`
`219`	`220`