fix(ui): use consistent/correct button roles

Author: CyanVoxel

src/tagstudio/qt/controllers/field_template_search_panel.py

@@ -89,11 +89,18 @@ def _on_item_remove(self, item: BaseFieldTemplate) -> None:
             return
 
         message_box = QMessageBox(
-            QMessageBox.Icon.Question,
+            QMessageBox.Icon.Warning,
             Translations["field_template.delete"],
             Translations.format("field_template.confirm_delete", field_template_name=item.name),
             QMessageBox.StandardButton.Ok | QMessageBox.StandardButton.Cancel,
         )
+        unwrap(message_box.button(QMessageBox.StandardButton.Ok)).setText(
+            Translations["generic.delete_alt"]
+        )
+        unwrap(message_box.button(QMessageBox.StandardButton.Cancel)).setText(
+            Translations["generic.cancel_alt"]
+        )
+        message_box.setDefaultButton(QMessageBox.StandardButton.Cancel)
 
         result = message_box.exec()
 

src/tagstudio/qt/controllers/tag_search_panel.py

@@ -99,6 +99,7 @@ def _on_item_remove(self, item: Tag) -> None:
         unwrap(message_box.button(QMessageBox.StandardButton.Cancel)).setText(
             Translations["generic.cancel_alt"]
         )
+        message_box.setDefaultButton(QMessageBox.StandardButton.Cancel)
 
         result = message_box.exec()
 

src/tagstudio/qt/controllers/tiles/color_data.py

@@ -126,13 +126,13 @@ def delete_color(self, color_group: TagColorGroup):
         cancel_button = message_box.addButton(
             Translations["generic.cancel_alt"], QMessageBox.ButtonRole.RejectRole
         )
-        message_box.addButton(
-            Translations["generic.delete_alt"], QMessageBox.ButtonRole.DestructiveRole
+        delete_button = message_box.addButton(
+            Translations["generic.delete_alt"], QMessageBox.ButtonRole.AcceptRole
         )
         message_box.setEscapeButton(cancel_button)
-        result = message_box.exec_()
-        logger.info(QMessageBox.ButtonRole.DestructiveRole.value)
-        if result != QMessageBox.ButtonRole.ActionRole.value:
+        message_box.setDefaultButton(cancel_button)
+        message_box.exec()
+        if message_box.clickedButton() != delete_button:
             return
 
         logger.info("[ColorData] Removing color", color=color_group)

src/tagstudio/qt/controllers/tiles/tile_list.py

@@ -418,19 +418,20 @@ def update_datetime_field(self, field: DatetimeField, name: str, value: str) ->
         self.lib.update_datetime_field(entry_ids, field, name, dt.fromisoformat(value))
 
     def remove_message_box(self, prompt: str, callback: Callable[..., None]) -> None:
-        remove_mb = QMessageBox()
-        remove_mb.setText(prompt)
-        remove_mb.setWindowTitle(Translations["field.remove"])
-        remove_mb.setIcon(QMessageBox.Icon.Warning)
-        cancel_button = remove_mb.addButton(
+        message_box = QMessageBox()
+        message_box.setText(prompt)
+        message_box.setWindowTitle(Translations["field.remove"])
+        message_box.setIcon(QMessageBox.Icon.Warning)
+        cancel_button = message_box.addButton(
             Translations["generic.cancel_alt"], QMessageBox.ButtonRole.RejectRole
         )
-        remove_mb.addButton(
-            Translations["generic.remove_alt"], QMessageBox.ButtonRole.DestructiveRole
+        remove_button = message_box.addButton(
+            Translations["generic.remove_alt"], QMessageBox.ButtonRole.AcceptRole
         )
-        remove_mb.setEscapeButton(cancel_button)
-        result = remove_mb.exec_()
-        if result == QMessageBox.ButtonRole.ActionRole.value:
+        message_box.setEscapeButton(cancel_button)
+        message_box.setDefaultButton(cancel_button)
+        message_box.exec()
+        if message_box.clickedButton() == remove_button:
             callback()
 
     @property

src/tagstudio/qt/controllers/update_available_message_box.py

@@ -54,6 +54,7 @@ def __init__(self):
             partial(QDesktopServices.openUrl, GITHUB_RELEASE_URL)
         )
         self.button(QMessageBox.StandardButton.Ignore).setText(Translations["generic.dont_remind"])
+        self.button(QMessageBox.StandardButton.Close).setText(Translations["generic.close"])
 
         red = get_ui_color(ColorType.PRIMARY, UiColor.RED)
         green = get_ui_color(ColorType.PRIMARY, UiColor.GREEN)

src/tagstudio/qt/mixed/drop_import_modal.py

@@ -63,6 +63,10 @@ def __init__(self, driver: QtDriver):
         self.button_layout.setContentsMargins(6, 6, 6, 6)
         self.button_layout.addStretch(1)
 
+        self.cancel_button = QPushButton(Translations["generic.cancel_alt"])
+        self.cancel_button.clicked.connect(lambda: self.begin_transfer(DuplicateChoice.CANCEL))
+        self.button_layout.addWidget(self.cancel_button)
+
         self.skip_button = QPushButton(Translations["generic.skip_alt"])
         self.skip_button.setDefault(True)
         self.skip_button.clicked.connect(lambda: self.begin_transfer(DuplicateChoice.SKIP))
@@ -78,10 +82,6 @@ def __init__(self, driver: QtDriver):
         self.rename_button.clicked.connect(lambda: self.begin_transfer(DuplicateChoice.RENAME))
         self.button_layout.addWidget(self.rename_button)
 
-        self.cancel_button = QPushButton(Translations["generic.cancel_alt"])
-        self.cancel_button.clicked.connect(lambda: self.begin_transfer(DuplicateChoice.CANCEL))
-        self.button_layout.addWidget(self.cancel_button)
-
         # Layout =====================
         self.root_layout.addWidget(self.desc_widget)
         self.root_layout.addWidget(self.list_view)

src/tagstudio/qt/mixed/migration_modal.py

@@ -462,6 +462,7 @@ def update_sql_value_ui(self, show_msg_box: bool = True):
                 Translations["json_migration.discrepancies_found.description"],
             )
             msg_box.setDetailedText("\n".join(self.discrepancies))
+            msg_box.addButton(Translations["generic.close"], QMessageBox.ButtonRole.AcceptRole)
             msg_box.exec()
 
     def finish_migration(self):

src/tagstudio/qt/mixed/tag_color_manager.py

@@ -200,12 +200,13 @@ def delete_namespace_dialog(self, prompt: str, callback: Callable[..., Any]) ->
         cancel_button = message_box.addButton(
             Translations["generic.cancel_alt"], QMessageBox.ButtonRole.RejectRole
         )
-        message_box.addButton(
-            Translations["generic.delete_alt"], QMessageBox.ButtonRole.DestructiveRole
+        delete_button = message_box.addButton(
+            Translations["generic.delete_alt"], QMessageBox.ButtonRole.AcceptRole
         )
         message_box.setEscapeButton(cancel_button)
-        result = message_box.exec_()
-        if result != QMessageBox.ButtonRole.ActionRole.value:
+        message_box.setDefaultButton(cancel_button)
+        message_box.exec()
+        if message_box.clickedButton() != delete_button:
             return
         callback()
 

src/tagstudio/qt/qt_driver.py

@@ -979,25 +979,19 @@ def delete_files_callback(self, origin_path: str | Path, origin_id: int | None =
                 filepath: Path = entry.path
                 pending.append((item, filepath))
 
-        if pending:
-            return_code = self.delete_file_confirmation(len(pending), pending[0][1])
-            # If there was a confirmation and not a cancellation
-            if (
-                return_code == QMessageBox.ButtonRole.DestructiveRole.value
-                and return_code != QMessageBox.ButtonRole.ActionRole.value
-            ):
-                for e_id, f in pending:
-                    if (origin_path == f) or (not origin_path):
-                        self.main_window.inspector.stop_media_playback()
-
-                    if e_id is not None:
-                        self.lib.remove_entries([e_id])
-                    delete_file(library_dir / f)
-
-                self.clear_select_action_callback()
-                self.update_browsing_state()
-
-    def delete_file_confirmation(self, count: int, filename: Path | None = None) -> int:
+        if pending and self.delete_file_confirmation(len(pending), pending[0][1]):
+            for e_id, f in pending:
+                if (origin_path == f) or (not origin_path):
+                    self.main_window.inspector.stop_media_playback()
+
+                if e_id is not None:
+                    self.lib.remove_entries([e_id])
+                delete_file(library_dir / f)
+
+            self.clear_select_action_callback()
+            self.update_browsing_state()
+
+    def delete_file_confirmation(self, count: int, filename: Path | None = None) -> bool:
         """A confirmation dialogue box for deleting files.
 
         Args:
@@ -1048,13 +1042,23 @@ def delete_file_confirmation(self, count: int, filename: Path | None = None) ->
                 f"{perm_warning}<br>"
             )
 
-        yes_button: QPushButton = msg.addButton(
-            Translations["generic.yes"], QMessageBox.ButtonRole.YesRole
+        move_key = (
+            "menu.delete_selected_files_singular"
+            if count <= 1
+            else "menu.delete_selected_files_plural"
+        )
+        cancel_button = msg.addButton(
+            Translations["generic.cancel_alt"], QMessageBox.ButtonRole.RejectRole
+        )
+        move_button: QPushButton = msg.addButton(
+            Translations.format(move_key, trash_term=trash_term()),
+            QMessageBox.ButtonRole.AcceptRole,
         )
-        msg.addButton(Translations["generic.no"], QMessageBox.ButtonRole.NoRole)
-        msg.setDefaultButton(yes_button)
+        msg.setEscapeButton(cancel_button)
+        msg.setDefaultButton(cancel_button)
 
-        return msg.exec()
+        msg.exec()
+        return msg.clickedButton() == move_button
 
     def _run_sync_step(
         self,

src/tagstudio/resources/translations/en.json

@@ -70,10 +70,10 @@
     "entries.tags": "Tags",
     "entries.unlinked.description": "Unlinked entries are file entries that can no longer find their original file on disk. Most entries are automatically relinked during a library sync, however some cases require manual review.",
     "entries.unlinked.description.ambiguous": "For unlinked entries that have ambiguous matches to multiple files in your library, you may manually choose how they get relinked.",
-    "entries.unlinked.description.deleted": "When you delete files outside of TagStudio, their associated entries become unlinked. You may manually delete any unlinked entries at your own discretion.",
+    "entries.unlinked.description.deleted": "When you delete files outside of TagStudio, their associated entries become unlinked. You may manually remove any unlinked entries at your own discretion.",
     "entries.unlinked.relink.manual": "&Manual Relink",
-    "entries.unlinked.remove": "Delete Unlinked Entries",
-    "entries.unlinked.remove_alt": "&Delete Unlinked Entries",
+    "entries.unlinked.remove": "Remove Unlinked Entries",
+    "entries.unlinked.remove_alt": "Remo&ve Unlinked Entries",
     "entries.unlinked.review": "Manual &Review",
     "entries.unlinked.title": "Fix Unlinked Entries",
     "entries.unlinked.unlinked_count": "Unlinked Entries: {count}",
@@ -106,7 +106,7 @@
     "file.date_modified": "Date Modified",
     "file.dimensions": "Dimensions",
     "file.duplicates.description": "TagStudio supports importing DupeGuru results to manage duplicate files.",
-    "file.duplicates.dupeguru.advice": "After mirroring, you're free to use DupeGuru to delete the unwanted files. Afterwards, use TagStudio's \"Fix Unlinked Entries\" feature in the Tools menu in order to delete the unlinked Entries.",
+    "file.duplicates.dupeguru.advice": "After mirroring, you're free to use DupeGuru to delete the unwanted files. Afterwards, use TagStudio's \"Fix Unlinked Entries\" feature in the Tools menu in order to remove the unlinked Entries.",
     "file.duplicates.dupeguru.file_extension": "DupeGuru Files (*.dupeguru)",
     "file.duplicates.dupeguru.load_file": "&Load DupeGuru File",
     "file.duplicates.dupeguru.no_file": "No DupeGuru File Selected",