Merge lp:~kvalo/indicator-network/settings-tech-control into lp:~indicator-applet-developers/indicator-network/indicator-network

[Kalle Valo]

Connect device on/off buttons to libconnman. Also the icons on the left show now real state.

Wired, mobile and bluetooth boxes still are not implemented.

[Andrew (and471)]

This all looks great Kalle!

Just one small issue, FligthModeDevice should be FlightModeDevice :) The fact that this is the only issue is a credit to your work!

review: Needs Fixing

[lp:~kvalo/indicator-network/settings-tech-control]

159. By Kalle Valo on 2011-02-24

settings: fix spelling of word flight

My most common spelling error :)

[Kalle Valo (kvalo)]

Andrew <email address hidden> writes:

> Review: Needs Fixing
> This all looks great Kalle!

Thanks for review!

> Just one small issue, FligthModeDevice should be FlightModeDevice :)

Haha, I always do the same mistake :) I should make emacs warn about
this...

> The fact that this is the only issue is a credit to your work!

No, this is all credit to your work. The architecture for the settings
app is just excellent, it was extremely simple to connect libconnman to
it.

--
Kalle Valo

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'src/settings/backend/device.vala'
--- src/settings/backend/device.vala	2011-01-24 17:15:22 +0000
+++ src/settings/backend/device.vala	2011-02-24 08:05:23 +0000
@@ -18,57 +18,107 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class Device : GLib.Object {
-    
-    public DeviceType type_ { get; set; }
-    public DeviceState state { get; set; }
-    
-    public Device() {
-    }
-}
-
-public static Device[] get_wired_devices() {
-    // Populate Device View (temporary)
-    var device1 = new Device();
-    device1.type_ = DeviceType.WIRED;
-    device1.state = DeviceState.OFFLINE;
-    //
-    return {device1};
-}
-    
-public static Device[] get_wireless_devices() {
-    // Populate Device View (temporary)
-    var device1 = new Device();
-    device1.type_ = DeviceType.WIRELESS;
-    device1.state = DeviceState.ONLINE;
-    var device2 = new Device();
-    device2.type_ = DeviceType.WIRELESS;
-    device2.state = DeviceState.OFF;
-    //
-    return {device1, device2};
-}
-    
-public static Device[] get_mobile_devices() {
-    // Populate Device View (temporary)
-    var device3 = new Device();
-    device3.type_ = DeviceType.MOBILE;
-    device3.state = DeviceState.CONNECTED;
-    //
-    return {device3};
-}    
-    
-public static Device[] get_bluetooth_devices() {
-    // Populate Device View (temporary)
-    var device4 = new Device();
-    device4.type_ = DeviceType.BLUETOOTH;
-    device4.state = DeviceState.OFF;
-    //
-    return {device4};
-}
-
-public static Device get_flightmode_device() {
-    var device = new Device();
-    device.type_ = DeviceType.FLIGHTMODE;
-    device.state = DeviceState.OFF;
-    return device;
+public abstract class Device : GLib.Object {
+
+    public DeviceType type_ { get; protected set; }
+    public DeviceState state { get; protected set; }
+
+    protected Connman.Manager connman;
+
+    protected DeviceState convert_state(Connman.TechnologyState state) {
+
+        switch (state) {
+        case Connman.TechnologyState.CONNECTED:
+            return DeviceState.CONNECTED;
+        case Connman.TechnologyState.ENABLED:
+            return DeviceState.ONLINE;
+        case Connman.TechnologyState.OFFLINE:
+            return DeviceState.OFFLINE;
+        case Connman.TechnologyState.AVAILABLE:
+        default:
+            return DeviceState.OFF;
+        }
+    }
+
+    protected void update_state(Connman.TechnologyState state) {
+        this.state = convert_state(state);
+    }
+}
+
+public class WifiDevice : Device {
+
+    public WifiDevice(Connman.Manager connman) {
+        this.type_ = DeviceType.WIRELESS;
+        this.connman = connman;
+
+        this.connman.notify["wifi-state"].connect((s, p) => {
+                update_state(this.connman.get_wifi_state());
+            });
+
+        update_state(this.connman.get_wifi_state());
+    }
+}
+
+public class EthernetDevice : Device {
+
+    public EthernetDevice(Connman.Manager connman) {
+        this.type_ = DeviceType.WIRED;
+        this.connman = connman;
+
+        this.connman.notify["ethernet-state"].connect((s, p) => {
+                update_state(this.connman.get_ethernet_state());
+            });
+
+        update_state(this.connman.get_ethernet_state());
+    }
+}
+
+public class CellularDevice : Device {
+
+    public CellularDevice(Connman.Manager connman) {
+        this.type_ = DeviceType.MOBILE;
+        this.connman = connman;
+
+        this.connman.notify["cellular-state"].connect((s, p) => {
+                update_state(this.connman.get_cellular_state());
+            });
+
+        update_state(this.connman.get_cellular_state());
+    }
+}
+
+public class BluetoothDevice : Device {
+
+    public BluetoothDevice(Connman.Manager connman) {
+        this.type_ = DeviceType.BLUETOOTH;
+        this.connman = connman;
+
+        this.connman.notify["bluetooth-state"].connect((s, p) => {
+                update_state(this.connman.get_bluetooth_state());
+            });
+
+        update_state(this.connman.get_bluetooth_state());
+    }
+}
+
+public class FlightModeDevice : Device {
+
+    public FlightModeDevice(Connman.Manager connman) {
+        this.type_ = DeviceType.FLIGHTMODE;
+        this.connman = connman;
+
+        this.connman.notify["offline-mode"].connect((s, p) => {
+                update_mode(this.connman.offline_mode);
+            });
+
+        update_mode(this.connman.offline_mode);
+    }
+
+    private void update_mode(bool mode) {
+
+        if (mode)
+            this.state = DeviceState.OFFLINE;
+        else
+            this.state = DeviceState.ONLINE;
+    }
 }

=== modified file 'src/settings/frontend/pages/connections.vala'
--- src/settings/frontend/pages/connections.vala	2011-02-01 12:59:54 +0000
+++ src/settings/frontend/pages/connections.vala	2011-02-24 08:05:23 +0000
@@ -47,43 +47,34 @@
         this.treeview_devices.reordered.connect(
             this.on_treeview_devices_reordered);
 
-        Device[] wired_devices = get_wired_devices();
-        Device[] wireless_devices = get_wireless_devices();
-        Device[] mobile_devices = get_mobile_devices();
-        Device[] bluetooth_devices = get_bluetooth_devices();
-
-        foreach (var device in wireless_devices) {
-            var box = new WirelessBox(device, connman, datadir);
-            notebook_right.append_page(box, null);
-            this.add_device(device, box);
-        }
-
-        foreach (var device in mobile_devices) {
-            var box = new MobileBox(device, datadir);
-            notebook_right.append_page(box, null);
-            this.add_device(device, box);
-        }
-            
-        foreach (var device in wired_devices) {
-            var box = new WiredBox(device, datadir);
-            notebook_right.append_page(box, null);
-            this.add_device(device, box);
-        }
-            
-        foreach (var device in bluetooth_devices) {
-            var box = new BluetoothBox(device, datadir);
-            notebook_right.append_page(box, null);
-            this.add_device(device, box);
-        }
-
-        var flightmode_device = get_flightmode_device();
-        var flightmode_box = new FlightModeBox(flightmode_device, datadir);
+        var wifi = new WifiDevice(connman);
+        var wifi_box = new WirelessBox(connman, datadir);
+        notebook_right.append_page(wifi_box, null);
+        this.add_device(wifi, wifi_box);
+
+        var ethernet = new EthernetDevice(connman);
+        var ethernet_box = new WiredBox(connman, datadir);
+        notebook_right.append_page(ethernet_box, null);
+        this.add_device(ethernet, ethernet_box);
+
+        var cellular = new CellularDevice(connman);
+        var cellular_box = new MobileBox(connman, datadir);
+        notebook_right.append_page(cellular_box, null);
+        this.add_device(cellular, cellular_box);
+
+        var bluetooth = new BluetoothDevice(connman);
+        var bluetooth_box = new BluetoothBox(connman, datadir);
+        notebook_right.append_page(bluetooth_box, null);
+        this.add_device(bluetooth, bluetooth_box);
+
+        var flightmode_device = new FlightModeDevice(connman);
+        var flightmode_box = new FlightModeBox(flightmode_device, connman,
+                                               datadir);
         notebook_right.append_page(flightmode_box, null);
         this.add_device(flightmode_device, flightmode_box);
 
         // Order the RHS notebook pages inaccordance with the deviceview
         this.on_treeview_devices_reordered();
-        
     }
 
     public void add_device(Device device, DeviceBox box) {

=== modified file 'src/settings/frontend/widgets/device-boxes/base.vala'
--- src/settings/frontend/widgets/device-boxes/base.vala	2011-01-10 17:35:19 +0000
+++ src/settings/frontend/widgets/device-boxes/base.vala	2011-02-24 08:05:23 +0000
@@ -22,5 +22,4 @@
     /* A gtk.VBox which holds all of the widgets to control a device */
 
     public DeviceBox() {}
-    public abstract void on_device_state_changed(ParamSpec p);
 }

=== modified file 'src/settings/frontend/widgets/device-boxes/bluetooth.vala'
--- src/settings/frontend/widgets/device-boxes/bluetooth.vala	2011-01-10 17:35:19 +0000
+++ src/settings/frontend/widgets/device-boxes/bluetooth.vala	2011-02-24 08:05:23 +0000
@@ -23,13 +23,10 @@
     /* A Gtk.VBox which holds all of the widgets to control a bluetooth
       device. */
 
-    private Device device;
+    private Connman.Manager connman;
 
-    public BluetoothBox(Device device, string datadir) {
+    public BluetoothBox(Connman.Manager connman, string datadir) {
         this.set_spacing(12);
-        this.device = device;
-        this.device.notify["state"].connect(this.on_device_state_changed);
+        this.connman = connman;
     }
-
-    public override void on_device_state_changed(ParamSpec p) {}
 }

=== modified file 'src/settings/frontend/widgets/device-boxes/flightmode.vala'
--- src/settings/frontend/widgets/device-boxes/flightmode.vala	2011-01-24 17:15:22 +0000
+++ src/settings/frontend/widgets/device-boxes/flightmode.vala	2011-02-24 08:05:23 +0000
@@ -26,6 +26,7 @@
 
     private string datadir;
     private Device device;
+    private Connman.Manager connman;
     private InfoBox infobox;
     private ToggleSwitch toggleswitch;
     private Gtk.Label label_status;
@@ -35,11 +36,13 @@
     private Gtk.Button button_more_information;
     private Gtk.CheckButton checkbutton_show;
 
-    public FlightModeBox(Device device, string datadir) {
+    public FlightModeBox(Device device, Connman.Manager connman,
+                         string datadir) {
         this.set_spacing(12);
         this.datadir = datadir;
         this.device = device;
-        this.device.notify["state"].connect(this.on_device_state_changed);
+        this.connman = connman;
+        this.connman.notify["offline-mode"].connect(this.offline_mode_changed);
 
         // Infobox and Togglswitch
         /// Creation
@@ -64,7 +67,7 @@
         /// Packing
         this.pack_start(this.vbox_information, true, true);
 
-        this.update_widget_states(this.device.state);
+        this.update_widget_states(this.connman.offline_mode);
     }
 
     private void get_widgets() {
@@ -76,34 +79,31 @@
     private void connect_signals() {
     }
 
-    private void update_widget_states(DeviceState state) {
+    private void update_widget_states(bool offline) {
         bool toggleswitch_state = false;
         string status_text = "";
-        
-        switch (state) {
-            case DeviceState.ONLINE:
-                toggleswitch_state = true;
-                status_text = ("Flight Mode is on.");
-                break;
-            case DeviceState.OFF:
-                toggleswitch_state = false;
-                status_text = ("Flight Mode is off.");
-                break;
+
+        if (offline) {
+            toggleswitch_state = true;
+            status_text = ("Flight Mode is on.");
+        } else {
+            toggleswitch_state = false;
+            status_text = ("Flight Mode is off.");
         }
 
         this.toggleswitch.set_active(toggleswitch_state);
         this.label_status.set_text(status_text);
     }
-    
-    public override void on_device_state_changed(ParamSpec p) {
-        this.update_widget_states(this.device.state);
+
+    private void offline_mode_changed(ParamSpec p) {
+        this.update_widget_states(this.connman.offline_mode);
     }
 
     private void on_toggleswitch_toggled() {
         if (this.toggleswitch.get_active()) {
-            this.device.state = DeviceState.ONLINE;
+            this.connman.offline_mode = true;
         } else {
-            this.device.state = DeviceState.OFF;
+            this.connman.offline_mode = false;
         }
     }
 }

=== modified file 'src/settings/frontend/widgets/device-boxes/mobile.vala'
--- src/settings/frontend/widgets/device-boxes/mobile.vala	2011-01-10 17:35:19 +0000
+++ src/settings/frontend/widgets/device-boxes/mobile.vala	2011-02-24 08:05:23 +0000
@@ -25,7 +25,7 @@
       monitor the state of the mobile device, and a set of widgets
       to enter details about the mobile network to connect to. */
 
-    private Device device;
+    private Connman.Manager connman;
     private InfoBox infobox;
     private ToggleSwitch toggleswitch;
     private Gtk.Label label_status;
@@ -40,10 +40,11 @@
     private const string[] sensitive_widgets = {"label_apn_place", "label_apn",
                                         "label_pin_auth", "checkbutton_show_pin"};
 
-    public MobileBox(Device device, string datadir) {
+    public MobileBox(Connman.Manager connman, string datadir) {
         this.set_spacing(12);
-        this.device = device;
-        this.device.notify["state"].connect(this.on_device_state_changed);
+        this.connman = connman;
+
+        this.connman.notify["cellular-state"].connect(this.on_cellular_state_changed);
 
         // Infobox and Togglswitch
         /// Creation
@@ -68,7 +69,7 @@
         /// Packing
         this.pack_start(this.table_settings, true, true);
 
-        this.update_widget_states(this.device.state);
+        this.update_widget_states(this.connman.get_cellular_state());
         this.on_checkbutton_show_pin_toggled();
     }
 
@@ -82,32 +83,32 @@
         this.checkbutton_show_pin.toggled.connect(this.on_checkbutton_show_pin_toggled);
     }
 
-    private void update_widget_states(DeviceState state) {
+    private void update_widget_states(Connman.TechnologyState state) {
         bool toggleswitch_state = false;
         string status_text = "";
 
         switch (state) {
-            case DeviceState.CONNECTED:
-                this.device_editable = true;
-                this.settings_editable = false;
-                toggleswitch_state = true;
-                status_text = ("Connected to “Vodafone UK”.");
-                break;
-            case DeviceState.ONLINE:
-                this.device_editable = true;
-                this.settings_editable = false;
-                toggleswitch_state = true;
-                status_text = ("Connected to the Internet on “Vodafone UK”.");
-                break;
-            case DeviceState.OFF:
-                this.device_editable = false;
+            case Connman.TechnologyState.ENABLED:
+                this.device_editable = true;
                 this.settings_editable = true;
+                toggleswitch_state = true;
+                status_text = ("Mobile Broadband is enabled.");
+                break;
+            case Connman.TechnologyState.CONNECTED:
+                this.device_editable = true;
+                this.settings_editable = false;
+                toggleswitch_state = true;
+                status_text = ("Connected to the Internet.");
+                break;
+            case Connman.TechnologyState.AVAILABLE:
+                this.device_editable = true;
+                this.settings_editable = false;
                 toggleswitch_state = false;
                 status_text = ("The Mobile Broadband device is powered off.");
                 break;
-            case DeviceState.OFFLINE:
+            case Connman.TechnologyState.OFFLINE:
                 this.device_editable = true;
-                this.settings_editable = true;
+                this.settings_editable = false;
                 toggleswitch_state = false;
                 status_text = ("Mobile Broadband is offline.");
                 break;
@@ -133,15 +134,17 @@
         }
     }
     
-    public override void on_device_state_changed(ParamSpec p) {
-        this.update_widget_states(this.device.state);
+    private void on_cellular_state_changed(ParamSpec p) {
+        this.update_widget_states(this.connman.get_cellular_state());
     }
     
     private void on_toggleswitch_toggled() {
         if (this.toggleswitch.get_active()) {
-            this.device.state = DeviceState.CONNECTED;
+            this.connman.enable_technology(Connman.TechnologyType.CELLULAR,
+                                           null);
         } else {
-            this.device.state = DeviceState.OFFLINE;
+            this.connman.disable_technology(Connman.TechnologyType.CELLULAR,
+                                            null);
         }
     }
 

=== modified file 'src/settings/frontend/widgets/device-boxes/wired.vala'
--- src/settings/frontend/widgets/device-boxes/wired.vala	2011-01-10 17:35:19 +0000
+++ src/settings/frontend/widgets/device-boxes/wired.vala	2011-02-24 08:05:23 +0000
@@ -23,13 +23,10 @@
     /* A Gtk.VBox which holds all of the widgets to control a wired
        device. */
 
-    private Device device;
+    private Connman.Manager connman;
 
-    public WiredBox(Device device, string datadir) {
+    public WiredBox(Connman.Manager connman, string datadir) {
         this.set_spacing(12);
-        this.device = device;
-        this.device.notify["state"].connect(this.on_device_state_changed);
+        this.connman = connman;
     }
-
-    public override void on_device_state_changed(ParamSpec p) {}
 }

=== modified file 'src/settings/frontend/widgets/device-boxes/wireless.vala'
--- src/settings/frontend/widgets/device-boxes/wireless.vala	2011-02-01 13:29:19 +0000
+++ src/settings/frontend/widgets/device-boxes/wireless.vala	2011-02-24 08:05:23 +0000
@@ -27,7 +27,7 @@
       wireless networks. */
 
     private string datadir;
-    private Device device;
+    private Connman.Manager connman;
     private InfoBox infobox;
     private ToggleSwitch toggleswitch;
     private Gtk.Label label_status;
@@ -39,12 +39,12 @@
     private Gtk.Button button_edit;
     private Gtk.ScrolledWindow scrolledwindow_connections;
 
-    public WirelessBox(Device device, Connman.Manager connman,
-					   string datadir) {
+    public WirelessBox(Connman.Manager connman, string datadir) {
         this.set_spacing(12);
         this.datadir = datadir;
-        this.device = device;
-        this.device.notify["state"].connect(this.on_device_state_changed);
+        this.connman = connman;
+
+        this.connman.notify["wifi-state"].connect(this.wifi_state_changed);
 
         // Infobox and Togglswitch
         /// Creation
@@ -85,7 +85,7 @@
 				this.add_service(service);
         }
 
-        this.update_widget_states(this.device.state);
+        this.update_widget_states(this.connman.get_wifi_state());
         this.on_treeview_connections_selection_changed();
     }
 
@@ -102,32 +102,32 @@
         this.button_edit.clicked.connect(this.on_button_edit_clicked);
     }
 
-    private void update_widget_states(DeviceState state) {
+    private void update_widget_states(Connman.TechnologyState state) {
         bool device_editable = false;
         bool settings_editable = false;
         bool toggleswitch_state = false;
         string status_text = "";
-        
+
         switch (state) {
-            case DeviceState.CONNECTED:
+            case Connman.TechnologyState.ENABLED:
                 device_editable = true;
                 settings_editable = true;
                 toggleswitch_state = true;
                 status_text = ("Wi-fi is on but not connected to the Internet.");
                 break;
-            case DeviceState.ONLINE:
+            case Connman.TechnologyState.CONNECTED:
                 device_editable = true;
                 settings_editable = true;
                 toggleswitch_state = true;
                 status_text = ("Wi-fi is on and connected to the Internet.");
                 break;
-            case DeviceState.OFF:
-                device_editable = false;
+            case Connman.TechnologyState.AVAILABLE:
+                device_editable = true;
                 settings_editable = false;
                 toggleswitch_state = false;
                 status_text = ("The Wi-fi device is powered off.");
                 break;
-            case DeviceState.OFFLINE:
+            case Connman.TechnologyState.OFFLINE:
                 device_editable = true;
                 settings_editable = false;
                 toggleswitch_state = false;
@@ -150,15 +150,15 @@
         liststore.add_service(service, name, signal, last_used);
     }
     
-    public override void on_device_state_changed(ParamSpec p) {
-        this.update_widget_states(this.device.state);
+    private void wifi_state_changed(ParamSpec p) {
+        this.update_widget_states(this.connman.get_wifi_state());
     }
 
     private void on_toggleswitch_toggled() {
         if (this.toggleswitch.get_active()) {
-            this.device.state = DeviceState.CONNECTED;
+            this.connman.enable_technology(Connman.TechnologyType.WIFI, null);
         } else {
-            this.device.state = DeviceState.OFFLINE;
+            this.connman.disable_technology(Connman.TechnologyType.WIFI, null);
         }
     }