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

close dialogs when transitioning to printing

Browse Source 
also simplify the transition
This commit is contained in:
alfrix 2023-06-08 11:16:02 -03:00
parent 1813533bec
commit ff94b45c45
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panels/job_status.py
View File

@ -478,8 +478,7 @@ class JobStatusPanel(ScreenPanel):
def close_panel(self, widget=None):
if self.can_close:
logging.debug("Closing job_status panel")
self._screen.printer_ready()
self._printer.change_state("ready")
self._screen.state_ready(wait=False)
def enable_button(self, *args):
for arg in args:

33
screen.py
View File

@ -157,7 +157,7 @@ class KlipperScreen(Gtk.Window):
state_callbacks = {
"disconnected": self.state_disconnected,
"error": self.state_error,
"paused": self.state_paused,
"paused": self.state_printing,
"printing": self.state_printing,
"ready": self.state_ready,
"startup": self.state_startup,
@ -654,21 +654,19 @@ class KlipperScreen(Gtk.Window):
msg += _("Please recompile and flash the micro-controller.") + "\n"
self.printer_initializing(msg + "\n" + state, remove=True)
def state_paused(self):
if "job_status" not in self._cur_panels:
self.printer_printing()
def state_printing(self):
if "job_status" not in self._cur_panels:
self.printer_printing()
else:
self.panels["job_status"].new_print()
self.close_screensaver()
self.base_panel_show_all()
for dialog in self.dialogs:
self.gtk.remove_dialog(dialog)
self.show_panel('job_status', "job_status", _("Printing"), 2)
def state_ready(self):
def state_ready(self, wait=True):
# Do not return to main menu if completing a job, timeouts/user input will return
if "job_status" in self._cur_panels:
if "job_status" in self._cur_panels and wait:
return
self.printer_ready()
self.show_panel('main_panel', "main_menu", None, 2, items=self._config.get_menu_items("__main"))
self.base_panel_show_all()
def state_startup(self):
self.printer_initializing(_("Klipper is attempting to start"))
@ -893,17 +891,6 @@ class KlipperScreen(Gtk.Window):
self.base_panel.show_heaters(True)
self.base_panel.show_estop(True)
def printer_ready(self):
self.show_panel('main_panel', "main_menu", None, 2, items=self._config.get_menu_items("__main"))
self.base_panel_show_all()
def printer_printing(self):
self.close_screensaver()
self.base_panel_show_all()
for dialog in self.dialogs:
self.gtk.remove_dialog(dialog)
self.show_panel('job_status', "job_status", _("Printing"), 2)
def show_keyboard(self, entry=None, event=None):
if self.keyboard is not None:
return