diff --git a/panels/gcode_macros.py b/panels/gcode_macros.py index 11960f3b..1b7227a7 100644 --- a/panels/gcode_macros.py +++ b/panels/gcode_macros.py @@ -24,8 +24,6 @@ class MacroPanel(ScreenPanel): self.loaded_macros = [] self.macros = {} self.menu = ['macros_menu'] - sort = Gtk.Label(_("Sort:")) - sort.set_hexpand(False) adjust = self._gtk.Button("settings", None, "color2", self.bts, Gtk.PositionType.LEFT, 1) adjust.connect("clicked", self.load_menu, 'options', _("Settings")) @@ -33,7 +31,6 @@ class MacroPanel(ScreenPanel): sbox = Gtk.Box() sbox.set_vexpand(False) - sbox.pack_start(sort, False, False, 5) sbox.pack_start(self.sort_btn, True, True, 5) sbox.pack_start(adjust, True, True, 5) diff --git a/panels/print.py b/panels/print.py index 7dee07ec..d416a539 100644 --- a/panels/print.py +++ b/panels/print.py @@ -37,18 +37,16 @@ class PrintPanel(ScreenPanel): self.directories = {} self.labels['directories'] = {} self.labels['files'] = {} - sort = Gtk.Label(_("Sort:")) sbox = Gtk.Box(spacing=0) sbox.set_vexpand(False) - sbox.pack_start(sort, False, False, 5) for i, (name, val) in enumerate(self.sort_items.items(), start=1): s = self._gtk.Button(None, val, f"color{i % 4}", .5, Gtk.PositionType.RIGHT, 1) if name == self.sort_current[0]: - s.set_image(self._gtk.Image(self.sort_icon[self.sort_current[1]], self._gtk.img_scale * .5)) + s.set_image(self._gtk.Image(self.sort_icon[self.sort_current[1]], self._gtk.img_scale * self.bts)) s.connect("clicked", self.change_sort, name) self.labels[f'sort_{name}'] = s sbox.add(s) - refresh = self._gtk.Button("refresh", scale=.66) + refresh = self._gtk.Button("refresh", style="color4", scale=self.bts) refresh.connect('clicked', self._refresh_files) sbox.add(refresh) sbox.set_hexpand(True) @@ -287,7 +285,7 @@ class PrintPanel(ScreenPanel): self.labels[f'sort_{oldkey}'].show_all() self.sort_current = [key, 0] self.labels[f'sort_{key}'].set_image(self._gtk.Image(self.sort_icon[self.sort_current[1]], - self._gtk.img_scale * .5)) + self._gtk.img_scale * self.bts)) self.labels[f'sort_{key}'].show() GLib.idle_add(self.reload_files)