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

screenpanel remove unnecesary getters

Browse Source
This commit is contained in:
alfrix 2022-11-22 00:12:11 -03:00
parent b415eca1c8
commit ef5f86a67d
3 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ks_includes/screen_panel.py
View File

@ -41,12 +41,6 @@ class ScreenPanel:
else: else:
self._screen._ws.klippy.emergency_stop() self._screen._ws.klippy.emergency_stop()
def get(self):
return self.layout
def get_content(self):
return self.content
def get_file_image(self, filename, width=None, height=None, small=False): def get_file_image(self, filename, width=None, height=None, small=False):
if not self._files.has_thumbnail(filename): if not self._files.has_thumbnail(filename):
return None return None
@ -61,15 +55,9 @@ class ScreenPanel:
return self._gtk.PixbufFromHttp(loc[1], width, height) return self._gtk.PixbufFromHttp(loc[1], width, height)
return None return None
def get_title(self):
return self.title
def menu_item_clicked(self, widget, panel, item): def menu_item_clicked(self, widget, panel, item):
self._screen.show_panel(panel, item['panel'], item['name'], 1, False) self._screen.show_panel(panel, item['panel'], item['name'], 1, False)
def set_title(self, title):
self.title = title
def show_all(self): def show_all(self):
self._screen.show_all() self._screen.show_all()

4
panels/base_panel.py
View File

@ -200,8 +200,8 @@ class BasePanel(ScreenPanel):
def add_content(self, panel): def add_content(self, panel):
self.current_panel = panel self.current_panel = panel
self.set_title(panel.get_title()) self.set_title(panel.title)
self.content.add(panel.get_content()) self.content.add(panel.content)
def back(self, widget=None): def back(self, widget=None):
if self.current_panel is None: if self.current_panel is None:

20
screen.py
View File

@ -119,7 +119,7 @@ class KlipperScreen(Gtk.Window):
self.set_icon_from_file(os.path.join(klipperscreendir, "styles", "icon.svg")) self.set_icon_from_file(os.path.join(klipperscreendir, "styles", "icon.svg"))
self.base_panel = BasePanel(self, title="Base Panel") self.base_panel = BasePanel(self, title="Base Panel")
self.add(self.base_panel.get()) self.add(self.base_panel.layout)
self.show_all() self.show_all()
if show_cursor: if show_cursor:
self.get_window().set_cursor( self.get_window().set_cursor(
@ -318,7 +318,7 @@ class KlipperScreen(Gtk.Window):
box.add(msg) box.add(msg)
box.add(close) box.add(close)
self.base_panel.get().put(box, 0, 0) self.base_panel.layout.put(box, 0, 0)
self.show_all() self.show_all()
self.popup_message = box self.popup_message = box
@ -332,7 +332,7 @@ class KlipperScreen(Gtk.Window):
if self.popup_message is None: if self.popup_message is None:
return return
self.base_panel.get().remove(self.popup_message) self.base_panel.layout.remove(self.popup_message)
self.popup_message = None self.popup_message = None
def show_error_modal(self, err, e=""): def show_error_modal(self, err, e=""):
@ -489,7 +489,7 @@ class KlipperScreen(Gtk.Window):
if len(self._cur_panels) <= 0: if len(self._cur_panels) <= 0:
self.reload_panels() self.reload_panels()
return return
self.base_panel.remove(self.panels[self._cur_panels[-1]].get_content()) self.base_panel.remove(self.panels[self._cur_panels[-1]].content)
if hasattr(self.panels[self._cur_panels[-1]], "deactivate"): if hasattr(self.panels[self._cur_panels[-1]], "deactivate"):
self.panels[self._cur_panels[-1]].deactivate() self.panels[self._cur_panels[-1]].deactivate()
if self._cur_panels[-1] in self.subscriptions: if self._cur_panels[-1] in self.subscriptions:
@ -544,7 +544,7 @@ class KlipperScreen(Gtk.Window):
box.pack_start(close, True, True, 0) box.pack_start(close, True, True, 0)
box.set_halign(Gtk.Align.CENTER) box.set_halign(Gtk.Align.CENTER)
box.get_style_context().add_class("screensaver") box.get_style_context().add_class("screensaver")
self.base_panel.get().put(box, 0, 0) self.base_panel.layout.put(box, 0, 0)
# Avoid leaving a cursor-handle # Avoid leaving a cursor-handle
close.grab_focus() close.grab_focus()
@ -556,7 +556,7 @@ class KlipperScreen(Gtk.Window):
if self.screensaver is None: if self.screensaver is None:
return False return False
logging.debug("Closing Screensaver") logging.debug("Closing Screensaver")
self.base_panel.get().remove(self.screensaver) self.base_panel.layout.remove(self.screensaver)
self.screensaver = None self.screensaver = None
if self.use_dpms: if self.use_dpms:
self.wake_screen() self.wake_screen()
@ -926,7 +926,7 @@ class KlipperScreen(Gtk.Window):
keyboard = Gtk.Socket() keyboard = Gtk.Socket()
box.get_style_context().add_class("keyboard_matchbox") box.get_style_context().add_class("keyboard_matchbox")
box.pack_start(keyboard, True, True, 0) box.pack_start(keyboard, True, True, 0)
self.base_panel.get_content().pack_end(box, False, False, 0) self.base_panel.content.pack_end(box, False, False, 0)
self.show_all() self.show_all()
keyboard.add_id(xid) keyboard.add_id(xid)
@ -946,8 +946,8 @@ class KlipperScreen(Gtk.Window):
"entry": entry, "entry": entry,
"box": box "box": box
} }
self.base_panel.get_content().pack_end(box, False, False, 0) self.base_panel.content.pack_end(box, False, False, 0)
self.base_panel.get_content().show_all() self.base_panel.content.show_all()
def remove_keyboard(self, widget=None, event=None): def remove_keyboard(self, widget=None, event=None):
if self.keyboard is None: if self.keyboard is None:
@ -955,7 +955,7 @@ class KlipperScreen(Gtk.Window):
if 'process' in self.keyboard: if 'process' in self.keyboard:
os.kill(self.keyboard['process'].pid, SIGTERM) os.kill(self.keyboard['process'].pid, SIGTERM)
self.base_panel.get_content().remove(self.keyboard['box']) self.base_panel.content.remove(self.keyboard['box'])
self.keyboard = None self.keyboard = None
def _key_press_event(self, widget, event): def _key_press_event(self, widget, event):