diff options
20 files changed, 106 insertions, 88 deletions
diff --git a/baobab/pixmaps/24x24/Makefile.am b/baobab/pixmaps/24x24/Makefile.am deleted file mode 100644 index 7edb810a..00000000 --- a/baobab/pixmaps/24x24/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -NULL = - -size = 24x24 - -iconsdir = $(datadir)/icons/hicolor/$(size)/apps - -icons_DATA = \ - mate-disk-usage-analyzer.png \ - $(NULL) - -icons_SOURCE = \ - $(NULL) - -EXTRA_DIST = \ - $(icons_DATA) \ - $(icons_SOURCE) - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi diff --git a/baobab/pixmaps/24x24/mate-disk-usage-analyzer.png b/baobab/pixmaps/24x24/mate-disk-usage-analyzer.png Binary files differdeleted file mode 100644 index f7a7a6ae..00000000 --- a/baobab/pixmaps/24x24/mate-disk-usage-analyzer.png +++ /dev/null diff --git a/baobab/pixmaps/Makefile.am b/baobab/pixmaps/Makefile.am index 6bfb6135..5edbe806 100644 --- a/baobab/pixmaps/Makefile.am +++ b/baobab/pixmaps/Makefile.am @@ -1,8 +1,63 @@ -SUBDIRS = 24x24 scalable +png_icons = \ + hicolor_apps_16x16_mate-disk-usage-analyzer.png \ + hicolor_apps_22x22_mate-disk-usage-analyzer.png \ + hicolor_apps_32x32_mate-disk-usage-analyzer.png \ + hicolor_apps_48x48_mate-disk-usage-analyzer.png \ + hicolor_apps_128x128_mate-disk-usage-analyzer.png \ + $(NULL) -imagesdir = $(datadir)/mate-disk-usage-analyzer/pixmaps -images_DATA = \ - shot.png +public_icons = \ + $(png_icons) \ + hicolor_apps_scalable_mate-disk-usage-analyzer.svg \ + $(NULL) + +hicolor_apps_%.png: hicolor_apps_scalable_mate-disk-usage-analyzer.svg + rsvg-convert -w $(word 1, $(subst x, ,$(word 1,$(subst _, ,$*)))) -h $(word 2, $(subst x, ,$(word 1,$(subst _, ,$*)))) $^ -o $@ EXTRA_DIST = \ - $(images_DATA) + $(public_icons) \ + $(NULL) + +############################################################################### + +install-icons: $(public_icons) + for icon in $(public_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done + +uninstall-icons: + -for icon in $(public_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done + +install-data-local: install-icons + +uninstall-local: uninstall-icons + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: update-icon-cache +uninstall-hook: update-icon-cache +update-icon-cache: $(public_icons) + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + +.PHONY: build-png-icons clean-png-icons +build-png-icons: $(png_icons) + +clean-png-icons: + rm -f $(png_icons) diff --git a/baobab/pixmaps/hicolor_apps_128x128_mate-disk-usage-analyzer.png b/baobab/pixmaps/hicolor_apps_128x128_mate-disk-usage-analyzer.png Binary files differnew file mode 100644 index 00000000..321e8983 --- /dev/null +++ b/baobab/pixmaps/hicolor_apps_128x128_mate-disk-usage-analyzer.png diff --git a/baobab/pixmaps/hicolor_apps_16x16_mate-disk-usage-analyzer.png b/baobab/pixmaps/hicolor_apps_16x16_mate-disk-usage-analyzer.png Binary files differnew file mode 100644 index 00000000..f0130d2a --- /dev/null +++ b/baobab/pixmaps/hicolor_apps_16x16_mate-disk-usage-analyzer.png diff --git a/baobab/pixmaps/hicolor_apps_22x22_mate-disk-usage-analyzer.png b/baobab/pixmaps/hicolor_apps_22x22_mate-disk-usage-analyzer.png Binary files differnew file mode 100644 index 00000000..0c481eec --- /dev/null +++ b/baobab/pixmaps/hicolor_apps_22x22_mate-disk-usage-analyzer.png diff --git a/baobab/pixmaps/hicolor_apps_24x24_mate-disk-usage-analyzer.png b/baobab/pixmaps/hicolor_apps_24x24_mate-disk-usage-analyzer.png Binary files differnew file mode 100644 index 00000000..e85e22ae --- /dev/null +++ b/baobab/pixmaps/hicolor_apps_24x24_mate-disk-usage-analyzer.png diff --git a/baobab/pixmaps/hicolor_apps_32x32_mate-disk-usage-analyzer.png b/baobab/pixmaps/hicolor_apps_32x32_mate-disk-usage-analyzer.png Binary files differnew file mode 100644 index 00000000..d276d1fc --- /dev/null +++ b/baobab/pixmaps/hicolor_apps_32x32_mate-disk-usage-analyzer.png diff --git a/baobab/pixmaps/hicolor_apps_48x48_mate-disk-usage-analyzer.png b/baobab/pixmaps/hicolor_apps_48x48_mate-disk-usage-analyzer.png Binary files differnew file mode 100644 index 00000000..d9e122ab --- /dev/null +++ b/baobab/pixmaps/hicolor_apps_48x48_mate-disk-usage-analyzer.png diff --git a/baobab/pixmaps/scalable/mate-disk-usage-analyzer.svg b/baobab/pixmaps/hicolor_apps_scalable_mate-disk-usage-analyzer.svg index c9daaaad..c9daaaad 100644 --- a/baobab/pixmaps/scalable/mate-disk-usage-analyzer.svg +++ b/baobab/pixmaps/hicolor_apps_scalable_mate-disk-usage-analyzer.svg diff --git a/baobab/pixmaps/scalable/Makefile.am b/baobab/pixmaps/scalable/Makefile.am deleted file mode 100644 index caeb628d..00000000 --- a/baobab/pixmaps/scalable/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -NULL = - -size = scalable - -iconsdir = $(datadir)/icons/hicolor/$(size)/apps - -icons_DATA = \ - mate-disk-usage-analyzer.svg \ - $(NULL) - -icons_SOURCE = \ - $(NULL) - -EXTRA_DIST = \ - $(icons_DATA) \ - $(icons_SOURCE) - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi diff --git a/baobab/pixmaps/shot.png b/baobab/pixmaps/shot.png Binary files differdeleted file mode 100644 index 271ad117..00000000 --- a/baobab/pixmaps/shot.png +++ /dev/null diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c index 92775bea..3bed3997 100644 --- a/baobab/src/baobab.c +++ b/baobab/src/baobab.c @@ -932,7 +932,7 @@ create_context_menu (void) menu->snapshot_item = gtk_image_menu_item_new_with_label (_("Save screenshot")); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu->snapshot_item), - gtk_image_new_from_file (BAOBAB_PIX_DIR "shot.png")); + gtk_image_new_from_icon_name ("applets-screenshooter", GTK_ICON_SIZE_MENU)); gtk_menu_shell_append (GTK_MENU_SHELL (menu->widget), menu->up_item); diff --git a/configure.ac b/configure.ac index 24e8c48f..b9f1437e 100644 --- a/configure.ac +++ b/configure.ac @@ -345,8 +345,6 @@ baobab/Makefile baobab/data/Makefile baobab/data/org.mate.disk-usage-analyzer.gschema.xml baobab/pixmaps/Makefile -baobab/pixmaps/24x24/Makefile -baobab/pixmaps/scalable/Makefile baobab/src/Makefile baobab/help/Makefile diff --git a/logview/data/icons/Makefile.am b/logview/data/icons/Makefile.am index 20f0da67..7dcf7a2c 100644 --- a/logview/data/icons/Makefile.am +++ b/logview/data/icons/Makefile.am @@ -4,15 +4,34 @@ public_icons_themes = \ hicolor \ $(NULL) +png_icons = \ + hicolor_apps_16x16_mate-system-log.png \ + hicolor_apps_22x22_mate-system-log.png \ + hicolor_apps_32x32_mate-system-log.png \ + hicolor_apps_48x48_mate-system-log.png \ + hicolor_apps_256x256_mate-system-log.png \ + $(NULL) + public_icons = \ - hicolor_apps_16x16_mate-system-log.png \ - hicolor_apps_22x22_mate-system-log.png \ - hicolor_apps_32x32_mate-system-log.png \ - hicolor_apps_48x48_mate-system-log.png \ - hicolor_apps_256x256_mate-system-log.png \ + $(png_icons) \ hicolor_apps_scalable_mate-system-log-symbolic.svg \ $(NULL) +hicolor_apps_16x16_mate-system-log.png: logview.svg + inkscape -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@ + +hicolor_apps_22x22_mate-system-log.png: logview.svg + inkscape -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@ + +hicolor_apps_32x32_mate-system-log.png: logview.svg + inkscape -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@ + +hicolor_apps_48x48_mate-system-log.png: logview.svg + inkscape -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@ + +hicolor_apps_256x256_mate-system-log.png: logview.svg + inkscape -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@ + noinst_DATA = \ logview.svg \ $(NULL) @@ -24,21 +43,6 @@ EXTRA_DIST = \ ############################################################################### -gtk_update_icon_cache = gtk-update-icon-cache -f -t - -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - for theme in $(public_icons_themes); do \ - $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \ - done; \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - for theme in $(public_icons_themes); do \ - echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \ - done; \ - fi - install-icons: for icon in $(public_icons); do \ THEME=`echo $$icon | cut -d_ -f1`; \ @@ -58,6 +62,25 @@ uninstall-icons: rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ done -install-data-local: install-icons update-icon-cache +install-data-local: install-icons + +uninstall-local: uninstall-icons + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: update-icon-cache +uninstall-hook: update-icon-cache +update-icon-cache: $(public_icons) + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + +.PHONY: build-png-icons clean-png-icons +build-png-icons: $(png_icons) -uninstall-local: uninstall-icons update-icon-cache +clean-png-icons: + rm -f $(png_icons) diff --git a/logview/data/icons/hicolor_apps_16x16_mate-system-log.png b/logview/data/icons/hicolor_apps_16x16_mate-system-log.png Binary files differindex 34638e07..0a8ff744 100644 --- a/logview/data/icons/hicolor_apps_16x16_mate-system-log.png +++ b/logview/data/icons/hicolor_apps_16x16_mate-system-log.png diff --git a/logview/data/icons/hicolor_apps_22x22_mate-system-log.png b/logview/data/icons/hicolor_apps_22x22_mate-system-log.png Binary files differindex ff6fad54..55a132f0 100644 --- a/logview/data/icons/hicolor_apps_22x22_mate-system-log.png +++ b/logview/data/icons/hicolor_apps_22x22_mate-system-log.png diff --git a/logview/data/icons/hicolor_apps_256x256_mate-system-log.png b/logview/data/icons/hicolor_apps_256x256_mate-system-log.png Binary files differindex 45334bf8..bccadd7d 100644 --- a/logview/data/icons/hicolor_apps_256x256_mate-system-log.png +++ b/logview/data/icons/hicolor_apps_256x256_mate-system-log.png diff --git a/logview/data/icons/hicolor_apps_32x32_mate-system-log.png b/logview/data/icons/hicolor_apps_32x32_mate-system-log.png Binary files differindex 943028d1..11f1e749 100644 --- a/logview/data/icons/hicolor_apps_32x32_mate-system-log.png +++ b/logview/data/icons/hicolor_apps_32x32_mate-system-log.png diff --git a/logview/data/icons/hicolor_apps_48x48_mate-system-log.png b/logview/data/icons/hicolor_apps_48x48_mate-system-log.png Binary files differindex b00429e9..cc023091 100644 --- a/logview/data/icons/hicolor_apps_48x48_mate-system-log.png +++ b/logview/data/icons/hicolor_apps_48x48_mate-system-log.png |
