Remove icons and use theme icons from openmamba-icons

This commit is contained in:
Silvan Calarco 2022-06-19 11:32:55 +02:00
parent caa94ea36c
commit 91dd46e2a6
11 changed files with 5 additions and 14 deletions

View File

@ -62,12 +62,6 @@ install-locales: locales
done done
@lrelease-qt5 mambabase/mambabase_it.ts -qm $(DESTDIR)$(datadir)/locale/it/LC_MESSAGES/mambabase.qm @lrelease-qt5 mambabase/mambabase_it.ts -qm $(DESTDIR)$(datadir)/locale/it/LC_MESSAGES/mambabase.qm
install-icons:
@for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \
$(INSTALL_DIR) $(DESTDIR)$(iconsdir)/$$i/apps/; \
$(INSTALL_DATA) mambabase/mambabase-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mambabase.png; \
done
install-mambabase: install-mambabase:
@$(INSTALL_DIR) $(DESTDIR)$(bindir) @$(INSTALL_DIR) $(DESTDIR)$(bindir)
@$(INSTALL_DIR) $(DESTDIR)$(mambabasedatadir) @$(INSTALL_DIR) $(DESTDIR)$(mambabasedatadir)
@ -78,14 +72,11 @@ install-mambabase:
$(INSTALL_SCRIPT) mambabase/nvidia-autoselect-driver $(DESTDIR)$(mambabasedatadir) $(INSTALL_SCRIPT) mambabase/nvidia-autoselect-driver $(DESTDIR)$(mambabasedatadir)
$(INSTALL_DATA) mambabase/mambabase.desktop $(DESTDIR)$(xdg_appsdir) $(INSTALL_DATA) mambabase/mambabase.desktop $(DESTDIR)$(xdg_appsdir)
$(INSTALL_DATA) mambabase/mambabase-autostart.desktop $(DESTDIR)$(mambabasedatadir) $(INSTALL_DATA) mambabase/mambabase-autostart.desktop $(DESTDIR)$(mambabasedatadir)
$(INSTALL_DATA) mambabase/openmamba.png $(DESTDIR)$(mambabasedatadir)
$(INSTALL_DATA) mambabase/mambabase.png $(DESTDIR)$(mambabasedatadir)
cp mambabase/*.ui $(DESTDIR)$(mambabasedatadir) cp mambabase/*.ui $(DESTDIR)$(mambabasedatadir)
install: $(pck_infiles:.in=) \ install: $(pck_infiles:.in=) \
install-mambabase \ install-mambabase \
install-locales \ install-locales
install-icons
dist: clean dist: clean
@mkdir /tmp/$(distdir) @mkdir /tmp/$(distdir)

View File

@ -55,8 +55,8 @@
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>30</x>
<y>10</y> <y>20</y>
<width>491</width> <width>491</width>
<height>61</height> <height>61</height>
</rect> </rect>
@ -71,7 +71,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap>openmamba.png</pixmap> <pixmap>../../../../../share/pixmaps/vendor-logo-large.png</pixmap>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 859 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

View File

@ -351,7 +351,7 @@ class InstallationPage(QtWidgets.QWizardPage):
if __name__ == '__main__': if __name__ == '__main__':
import sys import sys
app = QtWidgets.QApplication(sys.argv) app = QtWidgets.QApplication(sys.argv)
app.setWindowIcon(QtGui.QIcon(DATADIR + "mambabase.png")) app.setWindowIcon(QtGui.QIcon.fromTheme("mambabase"))
# UI translations # UI translations
locale = QLocale.system().name() locale = QLocale.system().name()
language = locale[0:2] language = locale[0:2]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB