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

base_panel: fix macro shorcut not hiding at startup if configured to off

Browse Source
This commit is contained in:
alfrix 2022-10-23 12:19:28 -03:00
parent 0de49ee0cd
commit d6e4ad0a35
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panels/base_panel.py
View File

@ -65,7 +65,7 @@ class BasePanel(ScreenPanel):
self.action_bar.add(self.control['home']) self.action_bar.add(self.control['home'])
if len(self._config.get_printers()) > 1: if len(self._config.get_printers()) > 1:
self.action_bar.add(self.control['printer_select']) self.action_bar.add(self.control['printer_select'])
self.action_bar.add(self.control['macros_shortcut']) self.show_macro_shortcut(self._config.get_main_config().getboolean('side_macro_shortcut', True))
self.action_bar.add(self.control['estop']) self.action_bar.add(self.control['estop'])
# Titlebar # Titlebar
@ -267,11 +267,11 @@ class BasePanel(ScreenPanel):
self.action_bar.reorder_child(self.control['macros_shortcut'], 2) self.action_bar.reorder_child(self.control['macros_shortcut'], 2)
else: else:
self.action_bar.reorder_child(self.control['macros_shortcut'], 3) self.action_bar.reorder_child(self.control['macros_shortcut'], 3)
self.control['macros_shortcut'].show()
self.buttons_showing['macros_shortcut'] = True self.buttons_showing['macros_shortcut'] = True
elif show is False and self.buttons_showing['macros_shortcut'] is True: elif show is False and self.buttons_showing['macros_shortcut'] is True:
self.action_bar.remove(self.control['macros_shortcut']) self.action_bar.remove(self.control['macros_shortcut'])
self.buttons_showing['macros_shortcut'] = False self.buttons_showing['macros_shortcut'] = False
self._screen.show_all()
def show_printer_select(self, show=True): def show_printer_select(self, show=True):
if len(self._config.get_printers()) <= 1: if len(self._config.get_printers()) <= 1:
@ -280,10 +280,10 @@ class BasePanel(ScreenPanel):
self.action_bar.add(self.control['printer_select']) self.action_bar.add(self.control['printer_select'])
self.action_bar.reorder_child(self.control['printer_select'], 2) self.action_bar.reorder_child(self.control['printer_select'], 2)
self.buttons_showing['printer_select'] = True self.buttons_showing['printer_select'] = True
self.control['printer_select'].show()
elif show is False and self.buttons_showing['printer_select']: elif show is False and self.buttons_showing['printer_select']:
self.action_bar.remove(self.control['printer_select']) self.action_bar.remove(self.control['printer_select'])
self.buttons_showing['printer_select'] = False self.buttons_showing['printer_select'] = False
self._screen.show_all()
def set_title(self, title): def set_title(self, title):
try: try: