diff --git a/ks_includes/screen_panel.py b/ks_includes/screen_panel.py index 7d53ee70..cf71250e 100644 --- a/ks_includes/screen_panel.py +++ b/ks_includes/screen_panel.py @@ -9,7 +9,7 @@ from ks_includes.KlippyGcodes import KlippyGcodes class ScreenPanel: - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): + def __init__(self, screen, title, back=True): self.menu = None self._screen = screen self._config = screen._config diff --git a/panels/base_panel.py b/panels/base_panel.py index cec73016..4cdcd7aa 100644 --- a/panels/base_panel.py +++ b/panels/base_panel.py @@ -12,8 +12,8 @@ from ks_includes.screen_panel import ScreenPanel class BasePanel(ScreenPanel): - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.current_panel = None self.time_min = -1 self.time_format = self._config.get_main_config().getboolean("24htime", True) diff --git a/panels/bed_level.py b/panels/bed_level.py index 7628935b..2881a57c 100644 --- a/panels/bed_level.py +++ b/panels/bed_level.py @@ -16,8 +16,8 @@ def create_panel(*args): class BedLevelPanel(ScreenPanel): supported = (4, 6, 8) - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.response_count = 0 self.panel_name = "" self.screw_dict = {} diff --git a/panels/bed_mesh.py b/panels/bed_mesh.py index c0054a6d..f443eeff 100644 --- a/panels/bed_mesh.py +++ b/panels/bed_mesh.py @@ -23,8 +23,8 @@ def create_panel(*args): class BedMeshPanel(ScreenPanel): - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.profiles = {} self.show_create = False self.active_mesh = None diff --git a/panels/console.py b/panels/console.py index 81a6aacc..b0f37083 100644 --- a/panels/console.py +++ b/panels/console.py @@ -23,8 +23,8 @@ COLORS = { class ConsolePanel(ScreenPanel): - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.autoscroll = True self.hidetemps = True diff --git a/panels/extrude.py b/panels/extrude.py index 5e3aac98..c6019d0e 100644 --- a/panels/extrude.py +++ b/panels/extrude.py @@ -14,8 +14,8 @@ def create_panel(*args): class ExtrudePanel(ScreenPanel): - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.current_extruder = self._printer.get_stat("toolhead", "extruder") self.speeds = ['1', '2', '5', '25'] self.speed = 1 diff --git a/panels/gcode_macros.py b/panels/gcode_macros.py index 2883a487..f2940609 100644 --- a/panels/gcode_macros.py +++ b/panels/gcode_macros.py @@ -12,8 +12,8 @@ def create_panel(*args): class MacroPanel(ScreenPanel): - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.sort_reverse = False self.sort_lbl = _("Name") self.sort_btn = self._gtk.ButtonImage("arrow-up", self.sort_lbl, "color1", .66, Gtk.PositionType.RIGHT, False) diff --git a/panels/input_shaper.py b/panels/input_shaper.py index 1955cb11..b5f3f2f9 100644 --- a/panels/input_shaper.py +++ b/panels/input_shaper.py @@ -21,8 +21,8 @@ SHAPERS = ['zv', 'mzv', 'zvd', 'ei', '2hump_ei', '3hump_ei'] class InputShaperPanel(ScreenPanel): - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.freq_xy_adj = {} self.freq_xy_combo = {} self.calibrate_btn = self._gtk.ButtonImage("move", _('Finding ADXL'), "color1", word_wrap=False) diff --git a/panels/limits.py b/panels/limits.py index 3ae52620..d98a2196 100644 --- a/panels/limits.py +++ b/panels/limits.py @@ -13,8 +13,8 @@ def create_panel(*args): class LimitsPanel(ScreenPanel): - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.limits = {} self.grid = Gtk.Grid() self.options = None diff --git a/panels/move.py b/panels/move.py index 78eabe81..5871c767 100644 --- a/panels/move.py +++ b/panels/move.py @@ -20,8 +20,8 @@ class MovePanel(ScreenPanel): distance = 1 distances = ['.1', '.5', '1', '5', '10', '25', '50'] - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.settings = {} self.menu = ['move_menu'] diff --git a/panels/network.py b/panels/network.py index bc0df12c..7e9173e5 100644 --- a/panels/network.py +++ b/panels/network.py @@ -16,8 +16,8 @@ def create_panel(*args): class NetworkPanel(ScreenPanel): initialized = False - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.show_add = False self.networks = {} self.interface = None diff --git a/panels/print.py b/panels/print.py index 94a5b6df..5f2b4bfa 100644 --- a/panels/print.py +++ b/panels/print.py @@ -19,8 +19,8 @@ class PrintPanel(ScreenPanel): dir_panels = {} filelist = {'gcodes': {'directories': [], 'files': []}} - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) sortdir = self._config.get_main_config().get("print_sort_dir", "name_asc") sortdir = sortdir.split('_') if sortdir[0] not in ["name", "date"] or sortdir[1] not in ["asc", "desc"]: diff --git a/panels/printer_select.py b/panels/printer_select.py index 0da426d5..6ce45878 100644 --- a/panels/printer_select.py +++ b/panels/printer_select.py @@ -13,8 +13,8 @@ def create_panel(*args): class PrinterSelect(ScreenPanel): - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, False, False, False) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, False) def initialize(self, panel_name): diff --git a/panels/retraction.py b/panels/retraction.py index c9fa8431..94cb8bf2 100644 --- a/panels/retraction.py +++ b/panels/retraction.py @@ -14,8 +14,8 @@ def create_panel(*args): class FWRetractionPanel(ScreenPanel): - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.options = None self.grid = Gtk.Grid() self.values = {} diff --git a/panels/settings.py b/panels/settings.py index b27de0c1..10638b35 100644 --- a/panels/settings.py +++ b/panels/settings.py @@ -12,8 +12,8 @@ def create_panel(*args): class SettingsPanel(ScreenPanel): - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.printers = self.settings = {} self.menu = ['settings_menu'] diff --git a/panels/system.py b/panels/system.py index b17c27a7..3a6f5999 100644 --- a/panels/system.py +++ b/panels/system.py @@ -16,8 +16,8 @@ ALLOWED_SERVICES = ["KlipperScreen", "MoonCord", "klipper", "moonraker", "webcam class SystemPanel(ScreenPanel): - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.update_status = None self.update_dialog = None self.update_prog = None diff --git a/panels/temperature.py b/panels/temperature.py index 8e6b0d1b..88a3e14b 100644 --- a/panels/temperature.py +++ b/panels/temperature.py @@ -17,8 +17,8 @@ class TemperaturePanel(ScreenPanel): graph_update = None active_heater = None - def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): - super().__init__(screen, title, back, action_bar, printer_name) + def __init__(self, screen, title, back=True): + super().__init__(screen, title, back) self.popover_device = None self.h = 1 self.tempdeltas = ["1", "5", "10", "25"]