From 82ae373c6ef0d943618100966236e97828a6b4c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Sat, 28 Oct 2023 12:56:46 +0200 Subject: [PATCH] [gui] Add project support link --- gui-win32.spec | 1 + ltchiptool/gui/ko-fi.png | Bin 0 -> 3228 bytes ltchiptool/gui/ltchiptool.wxui | 30 +++++++++++++++++++++++++++++ ltchiptool/gui/ltchiptool.xrc | 34 +++++++++++++++++++++++++++++++++ ltchiptool/gui/panels/log.py | 31 ++++++++++++++++++++++++++++++ 5 files changed, 96 insertions(+) create mode 100644 ltchiptool/gui/ko-fi.png diff --git a/gui-win32.spec b/gui-win32.spec index fcb8a00..130667a 100644 --- a/gui-win32.spec +++ b/gui-win32.spec @@ -27,6 +27,7 @@ a = Analysis( ("ltchiptool/gui/ltchiptool-192x192.png", "."), ("ltchiptool/gui/ltchiptool.ico", "."), ("ltchiptool/gui/ltchiptool.xrc", "."), + ("ltchiptool/gui/ko-fi.png", "."), ("ltchiptool/gui/colors.json", "."), ("pyproject.toml", "."), ] diff --git a/ltchiptool/gui/ko-fi.png b/ltchiptool/gui/ko-fi.png new file mode 100644 index 0000000000000000000000000000000000000000..eb2efbcac3cb5f2fb46b7545763acab817bc5f6d GIT binary patch literal 3228 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 O0000 + + + + + + + #FFFFFF + + wxEXPAND + 5 + + + + wxHORIZONTAL + + wxRIGHT|wxLEFT|wxALIGN_CENTER + 5 + + 48,32 + + + + wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER + 5 + + + + https://ko-fi.com/kuba2k2 + + + + + wxALL + 5 + + 1 + + + + + diff --git a/ltchiptool/gui/panels/log.py b/ltchiptool/gui/panels/log.py index 5a67dc9..364b7ff 100644 --- a/ltchiptool/gui/panels/log.py +++ b/ltchiptool/gui/panels/log.py @@ -1,10 +1,12 @@ # Copyright (c) Kuba Szczodrzyński 2023-1-8. import logging +import sys import threading import time from logging import INFO, info, log, warning from multiprocessing import Queue +from os.path import dirname, join from queue import Empty import wx @@ -93,6 +95,7 @@ def render_finish(self) -> None: # noinspection PyPep8Naming class LogPanel(BasePanel): log_queue: Queue + donate_closed: bool = False def __init__(self, parent: wx.Window, frame): super().__init__(parent, frame) @@ -117,6 +120,20 @@ def __init__(self, parent: wx.Window, frame): GUIProgressBar.render_finish(GUIProgressBar) setattr(_termui_impl, "ProgressBar", GUIProgressBar) + if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"): + donate = join(sys._MEIPASS, "ko-fi.png") + else: + donate = join(dirname(__file__), "..", "ko-fi.png") + + bitmap = self.FindStaticBitmap("bmp_donate") + height = 28 + image = wx.Image(donate) + ratio = image.GetWidth() / image.GetHeight() + image.Rescale(int(ratio * height), height, wx.IMAGE_QUALITY_BICUBIC) + bitmap.SetBitmap(image) + + self.BindButton("button_donate_close", self.OnDonateClose) + def emit_raw(self, log_prefix: str, message: str, color: str): if threading.current_thread() is not threading.main_thread(): # NEVER block worker threads by waiting for main thread availability @@ -145,6 +162,7 @@ def GetSettings(self) -> dict: raw=handler.raw, full_traceback=handler.full_traceback, dump_serial=LoggingStreamHook.is_registered(Serial), + donate_closed=self.donate_closed, ) def SetSettings( @@ -154,6 +172,7 @@ def SetSettings( raw: bool = False, full_traceback: bool = True, dump_serial: bool = False, + donate_closed: bool = False, **_, ): handler = LoggingHandler.get() @@ -181,6 +200,10 @@ def SetSettings( case _ if item.GetItemLabel() == level_name: item.Check() + if donate_closed: + # noinspection PyTypeChecker + self.OnDonateClose(None) + @on_event def OnIdle(self): while True: @@ -189,6 +212,14 @@ def OnIdle(self): except Empty: break + @on_event + def OnDonateClose(self): + self.donate_closed = True + panel: wx.Panel = self.FindWindowByName("panel_donate", self) + panel.Hide() + self.Layout() + self.Update() + def OnClose(self): super().OnClose() LoggingHandler.get().clear_emitters()