Skip to content

chore(resources): asset cleanup, rename, and folder reorg #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gmmcosta15 wants to merge 2 commits into from
Open

chore(resources): asset cleanup, rename, and folder reorg #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cba9498
chore(resources): rename/dedupe asset filenames, drop 59 dead SVGs, a…
gmmcosta15 Sep 3, 2026
7039363
chore(resources): reorganize btn_icons into per-prefix subfolders
gmmcosta15 Sep 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions BlocksScreen/lib/panels/filamentTab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import logging
from collections import deque
from typing import Deque

from devices.amu import AMUManager
from devices.amu.models import GateStatus
Expand Down Expand Up @@ -53,7 +52,7 @@ def __init__(

self._previous_gate_states: dict[int, bool] = {}
self.pre_gate_idx = {}
self.popup_gates: Deque = deque()
self.popup_gates: deque = deque()
self._spool_id_map: dict[str, dict] = {}
self._current_field: QtWidgets.QLineEdit | None = None
self._color_target_field = None
Expand Down Expand Up @@ -970,7 +969,7 @@ def setupUi(self):
self.fp_button_2.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
self.fp_button_2.setProperty(
"icon_pixmap",
BlocksPixmap.get(Icon.BASE_DADOS_SPOOL_1),
BlocksPixmap.get(Icon.SPOOL_DATABASE_1),
)
self.fp_button_2.setObjectName("fp_button_2")

Expand Down
78 changes: 39 additions & 39 deletions BlocksScreen/lib/ui/controlStackedWidget.ui
View file
Open in desktop

Large diffs are not rendered by default.

2,223 changes: 1,723 additions & 500 deletions BlocksScreen/lib/ui/controlStackedWidget_ui.py
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions BlocksScreen/lib/ui/mainWindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ QPushButton:pressed{
<bool>true</bool>
</property>
<property name="icon_pixmap" stdset="0">
<pixmap resource="resources/icon_resources.qrc">:/ui/media/btn_icons/notification.svg</pixmap>
<pixmap resource="resources/icon_resources.qrc">:/ui/media/btn_icons/ui/notification.svg</pixmap>
</property>
<property name="button_type" stdset="0">
<string>icon_text</string>
Expand Down Expand Up @@ -594,7 +594,7 @@ QPushButton:pressed{
<string>secondary_display</string>
</property>
<property name="icon_pixmap" stdset="0">
<pixmap resource="resources/icon_resources.qrc">:/extruder_related/media/btn_icons/nozzle_topbar.svg</pixmap>
<pixmap resource="resources/icon_resources.qrc">:/extruder_related/media/btn_icons/extruder_related/nozzle_topbar.svg</pixmap>
</property>
<property name="name" stdset="0">
<string>extruder_temperature_display</string>
Expand Down Expand Up @@ -625,7 +625,7 @@ QPushButton:pressed{
<string>secondary_display</string>
</property>
<property name="icon_pixmap" stdset="0">
<pixmap resource="resources/icon_resources.qrc">:/temperature_related/media/btn_icons/temperature_plate.svg</pixmap>
<pixmap resource="resources/icon_resources.qrc">:/temperature_related/media/btn_icons/temperature_related/temperature_plate.svg</pixmap>
</property>
</widget>
</item>
Expand Down Expand Up @@ -659,7 +659,7 @@ QPushButton:pressed{
<string>display_secondary</string>
</property>
<property name="secondary_pixmap" stdset="0">
<pixmap resource="resources/icon_resources.qrc">:/temperature_related/media/btn_icons/humidity.svg</pixmap>
<pixmap resource="resources/icon_resources.qrc">:/temperature_related/media/btn_icons/temperature_related/humidity.svg</pixmap>
</property>
</widget>
</item>
Expand All @@ -684,7 +684,7 @@ QPushButton:pressed{
<bool>true</bool>
</property>
<property name="icon_pixmap" stdset="0">
<pixmap resource="resources/icon_resources.qrc">:/filament_related/media/btn_icons/load_filament.svg</pixmap>
<pixmap resource="resources/icon_resources.qrc">:/filament_related/media/btn_icons/filament_related/load_filament.svg</pixmap>
</property>
<property name="button_type" stdset="0">
<string>icon_text</string>
Expand Down Expand Up @@ -715,7 +715,7 @@ QPushButton:pressed{
<string>icon_text</string>
</property>
<property name="icon_pixmap" stdset="0">
<pixmap resource="resources/icon_resources.qrc">:/temperature_related/media/btn_icons/standart_temperature.svg</pixmap>
<pixmap resource="resources/icon_resources.qrc">:/temperature_related/media/btn_icons/temperature_related/standard_temperature.svg</pixmap>
</property>
</widget>
</item>
Expand Down Expand Up @@ -767,7 +767,7 @@ QPushButton:pressed{
<string>icon</string>
</property>
<property name="icon_pixmap" stdset="0">
<pixmap resource="resources/icon_resources.qrc">:/network/media/btn_icons/network/3bar_wifi.svg</pixmap>
<pixmap resource="resources/icon_resources.qrc">:/network/media/btn_icons/network/wifi_3bar.svg</pixmap>
</property>
</widget>
</item>
Expand Down
406 changes: 294 additions & 112 deletions BlocksScreen/lib/ui/mainWindow_ui.py
View file
Open in desktop

Large diffs are not rendered by default.

195 changes: 96 additions & 99 deletions BlocksScreen/lib/ui/resources/icon_resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,131 +1,128 @@
<RCC>
<qresource prefix="network">
<file>media/btn_icons/network/static_ip.svg</file>
<file>media/btn_icons/wifi_config.svg</file>
<file>media/btn_icons/network/0bar_wifi.svg</file>
<file>media/btn_icons/network/0bar_wifi_protected.svg</file>
<file>media/btn_icons/network/1bar_wifi.svg</file>
<file>media/btn_icons/network/1bar_wifi_protected.svg</file>
<file>media/btn_icons/network/2bar_wifi.svg</file>
<file>media/btn_icons/network/2bar_wifi_protected.svg</file>
<file>media/btn_icons/network/3bar_wifi.svg</file>
<file>media/btn_icons/network/3bar_wifi_protected.svg</file>
<file>media/btn_icons/network/4bar_wifi.svg</file>
<file>media/btn_icons/network/4bar_wifi_protected.svg</file>
<file>media/btn_icons/network/wifi_config.svg</file>
<file>media/btn_icons/network/wifi_0bar.svg</file>
<file>media/btn_icons/network/wifi_0bar_protected.svg</file>
<file>media/btn_icons/network/wifi_1bar.svg</file>
<file>media/btn_icons/network/wifi_1bar_protected.svg</file>
<file>media/btn_icons/network/wifi_2bar.svg</file>
<file>media/btn_icons/network/wifi_2bar_protected.svg</file>
<file>media/btn_icons/network/wifi_3bar.svg</file>
<file>media/btn_icons/network/wifi_3bar_protected.svg</file>
<file>media/btn_icons/network/wifi_4bar.svg</file>
<file>media/btn_icons/network/wifi_4bar_protected.svg</file>
<file>media/btn_icons/network/ethernet_connected.svg</file>
<file>media/btn_icons/hotspot.svg</file>
<file>media/btn_icons/network/hotspot.svg</file>
</qresource>
<qresource prefix="baby_step">
<file>media/btn_icons/move_nozzle_away.svg</file>
<file>media/btn_icons/move_nozzle_close.svg</file>
<file>media/btn_icons/baby_step/move_nozzle_away.svg</file>
<file>media/btn_icons/baby_step/move_nozzle_close.svg</file>
</qresource>
<qresource prefix="dialog">
<file>media/btn_icons/no.svg</file>
<file>media/btn_icons/yes.svg</file>
<file>media/btn_icons/dialog/no.svg</file>
<file>media/btn_icons/dialog/yes.svg</file>
</qresource>
<qresource prefix="files">
<file>media/btn_icons/file_icon.svg</file>
<file>media/btn_icons/files/file.svg</file>
</qresource>
<qresource prefix="system">
<file>media/btn_icons/reboot.svg</file>
<file>media/btn_icons/restart_firmware.svg</file>
<file>media/btn_icons/restart_klipper.svg</file>
<file>media/btn_icons/restart_printer.svg</file>
<file>media/btn_icons/update-software-icon.svg</file>
<file>media/btn_icons/system/reboot.svg</file>
<file>media/btn_icons/system/restart_firmware.svg</file>
<file>media/btn_icons/system/restart_klipper.svg</file>
<file>media/btn_icons/system/restart_printer.svg</file>
<file>media/btn_icons/system/update_software.svg</file>
</qresource>
<qresource prefix="fan_related">
<file>media/btn_icons/fan.svg</file>
<file>media/btn_icons/fan_cage.svg</file>
<file>media/btn_icons/blower.svg</file>
<file>media/btn_icons/fan_related/fan.svg</file>
<file>media/btn_icons/fan_related/fan_cage.svg</file>
<file>media/btn_icons/fan_related/blower.svg</file>
</qresource>
<qresource prefix="temperature_related">
<file>media/btn_icons/humidity.svg</file>
<file>media/btn_icons/standart_temperature.svg</file>
<file>media/btn_icons/temperature.svg</file>
<file>media/btn_icons/temperature_plate.svg</file>
<file>media/btn_icons/cooldown.svg</file>
<file>media/btn_icons/heatsoak_icon.svg</file>
<file>media/btn_icons/temperature_related/humidity.svg</file>
<file>media/btn_icons/temperature_related/standard_temperature.svg</file>
<file>media/btn_icons/temperature_related/temperature.svg</file>
<file>media/btn_icons/temperature_related/temperature_plate.svg</file>
<file>media/btn_icons/temperature_related/cooldown.svg</file>
<file>media/btn_icons/temperature_related/heatsoak.svg</file>
</qresource>
<qresource prefix="motion">
<file>media/btn_icons/disable_steppers.svg</file>
<file>media/btn_icons/home_all.svg</file>
<file>media/btn_icons/home_x.svg</file>
<file>media/btn_icons/home_z.svg</file>
<file>media/btn_icons/home_y.svg</file>
<file>media/btn_icons/axis_maintenance.svg</file>
<file>media/btn_icons/speed.svg</file>
<file>media/btn_icons/motion/disable_steppers.svg</file>
<file>media/btn_icons/motion/home_all.svg</file>
<file>media/btn_icons/motion/home_x.svg</file>
<file>media/btn_icons/motion/home_z.svg</file>
<file>media/btn_icons/motion/home_y.svg</file>
<file>media/btn_icons/motion/axis_maintenance.svg</file>
<file>media/btn_icons/motion/speed.svg</file>
</qresource>
<qresource prefix="filament_related">
<file>media/btn_icons/add spool.svg</file>
<file>media/btn_icons/add filament.svg</file>
<file>media/btn_icons/spoolman.svg</file>
<file>media/btn_icons/base dados spool 1.svg</file>
<file>media/btn_icons/check gate 1.svg</file>
<file>media/btn_icons/eject.svg</file>
<file>media/btn_icons/change_filament.svg</file>
<file>media/btn_icons/filament_sensor.svg</file>
<file>media/btn_icons/filament_sensor_off.svg</file>
<file>media/btn_icons/filament_sensor_turn_on.svg</file>
<file>media/btn_icons/load_filament.svg</file>
<file>media/btn_icons/unload_filament.svg</file>
<file>media/btn_icons/loaded_spool.svg</file>
<file>media/btn_icons/half_spoll.svg</file>
<file>media/btn_icons/filament_related/add_spool.svg</file>
<file>media/btn_icons/filament_related/add_filament.svg</file>
<file>media/btn_icons/filament_related/spoolman.svg</file>
<file>media/btn_icons/filament_related/spool_database_1.svg</file>
<file>media/btn_icons/filament_related/check_gate_1.svg</file>
<file>media/btn_icons/filament_related/eject.svg</file>
<file>media/btn_icons/filament_related/change_filament.svg</file>
<file>media/btn_icons/filament_related/filament_sensor.svg</file>
<file>media/btn_icons/filament_related/filament_sensor_off.svg</file>
<file>media/btn_icons/filament_related/filament_sensor_turn_on.svg</file>
<file>media/btn_icons/filament_related/load_filament.svg</file>
<file>media/btn_icons/filament_related/unload_filament.svg</file>
<file>media/btn_icons/filament_related/loaded_spool.svg</file>
<file>media/btn_icons/filament_related/half_spool.svg</file>
</qresource>
<qresource prefix="ui">
<file>media/btn_icons/notification.svg</file>
<file>media/btn_icons/usb_icon.svg</file>
<file>media/btn_icons/garbage-icon.svg</file>
<file>media/btn_icons/back.svg</file>
<file>media/btn_icons/refresh.svg</file>
<file>media/btn_icons/back_folder.svg</file>
<file>media/btn_icons/folderIcon.svg</file>
<file>media/btn_icons/center_arrows.svg</file>
<file>media/btn_icons/error.svg</file>
<file>media/btn_icons/info.svg</file>
<file>media/btn_icons/LCD_settings.svg</file>
<file>media/btn_icons/LEDs.svg</file>
<file>media/btn_icons/pause.svg</file>
<file>media/btn_icons/play.svg</file>
<file>media/btn_icons/print.svg</file>
<file>media/btn_icons/stop.svg</file>
<file>media/btn_icons/layers.svg</file>
<file>media/btn_icons/printer_settings.svg</file>
<file>media/btn_icons/routine.svg</file>
<file>media/btn_icons/save.svg</file>
<file>media/btn_icons/time.svg</file>
<file>media/btn_icons/troubleshoot.svg</file>
<file>media/btn_icons/tune.svg</file>
<file>media/btn_icons/see.svg</file>
<file>media/btn_icons/unsee.svg</file>
<file>media/btn_icons/ui/notification.svg</file>
<file>media/btn_icons/ui/usb.svg</file>
<file>media/btn_icons/ui/garbage.svg</file>
<file>media/btn_icons/ui/back.svg</file>
<file>media/btn_icons/ui/refresh.svg</file>
<file>media/btn_icons/ui/back_folder.svg</file>
<file>media/btn_icons/ui/folder.svg</file>
<file>media/btn_icons/ui/center_arrows.svg</file>
<file>media/btn_icons/ui/error.svg</file>
<file>media/btn_icons/ui/info.svg</file>
<file>media/btn_icons/ui/leds.svg</file>
<file>media/btn_icons/ui/pause.svg</file>
<file>media/btn_icons/ui/play.svg</file>
<file>media/btn_icons/ui/print.svg</file>
<file>media/btn_icons/ui/stop.svg</file>
<file>media/btn_icons/ui/layers.svg</file>
<file>media/btn_icons/ui/printer_settings.svg</file>
<file>media/btn_icons/ui/routine.svg</file>
<file>media/btn_icons/ui/save.svg</file>
<file>media/btn_icons/ui/time.svg</file>
<file>media/btn_icons/ui/troubleshoot.svg</file>
<file>media/btn_icons/ui/tune.svg</file>
<file>media/btn_icons/ui/see.svg</file>
<file>media/btn_icons/ui/unsee.svg</file>
</qresource>
<qresource prefix="z_levelling">
<file>media/btn_icons/baby_step_icon.svg</file>
<file>media/btn_icons/bed_levelling.svg</file>
<file>media/btn_icons/eddy_mech.svg</file>
<file>media/btn_icons/inductive.svg</file>
<file>media/btn_icons/bltouch.svg</file>
<file>media/btn_icons/z_levelling/baby_step.svg</file>
<file>media/btn_icons/z_levelling/bed_levelling.svg</file>
<file>media/btn_icons/z_levelling/eddy_mech.svg</file>
<file>media/btn_icons/z_levelling/inductive.svg</file>
<file>media/btn_icons/z_levelling/bltouch.svg</file>
</qresource>
<qresource prefix="extruder_related">
<file>media/btn_icons/extrude.svg</file>
<file>media/btn_icons/nozzle.svg</file>
<file>media/btn_icons/nozzle_topbar.svg</file>
<file>media/btn_icons/switch_print_core.svg</file>
<file>media/btn_icons/switch_zoom.svg</file>
<file>media/btn_icons/extruder_related/extrude.svg</file>
<file>media/btn_icons/extruder_related/nozzle.svg</file>
<file>media/btn_icons/extruder_related/nozzle_topbar.svg</file>
<file>media/btn_icons/extruder_related/switch_print_core.svg</file>
<file>media/btn_icons/extruder_related/switch_zoom.svg</file>
</qresource>
<qresource prefix="input_shaper">
<file>media/btn_icons/frequency_X.svg</file>
<file>media/btn_icons/frequency_Y.svg</file>
<file>media/btn_icons/input_shaper.svg</file>
<file>media/btn_icons/input_shaper_auto.svg</file>
<file>media/btn_icons/input_shaper_manual.svg</file>
<file>media/btn_icons/input_shaper/input_shaper.svg</file>
<file>media/btn_icons/input_shaper/input_shaper_auto.svg</file>
<file>media/btn_icons/input_shaper/input_shaper_manual.svg</file>
</qresource>
<qresource prefix="arrow_icons">
<file>media/btn_icons/arrow_left.svg</file>
<file>media/btn_icons/arrow_down.svg</file>
<file>media/btn_icons/arrow_right.svg</file>
<file>media/btn_icons/left_arrow.svg</file>
<file>media/btn_icons/right_arrow.svg</file>
<file>media/btn_icons/down_arrow.svg</file>
<file>media/btn_icons/up_arrow.svg</file>
<file>media/btn_icons/arrow_icons/arrow_left.svg</file>
<file>media/btn_icons/arrow_icons/arrow_down.svg</file>
<file>media/btn_icons/arrow_icons/arrow_right.svg</file>
<file>media/btn_icons/arrow_icons/left_arrow.svg</file>
<file>media/btn_icons/arrow_icons/right_arrow.svg</file>
<file>media/btn_icons/arrow_icons/down_arrow.svg</file>
<file>media/btn_icons/arrow_icons/up_arrow.svg</file>
</qresource>
</RCC>
Loading
Loading