refactors and cleanup

ks_includes/KlippyGtk.py

@@ -225,9 +225,9 @@ class KlippyGtk:
         dialog.show_all()
         # Change cursor to blank
         if self.cursor:
-            dialog.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.ARROW))
+            dialog.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.ARROW))
         else:
-            dialog.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.BLANK_CURSOR))
+            dialog.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.BLANK_CURSOR))
 
         self.screen.dialogs.append(dialog)
         return dialog

ks_includes/config.py

@@ -391,9 +391,7 @@ class KlipperScreenConfig:
 
     def get_menu_name(self, menu="__main", subsection=""):
         name = f"menu {menu} {subsection}" if subsection != "" else f"menu {menu}"
-        if name not in self.config:
+        return False if name not in self.config else self.config[name].get('name')
-            return False
-        return self.config[name].get('name')
 
     def get_preheat_options(self):
         index = "preheat "
@@ -410,9 +408,7 @@ class KlipperScreenConfig:
         if not name.startswith("printer "):
             name = f"printer {name}"
 
-        if name not in self.config:
+        return None if name not in self.config else self.config[name]
-            return None
-        return self.config[name]
 
     def get_printer_power_name(self):
         return self.config['settings'].get("printer_power_name", "printer")

ks_includes/files.py

@@ -135,10 +135,8 @@ class KlippyFiles:
         return filename in self.filelist
 
     def file_metadata_exists(self, filename):
-        if not self.file_exists(filename):
+        if self.file_exists(filename):
-            return False
+            return "slicer" in self.files[filename]
-        if "slicer" in self.files[filename]:
-            return True
         return False
 
     def get_thumbnail_location(self, filename, small=False):

panels/job_status.py

@@ -849,14 +849,11 @@ class JobStatusPanel(ScreenPanel):
 
     def animate_label(self):
         pos = self.filename_label['position']
-        current = self.filename_label['current']
-        complete = self.filename_label['complete']
-
         if pos > (self.filename_label['length'] - self.filename_label['limit']):
             self.filename_label['position'] = 0
-            self.labels['file'].set_label(complete)
+            self.labels['file'].set_label(self.filename_label['complete'])
         else:
-            self.labels['file'].set_label(current[pos:self.filename_label['length']])
+            self.labels['file'].set_label(self.filename_label['current'][pos:self.filename_label['length']])
             self.filename_label['position'] += 1
         return True
 

panels/menu.py

@@ -109,9 +109,7 @@ class MenuPanel(ScreenPanel):
             logging.debug(f"Template: '{enable}'")
             j2_temp = Template(enable, autoescape=True)
             result = j2_temp.render(self.j2_data)
-            if result == 'True':
+            return result == 'True'
-                return True
-            return False
         except Exception as e:
             logging.debug(f"Error evaluating enable statement: {enable}\n{e}")
             return False

panels/move.py

@@ -199,15 +199,13 @@ class MovePanel(ScreenPanel):
         self.distance = distance
 
     def move(self, widget, axis, direction):
-        speed = None
         if self._config.get_config()['main'].getboolean(f"invert_{axis.lower()}", False):
             direction = "-" if direction == "+" else "+"
 
         dist = f"{direction}{self.distance}"
         config_key = "move_speed_z" if axis == AXIS_Z else "move_speed_xy"
         printer_cfg = self._config.get_printer_config(self._screen.connected_printer)
-        if printer_cfg is not None:
+        speed = None if printer_cfg is None else printer_cfg.getint(config_key, None)
-            speed = printer_cfg.getint(config_key, None)
         if speed is None:
             speed = self._config.get_config()['main'].getint(config_key, 20)
 

panels/print.py

@@ -126,7 +126,7 @@ class PrintPanel(ScreenPanel):
                 if curdir != "gcodes" and fileinfo['modified'] > self.filelist[curdir]['modified']:
                     self.filelist[curdir]['modified'] = fileinfo['modified']
                     self.labels['directories'][curdir]['info'].set_markup(
-                        f'<small>' + _("Modified")
+                        '<small>' + _("Modified")
                         + f' <b>{datetime.fromtimestamp(fileinfo["modified"]):%Y-%m-%d %H:%M}</b></small>'
                     )
 

panels/settings.py

@@ -102,12 +102,10 @@ class SettingsPanel(ScreenPanel):
             dev.add(box)
         elif option['type'] == "dropdown":
             dropdown = Gtk.ComboBoxText()
-            i = 0
+            for i, opt in enumerate(option['options']):
-            for opt in option['options']:
                 dropdown.append(opt['value'], opt['name'])
                 if opt['value'] == self._config.get_config()[option['section']].get(opt_name, option['value']):
                     dropdown.set_active(i)
-                i += 1
             dropdown.connect("changed", self.on_dropdown_change, option['section'], opt_name,
                              option['callback'] if "callback" in option else None)
             dropdown.set_entry_text_column(0)