From 7cfad1c08a66678e01a1568baf7900d498962a46 Mon Sep 17 00:00:00 2001 From: rbuj Date: Sat, 16 Mar 2019 14:49:24 +0100 Subject: Use icons provided by themes and remove not used icons --- capplets/display/Makefile.am | 23 - .../16x16/mate-preferences-desktop-display.png | Bin 613 -> 0 bytes .../22x22/mate-preferences-desktop-display.png | Bin 866 -> 0 bytes .../24x24/mate-preferences-desktop-display.png | Bin 909 -> 0 bytes .../32x32/mate-preferences-desktop-display.png | Bin 1602 -> 0 bytes .../scalable/mate-preferences-desktop-display.svg | 470 --------------------- .../display/mate-display-properties.desktop.in | 2 +- capplets/display/xrandr-capplet.c | 4 +- 8 files changed, 3 insertions(+), 496 deletions(-) delete mode 100644 capplets/display/icons/16x16/mate-preferences-desktop-display.png delete mode 100644 capplets/display/icons/22x22/mate-preferences-desktop-display.png delete mode 100644 capplets/display/icons/24x24/mate-preferences-desktop-display.png delete mode 100644 capplets/display/icons/32x32/mate-preferences-desktop-display.png delete mode 100644 capplets/display/icons/scalable/mate-preferences-desktop-display.svg (limited to 'capplets/display') diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am index d442fe6f..4b168ac0 100644 --- a/capplets/display/Makefile.am +++ b/capplets/display/Makefile.am @@ -36,17 +36,6 @@ dist_polkit_policy_DATA = \ @INTLTOOL_DESKTOP_RULE@ -icons16dir = $(datadir)/icons/hicolor/16x16/apps -dist_icons16_DATA = icons/16x16/mate-preferences-desktop-display.png -icons22dir = $(datadir)/icons/hicolor/22x22/apps -dist_icons22_DATA = icons/22x22/mate-preferences-desktop-display.png -icons24dir = $(datadir)/icons/hicolor/24x24/apps -dist_icons24_DATA = icons/24x24/mate-preferences-desktop-display.png -icons32dir = $(datadir)/icons/hicolor/32x32/apps -dist_icons32_DATA = icons/32x32/mate-preferences-desktop-display.png -iconssvgdir = $(datadir)/icons/hicolor/scalable/apps -dist_iconssvg_DATA = icons/scalable/mate-preferences-desktop-display.svg - desktopdir = $(datadir)/applications Desktop_in_files = mate-display-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) @@ -60,18 +49,6 @@ AM_CPPFLAGS = $(DISPLAY_CAPPLET_CFLAGS) \ CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) -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 - EXTRA_DIST = org.mate.randr.policy.in $(Desktop_in_files) DISTCLEANFILES = org.mate.randr.policy diff --git a/capplets/display/icons/16x16/mate-preferences-desktop-display.png b/capplets/display/icons/16x16/mate-preferences-desktop-display.png deleted file mode 100644 index f996ddf5..00000000 Binary files a/capplets/display/icons/16x16/mate-preferences-desktop-display.png and /dev/null differ diff --git a/capplets/display/icons/22x22/mate-preferences-desktop-display.png b/capplets/display/icons/22x22/mate-preferences-desktop-display.png deleted file mode 100644 index cc47eec6..00000000 Binary files a/capplets/display/icons/22x22/mate-preferences-desktop-display.png and /dev/null differ diff --git a/capplets/display/icons/24x24/mate-preferences-desktop-display.png b/capplets/display/icons/24x24/mate-preferences-desktop-display.png deleted file mode 100644 index 49b4e12c..00000000 Binary files a/capplets/display/icons/24x24/mate-preferences-desktop-display.png and /dev/null differ diff --git a/capplets/display/icons/32x32/mate-preferences-desktop-display.png b/capplets/display/icons/32x32/mate-preferences-desktop-display.png deleted file mode 100644 index 95de3eaa..00000000 Binary files a/capplets/display/icons/32x32/mate-preferences-desktop-display.png and /dev/null differ diff --git a/capplets/display/icons/scalable/mate-preferences-desktop-display.svg b/capplets/display/icons/scalable/mate-preferences-desktop-display.svg deleted file mode 100644 index 0679b6b3..00000000 --- a/capplets/display/icons/scalable/mate-preferences-desktop-display.svg +++ /dev/null @@ -1,470 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Change Resolution - - - Jakub Steiner - - - - - - display - resolution - video - - - - - Andreas Nilsson -Luca Ferretti <elle.uca@libero.it> - - - - http://www.gnome.org - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/capplets/display/mate-display-properties.desktop.in b/capplets/display/mate-display-properties.desktop.in index 324529fa..59de1d13 100644 --- a/capplets/display/mate-display-properties.desktop.in +++ b/capplets/display/mate-display-properties.desktop.in @@ -2,7 +2,7 @@ _Name=Displays _Comment=Change resolution and position of monitors and projectors Exec=mate-display-properties -Icon=mate-preferences-desktop-display +Icon=preferences-desktop-display Terminal=false Type=Application StartupNotify=true diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c index 17ac1b64..0bb7430c 100644 --- a/capplets/display/xrandr-capplet.c +++ b/capplets/display/xrandr-capplet.c @@ -2431,9 +2431,9 @@ run_application (App *app) g_signal_connect_after (app->dialog, "map-event", G_CALLBACK (dialog_map_event_cb), app); - gtk_window_set_default_icon_name ("mate-preferences-desktop-display"); + gtk_window_set_default_icon_name ("preferences-desktop-display"); gtk_window_set_icon_name (GTK_WINDOW (app->dialog), - "mate-preferences-desktop-display"); + "preferences-desktop-display"); app->current_monitor_event_box = _gtk_builder_get_widget (builder, "current_monitor_event_box"); -- cgit v1.2.1