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

menu: get rid of initalize

Browse Source
This commit is contained in:
alfrix
2023-06-11 10:02:20 -03:00
parent f7c12867d5
commit c1d8a4f033
4 changed files with 47 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
panels/main_menu.py
View File

@@ -10,44 +10,38 @@ from ks_includes.widgets.heatergraph import HeaterGraph
from ks_includes.widgets.keypad import Keypad
def create_panel(*args):
return MainPanel(*args)
def create_panel(*args, **kwargs):
return MainPanel(*args, **kwargs)
class MainPanel(MenuPanel):
def __init__(self, screen, title):
super().__init__(screen, title)
def __init__(self, screen, title, items=None):
super().__init__(screen, title, items)
self.left_panel = None
self.items = None
self.devices = {}
self.graph_update = None
self.active_heater = None
self.h = 1
self.grid = self._gtk.HomogeneousGrid()
self.grid.set_hexpand(True)
self.grid.set_vexpand(True)
self.main_menu = self._gtk.HomogeneousGrid()
self.main_menu.set_hexpand(True)
self.main_menu.set_vexpand(True)
self.graph_retry = 0
def initialize(self, items):
logging.info("### Making MainMenu")
self.items = items
self.create_menu_items()
stats = self._printer.get_printer_status_data()["printer"]
grid = self._gtk.HomogeneousGrid()
if stats["temperature_devices"]["count"] > 0 or stats["extruders"]["count"] > 0:
self._gtk.reset_temp_color()
grid.attach(self.create_left_panel(), 0, 0, 1, 1)
self.main_menu.attach(self.create_left_panel(), 0, 0, 1, 1)
else:
self.graph_update = False
if self._screen.vertical_mode:
self.labels['menu'] = self.arrangeMenuItems(items, 3, True)
grid.attach(self.labels['menu'], 0, 1, 1, 1)
self.main_menu.attach(self.labels['menu'], 0, 1, 1, 1)
else:
self.labels['menu'] = self.arrangeMenuItems(items, 2, True)
grid.attach(self.labels['menu'], 1, 0, 1, 1)
self.grid = grid
self.content.add(self.grid)
self.main_menu.attach(self.labels['menu'], 1, 0, 1, 1)
self.content.add(self.main_menu)
def update_graph_visibility(self):
if self.left_panel is None or not self._printer.get_temp_store_devices():
@@ -241,12 +235,12 @@ class MainPanel(MenuPanel):
self.active_heater = None
if self._screen.vertical_mode:
self.grid.remove_row(1)
self.grid.attach(self.labels['menu'], 0, 1, 1, 1)
self.main_menu.remove_row(1)
self.main_menu.attach(self.labels['menu'], 0, 1, 1, 1)
else:
self.grid.remove_column(1)
self.grid.attach(self.labels['menu'], 1, 0, 1, 1)
self.grid.show_all()
self.main_menu.remove_column(1)
self.main_menu.attach(self.labels['menu'], 1, 0, 1, 1)
self.main_menu.show_all()
def process_update(self, action, data):
if action != "notify_status_update":
@@ -271,12 +265,12 @@ class MainPanel(MenuPanel):
self.labels["keypad"].clear()
if self._screen.vertical_mode:
self.grid.remove_row(1)
self.grid.attach(self.labels["keypad"], 0, 1, 1, 1)
self.main_menu.remove_row(1)
self.main_menu.attach(self.labels["keypad"], 0, 1, 1, 1)
else:
self.grid.remove_column(1)
self.grid.attach(self.labels["keypad"], 1, 0, 1, 1)
self.grid.show_all()
self.main_menu.remove_column(1)
self.main_menu.attach(self.labels["keypad"], 1, 0, 1, 1)
self.main_menu.show_all()
def update_graph(self):
self.labels['da'].queue_draw()

44
panels/menu.py
View File

@@ -11,45 +11,44 @@ from jinja2 import Environment, Template
from ks_includes.screen_panel import ScreenPanel
def create_panel(*args):
return MenuPanel(*args)
def create_panel(*args, **kwargs):
return MenuPanel(*args, **kwargs)
class MenuPanel(ScreenPanel):
i = 0
j2_data = None
def __init__(self, screen, title):
def __init__(self, screen, title, items=None):
super().__init__(screen, title)
self.items = []
self.grid = self._gtk.HomogeneousGrid()
def initialize(self, items):
for item in items:
key = next(iter(item))
if self.evaluate_enable(item[key]['enable']):
self.items.append(item)
else:
logging.debug(f"X > {key}")
self.items = items
self.create_menu_items()
scroll = self._gtk.ScrolledWindow()
scroll.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
scroll.add(self.grid)
self.content.add(scroll)
self.grid = self._gtk.HomogeneousGrid()
self.scroll = self._gtk.ScrolledWindow()
self.scroll.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
def activate(self):
self.add_content()
def add_content(self):
for child in self.scroll.get_children():
self.scroll.remove(child)
if self._screen.vertical_mode:
self.arrangeMenuItems(self.items, 3)
self.scroll.add(self.arrangeMenuItems(self.items, 3))
else:
self.arrangeMenuItems(self.items, 4)
self.scroll.add(self.arrangeMenuItems(self.items, 4))
if not self.content.get_children():
self.content.add(self.scroll)
def arrangeMenuItems(self, items, columns, expand_last=False):
for child in self.grid.get_children():
self.grid.remove(child)
length = len(items)
for i, item in enumerate(items):
i = 0
for item in items:
key = list(item)[0]
if not self.evaluate_enable(item[key]['enable']):
logging.debug(f"X > {key}")
continue
if columns == 4:
if length <= 4:
@@ -67,6 +66,7 @@ class MenuPanel(ScreenPanel):
width = 2
self.grid.attach(self.labels[key], col, row, width, height)
i += 1
self.j2_data = None
return self.grid