From 7c5d340069139df598b6fda72f773697b5cd7045 Mon Sep 17 00:00:00 2001 From: Zhang Xianwei Date: Fri, 5 Oct 2018 11:18:19 -0400 Subject: media-keys: Remove touchpad OSD icons and use theme's instead To be controllable by theme, use the touchpad enabled/disabled icons in mate-icon-theme. Refer to mate-icon-theme commit "add icons for touchpad": 932961db50aaea23b953a79e0967385bf66a12ea Signed-off-by: Zhang Xianwei --- plugins/media-keys/Makefile.am | 49 +- plugins/media-keys/msd-media-keys-manager.c | 2 +- plugins/media-keys/touchpad-disabled-16.png | Bin 610 -> 0 bytes plugins/media-keys/touchpad-disabled-22.png | Bin 957 -> 0 bytes plugins/media-keys/touchpad-disabled-24.png | Bin 985 -> 0 bytes plugins/media-keys/touchpad-disabled-32.png | Bin 1610 -> 0 bytes plugins/media-keys/touchpad-disabled-48.png | Bin 2208 -> 0 bytes plugins/media-keys/touchpad-disabled-template.svg | 1172 --------------------- plugins/media-keys/touchpad-disabled.svg | 833 --------------- plugins/media-keys/touchpad-enabled-16.png | Bin 626 -> 0 bytes plugins/media-keys/touchpad-enabled-22.png | Bin 938 -> 0 bytes plugins/media-keys/touchpad-enabled-24.png | Bin 949 -> 0 bytes plugins/media-keys/touchpad-enabled-32.png | Bin 1494 -> 0 bytes plugins/media-keys/touchpad-enabled-48.png | Bin 2041 -> 0 bytes plugins/media-keys/touchpad-enabled-template.svg | 936 ---------------- plugins/media-keys/touchpad-enabled.svg | 581 ---------- 16 files changed, 2 insertions(+), 3571 deletions(-) delete mode 100644 plugins/media-keys/touchpad-disabled-16.png delete mode 100644 plugins/media-keys/touchpad-disabled-22.png delete mode 100644 plugins/media-keys/touchpad-disabled-24.png delete mode 100644 plugins/media-keys/touchpad-disabled-32.png delete mode 100644 plugins/media-keys/touchpad-disabled-48.png delete mode 100644 plugins/media-keys/touchpad-disabled-template.svg delete mode 100644 plugins/media-keys/touchpad-disabled.svg delete mode 100644 plugins/media-keys/touchpad-enabled-16.png delete mode 100644 plugins/media-keys/touchpad-enabled-22.png delete mode 100644 plugins/media-keys/touchpad-enabled-24.png delete mode 100644 plugins/media-keys/touchpad-enabled-32.png delete mode 100644 plugins/media-keys/touchpad-enabled-48.png delete mode 100644 plugins/media-keys/touchpad-enabled-template.svg delete mode 100644 plugins/media-keys/touchpad-enabled.svg diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am index 89fa0d0..3a41d85 100644 --- a/plugins/media-keys/Makefile.am +++ b/plugins/media-keys/Makefile.am @@ -11,49 +11,6 @@ BUILT_SOURCES = \ msd-marshal.c \ $(NULL) -ICON_FILES = \ - touchpad-disabled-16.png \ - touchpad-enabled-16.png \ - touchpad-disabled-22.png \ - touchpad-enabled-22.png \ - touchpad-disabled-24.png \ - touchpad-enabled-24.png \ - touchpad-disabled-32.png \ - touchpad-enabled-32.png \ - touchpad-disabled-48.png \ - touchpad-enabled-48.png \ - touchpad-disabled.svg \ - touchpad-enabled.svg - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(icondir)/16x16/$(context) - $(mkinstalldirs) $(DESTDIR)$(icondir)/22x22/$(context) - $(mkinstalldirs) $(DESTDIR)$(icondir)/24x24/$(context) - $(mkinstalldirs) $(DESTDIR)$(icondir)/32x32/$(context) - $(mkinstalldirs) $(DESTDIR)$(icondir)/scalable/$(context) - $(INSTALL_DATA) $(srcdir)/touchpad-enabled-16.png $(DESTDIR)$(icondir)/16x16/$(context)/touchpad-enabled.png - $(INSTALL_DATA) $(srcdir)/touchpad-enabled-22.png $(DESTDIR)$(icondir)/22x22/$(context)/touchpad-enabled.png - $(INSTALL_DATA) $(srcdir)/touchpad-enabled-24.png $(DESTDIR)$(icondir)/24x24/$(context)/touchpad-enabled.png - $(INSTALL_DATA) $(srcdir)/touchpad-enabled-32.png $(DESTDIR)$(icondir)/32x32/$(context)/touchpad-enabled.png - $(INSTALL_DATA) $(srcdir)/touchpad-enabled.svg $(DESTDIR)$(icondir)/scalable/$(context)/touchpad-enabled.svg - $(INSTALL_DATA) $(srcdir)/touchpad-disabled-16.png $(DESTDIR)$(icondir)/16x16/$(context)/touchpad-disabled.png - $(INSTALL_DATA) $(srcdir)/touchpad-disabled-22.png $(DESTDIR)$(icondir)/22x22/$(context)/touchpad-disabled.png - $(INSTALL_DATA) $(srcdir)/touchpad-disabled-24.png $(DESTDIR)$(icondir)/24x24/$(context)/touchpad-disabled.png - $(INSTALL_DATA) $(srcdir)/touchpad-disabled-32.png $(DESTDIR)$(icondir)/32x32/$(context)/touchpad-disabled.png - $(INSTALL_DATA) $(srcdir)/touchpad-disabled.svg $(DESTDIR)$(icondir)/scalable/$(context)/touchpad-disabled.svg - -uninstall-local: - rm -f $(DESTDIR)$(icondir)/16x16/$(context)/touchpad-enabled.png - rm -f $(DESTDIR)$(icondir)/22x22/$(context)/touchpad-enabled.png - rm -f $(DESTDIR)$(icondir)/24x24/$(context)/touchpad-enabled.png - rm -f $(DESTDIR)$(icondir)/32x32/$(context)/touchpad-enabled.png - rm -f $(DESTDIR)$(icondir)/scalable/$(context)/touchpad-enabled.svg - rm -f $(DESTDIR)$(icondir)/16x16/$(context)/touchpad-disabled.png - rm -f $(DESTDIR)$(icondir)/22x22/$(context)/touchpad-disabled.png - rm -f $(DESTDIR)$(icondir)/24x24/$(context)/touchpad-disabled.png - rm -f $(DESTDIR)$(icondir)/32x32/$(context)/touchpad-disabled.png - rm -f $(DESTDIR)$(icondir)/scalable/$(context)/touchpad-disabled.svg - msd-media-keys-manager-glue.h: msd-media-keys-manager.xml Makefile $(AM_V_GEN) dbus-binding-tool --prefix=msd_media_keys_manager --mode=glib-server $< > xgen-$(@F) \ && ( cmp -s xgen-$(@F) $@ || cp xgen-$(@F) $@ ) \ @@ -180,11 +137,7 @@ EXTRA_DIST = \ msd-media-keys-manager.xml \ msd-marshal.list \ $(plugin_in_files) \ - $(gtkbuilder_DATA) \ - $(pixmaps_DATA) \ - touchpad-enabled-template.svg \ - touchpad-disabled-template.svg \ - $(ICON_FILES) + $(gtkbuilder_DATA) CLEANFILES = \ $(BUILT_SOURCES) \ diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c index cbf8586..14434e5 100644 --- a/plugins/media-keys/msd-media-keys-manager.c +++ b/plugins/media-keys/msd-media-keys-manager.c @@ -590,7 +590,7 @@ do_touchpad_osd_action (MsdMediaKeysManager *manager, gboolean state) { dialog_init (manager); msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog), - state ? "touchpad-enabled" : "touchpad-disabled", + state ? "input-touchpad" : "touchpad-disabled", FALSE); dialog_show (manager); } diff --git a/plugins/media-keys/touchpad-disabled-16.png b/plugins/media-keys/touchpad-disabled-16.png deleted file mode 100644 index c8355de..0000000 Binary files a/plugins/media-keys/touchpad-disabled-16.png and /dev/null differ diff --git a/plugins/media-keys/touchpad-disabled-22.png b/plugins/media-keys/touchpad-disabled-22.png deleted file mode 100644 index 706fbc7..0000000 Binary files a/plugins/media-keys/touchpad-disabled-22.png and /dev/null differ diff --git a/plugins/media-keys/touchpad-disabled-24.png b/plugins/media-keys/touchpad-disabled-24.png deleted file mode 100644 index fc0bac7..0000000 Binary files a/plugins/media-keys/touchpad-disabled-24.png and /dev/null differ diff --git a/plugins/media-keys/touchpad-disabled-32.png b/plugins/media-keys/touchpad-disabled-32.png deleted file mode 100644 index 1311c60..0000000 Binary files a/plugins/media-keys/touchpad-disabled-32.png and /dev/null differ diff --git a/plugins/media-keys/touchpad-disabled-48.png b/plugins/media-keys/touchpad-disabled-48.png deleted file mode 100644 index 8f6ee03..0000000 Binary files a/plugins/media-keys/touchpad-disabled-48.png and /dev/null differ diff --git a/plugins/media-keys/touchpad-disabled-template.svg b/plugins/media-keys/touchpad-disabled-template.svg deleted file mode 100644 index 4d08198..0000000 --- a/plugins/media-keys/touchpad-disabled-template.svg +++ /dev/null @@ -1,1172 +0,0 @@ - - - - - Touchpad - - - - image/svg+xml - - Touchpad - - - Lapo Calamandrei - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/media-keys/touchpad-disabled.svg b/plugins/media-keys/touchpad-disabled.svg deleted file mode 100644 index 4f1b37f..0000000 --- a/plugins/media-keys/touchpad-disabled.svg +++ /dev/null @@ -1,833 +0,0 @@ - - - - - Touchpad - - - - image/svg+xml - - Touchpad - - - Lapo Calamandrei - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/media-keys/touchpad-enabled-16.png b/plugins/media-keys/touchpad-enabled-16.png deleted file mode 100644 index 58fc1d4..0000000 Binary files a/plugins/media-keys/touchpad-enabled-16.png and /dev/null differ diff --git a/plugins/media-keys/touchpad-enabled-22.png b/plugins/media-keys/touchpad-enabled-22.png deleted file mode 100644 index ae23118..0000000 Binary files a/plugins/media-keys/touchpad-enabled-22.png and /dev/null differ diff --git a/plugins/media-keys/touchpad-enabled-24.png b/plugins/media-keys/touchpad-enabled-24.png deleted file mode 100644 index b8617e9..0000000 Binary files a/plugins/media-keys/touchpad-enabled-24.png and /dev/null differ diff --git a/plugins/media-keys/touchpad-enabled-32.png b/plugins/media-keys/touchpad-enabled-32.png deleted file mode 100644 index 7bbfa48..0000000 Binary files a/plugins/media-keys/touchpad-enabled-32.png and /dev/null differ diff --git a/plugins/media-keys/touchpad-enabled-48.png b/plugins/media-keys/touchpad-enabled-48.png deleted file mode 100644 index ebad680..0000000 Binary files a/plugins/media-keys/touchpad-enabled-48.png and /dev/null differ diff --git a/plugins/media-keys/touchpad-enabled-template.svg b/plugins/media-keys/touchpad-enabled-template.svg deleted file mode 100644 index fe07b68..0000000 --- a/plugins/media-keys/touchpad-enabled-template.svg +++ /dev/null @@ -1,936 +0,0 @@ - - - - - Touchpad - - - - image/svg+xml - - Touchpad - - - Lapo Calamandrei - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/media-keys/touchpad-enabled.svg b/plugins/media-keys/touchpad-enabled.svg deleted file mode 100644 index 98fa258..0000000 --- a/plugins/media-keys/touchpad-enabled.svg +++ /dev/null @@ -1,581 +0,0 @@ - - - - - Touchpad - - - - image/svg+xml - - Touchpad - - - Lapo Calamandrei - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.1