Merge lp:~naaando/switchboard-plug-networking/switchboard-plug-networking into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[Danielle Foré]

[Danielle Foré (danrabbit)]

Hey Fernando, thanks for you branch! It looks like there are a couple of things that need fixing:

* The label needs to have wrap = true so that it won't change the size of the window when the hotspot pane is opened

* The H2 class here is a bit excessive since we already have an H2 in this layout. It should probably just be a regular label

* The box you've added here isn't necessary since we're only packing a single widget (the label).

* Maybe you should consider replacing the current hotspot_revealer with a Gtk.Stack. This would probably be a more elegant way to switch between showing the warning label and the hotspot information

review: Needs Fixing

[Fernando da Silva Sousa (naaando)]

I've made the changes, now how I change them in my commit ? Or should I make a new commit? I'm new to bzr-launchpad thing(and Vala too).

Any convention about Gtk transitions and duration on elementary?

[Danielle Foré (danrabbit)]

You'll want to make a new commit like so:

bzr commit -m "A description of changes made in the commit"

and then push it to this branch

bzr push

Please don't change the transition duration from Gtk defaults.

[lp:~naaando/switchboard-plug-networking/switchboard-plug-networking]

340. By Fernando da Silva Sousa on 2016-12-14

Add hotspot warning about wifi being disconnected
 https://bugs.launchpad.net/switchboard-plug-networking/+bug/1619088

Unmerged revisions

=== modified file 'src/Widgets/HotspotInterface.vala'
--- src/Widgets/HotspotInterface.vala	2016-07-29 19:49:28 +0000
+++ src/Widgets/HotspotInterface.vala	2016-12-10 20:08:43 +0000
@@ -21,8 +21,10 @@
     public class HotspotInterface : Network.AbstractHotspotInterface {
 
         private NM.RemoteSettings nm_settings;
-        private Gtk.Revealer hotspot_revealer;
+        private Gtk.Stack hotspot_stack;
         private Gtk.Button hotspot_settings_btn;
+        private Gtk.Box hinfo_box;
+        private Gtk.Label warning_label;
         private Gtk.Label ssid_label;
         private Gtk.Label key_label;
         private bool switch_updating = false;
@@ -34,12 +36,16 @@
 
             this.icon_name = "network-wireless-hotspot";
 
-            hotspot_revealer = new Gtk.Revealer ();
-            hotspot_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
+            hotspot_stack = new Gtk.Stack();
+            hotspot_stack.set_transition_type(Gtk.StackTransitionType.UNDER_UP);
+
+            warning_label = new Gtk.Label (_("Turning on the Hotspot Mode will disconnect from any connected wireless networks."));
+            warning_label.halign = Gtk.Align.CENTER;
+            warning_label.set_line_wrap(true);
 
             hotspot_settings_btn = new SettingsButton.from_device (device, _("Hotspot Settings…"));
 
-            var hinfo_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
+            hinfo_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
 
             ssid_label = new Gtk.Label ("");
             ssid_label.halign = Gtk.Align.START;
@@ -49,7 +55,9 @@
 
             hinfo_box.add (ssid_label);
             hinfo_box.add (key_label);
-            hotspot_revealer.add (hinfo_box);
+
+            hotspot_stack.add_named (warning_label, "warning_label");
+            hotspot_stack.add_named (hinfo_box, "hinfo_box");
 
             bottom_revealer = new Gtk.Revealer ();
 
@@ -62,7 +70,7 @@
 
             update ();
 
-            this.add (hotspot_revealer);
+            this.add (hotspot_stack);
             this.add (bottom_revealer);
             this.show_all ();
         }
@@ -104,7 +112,7 @@
                     } else {
                         switch_updating = true;
                         control_switch.active = false;
-                    }              
+                    }
                 });
 
                 hotspot_dialog.run ();
@@ -117,11 +125,15 @@
             bool hotspot_mode = Utils.Hotspot.get_device_is_hotspot (wifi_device, nm_settings);
 
             var mode = Utils.CustomMode.HOTSPOT_DISABLED;
+
             if (hotspot_mode) {
                 mode = Utils.CustomMode.HOTSPOT_ENABLED;
             }
 
-            hotspot_revealer.set_reveal_child (hotspot_mode);
+            if(hotspot_mode)
+                hotspot_stack.set_visible_child (hinfo_box);
+            else
+                hotspot_stack.set_visible_child (warning_label);
 
             if (hotspot_mode) {
                 var connection = nm_settings.get_connection_by_path (wifi_device.get_active_connection ().get_connection ());
@@ -147,8 +159,8 @@
                     Utils.Hotspot.update_secrets (connection, update);
                     return;
                 }
-                
-                key_label.label = _("Password %s: %s").printf (security, secret);  
+
+                key_label.label = _("Password %s: %s").printf (security, secret);
             }
         }