Merge lp:~elementary-apps/switchboard/fix-bug-1039269 into lp:~elementary-pantheon/switchboard/switchboard

[David Gomes]

Use a back-arrow shaped button with text instead of a simple button. Fixes bug #1039269.

https://code.launchpad.net/~aniket-deole/switchboard/bug-fix/+merge/194643

Rewrote that with fixed bzr conflicts.

[Akshay Shekher (voldyman)]

please add src/Buttons.vala to the repo.

[David Gomes (davidgomes)]

Don't make it WIP when it needs fixing, I'll fix it later today.
On Dec 3, 2013 2:54 AM, "Akshay Shekher" <email address hidden> wrote:

> The proposal to merge lp:~elementary-apps/switchboard/fix-bug-1039269 into
> lp:switchboard has been updated.
>
> Status: Needs review => Work in progress
>
> For more details, see:
>
> https://code.launchpad.net/~elementary-apps/switchboard/fix-bug-1039269/+merge/197454
> --
>
> https://code.launchpad.net/~elementary-apps/switchboard/fix-bug-1039269/+merge/197454
> Your team elementary Apps team is subscribed to branch
> lp:~elementary-apps/switchboard/fix-bug-1039269.
>

[lp:~elementary-apps/switchboard/fix-bug-1039269]

413. By David Gomes on 2013-12-03

Fixed license header.

[Akshay Shekher (voldyman)]

the code look fine, i just a few suggestions.

rename the file from Buttons.vala to NavigationButton.vala, it'll look less generic.

In the signal search_box.changed you partially changed the closure, you could also fix the spacing of the bracket on line 294.

since when are we giving the copyright to elementary LLC instead of elementary Developers or <insert project name here> developers?

review: Approve

[lp:~elementary-apps/switchboard/fix-bug-1039269]

414. By David Gomes on 2013-12-03

Fixed file name and some code style.

[David Gomes (davidgomes)]

Done, and we've been doing that since the Isis cycle began, supposedly.

[Julián Unrrein (junrrein)]

Rename Buttons.vala in diff line 8 too.

[lp:~elementary-apps/switchboard/fix-bug-1039269]

415. By David Gomes on 2013-12-03

Fixed file name in CMakeLists.txt.

[Akshay Shekher (voldyman)]

well done.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-30 06:42:11 +0000
+++ CMakeLists.txt	2013-12-03 14:31:03 +0000
@@ -74,6 +74,7 @@
     src/Resources.vala
     src/DesktopLauncher.vala
     src/EmbeddedAlert.vala
+    src/NavigationButton.vala
 PACKAGES
     granite
     gee-1.0
 
=== added file 'src/NavigationButton.vala'
--- src/NavigationButton.vala	1970-01-01 00:00:00 +0000
+++ src/NavigationButton.vala	2013-12-03 14:31:03 +0000
@@ -0,0 +1,50 @@
+/***
+    BEGIN LICENSE
+
+    Copyright (C) 2013 elementary, LLC.
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE.  See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program.  If not, see <http://www.gnu.org/licenses>
+
+    END LICENSE
+***/
+
+namespace Switchboard {
+
+    public class NavigationButton : Gtk.Button {
+
+        private Gtk.Label text;
+
+        public NavigationButton () {
+            can_focus = false;
+            valign = Gtk.Align.CENTER;
+            vexpand = false;
+
+            Gtk.Box button_b = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+            var icon = new Gtk.Image.from_icon_name ("go-previous-symbolic",
+                                                     Gtk.IconSize.MENU);
+            text = new Gtk.Label ("");
+
+            button_b.pack_start (icon, true, true, 2);
+            button_b.pack_start (text, true, true, 2);
+
+            this.add (button_b);
+        }
+
+        public string get_text () {
+            return text.label;
+        }
+
+        public void set_text (string text) {
+            this.text.label = text;
+        }
+    }
+}
 
=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2013-09-26 08:05:15 +0000
+++ src/Switchboard.vala	2013-12-03 14:31:03 +0000
@@ -21,7 +21,7 @@
 
     [DBus (name = "org.elementary.switchboard")]
     public class SwitchboardApp : Granite.Application {
-        
+
         construct {
             application_id = "org.elementary.Switchboard";
             program_name = "Switchboard";
@@ -45,15 +45,15 @@
         Gtk.Label progress_label;
         Gtk.SearchEntry search_box;
         Gtk.Toolbar toolbar;
-        Gtk.ToolButton navigation_button;
+        Switchboard.NavigationButton navigation_button;
         // Public so we can hide it after show_all()
         public Gtk.ToolItem progress_toolitem;
         // These two wrap the progress bar
         Gtk.ToolItem lspace = new Gtk.ToolItem ();
         Gtk.ToolItem rspace = new Gtk.ToolItem ();
-        
+
         Gtk.Spinner loading;
-        
+
         Gtk.Window main_window;
 
         // Content area widgets
@@ -70,15 +70,16 @@
 
         string[] plug_places = {"/usr/share/plugs/",
                                 "/usr/lib/plugs/",
-                                "/usr/local/share/plugs/", 
+                                "/usr/local/share/plugs/",
                                 "/usr/local/lib/plugs/"};
         string search_box_buffer = "";
 
         private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
 
-        public SwitchboardApp () {
-        }
-        
+        string all_settings_label = _("All Settings");
+
+        public SwitchboardApp () { }
+
         void build () {
             main_window = new Gtk.Window();
 
@@ -149,6 +150,8 @@
                 category_view.recalculate_columns (width);
             });
 
+            navigation_button.hide ();
+
             foreach (var label in category_view.category_labels.values)
                 label.hide ();
             foreach (var view in category_view.category_views.values)
@@ -188,7 +191,7 @@
             } else {
                 update_libunity_quicklist ();
             }
-            
+
             bool found = false;
             if (plug_to_open != null) {
                 foreach (var plug in plugs) {
@@ -201,17 +204,17 @@
                     critical ("Couldn't find %s among the loaded settings.", plug_to_open);
                 }
             }
-            
+
             foreach (var store in category_view.category_store.values) {
                 store.foreach ((model, path, iter) => {
                     store.set_value (iter, 3, true);
                     return false;
                 });
             }
-            
+
             progress_toolitem.hide ();
         }
-        
+
         void shut_down () {
             plug_closed ();
         }
@@ -236,15 +239,17 @@
                     // The plug is already selected
                     debug(_("Closing plug \"%s\" in Switchboard controller..."), current_plug["title"]);
                     plug_closed ();
-                    
+
                     string[] cmd_exploded = (executable!=null)?executable.split (" "):null;
                     GLib.Process.spawn_async (File.new_for_path (cmd_exploded[0]).get_parent ().
                         get_path (), cmd_exploded, null, SpawnFlags.SEARCH_PATH, null, null);
-                    
+
                     // ensure the button is sensitive; it might be the first plug loaded
                     if (!@extern) {
-                        navigation_button.set_sensitive(true);
-                        navigation_button.set_icon_name ("go-home");
+                        navigation_button.set_sensitive (true);
+                        navigation_button.set_text (all_settings_label);
+                        navigation_button.show ();
+
                         current_plug["title"] = title;
                         current_plug["executable"] = executable;
                         switch_to_socket ();
@@ -252,10 +257,11 @@
                     }
                 } catch {  warning(_("Failed to launch plug: title %s | executable %s"), title, executable); }
             } else {
-                navigation_button.set_sensitive(true);
-                navigation_button.set_icon_name ("go-home");
+                navigation_button.set_sensitive (true);
+                navigation_button.set_text (all_settings_label);
+                navigation_button.show ();
             }
-            
+
             if (@extern) {
                 switch_to_icons ();
             }
@@ -268,20 +274,17 @@
 
         // Handles clicking the navigation button
         void handle_navigation_button_clicked () {
-            string icon_name = navigation_button.get_icon_name ();
-            if (icon_name == "go-home") {
+            if (navigation_button.get_text () != current_plug["title"]) {
                 switch_to_icons();
-                navigation_button.set_icon_name ("go-previous");
-            }
-            else {
+                navigation_button.set_text (current_plug["title"]);
+            } else {
                 load_plug (current_plug["title"], current_plug["executable"], current_plug["extern"] == "1");
-                navigation_button.set_icon_name ("go-home");
+                navigation_button.set_text (all_settings_label);
             }
         }
 
         // Switches to the socket view
         void switch_to_socket () {
-
             socket_shown = true;
             search_box.sensitive = false;
 
@@ -289,13 +292,13 @@
             socket.hide ();
             loading.show_all ();
         }
-        
+
         // Switches back to the icons
         bool switch_to_icons () {
             socket.hide ();
             loading.hide ();
             category_view.show ();
-            
+
             socket_shown = false;
 
             // Reset state
@@ -305,9 +308,9 @@
             progress_label.set_text("");
             progress_bar.fraction = 0.0;
             progress_toolitem.visible = false;
-            
+
             plug_closed ();
-            
+
             return true;
         }
 
@@ -341,7 +344,7 @@
                             exec = Path.build_filename(parent, exec);
                             plug["extern"] = "0";
                         }
-                        
+
                         plug["exec"] = exec;
                     } catch (Error e) { warning("Couldn't read exec field in file %s, %s", keyfile, e.message); }
                     try { plug["icon"] = kf.get_string (head, "icon");
@@ -385,7 +388,7 @@
                     keyfiles.append(keyfile);
                 }
             }
-            
+
             var directory = File.new_for_path (path);
             if (!directory.query_exists ()) {
                 return null;
@@ -396,7 +399,7 @@
                 FileInfo file_info;
                 while ((file_info = enumerator.next_file ()) != null) {
                     string file_path = Path.build_filename(path, file_info.get_name());
-                    if (file_info.get_file_type() == GLib.FileType.REGULAR && 
+                    if (file_info.get_file_type() == GLib.FileType.REGULAR &&
                         is_plug_file(file_info.get_name())) {
                         keyfiles.append(file_path);
                     } else if(file_info.get_file_type() == GLib.FileType.DIRECTORY) {
@@ -404,7 +407,7 @@
                     }
                 }
             } catch { warning(_(@"Unable to iterate over enumerated plug directory \"$path\"'s contents")); }
-            
+
             return keyfiles;
         }
 
@@ -496,12 +499,15 @@
             // Searchbar
             search_box = new Gtk.SearchEntry ();
             search_box.set_placeholder_text (_("Search Settings"));
-            search_box.activate.connect(() => search_box_activated());
-            search_box.changed.connect(() => {
-                category_view.filter_plugs(search_box.get_text (), this);
-                search_box_text_changed();
+            search_box.activate.connect (() => search_box_activated ());
+
+            search_box.changed.connect (() => {
+                category_view.filter_plugs (search_box.get_text (), this);
+                search_box_text_changed ();
             });
+
             search_box.sensitive = (count_plugs () > 0);
+            search_box.margin = 5;
             var find_toolitem = new Gtk.ToolItem ();
             find_toolitem.add(search_box);
             find_toolitem.margin_right = 6;
@@ -516,19 +522,21 @@
             });
 
             // Nav button
-            navigation_button = new Gtk.ToolButton (null, null);
-            navigation_button.set_icon_name ("go-previous");
+            navigation_button = new NavigationButton ();
             navigation_button.clicked.connect (handle_navigation_button_clicked);
-            navigation_button.set_sensitive(false);
+            navigation_button.margin = 5;
 
             // Add everything to the toolbar
-            toolbar.insert (navigation_button, -1);
+
+            Gtk.ToolItem tool = new Gtk.ToolItem ();
+            tool.add (navigation_button);
+            toolbar.insert (tool, -1);
             toolbar.insert (lspace, -1);
             toolbar.insert (progress_toolitem, -1);
             toolbar.insert (rspace, -1);
             toolbar.insert (find_toolitem, -1);
         }
-        
+
         public override void activate () {
             // If app is already running, present the current window.
             if (get_windows () != null) {
@@ -594,29 +602,29 @@
         message(_(@"Welcome to $APP_TITLE"));
         message(_(@"Version: $VERSION"));
         message(_("Report any issues/bugs you mind find to lp:switchboard"));
-        
+
         Gtk.init (ref args);
-        
+
         var context = new OptionContext("");
         context.add_main_entries(entries, "switchboard ");
         context.add_group(Gtk.get_option_group(true));
         try {
             context.parse(ref args);
         } catch(Error e) { warning (e.message); }
-        
+
         // In the future, the plug_root_dir should be overridable by CLI flags.
         var switchboard_app = new SwitchboardApp ();
-        
+
         GLib.Bus.own_name (BusType.SESSION, "org.elementary.switchboard",
                 BusNameOwnerFlags.NONE,
-                (conn) => { 
+                (conn) => {
                     try {
                         conn.register_object("/org/elementary/switchboard", switchboard_app);
                     } catch (IOError e) { warning (e.message); }
                 },
                 () => {},
                 () => {logger.notification(_("Switchboard already running. Exiting..")); Process.exit(1);});
-        
+
         return switchboard_app.run (args);
     }
 }