fix: resolve differences with main

tagstudio/src/qt/modals/build_tag.py

@@ -224,17 +224,6 @@ class BuildTagPanel(PanelWidget):
         self.cat_layout.addWidget(self.cat_checkbox)
         self.cat_layout.addWidget(self.cat_title)
 
-        # Keyboard Actions =====================================================
-        remove_selected_alias_action = QAction("remove selected alias", self)
-        remove_selected_alias_action.triggered.connect(self.remove_selected_alias)
-        remove_selected_alias_action.setShortcut(
-            QtCore.QKeyCombination(
-                QtCore.Qt.KeyboardModifier(QtCore.Qt.KeyboardModifier.ControlModifier),
-                QtCore.Qt.Key.Key_D,
-            )
-        )
-        self.addAction(remove_selected_alias_action)
-
         # Add Widgets to Layout ================================================
         self.root_layout.addWidget(self.name_widget)
         self.root_layout.addWidget(self.shorthand_widget)
@@ -301,12 +290,9 @@ class BuildTagPanel(PanelWidget):
         logger.info("add_alias_callback")
 
         id = self.new_item_id
-
         self.alias_ids.append(id)
         self.new_alias_names[id] = ""
-
         self.new_item_id -= 1
-
         self._set_aliases()
 
         row = self.aliases_table.rowCount() - 1
@@ -402,12 +388,12 @@ class BuildTagPanel(PanelWidget):
         self.name_field.setText(tag.name)
         self.shorthand_field.setText(tag.shorthand or "")
 
+        for alias_id in tag.alias_ids:
+            self.alias_ids.append(alias_id)
+        self._set_aliases()
+
         for subtag in tag.subtag_ids:
             self.subtag_ids.add(subtag)
-
-        for alias_id in tag.alias_ids:
-            self.alias_ids.add(alias_id)
-
         self.set_subtags()
 
         # select item in self.color_field where the userData value matched tag.color

tagstudio/src/qt/widgets/migration_modal.py

@@ -367,9 +367,7 @@ class JsonMigrationModal(QObject):
             if self.temp_path.exists():
                 logger.info('Temporary migration file "temp_path" already exists. Removing...')
                 self.temp_path.unlink()
-            self.sql_lib.open_sqlite_library(
-                self.json_lib.library_dir, is_new=True, add_default_data=False
-            )
+            self.sql_lib.open_sqlite_library(self.json_lib.library_dir, is_new=True)
             yield Translations.translate_formatted(
                 "json_migration.migrating_files_entries", entries=len(self.json_lib.entries)
             )

tagstudio/src/qt/widgets/preview/field_containers.py

@@ -28,11 +28,8 @@ from src.core.library.alchemy.fields import (
     TextField,
 )
 from src.core.library.alchemy.library import Library
-from src.qt.translations import Translations
-from src.core.library.alchemy.models import Entry
-from src.qt.helpers.qbutton_wrapper import QPushButtonWrapper
-from src.qt.modals.add_field import AddFieldModal
 from src.core.library.alchemy.models import Entry, Tag
+from src.qt.translations import Translations
 from src.qt.widgets.fields import FieldContainer
 from src.qt.widgets.panel import PanelModal
 from src.qt.widgets.tag_box import TagBoxWidget

tagstudio/src/qt/widgets/preview/file_attributes.py

@@ -23,7 +23,6 @@ from src.core.enums import Theme
 from src.core.library.alchemy.library import Library
 from src.core.media_types import MediaCategories
 from src.qt.helpers.file_opener import FileOpenerHelper, FileOpenerLabel
-from src.qt.translations import Translations
 
 if typing.TYPE_CHECKING:
     from src.qt.ts_qt import QtDriver
@@ -111,16 +110,16 @@ class FileAttributes(QWidget):
                 created = dt.fromtimestamp(filepath.stat().st_ctime)
             modified: dt = dt.fromtimestamp(filepath.stat().st_mtime)
             self.date_created_label.setText(
-                f"<b>Date Created:</b> {dt.strftime(created, "%a, %x, %X")}"
+                f"<b>Date Created:</b> {dt.strftime(created, "%a, %x, %X")}"  # TODO: Translate
             )
             self.date_modified_label.setText(
-                f"<b>Date Modified:</b> {dt.strftime(modified, "%a, %x, %X")}"
+                f"<b>Date Modified:</b> {dt.strftime(modified, "%a, %x, %X")}"  # TODO: Translate
             )
             self.date_created_label.setHidden(False)
             self.date_modified_label.setHidden(False)
         elif filepath:
-            self.date_created_label.setText("<b>Date Created:</b> <i>N/A</i>")
-            self.date_modified_label.setText("<b>Date Modified:</b> <i>N/A</i>")
+            self.date_created_label.setText("<b>Date Created:</b> <i>N/A</i>")  # TODO: Translate
+            self.date_modified_label.setText("<b>Date Modified:</b> <i>N/A</i>")  # TODO: Translate
             self.date_created_label.setHidden(False)
             self.date_modified_label.setHidden(False)
         else:
@@ -135,7 +134,7 @@ class FileAttributes(QWidget):
         if not filepath:
             self.layout().setSpacing(0)
             self.file_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
-            self.file_label.setText("<i>No Items Selected</i>")
+            self.file_label.setText("<i>No Items Selected</i>")  # TODO: Translate
             self.file_label.set_file_path("")
             self.file_label.setCursor(Qt.CursorShape.ArrowCursor)
             self.dimensions_label.setText("")
@@ -224,7 +223,7 @@ class FileAttributes(QWidget):
         """Format attributes for multiple selected items."""
         self.layout().setSpacing(0)
         self.file_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        self.file_label.setText(f"<b>{count}</b> Items Selected")
+        self.file_label.setText(f"<b>{count}</b> Items Selected")  # TODO: Translate
         self.file_label.setCursor(Qt.CursorShape.ArrowCursor)
         self.file_label.set_file_path("")
         self.dimensions_label.setText("")

tagstudio/src/qt/widgets/preview/preview_thumb.py

@@ -54,7 +54,8 @@ class PreviewThumb(QWidget):
         image_layout = QHBoxLayout(self)
         image_layout.setContentsMargins(0, 0, 0, 0)
 
-        self.open_file_action = QAction("Open file", self)
+        self.open_file_action = QAction(self)
+        Translations.translate_qobject(self.open_file_action, "file.open_file")
         self.open_explorer_action = QAction(PlatformStrings.open_file_str, self)
 
         self.preview_img = QPushButtonWrapper()

tagstudio/src/qt/widgets/preview/recent_libraries.py

@@ -9,7 +9,6 @@ from PySide6.QtWidgets import (
     QWidget,
 )
 from src.core.library.alchemy.library import Library
-from src.qt.translations import Translations
 
 if typing.TYPE_CHECKING:
     from src.qt.ts_qt import QtDriver

tagstudio/src/qt/widgets/preview_panel.py

@@ -22,11 +22,11 @@ from src.core.library.alchemy.models import Entry
 from src.core.palette import ColorType, UiColor, get_ui_color
 from src.qt.modals.add_field import AddFieldModal
 from src.qt.modals.tag_search import TagSearchPanel
+from src.qt.translations import Translations
 from src.qt.widgets.panel import PanelModal
 from src.qt.widgets.preview.field_containers import FieldContainers
 from src.qt.widgets.preview.file_attributes import FileAttributes
 from src.qt.widgets.preview.preview_thumb import PreviewThumb
-from src.qt.translations import Translations
 
 if typing.TYPE_CHECKING:
     from src.qt.ts_qt import QtDriver
@@ -75,7 +75,10 @@ class PreviewPanel(QWidget):
         self.fields = FieldContainers(library, driver)
 
         tag_search_panel = TagSearchPanel(self.driver.lib)
-        self.add_tag_modal = PanelModal(tag_search_panel, "Add Tags", "Add Tags")
+        self.add_tag_modal = PanelModal(
+            tag_search_panel, Translations.translate_formatted("tag.add.plural")
+        )
+        Translations.translate_with_setter(self.add_tag_modal.setWindowTitle, "tag.add.plural")
 
         self.add_field_modal = AddFieldModal(self.lib)
 
@@ -103,14 +106,14 @@ class PreviewPanel(QWidget):
         self.add_tag_button.setCursor(Qt.CursorShape.PointingHandCursor)
         self.add_tag_button.setMinimumHeight(28)
         self.add_tag_button.setStyleSheet(PreviewPanel.button_style)
-        self.add_tag_button.setText("Add Tag")
+        self.add_tag_button.setText("Add Tag")  # TODO: Translate
 
         self.add_field_button = QPushButton()
         self.add_field_button.setEnabled(False)
         self.add_field_button.setCursor(Qt.CursorShape.PointingHandCursor)
         self.add_field_button.setMinimumHeight(28)
         self.add_field_button.setStyleSheet(PreviewPanel.button_style)
-        self.add_field_button.setText("Add Field")
+        self.add_field_button.setText("Add Field")  # TODO: Translate
 
         add_buttons_layout.addWidget(self.add_tag_button)
         add_buttons_layout.addWidget(self.add_field_button)