Merge lp:~donadigo/switchboard/return-to-previous-plug into lp:~elementary-pantheon/switchboard/switchboard

[Adam Bieńkowski]

When redirected to an other plug make navigation button return to previous plug.

Fixes bug #1497553. When redirected to an other plug make navigation button return to previous plug. This should support multiple redicretions as previous plugs are stored in the list instead of one variable.

[lp:~donadigo/switchboard/return-to-previous-plug]

570. By Adam Bieńkowski on 2015-09-22

Remove unneded line

571. By Adam Bieńkowski on 2015-09-22

Fix a code a little bit

572. By Adam Bieńkowski on 2015-09-22

Missing comment

[Danielle Foré (danrabbit)]

Works for me :)

Only thing I can see is that it looks like current code style is to put a space before <> so "Gee.ArrayList<Switchboard.Plug>" becomes "Gee.ArrayList <Switchboard.Plug>"

review: Needs Fixing

[lp:~donadigo/switchboard/return-to-previous-plug]

573. By Adam Bieńkowski on 2015-09-23

Small code-style fix

574. By Adam Bieńkowski on 2015-09-23

Another code-style fix

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2015-04-09 08:46:22 +0000
+++ src/Switchboard.vala	2015-09-23 15:45:37 +0000
@@ -44,6 +44,7 @@
         private Gee.LinkedList <string> loaded_plugs;
         private string all_settings_label = _("All Settings");
 
+        public Gee.ArrayList <Switchboard.Plug> previous_plugs;
         public Switchboard.Plug current_plug;
         public Gtk.SearchEntry search_box { public get; private set; }
 
@@ -150,6 +151,7 @@
             }
 
             loaded_plugs = new Gee.LinkedList <string> ();
+            previous_plugs = new Gee.ArrayList <Switchboard.Plug> ();
             Switchboard.PlugsManager.get_default ();
             settings = new GLib.Settings ("org.pantheon.switchboard.saved-state");
             build ();
@@ -179,6 +181,8 @@
                     loaded_plugs.add (plug.code_name);
                 }
 
+                previous_plugs.add (plug);
+
                 // Launch plug's executable
                 navigation_button.set_sensitive (true);
                 navigation_button.set_text (all_settings_label);
@@ -348,8 +352,12 @@
                 switch_to_icons ();
                 navigation_button.hide ();
             } else {
-                switch_to_plug (current_plug);
-                navigation_button.set_text (all_settings_label);
+                if (previous_plugs.size > 0 && stack.get_visible_child_name () != "main") {
+                    load_plug (previous_plugs.@get (0));
+                    previous_plugs.remove_at (0);
+                } else {
+                    switch_to_plug (current_plug);                 
+                }
             }
         }
 
@@ -362,6 +370,13 @@
                 stack.set_transition_type (Gtk.StackTransitionType.SLIDE_LEFT_RIGHT);
             }
 
+            if (previous_plugs.size > 1 && stack.get_visible_child_name () != "main") {
+                navigation_button.set_text (previous_plugs.@get (0).display_name);
+                previous_plugs.remove_at (previous_plugs.size - 1);
+            } else {
+                navigation_button.set_text (all_settings_label);
+            }
+
             search_box.sensitive = false;
             plug.shown ();
             stack.set_visible_child_name (plug.code_name);
@@ -373,6 +388,8 @@
             if (stack.transition_type == Gtk.StackTransitionType.NONE) {
                 stack.set_transition_type (Gtk.StackTransitionType.SLIDE_LEFT_RIGHT);
             }
+
+            previous_plugs.clear ();
             category_scrolled.show ();
             stack.set_visible_child (category_scrolled);
             current_plug.hidden ();