From 0faef1449d6718b06b5dc1c2d43de86e91e867a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 4 Mar 2017 13:21:28 +0100 Subject: Move icons to hicolor theme (WIP) The transition is not complete, mgaapplet still needs fixed to lookup the icons in the theme paths and no in a hardcoded /usr/share/mgaonline --- Makefile | 9 +- data/icons/bugfix.svg | 260 --------------- data/icons/bundle.svg | 264 --------------- data/icons/busy.svg | 219 ------------- data/icons/disabled.svg | 216 ------------ data/icons/disconnect.svg | 216 ------------ data/icons/noconf.svg | 235 ------------- data/icons/okay.svg | 220 ------------- data/icons/updates.svg | 271 --------------- icons/hicolor/16x16/apps/mgaonline.png | Bin 0 -> 625 bytes icons/hicolor/32x32/apps/mgaonline.png | Bin 0 -> 1327 bytes icons/hicolor/48x48/apps/mgaonline.png | Bin 0 -> 2099 bytes .../hicolor/scalable/actions/mgaonline-bugfix.svg | 260 +++++++++++++++ .../hicolor/scalable/actions/mgaonline-bundle.svg | 264 +++++++++++++++ icons/hicolor/scalable/actions/mgaonline-busy.svg | 219 +++++++++++++ .../scalable/actions/mgaonline-disabled.svg | 216 ++++++++++++ .../scalable/actions/mgaonline-disconnect.svg | 216 ++++++++++++ .../hicolor/scalable/actions/mgaonline-noconf.svg | 235 +++++++++++++ icons/hicolor/scalable/actions/mgaonline-okay.svg | 220 +++++++++++++ .../hicolor/scalable/actions/mgaonline-updates.svg | 271 +++++++++++++++ icons/hicolor/scalable/apps/mgaonline.svg | 362 +++++++++++++++++++++ icons/mgaonline.svg | 362 --------------------- icons/mgaonline16.png | Bin 625 -> 0 bytes icons/mgaonline32.png | Bin 1327 -> 0 bytes icons/mgaonline48.png | Bin 2099 -> 0 bytes mgaapplet | 1 + mgaapplet-upgrade-helper | 1 - mgaapplet_gui.pm | 2 - 28 files changed, 2266 insertions(+), 2273 deletions(-) delete mode 100644 data/icons/bugfix.svg delete mode 100644 data/icons/bundle.svg delete mode 100644 data/icons/busy.svg delete mode 100644 data/icons/disabled.svg delete mode 100644 data/icons/disconnect.svg delete mode 100644 data/icons/noconf.svg delete mode 100644 data/icons/okay.svg delete mode 100644 data/icons/updates.svg create mode 100644 icons/hicolor/16x16/apps/mgaonline.png create mode 100644 icons/hicolor/32x32/apps/mgaonline.png create mode 100644 icons/hicolor/48x48/apps/mgaonline.png create mode 100644 icons/hicolor/scalable/actions/mgaonline-bugfix.svg create mode 100644 icons/hicolor/scalable/actions/mgaonline-bundle.svg create mode 100644 icons/hicolor/scalable/actions/mgaonline-busy.svg create mode 100644 icons/hicolor/scalable/actions/mgaonline-disabled.svg create mode 100644 icons/hicolor/scalable/actions/mgaonline-disconnect.svg create mode 100644 icons/hicolor/scalable/actions/mgaonline-noconf.svg create mode 100644 icons/hicolor/scalable/actions/mgaonline-okay.svg create mode 100644 icons/hicolor/scalable/actions/mgaonline-updates.svg create mode 100644 icons/hicolor/scalable/apps/mgaonline.svg delete mode 100644 icons/mgaonline.svg delete mode 100644 icons/mgaonline16.png delete mode 100644 icons/mgaonline32.png delete mode 100644 icons/mgaonline48.png diff --git a/Makefile b/Makefile index c7ead352..d5cdc508 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ SUBDIRS = po polkit PREFIX = / DATADIR = $(PREFIX)/usr/share -PKGDATADIR = $(DATADIR)/$(NAME) ICONSDIR = $(DATADIR)/icons LIBEXECDIR = $(PREFIX)/usr/libexec BINDIR = $(PREFIX)/usr/bin @@ -30,18 +29,14 @@ clean: find . -name '*~' | xargs rm -f install: all - install -d $(PREFIX)/usr/{bin,libexec,share/{mime/packages,$(NAME)/icons,autostart,gnome/autostart,icons},lib/libDrakX/drakfirsttime} + install -d $(PREFIX)/usr/{bin,libexec,share/{mime/packages,autostart,gnome/autostart,icons},lib/libDrakX/drakfirsttime} install -m755 $(MGAUPDATE) $(MGAAPPLET)-config $(MGAAPPLET)-upgrade-helper $(LIBEXECDIR) install -m755 $(MGAAPPLET) $(MGAAPPLET)-update-checker $(BINDIR) install -d $(SYSCONFDIR) install -m644 mgaapplet.conf $(SYSCONFDIR)/mgaapplet - install -D -m644 icons/$(NAME)16.png $(ICONSDIR)/hicolor/16x16/apps/$(NAME).png - install -D -m644 icons/$(NAME)32.png $(ICONSDIR)/hicolor/32x32/apps/$(NAME).png - install -D -m644 icons/$(NAME)48.png $(ICONSDIR)/hicolor/48x48/apps/$(NAME).png - install -D -m644 icons/$(NAME).svg $(ICONSDIR)/hicolor/scalable/apps/$(NAME).png + cp -a icons/hicolor $(ICONSDIR) # Compat symlink, to be sure we don't break external apps relying on this icon ln -s $(ICONSDIR)/hicolor/32x32/apps/$(NAME).png $(ICONSDIR)/$(NAME).png - install -m644 data/icons/*.svg $(PKGDATADIR)/icons perl -pi -e "s/version = 1/version = '$(VERSION)'/" mgaonline.pm install -m644 mgaonline.pm $(FBLIBDIR) install -m644 mgaapplet.pm $(FBLIBDIR) diff --git a/data/icons/bugfix.svg b/data/icons/bugfix.svg deleted file mode 100644 index 760d3e8c..00000000 --- a/data/icons/bugfix.svg +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/data/icons/bundle.svg b/data/icons/bundle.svg deleted file mode 100644 index 55c703df..00000000 --- a/data/icons/bundle.svg +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/data/icons/busy.svg b/data/icons/busy.svg deleted file mode 100644 index 02591187..00000000 --- a/data/icons/busy.svg +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/data/icons/disabled.svg b/data/icons/disabled.svg deleted file mode 100644 index 8453f8fb..00000000 --- a/data/icons/disabled.svg +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/data/icons/disconnect.svg b/data/icons/disconnect.svg deleted file mode 100644 index a904ea83..00000000 --- a/data/icons/disconnect.svg +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/data/icons/noconf.svg b/data/icons/noconf.svg deleted file mode 100644 index e0209c03..00000000 --- a/data/icons/noconf.svg +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/data/icons/okay.svg b/data/icons/okay.svg deleted file mode 100644 index 9a16755d..00000000 --- a/data/icons/okay.svg +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/data/icons/updates.svg b/data/icons/updates.svg deleted file mode 100644 index 519c2aaa..00000000 --- a/data/icons/updates.svg +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/icons/hicolor/16x16/apps/mgaonline.png b/icons/hicolor/16x16/apps/mgaonline.png new file mode 100644 index 00000000..1e376758 Binary files /dev/null and b/icons/hicolor/16x16/apps/mgaonline.png differ diff --git a/icons/hicolor/32x32/apps/mgaonline.png b/icons/hicolor/32x32/apps/mgaonline.png new file mode 100644 index 00000000..5dabbcab Binary files /dev/null and b/icons/hicolor/32x32/apps/mgaonline.png differ diff --git a/icons/hicolor/48x48/apps/mgaonline.png b/icons/hicolor/48x48/apps/mgaonline.png new file mode 100644 index 00000000..bb9df771 Binary files /dev/null and b/icons/hicolor/48x48/apps/mgaonline.png differ diff --git a/icons/hicolor/scalable/actions/mgaonline-bugfix.svg b/icons/hicolor/scalable/actions/mgaonline-bugfix.svg new file mode 100644 index 00000000..760d3e8c --- /dev/null +++ b/icons/hicolor/scalable/actions/mgaonline-bugfix.svg @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/icons/hicolor/scalable/actions/mgaonline-bundle.svg b/icons/hicolor/scalable/actions/mgaonline-bundle.svg new file mode 100644 index 00000000..55c703df --- /dev/null +++ b/icons/hicolor/scalable/actions/mgaonline-bundle.svg @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/icons/hicolor/scalable/actions/mgaonline-busy.svg b/icons/hicolor/scalable/actions/mgaonline-busy.svg new file mode 100644 index 00000000..02591187 --- /dev/null +++ b/icons/hicolor/scalable/actions/mgaonline-busy.svg @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/icons/hicolor/scalable/actions/mgaonline-disabled.svg b/icons/hicolor/scalable/actions/mgaonline-disabled.svg new file mode 100644 index 00000000..8453f8fb --- /dev/null +++ b/icons/hicolor/scalable/actions/mgaonline-disabled.svg @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/icons/hicolor/scalable/actions/mgaonline-disconnect.svg b/icons/hicolor/scalable/actions/mgaonline-disconnect.svg new file mode 100644 index 00000000..a904ea83 --- /dev/null +++ b/icons/hicolor/scalable/actions/mgaonline-disconnect.svg @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/icons/hicolor/scalable/actions/mgaonline-noconf.svg b/icons/hicolor/scalable/actions/mgaonline-noconf.svg new file mode 100644 index 00000000..e0209c03 --- /dev/null +++ b/icons/hicolor/scalable/actions/mgaonline-noconf.svg @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/icons/hicolor/scalable/actions/mgaonline-okay.svg b/icons/hicolor/scalable/actions/mgaonline-okay.svg new file mode 100644 index 00000000..9a16755d --- /dev/null +++ b/icons/hicolor/scalable/actions/mgaonline-okay.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/icons/hicolor/scalable/actions/mgaonline-updates.svg b/icons/hicolor/scalable/actions/mgaonline-updates.svg new file mode 100644 index 00000000..519c2aaa --- /dev/null +++ b/icons/hicolor/scalable/actions/mgaonline-updates.svg @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/icons/hicolor/scalable/apps/mgaonline.svg b/icons/hicolor/scalable/apps/mgaonline.svg new file mode 100644 index 00000000..71ec37ae --- /dev/null +++ b/icons/hicolor/scalable/apps/mgaonline.svg @@ -0,0 +1,362 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/mgaonline.svg b/icons/mgaonline.svg deleted file mode 100644 index 71ec37ae..00000000 --- a/icons/mgaonline.svg +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/mgaonline16.png b/icons/mgaonline16.png deleted file mode 100644 index 1e376758..00000000 Binary files a/icons/mgaonline16.png and /dev/null differ diff --git a/icons/mgaonline32.png b/icons/mgaonline32.png deleted file mode 100644 index 5dabbcab..00000000 Binary files a/icons/mgaonline32.png and /dev/null differ diff --git a/icons/mgaonline48.png b/icons/mgaonline48.png deleted file mode 100644 index bb9df771..00000000 Binary files a/icons/mgaonline48.png and /dev/null differ diff --git a/mgaapplet b/mgaapplet index 4b7d3a47..db76ba17 100755 --- a/mgaapplet +++ b/mgaapplet @@ -42,6 +42,7 @@ use Net::DBus qw(:typing); use Rpmdrake::open_db; use Glib::Object::Introspection; +# FIXME: Icon lookup should be done in hicolor theme use constant IMAGE_FOLDER => '/usr/share/mgaonline/icons/'; Glib::Object::Introspection->setup( diff --git a/mgaapplet-upgrade-helper b/mgaapplet-upgrade-helper index 24d35104..9a6d516a 100755 --- a/mgaapplet-upgrade-helper +++ b/mgaapplet-upgrade-helper @@ -41,7 +41,6 @@ use Rpmdrake::open_db; use lang; use mgaapplet_gui qw(run_ask_credentials_dialog); -ugtk3::add_icon_path("/usr/share/mgaonline/icons/"); my ($log_file); my ($new_distro_version, $download_dir); diff --git a/mgaapplet_gui.pm b/mgaapplet_gui.pm index 11190453..75e09fca 100644 --- a/mgaapplet_gui.pm +++ b/mgaapplet_gui.pm @@ -53,8 +53,6 @@ use interactive; use interactive::gtk; use lib qw(/usr/lib/libDrakX/drakfirsttime); -ugtk3::add_icon_path("/usr/share/mgaonline/icons/"); - our $localdir = "$ENV{HOME}/.MgaOnline"; our $localfile = "$localdir/mgaonline"; -- cgit v1.2.1