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

[Kalle Valo]

[lp:~kvalo/indicator-network/settings-merge]

120. By Kalle Valo on 2010-12-09

Add Andrew to the authors file.

121. By Kalle Valo on 2010-12-09

Change copyright of SimpleGtkbuilderApp.py with approval from Michael
Vogt.

122. By Kalle Valo on 2010-12-09

settings: unify copyrights with approval from Andrew.

[Mikkel Kamstrup Erlandsen (kamstrup)]

in src/settings/indicator-network-settings:
 * There are two checks on os.path.exists("ui/indicator-network-settings.ui") can they be merged into one in order to simplify the code a bit?

 * Uses hardcoded /usr/share/indicator-network. It should use $pkgdatadir from autoconf

in src/settings/indicatorNetworkSettings/SimpleGtkbuilderApp.py:
 * The header says SimpleGladeApp, it should be SimpleGtkbuilderApp i guess

in src/settings/indicatorNetworkSettings/app.py:
 * There is a hardcoded /usr/share/locale in the _setup_translations(). I think this oughta use the datadir from autoconf.

in */Makefile.am:
 * Please put each python module on its own line that is autofoo standard

class ToggleSwitch: I don't know whether gtk.Switch will be backported to gtk2.0 (or if this UI will switch to gtk3). If it is than it's probably the widget to use here: http://library.gnome.org/devel/gtk/unstable/GtkSwitch.html. Otherwise the custom widget needs to stay of course.

class InfoBox: Why is gtk.InfoBar not good enough?

review: Needs Information

[Kalle Valo (kvalo)]

Mikkel Kamstrup Erlandsen <email address hidden> writes:

> in src/settings/indicator-network-settings:
>
> * There are two checks on
> os.path.exists("ui/indicator-network-settings.ui") can they be merged
> into one in order to simplify the code a bit?

Actually I don't know why we need to set the path anyway. Maybe Andrew
can comment on that?

But for now I just removed this code:

-if os.path.exists("ui/indicator-network-settings.ui"):
- sys.path.insert(0, os.path.abspath(os.getcwd()))

> * Uses hardcoded /usr/share/indicator-network. It should use
> $pkgdatadir from autoconf

That's a bit harder to implement. I believe the convention is from
software-center which also hardcodes the path in
/usr/share/software-center/software-center script.

> in src/settings/indicatorNetworkSettings/SimpleGtkbuilderApp.py:
> * The header says SimpleGladeApp, it should be SimpleGtkbuilderApp i guess

Fixed.

> in src/settings/indicatorNetworkSettings/app.py:
>
> * There is a hardcoded /usr/share/locale in the
> _setup_translations(). I think this oughta use the datadir from
> autoconf.

Same comment as above. Any tips how to do this properly is appreciated.

> in */Makefile.am:
> * Please put each python module on its own line that is autofoo standard

Fixed.

> class ToggleSwitch: I don't know whether gtk.Switch will be backported
> to gtk2.0 (or if this UI will switch to gtk3). If it is than it's
> probably the widget to use here:
> http://library.gnome.org/devel/gtk/unstable/GtkSwitch.html. Otherwise
> the custom widget needs to stay of course.

I think we have to switch to gtk3 quite soon, especially due to the new
control center, but not quite yet.

> class InfoBox: Why is gtk.InfoBar not good enough?

Andrew, can you answer this one?

Thank you for the review. I have now pushed the fixes. I also noticed
some other issues with distcheck and fixed them at the same time.

--
Kalle Valo

[lp:~kvalo/indicator-network/settings-merge]

123. By Kalle Valo on 2010-12-13

settings: don't set path if running locally

124. By Kalle Valo on 2010-12-13

settings: fix name of a script in comments

125. By Kalle Valo on 2010-12-13

settings: each autofoo item in it's own line

126. By Kalle Valo on 2010-12-13

settings: include ui files to the dist

127. By Kalle Valo on 2010-12-13

potfiles: add files from settings

[Mikkel Kamstrup Erlandsen (kamstrup)]

 review approve

On 13 December 2010 15:13, Kalle Valo <email address hidden> wrote:
> Mikkel Kamstrup Erlandsen <email address hidden> writes:
>
>> in src/settings/indicator-network-settings:
>>
>>  * There are two checks on
>>  os.path.exists("ui/indicator-network-settings.ui") can they be merged
>>  into one in order to simplify the code a bit?
>
> Actually I don't know why we need to set the path anyway. Maybe Andrew
> can comment on that?
>
> But for now I just removed this code:
>
> -if os.path.exists("ui/indicator-network-settings.ui"):
> -    sys.path.insert(0, os.path.abspath(os.getcwd()))

This section is there to be able to run the app directly from the
source tree, soo you might wanna re-add it for convenience. My point
was merely to move together with the other check for the same file.

>>  * Uses hardcoded /usr/share/indicator-network. It should use
>>  $pkgdatadir from autoconf
>
> That's a bit harder to implement. I believe the convention is from
> software-center which also hardcodes the path in
> /usr/share/software-center/software-center script.

Passing the monkey on eh? I think I need to talk to Michael about
these "conventions" ;-)

The normal way to do this is to have a config.py.in file and add
config.py to your AC_OUTPUT in configure.ac

review: Approve

[Kalle Valo (kvalo)]

Mikkel Kamstrup Erlandsen <email address hidden> writes:

> Review: Approve

Thanks!

> On 13 December 2010 15:13, Kalle Valo <email address hidden> wrote:
>> Mikkel Kamstrup Erlandsen <email address hidden> writes:
>>
>>> in src/settings/indicator-network-settings:
>>>
>>>  * There are two checks on
>>>  os.path.exists("ui/indicator-network-settings.ui") can they be merged
>>>  into one in order to simplify the code a bit?
>>
>> Actually I don't know why we need to set the path anyway. Maybe Andrew
>> can comment on that?
>>
>> But for now I just removed this code:
>>
>> -if os.path.exists("ui/indicator-network-settings.ui"):
>> -    sys.path.insert(0, os.path.abspath(os.getcwd()))
>
> This section is there to be able to run the app directly from the
> source tree, soo you might wanna re-add it for convenience.

Don't worry, I tested that before removing the code. I didn't find any
why we need to set the path, so it should be safe to remove. If somebody
comes up with a reason, please let me know :)

> My point was merely to move together with the other check for the same
> file.

Yeah, I got your point. I just want to remove stale code as I find them.

>>>  * Uses hardcoded /usr/share/indicator-network. It should use
>>>  $pkgdatadir from autoconf
>>
>> That's a bit harder to implement. I believe the convention is from
>> software-center which also hardcodes the path in
>> /usr/share/software-center/software-center script.
>
> Passing the monkey on eh?

Whatever it takes to get the code merged in ;)

More seriously, I noticed this problem already earlier but I didn't
think that this is serious enough to prevent merging the code to trunk.
I now filed bug #689708 to handle this so that it won't be forgotten.

> The normal way to do this is to have a config.py.in file and add
> config.py to your AC_OUTPUT in configure.ac

But how can a script from /usr/bin find this config.py? Or should I
create indicator-network-settings.in and create the script dynamically
with the correct path?

Thank you for the good comments.

--
Kalle Valo

[Andrew (and471)]

Ok so...

>in src/settings/indicator-network-settings:
> * There are two checks on os.path.exists("ui/indicator-network-settings.ui") can they be merged into one in order >to simplify the code a bit?
>* Uses hardcoded /usr/share/indicator-network. It should use $pkgdatadir from autoconf
>in src/settings/indicatorNetworkSettings/SimpleGtkbuilderApp.py:
> * The header says SimpleGladeApp, it should be SimpleGtkbuilderApp i guess
>in src/settings/indicatorNetworkSettings/app.py:
> * There is a hardcoded /usr/share/locale in the _setup_translations(). I think this oughta use the datadir from >autoconf.
>in */Makefile.am:
> * Please put each python module on its own line that is autofoo standard

I assume the above have been taken care of by Kalle.

>class ToggleSwitch: I don't know whether gtk.Switch will be backported to gtk2.0 (or if this UI will switch to >gtk3). If it is than it's probably the widget to use here: http://library.gnome.org/devel/gtk/unstable/GtkSwitch.html. Otherwise the custom widget needs to stay of course.

I am also not sure of this. What actually happened is I created the toggleswitch and then a week later say it had been created in GTK :/ However it is as you say, it it isn't back-ported we will keep it, otherwise it should be simple to port it to gtk.Switch

>class InfoBox: Why is gtk.InfoBar not good enough?

Because they are different colours and InfoBar should contain an icon and text, whereas we are packing it with other things :)

=== modified file '.bzrignore'
--- .bzrignore	2010-12-01 07:47:53 +0000
+++ .bzrignore	2010-12-13 14:13:17 +0000
@@ -88,3 +88,4 @@
 src/libconnman/libconnman_la-connman-manager.lo
 tests/libconnman-tool
 src/libconnman/libconnman_la-connman-service.lo
+py-compile

=== modified file 'AUTHORS'
--- AUTHORS	2010-05-19 07:49:00 +0000
+++ AUTHORS	2010-12-13 14:13:17 +0000
@@ -1,1 +1,2 @@
 Kalle Valo <[e-mail]>
+Andrew Higginson

=== modified file 'configure.ac'
--- configure.ac	2010-12-09 22:05:35 +0000
+++ configure.ac	2010-12-13 14:13:17 +0000
@@ -1,6 +1,6 @@
 AC_INIT([indicator-network], [0.3.1])
 AC_CONFIG_SRCDIR(src/indicator/indicator.c)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([tar-ustar])
 
 AC_PREREQ(2.53)
 
@@ -17,6 +17,9 @@
 AM_PROG_CC_C_O
 AC_STDC_HEADERS
 AC_PROG_LIBTOOL
+AM_PATH_PYTHON
+AC_PROG_LN_S
+AC_PROG_MKDIR_P
 
 AC_SUBST(VERSION)
 AC_CONFIG_MACRO_DIR([m4])
@@ -149,6 +152,14 @@
 src/libconnman/Makefile
 src/backend/Makefile
 src/agent/Makefile
+src/settings/Makefile
+src/settings/ui/Makefile
+src/settings/indicatorNetworkSettings/Makefile
+src/settings/indicatorNetworkSettings/backend/Makefile
+src/settings/indicatorNetworkSettings/frontend/Makefile
+src/settings/indicatorNetworkSettings/frontend/pages/Makefile
+src/settings/indicatorNetworkSettings/frontend/widgets/Makefile
+src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/Makefile
 data/Makefile
 po/Makefile.in
 scripts/Makefile

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-09-23 07:24:58 +0000
+++ po/POTFILES.in	2010-12-13 14:13:17 +0000
@@ -8,3 +8,9 @@
 src/agent/pin-dialog.c
 scripts/indicator-network-settings
 scripts/indicator-network-mobile-wizard
+src/settings/indicatorNetworkSettings/enums.py
+src/settings/indicatorNetworkSettings/frontend/widgets/connectionview.py
+src/settings/indicatorNetworkSettings/frontend/widgets/deviceview.py
+src/settings/ui/indicator-network-settings.ui
+src/settings/ui/mobile_box.ui
+src/settings/ui/wireless_box.ui

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-12-01 07:47:53 +0000
+++ src/Makefile.am	2010-12-13 14:13:17 +0000
@@ -3,4 +3,5 @@
 	libconnman \
 	indicator \
 	backend \
-	agent
+	agent \
+	settings

=== added directory 'src/settings'
=== added file 'src/settings/Makefile.am'
--- src/settings/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/settings/Makefile.am	2010-12-13 14:13:17 +0000
@@ -0,0 +1,16 @@
+SUBDIRS = \
+	indicatorNetworkSettings \
+	ui
+
+dist_pkgdata_SCRIPTS = \
+	indicator-network-settings
+
+# create a symbolic link to bindir
+# FIXME: it will have suffix -2 until new settings window is usable
+#
+# Note: ln -f is not portable
+install-exec-hook:
+	$(MKDIR_P) $(DESTDIR)$(bindir) && \
+	cd $(DESTDIR)$(bindir) && \
+	$(LN_S) -f $(pkgdatadir)/indicator-network-settings \
+			indicator-network-settings-2

=== added file 'src/settings/indicator-network-settings'
--- src/settings/indicator-network-settings	1970-01-01 00:00:00 +0000
+++ src/settings/indicator-network-settings	2010-12-13 14:13:17 +0000
@@ -0,0 +1,61 @@
+#!/usr/bin/python
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import pygtk
+pygtk.require ("2.0")
+import gtk
+
+import gettext
+import logging
+import os
+import sys
+
+from optparse import OptionParser
+from indicatorNetworkSettings.enums import *
+from indicatorNetworkSettings.version import *
+
+if __name__ == "__main__":
+    parser = OptionParser("usage: %prog [options]", version="%prog "+VERSION)
+    parser.add_option("--debug", action="store_true",
+                      help="enable debug mode", default=False)
+    parser.add_option("--force-rtl", action="store_true",
+                      help="force rtl mode (useful for debugging)", 
+                      default=False)
+    (options, args) = parser.parse_args()
+        
+    if options.debug:
+        logging.basicConfig(level=logging.DEBUG)
+    else:
+        logging.basicConfig(level=logging.INFO)
+    
+    # Override text direction for testing purposes
+    if options.force_rtl:
+        gtk.widget_set_default_direction(gtk.TEXT_DIR_RTL)
+
+    if os.path.exists("./ui/indicator-network-settings.ui"):
+        logging.info("Running locally")
+        datadir = "./"
+    else:
+        datadir = "/usr/share/indicator-network/"
+    
+    from indicatorNetworkSettings.app import NetworkSettingsApp
+
+    app = NetworkSettingsApp(datadir)
+    app.run()
+

=== added directory 'src/settings/indicatorNetworkSettings'
=== added file 'src/settings/indicatorNetworkSettings/Makefile.am'
--- src/settings/indicatorNetworkSettings/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/Makefile.am	2010-12-13 14:13:17 +0000
@@ -0,0 +1,13 @@
+SUBDIRS = \
+	backend \
+	frontend
+
+# indicator-network-settings
+insdir = $(pkgdatadir)/indicatorNetworkSettings
+ins_PYTHON = \
+	app.py \
+	enums.py \
+	 __init__.py \
+	SimpleGtkbuilderApp.py \
+	utils.py \
+	version.py

=== added file 'src/settings/indicatorNetworkSettings/SimpleGtkbuilderApp.py'
--- src/settings/indicatorNetworkSettings/SimpleGtkbuilderApp.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/SimpleGtkbuilderApp.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,58 @@
+"""
+ SimpleGtkbuilderApp.py
+ Module that provides an object oriented abstraction to pygtk and gtkbuilder
+ Copyright (C) 2009 Canonical
+ Author Michael Vogt
+ based on ideas from SimpleGladeBuilder by Sandino Flores Moreno
+"""
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; version 3.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+import sys
+import gtk
+
+class SimpleGtkbuilderApp(object):
+    def __init__(self, path, domain):
+        self.builder = gtk.Builder()
+        self.builder.set_translation_domain(domain)
+        self.builder.add_from_file(path)
+        self.builder.connect_signals(self)
+        for o in self.builder.get_objects():
+            if issubclass(type(o), gtk.Buildable):
+                name = gtk.Buildable.get_name(o)
+                setattr(self, name, o)
+            else:
+                print >> sys.stderr, "WARNING: can not get name for '%s'" % o
+
+    def run(self):
+        """
+        Starts the main loop of processing events checking for Control-C.
+
+        The default implementation checks wheter a Control-C is pressed,
+        then calls on_keyboard_interrupt().
+
+        Use this method for starting programs.
+        """
+        try:
+            gtk.main()
+        except KeyboardInterrupt:
+            self.on_keyboard_interrupt()
+
+    def on_keyboard_interrupt(self):
+        """
+        This method is called by the default implementation of run()
+        after a program is finished by pressing Control-C.
+        """
+        pass

=== added file 'src/settings/indicatorNetworkSettings/__init__.py'
--- src/settings/indicatorNetworkSettings/__init__.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/__init__.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,1 @@
+

=== added file 'src/settings/indicatorNetworkSettings/app.py'
--- src/settings/indicatorNetworkSettings/app.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/app.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,74 @@
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import locale
+import gtk
+import os
+import gettext
+
+from indicatorNetworkSettings.enums import *
+from indicatorNetworkSettings.version import *
+from indicatorNetworkSettings.frontend.pages.connections import \
+    ConnectionsPage
+from indicatorNetworkSettings.SimpleGtkbuilderApp import \
+    SimpleGtkbuilderApp
+
+class NetworkSettingsApp(SimpleGtkbuilderApp):
+    def __init__(self, datadir):
+        SimpleGtkbuilderApp.__init__(self,
+            os.path.join(datadir, "ui", "indicator-network-settings.ui"), 
+            "indicator-network-settings")
+
+        # Useful variables
+        self.datadir = datadir
+        self.icons = gtk.icon_theme_get_default()
+
+        # Setup Translations
+        self._setup_translations()
+
+        # Setup Pages
+        self.page_connections = ConnectionsPage(self, datadir)
+        self.pages = [self.page_connections]
+
+        self.on_notebook_main_page_switched(None, None, 0)
+
+    # Callbacks
+    def on_window_main_delete_event(self, widget, event):
+        gtk.main_quit()
+
+    def on_notebook_main_page_switched(self, widget, move_focus, page_num):
+        page_alignment = self.notebook_main.get_nth_page(page_num)
+
+        for page in self.pages:
+            if page.alignment == page_alignment:
+                page.on_first_expose()
+        
+    # Private Functions
+    def _setup_translations(self):
+        gettext.bindtextdomain("indicator-network-settings",
+                                "/usr/share/locale")
+        gettext.textdomain("indicator-network-settings")
+        try:
+            locale.setlocale(locale.LC_ALL, "")
+        except Exception:
+            print "setlocale failed"
+
+    # Public Functions
+    def run(self):
+        self.window_main.show_all()
+        super(NetworkSettingsApp, self).run()

=== added directory 'src/settings/indicatorNetworkSettings/backend'
=== added file 'src/settings/indicatorNetworkSettings/backend/Makefile.am'
--- src/settings/indicatorNetworkSettings/backend/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/backend/Makefile.am	2010-12-13 14:13:17 +0000
@@ -0,0 +1,6 @@
+# indicator-network-settings
+insdir = $(pkgdatadir)/indicatorNetworkSettings/backend
+ins_PYTHON = \
+	connection.py \
+	device.py \
+	__init__.py

=== added file 'src/settings/indicatorNetworkSettings/backend/__init__.py'
--- src/settings/indicatorNetworkSettings/backend/__init__.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/backend/__init__.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,1 @@
+

=== added file 'src/settings/indicatorNetworkSettings/backend/connection.py'
--- src/settings/indicatorNetworkSettings/backend/connection.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/backend/connection.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#       
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import datetime
+
+class WifiConnection(object):
+    def __init__(self):
+        self.network = None
+        self.signal = None
+        self.last_used = None
+
+    def connect_(self, key):
+        print "Connecting to %s" % self.network
+
+def get_remembered_wireless_connections(device):
+    ### Dummy Connections (temporary)
+    connection1 = WifiConnection()
+    connection1.network = "BTHomeHub-193209"
+    connection1.signal = "0.75"
+    connection1.last_used = datetime.date(2010, 11, 3)
+    connection2 = WifiConnection()
+    connection2.network = "SKY-001"
+    connection2.signal = "0.55"
+    connection2.last_used = datetime.date(2010, 5, 22)
+    connection3 = WifiConnection()
+    connection3.network = "Starbucks OpenAccess"
+    connection3.signal = "0.2"
+    connection3.last_used = None
+    ###
+    connections = (connection1, connection2, connection3)
+    return connections

=== added file 'src/settings/indicatorNetworkSettings/backend/device.py'
--- src/settings/indicatorNetworkSettings/backend/device.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/backend/device.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,86 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#       
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import gobject
+
+from indicatorNetworkSettings.enums import *
+
+class Device(gobject.GObject):
+
+    __gsignals__ = {
+        "state-changed" : (gobject.SIGNAL_RUN_LAST,
+                                   gobject.TYPE_NONE,
+                                   ([gobject.TYPE_PYOBJECT]),
+                                  ),
+    }
+    
+    
+    def __init__(self):
+        super(Device, self).__init__()
+        self.type = None
+        self.state = None
+
+    def set_state(self, state):
+        self.state = state
+        self.emit("state-changed", self.state)
+
+    def get_state(self):
+        return self.state
+
+def get_wired_devices():
+    ### Populate Device View (temporary)
+    device1 = Device()
+    device1.type = DEVICE_TYPE_WIRED
+    device1.state = DEVICE_STATE_OFFLINE
+    ###
+    devices = (device1,)
+    return devices
+    
+def get_wireless_devices():
+    ### Populate Device View (temporary)
+    device1 = Device()
+    device1.type = DEVICE_TYPE_WIRELESS
+    device1.state = DEVICE_STATE_ONLINE
+    device2 = Device()
+    device2.type = DEVICE_TYPE_WIRELESS
+    device2.state = DEVICE_STATE_OFF
+    ###
+    devices = (device1, device2)
+    return devices
+    
+def get_mobile_devices():
+    ### Populate Device View (temporary)
+    device3 = Device()
+    device3.type = DEVICE_TYPE_MOBILE
+    device3.state = DEVICE_STATE_CONNECTED
+    ###
+    devices = (device3,)
+    return devices
+    
+def get_bluetooth_devices():
+    ### Populate Device View (temporary)
+    device4 = Device()
+    device4.type = DEVICE_TYPE_BLUETOOTH
+    device4.state = DEVICE_STATE_OFF
+    ###
+    devices = (device4,)
+    return devices
+    

=== added file 'src/settings/indicatorNetworkSettings/enums.py'
--- src/settings/indicatorNetworkSettings/enums.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/enums.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,43 @@
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+from gettext import gettext as _
+
+DEVICE_TYPES = (DEVICE_TYPE_WIRED, DEVICE_TYPE_WIRELESS, \
+                DEVICE_TYPE_BLUETOOTH, DEVICE_TYPE_MOBILE) = range(4)
+                
+DEVICE_TYPE_NAMES = {DEVICE_TYPE_WIRED:_("Wired"),
+                    DEVICE_TYPE_WIRELESS:_("Wireless"),
+                    DEVICE_TYPE_BLUETOOTH:_("Bluetooth"),
+                    DEVICE_TYPE_MOBILE:_("Mobile Broadband")}
+                    
+DEVICE_TYPE_LNAMES = {DEVICE_TYPE_WIRED:"wired",
+                    DEVICE_TYPE_WIRELESS:"wireless",
+                    DEVICE_TYPE_BLUETOOTH:"bluetooth",
+                    DEVICE_TYPE_MOBILE:"mobile"}
+                    
+DEVICE_TYPE_ICONS = {DEVICE_TYPE_WIRED:"network-wired",
+                    DEVICE_TYPE_WIRELESS:"network-wireless",
+                    DEVICE_TYPE_BLUETOOTH:"bluetooth-active",
+                    DEVICE_TYPE_MOBILE:"gsm-3g-high"}
+
+DEVICE_STATE_OFF, DEVICE_STATE_OFFLINE, DEVICE_STATE_CONNECTED, \
+    DEVICE_STATE_ONLINE = range(4)
+
+
+GENERIC_DEVICE_ICON = DEVICE_TYPE_ICONS[DEVICE_TYPE_WIRED]

=== added directory 'src/settings/indicatorNetworkSettings/frontend'
=== added file 'src/settings/indicatorNetworkSettings/frontend/Makefile.am'
--- src/settings/indicatorNetworkSettings/frontend/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/Makefile.am	2010-12-13 14:13:17 +0000
@@ -0,0 +1,9 @@
+SUBDIRS = \
+	pages \
+	widgets
+
+# indicator-network-settings
+insdir = $(pkgdatadir)/indicatorNetworkSettings/frontend
+ins_PYTHON = \
+	__init__.py \
+	utils.py

=== added file 'src/settings/indicatorNetworkSettings/frontend/__init__.py'
--- src/settings/indicatorNetworkSettings/frontend/__init__.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/__init__.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,1 @@
+

=== added directory 'src/settings/indicatorNetworkSettings/frontend/pages'
=== added file 'src/settings/indicatorNetworkSettings/frontend/pages/Makefile.am'
--- src/settings/indicatorNetworkSettings/frontend/pages/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/pages/Makefile.am	2010-12-13 14:13:17 +0000
@@ -0,0 +1,5 @@
+# indicator-network-settings
+insdir = $(pkgdatadir)/indicatorNetworkSettings/frontend/pages
+ins_PYTHON = \
+	connections.py \
+	__init__.py

=== added file 'src/settings/indicatorNetworkSettings/frontend/pages/__init__.py'
=== added file 'src/settings/indicatorNetworkSettings/frontend/pages/connections.py'
--- src/settings/indicatorNetworkSettings/frontend/pages/connections.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/pages/connections.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,111 @@
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import gobject
+
+from indicatorNetworkSettings.frontend.widgets.device_boxes.wired \
+    import WiredBox
+from indicatorNetworkSettings.frontend.widgets.device_boxes.wireless \
+    import WirelessBox
+from indicatorNetworkSettings.frontend.widgets.device_boxes.bluetooth \
+    import BluetoothBox
+from indicatorNetworkSettings.frontend.widgets.device_boxes.mobile \
+    import MobileBox
+from indicatorNetworkSettings.frontend.widgets.deviceview \
+    import DeviceView, DeviceStore
+
+from indicatorNetworkSettings.backend.device import *
+from indicatorNetworkSettings.enums import *
+
+class ConnectionsPage(gobject.GObject):
+    def __init__(self, app, datadir):
+        super(ConnectionsPage, self).__init__()
+
+        self.app = app
+        self.alignment = app.alignment_connections
+        self.viewed = False
+
+        # Create LHS
+        ## Create device view
+        device_store = DeviceStore(app.icons)
+        self.treeview_devices = DeviceView(device_store)
+        ## Pack it
+        app.scrolledwindow_c_devices.add(self.treeview_devices)
+        ## Connect signals to callbacks
+        self.treeview_devices.connect("selection-changed",
+            self._on_treeview_devices_selection_changed)
+        self.treeview_devices.connect("reordered",
+            self._on_treeview_devices_reordered)
+
+        wired_devices = get_wired_devices()
+        wireless_devices = get_wireless_devices()
+        mobile_devices = get_mobile_devices()
+        bluetooth_devices = get_bluetooth_devices()
+            
+        for device in wired_devices:
+            box = WiredBox(device, datadir)
+            self.app.notebook_c_right.append_page(box)
+            self.add_device(device, box)
+            
+        for device in wireless_devices:
+            box = WirelessBox(device, datadir)
+            self.app.notebook_c_right.append_page(box)
+            self.add_device(device, box)
+            
+        for device in mobile_devices:
+            box = MobileBox(device, datadir)
+            self.app.notebook_c_right.append_page(box)
+            self.add_device(device, box)
+            
+        for device in bluetooth_devices:
+            box = BluetoothBox(device, datadir)
+            self.app.notebook_c_right.append_page(box)
+            self.add_device(device, box)
+
+        # Order the RHS notebook pages inaccordance with the deviceview
+        self._on_treeview_devices_reordered(self.treeview_devices)
+
+    # Private Functions
+
+    # Public Functions
+
+    def add_device(self, device, box):
+        liststore = self.treeview_devices.get_model()
+        liststore.append(device, box)
+
+    # Callbacks
+
+    def on_first_expose(self):
+        if not self.viewed:
+            self.treeview_devices.get_selection().select_path((0,))
+            self.viewed = True
+
+    def _on_treeview_devices_selection_changed(self, widget, selection):
+        (model, iter_) = selection.get_selected()
+
+        if iter_:
+            i = model.get_path(iter_)[0]
+            self.app.notebook_c_right.set_current_page(i)
+
+    def _on_treeview_devices_reordered(self, widget):
+        i = 0
+        model = widget.get_model()
+        for device in model:
+            page = device[DeviceStore.COL_SETTINGS_BOX]
+            self.app.notebook_c_right.reorder_child(page, i)
+            i += 1

=== added file 'src/settings/indicatorNetworkSettings/frontend/utils.py'
--- src/settings/indicatorNetworkSettings/frontend/utils.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/utils.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,34 @@
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import os
+import sys
+import gtk
+
+def setup_ui(self, datadir, name):
+    builder = gtk.Builder()
+    builder.set_translation_domain("indicator-network-settings")
+    path = os.path.join(datadir, "ui", "%s.ui" % name)
+    builder.add_from_file(path)
+    builder.connect_signals(self)
+    for object_ in builder.get_objects():
+        if issubclass(type(object_), gtk.Buildable):
+            name = gtk.Buildable.get_name(object_)
+            setattr(self, name, object_)
+        else:
+            print >> sys.stderr, "WARNING: can not get name for '%s'" % object_

=== added directory 'src/settings/indicatorNetworkSettings/frontend/widgets'
=== added file 'src/settings/indicatorNetworkSettings/frontend/widgets/Makefile.am'
--- src/settings/indicatorNetworkSettings/frontend/widgets/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/Makefile.am	2010-12-13 14:13:17 +0000
@@ -0,0 +1,6 @@
+SUBDIRS = device_boxes
+
+# indicator-network-settings
+insdir = $(pkgdatadir)/indicatorNetworkSettings/frontend/widgets
+ins_PYTHON = cellrenderers.py deviceview.py toggleswitch.py connectionview.py  __init__.py
+

=== added file 'src/settings/indicatorNetworkSettings/frontend/widgets/__init__.py'
--- src/settings/indicatorNetworkSettings/frontend/widgets/__init__.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/__init__.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,1 @@
+

=== added file 'src/settings/indicatorNetworkSettings/frontend/widgets/cellrenderers.py'
--- src/settings/indicatorNetworkSettings/frontend/widgets/cellrenderers.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/cellrenderers.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,210 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#       
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import gtk
+import gobject
+
+from math import pi
+
+PI =            3.1415926535897931
+PI_OVER_180 =   0.017453292519943295
+
+class PinCellRenderer(gtk.GenericCellRenderer):
+    __gproperties__ = {
+                        'color': (gobject.TYPE_STRING,
+                        'The color of the pin.',
+                        'The color of the pin.',
+                        '#FFFFFF',
+                        gobject.PARAM_READWRITE
+                        ),
+                    }
+
+    RED_FILL = "#ef2929"
+    RED_STROKE = "#a40000"
+    GREEN_FILL = "#8ae234"
+    GREEN_STROKE = "#4e9a06"
+    YELLOW_FILL = "#fce94f"
+    YELLOW_STROKE = "#c4a000"
+    GREY_FILL = "#d3d7cf"
+    GREY_STROKE = "#555753"
+
+    PIN_WIDTH = 8
+    PIN_HEIGHT = 8
+
+    PIN_XPAD = 8
+    PIN_YPAD = 8
+
+    CELL_WIDTH = PIN_WIDTH + PIN_XPAD
+    CELL_HEIGHT = PIN_HEIGHT + PIN_YPAD
+
+    def __init__(self):
+        super(PinCellRenderer, self).__init__()
+    
+    def on_get_size(self, widget, cell_area):
+        return 0, 0, self.CELL_WIDTH, self.CELL_HEIGHT
+
+    def do_set_property(self, pspec, value):
+        setattr(self, pspec.name, value)
+
+    def do_get_property(self, pspec):
+        return getattr(self, pspec.name)
+
+    def on_render(self, window, widget, background_area, cell_area,
+                    expose_area, flags):
+        cr = window.cairo_create()
+        
+        x = cell_area.x
+        y = cell_area.y
+
+        y_offset = (cell_area.height - self.CELL_HEIGHT) / 2
+
+        cr.arc(self.CELL_WIDTH/2+x, self.CELL_HEIGHT/2+y+y_offset,
+                self.PIN_WIDTH/2, 0, 2 * pi)
+        
+        stroke_string = getattr(self, "%s_STROKE" % self.color.upper())
+        stroke = gtk.gdk.Color(stroke_string)
+        fill_string = getattr(self, "%s_FILL" % self.color.upper())
+        fill = gtk.gdk.Color(fill_string)
+
+        cr.set_source_rgb(stroke.red / 65535.,
+                        stroke.green / 65535.,
+                        stroke.blue / 65535.)
+        cr.stroke_preserve()
+        cr.set_source_rgb(fill.red / 65535.,
+                        fill.green / 65535.,
+                        fill.blue / 65535.)
+        cr.fill()
+        
+class SignalStrengthCellRenderer(gtk.GenericCellRenderer):
+    __gproperties__ = {
+                        'signal': (gobject.TYPE_STRING,
+                        'The color of the pin.',
+                        'The color of the pin.',
+                        '#FFFFFF',
+                        gobject.PARAM_READWRITE
+                        ),
+                    }
+
+    BG_FILL = "#f2f1f0"
+    BG_STROKE = "#ada9a4"
+    FG_FILL = "#d6d4d2"
+    FG_STROKE = "#ada9a4"
+
+    BAR_WIDTH = 50
+    BAR_HEIGHT = 12
+
+    BAR_XPAD = 4
+    BAR_YPAD = 5
+
+    CELL_WIDTH = BAR_WIDTH + BAR_XPAD * 2
+    CELL_HEIGHT = BAR_HEIGHT + BAR_YPAD * 2
+
+    CORNER_RADIUS = 3
+
+    def __init__(self):
+        super(SignalStrengthCellRenderer, self).__init__()
+    
+    def on_get_size(self, widget, cell_area):
+        return (0, 0, self.CELL_WIDTH, self.CELL_HEIGHT)
+
+    def do_set_property(self, pspec, value):
+        setattr(self, pspec.name, value)
+
+    def do_get_property(self, pspec):
+        return getattr(self, pspec.name)
+
+    def on_render(self, window, widget, background_area, cell_area,
+                    expose_area, flags):
+        cr = window.cairo_create()
+        
+        x = cell_area.x
+        y = cell_area.y
+
+        x_offset = self.BAR_XPAD
+        y_offset = self.BAR_YPAD
+
+        self._draw_rounded_rectangle(cr, x+x_offset, y+y_offset,
+            x+x_offset+self.BAR_WIDTH, y+y_offset+self.BAR_HEIGHT,
+            self.BG_FILL, self.BG_STROKE)
+            
+        self._draw_rounded_rectangle(cr, x+x_offset, y+y_offset,
+            x+x_offset+(int(self.BAR_WIDTH*float(self.signal))), y+y_offset+self.BAR_HEIGHT,
+            self.FG_FILL, self.FG_STROKE)
+
+    def _draw_rounded_rectangle(self, cr, x, y, w, h, fill, stroke):
+        self._layout_rounded_rectangle(cr, x, y, w, h)
+        
+        stroke = gtk.gdk.Color(stroke)
+        fill = gtk.gdk.Color(fill)
+        
+        cr.set_source_rgb(stroke.red / 65535.,
+                        stroke.green / 65535.,
+                        stroke.blue / 65535.)
+        cr.stroke_preserve()
+        
+        cr.set_source_rgb(fill.red / 65535.,
+                        fill.green / 65535.,
+                        fill.blue / 65535.)
+        cr.fill()
+        
+    def _layout_rounded_rectangle(self, cr, x, y, w, h):
+        r = self.CORNER_RADIUS
+        cr.new_sub_path()
+        cr.arc(r+x, r+y, r, PI, 270*PI_OVER_180)
+        cr.arc(w-r, r+y, r, 270*PI_OVER_180, 0)
+        cr.arc(w-r, h-r, r, 0, 90*PI_OVER_180)
+        cr.arc(r+x, h-r, r, 90*PI_OVER_180, PI)
+        cr.close_path()
+
+
+        
+gobject.type_register(PinCellRenderer)
+gobject.type_register(SignalStrengthCellRenderer)
+
+if __name__ == "__main__":    
+    window = gtk.Window()
+    
+    treeview = gtk.TreeView()
+    
+    # Main Column
+    column = gtk.TreeViewColumn("Main")
+    cr = PinCellRenderer()
+    crs = SignalStrengthCellRenderer()
+    crt = gtk.CellRendererText()
+    column.pack_start(cr)
+    column.pack_start(crs)
+    column.pack_start(crt)
+    column.set_attributes(cr, color=0)
+    column.set_attributes(crs, signal=1)
+    column.set_attributes(crt, text=2)
+    treeview.append_column(column)
+
+    store = gtk.ListStore(str, float, str)
+    store.append(["green", 0.25, "Hey"])
+    store.append(["red", 0.5, "hi"])
+    store.append(["yellow", 0.75, "ho"])
+    store.append(["grey", 1.0, "ha"])
+    treeview.set_model(store)
+    
+    window.add(treeview)
+    window.show_all()
+    gtk.main()
+

=== added file 'src/settings/indicatorNetworkSettings/frontend/widgets/connectionview.py'
--- src/settings/indicatorNetworkSettings/frontend/widgets/connectionview.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/connectionview.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,78 @@
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import gtk
+import gobject
+
+from indicatorNetworkSettings.enums import *
+from indicatorNetworkSettings.frontend.widgets.cellrenderers \
+    import SignalStrengthCellRenderer
+
+from gettext import gettext as _
+
+class WirelessConnectionView(gtk.TreeView):
+    def __init__(self, store):
+        super(WirelessConnectionView, self).__init__()
+        self.set_model(store)
+        
+        # Network Column (contains label)
+        column = gtk.TreeViewColumn(_("Network"))
+        cr_label = gtk.CellRendererText()
+        column.pack_start(cr_label, True)
+        column.set_attributes(cr_label,
+                            markup=WirelessConnectionStore.COL_NETWORK)
+        column.set_expand(True)
+        self.append_column(column)
+        
+        # Signal Column (contains signal indicator)
+        column = gtk.TreeViewColumn(_("Signal"))
+        cr_signal = SignalStrengthCellRenderer()
+        column.pack_start(cr_signal, True)
+        column.set_attributes(cr_signal,
+                            signal=WirelessConnectionStore.COL_SIGNAL)
+        column.set_clickable(True)
+        column.set_sort_column_id(WirelessConnectionStore.COL_SIGNAL)
+        self.append_column(column)
+        
+        # Last Used Column (contains label)
+        column = gtk.TreeViewColumn(_("Last Used"))
+        cr_label = gtk.CellRendererText()
+        column.pack_start(cr_label, True)
+        column.set_attributes(cr_label,
+                        markup=WirelessConnectionStore.COL_LAST_USED)
+        self.append_column(column)
+
+    def get_selected_connection(self):
+        (model, iter_) = self.get_selection().get_selected()
+        if iter_:
+            return model.get_value(iter_, 0)
+        return None
+
+        
+class WirelessConnectionStore(gtk.ListStore):
+    
+    (COL_OBJ, COL_NETWORK, COL_SIGNAL, COL_LAST_USED) = range(4)
+    
+    def __init__(self):
+        super(WirelessConnectionStore, self).__init__(
+            gobject.TYPE_PYOBJECT, str, str, str)
+        
+    def append(self, obj, network, signal, last_used):
+        row_data = [obj, network, signal, last_used]
+        return super(WirelessConnectionStore, self).append(row_data)
+

=== added directory 'src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes'
=== added file 'src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/Makefile.am'
--- src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/Makefile.am	2010-12-13 14:13:17 +0000
@@ -0,0 +1,3 @@
+# indicator-network-settings
+insdir = $(pkgdatadir)/indicatorNetworkSettings/frontend/widgets/device_boxes
+ins_PYTHON = bluetooth.py  __init__.py  mobile.py  wired.py  wireless.py

=== added file 'src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/__init__.py'
--- src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/__init__.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/__init__.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,30 @@
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import gtk
+
+class DeviceBox(gtk.VBox):
+    """A gtk.VBox which holds all of the widgets to control a device."""
+
+    def __init__(self, device, datadir):
+        super(DeviceBox, self).__init__(spacing=12)
+        self.device = device
+        self.device.connect("state-changed", self._on_device_state_changed)
+
+    def _on_device_state_changed(self, device, state):
+        pass

=== added file 'src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/bluetooth.py'
--- src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/bluetooth.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/bluetooth.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,35 @@
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import gtk
+import locale
+
+from indicatorNetworkSettings.enums import *
+
+from gettext import gettext as _
+
+class BluetoothBox(gtk.VBox):
+
+    """A gtk.VBox which holds all of thw widgets to control a bluetooth
+      device."""
+    
+    def __init__(self, device, datadir):
+        super(BluetoothBox, self).__init__(spacing=12)
+        self.device = device
+
+    # Callbacks

=== added file 'src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/mobile.py'
--- src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/mobile.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/mobile.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import gtk
+
+from indicatorNetworkSettings.frontend.widgets.device_boxes \
+    import DeviceBox
+from indicatorNetworkSettings.frontend.widgets.toggleswitch \
+    import InfoBox, ToggleSwitch
+
+from indicatorNetworkSettings.enums import *
+import indicatorNetworkSettings.frontend.utils as utils
+
+from gettext import gettext as _
+
+class MobileBox(DeviceBox):
+
+    """A gtk.VBox which holds all of the widgets to control a mobile
+      device. It contains an InfoBox and ToggleSwitch to control and
+      monitor the state of the mobile device, and a set of widgets
+      to enter details about the mobile network to connect to."""
+
+    SENSITIVE_WIDGETS = ["label_apn_place", "label_apn",
+                        "label_pin_auth", "checkbutton_show_pin"]
+
+    def __init__(self, device, datadir):
+        super(MobileBox, self).__init__(device, datadir)
+
+        # Infobox and Togglswitch
+        ## Creation
+        self.infobox = InfoBox(spacing=12)
+        self.toggleswitch = ToggleSwitch((_("ON"), _("OFF")))
+        self.label_status = gtk.Label()
+        ## Padding and alignment
+        self.label_status.set_alignment(0, 0.5)
+        self.infobox.set_border_width(10)
+        ## Packing
+        self.infobox.pack_start(self.label_status, True, True)
+        self.infobox.pack_start(self.toggleswitch, False, True)
+        self.pack_start(self.infobox, False, False)
+        ## Connect signals
+        self.toggleswitch.connect("toggled", self._on_toggleswitch_toggled)
+
+        # Network Settings
+        ## Creation
+        utils.setup_ui(self, datadir, "mobile_box")
+        ## Packing
+        self.pack_start(self.table_settings, True, True)
+
+        self._update_widget_states(self.device.get_state())
+        self._on_checkbutton_show_pin_toggled(self.checkbutton_show_pin)
+
+    # Private Functions
+    def _update_widget_states(self, state):
+        if state == DEVICE_STATE_CONNECTED:
+            device_editable = True
+            settings_editable = False
+            toggleswitch_state = True
+            status_text = _("Connected to “Vodafone UK”.")
+        elif state == DEVICE_STATE_ONLINE:
+            device_editable = True
+            settings_editable = False
+            toggleswitch_state = True
+            status_text = _("Connected to the Internet on “Vodafone UK”.")
+        elif state == DEVICE_STATE_OFF:
+            device_editable = False
+            settings_editable = True
+            toggleswitch_state = False
+            status_text = _("The Mobile Broadband device is powered off.")
+        elif state == DEVICE_STATE_OFFLINE:
+            device_editable = True
+            settings_editable = True
+            toggleswitch_state = False
+            status_text = _("Mobile Broadband is offline.")
+            
+        self.toggleswitch.set_sensitive(device_editable)
+        self.toggleswitch.set_active(toggleswitch_state)
+        self.label_status.set_text(status_text)
+
+        self.table_settings.foreach(self._sensitise_widgets,
+            (device_editable, settings_editable))
+
+    def _sensitise_widgets(self, widget, data):
+        (device_editable, settings_editable) = data
+        name = gtk.Buildable.get_name(widget)
+        if name in self.SENSITIVE_WIDGETS:
+            widget.set_sensitive(device_editable)
+        elif not isinstance(widget, gtk.Box):
+            widget.set_sensitive(settings_editable)
+        else:
+            widget.foreach(self._sensitise_widgets,
+                (device_editable, settings_editable))
+    
+    # Callbacks
+    def _on_device_state_changed(self, device, state):
+        self._update_widget_states(state)
+    
+    def _on_toggleswitch_toggled(self, widget):
+        if widget.get_active():
+            self.device.set_state(DEVICE_STATE_CONNECTED)
+        else:
+            self.device.set_state(DEVICE_STATE_OFFLINE)
+
+    def _on_checkbutton_show_pin_toggled(self, widget):
+        self.entry_pin.set_visibility(widget.get_active())

=== added file 'src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/wired.py'
--- src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/wired.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/wired.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,35 @@
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import gtk
+import locale
+
+from indicatorNetworkSettings.enums import *
+
+from gettext import gettext as _
+
+class WiredBox(gtk.VBox):
+
+    """A gtk.VBox which holds all of the widgets to control a wired
+      device."""
+    
+    def __init__(self, device, datadir):
+        super(WiredBox, self).__init__(spacing=12)
+        self.device = device
+
+    # Callbacks

=== added file 'src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/wireless.py'
--- src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/wireless.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/wireless.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,134 @@
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import gtk
+import locale
+
+from indicatorNetworkSettings.frontend.widgets.device_boxes \
+    import DeviceBox
+from indicatorNetworkSettings.frontend.widgets.connectionview \
+    import WirelessConnectionView, WirelessConnectionStore
+from indicatorNetworkSettings.frontend.widgets.toggleswitch \
+    import InfoBox, ToggleSwitch
+
+from indicatorNetworkSettings.backend.connection \
+    import get_remembered_wireless_connections
+    
+from indicatorNetworkSettings.enums import *
+import indicatorNetworkSettings.frontend.utils as utils
+
+from gettext import gettext as _
+
+class WirelessBox(DeviceBox):
+
+    """A gtk.VBox which holds all of the widgets to control a wireless
+      device. It contains an InfoBox and ToggleSwitch to control and
+      monitor the state of the wireless device, and a
+      WirelessConnectionView to connect to and remember details for
+      wireless networks."""
+
+    def __init__(self, device, datadir):
+        super(WirelessBox, self).__init__(device, datadir)
+
+        # Infobox and Togglswitch
+        ## Creation
+        self.infobox = InfoBox(spacing=12)
+        self.toggleswitch = ToggleSwitch((_("ON"), _("OFF")))
+        self.label_status = gtk.Label()
+        ## Padding and alignment
+        self.label_status.set_alignment(0, 0.5)
+        self.infobox.set_border_width(10)
+        ## Packing
+        self.infobox.pack_start(self.label_status, True, True)
+        self.infobox.pack_start(self.toggleswitch, False, True)
+        self.pack_start(self.infobox, False, False)
+        ## Connect signals
+        self.toggleswitch.connect("toggled", self._on_toggleswitch_toggled)
+
+        # Network Settings
+        ## Creation
+        utils.setup_ui(self, datadir, "wireless_box")
+        ## Packing
+        self.pack_start(self.vbox_connections, True, True)
+
+        # Connection View
+        ## Creation
+        connection_store = WirelessConnectionStore()
+        self.treeview_connections = WirelessConnectionView(connection_store)
+        ## Packing
+        self.scrolledwindow_connections.add(self.treeview_connections)
+        ## Population
+        connections = get_remembered_wireless_connections(device)
+        for connection in connections:
+            self._add_connection(connection)
+
+        self._update_widget_states(self.device.get_state())
+
+    # Private Functions
+    def _update_widget_states(self, state):
+        if state == DEVICE_STATE_CONNECTED:
+            device_editable = True
+            settings_editable = True
+            toggleswitch_state = True
+            status_text = _("Wi-fi is on but not connected to the Internet.")
+        elif state == DEVICE_STATE_ONLINE:
+            device_editable = True
+            settings_editable = True
+            toggleswitch_state = True
+            status_text = _("Wi-fi is on and connected to the Internet.")
+        elif state == DEVICE_STATE_OFF:
+            device_editable = False
+            settings_editable = False
+            toggleswitch_state = False
+            status_text = _("The Wi-fi device is powered off.")
+        elif state == DEVICE_STATE_OFFLINE:
+            device_editable = True
+            settings_editable = False
+            toggleswitch_state = False
+            status_text = _("Wi-fi is offline.")
+
+        self.vbox_connections.set_sensitive(settings_editable)
+        self.toggleswitch.set_sensitive(device_editable)
+        self.toggleswitch.set_active(toggleswitch_state)
+        self.label_status.set_text(status_text)
+
+    def _add_connection(self, connection):
+        network = connection.network
+        signal = connection.signal
+        if connection.last_used:
+            date_format = locale.nl_langinfo(locale.D_FMT)
+            last_used = connection.last_used.strftime(date_format)
+        else:
+            last_used = _("Never")
+
+        liststore = self.treeview_connections.get_model()
+        liststore.append(connection, network, signal, last_used)
+
+    # Callbacks
+    def _on_device_state_changed(self, device, state):
+        self._update_widget_states(state)
+
+    def _on_toggleswitch_toggled(self, widget):
+        if widget.get_active():
+            self.device.set_state(DEVICE_STATE_CONNECTED)
+        else:
+            self.device.set_state(DEVICE_STATE_OFFLINE)
+
+    def _on_button_connect_clicked(self, widget):
+        connection = self.treeview_connections.get_selected_connection()
+        connection.connect_("password")

=== added file 'src/settings/indicatorNetworkSettings/frontend/widgets/deviceview.py'
--- src/settings/indicatorNetworkSettings/frontend/widgets/deviceview.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/deviceview.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,157 @@
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import gtk
+import glib
+import gobject
+import pango
+
+from indicatorNetworkSettings.enums import *
+from indicatorNetworkSettings.frontend.widgets.cellrenderers \
+    import PinCellRenderer
+
+from gettext import gettext as _
+
+class DeviceView(gtk.TreeView):
+
+    __gsignals__ = {
+        "selection-changed" : (gobject.SIGNAL_RUN_LAST,
+                                   gobject.TYPE_NONE,
+                                   ([gobject.TYPE_PYOBJECT]),
+                                  ),
+        "reordered" : (gobject.SIGNAL_RUN_LAST,
+                                   gobject.TYPE_NONE,
+                                   (),
+                                  ),
+    }
+    
+    def __init__(self, store):
+        super(DeviceView, self).__init__()
+        self.set_model(store)
+        
+        # Device (main) Column (contains pin icon, type icon and label)
+        column = gtk.TreeViewColumn("Device")
+        cr_pin = PinCellRenderer()
+        cr_icon = gtk.CellRendererPixbuf()
+        cr_label = gtk.CellRendererText()
+        column.pack_start(cr_pin, False)
+        column.set_attributes(cr_pin, color=DeviceStore.COL_PIN)
+        column.pack_start(cr_icon, False)
+        column.set_attributes(cr_icon, pixbuf=DeviceStore.COL_ICON)
+        column.pack_start(cr_label, True)
+        column.set_attributes(cr_label, markup=DeviceStore.COL_LABEL)
+        cr_label.set_property("ellipsize", pango.ELLIPSIZE_END)
+        self.append_column(column)
+
+        self.set_headers_visible(False)
+        self.set_reorderable(True)
+
+        self._dragging = False
+
+        self.get_selection().connect("changed", self._on_selection_changed)
+        self.connect("drag-begin", self._on_drag_begin)
+        self.connect("drag-end", self._on_drag_end)
+        self.connect("drag-failed", self._on_drag_failed)
+
+    def _on_selection_changed(self, selection):
+        self.emit("selection-changed", selection)
+        
+    def _on_drag_begin(self, drag_context, *data):
+        self._dragging = True
+        
+    def _on_drag_failed(self, drag_context, *data):
+        self._dragging = False
+        
+    def _on_drag_end(self, drag_context, *data):
+        if self._dragging:
+            self.emit("reordered")
+
+    def get_selected_device(self):
+        (model, iter_) = self.get_selection().get_selected()
+        if iter_:
+            return model.get_value(iter_, 0)
+        return None
+        
+class DeviceStore(gtk.ListStore):
+    
+    (COL_DEVICE_OBJ, COL_SETTINGS_BOX, COL_PIN, COL_ICON, COL_LABEL) = range(5)
+    
+    def __init__(self, icons):
+        super(DeviceStore, self).__init__(gobject.TYPE_PYOBJECT,
+                                            gobject.TYPE_PYOBJECT, str,
+                                            gtk.gdk.Pixbuf, str)
+        self.icons = icons
+        
+    def append(self, device, settings_box):
+        device.connect("state-changed", self._on_device_state_changed)
+        
+        pin_color = self._get_pin_color(device.state)
+        caption = self._get_device_caption(device.state)
+        label = DEVICE_TYPE_NAMES[device.type]
+        icon = DEVICE_TYPE_ICONS[device.type]
+        
+        markup = self._get_markup(label, caption)
+        try:
+            icon_pixbuf = self.icons.load_icon(icon, 16, 16)
+        except glib.GError:
+            icon_pixbuf = self.icons.load_icon(GENERIC_DEVICE_ICON, 16, 16)
+        
+        row_data = [device, settings_box, pin_color, icon_pixbuf, markup]
+        
+        return super(DeviceStore, self).append(row_data)
+
+    def _on_device_state_changed(self, device, state):
+        iter_ = self._get_iter_for_device(device)
+        pin_color = self._get_pin_color(state)
+        caption = self._get_device_caption(state)
+        label = DEVICE_TYPE_NAMES[device.type]
+        
+        markup = self._get_markup(label, caption)
+        
+        self.set_value(iter_, self.COL_PIN, pin_color)
+        self.set_value(iter_, self.COL_LABEL, markup)
+
+    def _get_iter_for_device(self, device):
+        for row in self:
+            if row[0] == device:
+                return row.iter
+        
+    def _get_pin_color(self, state):
+        if state == DEVICE_STATE_OFF:
+            return "grey"
+        elif state == DEVICE_STATE_OFFLINE:
+            return "red"
+        elif state == DEVICE_STATE_CONNECTED:
+            return "yellow"
+        elif state == DEVICE_STATE_ONLINE:
+            return "green"
+        
+    def _get_device_caption(self, state):
+        if state == DEVICE_STATE_OFF:
+            return _("Off")
+        elif state == DEVICE_STATE_OFFLINE:
+            return _("Offline")
+        elif state == DEVICE_STATE_CONNECTED:
+            return _("Connected")
+        elif state == DEVICE_STATE_ONLINE:
+            return _("Online")
+
+    def _get_markup(self, label, caption):
+        return "%s\n<span font_size=\"small\">%s</span>" % (label, caption)
+
+

=== added file 'src/settings/indicatorNetworkSettings/frontend/widgets/toggleswitch.py'
--- src/settings/indicatorNetworkSettings/frontend/widgets/toggleswitch.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/toggleswitch.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,529 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#       
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import atk
+import gtk
+import gobject
+import cairo
+
+from gettext import gettext as _
+
+PI =            3.1415926535897931
+PI_OVER_180 =   0.017453292519943295
+
+class ToggleSwitch(gtk.EventBox):
+
+    """A switch containing the values ON and OFF (or user-inputed) that
+    hides the inactive value. It can be clicked or dragged to change
+    state, or through an enter/return keypress."""
+    
+    __gsignals__ = {
+        "clicked" : (gobject.SIGNAL_RUN_LAST,
+                                   gobject.TYPE_NONE,
+                                   (),
+                                  ),
+        "toggled" : (gobject.SIGNAL_RUN_LAST,
+                                   gobject.TYPE_NONE,
+                                   (),
+                                  ),
+    }
+
+    # (In relation to the height of the covering rectangle)
+    LINE_HEIGHT_RATIO = 9/25.0
+    LINE_SPACING_RATIO = 5/38.0
+    CORNER_RADIUS = 3
+    
+    ANIMATION_DURATION = 800
+
+    STATE_ACTIVE, STATE_INACTIVE = (True, False)
+
+    # (In relation to the width/height of the text)
+    TEXT_XPAD = 0.5
+    TEXT_YPAD = 0.55
+
+    # Used for storing Geometry of Widget
+    GEO = {}
+    
+    def __init__(self, values=(_("ON"), _("OFF")), active=False):
+        super(ToggleSwitch, self).__init__()
+            
+        self.set_visible_window(False)
+
+        # Accessibility info
+        self.atk = self.get_accessible()
+        self.atk.set_role(atk.ROLE_CHECK_BOX)
+
+        # Set events for the widget to receive
+        self.set_flags(gtk.CAN_FOCUS)
+        self.set_events(gtk.gdk.KEY_PRESS_MASK|
+                        gtk.gdk.ENTER_NOTIFY_MASK|
+                        gtk.gdk.LEAVE_NOTIFY_MASK|
+                        gtk.gdk.BUTTON_PRESS_MASK|
+                        gtk.gdk.BUTTON_RELEASE_MASK)
+
+        # Connect signls and callbacks
+        self.connect('style-set', self._on_style_set)
+        self.connect('expose-event', self._on_expose_event)
+        self.connect('button-press-event', self._on_press)
+        self.connect('button-release-event', self._on_release)
+        self.connect('key-release-event', self._on_key_release)
+        self.connect('enter-notify-event', self._on_enter)
+        self.connect('leave-notify-event', self._on_leave)
+        self.connect('motion-notify-event', self._on_motion_notify_event)
+
+        # Set values of the widget
+        self.set_values(values)
+        # Set default state of widget
+        self.state_ = active
+        # Allocate variables that will be used later
+        self._layout = None
+        self._animating = False
+        self._pressed = False
+
+        # If the covering rectangle needs to start on the right
+        # set the offset to -1
+        if self.state_ == self.STATE_ACTIVE:
+            self.x_movement_offset = -1
+        else:
+            self.x_movement_offset = 0
+
+        # Calculate the best size
+        calc_width, calc_height = self._calculate_size()
+        self.set_size_request(calc_width, calc_height)
+
+    # Private functions
+
+    def _calculate_size(self):
+        """Calculate the best size for the toggleswitch based on the
+           dimensions of the user's default font."""
+        self._layout = self.create_pango_layout('')
+        
+        self._layout.set_text("ON")
+        text_width, text_height = self._layout.get_pixel_extents()[1][2:]
+
+        width = (text_width+(text_width*self.TEXT_XPAD*2))*2
+        height = text_height+(text_height*self.TEXT_YPAD*2)
+
+        return (int(width), int(height))
+
+    
+    def _draw_widget(self, widget):
+        """Do the drawing of the actual widget."""
+        cr = widget.window.cairo_create()
+
+        # Store the dimensions of the widget for access throughout
+        self.GEO["x"] = widget.allocation.x
+        self.GEO["y"] = widget.allocation.y
+        self.GEO["x1"] = widget.allocation.x + 1
+        self.GEO["y1"] = widget.allocation.y + 1
+        self.GEO["width"] = widget.allocation.width - 3
+        self.GEO["height"] = widget.allocation.height - 3
+        self.GEO["x2"] = widget.allocation.x + 1 + widget.allocation.width - 5
+        self.GEO["y2"] = widget.allocation.y + 1 + widget.allocation.height - 5
+
+        # Draw clipping rectangle
+        self._layout_rounded_rectangle(cr, self.GEO["x"],
+                                self.GEO["y"],
+                                self.GEO["x"] + widget.allocation.width,
+                                self.GEO["y"] + widget.allocation.height)
+        cr.clip()
+
+        # Draw the main background
+        self._draw_main_background(cr)
+        
+        # Draw the text
+        self._draw_on_text()
+        self._draw_off_text()
+
+        # Draw the covering rectangle
+        self._draw_covering_rectangle(cr)
+
+        # Update ATK description, based on state
+        if self.state_ == self.STATE_ACTIVE:
+            self.atk.set_name(self.values[0])
+        else:
+            self.atk.set_name(self.values[1])
+
+    def _draw_main_background(self, cr):
+        x1 = self.GEO["x1"]
+        y1 = self.GEO["y1"]
+        x2 = self.GEO["x2"]
+        y2 = self.GEO["y2"]
+
+        # Don't change colour of background on hover or press
+        if self.state == gtk.STATE_PRELIGHT or self.state == gtk.STATE_ACTIVE:
+            state = gtk.STATE_NORMAL
+        else:
+            state = self.state
+
+        # Layout the outline of the whole widget
+        self._layout_rounded_rectangle(cr, x1, y1, x2, y2)
+        ## Select colours
+        fill = self.style.base[state]
+        stroke = self.style.dark[state]
+        ## Stroke and then fill it in
+        self._stroke_rounded_rectangle(cr, stroke)
+        self._fill_rounded_rectangle(cr, fill)
+        
+        # Layout the left (highlighted) part
+        x1 = self.GEO["x1"]
+        x2 = self.GEO["x1"] + (self.GEO["width"]/2)
+        self._layout_rounded_rectangle(cr, x1, y1, x2, y2)
+        ## Select colours
+        fill = self.style.light[gtk.STATE_SELECTED]
+        stroke = self.style.mid[gtk.STATE_SELECTED]
+        ## Stroke and then fill it in
+        self._stroke_rounded_rectangle(cr, stroke)
+        self._fill_rounded_rectangle(cr, fill)
+        
+        # Layout the right (normal) part
+        x1 = self.GEO["x2"] - (self.GEO["width"]/2)
+        x2 = self.GEO["x2"] 
+        self._layout_rounded_rectangle(cr, x1, y1, x2, y2)
+        ## Select colours
+        fill = self.style.base[state]
+        stroke = self.style.dark[state]
+        ## Stroke and then fill it in
+        self._stroke_rounded_rectangle(cr, stroke)
+        self._fill_rounded_rectangle(cr, fill)
+        
+
+    def _draw_covering_rectangle(self, cr, x_offset=0):
+        if self.x_movement_offset == -1:
+            self.x_movement_offset = self.GEO["width"] / 2 - 1
+        x1 = self.GEO["x1"] + self.x_movement_offset
+        x2 = (self.GEO["width"] / 2) + self.GEO["x1"] + self.x_movement_offset
+
+        y1 = self.GEO["y1"]
+        y2 = self.GEO["y2"]
+        
+        stroke = self.style.dark[self.state]
+        self._layout_rounded_rectangle(cr, x1, y1, x2, y2)
+        self._stroke_rounded_rectangle(cr, stroke)
+        
+        if self.state == gtk.STATE_INSENSITIVE:
+            fill = self.style.bg[self.state]
+            self._fill_rounded_rectangle(cr, fill)
+        else:
+            fill1 = self.style.light[self.state]
+            fill2 = self.style.mid[self.state]
+            linear = self._create_vertical_gradient(fill1, fill2, x1, x2, y1, y2)
+            self._fill_gradient_rounded_rectangle(cr, linear)
+
+        # Draw the vertical lines
+        fill_dark = self.style.dark[self.state]
+        fill_light = self.style.light[self.state]
+        height = round(self.GEO["height"]*self.LINE_HEIGHT_RATIO)
+        width = 1
+
+        spacing = int(self.LINE_SPACING_RATIO * (self.GEO["width"] / 2))
+        c_spacing = 0
+        
+        x_offset = ((self.GEO["width"] / 2) - (6+(spacing*2)))/2 + 2
+        y_offset = (self.GEO["height"]  - height)/2
+        
+        for i in range(3):
+            self._draw_vertical_line(cr, x1+x_offset+c_spacing,
+                                y1+y_offset, width, height, fill_dark)
+            self._draw_vertical_line(cr, x1+x_offset+c_spacing+1,
+                                y1+y_offset, width, height, fill_light)
+            c_spacing += spacing
+
+
+    def _draw_vertical_line(self, cr, x1, y1, width, height, fill):
+        """Draw a vertical line on the covering rectangle"""
+        cr.rectangle(x1, y1, width, height)
+        cr.set_source_rgb(fill.red_float, fill.green_float, fill.blue_float)
+        cr.fill()
+
+    def _draw_on_text(self):
+        """Draw the ON (or otherwise) text"""
+        text = self.values[0]
+        gravity = "left"
+        self._draw_text_centered_text(text, gravity)
+
+    def _draw_off_text(self):
+        """Draw the OFF (or otherwise) text"""
+        text = self.values[1]
+        gravity = "right"
+        self._draw_text_centered_text(text, gravity)
+
+    def _draw_text_centered_text(self, text, gravity):
+        if not self._layout:
+            self._layout = self.create_pango_layout('')
+        
+        self._layout.set_text(text)
+        text_width, text_height = self._layout.get_pixel_extents()[1][2:]
+        
+        if self.x_movement_offset == -1:
+            if gravity == "right":
+                text_x_offset = (((self.GEO["width"]/2) - text_width) / 2) + (self.GEO["width"]/2)
+            elif gravity == "left":
+                text_x_offset = (((self.GEO["width"]/2) - text_width) / 2) + self.x_movement_offset
+        else:
+            if gravity == "right":
+                text_x_offset = (((self.GEO["width"]/2) - text_width) / 2) + (self.GEO["width"]/2) + self.x_movement_offset
+            elif gravity == "left":
+                text_x_offset = (((self.GEO["width"]/2) - text_width) / 2) + (self.x_movement_offset-(self.GEO["width"]/2))
+        
+        text_y_offset = ((self.GEO["height"] - text_height) / 2)
+        
+        self.style.paint_layout(self.window, self.state, True,
+                                (self.GEO["x"], self.GEO["y"],
+                                self.GEO["width"], self.GEO["height"]),
+                                self, '',         
+                                int(self.GEO["x1"]+text_x_offset),
+                                int(self.GEO["y1"]+text_y_offset),
+                                self._layout)
+        
+
+    def _layout_rounded_rectangle(self, cr, x, y, w, h):
+        r = self.CORNER_RADIUS
+        cr.new_sub_path()
+        cr.arc(r+x, r+y, r, PI, 270*PI_OVER_180)
+        cr.arc(w-r, r+y, r, 270*PI_OVER_180, 0)
+        cr.arc(w-r, h-r, r, 0, 90*PI_OVER_180)
+        cr.arc(r+x, h-r, r, 90*PI_OVER_180, PI)
+        cr.close_path()
+
+    def _fill_rounded_rectangle(self, cr, fill):
+        cr.set_source_rgb(fill.red_float,
+                          fill.green_float,
+                          fill.blue_float)
+        cr.fill()
+
+    def _fill_gradient_rounded_rectangle(self, cr, fill):
+        cr.set_source(fill)
+        cr.fill()
+        
+    def _stroke_rounded_rectangle(self, cr, stroke):
+        cr.set_source_rgb(stroke.red_float,
+                            stroke.green_float,
+                            stroke.blue_float)
+        cr.stroke_preserve()
+
+    def _create_vertical_gradient(self, color1, color2, x1, x2, y1, y2):
+        linear = cairo.LinearGradient(x1, y1, x1, y2)
+        linear.add_color_stop_rgba(0.00, color1.red_float,
+                                    color1.green_float,
+                                    color1.blue_float, 1)
+        linear.add_color_stop_rgba(0.8, color2.red_float,
+                                    color2.green_float,
+                                    color2.blue_float, 1)
+        return linear
+
+    def _increment_movement(self, state):
+        if state == self.STATE_ACTIVE:
+            increment = 1
+            criterion = self.x_movement_offset == (self.GEO["x2"] - (self.GEO["width"]/2) - self.GEO["x1"])
+        else:
+            increment = -1
+            criterion = self.x_movement_offset == 0
+            
+        if criterion:
+            self._animating = False
+            self.queue_draw()
+            return False
+        else:
+            self.x_movement_offset += increment
+            self.queue_draw()
+            return True
+
+    # Callbacks
+    def _on_style_set(self, widget, event):
+        # Re-calculate the best size
+        calc_width, calc_height = self._calculate_size()
+        self.set_size_request(calc_width, calc_height)
+
+    def _on_expose_event(self, widget, event):
+        self._draw_widget(widget)
+
+    def _on_press(self, widget, event):
+        self.set_state(gtk.STATE_ACTIVE)
+        if event.x < self.GEO["width"]/2:
+            self.offset = event.x
+        elif event.x > self.GEO["width"]/2:
+            self.offset =  event.x - self.GEO["width"]/2
+    
+    def _on_release(self, widget, event):
+        if not self._animating:
+            if self._pressed:
+                if self.x_movement_offset <= self.GEO["width"] / 4:
+                    gobject.timeout_add(5, self._increment_movement,
+                                        self.STATE_INACTIVE)
+                    self.state_ = self.STATE_INACTIVE
+                    self.emit('toggled')
+                elif self.x_movement_offset >= self.GEO["width"] / 4:
+                    gobject.timeout_add(5, self._increment_movement,
+                                        self.STATE_ACTIVE)
+                    self.state_ = self.STATE_ACTIVE
+                    self.emit('toggled')
+                self._pressed = False
+                self.offset = 0
+            else:
+                self.set_state(gtk.STATE_PRELIGHT)
+                self.state_ = not self.state_
+                self.emit('clicked')
+                self.emit('toggled')
+                gobject.timeout_add(5, self._increment_movement,
+                                    self.state_)
+                self._pressed = False
+            self._animating = True
+            
+    def _on_motion_notify_event(self, widget, event):
+        self._pressed = True
+        if event.x - self.offset < 0:
+            self.x_movement_offset = 0
+        elif event.x - self.offset >= (self.GEO["width"]/2 - 1):
+            self.x_movement_offset = self.GEO["width"]/2 -1
+        else:
+            self.x_movement_offset = event.x - self.offset
+        self.queue_draw()
+        
+    def _on_key_release(self, widget, event):
+        if widget.has_focus():
+            if event.keyval == gtk.keysyms.Return or  \
+                event.keyval == gtk.keysyms.KP_Enter:
+                self.toggled()
+
+    def _on_enter(self, widget, event):
+        self.set_state(gtk.STATE_PRELIGHT)
+
+    def _on_leave(self, widget, event):
+        self.set_state(gtk.STATE_NORMAL)
+
+    # Public functions
+
+    def get_active(self):
+        return self.state_
+        
+    def set_active(self, state):
+        # If the widget is not yet realized, don't bother animating
+        if self.get_window() == None:
+            if state:
+                self.x_movement_offset = -1
+            else:
+                self.x_movement_offset = 0
+            self.queue_draw()
+            self.state_ = state
+        # Otherwise if we are not already animating, change the state
+        elif not self._animating:
+            self._animating = True
+            self._on_release(self, None)
+        
+    def set_values(self, values):
+        # If the variable values is a tuple of length 2, and type string
+        # set the widget's values property to it.
+        if (len(values) == 2) and (type(values) == tuple):
+            if (type(values[0]) == str) and (type(values[1]) == str):
+                self.values = values
+                return
+        # Otherwise raise a Type error
+        raise TypeError("ToggleSwitch.set_values() argument 1 must be " + \
+                        "String Tuple of length 2, not %s." % type(values))
+        
+    def toggled(self):
+        self._on_release(self, None)
+
+    def pressed(self):
+        self._on_press(self, None)
+
+    def clicked(self):
+        self._on_release(self, None)
+        
+    def enter(self):
+        self._on_enter(self, None)
+        
+    def leave(self):
+        self._on_leave(self, None)
+        
+class InfoBox(gtk.HBox):
+    """A gtk.HBox that is filled with the mid-colour and stroked with
+    the dark colour from a user's gtk theme so that it stands out."""
+
+    YPAD = 1
+    XPAD = 1
+    
+    def __init__(self, homogeneous=False, spacing=0):
+        super(InfoBox, self).__init__(homogeneous, spacing)
+        self.connect('expose-event', self._on_expose_event)
+
+    def _on_expose_event(self, widget, event):
+        cr = widget.window.cairo_create()
+
+        # Get geometry
+        x = widget.allocation.x + self.XPAD
+        y = widget.allocation.y + self.YPAD
+        width = widget.allocation.width - (self.XPAD * 2)
+        height = widget.allocation.height - (self.YPAD * 2)
+
+        # Fill with the mid color from the current gtk theme
+        fill = self.style.mid[self.state]
+        # Fill with the dark color from the current gtk theme
+        stroke = self.style.dark[self.state]
+
+        # Layout the rectangle
+        cr.rectangle(x, y, width, height)
+        # Stroke the outline
+        cr.set_source_rgb(stroke.red_float, stroke.green_float,
+                            stroke.blue_float)
+        cr.stroke_preserve()
+        # Fill it in
+        cr.set_source_rgb(fill.red_float, fill.green_float,
+                            fill.blue_float)
+        cr.fill()
+        
+if __name__ == "__main__":
+    def on_toggle_switch_clicked(widget):
+        print widget.get_active()
+
+    def do():
+        s.toggled()
+        return True
+    
+    w = gtk.Window()
+    v = gtk.VBox()
+    h = gtk.HBox()
+    i = InfoBox(spacing=12)
+    s = ToggleSwitch()
+    si = ToggleSwitch()
+    si.set_sensitive(False)
+    l = gtk.Label("Wi-fi is on and connected to the Internet.")
+    
+    gobject.timeout_add(3000, do)
+
+    w.connect("delete-event", gtk.main_quit)
+    s.connect("clicked", on_toggle_switch_clicked)
+
+    v.set_border_width(10)
+    w.set_default_size(200, 200)
+
+    i.pack_start(l, False)
+    i.pack_start(s, False, False)
+    i.pack_start(si, False, False)
+    i.set_border_width(12)
+    h.pack_start(i)
+    v.pack_start(h, False, False)
+    w.add(v)
+
+    w.show_all()
+    gtk.main()
+    

=== added file 'src/settings/indicatorNetworkSettings/utils.py'
--- src/settings/indicatorNetworkSettings/utils.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/utils.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,18 @@
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Andrew Higginson
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+

=== added file 'src/settings/indicatorNetworkSettings/version.py'
--- src/settings/indicatorNetworkSettings/version.py	1970-01-01 00:00:00 +0000
+++ src/settings/indicatorNetworkSettings/version.py	2010-12-13 14:13:17 +0000
@@ -0,0 +1,5 @@
+
+VERSION = '0.01'
+CODENAME = 'UNRELEASED'
+DISTRO = 'Ubuntu'
+RELEASE = '11.04'

=== added directory 'src/settings/ui'
=== added file 'src/settings/ui/Makefile.am'
--- src/settings/ui/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/settings/ui/Makefile.am	2010-12-13 14:13:17 +0000
@@ -0,0 +1,5 @@
+uidir = $(pkgdatadir)/ui
+dist_ui_DATA = \
+	indicator-network-settings.ui \
+	mobile_box.ui \
+	wireless_box.ui

=== added file 'src/settings/ui/indicator-network-settings.ui'
--- src/settings/ui/indicator-network-settings.ui	1970-01-01 00:00:00 +0000
+++ src/settings/ui/indicator-network-settings.ui	2010-12-13 14:13:17 +0000
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkWindow" id="window_main">
+    <property name="title" translatable="yes">Network Settings</property>
+    <property name="default_width">600</property>
+    <property name="default_height">300</property>
+    <signal name="delete_event" handler="on_window_main_delete_event"/>
+    <child>
+      <object class="GtkNotebook" id="notebook_main">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="border_width">12</property>
+        <signal name="switch_page" handler="on_notebook_main_page_switched"/>
+        <child>
+          <object class="GtkAlignment" id="alignment_connections">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkHBox" id="hbox_c">
+                <property name="visible">True</property>
+                <property name="border_width">12</property>
+                <property name="spacing">12</property>
+                <child>
+                  <object class="GtkViewport" id="viewport_c_devices">
+                    <property name="width_request">170</property>
+                    <property name="visible">True</property>
+                    <property name="resize_mode">queue</property>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolledwindow_c_devices">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkNotebook" id="notebook_c_right">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="show_tabs">False</property>
+                    <property name="show_border">False</property>
+                    <property name="tab_hborder">3</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child type="tab">
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child type="tab">
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child type="tab">
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child type="tab">
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Connections</property>
+          </object>
+          <packing>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        <!--
+        <child>
+          <object class="GtkAlignment" id="alignment_vpns">
+            <property name="visible">True</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">VPNs</property>
+          </object>
+          <packing>
+            <property name="position">1</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkAlignment" id="alignment_sharing">
+            <property name="visible">True</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label4">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Sharing</property>
+          </object>
+          <packing>
+            <property name="position">2</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkAlignment" id="alignment_firewall">
+            <property name="visible">True</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Firewall</property>
+          </object>
+          <packing>
+            <property name="position">3</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        -->
+      </object>
+    </child>
+  </object>
+</interface>

=== added file 'src/settings/ui/mobile_box.ui'
--- src/settings/ui/mobile_box.ui	1970-01-01 00:00:00 +0000
+++ src/settings/ui/mobile_box.ui	2010-12-13 14:13:17 +0000
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkTable" id="table_settings">
+    <property name="visible">True</property>
+    <property name="n_rows">6</property>
+    <property name="n_columns">2</property>
+    <property name="column_spacing">6</property>
+    <property name="row_spacing">6</property>
+    <child>
+      <object class="GtkLabel" id="label_pin">
+        <property name="visible">True</property>
+        <property name="sensitive">False</property>
+        <property name="xalign">1</property>
+        <property name="label" translatable="yes">Device PIN:</property>
+      </object>
+      <packing>
+        <property name="x_options">GTK_FILL</property>
+        <property name="y_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label_access_point">
+        <property name="visible">True</property>
+        <property name="sensitive">False</property>
+        <property name="xalign">1</property>
+        <property name="label" translatable="yes">Access point:</property>
+      </object>
+      <packing>
+        <property name="top_attach">2</property>
+        <property name="bottom_attach">3</property>
+        <property name="x_options">GTK_FILL</property>
+        <property name="y_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label_region">
+        <property name="visible">True</property>
+        <property name="sensitive">False</property>
+        <property name="xalign">1</property>
+        <property name="label" translatable="yes">Region:</property>
+      </object>
+      <packing>
+        <property name="top_attach">3</property>
+        <property name="bottom_attach">4</property>
+        <property name="x_options">GTK_FILL</property>
+        <property name="y_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label_provider">
+        <property name="visible">True</property>
+        <property name="sensitive">False</property>
+        <property name="xalign">1</property>
+        <property name="label" translatable="yes">Provider:</property>
+      </object>
+      <packing>
+        <property name="top_attach">4</property>
+        <property name="bottom_attach">5</property>
+        <property name="x_options">GTK_FILL</property>
+        <property name="y_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label_apn">
+        <property name="visible">True</property>
+        <property name="xalign">1</property>
+        <property name="label" translatable="yes">APN:</property>
+      </object>
+      <packing>
+        <property name="top_attach">5</property>
+        <property name="bottom_attach">6</property>
+        <property name="x_options">GTK_FILL</property>
+        <property name="y_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkHBox" id="hbox_entry_pin">
+        <property name="visible">True</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkEntry" id="entry_pin">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">•</property>
+            <property name="text" translatable="yes">0123456</property>
+          </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label_pin_auth">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Authorized</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="right_attach">2</property>
+        <property name="y_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkCheckButton" id="checkbutton_show_pin">
+        <property name="label" translatable="yes">Show PIN</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="draw_indicator">True</property>
+        <signal name="toggled" handler="_on_checkbutton_show_pin_toggled"/>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="right_attach">2</property>
+        <property name="top_attach">1</property>
+        <property name="bottom_attach">2</property>
+        <property name="y_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkHBox" id="hbox_radiobuttons">
+        <property name="visible">True</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkRadioButton" id="radiobutton_automatic">
+            <property name="label" translatable="yes">Automatic</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="active">True</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="radiobutton_manual">
+            <property name="label" translatable="yes">Manual</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="active">True</property>
+            <property name="draw_indicator">True</property>
+            <property name="group">radiobutton_automatic</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="right_attach">2</property>
+        <property name="top_attach">2</property>
+        <property name="bottom_attach">3</property>
+        <property name="y_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label_apn_place">
+        <property name="visible">True</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">INTERNET</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="right_attach">2</property>
+        <property name="top_attach">5</property>
+        <property name="bottom_attach">6</property>
+        <property name="x_options">GTK_FILL</property>
+        <property name="y_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkComboBox" id="combobox1">
+        <property name="visible">True</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="right_attach">2</property>
+        <property name="top_attach">3</property>
+        <property name="bottom_attach">4</property>
+        <property name="y_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkComboBox" id="combobox2">
+        <property name="visible">True</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="right_attach">2</property>
+        <property name="top_attach">4</property>
+        <property name="bottom_attach">5</property>
+        <property name="y_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
+</interface>

=== added file 'src/settings/ui/wireless_box.ui'
--- src/settings/ui/wireless_box.ui	1970-01-01 00:00:00 +0000
+++ src/settings/ui/wireless_box.ui	2010-12-13 14:13:17 +0000
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkVBox" id="vbox_connections">
+    <property name="visible">True</property>
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkScrolledWindow" id="scrolledwindow_connections">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="hscrollbar_policy">automatic</property>
+        <property name="vscrollbar_policy">automatic</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+      <packing>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkHBox" id="hbox1">
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox_left">
+            <property name="visible">True</property>
+            <property name="spacing">6</property>
+            <property name="layout_style">start</property>
+            <child>
+              <object class="GtkButton" id="button_connect">
+                <property name="label" translatable="yes">Connect</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <signal name="clicked" handler="_on_button_connect_clicked"/>
+              </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_other">
+                <property name="label" translatable="yes">Other...</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox_right">
+            <property name="visible">True</property>
+            <property name="spacing">6</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button_forget">
+                <property name="label" translatable="yes">Forget Details</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
+</interface>