Merge lp:~donadigo/switchboard-plug-sharing/network-disconnected into lp:~elementary-apps/switchboard-plug-sharing/trunk

[Adam Bieńkowski]

* Fix bug #1528346: "Show a message when network is disconnected".

Fixes bug #1528346: "Show a message when network is disconnected".

This branch adds a simple AlertView when the network is disconnected, it uses already available NetworkMonitor from GIO so no need for additional libraries.

* Strings may be a little bit weird, please comment here to propose something better.
* Although the bug involved changing the page status to NOT_AVAILABLE, I've chosen a simpler method to present it directly in the root of the plug content.

[lp:~donadigo/switchboard-plug-sharing/network-disconnected]

62. By Adam Bieńkowski on 2016-06-10

Actually use the container as root widget

63. By Adam Bieńkowski on 2016-06-10

Fix the child name

[Danielle Foré (danrabbit)]

Looks good except a few things:

For the secondary text maybe "While disconnected from the network, sharing services are not available."

When reconnected, the message is not removed.

I believe that alertview as a built-in link button you can use

review: Needs Fixing

[lp:~donadigo/switchboard-plug-sharing/network-disconnected]

64. By Adam Bieńkowski on 2016-06-10

Fix the description string; check if network is metered

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2016-05-07 18:11:46 +0000
+++ src/Plug.vala	2016-06-10 20:45:37 +0000
@@ -18,10 +18,12 @@
  */
 
 public class Sharing.Plug : Switchboard.Plug {
-    private Gtk.Paned? main_container = null;
+    private Gtk.Stack? content = null;
 
+    private Gtk.Paned main_container;
     private Widgets.Sidebar sidebar;
     private Widgets.SettingsView settings_view;
+    private Gtk.LinkButton link_button;
 
     public Plug () {
         Object (category : Category.NETWORK,
@@ -32,12 +34,13 @@
     }
 
     public override Gtk.Widget get_widget () {
-        if (main_container == null) {
+        if (content == null) {
             build_ui ();
             connect_signals ();
+            update_content_view ();
         }
 
-        return main_container;
+        return content;
     }
 
     public override void shown () {
@@ -55,23 +58,64 @@
     }
 
     private void build_ui () {
+        content = new Gtk.Stack ();
+
         main_container = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
-
         sidebar = new Widgets.Sidebar ();
-
         settings_view = new Widgets.SettingsView ();
 
+        var network_alert_view = new Granite.Widgets.AlertView (_("Network Is Not Available"),
+                                                                _("While disconnected from the network, sharing services are not available."),
+                                                                "network-error");
+        network_alert_view.get_style_context ().remove_class (Gtk.STYLE_CLASS_VIEW);
+
+        link_button = new Gtk.LinkButton (_("Network settings…"));
+        link_button.halign = Gtk.Align.END;
+        link_button.valign = Gtk.Align.END;
+        link_button.vexpand = true;
+
+        var network_grid_view = new Gtk.Grid ();
+        network_grid_view.margin = 24;
+        network_grid_view.attach (network_alert_view, 0, 0, 1, 1);
+        network_grid_view.attach (link_button, 0, 1, 1, 1);
+
         foreach (Widgets.SettingsPage settings_page in settings_view.get_settings_pages ()) {
             sidebar.add_service_entry (settings_page.get_service_entry ());
         }
 
         main_container.pack1 (sidebar, false, false);
         main_container.pack2 (settings_view, true, false);
-        main_container.show_all ();
+
+        content.add_named (main_container, "main-container");
+        content.add_named (network_grid_view, "network-alert-view");
+        content.show_all ();
     }
 
     private void connect_signals () {
+        NetworkMonitor.get_default ().network_changed.connect (() => update_content_view ());
         sidebar.selected_service_changed.connect (settings_view.show_service_settings);
+
+        link_button.activate_link.connect (() => {
+            var list = new List<string> ();
+            list.append ("network");
+
+            try {
+                var appinfo = AppInfo.create_from_commandline ("switchboard", null, AppInfoCreateFlags.SUPPORTS_URIS);
+                appinfo.launch_uris (list, null);
+            } catch (Error e) {
+                warning (e.message);
+            }
+
+            return true;
+        });        
+    }
+
+    private void update_content_view () {
+        if (NetworkMonitor.get_default ().get_network_available () || NetworkMonitor.get_default ().get_network_metered ()) {
+            content.visible_child_name = "main-container";
+        } else {
+            content.visible_child_name = "network-alert-view";
+        }
     }
 }