refactor(export_common, main): pass plugin instance when initializing…

… export dialog
themix-project · Jul 22, 2024 · abd2164 · abd2164
1 parent 8c403cc
commit abd2164
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/oomox_gui/export_common.py b/oomox_gui/export_common.py
@@ -29,6 +29,7 @@
     from collections.abc import Callable
     from typing import Any
 
+    from .plugin_api import OomoxPlugin
     from .theme_file import ThemeT
 
 
@@ -165,7 +166,8 @@ class ExportDialog(ExportWrapper):  # type: ignore[type-arg]
 
     colorscheme: "ThemeT"
     theme_name: str
-    command: str
+    plugin: "OomoxPlugin"
+    command: str  # deprecated from plugin API 1.1
     timeout = 300
     done: bool = False
 
@@ -213,6 +215,7 @@ def __init__(  # pylint: disable=too-many-arguments
             transient_for: Gtk.Window,
             colorscheme: "ThemeT",
             theme_name: str,
+            plugin: "OomoxPlugin",
             headline: str | None = None,
             width: int = 150,
             height: int = 80,
@@ -226,6 +229,7 @@ def __init__(  # pylint: disable=too-many-arguments
         # @TODO: make sure it doesn't break things:
         self.colorscheme = colorscheme
         self.callback = callback
+        self.plugin = plugin
         # from .terminal import generate_terminal_colors_for_oomox
         # self.colorscheme = generate_terminal_colors_for_oomox(colorscheme)
 

diff --git a/oomox_gui/main.py b/oomox_gui/main.py
@@ -500,6 +500,7 @@ def _on_export_theme(self, _action: Gio.SimpleAction, _param: "Any" = None) -> N
             transient_for=self,
             theme_name=self.colorscheme_name,
             colorscheme=self.colorscheme,
+            plugin=self.plugin_theme,
         )
 
     def _on_export_icontheme(self, _action: Gio.SimpleAction, _param: "Any" = None) -> None:
@@ -510,6 +511,7 @@ def _on_export_icontheme(self, _action: Gio.SimpleAction, _param: "Any" = None)
             transient_for=self,
             theme_name=self.colorscheme_name,
             colorscheme=self.colorscheme,
+            plugin=self.plugin_icons,
         )
 
     def _on_export_plugin(self, action: Gio.SimpleAction, _param: "Any" = None) -> None:
@@ -520,6 +522,7 @@ def _on_export_plugin(self, action: Gio.SimpleAction, _param: "Any" = None) -> N
             transient_for=self,
             theme_name=self.colorscheme_name,
             colorscheme=self.colorscheme,
+            plugin=plugin,
         )
 
     def _before_quit(self) -> None:

diff --git a/oomox_gui/multi_export.py b/oomox_gui/multi_export.py
@@ -388,6 +388,7 @@ def add_export_target(
                 transient_for=self,
                 theme_name=self.colorscheme_name,
                 colorscheme=self.colorscheme,
+                plugin=plugin,
                 base_class=Gtk.Box,  # type: ignore[arg-type]
                 override_config=default_config,
                 preview_theme=False,