From 54c49612781d5f3444e6298da622b2fee4a9e01a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 12 Oct 2015 12:40:56 -0400
Subject: [PATCH] Beef up the shortcuts window demo more

Add more of the complications seen in mockups.
---
 demos/gtk-demo/shortcuts.ui          | 23 +++++++++++++++++++----
 docs/reference/gtk/gtk-docs.sgml     |  1 +
 docs/reference/gtk/gtk3-sections.txt |  7 +++++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/demos/gtk-demo/shortcuts.ui b/demos/gtk-demo/shortcuts.ui
index 929d95a3e8..cf340f8828 100644
--- a/demos/gtk-demo/shortcuts.ui
+++ b/demos/gtk-demo/shortcuts.ui
@@ -377,12 +377,27 @@
             <group>
               <property name="title" translatable="yes">Stopwatch</property>
               <shortcut>
-                <property name="accelerator">&lt;ctrl&gt;N</property>
-                <property name="title" translatable="yes">Add an alarm</property>
+                <property name="accelerator">space</property>
+                <property name="title" translatable="yes">Start / Stop / Continue</property>
               </shortcut>
               <shortcut>
-                <property name="accelerator">&lt;ctrl&gt;S</property>
-                <property name="title" translatable="yes">Select alarms</property>
+                <property name="accelerator">L</property>
+                <property name="title" translatable="yes">Lap</property>
+              </shortcut>
+              <shortcut>
+                <property name="accelerator">Delete</property>
+                <property name="title" translatable="yes">Reset</property>
+              </shortcut>
+            </group>
+            <group>
+              <property name="title" translatable="yes">Timer</property>
+              <shortcut>
+                <property name="accelerator">space</property>
+                <property name="title" translatable="yes">Start / Stop / Pause</property>
+              </shortcut>
+              <shortcut>
+                <property name="accelerator">Delete</property>
+                <property name="title" translatable="yes">Reset</property>
               </shortcut>
             </group>
           </column>
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 9194c4722d..8f0402f6ef 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -253,6 +253,7 @@
       <xi:include href="xml/gtktooltip.xml" />
       <xi:include href="xml/gtkviewport.xml" />
       <xi:include href="xml/gtkaccessible.xml" />
+      <xi:include href="xml/gtkshortcutswindow.xml" />
     </chapter>
 
     <chapter id="AbstractObjects">
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 60d3eb8449..6a4cdca031 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -8422,3 +8422,10 @@ GTK_IS_GL_AREA_CLASS
 <SUBSECTION Private>
 gtk_gl_area_get_type
 </SECTION>
+
+<SECTION>
+<FILE>gtkshortcutswindow</FILE>
+GtkShortcutsWindow
+<SUBSECTION Private>
+gtk_shortcuts_window_get_type
+</SECTION>