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

printer_select: hide action_bar on startup and translate name

Browse Source
This commit is contained in:
alfrix 2022-10-27 21:24:23 -03:00
parent 0620d660f5
commit 51ddee28c3
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panels/base_panel.py
View File

@ -116,6 +116,11 @@ class BasePanel(ScreenPanel):
return return
def show_heaters(self, show=True): def show_heaters(self, show=True):
for child in self.control['temp_box'].get_children():
self.control['temp_box'].remove(child)
if not show or self._screen.printer.get_temp_store_devices() is None:
return
printer_cfg = self._config.get_printer_config(self._screen.connected_printer) printer_cfg = self._config.get_printer_config(self._screen.connected_printer)
if printer_cfg is not None: if printer_cfg is not None:
self.titlebar_name_type = printer_cfg.get("titlebar_name_type", None) self.titlebar_name_type = printer_cfg.get("titlebar_name_type", None)
@ -123,12 +128,6 @@ class BasePanel(ScreenPanel):
self.titlebar_name_type = None self.titlebar_name_type = None
logging.info(f"Titlebar name type: {self.titlebar_name_type}") logging.info(f"Titlebar name type: {self.titlebar_name_type}")
for child in self.control['temp_box'].get_children():
self.control['temp_box'].remove(child)
if not show or self._screen.printer.get_temp_store_devices() is None:
return
img_size = self._gtk.img_scale * .5 img_size = self._gtk.img_scale * .5
for device in self._screen.printer.get_temp_store_devices(): for device in self._screen.printer.get_temp_store_devices():
self.labels[device] = Gtk.Label(label="100º") self.labels[device] = Gtk.Label(label="100º")

7
panels/printer_select.py
View File

@ -2,7 +2,7 @@ import gi
import logging import logging
gi.require_version("Gtk", "3.0") gi.require_version("Gtk", "3.0")
from gi.repository import Gtk from gi.repository import Gtk, GLib
from ks_includes.screen_panel import ScreenPanel from ks_includes.screen_panel import ScreenPanel
logger = logging.getLogger("KlipperScreen.PrinterSelect") logger = logging.getLogger("KlipperScreen.PrinterSelect")
@ -17,7 +17,6 @@ class PrinterSelect(ScreenPanel):
super().__init__(screen, title, False) super().__init__(screen, title, False)
def initialize(self, panel_name): def initialize(self, panel_name):
printers = self._config.get_printers() printers = self._config.get_printers()
grid = self._gtk.HomogeneousGrid() grid = self._gtk.HomogeneousGrid()
@ -47,3 +46,7 @@ class PrinterSelect(ScreenPanel):
col = i % columns col = i % columns
row = int(i / columns) row = int(i / columns)
grid.attach(self.labels[name], col, row, 1, 1) grid.attach(self.labels[name], col, row, 1, 1)
def activate(self):
self._screen.base_panel.action_bar.hide()
GLib.timeout_add(100, self._screen.base_panel.action_bar.hide)

8
screen.py
View File

@ -137,7 +137,7 @@ class KlipperScreen(Gtk.Window):
pname = list(printers[0])[0] pname = list(printers[0])[0]
self.connect_printer(pname) self.connect_printer(pname)
else: else:
self.show_panel("printer_select", "printer_select", "Printer Select", 2) self.show_printer_select()
def connect_printer_widget(self, widget, name): def connect_printer_widget(self, widget, name):
self.connect_printer(name) self.connect_printer(name)
@ -714,11 +714,7 @@ class KlipperScreen(Gtk.Window):
logging.debug(f"Saving panel: {self._cur_panels[0]}") logging.debug(f"Saving panel: {self._cur_panels[0]}")
self.printer_select_prepanel = self._cur_panels[0] self.printer_select_prepanel = self._cur_panels[0]
self.base_panel.show_heaters(False) self.base_panel.show_heaters(False)
self.base_panel.show_macro_shortcut(False) self.show_panel("printer_select", "printer_select", _("Printer Select"), 2)
self.base_panel.show_printer_select(False)
self.show_panel("printer_select", "printer_select", "Printer Select", 2)
self.show_all()
self.base_panel.action_bar.hide()
def state_execute(self, callback, prev_state): def state_execute(self, callback, prev_state):
if self.is_updating(): if self.is_updating():