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

system: Add restart option to services that moonraker supports

Browse Source
This commit is contained in:
Jordan 2021-06-12 06:28:32 -04:00 committed by jordanruthe
parent dfe9883923
commit d3ae02e8d8
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ks_includes/KlipperScreen.conf
View File

@ -225,3 +225,8 @@ panel: network
name: {{ gettext('System') }} name: {{ gettext('System') }}
icon: info icon: info
panel: system panel: system
[menu __splashscreen settings]
name: {{ gettext('Settings') }}
icon: settings
panel: settings

19
panels/system.py
View File

@ -12,6 +12,8 @@ from ks_includes.screen_panel import ScreenPanel
def create_panel(*args): def create_panel(*args):
return SystemPanel(*args) return SystemPanel(*args)
ALLOWED_SERVICES = ["KlipperScreen","MoonCord","klipper","moonraker"]
class SystemPanel(ScreenPanel): class SystemPanel(ScreenPanel):
def initialize(self, panel_name): def initialize(self, panel_name):
_ = self.lang.gettext _ = self.lang.gettext
@ -26,10 +28,6 @@ class SystemPanel(ScreenPanel):
firmrestart.connect("clicked", self.restart_klippy, "firmware") firmrestart.connect("clicked", self.restart_klippy, "firmware")
firmrestart.set_vexpand(False) firmrestart.set_vexpand(False)
ks_restart = self._gtk.ButtonImage('refresh',"\n".join(_('Restart Klipper Screen').split(' ')))
ks_restart.set_vexpand(False)
ks_restart.connect("clicked", self.restart_ks)
reboot = self._gtk.ButtonImage('refresh',_('System\nRestart'),'color3') reboot = self._gtk.ButtonImage('refresh',_('System\nRestart'),'color3')
reboot.connect("clicked", self._screen._confirm_send_action, reboot.connect("clicked", self._screen._confirm_send_action,
_("Are you sure you wish to reboot the system?"), "machine.reboot") _("Are you sure you wish to reboot the system?"), "machine.reboot")
@ -86,6 +84,11 @@ class SystemPanel(ScreenPanel):
self.labels["%s_info" % prog] = self._gtk.ButtonImage("info",None, None, .7, .7) self.labels["%s_info" % prog] = self._gtk.ButtonImage("info",None, None, .7, .7)
self.labels["%s_info" % prog].connect("clicked", self.show_commit_history, prog) self.labels["%s_info" % prog].connect("clicked", self.show_commit_history, prog)
if prog in ALLOWED_SERVICES:
self.labels["%s_restart" % prog] = self._gtk.ButtonImage("refresh",None, None, .7, .7)
self.labels["%s_restart" % prog].connect("clicked", self.restart, prog)
self.labels["%s_box" % prog].pack_start(self.labels["%s_restart" % prog], True, 0, 0)
self.labels["%s_box" % prog].pack_end(self.labels["%s_status" % prog], True, 0, 0) self.labels["%s_box" % prog].pack_end(self.labels["%s_status" % prog], True, 0, 0)
logging.info("Updating program: %s " % prog) logging.info("Updating program: %s " % prog)
self.update_program_info(prog) self.update_program_info(prog)
@ -100,7 +103,6 @@ class SystemPanel(ScreenPanel):
grid.attach(scroll, 0, 0, 5, 2) grid.attach(scroll, 0, 0, 5, 2)
grid.attach(restart, 0, 2, 1, 1) grid.attach(restart, 0, 2, 1, 1)
grid.attach(firmrestart, 1, 2, 1, 1) grid.attach(firmrestart, 1, 2, 1, 1)
grid.attach(ks_restart, 2, 2, 1, 1)
grid.attach(reboot, 3, 2, 1, 1) grid.attach(reboot, 3, 2, 1, 1)
grid.attach(shutdown, 4, 2, 1, 1) grid.attach(shutdown, 4, 2, 1, 1)
@ -142,6 +144,13 @@ class SystemPanel(ScreenPanel):
if data['complete'] == True: if data['complete'] == True:
self.update_dialog.set_response_sensitive(Gtk.ResponseType.CANCEL, True) self.update_dialog.set_response_sensitive(Gtk.ResponseType.CANCEL, True)
def restart(self, widget, program):
if program not in ALLOWED_SERVICES:
return
logging.info("Restarting service: %s" % program)
self._screen._ws.send_method("machine.services.restart", {"service": program})
def show_commit_history(self, widget, program): def show_commit_history(self, widget, program):
_ = self.lang.gettext _ = self.lang.gettext