From 9d4e41ec40f97ba21f7737191f83156384404020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 28 May 2016 18:15:19 +0200 Subject: Install drakconf icon to hicolor (with SVG) Allows to use scalable graphics unlike icons/{,large,mini} (mga#18066) --- NEWS | 2 + control-center | 6 +- pixmaps/Makefile | 6 +- pixmaps/default/splash_screen_about.png | Bin 2357 -> 0 bytes pixmaps/icons/drakconf.png | Bin 1824 -> 0 bytes pixmaps/icons/hicolor/20x20/apps/drakconf.png | Bin 0 -> 1163 bytes pixmaps/icons/hicolor/32x32/apps/drakconf.png | Bin 0 -> 1824 bytes pixmaps/icons/hicolor/48x48/apps/drakconf.png | Bin 0 -> 3079 bytes pixmaps/icons/hicolor/scalable/apps/drakconf.svg | 294 +++++++++++++++++++++++ pixmaps/icons/large/drakconf.png | Bin 3079 -> 0 bytes pixmaps/icons/mini/drakconf.png | Bin 1163 -> 0 bytes pixmaps/icons/svg/drakconf.svg | 294 ----------------------- 12 files changed, 303 insertions(+), 299 deletions(-) delete mode 100644 pixmaps/default/splash_screen_about.png delete mode 100644 pixmaps/icons/drakconf.png create mode 100644 pixmaps/icons/hicolor/20x20/apps/drakconf.png create mode 100644 pixmaps/icons/hicolor/32x32/apps/drakconf.png create mode 100644 pixmaps/icons/hicolor/48x48/apps/drakconf.png create mode 100644 pixmaps/icons/hicolor/scalable/apps/drakconf.svg delete mode 100644 pixmaps/icons/large/drakconf.png delete mode 100644 pixmaps/icons/mini/drakconf.png delete mode 100644 pixmaps/icons/svg/drakconf.svg diff --git a/NEWS b/NEWS index 718cfaeb..ee42e9d2 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- install drakconf icon to icons/hicolor (with SVG) instead of + icons/{,large,mini} (mga#18066) - drop obsolete drakconf icons (mga#18066) - use new icon for update frequency applet (mga#18226) diff --git a/control-center b/control-center index b45974d7..caf48ff1 100755 --- a/control-center +++ b/control-center @@ -594,7 +594,7 @@ if ($geometry) { } $window_global->resize(max($default_width, $h{WIDTH}, $min_width), max($h{HEIGTH}, $default_height, $min_height)); -$window_global->set_icon(gtkcreate_pixbuf("/usr/share/icons/drakconf.png")); +$window_global->set_icon(gtkcreate_pixbuf("/usr/share/icons/hicolor/32x32/apps/drakconf.png")); my $pending_app = 0; @@ -755,7 +755,7 @@ foreach my $notebook ($banner_notebook) { # banner : -#add2notebook($banner_notebook, "", Gtk3::Banner->new("/usr/share/icons/large/drakconf.png", +#add2notebook($banner_notebook, "", Gtk3::Banner->new("/usr/share/icons/hicolor/48x48/apps/drakconf.png", # N("Welcome to the %s Control Center", $branding))); @@ -1462,7 +1462,7 @@ sub about_mga_cc() { $list->get_selection->set_mode('none'); gtkpack_($window_about->get_child, - (0, Gtk3::Banner->new('/usr/share/icons/large/drakconf.png', + (0, Gtk3::Banner->new('/usr/share/icons/hicolor/48x48/apps/drakconf.png', #-PO: Here, first %s will be replaced by 'Mageia' #-PO: second %s will be replaced by the version (eg: "Mageia 1 (Free) Control Center") N("%s %s (%s) Control Center", diff --git a/pixmaps/Makefile b/pixmaps/Makefile index 6df1cf21..a7c487db 100644 --- a/pixmaps/Makefile +++ b/pixmaps/Makefile @@ -1,9 +1,11 @@ THEMES = default kde gnome -mcc_dir = $(DESTDIR)/usr/share/mcc/themes +SHAREDIR = $(DESTDIR)/usr/share +THEMEDIR = $(SHAREDIR)/mcc/themes all: clean: install: - for d in $(THEMES); do ( install -d $(mcc_dir)/$$d ; install -m644 $$d/*.png $(mcc_dir)/$$d ; if [ -e $$d/*.rc ]; then install -m644 $$d/*.rc $(mcc_dir)/$$d; fi; ) ; done + install -d $(SHAREDIR); cp -a icons $(SHAREDIR); \ + for d in $(THEMES); do ( install -d $(THEMEDIR)/$$d ; install -m644 $$d/*.png $(THEMEDIR)/$$d ; if [ -e $$d/*.rc ]; then install -m644 $$d/*.rc $(THEMEDIR)/$$d; fi; ) ; done diff --git a/pixmaps/default/splash_screen_about.png b/pixmaps/default/splash_screen_about.png deleted file mode 100644 index 01a425a6..00000000 Binary files a/pixmaps/default/splash_screen_about.png and /dev/null differ diff --git a/pixmaps/icons/drakconf.png b/pixmaps/icons/drakconf.png deleted file mode 100644 index f033fba3..00000000 Binary files a/pixmaps/icons/drakconf.png and /dev/null differ diff --git a/pixmaps/icons/hicolor/20x20/apps/drakconf.png b/pixmaps/icons/hicolor/20x20/apps/drakconf.png new file mode 100644 index 00000000..a18fde5e Binary files /dev/null and b/pixmaps/icons/hicolor/20x20/apps/drakconf.png differ diff --git a/pixmaps/icons/hicolor/32x32/apps/drakconf.png b/pixmaps/icons/hicolor/32x32/apps/drakconf.png new file mode 100644 index 00000000..f033fba3 Binary files /dev/null and b/pixmaps/icons/hicolor/32x32/apps/drakconf.png differ diff --git a/pixmaps/icons/hicolor/48x48/apps/drakconf.png b/pixmaps/icons/hicolor/48x48/apps/drakconf.png new file mode 100644 index 00000000..f7602232 Binary files /dev/null and b/pixmaps/icons/hicolor/48x48/apps/drakconf.png differ diff --git a/pixmaps/icons/hicolor/scalable/apps/drakconf.svg b/pixmaps/icons/hicolor/scalable/apps/drakconf.svg new file mode 100644 index 00000000..1e2bacdf --- /dev/null +++ b/pixmaps/icons/hicolor/scalable/apps/drakconf.svg @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/icons/large/drakconf.png b/pixmaps/icons/large/drakconf.png deleted file mode 100644 index f7602232..00000000 Binary files a/pixmaps/icons/large/drakconf.png and /dev/null differ diff --git a/pixmaps/icons/mini/drakconf.png b/pixmaps/icons/mini/drakconf.png deleted file mode 100644 index a18fde5e..00000000 Binary files a/pixmaps/icons/mini/drakconf.png and /dev/null differ diff --git a/pixmaps/icons/svg/drakconf.svg b/pixmaps/icons/svg/drakconf.svg deleted file mode 100644 index 1e2bacdf..00000000 --- a/pixmaps/icons/svg/drakconf.svg +++ /dev/null @@ -1,294 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - -- cgit v1.2.1