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

将挤出机菜单移动到侧边栏

Browse Source
This commit is contained in:
张开科 2024-07-01 08:56:57 +08:00
parent afd3a370a1
commit 656371fce3
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/main_menu.conf
View File

@ -11,12 +11,6 @@ icon: heat-up
panel: temperature panel: temperature
enable: {{ (printer.temperature_devices.count > 0) or (printer.extruders.count > 0)}} enable: {{ (printer.temperature_devices.count > 0) or (printer.extruders.count > 0)}}
[menu __main extrude]
name: {{ gettext('Extrude') }}
icon: extrude
panel: extrude
enable: {{ printer.extruders.count > 0 }}
[menu __main gcodes] [menu __main gcodes]
name: {{ gettext('Gcodes') }} name: {{ gettext('Gcodes') }}
icon: files icon: files

10
panels/base_panel.py
View File

@ -35,6 +35,13 @@ class BasePanel(ScreenPanel):
self.control['move'] = self._gtk.Button('move', scale=abscale) self.control['move'] = self._gtk.Button('move', scale=abscale)
self.control['move'].connect("clicked", self.menu_item_clicked, self.move) self.control['move'].connect("clicked", self.menu_item_clicked, self.move)
self.control['move'].set_no_show_all(True) self.control['move'].set_no_show_all(True)
self.extrude = {
"panel": "extrude",
}
self.control['extrude'] = self._gtk.Button('extrude', scale=abscale)
self.control['extrude'].connect("clicked", self.menu_item_clicked, self.extrude)
self.control['extrude'].set_no_show_all(True)
self.files = { self.files = {
"panel": "gcodes", "panel": "gcodes",
} }
@ -78,6 +85,7 @@ class BasePanel(ScreenPanel):
self.action_bar.add(self.control['back']) self.action_bar.add(self.control['back'])
self.action_bar.add(self.control['home']) self.action_bar.add(self.control['home'])
self.action_bar.add(self.control['move']) self.action_bar.add(self.control['move'])
self.action_bar.add(self.control['extrude'])
self.action_bar.add(self.control['files']) self.action_bar.add(self.control['files'])
self.action_bar.add(self.control['more']) self.action_bar.add(self.control['more'])
self.action_bar.add(self.control['printer_select']) self.action_bar.add(self.control['printer_select'])
@ -207,6 +215,7 @@ class BasePanel(ScreenPanel):
connected = self._printer and self._printer.state not in {'disconnected', 'startup', 'shutdown', 'error'} connected = self._printer and self._printer.state not in {'disconnected', 'startup', 'shutdown', 'error'}
self.control['estop'].set_visible(printing) self.control['estop'].set_visible(printing)
self.control['move'].set_visible(not printing) self.control['move'].set_visible(not printing)
self.control['extrude'].set_visible(not printing)
self.control['files'].set_visible(not printing) self.control['files'].set_visible(not printing)
self.control['more'].set_visible(not printing) self.control['more'].set_visible(not printing)
self.show_shortcut(connected) self.show_shortcut(connected)
@ -311,6 +320,7 @@ class BasePanel(ScreenPanel):
) )
self.set_control_sensitive(self._screen._cur_panels[-1] != self.shorcut['panel']) self.set_control_sensitive(self._screen._cur_panels[-1] != self.shorcut['panel'])
self.set_control_sensitive(self._screen._cur_panels[-1] != self.move['panel'], control='move') self.set_control_sensitive(self._screen._cur_panels[-1] != self.move['panel'], control='move')
self.set_control_sensitive(self._screen._cur_panels[-1] != self.extrude['panel'], control='extrude')
self.set_control_sensitive(self._screen._cur_panels[-1] != self.files['panel'], control='files') self.set_control_sensitive(self._screen._cur_panels[-1] != self.files['panel'], control='files')
self.set_control_sensitive(self._screen._cur_panels[-1] != self.more['panel'], control='more') self.set_control_sensitive(self._screen._cur_panels[-1] != self.more['panel'], control='more')