toolbar: Add 'toggle-extra-pane' button.

User can now add this to their toolbar. It mimics 'Extra Pane'
in the View menu.

ref: #1682.

Author: mtwebster

gresources/nemo-file-management-properties.glade

@@ -60,6 +60,11 @@ along with .  If not, see <http://www.gnu.org/licenses/>.
     <property name="can-focus">False</property>
     <property name="icon-name">xapp-prefs-preview-symbolic</property>
   </object>
+  <object class="GtkImage" id="image15">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">view-dual-symbolic</property>
+  </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -2927,7 +2932,7 @@ along with .  If not, see <http://www.gnu.org/licenses/>.
                                   </packing>
                                 </child>
                                 <child>
-                                  <!-- n-columns=3 n-rows=7 -->
+                                  <!-- n-columns=2 n-rows=8 -->
                                   <object class="GtkGrid">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
@@ -3456,22 +3461,41 @@ along with .  If not, see <http://www.gnu.org/licenses/>.
                                       </packing>
                                     </child>
                                     <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
+                                      <object class="GtkBox">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="spacing">6</property>
+                                        <child>
+                                          <object class="GtkToggleButton" id="show_toggle_extra_pane_icon_toolbar_togglebutton">
+                                            <property name="name">show_previous_icon_toolbar_togglebutton</property>
+                                            <property name="visible">True</property>
+                                            <property name="can-focus">True</property>
+                                            <property name="receives-default">True</property>
+                                            <property name="image">image15</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel">
+                                            <property name="visible">True</property>
+                                            <property name="can-focus">False</property>
+                                            <property name="label" translatable="yes">Extra Pane</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="left-attach">0</property>
+                                        <property name="top-attach">7</property>
+                                      </packing>
                                     </child>
                                     <child>
                                       <placeholder/>

libnemo-private/nemo-global-preferences.h

@@ -106,6 +106,7 @@ typedef enum
 #define NEMO_PREFERENCES_SHOW_COMPACT_VIEW_ICON_TOOLBAR   "show-compact-view-icon-toolbar"
 #define NEMO_PREFERENCES_SHOW_ROOT_WARNING                "show-root-warning"
 #define NEMO_PREFERENCES_SHOW_SHOW_THUMBNAILS_TOOLBAR     "show-show-thumbnails-toolbar"
+#define NEMO_PREFERENCES_SHOW_TOGGLE_EXTRA_PANE_TOOLBAR "show-toggle-extra-pane-toolbar"
 
 /* Which views should be displayed for new windows */
 #define NEMO_WINDOW_STATE_START_WITH_STATUS_BAR		"start-with-status-bar"

libnemo-private/org.nemo.gschema.xml

@@ -176,6 +176,11 @@
       <summary>Show Thumbnails button in nemo toolbar</summary>
       <description>If set to true, then Nemo browser windows will show the button.</description>
     </key>
+    <key type="b" name="show-toggle-extra-pane-toolbar">
+      <default>false</default>
+      <summary>Show Extra Pane button in nemo toolbar</summary>
+      <description>If set to true, then Nemo browser windows will show the button.</description>
+    </key>
     <key type="b" name="show-root-warning">
       <default>true</default>
       <summary>Show warning when opening as root</summary>

src/nemo-file-management-properties.c

@@ -88,6 +88,7 @@
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_LIST_VIEW_ICON_TOOLBAR_WIDGET "show_list_view_icon_toolbar_togglebutton"
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_COMPACT_VIEW_ICON_TOOLBAR_WIDGET "show_compact_view_icon_toolbar_togglebutton"
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_SHOW_THUMBNAILS_ICON_TOOLBAR_WIDGET "show_show_thumbnails_icon_toolbar_togglebutton"
+#define NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_TOGGLE_EXTRA_PANE_ICON_TOOLBAR_WIDGET "show_toggle_extra_pane_icon_toolbar_togglebutton"
 
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_FULL_PATH_IN_TITLE_BARS_WIDGET "show_full_path_in_title_bars_checkbutton"
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_CLOSE_DEVICE_VIEW_ON_EJECT_WIDGET "close_device_view_on_eject_checkbutton"
@@ -901,6 +902,9 @@ nemo_file_management_properties_dialog_setup (GtkBuilder  *builder,
     bind_builder_bool (builder, nemo_preferences,
         NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_OPEN_IN_TERMINAL_ICON_TOOLBAR_WIDGET,
         NEMO_PREFERENCES_SHOW_OPEN_IN_TERMINAL_TOOLBAR);
+    bind_builder_bool (builder, nemo_preferences,
+        NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_TOGGLE_EXTRA_PANE_ICON_TOOLBAR_WIDGET,
+        NEMO_PREFERENCES_SHOW_TOGGLE_EXTRA_PANE_TOOLBAR);
     bind_builder_bool (builder, nemo_preferences,
 			   NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_ICON_VIEW_ICON_TOOLBAR_WIDGET,
 			   NEMO_PREFERENCES_SHOW_ICON_VIEW_ICON_TOOLBAR);

src/nemo-toolbar.c

@@ -56,6 +56,7 @@ struct _NemoToolbarPriv {
     GtkWidget *list_view_button;
     GtkWidget *compact_view_button;
     GtkWidget *show_thumbnails_button;
+    GtkWidget *show_extra_pane_button;
 
 	GtkWidget *path_bar;
 	GtkWidget *location_bar;
@@ -197,6 +198,11 @@ toolbar_update_appearance (NemoToolbar *self)
     icon_toolbar = g_settings_get_boolean (nemo_preferences, NEMO_PREFERENCES_SHOW_SHOW_THUMBNAILS_TOOLBAR);
     if ( icon_toolbar == FALSE ) { gtk_widget_hide (widgetitem); }
     else {gtk_widget_show (GTK_WIDGET(widgetitem));}
+
+    widgetitem = self->priv->show_extra_pane_button;
+    icon_toolbar = g_settings_get_boolean (nemo_preferences, NEMO_PREFERENCES_SHOW_TOGGLE_EXTRA_PANE_TOOLBAR);
+    if ( icon_toolbar == FALSE ) { gtk_widget_hide (widgetitem); }
+    else {gtk_widget_show (GTK_WIDGET(widgetitem));}
 }
 
 static void
@@ -343,6 +349,9 @@ nemo_toolbar_constructed (GObject *obj)
 
     setup_root_info_bar (self);
 
+    self->priv->show_extra_pane_button = toolbar_create_toolbutton (self, TRUE, NEMO_ACTION_SHOW_HIDE_EXTRA_PANE);
+    gtk_container_add (GTK_CONTAINER (box), self->priv->show_extra_pane_button);
+
     self->priv->icon_view_button = toolbar_create_toolbutton (self, TRUE, NEMO_ACTION_ICON_VIEW);
     gtk_container_add (GTK_CONTAINER (box), self->priv->icon_view_button);
 

src/nemo-window-menus.c

@@ -658,7 +658,7 @@ action_split_view_callback (GtkAction *action,
 		}
 	}
 
-    nemo_window_update_split_view_actions_sensitivity (window);
+    nemo_window_update_show_hide_ui_elements (window);
 }
 
 static void
@@ -778,20 +778,36 @@ update_side_bar_radio_buttons (NemoWindow *window)
 }
 
 void
-nemo_window_update_show_hide_menu_items (NemoWindow *window)
+nemo_window_update_show_hide_ui_elements (NemoWindow *window)
 {
+    NemoWindowPane *pane;
 	GtkActionGroup *action_group;
 	GtkAction *action;
 
 	action_group = nemo_window_get_main_action_group (window);
 
 	action = gtk_action_group_get_action (action_group,
 					      NEMO_ACTION_SHOW_HIDE_EXTRA_PANE);
+    gtk_action_block_activate (action);
 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
 				      nemo_window_split_view_showing (window));
+    gtk_action_unblock_activate (action);
+
 	nemo_window_update_split_view_actions_sensitivity (window);
 
     update_side_bar_radio_buttons (window);
+
+    pane = nemo_window_get_active_pane (window);
+    if (pane != NULL) {
+        action_group = nemo_window_pane_get_toolbar_action_group (pane);
+
+        action = gtk_action_group_get_action (action_group,
+                                              NEMO_ACTION_SHOW_HIDE_EXTRA_PANE);
+        gtk_action_block_activate (action);
+        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                      nemo_window_split_view_showing (window));
+        gtk_action_unblock_activate (action);
+    }
 }
 
 static void
@@ -1788,6 +1804,19 @@ nemo_window_create_toolbar_action_group (NemoWindow *window)
 
    	g_object_unref (action);
 
+    action = GTK_ACTION (gtk_toggle_action_new (NEMO_ACTION_SHOW_HIDE_EXTRA_PANE,
+                         NULL,
+                         _("Open an extra folder view side-by-side"),
+                         NULL));
+    g_signal_connect (action, "activate",
+                      G_CALLBACK (action_split_view_callback),
+                      window);
+
+    gtk_action_group_add_action (action_group, action);
+    gtk_action_set_icon_name (GTK_ACTION (action), "view-dual-symbolic");
+
+    g_object_unref (action);
+
 	navigation_state = nemo_window_get_navigation_state (window);
 	nemo_navigation_state_add_group (navigation_state, action_group);
 
@@ -1853,7 +1882,7 @@ nemo_window_initialize_actions (NemoWindow *window)
 								    nav_state_actions);
 
 	window_menus_set_bindings (window);
-	nemo_window_update_show_hide_menu_items (window);
+	nemo_window_update_show_hide_ui_elements (window);
 
 	g_signal_connect (window, "loading_uri",
 			  G_CALLBACK (nemo_window_update_split_view_actions_sensitivity),

src/nemo-window-pane.c

@@ -1282,7 +1282,7 @@ nemo_window_pane_close_slot (NemoWindowPane *pane,
 
 			DEBUG ("Calling set_active_pane, new slot %p", new_pane->active_slot);
 			nemo_window_set_active_pane (window, new_pane);
-			nemo_window_update_show_hide_menu_items (window);
+			nemo_window_update_show_hide_ui_elements (window);
 		} else {
 			DEBUG ("Last slot removed from the last pane, close the window");
 			nemo_window_close (window);

src/nemo-window-private.h

@@ -173,7 +173,7 @@ void               nemo_window_initialize_actions                    (NemoWindow
 void               nemo_window_initialize_menus                      (NemoWindow    *window);
 void               nemo_window_finalize_menus                        (NemoWindow    *window);
 
-void               nemo_window_update_show_hide_menu_items           (NemoWindow     *window);
+void               nemo_window_update_show_hide_ui_elements           (NemoWindow     *window);
 
 /* window toolbar */
 void               nemo_window_close_pane                            (NemoWindow    *window,

src/nemo-window.c

@@ -478,7 +478,7 @@ nemo_window_hide_sidebar (NemoWindow *window)
 	}
 
 	nemo_window_tear_down_sidebar (window);
-	nemo_window_update_show_hide_menu_items (window);
+	nemo_window_update_show_hide_ui_elements (window);
 
     nemo_window_set_show_sidebar (window, FALSE);
 }
@@ -497,7 +497,7 @@ nemo_window_show_sidebar (NemoWindow *window)
 	}
 
 	nemo_window_set_up_sidebar (window);
-	nemo_window_update_show_hide_menu_items (window);
+	nemo_window_update_show_hide_ui_elements (window);
 
     nemo_window_set_show_sidebar (window, TRUE);
 }
@@ -2247,7 +2247,7 @@ nemo_window_split_view_off (NemoWindow *window)
 	nemo_navigation_state_set_master (window->details->nav_state,
 					      active_pane->action_group);
 
-	nemo_window_update_show_hide_menu_items (window);
+	nemo_window_update_show_hide_ui_elements (window);
 }
 
 gboolean