Load gesture images as symbolic icons

This makes them recolor in the dark theme, which looks better.

19 files changed, 19 insertions, 8 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 61dcd7d0f0..62741758d4 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1201,9 +1201,9 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc
 	  n=`basename $$f`; \
 	  echo "    <file>cursor/$$n</file>" >> $@; \
 	done; \
-	for f in $(srcdir)/gesture/*.png; do \
+	for f in $(srcdir)/gesture/*.symbolic.png; do \
 	  n=`basename $$f`; \
-	  echo "    <file>gesture/$$n</file>" >> $@; \
+	  echo "    <file alias='icons/64x64/actions/$$n'>gesture/$$n</file>" >> $@; \
 	done; \
 	for f in $(srcdir)/ui/*.ui; do \
 	  n=`basename $$f`; \
diff --git a/gtk/gesture/pinch.svg b/gtk/gesture/gesture-pinch-symbolic.svg
index 408f80967f..408f80967f 100644
--- a/gtk/gesture/pinch.svg
+++ b/gtk/gesture/gesture-pinch-symbolic.svg
diff --git a/gtk/gesture/gesture-pinch-symbolic.symbolic.png b/gtk/gesture/gesture-pinch-symbolic.symbolic.png
new file mode 100644
index 0000000000..dbdb173cf3
--- /dev/null
+++ b/gtk/gesture/gesture-pinch-symbolic.symbolic.png
diff --git a/gtk/gesture/rotate-anticlockwise.svg b/gtk/gesture/gesture-rotate-anticlockwise-symbolic.svg
index 10f4e362ad..10f4e362ad 100644
--- a/gtk/gesture/rotate-anticlockwise.svg
+++ b/gtk/gesture/gesture-rotate-anticlockwise-symbolic.svg
diff --git a/gtk/gesture/gesture-rotate-anticlockwise-symbolic.symbolic.png b/gtk/gesture/gesture-rotate-anticlockwise-symbolic.symbolic.png
new file mode 100644
index 0000000000..254ab330f8
--- /dev/null
+++ b/gtk/gesture/gesture-rotate-anticlockwise-symbolic.symbolic.png
diff --git a/gtk/gesture/rotate-clockwise.svg b/gtk/gesture/gesture-rotate-clockwise-symbolic.svg
index 38c44dc361..38c44dc361 100644
--- a/gtk/gesture/rotate-clockwise.svg
+++ b/gtk/gesture/gesture-rotate-clockwise-symbolic.svg
diff --git a/gtk/gesture/gesture-rotate-clockwise-symbolic.symbolic.png b/gtk/gesture/gesture-rotate-clockwise-symbolic.symbolic.png
new file mode 100644
index 0000000000..76966cb60e
--- /dev/null
+++ b/gtk/gesture/gesture-rotate-clockwise-symbolic.symbolic.png
diff --git a/gtk/gesture/stretch.svg b/gtk/gesture/gesture-stretch-symbolic.svg
index d783c20b58..d783c20b58 100644
--- a/gtk/gesture/stretch.svg
+++ b/gtk/gesture/gesture-stretch-symbolic.svg
diff --git a/gtk/gesture/gesture-stretch-symbolic.symbolic.png b/gtk/gesture/gesture-stretch-symbolic.symbolic.png
new file mode 100644
index 0000000000..86fe89a5d2
--- /dev/null
+++ b/gtk/gesture/gesture-stretch-symbolic.symbolic.png
diff --git a/gtk/gesture/two-finger-swipe-left.svg b/gtk/gesture/gesture-two-finger-swipe-left-symbolic.svg
index 16256d4b4b..16256d4b4b 100644
--- a/gtk/gesture/two-finger-swipe-left.svg
+++ b/gtk/gesture/gesture-two-finger-swipe-left-symbolic.svg
diff --git a/gtk/gesture/gesture-two-finger-swipe-left-symbolic.symbolic.png b/gtk/gesture/gesture-two-finger-swipe-left-symbolic.symbolic.png
new file mode 100644
index 0000000000..08dcacadb8
--- /dev/null
+++ b/gtk/gesture/gesture-two-finger-swipe-left-symbolic.symbolic.png
diff --git a/gtk/gesture/two-finger-swipe-right.svg b/gtk/gesture/gesture-two-finger-swipe-right-symbolic.svg
index e27b4b126d..e27b4b126d 100644
--- a/gtk/gesture/two-finger-swipe-right.svg
+++ b/gtk/gesture/gesture-two-finger-swipe-right-symbolic.svg
diff --git a/gtk/gesture/two-finger-swipe-right.png b/gtk/gesture/gesture-two-finger-swipe-right-symbolic.symbolic.png
index bf5737ab98..5bce192458 100644
--- a/gtk/gesture/two-finger-swipe-right.png
+++ b/gtk/gesture/gesture-two-finger-swipe-right-symbolic.symbolic.png
diff --git a/gtk/gesture/pinch.png b/gtk/gesture/pinch.png
deleted file mode 100644
index ab3b9f506a..0000000000
--- a/gtk/gesture/pinch.png
+++ /dev/null
diff --git a/gtk/gesture/rotate-anticlockwise.png b/gtk/gesture/rotate-anticlockwise.png
deleted file mode 100644
index 6d97665fd8..0000000000
--- a/gtk/gesture/rotate-anticlockwise.png
+++ /dev/null
diff --git a/gtk/gesture/rotate-clockwise.png b/gtk/gesture/rotate-clockwise.png
deleted file mode 100644
index fda51ac672..0000000000
--- a/gtk/gesture/rotate-clockwise.png
+++ /dev/null
diff --git a/gtk/gesture/stretch.png b/gtk/gesture/stretch.png
deleted file mode 100644
index c1161cc555..0000000000
--- a/gtk/gesture/stretch.png
+++ /dev/null
diff --git a/gtk/gesture/two-finger-swipe-left.png b/gtk/gesture/two-finger-swipe-left.png
deleted file mode 100644
index d82bb0e42a..0000000000
--- a/gtk/gesture/two-finger-swipe-left.png
+++ /dev/null
diff --git a/gtk/gtkshortcutsshortcut.c b/gtk/gtkshortcutsshortcut.c
index 6b5bdcad0d..28aab42a8d 100644
--- a/gtk/gtkshortcutsshortcut.c
+++ b/gtk/gtkshortcutsshortcut.c
@@ -189,36 +189,47 @@ gtk_shortcuts_shortcut_set_subtitle (GtkShortcutsShortcut *self,
 static void
 update_icon_from_type (GtkShortcutsShortcut *self)
 {
+  GIcon *icon;
+
   if (self->icon_set)
     return;
 
   switch (self->shortcut_type)
     {
     case GTK_SHORTCUT_GESTURE_PINCH:
-      gtk_image_set_from_resource (self->image, "/org/gtk/libgtk/gesture/pinch.png");
+      icon = g_themed_icon_new ("gesture-pinch-symbolic");
       break;
 
     case GTK_SHORTCUT_GESTURE_STRETCH:
-      gtk_image_set_from_resource (self->image, "/org/gtk/libgtk/gesture/stretch.png");
+      icon = g_themed_icon_new ("gesture-stretch-symbolic");
       break;
 
     case GTK_SHORTCUT_GESTURE_ROTATE_CLOCKWISE:
-      gtk_image_set_from_resource (self->image, "/org/gtk/libgtk/gesture/rotate-clockwise.png");
+      icon = g_themed_icon_new ("gesture-rotate-clockwise-symbolic");
       break;
 
     case GTK_SHORTCUT_GESTURE_ROTATE_COUNTERCLOCKWISE:
-      gtk_image_set_from_resource (self->image, "/org/gtk/libgtk/gesture/rotate-anticlockwise.png");
+      icon = g_themed_icon_new ("gesture-rotate-anticlockwise-symbolic");
       break;
 
     case GTK_SHORTCUT_GESTURE_TWO_FINGER_SWIPE_LEFT:
-      gtk_image_set_from_resource (self->image, "/org/gtk/libgtk/gesture/two-finger-swipe-left.png");
+      icon = g_themed_icon_new ("gesture-two-finger-swipe-left-symbolic");
       break;
 
     case GTK_SHORTCUT_GESTURE_TWO_FINGER_SWIPE_RIGHT:
-      gtk_image_set_from_resource (self->image, "/org/gtk/libgtk/gesture/two-finger-swipe-right.png");
+      icon = g_themed_icon_new ("gesture-two-finger-swipe-right-symbolic");
       break;
 
     default: ;
+      icon = NULL;
+      break;
+    }
+
+  if (icon)
+    {
+      gtk_image_set_from_gicon (self->image, icon, GTK_ICON_SIZE_DIALOG);
+      gtk_image_set_pixel_size (self->image, 64);
+      g_object_unref (icon);
     }
 }