CreatBot/CreatBotKlipperScreen
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gtk: adjust icon sizes so they are more consistent across font sizes

Browse Source
This commit is contained in:
alfrix
2022-11-22 16:18:06 -03:00
parent 33fd5f9576
commit 00bd6ac4db
7 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
panels/job_status.py
View File

@@ -48,7 +48,6 @@ class JobStatusPanel(ScreenPanel):
self.progress = self.zoffset = self.flowrate = self.vel = 0
self.main_status_displayed = True
self.velstore = self.flowstore = []
self.bt_scale = 1 if self._gtk.font_size_type == "extralarge" else .6
data = ['pos_x', 'pos_y', 'pos_z', 'time_left', 'duration', 'slicer_time', 'file_time',
'filament_time', 'est_time', 'speed_factor', 'req_speed', 'max_accel', 'extrude_factor', 'zoffset',
@@ -152,7 +151,7 @@ class JobStatusPanel(ScreenPanel):
if self._screen.printer.get_tools():
for i, extruder in enumerate(self._printer.get_tools()):
self.labels[extruder] = Gtk.Label("-")
self.extruder_button[extruder] = self._gtk.Button(f"extruder-{i}", None, None, self.bt_scale,
self.extruder_button[extruder] = self._gtk.Button(f"extruder-{i}", "", None, self.bts,
Gtk.PositionType.LEFT)
self.extruder_button[extruder].set_label(self.labels[extruder].get_text())
self.extruder_button[extruder].connect("clicked", self.menu_item_clicked, "temperature",
@@ -165,7 +164,7 @@ class JobStatusPanel(ScreenPanel):
self.current_extruder = None
self.heater_button = {}
if self._printer.has_heated_bed():
self.heater_button['heater_bed'] = self._gtk.Button("bed", None, None, self.bt_scale, Gtk.PositionType.LEFT)
self.heater_button['heater_bed'] = self._gtk.Button("bed", "", None, self.bts, Gtk.PositionType.LEFT)
self.labels['heater_bed'] = Gtk.Label("-")
self.heater_button['heater_bed'].set_label(self.labels['heater_bed'].get_text())
self.heater_button['heater_bed'].connect("clicked", self.menu_item_clicked, "temperature",
@@ -177,8 +176,7 @@ class JobStatusPanel(ScreenPanel):
if n >= nlimit:
break
if device.startswith("heater_generic"):
self.heater_button[device] = self._gtk.Button("heater", None, None, self.bt_scale,
Gtk.PositionType.LEFT, 1)
self.heater_button[device] = self._gtk.Button("heater", "", None, self.bts, Gtk.PositionType.LEFT, 1)
self.labels[device] = Gtk.Label("-")
self.heater_button[device].set_label(self.labels[device].get_text())
self.heater_button[device].connect("clicked", self.menu_item_clicked, "temperature",
@@ -202,7 +200,7 @@ class JobStatusPanel(ScreenPanel):
nlimit += 1
if n >= nlimit:
break
self.heater_button[device] = self._gtk.Button("heat-up", None, None, self.bt_scale,
self.heater_button[device] = self._gtk.Button("heat-up", "", None, self.bts,
Gtk.PositionType.LEFT, 1)
self.labels[device] = Gtk.Label("-")
self.heater_button[device].set_label(self.labels[device].get_text())
@@ -213,33 +211,33 @@ class JobStatusPanel(ScreenPanel):
n += 1
break
self.z_button = self._gtk.Button("home-z", None, None, self.bt_scale, Gtk.PositionType.LEFT, 1)
self.z_button = self._gtk.Button("home-z", "", None, self.bts, Gtk.PositionType.LEFT, 1)
self.z_button.set_label(self.labels['pos_z'].get_text())
self.z_button.connect("clicked", self.create_move_grid)
self.z_button.set_halign(Gtk.Align.START)
self.speed_button = self._gtk.Button("speed+", None, None, self.bt_scale, Gtk.PositionType.LEFT, 1)
self.speed_button = self._gtk.Button("speed+", "", None, self.bts, Gtk.PositionType.LEFT, 1)
self.speed_button.set_label(self.labels['speed_factor'].get_text())
self.speed_button.connect("clicked", self.create_move_grid)
self.speed_button.set_halign(Gtk.Align.START)
self.extrusion_button = self._gtk.Button("extrude", None, None, self.bt_scale, Gtk.PositionType.LEFT, 1)
self.extrusion_button = self._gtk.Button("extrude", "", None, self.bts, Gtk.PositionType.LEFT, 1)
self.extrusion_button.set_label(self.labels['extrude_factor'].get_text())
self.extrusion_button.connect("clicked", self.create_extrusion_grid)
self.extrusion_button.set_halign(Gtk.Align.START)
self.fan_button = self._gtk.Button("fan", None, None, self.bt_scale, Gtk.PositionType.LEFT, 1)
self.fan_button = self._gtk.Button("fan", "", None, self.bts, Gtk.PositionType.LEFT, 1)
self.fan_button.set_label(self.labels['fan'].get_text())
self.fan_button.connect("clicked", self.menu_item_clicked, "fan", {"panel": "fan", "name": _("Fan")})
self.fan_button.set_halign(Gtk.Align.START)
elapsed_label = self.labels['elapsed'].get_text() + " " + self.labels['duration'].get_text()
self.elapsed_button = self._gtk.Button("clock", elapsed_label, None, self.bt_scale, Gtk.PositionType.LEFT, 1)
self.elapsed_button = self._gtk.Button("clock", elapsed_label, None, self.bts, Gtk.PositionType.LEFT, 1)
self.elapsed_button.connect("clicked", self.create_time_grid)
self.elapsed_button.set_halign(Gtk.Align.START)
remaining_label = self.labels['left'].get_text() + " " + self.labels['time_left'].get_text()
self.left_button = self._gtk.Button("hourglass", remaining_label, None, self.bt_scale, Gtk.PositionType.LEFT, 1)
self.left_button = self._gtk.Button("hourglass", remaining_label, None, self.bts, Gtk.PositionType.LEFT, 1)
self.left_button.connect("clicked", self.create_time_grid)
self.left_button.set_halign(Gtk.Align.START)
@@ -261,7 +259,7 @@ class JobStatusPanel(ScreenPanel):
def create_extrusion_grid(self, widget=None):
self.main_status_displayed = False
goback = self._gtk.Button("back", None, "color1", self.bt_scale, Gtk.PositionType.TOP, False)
goback = self._gtk.Button("back", None, "color1", self.bts, Gtk.PositionType.TOP, False)
goback.connect("clicked", self.create_status_grid)
goback.set_hexpand(False)
goback.get_style_context().add_class("printing-info")
@@ -286,7 +284,7 @@ class JobStatusPanel(ScreenPanel):
def create_move_grid(self, widget=None):
self.main_status_displayed = False
goback = self._gtk.Button("back", None, "color2", self.bt_scale, Gtk.PositionType.TOP, False)
goback = self._gtk.Button("back", None, "color2", self.bts, Gtk.PositionType.TOP, False)
goback.connect("clicked", self.create_status_grid)
goback.set_hexpand(False)
goback.get_style_context().add_class("printing-info")
@@ -317,7 +315,7 @@ class JobStatusPanel(ScreenPanel):
def create_time_grid(self, widget=None):
self.main_status_displayed = False
goback = self._gtk.Button("back", None, "color3", self.bt_scale, Gtk.PositionType.TOP, False)
goback = self._gtk.Button("back", None, "color3", self.bts, Gtk.PositionType.TOP, False)
goback.connect("clicked", self.create_status_grid)
goback.set_hexpand(False)