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

gtk: merge buttonimage and button

Browse Source
This commit is contained in:
alfrix
2022-11-22 14:22:59 -03:00
parent 34fde780fc
commit 593d8c678b
28 changed files with 143 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ks_includes/KlippyGtk.py
View File

@@ -140,19 +140,7 @@ class KlippyGtk:
stream.close_async(2)
return pixbuf
def Button(self, label=None, style=None):
b = Gtk.Button(label=label)
b.set_hexpand(True)
b.set_vexpand(True)
b.set_can_focus(False)
b.props.relief = Gtk.ReliefStyle.NONE
if style is not None:
b.get_style_context().add_class(style)
b.connect("clicked", self.screen.reset_screensaver_timeout)
return b
def ButtonImage(self, image_name=None, label=None, style=None, scale=1.38, position=Gtk.PositionType.TOP, lines=2):
def Button(self, image_name=None, label=None, style=None, scale=1.38, position=Gtk.PositionType.TOP, lines=2):
if self.font_size_type == "max" and label is not None and scale == 1.38:
image_name = None
b = Gtk.Button()

8
ks_includes/widgets/keyboard.py
View File

@@ -72,13 +72,13 @@ class Keyboard(Gtk.Box):
for r, row in enumerate(pallet):
for k, key in enumerate(row):
if key == "⌫":
self.buttons[p][r][k] = screen.gtk.ButtonImage("backspace", scale=.6)
self.buttons[p][r][k] = screen.gtk.Button("backspace", scale=.6)
elif key == "✕":
self.buttons[p][r][k] = screen.gtk.ButtonImage("cancel", scale=.6)
self.buttons[p][r][k] = screen.gtk.Button("cancel", scale=.6)
elif key == "✔":
self.buttons[p][r][k] = screen.gtk.ButtonImage("complete", scale=.6)
self.buttons[p][r][k] = screen.gtk.Button("complete", scale=.6)
else:
self.buttons[p][r][k] = screen.gtk.Button(key)
self.buttons[p][r][k] = screen.gtk.Button(label=key, lines=1)
self.buttons[p][r][k].set_hexpand(True)
self.buttons[p][r][k].set_vexpand(True)
self.buttons[p][r][k].connect('button-press-event', self.repeat, key)

8
ks_includes/widgets/keypad.py
View File

@@ -34,11 +34,11 @@ class Keypad(Gtk.Box):
for i in range(len(keys)):
k_id = f'button_{str(keys[i][0])}'
if keys[i][0] == "B":
self.labels[k_id] = self._gtk.ButtonImage("backspace", scale=1)
self.labels[k_id] = self._gtk.Button("backspace", scale=1)
elif keys[i][0] == "E":
self.labels[k_id] = self._gtk.ButtonImage("complete", scale=1)
self.labels[k_id] = self._gtk.Button("complete", scale=1)
else:
self.labels[k_id] = Gtk.Button(keys[i][0])
self.labels[k_id] = Gtk.Button(label=keys[i][0])
self.labels[k_id].connect('clicked', self.update_entry, keys[i][0])
self.labels[k_id].get_style_context().add_class(keys[i][1])
numpad.attach(self.labels[k_id], i % 3, i / 3, 1, 1)
@@ -48,7 +48,7 @@ class Keypad(Gtk.Box):
self.labels['entry'].props.xalign = 0.5
self.labels['entry'].connect("activate", self.update_entry, "E")
b = self._gtk.ButtonImage('cancel', _('Close'), None, .66, Gtk.PositionType.LEFT, 1)
b = self._gtk.Button('cancel', _('Close'), None, .66, Gtk.PositionType.LEFT, 1)
b.connect("clicked", close_function)
self.add(self.labels['entry'])

10
panels/base_panel.py
View File

@@ -29,22 +29,22 @@ class BasePanel(ScreenPanel):
self.current_extruder = None
# Action bar buttons
scale = 1.5 if self._gtk.font_size_type == "extralarge" else 1
self.control['back'] = self._gtk.ButtonImage('back', scale=scale)
self.control['back'] = self._gtk.Button('back', scale=scale)
self.control['back'].connect("clicked", self.back)
self.control['home'] = self._gtk.ButtonImage('main', scale=scale)
self.control['home'] = self._gtk.Button('main', scale=scale)
self.control['home'].connect("clicked", self._screen._menu_go_home)
if len(self._config.get_printers()) > 1:
self.control['printer_select'] = self._gtk.ButtonImage('shuffle', scale=scale)
self.control['printer_select'] = self._gtk.Button('shuffle', scale=scale)
self.control['printer_select'].connect("clicked", self._screen.show_printer_select)
self.control['macros_shortcut'] = self._gtk.ButtonImage('custom-script', scale=scale)
self.control['macros_shortcut'] = self._gtk.Button('custom-script', scale=scale)
self.control['macros_shortcut'].connect("clicked", self.menu_item_clicked, "gcode_macros", {
"name": "Macros",
"panel": "gcode_macros"
})
self.control['estop'] = self._gtk.ButtonImage('emergency', scale=scale)
self.control['estop'] = self._gtk.Button('emergency', scale=scale)
self.control['estop'].connect("clicked", self.emergency_stop)
# Any action bar button should close the keyboard

20
panels/bed_level.py
View File

@@ -25,7 +25,7 @@ class BedLevelPanel(ScreenPanel):
self.x_cnt = 0
self.x_offset = 0
self.y_offset = 0
self.labels['dm'] = self._gtk.ButtonImage("motor-off", _("Disable XY"), "color3")
self.labels['dm'] = self._gtk.Button("motor-off", _("Disable XY"), "color3")
self.labels['dm'].connect("clicked", self.disable_motors)
screw_positions = []
rotation = None
@@ -34,7 +34,7 @@ class BedLevelPanel(ScreenPanel):
grid.attach(self.labels['dm'], 0, 0, 1, 1)
if "screws_tilt_adjust" in self._screen.printer.get_config_section_list():
self.labels['screws'] = self._gtk.ButtonImage("refresh", _("Screws Adjust"), "color4")
self.labels['screws'] = self._gtk.Button("refresh", _("Screws Adjust"), "color4")
self.labels['screws'].connect("clicked", self.screws_tilt_calculate)
grid.attach(self.labels['screws'], 0, 1, 1, 1)
@@ -93,14 +93,14 @@ class BedLevelPanel(ScreenPanel):
logging.debug(f"Using {len(self.screws)}-screw locations [x,y] [{self.x_cnt}x{self.y_cnt}]")
self.labels['bl'] = self._gtk.ButtonImage("bed-level-t-l", scale=2.5)
self.labels['br'] = self._gtk.ButtonImage("bed-level-t-r", scale=2.5)
self.labels['fl'] = self._gtk.ButtonImage("bed-level-b-l", scale=2.5)
self.labels['fr'] = self._gtk.ButtonImage("bed-level-b-r", scale=2.5)
self.labels['lm'] = self._gtk.ButtonImage("bed-level-l-m", scale=2.5)
self.labels['rm'] = self._gtk.ButtonImage("bed-level-r-m", scale=2.5)
self.labels['fm'] = self._gtk.ButtonImage("bed-level-b-m", scale=2.5)
self.labels['bm'] = self._gtk.ButtonImage("bed-level-t-m", scale=2.5)
self.labels['bl'] = self._gtk.Button("bed-level-t-l", scale=2.5)
self.labels['br'] = self._gtk.Button("bed-level-t-r", scale=2.5)
self.labels['fl'] = self._gtk.Button("bed-level-b-l", scale=2.5)
self.labels['fr'] = self._gtk.Button("bed-level-b-r", scale=2.5)
self.labels['lm'] = self._gtk.Button("bed-level-l-m", scale=2.5)
self.labels['rm'] = self._gtk.Button("bed-level-r-m", scale=2.5)
self.labels['fm'] = self._gtk.Button("bed-level-b-m", scale=2.5)
self.labels['bm'] = self._gtk.Button("bed-level-t-m", scale=2.5)
valid_positions = True
if self.ks_printer_cfg is not None:

14
panels/bed_mesh.py
View File

@@ -23,13 +23,13 @@ class BedMeshPanel(ScreenPanel):
self.profiles = {}
self.show_create = False
self.active_mesh = None
addprofile = self._gtk.ButtonImage("increase", " " + _("Add profile"), "color1", .66, Gtk.PositionType.LEFT, 1)
addprofile = self._gtk.Button("increase", " " + _("Add profile"), "color1", .66, Gtk.PositionType.LEFT, 1)
addprofile.connect("clicked", self.show_create_profile)
addprofile.set_hexpand(True)
self.clear = self._gtk.ButtonImage("cancel", " " + _("Clear"), "color2", .66, Gtk.PositionType.LEFT, 1)
self.clear = self._gtk.Button("cancel", " " + _("Clear"), "color2", .66, Gtk.PositionType.LEFT, 1)
self.clear.connect("clicked", self.send_clear_mesh)
self.clear.set_hexpand(True)
calibrate = self._gtk.ButtonImage("refresh", " " + _("Calibrate"), "color3", .66, Gtk.PositionType.LEFT, 1)
calibrate = self._gtk.Button("refresh", " " + _("Calibrate"), "color3", .66, Gtk.PositionType.LEFT, 1)
calibrate.connect("clicked", self.calibrate_mesh)
calibrate.set_hexpand(True)
@@ -115,7 +115,7 @@ class BedMeshPanel(ScreenPanel):
def add_profile(self, profile):
logging.debug(f"Adding Profile: {profile}")
name = self._gtk.Button(f"<big><b>{profile}</b></big>")
name = self._gtk.Button(label=f"<big><b>{profile}</b></big>")
name.get_children()[0].set_use_markup(True)
name.get_children()[0].set_line_wrap(True)
name.get_children()[0].set_line_wrap_mode(Pango.WrapMode.WORD_CHAR)
@@ -125,8 +125,8 @@ class BedMeshPanel(ScreenPanel):
name.connect("clicked", self.update_graph, profile)
buttons = {
"save": self._gtk.ButtonImage("complete", None, "color4", .75),
"delete": self._gtk.ButtonImage("cancel", None, "color2", .75),
"save": self._gtk.Button("complete", None, "color4", .75),
"delete": self._gtk.Button("cancel", None, "color2", .75),
}
buttons["save"].connect("clicked", self.send_save_mesh, profile)
buttons["delete"].connect("clicked", self.send_remove_mesh, profile)
@@ -230,7 +230,7 @@ class BedMeshPanel(ScreenPanel):
self.labels['profile_name'].connect("focus-in-event", self._show_keyboard)
self.labels['profile_name'].grab_focus_without_selecting()
save = self._gtk.ButtonImage("complete", _("Save"), "color3")
save = self._gtk.Button("complete", _("Save"), "color3")
save.set_hexpand(False)
save.connect("clicked", self.create_profile)

4
panels/console.py
View File

@@ -46,7 +46,7 @@ class ConsolePanel(ScreenPanel):
o2_switch.set_active(self.hidetemps)
o2_switch.connect("notify::active", self.hide_temps)
o3_button = self._gtk.ButtonImage("refresh", _('Clear') + " ", None, .66, Gtk.PositionType.RIGHT, 1)
o3_button = self._gtk.Button("refresh", _('Clear') + " ", None, .66, Gtk.PositionType.RIGHT, 1)
o3_button.connect("clicked", self.clear)
options = Gtk.Box()
@@ -84,7 +84,7 @@ class ConsolePanel(ScreenPanel):
entry.connect("activate", self._send_command)
entry.grab_focus_without_selecting()
enter = self._gtk.ButtonImage("resume", " " + _('Send') + " ", None, .66, Gtk.PositionType.RIGHT, 1)
enter = self._gtk.Button("resume", " " + _('Send') + " ", None, .66, Gtk.PositionType.RIGHT, 1)
enter.set_hexpand(False)
enter.connect("clicked", self._send_command)

4
panels/exclude.py
View File

@@ -22,7 +22,7 @@ class ExcludeObjectPanel(ScreenPanel):
self.object_list.set_valign(Gtk.Align.CENTER)
self.object_list.set_halign(Gtk.Align.START)
self.buttons = {}
self.current_object = self._gtk.ButtonImage("extrude", "", scale=.66, position=Gtk.PositionType.LEFT, lines=1)
self.current_object = self._gtk.Button("extrude", "", scale=.66, position=Gtk.PositionType.LEFT, lines=1)
self.current_object.connect("clicked", self.exclude_current)
self.current_object.set_vexpand(False)
self.excluded_objects = self._printer.get_stat("exclude_object", "excluded_objects")
@@ -61,7 +61,7 @@ class ExcludeObjectPanel(ScreenPanel):
def add_object(self, name):
if name not in self.buttons and name not in self.excluded_objects:
self.buttons[name] = self._gtk.Button(name.replace("_", " "))
self.buttons[name] = self._gtk.Button(label=name.replace("_", " "))
self.buttons[name].get_children()[0].set_line_wrap_mode(Pango.WrapMode.WORD_CHAR)
self.buttons[name].get_children()[0].set_line_wrap(True)
self.buttons[name].connect("clicked", self.exclude_object, name)

17
panels/extrude.py
View File

@@ -39,17 +39,17 @@ class ExtrudePanel(ScreenPanel):
self.distance = int(self.distances[1])
self.speed = int(self.speeds[1])
self.labels['extrude'] = self._gtk.ButtonImage("extrude", _("Extrude"), "color4")
self.labels['extrude'] = self._gtk.Button("extrude", _("Extrude"), "color4")
self.labels['extrude'].connect("clicked", self.extrude, "+")
self.labels['load'] = self._gtk.ButtonImage("arrow-down", _("Load"), "color3")
self.labels['load'] = self._gtk.Button("arrow-down", _("Load"), "color3")
self.labels['load'].connect("clicked", self.load_unload, "+")
self.labels['unload'] = self._gtk.ButtonImage("arrow-up", _("Unload"), "color2")
self.labels['unload'] = self._gtk.Button("arrow-up", _("Unload"), "color2")
self.labels['unload'].connect("clicked", self.load_unload, "-")
self.labels['retract'] = self._gtk.ButtonImage("retract", _("Retract"), "color1")
self.labels['retract'] = self._gtk.Button("retract", _("Retract"), "color1")
self.labels['retract'].connect("clicked", self.extrude, "-")
self.labels['temperature'] = self._gtk.ButtonImage("heat-up", _("Temperature"), "color4")
self.labels['temperature'] = self._gtk.Button("heat-up", _("Temperature"), "color4")
self.labels['temperature'].connect("clicked", self.menu_item_clicked, "temperature", {
"name": "Temperature",
"panel": "temperature"
@@ -60,10 +60,9 @@ class ExtrudePanel(ScreenPanel):
i = 0
for extruder in self._printer.get_tools():
if self._printer.extrudercount > 1:
self.labels[extruder] = self._gtk.ButtonImage(f"extruder-{i}",
f"T{self._printer.get_tool_number(extruder)}")
self.labels[extruder] = self._gtk.Button(f"extruder-{i}", f"T{self._printer.get_tool_number(extruder)}")
else:
self.labels[extruder] = self._gtk.ButtonImage("extruder", "")
self.labels[extruder] = self._gtk.Button("extruder", "")
self.labels[extruder].connect("clicked", self.change_extruder, extruder)
if extruder == self.current_extruder:
self.labels[extruder].get_style_context().add_class("button_active")
@@ -75,7 +74,7 @@ class ExtrudePanel(ScreenPanel):
distgrid = Gtk.Grid()
for j, i in enumerate(self.distances):
self.labels[f"dist{i}"] = self._gtk.Button(i)
self.labels[f"dist{i}"] = self._gtk.Button(label=i)
self.labels[f"dist{i}"].connect("clicked", self.change_distance, int(i))
ctx = self.labels[f"dist{i}"].get_style_context()
if ((self._screen.lang_ltr is True and j == 0) or

4
panels/fan.py
View File

@@ -72,10 +72,10 @@ class FanPanel(ScreenPanel):
name.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR)
fan_col = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5)
stop_btn = self._gtk.ButtonImage("cancel", None, "color1", 1)
stop_btn = self._gtk.Button("cancel", None, "color1", 1)
stop_btn.set_hexpand(False)
stop_btn.connect("clicked", self.update_fan_speed, fan, 0)
max_btn = self._gtk.ButtonImage("fan-on", _("Max"), "color2", 1)
max_btn = self._gtk.Button("fan-on", _("Max"), "color2", 1)
max_btn.set_hexpand(False)
max_btn.connect("clicked", self.update_fan_speed, fan, 100)

25
panels/fine_tune.py
View File

@@ -35,7 +35,7 @@ class FineTunePanel(ScreenPanel):
# babystepping grid
bsgrid = Gtk.Grid()
for j, i in enumerate(self.bs_deltas):
self.labels[f"bdelta{i}"] = self._gtk.Button(i)
self.labels[f"bdelta{i}"] = self._gtk.Button(label=i)
self.labels[f"bdelta{i}"].connect("clicked", self.change_bs_delta, float(i))
ctx = self.labels[f"bdelta{i}"].get_style_context()
if j == 0:
@@ -50,7 +50,7 @@ class FineTunePanel(ScreenPanel):
# Grid for percentage
deltgrid = Gtk.Grid()
for j, i in enumerate(self.percent_deltas):
self.labels[f"pdelta{i}"] = self._gtk.Button(f"{i}%")
self.labels[f"pdelta{i}"] = self._gtk.Button(label=f"{i}%")
self.labels[f"pdelta{i}"].connect("clicked", self.change_percent_delta, int(i))
ctx = self.labels[f"pdelta{i}"].get_style_context()
if j == 0:
@@ -65,19 +65,16 @@ class FineTunePanel(ScreenPanel):
grid = self._gtk.HomogeneousGrid()
grid.set_row_homogeneous(False)
self.labels['z+'] = self._gtk.ButtonImage("z-farther", "Z+", "color1")
self.labels['z-'] = self._gtk.ButtonImage("z-closer", "Z-", "color1")
self.labels['zoffset'] = self._gtk.ButtonImage("refresh", " 0.00" + _("mm"),
"color1", .6, Gtk.PositionType.LEFT, 1)
self.labels['speed+'] = self._gtk.ButtonImage("speed+", _("Speed +"), "color3")
self.labels['speed-'] = self._gtk.ButtonImage("speed-", _("Speed -"), "color3")
self.labels['speedfactor'] = self._gtk.ButtonImage("refresh", " 100%",
"color3", .6, Gtk.PositionType.LEFT, 1)
self.labels['z+'] = self._gtk.Button("z-farther", "Z+", "color1")
self.labels['z-'] = self._gtk.Button("z-closer", "Z-", "color1")
self.labels['zoffset'] = self._gtk.Button("refresh", " 0.00" + _("mm"), "color1", .6, Gtk.PositionType.LEFT, 1)
self.labels['speed+'] = self._gtk.Button("speed+", _("Speed +"), "color3")
self.labels['speed-'] = self._gtk.Button("speed-", _("Speed -"), "color3")
self.labels['speedfactor'] = self._gtk.Button("refresh", " 100%", "color3", .6, Gtk.PositionType.LEFT, 1)
self.labels['extrude+'] = self._gtk.ButtonImage("flow+", _("Extrusion +"), "color4")
self.labels['extrude-'] = self._gtk.ButtonImage("flow-", _("Extrusion -"), "color4")
self.labels['extrudefactor'] = self._gtk.ButtonImage("refresh", " 100%",
"color4", .6, Gtk.PositionType.LEFT, 1)
self.labels['extrude+'] = self._gtk.Button("flow+", _("Extrusion +"), "color4")
self.labels['extrude-'] = self._gtk.Button("flow-", _("Extrusion -"), "color4")
self.labels['extrudefactor'] = self._gtk.Button("refresh", " 100%", "color4", .6, Gtk.PositionType.LEFT, 1)
if self._screen.vertical_mode:
grid.attach(self.labels['z+'], 0, 0, 1, 1)
grid.attach(self.labels['z-'], 1, 0, 1, 1)

6
panels/gcode_macros.py
View File

@@ -17,7 +17,7 @@ class MacroPanel(ScreenPanel):
super().__init__(screen, title)
self.sort_reverse = False
self.sort_lbl = _("Name")
self.sort_btn = self._gtk.ButtonImage("arrow-up", self.sort_lbl, "color1", .5, Gtk.PositionType.RIGHT, 1)
self.sort_btn = self._gtk.Button("arrow-up", self.sort_lbl, "color1", .5, Gtk.PositionType.RIGHT, 1)
self.sort_btn.connect("clicked", self.change_sort)
self.sort_btn.set_hexpand(True)
self.allmacros = {}
@@ -27,7 +27,7 @@ class MacroPanel(ScreenPanel):
sort = Gtk.Label(_("Sort:"))
sort.set_hexpand(False)
adjust = self._gtk.ButtonImage("settings", None, "color2", 1, Gtk.PositionType.LEFT, 1)
adjust = self._gtk.Button("settings", None, "color2", 1, Gtk.PositionType.LEFT, 1)
adjust.connect("clicked", self.load_menu, 'options', _("Settings"))
adjust.set_hexpand(False)
@@ -70,7 +70,7 @@ class MacroPanel(ScreenPanel):
name.set_line_wrap(True)
name.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR)
btn = self._gtk.ButtonImage("resume", style="color3")
btn = self._gtk.Button("resume", style="color3")
btn.connect("clicked", self.run_gcode_macro, macro)
btn.set_hexpand(False)
btn.set_halign(Gtk.Align.END)

8
panels/input_shaper.py
View File

@@ -26,7 +26,7 @@ class InputShaperPanel(ScreenPanel):
super().__init__(screen, title)
self.freq_xy_adj = {}
self.freq_xy_combo = {}
self.calibrate_btn = self._gtk.ButtonImage("move", _('Finding ADXL'), "color1", lines=1)
self.calibrate_btn = self._gtk.Button("move", _('Finding ADXL'), "color1", lines=1)
self.calibrate_btn.connect("clicked", self.on_popover_clicked)
self.calibrate_btn.set_sensitive(False)
self.status = Gtk.Label("")
@@ -94,13 +94,13 @@ class InputShaperPanel(ScreenPanel):
self.content.add(box)
pobox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
test_x = self._gtk.Button(_("Measure X"))
test_x = self._gtk.Button(label=_("Measure X"))
test_x.connect("clicked", self.start_calibration, "x")
pobox.pack_start(test_x, True, True, 5)
test_y = self._gtk.Button(_("Measure Y"))
test_y = self._gtk.Button(label=_("Measure Y"))
test_y.connect("clicked", self.start_calibration, "y")
pobox.pack_start(test_y, True, True, 5)
test_both = self._gtk.Button(_("Measure Both"))
test_both = self._gtk.Button(label=_("Measure Both"))
test_both.connect("clicked", self.start_calibration, "both")
pobox.pack_start(test_both, True, True, 5)
self.labels['popover'] = Gtk.Popover()

53
panels/job_status.py
View File

@@ -152,8 +152,8 @@ 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.ButtonImage(f"extruder-{i}", None, None, self.bt_scale,
Gtk.PositionType.LEFT)
self.extruder_button[extruder] = self._gtk.Button(f"extruder-{i}", None, None, self.bt_scale,
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",
{"panel": "temperature", "name": _("Temperature")})
@@ -165,8 +165,7 @@ class JobStatusPanel(ScreenPanel):
self.current_extruder = None
self.heater_button = {}
if self._printer.has_heated_bed():
self.heater_button['heater_bed'] = self._gtk.ButtonImage("bed", None, None, self.bt_scale,
Gtk.PositionType.LEFT)
self.heater_button['heater_bed'] = self._gtk.Button("bed", None, None, self.bt_scale, 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",
@@ -178,8 +177,8 @@ class JobStatusPanel(ScreenPanel):
if n >= nlimit:
break
if device.startswith("heater_generic"):
self.heater_button[device] = self._gtk.ButtonImage("heater", None, None, self.bt_scale,
Gtk.PositionType.LEFT)
self.heater_button[device] = self._gtk.Button("heater", None, None, self.bt_scale,
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",
@@ -203,8 +202,8 @@ class JobStatusPanel(ScreenPanel):
nlimit += 1
if n >= nlimit:
break
self.heater_button[device] = self._gtk.ButtonImage("heat-up", None, None, self.bt_scale,
Gtk.PositionType.LEFT)
self.heater_button[device] = self._gtk.Button("heat-up", None, None, self.bt_scale,
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",
@@ -214,35 +213,33 @@ class JobStatusPanel(ScreenPanel):
n += 1
break
self.z_button = self._gtk.ButtonImage("home-z", None, None, self.bt_scale, Gtk.PositionType.LEFT)
self.z_button = self._gtk.Button("home-z", None, None, self.bt_scale, 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.ButtonImage("speed+", None, None, self.bt_scale, Gtk.PositionType.LEFT)
self.speed_button = self._gtk.Button("speed+", None, None, self.bt_scale, 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.ButtonImage("extrude", None, None, self.bt_scale, Gtk.PositionType.LEFT)
self.extrusion_button = self._gtk.Button("extrude", None, None, self.bt_scale, 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.ButtonImage("fan", None, None, self.bt_scale, Gtk.PositionType.LEFT)
self.fan_button = self._gtk.Button("fan", None, None, self.bt_scale, 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.ButtonImage("clock", elapsed_label, None,
self.bt_scale, Gtk.PositionType.LEFT, False)
self.elapsed_button = self._gtk.Button("clock", elapsed_label, None, self.bt_scale, 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.ButtonImage("hourglass", remaining_label,
None, self.bt_scale, Gtk.PositionType.LEFT, False)
self.left_button = self._gtk.Button("hourglass", remaining_label, None, self.bt_scale, Gtk.PositionType.LEFT, 1)
self.left_button.connect("clicked", self.create_time_grid)
self.left_button.set_halign(Gtk.Align.START)
@@ -264,7 +261,7 @@ class JobStatusPanel(ScreenPanel):
def create_extrusion_grid(self, widget=None):
self.main_status_displayed = False
goback = self._gtk.ButtonImage("back", None, "color1", self.bt_scale, Gtk.PositionType.TOP, False)
goback = self._gtk.Button("back", None, "color1", self.bt_scale, Gtk.PositionType.TOP, False)
goback.connect("clicked", self.create_status_grid)
goback.set_hexpand(False)
goback.get_style_context().add_class("printing-info")
@@ -289,7 +286,7 @@ class JobStatusPanel(ScreenPanel):
def create_move_grid(self, widget=None):
self.main_status_displayed = False
goback = self._gtk.ButtonImage("back", None, "color2", self.bt_scale, Gtk.PositionType.TOP, False)
goback = self._gtk.Button("back", None, "color2", self.bt_scale, Gtk.PositionType.TOP, False)
goback.connect("clicked", self.create_status_grid)
goback.set_hexpand(False)
goback.get_style_context().add_class("printing-info")
@@ -320,7 +317,7 @@ class JobStatusPanel(ScreenPanel):
def create_time_grid(self, widget=None):
self.main_status_displayed = False
goback = self._gtk.ButtonImage("back", None, "color3", self.bt_scale, Gtk.PositionType.TOP, False)
goback = self._gtk.Button("back", None, "color3", self.bt_scale, Gtk.PositionType.TOP, False)
goback.connect("clicked", self.create_status_grid)
goback.set_hexpand(False)
@@ -380,15 +377,15 @@ class JobStatusPanel(ScreenPanel):
def create_buttons(self):
self.buttons = {
'cancel': self._gtk.ButtonImage("stop", _("Cancel"), "color2"),
'control': self._gtk.ButtonImage("settings", _("Settings"), "color3"),
'fine_tune': self._gtk.ButtonImage("fine-tune", _("Fine Tuning"), "color4"),
'menu': self._gtk.ButtonImage("complete", _("Main Menu"), "color4"),
'pause': self._gtk.ButtonImage("pause", _("Pause"), "color1"),
'restart': self._gtk.ButtonImage("refresh", _("Restart"), "color3"),
'resume': self._gtk.ButtonImage("resume", _("Resume"), "color1"),
'save_offset_probe': self._gtk.ButtonImage("home-z", _("Save Z") + "\n" + "Probe", "color1"),
'save_offset_endstop': self._gtk.ButtonImage("home-z", _("Save Z") + "\n" + "Endstop", "color2"),
'cancel': self._gtk.Button("stop", _("Cancel"), "color2"),
'control': self._gtk.Button("settings", _("Settings"), "color3"),
'fine_tune': self._gtk.Button("fine-tune", _("Fine Tuning"), "color4"),
'menu': self._gtk.Button("complete", _("Main Menu"), "color4"),
'pause': self._gtk.Button("pause", _("Pause"), "color1"),
'restart': self._gtk.Button("refresh", _("Restart"), "color3"),
'resume': self._gtk.Button("resume", _("Resume"), "color1"),
'save_offset_probe': self._gtk.Button("home-z", _("Save Z") + "\n" + "Probe", "color1"),
'save_offset_endstop': self._gtk.Button("home-z", _("Save Z") + "\n" + "Endstop", "color2"),
}
self.buttons['cancel'].connect("clicked", self.cancel)
self.buttons['control'].connect("clicked", self._screen._go_to_submenu, "")

2
panels/limits.py
View File

@@ -94,7 +94,7 @@ class LimitsPanel(ScreenPanel):
scale.connect("button-release-event", self.set_opt_value, option)
self.values[option] = value
reset = self._gtk.ButtonImage("refresh", style="color1")
reset = self._gtk.Button("refresh", style="color1")
reset.connect("clicked", self.reset_value, option)
reset.set_hexpand(False)

4
panels/main_menu.py
View File

@@ -135,7 +135,7 @@ class MainPanel(MenuPanel):
if can_target:
self.labels['da'].add_object(device, "targets", rgb, True, False)
name = self._gtk.ButtonImage(image, devname.capitalize().replace("_", " "), None, .5, Gtk.PositionType.LEFT, 1)
name = self._gtk.Button(image, devname.capitalize().replace("_", " "), None, .5, Gtk.PositionType.LEFT, 1)
name.connect("clicked", self.toggle_visibility, device)
name.set_alignment(0, .5)
visible = self._config.get_config().getboolean(f"graph {self._screen.connected_printer}", device, fallback=True)
@@ -145,7 +145,7 @@ class MainPanel(MenuPanel):
name.get_style_context().add_class("graph_label_hidden")
self.labels['da'].set_showing(device, visible)
temp = self._gtk.Button("")
temp = self._gtk.Button(label="")
if can_target:
temp.connect("clicked", self.show_numpad, device)

2
panels/menu.py
View File

@@ -82,7 +82,7 @@ class MenuPanel(ScreenPanel):
j2_temp = env.from_string(item['name'])
parsed_name = j2_temp.render()
b = self._gtk.ButtonImage(item['icon'], parsed_name, f"color{(i % 4) + 1}")
b = self._gtk.Button(item['icon'], parsed_name, f"color{(i % 4) + 1}")
if item['panel'] is not None:
b.connect("clicked", self.menu_item_clicked, item['panel'], item)
elif item['method'] is not None:

26
panels/move.py
View File

@@ -22,34 +22,34 @@ class MovePanel(ScreenPanel):
self.settings = {}
self.menu = ['move_menu']
self.labels['x+'] = self._gtk.ButtonImage("arrow-right", "X+", "color1")
self.labels['x+'] = self._gtk.Button("arrow-right", "X+", "color1")
self.labels['x+'].connect("clicked", self.move, "X", "+")
self.labels['x-'] = self._gtk.ButtonImage("arrow-left", "X-", "color1")
self.labels['x-'] = self._gtk.Button("arrow-left", "X-", "color1")
self.labels['x-'].connect("clicked", self.move, "X", "-")
self.labels['y+'] = self._gtk.ButtonImage("arrow-up", "Y+", "color2")
self.labels['y+'] = self._gtk.Button("arrow-up", "Y+", "color2")
self.labels['y+'].connect("clicked", self.move, "Y", "+")
self.labels['y-'] = self._gtk.ButtonImage("arrow-down", "Y-", "color2")
self.labels['y-'] = self._gtk.Button("arrow-down", "Y-", "color2")
self.labels['y-'].connect("clicked", self.move, "Y", "-")
self.labels['z+'] = self._gtk.ButtonImage("z-farther", "Z+", "color3")
self.labels['z+'] = self._gtk.Button("z-farther", "Z+", "color3")
self.labels['z+'].connect("clicked", self.move, "Z", "+")
self.labels['z-'] = self._gtk.ButtonImage("z-closer", "Z-", "color3")
self.labels['z-'] = self._gtk.Button("z-closer", "Z-", "color3")
self.labels['z-'].connect("clicked", self.move, "Z", "-")
self.labels['home'] = self._gtk.ButtonImage("home", _("Home All"), "color4")
self.labels['home'] = self._gtk.Button("home", _("Home All"), "color4")
self.labels['home'].connect("clicked", self.home)
self.labels['home-xy'] = self._gtk.ButtonImage("home", _("Home XY"), "color4")
self.labels['home-xy'] = self._gtk.Button("home", _("Home XY"), "color4")
self.labels['home-xy'].connect("clicked", self.homexy)
self.labels['z_tilt'] = self._gtk.ButtonImage("z-tilt", _("Z Tilt"), "color4")
self.labels['z_tilt'] = self._gtk.Button("z-tilt", _("Z Tilt"), "color4")
self.labels['z_tilt'].connect("clicked", self.z_tilt)
self.labels['quad_gantry_level'] = self._gtk.ButtonImage("z-tilt", _("Quad Gantry Level"), "color4")
self.labels['quad_gantry_level'] = self._gtk.Button("z-tilt", _("Quad Gantry Level"), "color4")
self.labels['quad_gantry_level'].connect("clicked", self.quad_gantry_level)
self.labels['motors-off'] = self._gtk.ButtonImage("motor-off", _("Disable Motors"), "color4")
self.labels['motors-off'] = self._gtk.Button("motor-off", _("Disable Motors"), "color4")
script = {"script": "M18"}
self.labels['motors-off'].connect("clicked", self._screen._confirm_send_action,
_("Are you sure you wish to disable motors?"),
@@ -95,7 +95,7 @@ class MovePanel(ScreenPanel):
distgrid = Gtk.Grid()
for j, i in enumerate(self.distances):
self.labels[i] = self._gtk.Button(i)
self.labels[i] = self._gtk.Button(label=i)
self.labels[i].set_direction(Gtk.TextDirection.LTR)
self.labels[i].connect("clicked", self.change_distance, i)
ctx = self.labels[i].get_style_context()
@@ -112,7 +112,7 @@ class MovePanel(ScreenPanel):
self.labels['pos_x'] = Gtk.Label("X: 0")
self.labels['pos_y'] = Gtk.Label("Y: 0")
self.labels['pos_z'] = Gtk.Label("Z: 0")
adjust = self._gtk.ButtonImage("settings", None, "color2", 1, Gtk.PositionType.LEFT, 1)
adjust = self._gtk.Button("settings", None, "color2", 1, Gtk.PositionType.LEFT, 1)
adjust.connect("clicked", self.load_menu, 'options', _('Settings'))
adjust.set_hexpand(False)
self.labels['move_dist'] = Gtk.Label(_("Move Distance (mm)"))

8
panels/network.py
View File

@@ -58,7 +58,7 @@ class NetworkPanel(ScreenPanel):
self.labels['interface'].set_hexpand(True)
self.labels['ip'] = Gtk.Label()
self.labels['ip'].set_hexpand(True)
reload_networks = self._gtk.ButtonImage("refresh", None, "color1", .66)
reload_networks = self._gtk.Button("refresh", None, "color1", .66)
reload_networks.connect("clicked", self.reload_networks)
reload_networks.set_hexpand(False)
@@ -157,12 +157,12 @@ class NetworkPanel(ScreenPanel):
labels.set_valign(Gtk.Align.CENTER)
labels.set_halign(Gtk.Align.START)
connect = self._gtk.ButtonImage("load", style="color3")
connect = self._gtk.Button("load", style="color3")
connect.connect("clicked", self.connect_network, ssid)
connect.set_hexpand(False)
connect.set_halign(Gtk.Align.END)
delete = self._gtk.ButtonImage("delete", style="color3")
delete = self._gtk.Button("delete", style="color3")
delete.connect("clicked", self.remove_wifi_network, ssid)
delete.set_size_request(60, 0)
delete.set_hexpand(False)
@@ -346,7 +346,7 @@ class NetworkPanel(ScreenPanel):
self.labels['network_psk'].connect("focus-in-event", self._show_keyboard)
self.labels['network_psk'].grab_focus_without_selecting()
save = self._gtk.ButtonImage("sd", _("Save"), "color3")
save = self._gtk.Button("sd", _("Save"), "color3")
save.set_hexpand(False)
save.connect("clicked", self.add_new_network, ssid, True)

2
panels/pins.py
View File

@@ -61,7 +61,7 @@ class OutputPinPanel(ScreenPanel):
scale.get_style_context().add_class("fan_slider")
scale.connect("button-release-event", self.set_output_pin, pin)
min_btn = self._gtk.ButtonImage("cancel", None, "color1", 1)
min_btn = self._gtk.Button("cancel", None, "color1", 1)
min_btn.set_hexpand(False)
min_btn.connect("clicked", self.update_pin_value, pin, 0)

8
panels/print.py
View File

@@ -42,13 +42,13 @@ class PrintPanel(ScreenPanel):
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.ButtonImage(None, val, f"color{i % 4}", .5, Gtk.PositionType.RIGHT, 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.connect("clicked", self.change_sort, name)
self.labels[f'sort_{name}'] = s
sbox.add(s)
refresh = self._gtk.ButtonImage("refresh", scale=.66)
refresh = self._gtk.Button("refresh", scale=.66)
refresh.connect('clicked', self._refresh_files)
sbox.add(refresh)
sbox.set_hexpand(True)
@@ -169,7 +169,7 @@ class PrintPanel(ScreenPanel):
labels.set_valign(Gtk.Align.CENTER)
labels.set_halign(Gtk.Align.START)
actions = self._gtk.ButtonImage("load", style="color3")
actions = self._gtk.Button("load", style="color3")
actions.connect("clicked", self.change_dir, directory)
actions.set_hexpand(False)
actions.set_halign(Gtk.Align.END)
@@ -215,7 +215,7 @@ class PrintPanel(ScreenPanel):
labels.set_valign(Gtk.Align.CENTER)
labels.set_halign(Gtk.Align.START)
actions = self._gtk.ButtonImage("print", style="color3")
actions = self._gtk.Button("print", style="color3")
actions.connect("clicked", self.confirm_print, filepath)
actions.set_hexpand(False)
actions.set_halign(Gtk.Align.END)

2
panels/printer_select.py
View File

@@ -32,7 +32,7 @@ class PrinterSelect(ScreenPanel):
for i, printer in enumerate(printers):
name = list(printer)[0]
self.labels[name] = self._gtk.ButtonImage("extruder", name, f"color{1 + i % 4}")
self.labels[name] = self._gtk.Button("extruder", name, f"color{1 + i % 4}")
self.labels[name].connect("clicked", self.connect_printer, name)
if self._screen.vertical_mode:
row = i % columns

2
panels/retraction.py
View File

@@ -131,7 +131,7 @@ class FWRetractionPanel(ScreenPanel):
scale.get_style_context().add_class("option_slider")
scale.connect("button-release-event", self.set_opt_value, option)
reset = self._gtk.ButtonImage("refresh", style="color1")
reset = self._gtk.Button("refresh", style="color1")
reset.connect("clicked", self.reset_value, option)
reset.set_hexpand(False)

2
panels/settings.py
View File

@@ -119,7 +119,7 @@ class SettingsPanel(ScreenPanel):
box.add(label)
dev.add(box)
elif option['type'] == "menu":
open_menu = self._gtk.ButtonImage("settings", style="color3")
open_menu = self._gtk.Button("settings", style="color3")
open_menu.connect("clicked", self.load_menu, option['menu'], option['name'])
open_menu.set_hexpand(False)
open_menu.set_halign(Gtk.Align.END)

14
panels/splash_screen.py
View File

@@ -24,17 +24,17 @@ class SplashScreenPanel(ScreenPanel):
self.labels['text'].set_halign(Gtk.Align.CENTER)
self.labels['text'].set_valign(Gtk.Align.CENTER)
self.labels['menu'] = self._gtk.ButtonImage("settings", _("Menu"), "color4")
self.labels['menu'] = self._gtk.Button("settings", _("Menu"), "color4")
self.labels['menu'].connect("clicked", self._screen._go_to_submenu, "")
self.labels['restart'] = self._gtk.ButtonImage("refresh", _("Klipper Restart"), "color1")
self.labels['restart'] = self._gtk.Button("refresh", _("Klipper Restart"), "color1")
self.labels['restart'].connect("clicked", self.restart)
self.labels['firmware_restart'] = self._gtk.ButtonImage("refresh", _("Firmware Restart"), "color2")
self.labels['firmware_restart'] = self._gtk.Button("refresh", _("Firmware Restart"), "color2")
self.labels['firmware_restart'].connect("clicked", self.firmware_restart)
self.labels['restart_system'] = self._gtk.ButtonImage("refresh", _("System Restart"), "color1")
self.labels['restart_system'] = self._gtk.Button("refresh", _("System Restart"), "color1")
self.labels['restart_system'].connect("clicked", self.restart_system)
self.labels['shutdown'] = self._gtk.ButtonImage("shutdown", _('System Shutdown'), "color2")
self.labels['shutdown'] = self._gtk.Button("shutdown", _('System Shutdown'), "color2")
self.labels['shutdown'].connect("clicked", self.shutdown)
self.labels['retry'] = self._gtk.ButtonImage("load", _('Retry'), "color3")
self.labels['retry'] = self._gtk.Button("load", _('Retry'), "color3")
self.labels['retry'].connect("clicked", self.retry)
self.labels['actions'] = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
@@ -92,7 +92,7 @@ class SplashScreenPanel(ScreenPanel):
def add_power_button(self, powerdevs):
if powerdevs is not None:
self.labels['power'] = self._gtk.ButtonImage("shutdown", _("Power On Printer"), "color3")
self.labels['power'] = self._gtk.Button("shutdown", _("Power On Printer"), "color3")
self.labels['power'].connect("clicked", self._screen.power_on, powerdevs)
self.check_power_status()
self.labels['actions'].add(self.labels['power'])

10
panels/system.py
View File

@@ -36,17 +36,17 @@ class SystemPanel(ScreenPanel):
grid = self._gtk.HomogeneousGrid()
grid.set_row_homogeneous(False)
update_all = self._gtk.ButtonImage('arrow-up', _('Full Update'), 'color1')
update_all = self._gtk.Button('arrow-up', _('Full Update'), 'color1')
update_all.connect("clicked", self.show_update_info, "full")
update_all.set_vexpand(False)
self.refresh = self._gtk.ButtonImage('refresh', _('Refresh'), 'color2')
self.refresh = self._gtk.Button('refresh', _('Refresh'), 'color2')
self.refresh.connect("clicked", self.refresh_updates)
self.refresh.set_vexpand(False)
reboot = self._gtk.ButtonImage('refresh', _('Restart'), 'color3')
reboot = self._gtk.Button('refresh', _('Restart'), 'color3')
reboot.connect("clicked", self.reboot_poweroff, "reboot")
reboot.set_vexpand(False)
shutdown = self._gtk.ButtonImage('shutdown', _('Shutdown'), 'color4')
shutdown = self._gtk.Button('shutdown', _('Shutdown'), 'color4')
shutdown.connect("clicked", self.reboot_poweroff, "poweroff")
shutdown.set_vexpand(False)
@@ -75,7 +75,7 @@ class SystemPanel(ScreenPanel):
self.labels[f"{prog}_status"].connect("clicked", self.show_update_info, prog)
if prog in ALLOWED_SERVICES:
self.labels[f"{prog}_restart"] = self._gtk.ButtonImage("refresh", scale=.7)
self.labels[f"{prog}_restart"] = self._gtk.Button("refresh", scale=.7)
self.labels[f"{prog}_restart"].connect("clicked", self.restart, prog)
infogrid.attach(self.labels[f"{prog}_restart"], 0, i, 1, 1)

16
panels/temperature.py
View File

@@ -69,8 +69,8 @@ class TemperaturePanel(ScreenPanel):
def create_right_panel(self):
cooldown = self._gtk.ButtonImage('cool-down', _('Cooldown'), "color4", .5, Gtk.PositionType.LEFT, 1)
adjust = self._gtk.ButtonImage('fine-tune', None, "color3", 1, Gtk.PositionType.LEFT, 1)
cooldown = self._gtk.Button('cool-down', _('Cooldown'), "color4", .5, Gtk.PositionType.LEFT, 1)
adjust = self._gtk.Button('fine-tune', None, "color3", 1, Gtk.PositionType.LEFT, 1)
cooldown.connect("clicked", self.set_temperature, "cooldown")
adjust.connect("clicked", self.switch_preheat_adjust)
@@ -98,7 +98,7 @@ class TemperaturePanel(ScreenPanel):
i = 0
for option in self.preheat_options:
if option != "cooldown":
self.labels[option] = self._gtk.Button(option, f"color{(i % 4) + 1}")
self.labels[option] = self._gtk.Button(label=option, style=f"color{(i % 4) + 1}")
self.labels[option].connect("clicked", self.set_temperature, option)
self.labels['preheat_grid'].attach(self.labels[option], (i % 2), int(i / 2), 1, 1)
i += 1
@@ -108,14 +108,14 @@ class TemperaturePanel(ScreenPanel):
def delta_adjust(self):
deltagrid = self._gtk.HomogeneousGrid()
self.labels["increase"] = self._gtk.ButtonImage("increase", _("Increase"), "color1")
self.labels["increase"] = self._gtk.Button("increase", _("Increase"), "color1")
self.labels["increase"].connect("clicked", self.change_target_temp_incremental, "+")
self.labels["decrease"] = self._gtk.ButtonImage("decrease", _("Decrease"), "color3")
self.labels["decrease"] = self._gtk.Button("decrease", _("Decrease"), "color3")
self.labels["decrease"].connect("clicked", self.change_target_temp_incremental, "-")
tempgrid = Gtk.Grid()
for j, i in enumerate(self.tempdeltas):
self.labels[f'deg{i}'] = self._gtk.Button(i)
self.labels[f'deg{i}'] = self._gtk.Button(label=i)
self.labels[f'deg{i}'].connect("clicked", self.change_temp_delta, i)
ctx = self.labels[f'deg{i}'].get_style_context()
if j == 0:
@@ -328,7 +328,7 @@ class TemperaturePanel(ScreenPanel):
rgb = self._gtk.get_temp_color(dev_type)
name = self._gtk.ButtonImage(image, devname.capitalize().replace("_", " "), None, .5, Gtk.PositionType.LEFT, 1)
name = self._gtk.Button(image, devname.capitalize().replace("_", " "), None, .5, Gtk.PositionType.LEFT, 1)
name.set_alignment(0, .5)
visible = self._config.get_config().getboolean(f"graph {self._screen.connected_printer}", device, fallback=True)
if visible:
@@ -346,7 +346,7 @@ class TemperaturePanel(ScreenPanel):
name.connect("clicked", self.toggle_visibility, device)
self.labels['da'].set_showing(device, visible)
temp = self._gtk.Button("")
temp = self._gtk.Button(label="")
if can_target:
temp.connect("clicked", self.show_numpad, device)

12
panels/zcalibrate.py
View File

@@ -37,14 +37,14 @@ class ZCalibratePanel(ScreenPanel):
pos.attach(Gtk.Label(f"{self.z_offset:.2f}"), 0, 4, 1, 1)
pos.attach(self.widgets['zoffset'], 1, 4, 1, 1)
self.widgets['zpos'] = self._gtk.ButtonImage('z-farther', _("Raise Nozzle"), 'color4')
self.widgets['zpos'] = self._gtk.Button('z-farther', _("Raise Nozzle"), 'color4')
self.widgets['zpos'].connect("clicked", self.move, "+")
self.widgets['zneg'] = self._gtk.ButtonImage('z-closer', _("Lower Nozzle"), 'color1')
self.widgets['zneg'] = self._gtk.Button('z-closer', _("Lower Nozzle"), 'color1')
self.widgets['zneg'].connect("clicked", self.move, "-")
self.widgets['start'] = self._gtk.ButtonImage('resume', _("Start"), 'color3')
self.widgets['complete'] = self._gtk.ButtonImage('complete', _('Accept'), 'color3')
self.widgets['start'] = self._gtk.Button('resume', _("Start"), 'color3')
self.widgets['complete'] = self._gtk.Button('complete', _('Accept'), 'color3')
self.widgets['complete'].connect("clicked", self.accept)
self.widgets['cancel'] = self._gtk.ButtonImage('cancel', _('Abort'), 'color2')
self.widgets['cancel'] = self._gtk.Button('cancel', _('Abort'), 'color2')
self.widgets['cancel'].connect("clicked", self.abort)
functions = []
@@ -81,7 +81,7 @@ class ZCalibratePanel(ScreenPanel):
distgrid = Gtk.Grid()
for j, i in enumerate(self.distances):
self.widgets[i] = self._gtk.Button(i)
self.widgets[i] = self._gtk.Button(label=i)
self.widgets[i].set_direction(Gtk.TextDirection.LTR)
self.widgets[i].connect("clicked", self.change_distance, i)
ctx = self.widgets[i].get_style_context()