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

remove frames from lists

Browse Source
This commit is contained in:
alfrix
2022-11-28 00:15:28 -03:00
parent 56149e4148
commit 25797b5ed3
16 changed files with 19 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
panels/bed_mesh.py
View File

@@ -43,7 +43,6 @@ class BedMeshPanel(ScreenPanel):
# Create a grid for all profiles
self.labels['profiles'] = Gtk.Grid()
self.labels['profiles'].get_style_context().add_class("frame-item")
self.labels['profiles'].set_valign(Gtk.Align.CENTER)
scroll = self._gtk.ScrolledWindow()
@@ -144,17 +143,14 @@ class BedMeshPanel(ScreenPanel):
button_box.add(buttons["delete"])
box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5)
box.get_style_context().add_class("frame-item")
box.pack_start(name, True, True, 0)
box.pack_start(button_box, False, False, 0)
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
frame.add(box)
self.profiles[profile] = {
"name": name,
"button_box": button_box,
"row": frame,
"row": box,
"save": buttons["save"],
"delete": buttons["delete"],
}

9
panels/fan.py
View File

@@ -103,10 +103,6 @@ class FanPanel(ScreenPanel):
fan_row.add(name)
fan_row.add(fan_col)
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
frame.add(fan_row)
self.devices[fan] = {
"changeable": changeable,
"scale": scale,
@@ -123,7 +119,7 @@ class FanPanel(ScreenPanel):
pos = devices.index(fan)
self.labels['devices'].insert_row(pos)
self.labels['devices'].attach(frame, 0, pos, 1, 1)
self.labels['devices'].attach(fan_row, 0, pos, 1, 1)
self.labels['devices'].show_all()
def load_fans(self):
@@ -134,9 +130,6 @@ class FanPanel(ScreenPanel):
if name.startswith("_"):
continue
self.add_fan(fan)
frame = Gtk.Frame()
frame.set_vexpand(False)
self.labels['devices'].attach(frame, 0, -1, 1, 1)
def set_fan_speed(self, widget, event, fan):
value = self.devices[fan]['scale'].get_value()

14
panels/gcode_macros.py
View File

@@ -76,15 +76,12 @@ class MacroPanel(ScreenPanel):
labels.add(name)
dev = Gtk.Box(spacing=5)
dev.get_style_context().add_class("frame-item")
dev.add(labels)
dev.add(btn)
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
frame.add(dev)
self.macros[macro] = {
"row": frame
"row": dev
}
macros = sorted(self.macros, reverse=self.sort_reverse, key=str.casefold)
@@ -167,19 +164,16 @@ class MacroPanel(ScreenPanel):
box.add(switch)
dev = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5)
dev.get_style_context().add_class("frame-item")
dev.set_hexpand(True)
dev.set_vexpand(False)
dev.set_valign(Gtk.Align.CENTER)
dev.add(name)
dev.add(box)
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
frame.add(dev)
frame.show_all()
opt_array[opt_name] = {
"name": option['name'],
"row": frame
"row": dev
}
opts = sorted(self.allmacros, key=str.casefold)

6
panels/limits.py
View File

@@ -103,12 +103,8 @@ class LimitsPanel(ScreenPanel):
item.attach(scale, 0, 1, 1, 1)
item.attach(reset, 1, 1, 1, 1)
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
frame.add(item)
self.limits[option] = {
"row": frame,
"row": item,
"scale": scale,
"adjustment": adj,
}

8
panels/move.py
View File

@@ -228,6 +228,7 @@ class MovePanel(ScreenPanel):
name.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR)
dev = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5)
dev.get_style_context().add_class("frame-item")
dev.set_hexpand(True)
dev.set_vexpand(False)
dev.set_valign(Gtk.Align.CENTER)
@@ -255,14 +256,9 @@ class MovePanel(ScreenPanel):
scale.connect("button-release-event", self.scale_moved, option['section'], opt_name)
dev.add(scale)
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
frame.add(dev)
frame.show_all()
opt_array[opt_name] = {
"name": option['name'],
"row": frame
"row": dev
}
opts = sorted(list(opt_array), key=lambda x: opt_array[x]['name'])

7
panels/network.py
View File

@@ -171,6 +171,7 @@ class NetworkPanel(ScreenPanel):
delete.set_halign(Gtk.Align.END)
network = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5)
network.get_style_context().add_class("frame-item")
network.set_hexpand(True)
network.set_vexpand(False)
@@ -182,11 +183,7 @@ class NetworkPanel(ScreenPanel):
else:
buttons.pack_end(connect, False, False, 0)
network.add(buttons)
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
self.networks[ssid] = frame
frame.add(network)
self.networks[ssid] = network
nets = sorted(list(self.networks), reverse=False)
if connected_ssid in nets:

10
panels/pins.py
View File

@@ -37,10 +37,6 @@ class OutputPinPanel(ScreenPanel):
continue
self.add_pin(pin)
frame = Gtk.Frame()
frame.set_vexpand(False)
self.labels['devices'].attach(frame, 0, -1, 1, 1)
def add_pin(self, pin):
logging.info(f"Adding pin: {pin}")
@@ -73,12 +69,8 @@ class OutputPinPanel(ScreenPanel):
pin_row.add(name)
pin_row.add(pin_col)
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
frame.add(pin_row)
self.devices[pin] = {
"row": frame,
"row": pin_row,
"scale": scale,
}

10
panels/power.py
View File

@@ -38,9 +38,6 @@ class PowerPanel(ScreenPanel):
self.devices[x]['switch'].connect("notify::active", self.on_switch, x)
def add_device(self, device):
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
name = Gtk.Label()
name.set_markup(f"<big><b>{device}</b></big>")
name.set_hexpand(True)
@@ -66,10 +63,9 @@ class PowerPanel(ScreenPanel):
dev.set_valign(Gtk.Align.CENTER)
dev.add(labels)
dev.add(switch)
frame.add(dev)
self.devices[device] = {
"row": frame,
"row": dev,
"switch": switch
}
@@ -84,10 +80,6 @@ class PowerPanel(ScreenPanel):
devices = self._screen.printer.get_power_devices()
for x in devices:
self.add_device(x)
# Add the line at the top
frame = Gtk.Frame()
frame.set_vexpand(False)
self.labels['devices'].attach(frame, 0, -1, 1, 1)
def on_switch(self, switch, gparam, device):
logging.debug(f"Power toggled {device}")

6
panels/retraction.py
View File

@@ -140,12 +140,8 @@ class FWRetractionPanel(ScreenPanel):
item.attach(scale, 0, 1, 1, 1)
item.attach(reset, 1, 1, 1, 1)
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
frame.add(item)
self.list[option] = {
"row": frame,
"row": item,
"scale": scale,
"adjustment": adj,
}

10
panels/settings.py
View File

@@ -58,10 +58,6 @@ class SettingsPanel(ScreenPanel):
def add_option(self, boxname, opt_array, opt_name, option):
if option['type'] is None:
return
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
name = Gtk.Label()
name.set_markup(f"<big><b>{option['name']}</b></big>")
name.set_hexpand(True)
@@ -75,6 +71,7 @@ class SettingsPanel(ScreenPanel):
labels.add(name)
dev = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5)
dev.get_style_context().add_class("frame-item")
dev.set_hexpand(True)
dev.set_vexpand(False)
dev.set_valign(Gtk.Align.CENTER)
@@ -125,12 +122,9 @@ class SettingsPanel(ScreenPanel):
open_menu.set_halign(Gtk.Align.END)
dev.add(open_menu)
frame.add(dev)
frame.show_all()
opt_array[opt_name] = {
"name": option['name'],
"row": frame
"row": dev
}
opts = sorted(list(opt_array), key=lambda x: opt_array[x]['name'])

2
styles/base.css
View File

@@ -251,7 +251,7 @@ trough {
.frame-item {
min-height: 4.5em;
padding: .2em .3em;
border-bottom: 1px solid #1c1c1c
border-bottom: 1px solid rgba(255,255,255,0.05)
}
.heatergraph {

5
styles/colorized/style.css
View File

@@ -91,11 +91,6 @@ entry {
border-color: #002b36; /*base03*/
}
frame {
color: #fdf6e3; /*base3*/
border-bottom-color: #073642; /*base02*/
}
label {
color: #fdf6e3; /*base3*/
}

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

@@ -88,11 +88,6 @@ entry {
border-color: #1f1f1f;
}
frame {
color: #e2e2e2;
border-bottom-color: #1f1f1f;
}
label {
color: #e2e2e2;
}

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

@@ -67,16 +67,6 @@ switch:checked {
background-color: #2f5631;
}
entry {
background-color: #1c1c1c;
border-color: #1c1c1c;
}
frame {
color: #e2e2e2;
border-bottom-color: #121212;
}
label {
color: #e2e2e2;
}

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

@@ -105,7 +105,7 @@ entry {
background-color: #F5F5F5;
}
frame {
.frame-item {
border-bottom-color: #BDBDBD;
}

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

@@ -66,10 +66,6 @@ entry {
border-color: #13181C;
}
frame {
border-bottom-color: #444;
}
label {
color: white;
}