[GUI] fix circular import due to setting -> execution dependency; cleanup mainWindowHandle

Author: Shengjie Xu

src/preppipe_gui_pyside6/execution.py

@@ -8,7 +8,7 @@
 import time
 from PySide6.QtCore import *
 from preppipe.language import *
-from .toolwidgets.setting import SettingWidget
+from .settingsdict import *
 
 @dataclasses.dataclass
 class SpecifiedOutputInfo:
@@ -49,7 +49,7 @@ def add_output_unspecified(self, field_name : Translatable | str, default_name:
 
   @staticmethod
   def init_common():
-    lang = SettingWidget.get_current_language()
+    lang = SettingsDict.get_current_language()
     return ExecutionInfo(envs={
       'PREPPIPE_LANGUAGE': lang,
     })

src/preppipe_gui_pyside6/navigatorwidget.py

@@ -131,13 +131,9 @@ def parent(self, index: QModelIndex) -> QModelIndex:
 class NavigatorWidget(QWidget, ToolWidgetInterface):
   ui : Ui_NavigatorWidget
   model : ToolModel
-  mainWindowHandle : MainWindowInterface
 
   def __init__(self, parent : QWidget):
     super(NavigatorWidget, self).__init__(parent)
-    if not isinstance(parent, MainWindowInterface):
-      raise ValueError("Parent must be an instance of MainWindowInterface.")
-    self.mainWindowHandle = parent
     self.ui = Ui_NavigatorWidget()
     self.ui.setupUi(self)
     ToolNode.build_tree()
@@ -153,7 +149,7 @@ def on_treeView_clicked(self, index: QModelIndex):
     info = index.internalPointer().info
     if info is None:
       return
-    self.mainWindowHandle.requestOpen(info)
+    MainWindowInterface.getHandle(self).requestOpen(info)
 
   _tr_toolname_navigator = TR_gui_mainwindow.tr("toolname_navigator",
     en="Navigator",

src/preppipe_gui_pyside6/settingsdict.py

@@ -8,6 +8,7 @@
 import threading
 import collections
 import collections.abc
+from preppipe.language import *
 
 def get_executable_base_dir() -> str:
   if getattr(sys, 'frozen', False):
@@ -22,9 +23,11 @@ class SettingsDict(collections.abc.MutableMapping):
   shelf : shelve.Shelf
 
   @staticmethod
-  def instance():
+  def instance() -> 'SettingsDict':
     if SettingsDict._settings_instance is None:
       SettingsDict._settings_instance = SettingsDict(os.path.join(SettingsDict._executable_base_dir, "preppipe_gui.settings.db"))
+      if SettingsDict._settings_instance is None:
+        raise RuntimeError("SettingsDict instance failed to initialize")
     return SettingsDict._settings_instance
 
   @staticmethod
@@ -114,3 +117,19 @@ def __enter__(self):
 
   def __exit__(self, exc_type, exc_val, exc_tb):
     self.close()
+
+  # 为了避免循环依赖，我们在这里把其他获取当前设置值的函数放在这里
+  _langs_dict = {
+    "en": "English",
+    "zh_cn": "中文（简体）",
+    "zh_hk": "中文（繁體）",
+  }
+  @staticmethod
+  def get_current_language() -> str:
+    if inst := SettingsDict.instance():
+      if lang := inst.get("language"):
+        return lang
+    for candidate in Translatable.PREFERRED_LANG:
+      if candidate in SettingsDict._langs_dict:
+        return candidate
+    return "en"

src/preppipe_gui_pyside6/toolwidgets/__init__.py

@@ -33,17 +33,15 @@ class SettingWidget(QWidget, ToolWidgetInterface):
   }
 
   def __init__(self, parent : QWidget):
-    if not isinstance(parent, MainWindowInterface):
-      raise TypeError("SettingWidget must be created with a MainWindowInterface instance as parent")
     super(SettingWidget, self).__init__(parent)
     self.ui = Ui_SettingWidget()
     self.ui.setupUi(self)
     self.bind_text(lambda s : self.ui.tabWidget.setTabText(0, s), self._tr_tab_general)
     self.bind_text(self.ui.languageLabel.setText, self._tr_general_language)
     self.ui.languageComboBox.clear()
-    for lang_code, lang_name in self._langs_dict.items():
+    for lang_code, lang_name in SettingsDict._langs_dict.items():
       self.ui.languageComboBox.addItem(lang_name, lang_code)
-    self.ui.languageComboBox.setCurrentIndex(self.ui.languageComboBox.findData(self.get_current_language()))
+    self.ui.languageComboBox.setCurrentIndex(self.ui.languageComboBox.findData(SettingsDict.get_current_language()))
     self.ui.languageComboBox.currentIndexChanged.connect(self.on_languageComboBox_currentIndexChanged)
 
   def on_languageComboBox_currentIndexChanged(self, index):
@@ -63,24 +61,15 @@ def initialize():
     if lang := SettingsDict.instance().get("language"):
       SettingWidget.setLanguage(lang)
 
-  @staticmethod
-  def get_current_language() -> str:
-    if lang := SettingsDict.instance().get("language"):
-      return lang
-    for candidate in Translatable.PREFERRED_LANG:
-      if candidate in SettingWidget._langs_dict:
-        return candidate
-    return "en"
-
   def get_initial_value(self, key : str):
     match key:
       case "language":
-        return self.get_current_language()
+        return SettingsDict.get_current_language()
       case _:
         raise RuntimeError("Unexpected key")
 
   def language_updated(self, lang):
-    if lang == self.get_current_language():
+    if lang == SettingsDict.get_current_language():
       return
     SettingWidget.setLanguage(lang)
     SettingsDict.instance()["language"] = lang