v1.4.6: Add Show Places (Alt+Shift+P) and Show Treeview (Alt+Shift+T) keybindings

- Add NEMO_ACTION_SHOW_PLACES / NEMO_ACTION_SHOW_TREEVIEW to nemo-actions.h
- Add action_show_places_callback / action_show_treeview_callback in nemo-window-menus.c
  (switches sidebar type AND ensures sidebar is visible)
- Register both as GtkActionEntry in main_entries[]
- Add show-places / show-treeview keys to nemo-keybindings.c with Alt+Shift+P / Alt+Shift+T defaults
- Add corresponding schema keys to org.nemo.gschema.xml
- Upgrade statusbar places/tree button tooltips to use make_tooltip_with_accel
  so they show the live keybinding like the other buttons

Author: smpl-os

libnemo-private/org.nemo.gschema.xml

@@ -998,6 +998,14 @@
       <default>'&lt;Control&gt;F3'</default>
       <summary>Toggle split view</summary>
     </key>
+    <key name="show-places" type="s">
+      <default>'&lt;Alt&gt;&lt;Shift&gt;p'</default>
+      <summary>Show Places sidebar</summary>
+    </key>
+    <key name="show-treeview" type="s">
+      <default>'&lt;Alt&gt;&lt;Shift&gt;t'</default>
+      <summary>Show Treeview sidebar</summary>
+    </key>
     <key name="quick-preview" type="s">
       <default>'F3'</default>
       <summary>Quick file preview</summary>

meson.build

@@ -1,7 +1,7 @@
 # Meson build file
 
 # https://github.com/linuxmint/nemo
-project('nemo', 'c', version : '1.4.5', meson_version : '>=0.56.0')
+project('nemo', 'c', version : '1.4.6', meson_version : '>=0.56.0')
 
 # 1. If the library code has changed at all since last release, then increment revision.
 # 2. If any interfaces have been added, then increment current and set revision to 0.

src/nemo-actions.h

@@ -37,6 +37,8 @@
 #define NEMO_ACTION_UP_ACCEL "UpAccel"
 #define NEMO_ACTION_FORWARD "Forward"
 #define NEMO_ACTION_SHOW_HIDE_SIDEBAR "Show Hide Sidebar"
+#define NEMO_ACTION_SHOW_PLACES   "Show Places"
+#define NEMO_ACTION_SHOW_TREEVIEW "Show Treeview"
 
 #define NEMO_ACTION_SHOW_HIDE_TOOLBAR "Show Hide Toolbar"
 #define NEMO_ACTION_TOOLBAR_ALWAYS_SHOW_PATHBAR "Toolbar Always Show Pathbar"

src/nemo-keybindings.c

@@ -58,6 +58,8 @@ const NemoKeybindingEntry nemo_keybinding_entries[] = {
 	{ "show-hidden-files",     "<Actions>/ShellActions/Show Hidden Files",  N_("Show Hidden Files"),          N_("Window"), "<Control>h",                NULL, NULL },
 	{ "show-sidebar",          "<Actions>/ShellActions/Show Hide Sidebar",  N_("Toggle Sidebar"),             N_("Window"), "F9",                        NULL, NULL },
 	{ "split-view",            "<Actions>/ShellActions/Show Hide Extra Pane", N_("Toggle Split View"),        N_("Window"), "<Control>F3",                   NULL, NULL },
+	{ "show-places",           "<Actions>/ShellActions/Show Places",          N_("Show Places Sidebar"),      N_("Window"), "<Alt><Shift>p",               NULL, NULL },
+	{ "show-treeview",         "<Actions>/ShellActions/Show Treeview",        N_("Show Treeview Sidebar"),    N_("Window"), "<Alt><Shift>t",               NULL, NULL },
 	{ "quick-preview",         "<Actions>/ShellActions/Quick Preview", N_("Quick File Preview"),        N_("Window"), "F3",                        NULL, NULL },
 	{ "toggle-mute",           NULL,                                   N_("Mute/Unmute Preview Audio"), N_("Window"), "<Control>m",                  NULL, NULL },
 	{ "toggle-play",           NULL,                                   N_("Play/Pause Preview Audio"),  N_("Window"), "<Control>space",              NULL, NULL },

src/nemo-statusbar.c

@@ -235,7 +235,11 @@ nemo_status_bar_constructed (GObject *object)
     button = gtk_toggle_button_new ();
     icon = gtk_image_new_from_icon_name ("nemo-sidebar-places-symbolic", size);
     gtk_button_set_image (GTK_BUTTON (button), icon);
-    gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("Show Places"));
+    {
+        gchar *tip = make_tooltip_with_accel (bar, _("Show Places"), NEMO_ACTION_SHOW_PLACES);
+        gtk_widget_set_tooltip_text (GTK_WIDGET (button), tip);
+        g_free (tip);
+    }
     bar->places_button = button;
     gtk_box_pack_start (GTK_BOX (bar), button, FALSE, FALSE, 2);
     g_signal_connect (GTK_BUTTON (button), "clicked",
@@ -244,7 +248,11 @@ nemo_status_bar_constructed (GObject *object)
     button = gtk_toggle_button_new ();
     icon = gtk_image_new_from_icon_name ("nemo-sidebar-tree-symbolic", size);
     gtk_button_set_image (GTK_BUTTON (button), icon);
-    gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("Show Treeview"));
+    {
+        gchar *tip = make_tooltip_with_accel (bar, _("Show Treeview"), NEMO_ACTION_SHOW_TREEVIEW);
+        gtk_widget_set_tooltip_text (GTK_WIDGET (button), tip);
+        g_free (tip);
+    }
     bar->tree_button = button;
     gtk_box_pack_start (GTK_BOX (bar), button, FALSE, FALSE, 2);
     g_signal_connect (GTK_BUTTON (button), "clicked",

src/nemo-window-menus.c

@@ -599,6 +599,24 @@ action_split_view_same_location_callback (GtkAction *action,
 	}
 }
 
+static void
+action_show_places_callback (GtkAction *action,
+                             gpointer user_data)
+{
+    NemoWindow *window = NEMO_WINDOW (user_data);
+    nemo_window_set_sidebar_id (window, NEMO_WINDOW_SIDEBAR_PLACES);
+    nemo_window_set_show_sidebar (window, TRUE);
+}
+
+static void
+action_show_treeview_callback (GtkAction *action,
+                               gpointer user_data)
+{
+    NemoWindow *window = NEMO_WINDOW (user_data);
+    nemo_window_set_sidebar_id (window, NEMO_WINDOW_SIDEBAR_TREE);
+    nemo_window_set_show_sidebar (window, TRUE);
+}
+
 static void
 action_show_hide_sidebar_callback (GtkAction *action,
 				   gpointer user_data)
@@ -2256,6 +2274,10 @@ static const GtkActionEntry main_entries[] = {
     G_CALLBACK (action_tabs_move_right_callback) },
   { "Sidebar List", NULL, N_("Sidebar") },
   { "Toolbar List", NULL, N_("Toolbar") },
+  { NEMO_ACTION_SHOW_PLACES, NULL, N_("Show _Places Sidebar"), NULL, N_("Switch to Places sidebar panel"),
+    G_CALLBACK (action_show_places_callback) },
+  { NEMO_ACTION_SHOW_TREEVIEW, NULL, N_("Show _Tree Sidebar"), NULL, N_("Switch to Tree sidebar panel"),
+    G_CALLBACK (action_show_treeview_callback) },
 };
 
 static const GtkToggleActionEntry main_toggle_entries[] = {