sticker-convert 2.13.3.0__py3-none-any.whl → 2.15.0.0__py3-none-any.whl

sticker_convert/gui_components/frames/comp_frame.py

@@ -21,7 +21,9 @@ class CompFrame(LabelFrame):
             self,
             text="?",
             width=1,
-            command=lambda: self.gui.cb_msg_block(self.gui.help["comp"]["no_compress"]),
+            command=lambda: self.gui.cb.put(
+                ("msg_block", (self.gui.help["comp"]["no_compress"],), None)
+            ),
             bootstyle="secondary",  # type: ignore
         )
         self.no_compress_lbl = Label(self, text="No compression")
@@ -38,7 +40,9 @@ class CompFrame(LabelFrame):
             self,
             text="?",
             width=1,
-            command=lambda: self.gui.cb_msg_block(self.gui.help["comp"]["preset"]),
+            command=lambda: self.gui.cb.put(
+                ("msg_block", (self.gui.help["comp"]["preset"],), None)
+            ),
             bootstyle="secondary",  # type: ignore
         )
         self.comp_preset_lbl = Label(self, text="Preset")
@@ -56,7 +60,9 @@ class CompFrame(LabelFrame):
             self,
             text="?",
             width=1,
-            command=lambda: self.gui.cb_msg_block(self.gui.help["comp"]["steps"]),
+            command=lambda: self.gui.cb.put(
+                ("msg_block", (self.gui.help["comp"]["steps"],), None)
+            ),
             bootstyle="secondary",  # type: ignore
         )
         self.steps_lbl = Label(self, text="Number of steps")
@@ -67,7 +73,9 @@ class CompFrame(LabelFrame):
             self,
             text="?",
             width=1,
-            command=lambda: self.gui.cb_msg_block(self.gui.help["comp"]["processes"]),
+            command=lambda: self.gui.cb.put(
+                ("msg_block", (self.gui.help["comp"]["processes"],), None)
+            ),
             bootstyle="secondary",  # type: ignore
         )
         self.processes_lbl = Label(self, text="Number of processes")

sticker_convert/gui_components/frames/config_frame.py

@@ -78,27 +78,35 @@ class ConfigFrame(LabelFrame):
         )
 
     def cb_clear_cred(self, *_: Any, **kwargs: Any) -> None:
-        response = self.gui.cb_ask_bool("Are you sure you want to clear credentials?")
+        response = self.gui.cb.put(
+            ("ask_bool", ("Are you sure you want to clear credentials?",), None)
+        )
         if response is True:
             self.gui.delete_creds()
             self.gui.load_jsons()
             self.gui.apply_creds()
             self.gui.highlight_fields()
-            self.gui.cb_msg_block("Credentials cleared.")
+            self.gui.cb.put(("msg_block", ("Credentials cleared.",), None))
 
     def cb_restore_default(self, *_: Any, **kwargs: Any) -> None:
-        response = self.gui.cb_ask_bool(
-            "Are you sure you want to restore default config? (This will not clear credentials.)"
+        response = self.gui.cb.put(
+            (
+                "ask_bool",
+                (
+                    "Are you sure you want to restore default config? (This will not clear credentials.)",
+                ),
+                None,
+            )
         )
         if response is True:
             self.gui.delete_config()
             self.gui.load_jsons()
             self.gui.apply_config()
             self.gui.highlight_fields()
-            self.gui.cb_msg_block("Restored to default config.")
+            self.gui.cb.put(("msg_block", ("Restored to default config.",), None))
 
     def cb_open_config_directory(self, *_: Any, **kwargs: Any) -> None:
-        self.gui.cb_msg(msg=f"Config is located at {CONFIG_DIR}")
+        self.gui.cb.put(f"Config is located at {CONFIG_DIR}")
         if platform.system() == "Windows":
             os.startfile(CONFIG_DIR)  # type: ignore
         elif platform.system() == "Darwin":

sticker_convert/gui_components/frames/control_frame.py

@@ -23,7 +23,7 @@ class ControlFrame(Frame):
 
     def cb_start_btn(self, *args: Any, **kwargs: Any) -> None:
         if self.gui.job:
-            response = self.gui.cb_ask_bool("Cancel job?")
+            response = self.gui.cb.ask_bool("Cancel job?")
             if response is True:
                 self.gui.cancel_job()
         else:

sticker_convert/gui_components/frames/cred_frame.py

@@ -4,13 +4,13 @@ from typing import TYPE_CHECKING, Any
 
 from ttkbootstrap import Button, Entry, Label, LabelFrame  # type: ignore
 
+from sticker_convert.auth.auth_telethon import AuthTelethon
 from sticker_convert.gui_components.frames.right_clicker import RightClicker
 from sticker_convert.gui_components.windows.discord_get_auth_window import DiscordGetAuthWindow
 from sticker_convert.gui_components.windows.kakao_get_auth_window import KakaoGetAuthWindow
 from sticker_convert.gui_components.windows.line_get_auth_window import LineGetAuthWindow
 from sticker_convert.gui_components.windows.signal_get_auth_window import SignalGetAuthWindow
 from sticker_convert.gui_components.windows.viber_get_auth_window import ViberGetAuthWindow
-from sticker_convert.utils.auth.telethon_setup import TelethonSetup
 
 if TYPE_CHECKING:
     from sticker_convert.gui import GUI  # type: ignore
@@ -188,19 +188,17 @@ class CredFrame(LabelFrame):
         faq_site = "https://github.com/laggykiller/sticker-convert#faq"
         success = webbrowser.open(faq_site)
         if not success:
-            self.gui.cb_ask_str("You can get help from:", initialvalue=faq_site)
+            self.gui.cb.ask_str("You can get help from:", initialvalue=faq_site)
 
     def cb_telethon_get_auth(self, *_: Any) -> None:
-        success, _client, api_id, api_hash = TelethonSetup(
-            self.gui.get_opt_cred(), self.gui.cb_ask_str
-        ).start()
+        success, _client, api_id, api_hash, msg = AuthTelethon(
+            self.gui.get_opt_cred(), self.gui.cb
+        ).start(check_auth_only=True)
         if success:
             self.gui.telethon_api_id_var.set(api_id)
             self.gui.telethon_api_hash_var.set(api_hash)
             self.gui.save_creds()
-            self.gui.cb_msg_block("Telethon setup successful")
-        else:
-            self.gui.cb_msg_block("Telethon setup failed")
+        self.gui.cb.put(("msg_block", (msg,), None))
 
     def cb_kakao_get_auth(self, *_: Any) -> None:
         KakaoGetAuthWindow(self.gui)

sticker_convert/gui_components/windows/advanced_compression_window.py

@@ -2,7 +2,6 @@
 from __future__ import annotations
 
 import re
-from functools import partial
 from tkinter import colorchooser
 from typing import Any, List, Tuple
 
@@ -650,13 +649,13 @@ class AdvancedCompressionWindow(BaseWindow):
         self.set_emoji_btn()
 
     def add_help_btn(self, msg: str) -> Button:
-        cb_msg_block_adv_comp_win = partial(self.gui.cb_msg_block, parent=self)
-
         return Button(
             self.frame_advcomp,
             text="?",
             width=1,
-            command=lambda: cb_msg_block_adv_comp_win(msg),
+            command=lambda: self.gui.cb.put(
+                ("msg_block", None, {"message": msg, "parent": self})
+            ),
             bootstyle="secondary",  # type: ignore
         )
 

sticker_convert/gui_components/windows/base_window.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 import platform
-from typing import TYPE_CHECKING, Tuple
+from typing import TYPE_CHECKING, Optional, Tuple
 
 from ttkbootstrap import Toplevel  # type: ignore
 
@@ -11,10 +11,15 @@ if TYPE_CHECKING:
 
 
 class BaseWindow(Toplevel):
-    def __init__(self, gui: "GUI") -> None:
+    def __init__(self, gui: "GUI", parent: Optional[Toplevel] = None) -> None:
         super().__init__(alpha=0)  # type: ignore
         self.gui = gui
 
+        if parent is None:
+            self.parent = gui
+        else:
+            self.parent = parent
+
         GUIUtils.set_icon(self)
 
         self.mousewheel: Tuple[str, ...]

sticker_convert/gui_components/windows/discord_get_auth_window.py

@@ -1,13 +1,12 @@
 #!/usr/bin/env python3
-from functools import partial
 from threading import Thread
 from typing import Any
 
 from ttkbootstrap import Button, Frame, Label  # type: ignore
 
+from sticker_convert.auth.auth_discord import AuthDiscord
 from sticker_convert.gui_components.gui_utils import GUIUtils
 from sticker_convert.gui_components.windows.base_window import BaseWindow
-from sticker_convert.utils.auth.get_discord_auth import GetDiscordAuth
 
 
 class DiscordGetAuthWindow(BaseWindow):
@@ -16,9 +15,6 @@ class DiscordGetAuthWindow(BaseWindow):
 
         self.title("Get Discord token")
 
-        self.cb_msg_block_discord = partial(self.gui.cb_msg_block, parent=self)
-        self.cb_ask_str_discord = partial(self.gui.cb_ask_str, parent=self)
-
         self.frame_info = Frame(self.scrollable_frame)
         self.frame_start_btn = Frame(self.scrollable_frame)
 
@@ -68,7 +64,7 @@ class DiscordGetAuthWindow(BaseWindow):
         Thread(target=self.cb_login_thread, daemon=True).start()
 
     def cb_login_thread(self, *args: Any) -> None:
-        m = GetDiscordAuth(cb_msg=self.gui.cb_msg)
+        m = AuthDiscord(self.gui.get_opt_cred(), self.gui.cb)
         discord_token, msg = m.get_cred()
         if discord_token:
             if not self.gui.creds.get("discord"):
@@ -79,4 +75,4 @@ class DiscordGetAuthWindow(BaseWindow):
             self.gui.save_creds()
             self.gui.highlight_fields()
 
-        self.cb_msg_block_discord(msg)
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))