gtk-demo: Stop using GtkShortcutsGesture

Use the new predefined gestures, and GtkShortcutsShortcut.

5 files changed, 8 insertions, 372 deletions

diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index a19028bf86..4dea3a0d82 100644
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -220,8 +220,4 @@
   <gresource prefix="/modelbutton">
     <file>modelbutton.ui</file>
   </gresource>
-  <gresource prefix="/icons">
-    <file>gesture-two-finger-swipe-right.svg</file>
-    <file>gesture-two-finger-swipe-left.svg</file>
-  </gresource>
 </gresources>
diff --git a/demos/gtk-demo/gesture-two-finger-swipe-left.svg b/demos/gtk-demo/gesture-two-finger-swipe-left.svg
deleted file mode 100644
index d93af46a19..0000000000
--- a/demos/gtk-demo/gesture-two-finger-swipe-left.svg
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="80"
-   height="54"
-   viewBox="0 0 80.000001 54"
-   id="svg6660"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="two-finger-swipe-left.svg"
-   inkscape:export-filename="/home/aday/Scratch/two-finger-swipe-left.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs6662" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-26.486277"
-     inkscape:cy="27.97415"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:showpageshadow="false"
-     units="px"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata6665">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(1077.1429,-651.07582)">
-    <g
-       style="display:inline"
-       transform="translate(-753.14285,209.07579)"
-       id="g6613">
-      <g
-         id="g6615">
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect6617"
-           width="7.99999"
-           height="24.999994"
-           x="-288"
-           y="471"
-           ry="4.1854858"
-           rx="3.999995" />
-        <rect
-           rx="3.999995"
-           ry="4.1854858"
-           y="452.00003"
-           x="-279"
-           height="43.999989"
-           width="7.99999"
-           id="rect6619"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect6621"
-           width="7.99999"
-           height="49.000015"
-           x="-270"
-           y="447"
-           ry="4.1854858"
-           rx="3.999995" />
-        <rect
-           rx="3.999995"
-           ry="4.1854858"
-           y="460"
-           x="-261"
-           height="36.000011"
-           width="7.99999"
-           id="rect6623"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect6625"
-           width="7.99999"
-           height="30.000006"
-           x="-252"
-           y="466"
-           ry="4.1854858"
-           rx="3.999995" />
-        <rect
-           y="483"
-           x="-288"
-           height="12.99999"
-           width="28.999994"
-           id="rect6627"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-        <rect
-           rx="3.999995"
-           ry="4.1854858"
-           y="475"
-           x="-279"
-           height="21"
-           width="34.999985"
-           id="rect6629"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-        <path
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           id="path6631"
-           sodipodi:type="arc"
-           sodipodi:cx="-266"
-           sodipodi:cy="451"
-           sodipodi:rx="7.4999938"
-           sodipodi:ry="7.5000024"
-           sodipodi:start="3.4953343"
-           sodipodi:end="1.8407347"
-           d="m -273.03562,448.40192 a 7.4999938,7.5000024 0 0 1 9.43617,-4.50737 7.4999938,7.5000024 0 0 1 4.76917,9.30661 7.4999938,7.5000024 0 0 1 -9.16976,5.02725"
-           sodipodi:open="true" />
-        <path
-           d="m -268.10552,458.34925 a 7.4999938,7.5000024 0 0 1 -9.38146,4.80209 7.4999938,7.5000024 0 0 1 -4.92078,-9.31976 7.4999938,7.5000024 0 0 1 9.25653,-5.03869"
-           sodipodi:end="4.9929531"
-           sodipodi:start="0.31864739"
-           sodipodi:ry="7.5000024"
-           sodipodi:rx="7.4999938"
-           sodipodi:cy="455.99963"
-           sodipodi:cx="-275.22797"
-           sodipodi:type="arc"
-           id="path6633"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           sodipodi:open="true" />
-        <path
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;enable-background:accumulate"
-           d="m -314,465 -10,-9.5 10,-9.5 z"
-           id="path6635"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" />
-        <rect
-           transform="scale(-1,-1)"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect6637"
-           width="31.999987"
-           height="4.99999"
-           x="283"
-           y="-458" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/demos/gtk-demo/gesture-two-finger-swipe-right.svg b/demos/gtk-demo/gesture-two-finger-swipe-right.svg
deleted file mode 100644
index 758656806c..0000000000
--- a/demos/gtk-demo/gesture-two-finger-swipe-right.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="80.000008"
-   height="55.000023"
-   viewBox="0 0 80.000008 55.000024"
-   id="svg6535"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="two-finger-swipe-right.svg">
-  <defs
-     id="defs6537" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="-59.169932"
-     inkscape:cy="48.63391"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:showpageshadow="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata6540">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(180,-479.14791)">
-    <g
-       style="display:inline"
-       transform="translate(144,118.14791)"
-       id="g6509">
-      <g
-         id="g6511">
-        <rect
-           rx="3.999995"
-           ry="4.1854858"
-           y="391"
-           x="-324"
-           height="24.999994"
-           width="7.99999"
-           id="rect6513"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect6515"
-           width="7.99999"
-           height="43.999989"
-           x="-315"
-           y="372.00003"
-           ry="4.1854858"
-           rx="3.999995" />
-        <rect
-           rx="3.999995"
-           ry="4.1854858"
-           y="367"
-           x="-306"
-           height="49.000015"
-           width="7.99999"
-           id="rect6517"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect6519"
-           width="7.99999"
-           height="36.000011"
-           x="-297"
-           y="380"
-           ry="4.1854858"
-           rx="3.999995" />
-        <rect
-           rx="3.999995"
-           ry="4.1854858"
-           y="386"
-           x="-288"
-           height="30.000006"
-           width="7.99999"
-           id="rect6521"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect6523"
-           width="28.999994"
-           height="12.99999"
-           x="-324"
-           y="403" />
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect6525"
-           width="34.999985"
-           height="21"
-           x="-315"
-           y="395"
-           ry="4.1854858"
-           rx="3.999995" />
-        <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           id="path6527"
-           d="m -254,361 10,9.5 -10,9.5 z"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;enable-background:accumulate" />
-        <path
-           sodipodi:open="true"
-           d="m -309.03562,368.40192 a 7.4999938,7.5000024 0 0 1 9.43617,-4.50737 7.4999938,7.5000024 0 0 1 4.76917,9.30661 7.4999938,7.5000024 0 0 1 -9.16976,5.02725"
-           sodipodi:end="1.8407347"
-           sodipodi:start="3.4953343"
-           sodipodi:ry="7.5000024"
-           sodipodi:rx="7.4999938"
-           sodipodi:cy="371"
-           sodipodi:cx="-302"
-           sodipodi:type="arc"
-           id="path6529"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-        <path
-           sodipodi:open="true"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           id="path6531"
-           sodipodi:type="arc"
-           sodipodi:cx="-311.22797"
-           sodipodi:cy="375.99963"
-           sodipodi:rx="7.4999938"
-           sodipodi:ry="7.5000024"
-           sodipodi:start="0.31864739"
-           sodipodi:end="4.9929531"
-           d="m -304.10552,378.34925 a 7.4999938,7.5000024 0 0 1 -9.38146,4.80209 7.4999938,7.5000024 0 0 1 -4.92078,-9.31976 7.4999938,7.5000024 0 0 1 9.25653,-5.03869" />
-        <rect
-           y="368"
-           x="-295"
-           height="4.99999"
-           width="41.999992"
-           id="rect6533"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/demos/gtk-demo/shortcuts-builder.ui b/demos/gtk-demo/shortcuts-builder.ui
index c1ad79edde..6b587f2e72 100644
--- a/demos/gtk-demo/shortcuts-builder.ui
+++ b/demos/gtk-demo/shortcuts-builder.ui
@@ -2,13 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.17 -->
 
-  <object class="GFileIcon" id="left-swipe-icon">
-    <property name="file">resource:///icons/gesture-two-finger-swipe-left.svg</property>
-  </object>
-  <object class="GFileIcon" id="right-swipe-icon">
-    <property name="file">resource:///icons/gesture-two-finger-swipe-right.svg</property>
-  </object>
-
   <object class="GtkShortcutsWindow" id="shortcuts-builder">
     <property name="modal">1</property>
     <child>
@@ -89,19 +82,17 @@
             <property name="visible">1</property>
             <property name="title" translatable="yes">Touchpad gestures</property>
             <child>
-              <object class="GtkShortcutsGesture">
+              <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
+                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
                 <property name="title" translatable="yes">Switch to the next document</property>
-                <property name="subtitle" translatable="yes">Two finger swipe right</property>
-                <property name="icon">right-swipe-icon</property>
               </object>
             </child>
             <child>
-              <object class="GtkShortcutsGesture">
+              <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
+                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
                 <property name="title" translatable="yes">Switch to the previous document</property>
-                <property name="subtitle" translatable="yes">Two finger swipe left</property>
-                <property name="icon">left-swipe-icon</property>
               </object>
             </child>
           </object>
diff --git a/demos/gtk-demo/shortcuts-gedit.ui b/demos/gtk-demo/shortcuts-gedit.ui
index 74bd2dcf93..acb30d01a4 100644
--- a/demos/gtk-demo/shortcuts-gedit.ui
+++ b/demos/gtk-demo/shortcuts-gedit.ui
@@ -2,13 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.17 -->
 
-  <object class="GFileIcon" id="left-swipe-icon">
-    <property name="file">resource:///icons/gesture-two-finger-swipe-left.svg</property>
-  </object>
-  <object class="GFileIcon" id="right-swipe-icon">
-    <property name="file">resource:///icons/gesture-two-finger-swipe-right.svg</property>
-  </object>
-
   <object class="GtkShortcutsWindow" id="shortcuts-gedit">
     <property name="modal">1</property>
     <child>
@@ -21,19 +14,17 @@
             <property name="visible">1</property>
             <property name="title" translatable="yes">Touchpad gestures</property>
             <child>
-              <object class="GtkShortcutsGesture">
+              <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
+                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
                 <property name="title" translatable="yes">Switch to the next document</property>
-                <property name="subtitle" translatable="yes">Two finger swipe right</property>
-                <property name="icon">right-swipe-icon</property>
               </object>
             </child>
             <child>
-              <object class="GtkShortcutsGesture">
+              <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
+                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
                 <property name="title" translatable="yes">Switch to the previous document</property>
-                <property name="subtitle" translatable="yes">Two finger swipe left</property>
-                <property name="icon">left-swipe-icon</property>
               </object>
             </child>
           </object>