diff --git a/panels/gcodes.py b/panels/gcodes.py index 1ce9fcf6..771251bd 100644 --- a/panels/gcodes.py +++ b/panels/gcodes.py @@ -147,16 +147,17 @@ class Panel(ScreenPanel): info.get_style_context().add_class("print-info") info.set_markup(self.get_info_str(item, path)) delete = Gtk.Button(hexpand=False, vexpand=False, can_focus=False, always_show_image=True) - delete.get_style_context().add_class("color1") - delete.set_image(self._gtk.Image("delete", self.list_button_size, self.list_button_size)) + delete.get_style_context().add_class("custom-icon-button") + delete.set_image(self._gtk.Image("delete", self.list_button_size * 2, self.list_button_size * 2)) rename = Gtk.Button(hexpand=False, vexpand=False, can_focus=False, always_show_image=True) - rename.get_style_context().add_class("color2") - rename.set_image(self._gtk.Image("files", self.list_button_size, self.list_button_size)) + rename.get_style_context().add_class("custom-icon-button") + rename.set_image(self._gtk.Image("rename", self.list_button_size * 2, self.list_button_size * 2)) itemname = Gtk.Label(hexpand=True, halign=Gtk.Align.START, ellipsize=Pango.EllipsizeMode.END) itemname.get_style_context().add_class("print-filename") itemname.set_markup(f"{basename}") icon = Gtk.Button() - row = Gtk.Grid(hexpand=True, vexpand=False, valign=Gtk.Align.CENTER) + icon.get_style_context().add_class("custom-icon-button") + row = Gtk.Grid(hexpand=True, vexpand=True, valign=Gtk.Align.CENTER) row.get_style_context().add_class("frame-item") row.attach(icon, 0, 0, 1, 2) row.attach(itemname, 1, 0, 3, 1) @@ -169,7 +170,7 @@ class Panel(ScreenPanel): delete.connect("clicked", self.confirm_delete_file, f"gcodes/{path}") rename.connect("clicked", self.show_rename, f"gcodes/{path}") action_icon = "printer" if self._printer.extrudercount > 0 else "load" - action = self._gtk.Button(action_icon, style="color3") + action = self._gtk.Button(action_icon, style="custom-icon-button") action.connect("clicked", self.confirm_print, path) action.set_hexpand(False) action.set_vexpand(False) @@ -180,7 +181,7 @@ class Panel(ScreenPanel): image_args = (None, icon, self.thumbsize / 2, True, "folder") delete.connect("clicked", self.confirm_delete_directory, path) rename.connect("clicked", self.show_rename, path) - action = self._gtk.Button("load", style="color3") + action = self._gtk.Button("load", style="custom-icon-button") action.connect("clicked", self.change_dir, path) action.set_hexpand(False) action.set_vexpand(False) @@ -191,6 +192,7 @@ class Panel(ScreenPanel): fbchild.add(row) else: # Thumbnail view icon = self._gtk.Button(label=basename) + icon.get_style_context().add_class("custom-icon-button") if 'filename' in item: icon.connect("clicked", self.confirm_print, path) image_args = (path, icon, self.thumbsize, False, "file") diff --git a/styles/dark/images/delete.svg b/styles/dark/images/delete.svg index 26a47845..539cbcf6 100644 --- a/styles/dark/images/delete.svg +++ b/styles/dark/images/delete.svg @@ -1,109 +1,11 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/styles/dark/images/file.svg b/styles/dark/images/file.svg index 6157305e..ad8f3f38 100644 --- a/styles/dark/images/file.svg +++ b/styles/dark/images/file.svg @@ -1,81 +1,30 @@ - -image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/styles/dark/images/printer.svg b/styles/dark/images/printer.svg index bb4a2b81..50f21ef9 100644 --- a/styles/dark/images/printer.svg +++ b/styles/dark/images/printer.svg @@ -1,100 +1,16 @@ - - - - - - - image/svg+xml - - extruder1 - - - - - - extruder1 - - Created with Sketch. - - - - - - - + + + + + + + + + + + + + + + diff --git a/styles/dark/images/rename.svg b/styles/dark/images/rename.svg new file mode 100644 index 00000000..42eaae56 --- /dev/null +++ b/styles/dark/images/rename.svg @@ -0,0 +1,11 @@ + + + + + + + + + + +