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

Open
gmmcosta15 wants to merge 1 commit into from
Open

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
1 commit
Select commit
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
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 @@ -35,7 +35,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 PyQt6 import QtCore, QtGui, QtWidgets
Expand Down
6 changes: 3 additions & 3 deletions BlocksScreen/lib/panels/widgets/basicFilamentPanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,23 +639,23 @@ def _setupUi(self):
(
"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
2 changes: 1 addition & 1 deletion BlocksScreen/lib/ui/controlStackedWidget.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ Control</string>
<string>menu_btn</string>
</property>
<property name="icon_pixmap" stdset="0">
<pixmap resource="resources/icon_resources.qrc">:/temperature_related/media/btn_icons/fan.svg</pixmap>
<pixmap resource="resources/icon_resources.qrc">:/fan_related/media/btn_icons/fan.svg</pixmap>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion BlocksScreen/lib/ui/controlStackedWidget_ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def setupUi(self, controlStackedWidget):
self.cp_fans_btn.setStyleSheet("")
self.cp_fans_btn.setAutoDefault(False)
self.cp_fans_btn.setFlat(True)
self.cp_fans_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/temperature_related/media/btn_icons/fan.svg"))
self.cp_fans_btn.setProperty("icon_pixmap", QtGui.QPixmap(":/fan_related/media/btn_icons/fan.svg"))
self.cp_fans_btn.setObjectName("cp_fans_btn")
self.cp_content_layout.addWidget(self.cp_fans_btn, 2, 0, 1, 1)
self.cp_switch_print_core_btn = BlocksCustomButton(parent=self.control_page)
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,205 changes: 346 additions & 1,859 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 @@ -45,7 +45,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