minor refactors
This commit is contained in:
parent
bd18924f1d
commit
f3c0daef1b
@ -17,7 +17,7 @@ class Prompt:
|
|||||||
|
|
||||||
def _key_press_event(self, widget, event):
|
def _key_press_event(self, widget, event):
|
||||||
keyval_name = Gdk.keyval_name(event.keyval)
|
keyval_name = Gdk.keyval_name(event.keyval)
|
||||||
if keyval_name == "Escape" or keyval_name == "BackSpace":
|
if keyval_name in ["Escape", "BackSpace"]:
|
||||||
self.close()
|
self.close()
|
||||||
|
|
||||||
def decode(self, data):
|
def decode(self, data):
|
||||||
|
@ -73,11 +73,14 @@ class Panel(ScreenPanel):
|
|||||||
|
|
||||||
def add_directory(self, directory):
|
def add_directory(self, directory):
|
||||||
parent_dir = os.path.dirname(directory)
|
parent_dir = os.path.dirname(directory)
|
||||||
modified = 0
|
modified = next(
|
||||||
for x in self._files.directories:
|
(
|
||||||
if x['dirname'] == os.path.split(directory)[-1]:
|
x['modified']
|
||||||
modified = x['modified']
|
for x in self._files.directories
|
||||||
break
|
if x['dirname'] == os.path.split(directory)[-1]
|
||||||
|
),
|
||||||
|
0,
|
||||||
|
)
|
||||||
if directory not in self.filelist:
|
if directory not in self.filelist:
|
||||||
self.filelist[directory] = {'directories': [], 'files': [], 'modified': modified}
|
self.filelist[directory] = {'directories': [], 'files': [], 'modified': modified}
|
||||||
self.filelist[parent_dir]['directories'].append(directory)
|
self.filelist[parent_dir]['directories'].append(directory)
|
||||||
|
14
screen.py
14
screen.py
@ -215,13 +215,15 @@ class KlipperScreen(Gtk.Window):
|
|||||||
self.connecting = True
|
self.connecting = True
|
||||||
self.initialized = False
|
self.initialized = False
|
||||||
|
|
||||||
ind = 0
|
|
||||||
logging.info(f"Connecting to printer: {name}")
|
logging.info(f"Connecting to printer: {name}")
|
||||||
for printer in self.printers:
|
ind = next(
|
||||||
if name == list(printer)[0]:
|
(
|
||||||
ind = self.printers.index(printer)
|
self.printers.index(printer)
|
||||||
break
|
for printer in self.printers
|
||||||
|
if name == list(printer)[0]
|
||||||
|
),
|
||||||
|
0,
|
||||||
|
)
|
||||||
self.printer = self.printers[ind]["data"]
|
self.printer = self.printers[ind]["data"]
|
||||||
self.apiclient = KlippyRest(
|
self.apiclient = KlippyRest(
|
||||||
self.printers[ind][name]["moonraker_host"],
|
self.printers[ind][name]["moonraker_host"],
|
||||||
|
Loading…
x
Reference in New Issue
Block a user