diff --git a/Makefile b/Makefile index f7a4a4e..933f378 100644 --- a/Makefile +++ b/Makefile @@ -62,12 +62,6 @@ install-locales: locales done @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_DIR) $(DESTDIR)$(bindir) @$(INSTALL_DIR) $(DESTDIR)$(mambabasedatadir) @@ -78,14 +72,11 @@ install-mambabase: $(INSTALL_SCRIPT) mambabase/nvidia-autoselect-driver $(DESTDIR)$(mambabasedatadir) $(INSTALL_DATA) mambabase/mambabase.desktop $(DESTDIR)$(xdg_appsdir) $(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) install: $(pck_infiles:.in=) \ install-mambabase \ - install-locales \ - install-icons + install-locales dist: clean @mkdir /tmp/$(distdir) diff --git a/mambabase/WelcomePage.ui b/mambabase/WelcomePage.ui index 254affa..6d3339f 100644 --- a/mambabase/WelcomePage.ui +++ b/mambabase/WelcomePage.ui @@ -55,8 +55,8 @@ - 20 - 10 + 30 + 20 491 61 @@ -71,7 +71,7 @@ - openmamba.png + ../../../../../share/pixmaps/vendor-logo-large.png Qt::AlignCenter diff --git a/mambabase/mambabase-128x128.png b/mambabase/mambabase-128x128.png deleted file mode 100644 index 7951ee3..0000000 Binary files a/mambabase/mambabase-128x128.png and /dev/null differ diff --git a/mambabase/mambabase-16x16.png b/mambabase/mambabase-16x16.png deleted file mode 100644 index 9b66b49..0000000 Binary files a/mambabase/mambabase-16x16.png and /dev/null differ diff --git a/mambabase/mambabase-22x22.png b/mambabase/mambabase-22x22.png deleted file mode 100644 index 6aee518..0000000 Binary files a/mambabase/mambabase-22x22.png and /dev/null differ diff --git a/mambabase/mambabase-32x32.png b/mambabase/mambabase-32x32.png deleted file mode 100644 index ea54640..0000000 Binary files a/mambabase/mambabase-32x32.png and /dev/null differ diff --git a/mambabase/mambabase-48x48.png b/mambabase/mambabase-48x48.png deleted file mode 100644 index 787b10f..0000000 Binary files a/mambabase/mambabase-48x48.png and /dev/null differ diff --git a/mambabase/mambabase-64x64.png b/mambabase/mambabase-64x64.png deleted file mode 100644 index 6f2ec5a..0000000 Binary files a/mambabase/mambabase-64x64.png and /dev/null differ diff --git a/mambabase/mambabase.png b/mambabase/mambabase.png deleted file mode 100644 index 7951ee3..0000000 Binary files a/mambabase/mambabase.png and /dev/null differ diff --git a/mambabase/mambabase.py b/mambabase/mambabase.py index a8adfec..40b7a47 100755 --- a/mambabase/mambabase.py +++ b/mambabase/mambabase.py @@ -351,7 +351,7 @@ class InstallationPage(QtWidgets.QWizardPage): if __name__ == '__main__': import sys app = QtWidgets.QApplication(sys.argv) - app.setWindowIcon(QtGui.QIcon(DATADIR + "mambabase.png")) + app.setWindowIcon(QtGui.QIcon.fromTheme("mambabase")) # UI translations locale = QLocale.system().name() language = locale[0:2] diff --git a/mambabase/openmamba.png b/mambabase/openmamba.png deleted file mode 100644 index ff941ba..0000000 Binary files a/mambabase/openmamba.png and /dev/null differ