summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Borges <felipeborges@gnome.org>2015-11-19 14:23:31 +0100
committerFelipe Borges <felipeborges@gnome.org>2015-11-23 11:25:27 +0100
commit74da171b9647ab39849d062555cdd364dccb3678 (patch)
tree2a6317b7da13b588fcfd8f4b994e99c9339f52b7
parent15f963d040c878583242dfc98cb9cf689be03189 (diff)
downloadnautilus-74da171b9647ab39849d062555cdd364dccb3678.tar.gz
application: add shortcuts help window
Use GTK+'s new shortcut window to document our shortcuts. See: https://wiki.gnome.org/Initiatives/GnomeGoals/ShortcutWindows https://bugzilla.gnome.org/show_bug.cgi?id=757826
-rw-r--r--src/nautilus-application.c2
-rw-r--r--src/resources/gtk/help-overlay.ui372
-rw-r--r--src/resources/nautilus.gresource.xml1
3 files changed, 375 insertions, 0 deletions
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 8a491e747..812f0e0b1 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -1023,6 +1023,8 @@ nautilus_application_startup (GApplication *app)
nautilus_profile_start (NULL);
+ g_application_set_resource_base_path (app, "/org/gnome/nautilus");
+
/* chain up to the GTK+ implementation early, so gtk_init()
* is called for us.
*/
diff --git a/src/resources/gtk/help-overlay.ui b/src/resources/gtk/help-overlay.ui
new file mode 100644
index 000000000..6d52cfd5c
--- /dev/null
+++ b/src/resources/gtk/help-overlay.ui
@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <object class="GtkShortcutsWindow" id="help_overlay">
+ <property name="modal">True</property>
+ <child>
+ <object class="GtkShortcutsSection">
+ <property name="visible">True</property>
+ <property name="section-name">shortcuts</property>
+ <property name="max-height">15</property>
+ <child>
+ <object class="GtkShortcutsGroup">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">General</property>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">New window</property>
+ <property name="accelerator">&lt;Primary&gt;N</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">New tab</property>
+ <property name="accelerator">&lt;Primary&gt;T</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Close Tab</property>
+ <property name="accelerator">&lt;Primary&gt;W</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Search</property>
+ <property name="accelerator">&lt;Primary&gt;F</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Show help</property>
+ <property name="accelerator">F1</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsGroup">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Opening</property>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Open</property>
+ <property name="accelerator">Return &lt;Primary&gt;O</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Bookmark current location</property>
+ <property name="accelerator">&lt;Primary&gt;D</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Show item properties</property>
+ <property name="accelerator">&lt;Primary&gt;I</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Open in new tab</property>
+ <property name="accelerator">&lt;shift&gt;&lt;Primary&gt;T</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Open in new window</property>
+ <property name="accelerator">&lt;shift&gt;&lt;Primary&gt;W</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Open item location</property>
+ <property name="accelerator">&lt;alt&gt;&lt;Primary&gt;O</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Open file and close window</property>
+ <property name="accelerator">&lt;shift&gt;&lt;Primary&gt;Down</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Open with default application</property>
+ <property name="accelerator">&lt;Primary&gt;O &lt;alt&gt;Down</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsGroup">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Navigation</property>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Go back</property>
+ <property name="accelerator">&lt;alt&gt;Left</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Go forward</property>
+ <property name="accelerator">&lt;alt&gt;Right</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Go up</property>
+ <property name="accelerator">&lt;alt&gt;Up</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Go down</property>
+ <property name="accelerator">&lt;alt&gt;Down</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">List view</property>
+ <property name="accelerator">&lt;Primary&gt;1</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Grid view</property>
+ <property name="accelerator">&lt;Primary&gt;2</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Enter location</property>
+ <property name="accelerator">&lt;Primary&gt;L</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Go to home folder</property>
+ <property name="accelerator">&lt;alt&gt;Home</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Go to previous tab</property>
+ <property name="accelerator">&lt;Primary&gt;Page_Up</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Go to next tab</property>
+ <property name="accelerator">&lt;Primary&gt;Page_Down</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Move tab left</property>
+ <property name="accelerator">&lt;shift&gt;&lt;Primary&gt;Page_Up</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Move tab right</property>
+ <property name="accelerator">&lt;shift&gt;&lt;Primary&gt;Page_Down</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Go to tab</property>
+ <property name="accelerator">&lt;alt&gt;0...8</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Prompt root location</property>
+ <property name="accelerator">slash</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Prompt home location</property>
+ <property name="accelerator">asciitilde</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsGroup">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">View</property>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Zoom in</property>
+ <property name="accelerator">&lt;Primary&gt;plus</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Zoom out</property>
+ <property name="accelerator">&lt;Primary&gt;minus</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Refresh view</property>
+ <property name="accelerator">F5 &lt;Primary&gt;R</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Show/hide hidden files</property>
+ <property name="accelerator">&lt;Primary&gt;H</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Show/hide sidebar</property>
+ <property name="accelerator">F9</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Show/hide action menu</property>
+ <property name="accelerator">F10</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Show bookmarks manager</property>
+ <property name="accelerator">&lt;Primary&gt;B</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Reset zoom</property>
+ <property name="accelerator">&lt;Primary&gt;0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Invert selection</property>
+ <property name="accelerator">&lt;shift&gt;&lt;Primary&gt;I</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsGroup">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Editing</property>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Create folder</property>
+ <property name="accelerator">&lt;shift&gt;&lt;Primary&gt;N</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Rename</property>
+ <property name="accelerator">F2</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Move to trash</property>
+ <property name="accelerator">Delete</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Delete permanently</property>
+ <property name="accelerator">&lt;shift&gt;Delete</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Copy</property>
+ <property name="accelerator">&lt;Primary&gt;C</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Paste</property>
+ <property name="accelerator">&lt;Primary&gt;V</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Select all</property>
+ <property name="accelerator">&lt;Primary&gt;A</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Select items matching</property>
+ <property name="accelerator">&lt;Primary&gt;S</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Undo</property>
+ <property name="accelerator">&lt;Primary&gt;z</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Redo</property>
+ <property name="accelerator">&lt;shift&gt;&lt;Primary&gt;z</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml
index 057062562..92193f729 100644
--- a/src/resources/nautilus.gresource.xml
+++ b/src/resources/nautilus.gresource.xml
@@ -17,6 +17,7 @@
<file>ui/nautilus-no-search-results.ui</file>
<file>ui/nautilus-folder-is-empty.ui</file>
<file>ui/nautilus-remote-warning-bar.ui</file>
+ <file>gtk/help-overlay.ui</file>
<file alias="gtk/gtkplacesview.ui">../gtk/gtkplacesview.ui</file>
<file alias="gtk/gtkplacesviewrow.ui">../gtk/gtkplacesviewrow.ui</file>
<file alias="icons/thumbnail_frame.png">../../icons/thumbnail_frame.png</file>