Skip to content
Permalink
Browse files

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 <zhang.xianwei8@zte.com.cn>
  • Loading branch information...
zhangxianwei8 committed Oct 5, 2018
1 parent 45de88e commit 7c5d340069139df598b6fda72f773697b5cd7045
@@ -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) \
@@ -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);
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 7c5d340

Please sign in to comment.
You can’t perform that action at this time.