Merge lp:~donadigo/switchboard-plug-networking/edit-connections-button into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[Adam Bieńkowski]

* Add an edit connections button to the toolbar.

This branch adds a simple edit connections button to the bottom of the sidebar. This temprarily fixes the current issue we have with settings button being not accessible when not connected. However the pages need to be redesigned anyway for future releases.

[Cody Garver (codygarver)]

Should this instead be using AppInfo.create_from_commandline?

https://bugs.launchpad.net/wingpanel-indicator-network/+bug/1575376

[Adam Bieńkowski (donadigo)]

Cody: nm-connection-editor does not have any desktop file associated with it like switchboard and also, launching with AppInfo there is no way to determine when the command has ended so we can make the settings button sensitive again.

[Adam Bieńkowski (donadigo)]

Branch updated to comply to suggestions from Daniel and Felipe. The button should be on every page that features connections instead of in the sidebar.

=== modified file 'src/Widgets/EtherInterface.vala'
--- src/Widgets/EtherInterface.vala	2016-07-29 21:11:33 +0000
+++ src/Widgets/EtherInterface.vala	2016-08-09 12:41:24 +0000
@@ -33,10 +33,7 @@
             top_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
             top_revealer.add (info_box);
 
-            var button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-            button_box.pack_end (new SettingsButton.from_device (device), false, false, 0);
-
-            bottom_box.add (button_box);
+            bottom_box.pack_start (new SettingsButton.from_device (device), false, false, 0);
 
             add (top_revealer);
             add (bottom_revealer);

=== modified file 'src/Widgets/Page.vala'
--- src/Widgets/Page.vala	2016-07-29 21:11:33 +0000
+++ src/Widgets/Page.vala	2016-08-09 12:41:24 +0000
@@ -63,7 +63,9 @@
 
             bottom_revealer = new Gtk.Revealer ();
             bottom_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_UP;
-            bottom_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 12);
+
+            bottom_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+            bottom_box.pack_start (new SettingsButton (), false, false, 0);
 
             bottom_revealer.add (bottom_box);
         }

=== modified file 'src/Widgets/SettingsButton.vala'
--- src/Widgets/SettingsButton.vala	2016-07-22 16:01:12 +0000
+++ src/Widgets/SettingsButton.vala	2016-08-09 12:41:24 +0000
@@ -19,15 +19,24 @@
 
  namespace Network.Widgets {
     public class SettingsButton : Gtk.Button {
-        private string uuid = "";
+        private string? uuid = null;
 
         construct {
             clicked.connect (() => {
-                new Granite.Services.SimpleCommand ("/usr/bin",
-                                                    "nm-connection-editor --edit=%s".printf (uuid)).run ();
+                if (uuid != null) {
+                    new Granite.Services.SimpleCommand ("/usr/bin",
+                                                        "nm-connection-editor --edit=%s".printf (uuid)).run ();
+                } else {
+                    new Granite.Services.SimpleCommand ("/usr/bin",
+                                                        "nm-connection-editor").run ();
+                }
             });  
         }
 
+        public SettingsButton () {
+            label = _("Edit Connections…");
+        }
+
         public SettingsButton.from_device (NM.Device device, string title = _("Advanced Settings…")) {
             label = title;
             uuid = device.get_active_connection ().get_uuid ();

=== modified file 'src/Widgets/VPNPage.vala'
--- src/Widgets/VPNPage.vala	2016-07-30 21:30:37 +0000
+++ src/Widgets/VPNPage.vala	2016-08-09 12:41:24 +0000
@@ -137,6 +137,8 @@
             control_switch.no_show_all = true;
             control_switch.visible = false;
 
+            bottom_revealer.set_reveal_child (true);
+
             this.add (top_revealer);
             this.add (main_frame);
             this.add (bottom_revealer);

=== modified file 'src/Widgets/WifiInterface.vala'
--- src/Widgets/WifiInterface.vala	2016-07-29 19:49:28 +0000
+++ src/Widgets/WifiInterface.vala	2016-08-09 12:41:24 +0000
@@ -89,14 +89,10 @@
 
             main_frame.add (list_stack);
 
-            var button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-
             hidden_btn = new Gtk.Button.with_label (_("Connect to Hidden Network…"));
             hidden_btn.clicked.connect (connect_to_hidden);
 
-            button_box.pack_start (hidden_btn, false, false, 0);
-
-            bottom_box.add (button_box);
+            bottom_box.pack_start (hidden_btn, false, false, 0);
 
             this.add (top_revealer);
             this.add (main_frame);