CreatBot/GeneralKlipperScreen
7
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

PEP E721

Browse Source
This commit is contained in:
alfrix 2023-08-21 15:55:29 -03:00 committed by Alfredo Monclus
parent 2f4f28af1c
commit d5e55f8aad
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ks_includes/KlippyGtk.py
View File

@ -9,17 +9,14 @@ from gi.repository import Gdk, GdkPixbuf, Gio, Gtk, Pango
def format_label(widget, lines=2): def format_label(widget, lines=2):
if type(widget) == Gtk.Label: if isinstance(widget, Gtk.Label):
return widget widget.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR)
if type(widget) in (Gtk.Container, Gtk.Bin, Gtk.Button, Gtk.Alignment, Gtk.Box): widget.set_line_wrap(True)
widget.set_ellipsize(Pango.EllipsizeMode.END)
widget.set_lines(lines)
elif isinstance(widget, (Gtk.Container, Gtk.Bin, Gtk.Button, Gtk.Alignment, Gtk.Box)):
for _ in widget.get_children(): for _ in widget.get_children():
lbl = format_label(_) format_label(_, lines)
if lbl is not None:
lbl.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR)
lbl.set_line_wrap(True)
lbl.set_ellipsize(True)
lbl.set_ellipsize(Pango.EllipsizeMode.END)
lbl.set_lines(lines)
class KlippyGtk: class KlippyGtk:
@ -187,12 +184,12 @@ class KlippyGtk:
widget.set_sensitive(False) widget.set_sensitive(False)
widget.set_always_show_image(False) widget.set_always_show_image(False)
box.get_children()[0].hide() box.get_children()[0].hide()
if type(box.get_children()[1]) == Gtk.Spinner: if isinstance(box.get_children()[1], Gtk.Spinner):
box.get_children()[1].start() box.get_children()[1].start()
box.get_children()[1].show() box.get_children()[1].show()
else: else:
box.get_children()[0].show() box.get_children()[0].show()
if type(box.get_children()[1]) == Gtk.Spinner: if isinstance(box.get_children()[1], Gtk.Spinner):
box.get_children()[1].stop() box.get_children()[1].stop()
box.get_children()[1].hide() box.get_children()[1].hide()
widget.set_always_show_image(True) widget.set_always_show_image(True)

4
screen.py
View File

@ -788,7 +788,7 @@ class KlipperScreen(Gtk.Window):
def _send_action(self, widget, method, params): def _send_action(self, widget, method, params):
logging.info(f"{method}: {params}") logging.info(f"{method}: {params}")
if type(widget) == Gtk.Button: if isinstance(widget, Gtk.Button):
self.gtk.Button_busy(widget, True) self.gtk.Button_busy(widget, True)
self._ws.send_method(method, params, self.enable_widget, widget) self._ws.send_method(method, params, self.enable_widget, widget)
else: else:
@ -796,7 +796,7 @@ class KlipperScreen(Gtk.Window):
def enable_widget(self, *args): def enable_widget(self, *args):
for x in args: for x in args:
if type(x) == Gtk.Button: if isinstance(x, Gtk.Button):
GLib.timeout_add(150, self.gtk.Button_busy, x, False) GLib.timeout_add(150, self.gtk.Button_busy, x, False)
def printer_initializing(self, msg, remove=False): def printer_initializing(self, msg, remove=False):