Merge branch 'add-preferences' into 'master'

help-overlay: Use action-name properties

See merge request GNOME/eog!144

2 files changed, 34 insertions, 26 deletions

diff --git a/data/help-overlay.ui b/data/help-overlay.ui
index 7384754d..4f26e930 100644
--- a/data/help-overlay.ui
+++ b/data/help-overlay.ui
@@ -15,83 +15,90 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;O</property>
+                <property name="action-name">win.open</property>
                 <property name="title" translatable="yes" context="shortcut window">Open an image file</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;S</property>
+                <property name="action-name">win.save</property>
                 <property name="title" translatable="yes" context="shortcut window">Save the image</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;shift&gt;&lt;ctrl&gt;S</property>
+                <property name="action-name">win.save-as</property>
                 <property name="title" translatable="yes" context="shortcut window">Save the image with a new file name</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;P</property>
+                <property name="action-name">win.print</property>
                 <property name="title" translatable="yes" context="shortcut window">Print the current image</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;W</property>
+                <property name="action-name">win.close</property>
                 <property name="title" translatable="yes" context="shortcut window">Close the current window</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;Q</property>
+                <property name="action-name">win.close-all</property>
                 <property name="title" translatable="yes" context="shortcut window">Close all windows</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;F8</property>
+                <property name="action-name">win.set-wallpaper</property>
                 <property name="title" translatable="yes" context="shortcut window">Set the image as desktop background</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;alt&gt;Return</property>
+                <property name="action-name">win.properties</property>
                 <property name="title" translatable="yes" context="shortcut window">Show image properties in sidebar</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">F9</property>
+                <property name="action-name">win.view-sidebar</property>
                 <property name="title" translatable="yes" context="shortcut window">Show/Hide the sidebar</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">F1</property>
+                <property name="action-name">win.manual</property>
                 <property name="title" translatable="yes" context="shortcut window">Open the application manual</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">F10</property>
+                <property name="action-name">win.toggle-gear-menu</property>
                 <property name="title" translatable="yes" context="shortcut window">Show/Hide the application menu</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
+                <property name="action-name">win.preferences</property>
+                <property name="title" translatable="yes" context="shortcut window">Show preferences</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;question</property>
                 <property name="title" translatable="yes" context="shortcut window">Keyboard shortcuts</property>
               </object>
@@ -140,7 +147,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">F</property>
+                <property name="action-name">win.toggle-zoom-fit</property>
                 <property name="title" translatable="yes" context="shortcut window">Best fit</property>
               </object>
             </child>
@@ -217,35 +224,35 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">Home &lt;alt&gt;Home</property>
+                <property name="action-name">win.go-first</property>
                 <property name="title" translatable="yes" context="shortcut window">Go to the first image in the folder</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">End &lt;alt&gt;End</property>
+                <property name="action-name">win.go-last</property>
                 <property name="title" translatable="yes" context="shortcut window">Go to the last image in the folder</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;M</property>
+                <property name="action-name">win.go-random</property>
                 <property name="title" translatable="yes" context="shortcut window">Go to a random image in the folder</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;shift&gt;&lt;ctrl&gt;P</property>
+                <property name="action-name">win.show-remote</property>
                 <property name="title" translatable="yes" context="shortcut window">Show presenter with separate controls</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;F9</property>
+                <property name="action-name">win.view-gallery</property>
                 <property name="title" translatable="yes" context="shortcut window">Show/Hide the image gallery</property>
               </object>
             </child>
@@ -272,14 +279,14 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;R</property>
+                <property name="action-name">win.rotate-90</property>
                 <property name="title" translatable="yes" context="shortcut window">Rotate clockwise</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;shift&gt;&lt;ctrl&gt;R</property>
+                <property name="action-name">win.rotate-270</property>
                 <property name="title" translatable="yes" context="shortcut window">Rotate counterclockwise</property>
               </object>
             </child>
@@ -292,21 +299,21 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">F11</property>
+                <property name="action-name">win.view-fullscreen</property>
                 <property name="title" translatable="yes" context="shortcut window">Enter/Leave fullscreen</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">F5</property>
+                <property name="action-name">win.view-slideshow</property>
                 <property name="title" translatable="yes" context="shortcut window">Start/Stop slideshow</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">P</property>
+                <property name="action-name">win.pause-slideshow</property>
                 <property name="title" translatable="yes" context="shortcut window">Pause slideshow</property>
               </object>
             </child>
@@ -319,28 +326,28 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;C</property>
+                <property name="action-name">win.copy</property>
                 <property name="title" translatable="yes" context="shortcut window">Copy to clipboard</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;Z</property>
+                <property name="action-name">win.undo</property>
                 <property name="title" translatable="yes" context="shortcut window">Undo</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">Delete</property>
+                <property name="action-name">win.move-trash</property>
                 <property name="title" translatable="yes" context="shortcut window">Move to Trash</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;Shift&gt;Delete</property>
+                <property name="action-name">win.delete</property>
                 <property name="title" translatable="yes" context="shortcut window">Delete image permanently</property>
               </object>
             </child>
diff --git a/src/eog-application.c b/src/eog-application.c
index 04aa8d85..20820321 100644
--- a/src/eog-application.c
+++ b/src/eog-application.c
@@ -215,6 +215,7 @@ eog_application_init_accelerators (GtkApplication *application)
 		"win.show-remote",	"<Ctrl><Shift>p", NULL,
 		"win.set-wallpaper",	"<Ctrl>F8", NULL,
 		"win.manual",		"F1", NULL,
+		"win.preferences",	"<Ctrl>comma", NULL,
 
 		"win.go-first",		"<Alt>Home", "Home", NULL,
 		"win.go-last",		"<Alt>End", "End", NULL,