Skip to content

chore(ui): dedupe 10 double-exported assets and drop the dead system qrc #319

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

Merged
gmmcosta15 merged 9 commits into from
Sep 28, 2026
Merged

chore(ui): dedupe 10 double-exported assets and drop the dead system qrc #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5f7a88b
chore(ui): delete 11 unreferenced generated UI modules
gmmcosta15 Aug 31, 2026
974fdd3
test(ui): guard qrc resource keys against broken and stale references
gmmcosta15 Aug 31, 2026
b631019
fix(ui): repair broken resource keys and harden the BlocksLabel icon …
gmmcosta15 Sep 1, 2026
0df798a
fix(ui): delete dead pixmap references and repair the z-adjust back icon
gmmcosta15 Sep 1, 2026
2c028ca
fix(ui): give warning popups an icon and clear it for unknown severity
gmmcosta15 Sep 1, 2026
80a9c63
chore(ui): dedupe 10 double-exported assets and drop the dead system qrc
gmmcosta15 Sep 1, 2026
ca723c0
chore(merge): merge dev into fix/resource-broken-refs and port key fi…
gmmcosta15 Sep 28, 2026
44545b9
chore(merge): merge #318 tip into chore/resource-dedupe and move cont…
gmmcosta15 Sep 28, 2026
0aea9f9
chore(merge): absorb #318 squash into stack
gmmcosta15 Sep 28, 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
4 changes: 2 additions & 2 deletions BlocksScreen/lib/panels/controlTab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ def _menu(self, active: bool) -> list[tuple[str, str, typing.Callable]]:
),
(
"Fans",
":/temperature_related/media/btn_icons/fan.svg",
":/fan_related/media/btn_icons/fan.svg",
lambda: self.change_page(self.indexOf(self.fans_page)),
),
(
Expand Down Expand Up @@ -374,7 +374,7 @@ def _apply_true_zero_layout(self) -> None:
if has_true_zero:
self.cp_button_3.setText("Fans")
self.cp_button_3.setPixmap(
QtGui.QPixmap(":/temperature_related/media/btn_icons/fan.svg")
QtGui.QPixmap(":/fan_related/media/btn_icons/fan.svg")
)
self.cp_button_3.clicked.connect(
lambda: self.change_page(self.indexOf(self.fans_page))
Expand Down
1 change: 0 additions & 1 deletion BlocksScreen/lib/panels/mainWindow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
from lib.ui.resources.graphic_resources_rc import *
from lib.ui.resources.icon_resources_rc import *
from lib.ui.resources.main_menu_resources_rc import *
from lib.ui.resources.system_resources_rc import *
from lib.ui.resources.top_bar_resources_rc import *
from lib.updater_worker import UpdaterWorker
from lib.utils.blocks_tabwidget import NotificationQTabWidget
Expand Down
6 changes: 3 additions & 3 deletions BlocksScreen/lib/panels/widgets/FilamentTab/basicFilamentPanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,23 +661,23 @@ def _setup_ui(self) -> None:
(
"load_pla_btn",
"PLA",
":/filament_related/media/topbar/pla_filament_topbar.svg",
":/top_bar_icons/media/topbar/pla_filament_topbar.svg",
0,
0,
FilamentTypes.PLA,
),
(
"load_petg_btn",
"PETG",
":/filament_related/media/topbar/petg_filament_topbar.svg",
":/top_bar_icons/media/topbar/petg_filament_topbar.svg",
0,
1,
FilamentTypes.PETG,
),
(
"load_abs_btn",
"ABS",
":/filament_related/media/topbar/abs_filament_topbar.svg",
":/top_bar_icons/media/topbar/abs_filament_topbar.svg",
1,
0,
FilamentTypes.ABS,
Expand Down
9 changes: 0 additions & 9 deletions BlocksScreen/lib/ui/resources/icon_resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@
<file>media/btn_icons/temperature_error.svg</file>
<file>media/btn_icons/temperature_plate.svg</file>
<file>media/btn_icons/temperature_up.svg</file>
<file>media/btn_icons/blower.svg</file>
<file>media/btn_icons/fan.svg</file>
<file>media/btn_icons/cooldown.svg</file>
<file>media/btn_icons/heatsoak_icon.svg</file>
<file>media/btn_icons/hot_temperature.svg</file>
Expand Down Expand Up @@ -88,13 +86,6 @@
<file>media/btn_icons/eject.svg</file>
<file>media/btn_icons/humity_and_temp.svg</file>
<file>media/btn_icons/spoll.svg</file>
<file>media/topbar/abs_filament_topbar.svg</file>
<file>media/topbar/custom_filament_topbar.svg</file>
<file>media/topbar/hips_filament_topbar.svg</file>
<file>media/topbar/nylon_filament_topbar.svg</file>
<file>media/topbar/petg_filament_topbar.svg</file>
<file>media/topbar/pla_filament_topbar.svg</file>
<file>media/topbar/tpu_filament_topbar.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>
Expand Down
2,495 changes: 491 additions & 2,004 deletions BlocksScreen/lib/ui/resources/icon_resources_rc.py
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions BlocksScreen/lib/ui/resources/system_resources.qrc
View file
Open in desktop

This file was deleted.

623 changes: 0 additions & 623 deletions BlocksScreen/lib/ui/resources/system_resources_rc.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tests/panels/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
"lib.ui.resources.graphic_resources_rc",
"lib.ui.resources.icon_resources_rc",
"lib.ui.resources.main_menu_resources_rc",
"lib.ui.resources.system_resources_rc",
"lib.ui.resources.top_bar_resources_rc",
"lib.updater_worker",
"screensaver",
Expand Down
Loading