CreatBot/CreatBotKlipperScreen
7
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some unneeded complexity in the macro shortcut

Browse Source
This commit is contained in:
alfrix 2022-06-30 09:42:41 -03:00 committed by Alfredo Monclus
parent 06fceec84a
commit 5c17656567
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panels/base_panel.py
View File

@ -257,10 +257,7 @@ class BasePanel(ScreenPanel):
self.control['home'].set_sensitive(False)
self.buttons_showing['back'] = False
def show_macro_shortcut(self, show=True, mod_row=False):
if show == "True":
show = True
def show_macro_shortcut(self, show=True):
if show is True and self.buttons_showing['macros_shortcut'] is False:
self.action_bar.add(self.control['macros_shortcut'])
if self.buttons_showing['printer_select'] is False:

9
screen.py
View File

@ -166,7 +166,7 @@ class KlipperScreen(Gtk.Window):
if self.printer.get_state() not in ["disconnected", "error", "startup", "shutdown"]:
self.base_panel.show_heaters(True)
self.base_panel.show_printer_select(True)
self.base_panel.show_macro_shortcut(self._config.get_main_config().get('side_macro_shortcut'))
self.base_panel.show_macro_shortcut(self._config.get_main_config().getboolean('side_macro_shortcut'))
return
# Cleanup
@ -773,7 +773,7 @@ class KlipperScreen(Gtk.Window):
if "job_status" in self._cur_panels or "main_menu" in self._cur_panels:
return
self.base_panel.show_macro_shortcut(self._config.get_main_config().get('side_macro_shortcut'))
self.base_panel.show_macro_shortcut(self._config.get_main_config().getboolean('side_macro_shortcut'))
if prev_state not in ['paused', 'printing']:
self.init_printer()
self.base_panel._printer = self.printer
@ -804,10 +804,7 @@ class KlipperScreen(Gtk.Window):
"</b>" + "\n\n" + msg)
def toggle_macro_shortcut(self, value):
if value is True:
self.base_panel.show_macro_shortcut(True, True)
else:
self.base_panel.show_macro_shortcut(False, True)
self.base_panel.show_macro_shortcut(value)
def _websocket_callback(self, action, data):
_ = self.lang.gettext