Merge lp:~aniket-deole/switchboard/bug-fix into lp:~elementary-pantheon/switchboard/switchboard

[Cody Garver]

Use AppCenter style button instead of arrow to fix bug #1039269

[Danielle Foré (danrabbit)]

Looks good on design side. Just needs code approval :)

review: Approve

[Sergey "Shnatsel" Davidoff (shnatsel)]

Things like "<<<<<<< TREE" should not creep into the diff - they are Bazaar conflict markers, which the conflict should be resolved before committing. The code in its current state is not workable.

See http://doc.bazaar.canonical.com/beta/en/user-guide/resolving_conflicts.html for information on resolving conflicts.

review: Needs Fixing

[Aniket Deole (aniket-deole)]

I updated my local repo to the latest from lp:switchboard using "bzr merge" and now it requires gtk 3.6. But I'm still on Luna which has 3.4! Any help ?

[Aniket Deole (aniket-deole)]

"Any help" as in... Can I solve this without upgrading / getting all the Isis stuff ?

[David Gomes (davidgomes)]

https://code.launchpad.net/~elementary-apps/switchboard/fix-bug-1039269/+merge/197454

Made new one there creditting Aniket Deole of course.

Unmerged revisions

401. By Aniket Deole on 2013-09-05

Modified Back button related to bug 1039269.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-30 06:42:11 +0000
+++ CMakeLists.txt	2013-11-10 18:40:27 +0000
@@ -74,6 +74,7 @@
     src/Resources.vala
     src/DesktopLauncher.vala
     src/EmbeddedAlert.vala
+    src/Buttons.vala
 PACKAGES
     granite
     gee-1.0

=== added file 'src/Buttons.vala'
--- src/Buttons.vala	1970-01-01 00:00:00 +0000
+++ src/Buttons.vala	2013-11-10 18:40:27 +0000
@@ -0,0 +1,50 @@
+/***
+  BEGIN LICENSE
+
+  Copyright (C) 2012-2013 Mario Guerriero <[e-mail]>
+  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-11-10 18:40:27 +0000
@@ -45,7 +45,7 @@
         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
@@ -75,6 +75,8 @@
         string search_box_buffer = "";
 
         private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
+        
+        string all_settings_label = _("All Settings");
 
         public SwitchboardApp () {
         }
@@ -149,6 +151,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)
@@ -243,8 +247,14 @@
                     
                     // ensure the button is sensitive; it might be the first plug loaded
                     if (!@extern) {
+<<<<<<< TREE
                         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 ();
+>>>>>>> MERGE-SOURCE
                         current_plug["title"] = title;
                         current_plug["executable"] = executable;
                         switch_to_socket ();
@@ -252,8 +262,14 @@
                     }
                 } catch {  warning(_("Failed to launch plug: title %s | executable %s"), title, executable); }
             } else {
+<<<<<<< TREE
                 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 ();
+>>>>>>> MERGE-SOURCE
             }
             
             if (@extern) {
@@ -268,15 +284,28 @@
 
         // Handles clicking the navigation button
         void handle_navigation_button_clicked () {
+<<<<<<< TREE
             string icon_name = navigation_button.get_icon_name ();
             if (icon_name == "go-home") {
+=======
+            if (navigation_button.get_text () != current_plug["title"]) {
+>>>>>>> MERGE-SOURCE
                 switch_to_icons();
+<<<<<<< TREE
                 navigation_button.set_icon_name ("go-previous");
+=======
+                navigation_button.set_text (current_plug["title"]);
+>>>>>>> MERGE-SOURCE
             }
             else {
                 load_plug (current_plug["title"], current_plug["executable"], current_plug["extern"] == "1");
+<<<<<<< TREE
                 navigation_button.set_icon_name ("go-home");
             }
+=======
+                navigation_button.set_text (all_settings_label);
+            } 
+>>>>>>> MERGE-SOURCE
         }
 
         // Switches to the socket view
@@ -502,6 +531,7 @@
                 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,13 +546,19 @@
             });
 
             // Nav button
+<<<<<<< TREE
             navigation_button = new Gtk.ToolButton (null, null);
             navigation_button.set_icon_name ("go-previous");
+=======
+            navigation_button = new NavigationButton (); 
+>>>>>>> MERGE-SOURCE
             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);