Merge pull request #34 from Interpause/ui-overhaul

UI overhaul

Author: Interpause

frontends/krita/krita_diff/__init__.py

@@ -1,10 +1,63 @@
 from krita import DockWidgetFactory, DockWidgetFactoryBase, Krita
 
-from .docker import SDPluginDocker
-from .hotkeys import Hotkeys
+from .docker import create_docker
+from .extension import SDPluginExtension
+from .pages import (
+    ConfigPage,
+    Img2ImgPage,
+    InpaintPage,
+    SDCommonPage,
+    Txt2ImgPage,
+    UpscalePage,
+)
+
+# TODO:
+# - split each tab into its own Docker
+# - by default, dock all the tabs onto each other except quick config
+# - see https://scripting.krita.org/lessons/docker-widgets
+# - Might want to seriously consider drawing the line on what is done by backend/frontend
 
 instance = Krita.instance()
-instance.addExtension(Hotkeys(instance))
+instance.addExtension(SDPluginExtension(instance))
+instance.addDockWidgetFactory(
+    DockWidgetFactory(
+        "krita_diff_sdcommon",
+        DockWidgetFactoryBase.DockLeft,
+        create_docker(SDCommonPage),
+    )
+)
+instance.addDockWidgetFactory(
+    DockWidgetFactory(
+        "krita_diff_txt2img",
+        DockWidgetFactoryBase.DockLeft,
+        create_docker(Txt2ImgPage),
+    )
+)
+instance.addDockWidgetFactory(
+    DockWidgetFactory(
+        "krita_diff_img2img",
+        DockWidgetFactoryBase.DockLeft,
+        create_docker(Img2ImgPage),
+    )
+)
+instance.addDockWidgetFactory(
+    DockWidgetFactory(
+        "krita_diff_inpaint",
+        DockWidgetFactoryBase.DockLeft,
+        create_docker(InpaintPage),
+    )
+)
+instance.addDockWidgetFactory(
+    DockWidgetFactory(
+        "krita_diff_upscale",
+        DockWidgetFactoryBase.DockLeft,
+        create_docker(UpscalePage),
+    )
+)
 instance.addDockWidgetFactory(
-    DockWidgetFactory("krita_diff", DockWidgetFactoryBase.DockLeft, SDPluginDocker)
+    DockWidgetFactory(
+        "krita_diff_config",
+        DockWidgetFactoryBase.DockLeft,
+        create_docker(ConfigPage),
+    )
 )

frontends/krita/krita_diff/client.py

@@ -128,7 +128,7 @@ def request(cls, *args, **kwargs):
 
 class Client(QObject):
     status = pyqtSignal(str)
-    """error message, Exception object"""
+    config_updated = pyqtSignal()
 
     def __init__(self, cfg: Config, ext_cfg: Config):
         """It is highly dependent on config's structure to the point it writes directly to it. :/"""
@@ -207,7 +207,7 @@ def get_common_params(self, has_selection):
         )
         return params
 
-    def get_config(self) -> bool:
+    def get_config(self):
         def cb(obj):
             try:
                 assert "sample_path" in obj
@@ -254,6 +254,7 @@ def cb(obj):
 
             self.is_connected = True
             self.status.emit(STATE_READY)
+            self.config_updated.emit()
 
         # only get config if there are no pending post requests jamming the backend
         # NOTE: this might prevent get_config() from ever working if zombie requests can happen

frontends/krita/krita_diff/docker.py

@@ -1,108 +1,35 @@
-from functools import partial
+from krita import DockWidget, QScrollArea
 
-from krita import DockWidget, QScrollArea, QTabWidget, QTimer, QVBoxLayout, QWidget
-
-from .defaults import REFRESH_INTERVAL, STATE_INIT, STATE_READY, STATE_URLERROR
-from .pages import (
-    ConfigTabWidget,
-    Img2ImgTabWidget,
-    InpaintTabWidget,
-    SDCommonWidget,
-    Txt2ImgTabWidget,
-    UpscaleTabWidget,
-)
 from .script import script
 from .style import style
-from .widgets import QLabel
-
-# Notes:
-# - Consider making QuickConfig an accordion to save vertical space
-#    - There's no accordion in Qt. Cry. I wanna go back to using Preact & JSX...
-
-# TODO:
-# - split each tab into its own Docker
-# - by default, dock all the tabs onto each other except quick config
-# - see https://scripting.krita.org/lessons/docker-widgets
-# - Might want to seriously consider drawing the line on what is done by backend/frontend
-
-
-class SDPluginDocker(DockWidget):
-    def __init__(self, *args, **kwargs):
-        super(SDPluginDocker, self).__init__(*args, **kwargs)
-        self.setWindowTitle("SD Plugin")
-        self.create_interfaces()
-        self.update_remote_config()
-        self.update_interfaces()
-        self.connect_interfaces()
-        self.setWidget(self.widget)
-
-    def create_interfaces(self):
-        self.quick_widget = SDCommonWidget()
-        self.txt2img_widget = Txt2ImgTabWidget()
-        self.img2img_widget = Img2ImgTabWidget()
-        self.inpaint_widget = InpaintTabWidget()
-        self.upscale_widget = UpscaleTabWidget()
-        self.config_widget = ConfigTabWidget(self.update_interfaces)
-
-        self.tabs = tabs = QTabWidget()
-        tabs.addTab(self.txt2img_widget, "Txt2Img")
-        tabs.addTab(self.img2img_widget, "Img2Img")
-        tabs.addTab(self.inpaint_widget, "Inpaint")
-        tabs.addTab(self.upscale_widget, "Upscale")
-        tabs.addTab(self.config_widget, "Config")
-        tabs.setTabPosition(QTabWidget.West)
-
-        self.status_bar = QLabel()
-        self.update_status_bar(STATE_INIT)
-
-        layout = QVBoxLayout()
-        layout.setContentsMargins(0, 0, 0, 0)
-
-        layout.addWidget(self.quick_widget)
-        layout.addWidget(self.status_bar)
-        layout.addWidget(tabs)
-        layout.addStretch()
-
-        self.widget = QScrollArea()
-        self.widget.setStyleSheet(style)
-        widget = QWidget(self)
-        widget.setLayout(layout)
-        self.widget.setWidget(widget)
-        self.widget.setWidgetResizable(True)
-
-        self.update_timer = QTimer()
 
-    def update_interfaces(self):
-        self.quick_widget.cfg_init()
-        self.txt2img_widget.cfg_init()
-        self.img2img_widget.cfg_init()
-        self.inpaint_widget.cfg_init()
-        self.upscale_widget.cfg_init()
-        self.config_widget.cfg_init()
 
-        self.tabs.setCurrentIndex(script.cfg("tab_index", int))
+def create_docker(page):
+    class Docker(DockWidget):
+        def __init__(self, *args, **kwargs):
+            super(Docker, self).__init__(*args, **kwargs)
+            self.setWindowTitle(page.name)
+            self.create_interface()
+            self.update_interface()
+            self.connect_interface()
+            self.setWidget(self.widget)
 
-    def connect_interfaces(self):
-        self.quick_widget.cfg_connect()
-        self.txt2img_widget.cfg_connect()
-        self.img2img_widget.cfg_connect()
-        self.inpaint_widget.cfg_connect()
-        self.upscale_widget.cfg_connect()
-        self.config_widget.cfg_connect()
+        def create_interface(self):
+            self.page_widget = page()
+            self.widget = QScrollArea()
+            self.widget.setStyleSheet(style)
+            self.widget.setWidget(self.page_widget)
+            self.widget.setWidgetResizable(True)
 
-        self.update_timer.timeout.connect(self.update_remote_config)
-        self.update_timer.start(REFRESH_INTERVAL)
-        script.status_changed.connect(self.update_status_bar)
-        self.tabs.currentChanged.connect(partial(script.cfg.set, "tab_index"))
+        def update_interface(self):
+            self.page_widget.cfg_init()
 
-    def update_status_bar(self, s):
-        if s == STATE_READY and STATE_URLERROR not in self.status_bar.text():
-            return
-        self.status_bar.setText(f"<b>Status:</b> {s}")
+        def connect_interface(self):
+            self.page_widget.cfg_connect()
+            script.config_updated.connect(self.update_interface)
 
-    def update_remote_config(self):
-        script.update_config()
-        self.update_interfaces()
+        def canvasChanged(self, canvas):
+            # TODO: use this callback to save config settings per document
+            pass
 
-    def canvasChanged(self, canvas):
-        pass
+    return Docker

frontends/krita/krita_diff/hotkeys.py renamed to frontends/krita/krita_diff/extension.py

@@ -1,14 +1,18 @@
-from krita import Extension
+from krita import Extension, QTimer
 
-from .docker import script
+from .defaults import REFRESH_INTERVAL
+from .script import script
 
 
-class Hotkeys(Extension):
+class SDPluginExtension(Extension):
     def __init__(self, parent):
         super().__init__(parent)
 
     def setup(self):
-        pass
+        self.update_timer = QTimer()
+        self.update_timer.timeout.connect(script.action_update_config)
+        self.update_timer.start(REFRESH_INTERVAL)
+        script.action_update_config()
 
     def createActions(self, window):
         txt2img_action = window.createAction(

frontends/krita/krita_diff/pages/__init__.py

@@ -1,6 +1,6 @@
-from .common import SDCommonWidget
-from .config import ConfigTabWidget
-from .img2img import Img2ImgTabWidget
-from .inpaint import InpaintTabWidget
-from .txt2img import Txt2ImgTabWidget
-from .upscale import UpscaleTabWidget
+from .common import SDCommonPage
+from .config import ConfigPage
+from .img2img import Img2ImgPage
+from .inpaint import InpaintPage
+from .txt2img import Txt2ImgPage
+from .upscale import UpscalePage

frontends/krita/krita_diff/pages/common.py

@@ -8,9 +8,11 @@
 # - move upscaler/face restorer to config?
 
 
-class SDCommonWidget(QWidget):
+class SDCommonPage(QWidget):
+    name = "SD Common Options"
+
     def __init__(self, *args, **kwargs):
-        super(SDCommonWidget, self).__init__(*args, **kwargs)
+        super(SDCommonPage, self).__init__(*args, **kwargs)
 
         self.title = QLabel("<em>Quick Config</em>")
 
@@ -74,6 +76,7 @@ def __init__(self, *args, **kwargs):
         layout.addLayout(self.sd_model_layout)
         layout.addLayout(batch_layout)
         layout.addLayout(size_layout)
+        layout.addStretch()
 
         self.setLayout(layout)
 

frontends/krita/krita_diff/pages/config.py

@@ -4,15 +4,16 @@
 
 from ..defaults import DEFAULTS
 from ..script import script
-from ..widgets import QCheckBox, QLabel, QLineEditLayout
+from ..widgets import QCheckBox, QLabel, QLineEditLayout, StatusBar
 
 
-class ConfigTabWidget(QWidget):
-    def __init__(self, update_func, *args, **kwargs):
-        super(ConfigTabWidget, self).__init__(*args, **kwargs)
+class ConfigPage(QWidget):
+    name = "SD Plugin Config"
 
-        # callback to update all the other widgets
-        self.update_func = update_func
+    def __init__(self, *args, **kwargs):
+        super(ConfigPage, self).__init__(*args, **kwargs)
+
+        self.status_bar = StatusBar()
 
         self.base_url = QLineEdit()
         self.base_url_reset = QPushButton("Default")
@@ -93,6 +94,7 @@ def __init__(self, update_func, *args, **kwargs):
         # scroll_area.setLayout(layout_inner)
         # scroll_area.setWidgetResizable(True)
         # layout.addWidget(scroll_area)
+        layout.addWidget(self.status_bar)
         layout.addWidget(QLabel("<em>Backend url:</em>"))
         layout.addLayout(inline1)
         layout.addLayout(self.enc_key)
@@ -138,7 +140,7 @@ def cfg_init(self):
     def cfg_connect(self):
         self.base_url.textChanged.connect(partial(script.cfg.set, "base_url"))
         # NOTE: this triggers on every keystroke; theres no focus lost signal...
-        self.base_url.textChanged.connect(script.update_config)
+        self.base_url.textChanged.connect(script.action_update_config)
         self.base_url_reset.released.connect(
             lambda: self.base_url.setText(DEFAULTS.base_url)
         )
@@ -155,17 +157,12 @@ def cfg_connect(self):
         self.do_exact_steps.cfg_connect()
         self.minimize_ui.cfg_connect()
 
-        def update_remote_config():
-            script.update_config()
-            self.update_func()
-
         def restore_defaults():
             script.restore_defaults()
             # retrieve list of available stuff again
-            script.update_config()
-            self.update_func()
+            script.action_update_config()
 
-        self.refresh_btn.released.connect(update_remote_config)
+        self.refresh_btn.released.connect(script.action_update_config)
         self.restore_defaults.released.connect(restore_defaults)
-        # NOTE: crappy workaround because the config system doesnt emit signals
-        self.minimize_ui.toggled.connect(lambda _: self.update_func())
+        self.minimize_ui.toggled.connect(lambda _: script.config_updated.emit())
+        script.status_changed.connect(self.status_bar.set_status)

frontends/krita/krita_diff/pages/img2img.py

@@ -2,12 +2,14 @@
 
 from ..script import script
 from ..widgets import TipsLayout
-from .img_base import ImgTabBaseWidget
+from .img_base import SDImgPageBase
 
 
-class Img2ImgTabWidget(ImgTabBaseWidget):
+class Img2ImgPage(SDImgPageBase):
+    name = "Img2Img"
+
     def __init__(self, *args, **kwargs):
-        super(Img2ImgTabWidget, self).__init__(cfg_prefix="img2img", *args, **kwargs)
+        super(Img2ImgPage, self).__init__(cfg_prefix="img2img", *args, **kwargs)
 
         self.btn = QPushButton("Start img2img")
         self.tips = TipsLayout(
@@ -20,10 +22,10 @@ def __init__(self, *args, **kwargs):
         self.layout.addStretch()
 
     def cfg_init(self):
-        super(Img2ImgTabWidget, self).cfg_init()
+        super(Img2ImgPage, self).cfg_init()
 
         self.tips.setVisible(not script.cfg("minimize_ui", bool))
 
     def cfg_connect(self):
-        super(Img2ImgTabWidget, self).cfg_connect()
+        super(Img2ImgPage, self).cfg_connect()
         self.btn.released.connect(lambda: script.action_img2img())