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

themes: get rid of the unused vertical selector buttons, simplify and rename the horizontal toggle strip

Browse Source
This commit is contained in:
alfrix 2024-01-10 16:07:53 -03:00
parent 78f1c691f6
commit d1168b5405
11 changed files with 99 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
panels/extrude.py
View File

@ -77,16 +77,9 @@ class Panel(ScreenPanel):
self.labels[f"dist{i}"] = self._gtk.Button(label=i) self.labels[f"dist{i}"] = self._gtk.Button(label=i)
self.labels[f"dist{i}"].connect("clicked", self.change_distance, int(i)) self.labels[f"dist{i}"].connect("clicked", self.change_distance, int(i))
ctx = self.labels[f"dist{i}"].get_style_context() ctx = self.labels[f"dist{i}"].get_style_context()
if ((self._screen.lang_ltr is True and j == 0) or ctx.add_class("horizontal_togglebuttons")
(self._screen.lang_ltr is False and j == len(self.distances) - 1)):
ctx.add_class("distbutton_top")
elif ((self._screen.lang_ltr is False and j == 0) or
(self._screen.lang_ltr is True and j == len(self.distances) - 1)):
ctx.add_class("distbutton_bottom")
else:
ctx.add_class("distbutton")
if int(i) == self.distance: if int(i) == self.distance:
ctx.add_class("distbutton_active") ctx.add_class("horizontal_togglebuttons_active")
distgrid.attach(self.labels[f"dist{i}"], j, 0, 1, 1) distgrid.attach(self.labels[f"dist{i}"], j, 0, 1, 1)
speedgrid = Gtk.Grid() speedgrid = Gtk.Grid()
@ -94,16 +87,9 @@ class Panel(ScreenPanel):
self.labels[f"speed{i}"] = self._gtk.Button(label=i) self.labels[f"speed{i}"] = self._gtk.Button(label=i)
self.labels[f"speed{i}"].connect("clicked", self.change_speed, int(i)) self.labels[f"speed{i}"].connect("clicked", self.change_speed, int(i))
ctx = self.labels[f"speed{i}"].get_style_context() ctx = self.labels[f"speed{i}"].get_style_context()
if ((self._screen.lang_ltr is True and j == 0) or ctx.add_class("horizontal_togglebuttons")
(self._screen.lang_ltr is False and j == len(self.speeds) - 1)):
ctx.add_class("distbutton_top")
elif ((self._screen.lang_ltr is False and j == 0) or
(self._screen.lang_ltr is True and j == len(self.speeds) - 1)):
ctx.add_class("distbutton_bottom")
else:
ctx.add_class("distbutton")
if int(i) == self.speed: if int(i) == self.speed:
ctx.add_class("distbutton_active") ctx.add_class("horizontal_togglebuttons_active")
speedgrid.attach(self.labels[f"speed{i}"], j, 0, 1, 1) speedgrid.attach(self.labels[f"speed{i}"], j, 0, 1, 1)
distbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) distbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
@ -211,8 +197,8 @@ class Panel(ScreenPanel):
def change_distance(self, widget, distance): def change_distance(self, widget, distance):
logging.info(f"### Distance {distance}") logging.info(f"### Distance {distance}")
self.labels[f"dist{self.distance}"].get_style_context().remove_class("distbutton_active") self.labels[f"dist{self.distance}"].get_style_context().remove_class("horizontal_togglebuttons_active")
self.labels[f"dist{distance}"].get_style_context().add_class("distbutton_active") self.labels[f"dist{distance}"].get_style_context().add_class("horizontal_togglebuttons_active")
self.distance = distance self.distance = distance
def change_extruder(self, widget, extruder): def change_extruder(self, widget, extruder):
@ -225,8 +211,8 @@ class Panel(ScreenPanel):
def change_speed(self, widget, speed): def change_speed(self, widget, speed):
logging.info(f"### Speed {speed}") logging.info(f"### Speed {speed}")
self.labels[f"speed{self.speed}"].get_style_context().remove_class("distbutton_active") self.labels[f"speed{self.speed}"].get_style_context().remove_class("horizontal_togglebuttons_active")
self.labels[f"speed{speed}"].get_style_context().add_class("distbutton_active") self.labels[f"speed{speed}"].get_style_context().add_class("horizontal_togglebuttons_active")
self.speed = speed self.speed = speed
def extrude(self, widget, direction): def extrude(self, widget, direction):

35
panels/fine_tune.py
View File

@ -33,14 +33,9 @@ class Panel(ScreenPanel):
self.labels[f"zdelta{i}"] = self._gtk.Button(label=i) self.labels[f"zdelta{i}"] = self._gtk.Button(label=i)
self.labels[f"zdelta{i}"].connect("clicked", self.change_percent_delta, "z_offset", float(i)) self.labels[f"zdelta{i}"].connect("clicked", self.change_percent_delta, "z_offset", float(i))
ctx = self.labels[f"zdelta{i}"].get_style_context() ctx = self.labels[f"zdelta{i}"].get_style_context()
if j == 0: ctx.add_class("horizontal_togglebuttons")
ctx.add_class("distbutton_top")
elif j == len(self.z_deltas) - 1:
ctx.add_class("distbutton_bottom")
else:
ctx.add_class("distbutton")
if i == self.z_delta: if i == self.z_delta:
ctx.add_class("distbutton_active") ctx.add_class("horizontal_togglebuttons_active")
zgrid.attach(self.labels[f"zdelta{i}"], j, 0, 1, 1) zgrid.attach(self.labels[f"zdelta{i}"], j, 0, 1, 1)
spdgrid = Gtk.Grid() spdgrid = Gtk.Grid()
@ -48,14 +43,9 @@ class Panel(ScreenPanel):
self.labels[f"sdelta{i}"] = self._gtk.Button(label=f"{i}%") self.labels[f"sdelta{i}"] = self._gtk.Button(label=f"{i}%")
self.labels[f"sdelta{i}"].connect("clicked", self.change_percent_delta, "speed", int(i)) self.labels[f"sdelta{i}"].connect("clicked", self.change_percent_delta, "speed", int(i))
ctx = self.labels[f"sdelta{i}"].get_style_context() ctx = self.labels[f"sdelta{i}"].get_style_context()
if j == 0: ctx.add_class("horizontal_togglebuttons")
ctx.add_class("distbutton_top")
elif j == len(self.speed_deltas) - 1:
ctx.add_class("distbutton_bottom")
else:
ctx.add_class("distbutton")
if i == self.s_delta: if i == self.s_delta:
ctx.add_class("distbutton_active") ctx.add_class("horizontal_togglebuttons_active")
spdgrid.attach(self.labels[f"sdelta{i}"], j, 0, 1, 1) spdgrid.attach(self.labels[f"sdelta{i}"], j, 0, 1, 1)
extgrid = Gtk.Grid() extgrid = Gtk.Grid()
@ -63,14 +53,9 @@ class Panel(ScreenPanel):
self.labels[f"edelta{i}"] = self._gtk.Button(label=f"{i}%") self.labels[f"edelta{i}"] = self._gtk.Button(label=f"{i}%")
self.labels[f"edelta{i}"].connect("clicked", self.change_percent_delta, "extrude", int(i)) self.labels[f"edelta{i}"].connect("clicked", self.change_percent_delta, "extrude", int(i))
ctx = self.labels[f"edelta{i}"].get_style_context() ctx = self.labels[f"edelta{i}"].get_style_context()
if j == 0: ctx.add_class("horizontal_togglebuttons")
ctx.add_class("distbutton_top")
elif j == len(self.extrude_deltas) - 1:
ctx.add_class("distbutton_bottom")
else:
ctx.add_class("distbutton")
if i == self.e_delta: if i == self.e_delta:
ctx.add_class("distbutton_active") ctx.add_class("horizontal_togglebuttons_active")
extgrid.attach(self.labels[f"edelta{i}"], j, 0, 1, 1) extgrid.attach(self.labels[f"edelta{i}"], j, 0, 1, 1)
grid = Gtk.Grid(column_homogeneous=True) grid = Gtk.Grid(column_homogeneous=True)
@ -179,13 +164,13 @@ class Panel(ScreenPanel):
def change_percent_delta(self, widget, array, delta): def change_percent_delta(self, widget, array, delta):
logging.info(f"### Delta {delta}") logging.info(f"### Delta {delta}")
widget.get_style_context().add_class("distbutton_active") widget.get_style_context().add_class("horizontal_togglebuttons_active")
if array == "z_offset": if array == "z_offset":
self.labels[f"zdelta{self.z_delta}"].get_style_context().remove_class("distbutton_active") self.labels[f"zdelta{self.z_delta}"].get_style_context().remove_class("horizontal_togglebuttons_active")
self.z_delta = delta self.z_delta = delta
elif array == "speed": elif array == "speed":
self.labels[f"sdelta{self.s_delta}"].get_style_context().remove_class("distbutton_active") self.labels[f"sdelta{self.s_delta}"].get_style_context().remove_class("horizontal_togglebuttons_active")
self.s_delta = delta self.s_delta = delta
elif array == "extrude": elif array == "extrude":
self.labels[f"edelta{self.e_delta}"].get_style_context().remove_class("distbutton_active") self.labels[f"edelta{self.e_delta}"].get_style_context().remove_class("horizontal_togglebuttons_active")
self.e_delta = delta self.e_delta = delta

13
panels/move.py
View File

@ -86,14 +86,9 @@ class Panel(ScreenPanel):
self.labels[i].set_direction(Gtk.TextDirection.LTR) self.labels[i].set_direction(Gtk.TextDirection.LTR)
self.labels[i].connect("clicked", self.change_distance, i) self.labels[i].connect("clicked", self.change_distance, i)
ctx = self.labels[i].get_style_context() ctx = self.labels[i].get_style_context()
if (self._screen.lang_ltr and j == 0) or (not self._screen.lang_ltr and j == len(self.distances) - 1): ctx.add_class("horizontal_togglebuttons")
ctx.add_class("distbutton_top")
elif (not self._screen.lang_ltr and j == 0) or (self._screen.lang_ltr and j == len(self.distances) - 1):
ctx.add_class("distbutton_bottom")
else:
ctx.add_class("distbutton")
if i == self.distance: if i == self.distance:
ctx.add_class("distbutton_active") ctx.add_class("horizontal_togglebuttons_active")
distgrid.attach(self.labels[i], j, 0, 1, 1) distgrid.attach(self.labels[i], j, 0, 1, 1)
for p in ('pos_x', 'pos_y', 'pos_z'): for p in ('pos_x', 'pos_y', 'pos_z'):
@ -174,8 +169,8 @@ class Panel(ScreenPanel):
def change_distance(self, widget, distance): def change_distance(self, widget, distance):
logging.info(f"### Distance {distance}") logging.info(f"### Distance {distance}")
self.labels[f"{self.distance}"].get_style_context().remove_class("distbutton_active") self.labels[f"{self.distance}"].get_style_context().remove_class("horizontal_togglebuttons_active")
self.labels[f"{distance}"].get_style_context().add_class("distbutton_active") self.labels[f"{distance}"].get_style_context().add_class("horizontal_togglebuttons_active")
self.distance = distance self.distance = distance
def move(self, widget, axis, direction): def move(self, widget, axis, direction):

13
panels/temperature.py
View File

@ -103,14 +103,9 @@ class Panel(ScreenPanel):
self.labels[f'deg{i}'] = self._gtk.Button(label=i) self.labels[f'deg{i}'] = self._gtk.Button(label=i)
self.labels[f'deg{i}'].connect("clicked", self.change_temp_delta, i) self.labels[f'deg{i}'].connect("clicked", self.change_temp_delta, i)
ctx = self.labels[f'deg{i}'].get_style_context() ctx = self.labels[f'deg{i}'].get_style_context()
if j == 0: ctx.add_class("horizontal_togglebuttons")
ctx.add_class("distbutton_top")
elif j == len(self.tempdeltas) - 1:
ctx.add_class("distbutton_bottom")
else:
ctx.add_class("distbutton")
if i == self.tempdelta: if i == self.tempdelta:
ctx.add_class("distbutton_active") ctx.add_class("horizontal_togglebuttons_active")
tempgrid.attach(self.labels[f'deg{i}'], j, 0, 1, 1) tempgrid.attach(self.labels[f'deg{i}'], j, 0, 1, 1)
vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
@ -125,8 +120,8 @@ class Panel(ScreenPanel):
def change_temp_delta(self, widget, tempdelta): def change_temp_delta(self, widget, tempdelta):
logging.info(f"### tempdelta {tempdelta}") logging.info(f"### tempdelta {tempdelta}")
self.labels[f"deg{self.tempdelta}"].get_style_context().remove_class("distbutton_active") self.labels[f"deg{self.tempdelta}"].get_style_context().remove_class("horizontal_togglebuttons_active")
self.labels[f"deg{tempdelta}"].get_style_context().add_class("distbutton_active") self.labels[f"deg{tempdelta}"].get_style_context().add_class("horizontal_togglebuttons_active")
self.tempdelta = tempdelta self.tempdelta = tempdelta
def change_target_temp_incremental(self, widget, direction): def change_target_temp_incremental(self, widget, direction):

13
panels/zcalibrate.py
View File

@ -78,14 +78,9 @@ class Panel(ScreenPanel):
self.widgets[i].set_direction(Gtk.TextDirection.LTR) self.widgets[i].set_direction(Gtk.TextDirection.LTR)
self.widgets[i].connect("clicked", self.change_distance, i) self.widgets[i].connect("clicked", self.change_distance, i)
ctx = self.widgets[i].get_style_context() ctx = self.widgets[i].get_style_context()
if (self._screen.lang_ltr and j == 0) or (not self._screen.lang_ltr and j == len(self.distances) - 1): ctx.add_class("horizontal_togglebuttons")
ctx.add_class("distbutton_top")
elif (not self._screen.lang_ltr and j == 0) or (self._screen.lang_ltr and j == len(self.distances) - 1):
ctx.add_class("distbutton_bottom")
else:
ctx.add_class("distbutton")
if i == self.distance: if i == self.distance:
ctx.add_class("distbutton_active") ctx.add_class("horizontal_togglebuttons_active")
distgrid.attach(self.widgets[i], j, 0, 1, 1) distgrid.attach(self.widgets[i], j, 0, 1, 1)
self.widgets['move_dist'] = Gtk.Label(_("Move Distance (mm)")) self.widgets['move_dist'] = Gtk.Label(_("Move Distance (mm)"))
@ -247,8 +242,8 @@ class Panel(ScreenPanel):
def change_distance(self, widget, distance): def change_distance(self, widget, distance):
logging.info(f"### Distance {distance}") logging.info(f"### Distance {distance}")
self.widgets[f"{self.distance}"].get_style_context().remove_class("distbutton_active") self.widgets[f"{self.distance}"].get_style_context().remove_class("horizontal_togglebuttons_active")
self.widgets[f"{distance}"].get_style_context().add_class("distbutton_active") self.widgets[f"{distance}"].get_style_context().add_class("horizontal_togglebuttons_active")
self.distance = distance self.distance = distance
def move(self, widget, direction): def move(self, widget, direction):

64
styles/base.css
View File

@ -291,36 +291,32 @@ trough {
margin-top: 1em; margin-top: 1em;
} }
.distbutton_active { .horizontal_togglebuttons_active {
background-color: @active; background-color: @active;
font-weight: 600; font-weight: 600;
} }
.distbutton_top { .horizontal_togglebuttons {
border: .15em solid @lines; border-style: solid;
border-right: 0; border-color: @lines;
border-width: .15em;
border-right-width: 0;
margin-left: 0;
margin-right: 0;
min-height: 3em;
}
.horizontal_togglebuttons:first-child {
border-top-left-radius: .75em; border-top-left-radius: .75em;
border-bottom-left-radius: .75em; border-bottom-left-radius: .75em;
margin-right: 0; margin-left: .25em;
min-height: 3em;
} }
.distbutton { .horizontal_togglebuttons:last-child {
border: .15em solid @lines; border-top-right-radius: .75em;
border-left: .15em solid @lines; border-bottom-right-radius: .75em;
border-right: 0; border-right-width: .15em;
margin-left: 0; margin-right: .25em;
margin-right: 0;
min-height: 3em;
}
.distbutton_bottom {
border: .15em solid @lines;
border-left: .15em solid @lines;
border-top-right-radius: .7em;
border-bottom-right-radius: .7em;
margin-left: 0;
min-height: 3em;
} }
.fan_slider { .fan_slider {
@ -512,30 +508,6 @@ trough {
font-size: 0.95em; font-size: 0.95em;
} }
.tempbutton_top {
border: .15em solid @lines;
border-bottom: 0;
border-top-left-radius: .75em;
border-top-right-radius: .75em;
margin-bottom: 0;
}
.tempbutton {
border: .15em solid @lines;
border-top: .15em solid @lines;
border-bottom: 0;
margin-top: 0;
margin-bottom: 0;
}
.tempbutton_bottom {
border: .15em solid @lines;
border-top: .15em solid @lines;
border-bottom-left-radius: .7em;
border-bottom-right-radius: .7em;
margin-top: 0;
}
.updater-item { .updater-item {
min-height: 3em; min-height: 3em;
padding: .2em; padding: .2em;

9
styles/colorized/style.css
View File

@ -175,17 +175,12 @@ textview .time {
border-radius: .75em; border-radius: .75em;
} }
.tempbutton_top, .horizontal_togglebuttons {
.tempbutton,
.tempbutton_bottom,
.distbutton_top,
.distbutton,
.distbutton_bottom {
border-color: @solarized-base03; border-color: @solarized-base03;
background-color: @solarized-base02; background-color: @solarized-base02;
} }
.distbutton_active { .horizontal_togglebuttons_active {
background-color: @solarized-orange; background-color: @solarized-orange;
} }

9
styles/material-dark/style.css
View File

@ -157,18 +157,13 @@ textview .time {
border-radius: .75em; border-radius: .75em;
} }
.tempbutton_top, .horizontal_togglebuttons {
.tempbutton,
.tempbutton_bottom,
.distbutton_top,
.distbutton,
.distbutton_bottom {
border-color: @bg; border-color: @bg;
background-color: @buttons-bg; background-color: @buttons-bg;
} }
button:active, button:active,
.distbutton_active, .horizontal_togglebuttons_active,
button.active { button.active {
background-color: @active; background-color: @active;
} }

74
styles/material-darker/style.css
View File

@ -30,10 +30,6 @@ window {
background-color: #121212; background-color: #121212;
} }
.active_device {
background-color: #1c1c1c;
}
button { button {
background-color: #121212; background-color: #121212;
} }
@ -142,6 +138,10 @@ textview .time {
color: #9E9E9E; color: #9E9E9E;
} }
.active_device {
background-color: #1c1c1c;
}
.dialog { .dialog {
border: 0; border: 0;
background-color: #121212; background-color: #121212;
@ -152,18 +152,38 @@ textview .time {
border-radius: .25em; border-radius: .25em;
} }
.tempbutton_top,
.tempbutton, .dialog-error {
.tempbutton_bottom, border-bottom-color: #CF6679;
.distbutton_top, }
.distbutton,
.distbutton_bottom { .dialog-warning {
border-bottom-color: #f9b274;
}
.dialog-info {
border-bottom-color: @color4;
}
.dialog-default {
border-bottom-color: @color3;
}
.dialog-secondary {
border-bottom-color: @color2;
}
.dialog-primary {
border-bottom-color: @color1;
}
.horizontal_togglebuttons {
border-color: #545454; border-color: #545454;
border-width: .1em; border-width: .1em;
background-color: #252525; background-color: #252525;
} }
.distbutton_active { .horizontal_togglebuttons_active {
background-color: #545454; background-color: #545454;
} }
@ -218,38 +238,6 @@ textview .time {
color: #121212; color: #121212;
} }
.warning {
background-color: #f9b274;
}
.error {
background-color: #CF6679;
}
.keyboard_pad { .keyboard_pad {
background-color: #090909; background-color: #090909;
} }
.dialog-error {
border-bottom-color: #CF6679;
}
.dialog-warning {
border-bottom-color: #f9b274;
}
.dialog-info {
border-bottom-color: @color4;
}
.dialog-default {
border-bottom-color: @color3;
}
.dialog-secondary {
border-bottom-color: @color2;
}
.dialog-primary {
border-bottom-color: @color1;
}

29
styles/material-light/style.css
View File

@ -134,10 +134,6 @@ entry {
background-color: @bg; background-color: @bg;
} }
.frame-item {
border-bottom-color: @border;
}
label { label {
color: @text; color: @text;
} }
@ -195,26 +191,16 @@ textview .time {
color: @border; color: @border;
} }
.dialog { .horizontal_togglebuttons {
border: @border;
background-color: @bg;
}
.tempbutton_top,
.tempbutton,
.tempbutton_bottom,
.distbutton_top,
.distbutton,
.distbutton_bottom {
border-color: @border; border-color: @border;
background-color: @bg; background-color: @bg;
} }
.distbutton_active { .horizontal_togglebuttons_active {
background-color: @active; background-color: @active;
} }
.distbutton_active label { .horizontal_togglebuttons_active label {
color: @text; color: @text;
} }
@ -222,6 +208,10 @@ textview .time {
color: @bg; color: @bg;
} }
.frame-item {
border-bottom-color: @border;
}
.message_popup { .message_popup {
border-bottom-color: @border; border-bottom-color: @border;
} }
@ -281,6 +271,11 @@ textview .time {
background-color: @border; background-color: @border;
} }
.dialog {
border: @border;
background-color: @bg;
}
.dialog button { .dialog button {
border-radius: .75em; border-radius: .75em;
} }

18
styles/z-bolt/style.css
View File

@ -134,15 +134,13 @@ textview .time {
background-color: @bg; background-color: @bg;
} }
.distbutton_active { .horizontal_togglebuttons_active {
background-color: @active; background-color: @active;
border-color: @color1; border-color: @color1;
box-shadow: 0 0 0 .2em @text inset; box-shadow: 0 0 0 .2em @lines inset;
} }
.distbutton_top, .horizontal_togglebuttons {
.distbutton,
.distbutton_bottom {
border-color: @lines; border-color: @lines;
} }
@ -158,16 +156,6 @@ textview .time {
border-color: @lines; border-color: @lines;
} }
.tempbutton_top {
border-color: @lines;
}
.tempbutton,
.tempbutton_bottom {
border-color: @lines;
border-top-color: @lines;
}
.message { .message {
border-color: @error; border-color: @error;
color: @text; color: @text;