Merge lp:~dobey/ubuntuone-client/accessible-prefs into lp:ubuntuone-client

[dobey]

Split the preferences dialog to a separate app
Add a launcher to System->Preferences for preferences app
Add man page for preferences app
Add DBus object class and methods to applet for getting preferences changes

[Rodrigo Moya (rodrigo-moya)]

Looks good to me

review: Approve

[Vincenzo Di Somma (vds)]

Looks good.

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2009-08-24 20:22:32 +0000
+++ Makefile.am	2009-09-28 14:55:20 +0000
@@ -19,6 +19,7 @@
 # Install our scripts and extra data here
 bin_SCRIPTS =				\
 	bin/ubuntuone-client-applet	\
+	bin/ubuntuone-client-preferences	\
 	bin/u1sdtool			\
 	bin/u1sync
 
@@ -26,6 +27,7 @@
 
 manfilesdir = $(mandir)/man1
 manfiles_DATA =					\
+	docs/man/ubuntuone-client-preferences.1	\
 	docs/man/ubuntuone-client-applet.1	\
 	docs/man/u1sdtool.1			\
 	docs/man/u1sync.1
 
=== modified file 'bin/ubuntuone-client-applet'
--- bin/ubuntuone-client-applet	2009-09-18 13:24:52 +0000
+++ bin/ubuntuone-client-applet	2009-09-28 14:55:20 +0000
@@ -53,6 +53,9 @@
 
 _ = gettext.gettext
 
+APPLET_BUS_NAME = "com.ubuntuone.ClientApplet"
+APPLET_CONFIG_NAME = APPLET_BUS_NAME + ".Config"
+
 DBUS_IFACE_NAME = "com.ubuntuone.SyncDaemon"
 DBUS_IFACE_SYNC_NAME = "com.ubuntuone.SyncDaemon.SyncDaemon"
 DBUS_IFACE_STATUS_NAME = "com.ubuntuone.SyncDaemon.Status"
@@ -383,6 +386,20 @@
 
 
 
+def do_config_open():
+      """Opens the preferences dialog."""
+      paths = os.environ["PATH"].split(":")
+      dirpath = os.path.join(os.getcwd(), "bin")
+      if os.path.isdir(dirpath):
+            paths.insert(0, dirpath)
+      os.environ["PATH"] = ":".join(paths)
+      try:
+            ret = subprocess.call(["ubuntuone-client-preferences"])
+      except OSError:
+            ret = -1
+      if ret != 0:
+            logger.error(_("Failed to open Ubuntu One preferences"))
+
 def do_xdg_open(path_or_url):
       """Utility method to run xdg-open with path_or_url."""
       ret = subprocess.call(["xdg-open", path_or_url])
@@ -449,11 +466,12 @@
             self.__total = 0
             self.__last_id = 0
 
-            # Config dialog!
-            self.__conf_dialog = AppletConfigDialog(self, self.__config)
-
             self.__bus = dbus.SessionBus()
 
+            # Our own DBus service, for the config to deal with
+            self.__service = AppletConfig(icon=self)
+
+            # DBus signal handling
             self.__bus.add_signal_receiver(
                   handler_function=self.__status_changed,
                   signal_name="StatusChanged",
@@ -474,9 +492,15 @@
 
             gobject.idle_add(self.__get_root)
 
-      def update_config(self):
-            """Update internal reference to the config when it changes."""
-            self.__show_when = self.__config.getint("ubuntuone", "show_applet")
+      def set_visibility_config(self, visibility):
+            """Update the visibility configuration."""
+            self.__show_when = int(visibility)
+            self.__config.set("ubuntuone", "show_applet", str(self.__show_when))
+            self.update_visibility()
+
+      def set_connection_config(self, connect):
+            """Update the connection config."""
+            self.__config.set("ubuntuone", "connect", str(connect))
 
       def __update_transfer_status(self, done=False):
             """Update the status display."""
@@ -852,9 +876,6 @@
 
       def __quit_applet(self, menuitem, data=None):
             """Quit the daemon and closes the applet."""
-            with open(CONF_FILE, "w+b") as f:
-                  self.__config.write(f)
-
             def quit_error(e):
                   """Just log and ignore."""
                   logger.error(_("Quit Error: %s") % e.get_dbus_message())
@@ -929,7 +950,7 @@
 
       def __open_config(self, data=None):
             """Opens the preferences dialog."""
-            self.__conf_dialog.show()
+            do_config_open()
 
       def __add_to_places(self):
             """Add the managed directory to the .gtk-bookmarks file."""
@@ -974,249 +995,40 @@
             self.__status_changed({'name' : 'UNKNOWN_ERROR'})
 
 
-class AppletConfigDialog(gtk.Dialog):
-      """Preferences dialog."""
-
-      def __init__(self, icon=None, config=None, *args, **kw):
-            """Initializes our custom StatusIcon based widget."""
-            super(AppletConfigDialog, self).__init__(*args, **kw)
-            self.set_title(_("Ubuntu One Preferences"))
-            self.set_has_separator(False)
-            self.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)
-            self.set_default_response(gtk.RESPONSE_CLOSE)
-            self.set_icon_name("ubuntuone-client")
-
-            self.connect("close", self.__handle_response, gtk.RESPONSE_CLOSE)
-            self.connect("response", self.__handle_response)
-
-            self.__icon = icon
-            self.config = config
-
-            self.bw_enabled = False
-            self.up_limit = 2097152
-            self.dn_limit = 2097152
-
-            self.__bus = dbus.SessionBus()
-
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/config")
-                  iface = dbus.Interface(client, DBUS_IFACE_CONFIG_NAME)
-                  iface.get_throttling_limits(
-                        reply_handler=self.__got_limits,
-                        error_handler=self.__throttle_error)
-                  iface.bandwidth_throttling_enabled(
-                        reply_handler=self.__got_enabled,
-                        error_handler=self.__throttle_error)
-            except DBusException, e:
-                  self.__throttle_error(e)
-
-            # Timeout ID to avoid spamming DBus from spinbutton changes
-            self.__update_id = 0
-
-            self.__construct()
-
-
-      def __throttle_error(self, error):
-            """Error getting throttling config."""
-            logger.error(_("Error getting throttle config: %s") %
-                         error.get_dbus_message())
-
-      def __got_limits(self, limits):
-            """Got the throttling limits."""
-            self.up_limit = int(limits['upload'])
-            self.dn_limit = int(limits['download'])
-
-      def __got_enabled(self, enabled):
-            """Got the throttling enabled config."""
-            self.bw_enabled = bool(enabled)
-
-      def __update_bw_settings(self):
-            """Update the bandwidth throttling config in syncdaemon."""
-            self.bw_enabled = self.limit_check.get_active()
-            self.up_limit = self.up_spin.get_value_as_int() * 1024
-            self.dn_limit = self.dn_spin.get_value_as_int() * 1024
-
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/config")
-                  iface = dbus.Interface(client, DBUS_IFACE_CONFIG_NAME)
-                  iface.set_throttling_limits(self.dn_limit, self.up_limit,
-                        reply_handler=dbus_async,
-                        error_handler=self.__throttle_error)
-                  if self.bw_enabled:
-                        iface.enable_bandwidth_throttling(
-                              reply_handler=dbus_async,
-                              error_handler=self.__throttle_error)
-                  else:
-                        iface.disable_bandwidth_throttling(
-                              reply_handler=dbus_async,
-                              error_handler=self.__throttle_error)
-            except DBusException, e:
-                  self.__throttle_error(e)
-
-      def __handle_response(self, dialog, response):
-            """Handle the dialog's response."""
-            self.hide()
-            self.config.set("ubuntuone", "show_applet",
-                            self.show_menu.get_active())
-            self.config.set("ubuntuone", "connect",
-                            self.conn_menu.get_active())
-
-            self.__update_bw_settings()
-
-            with open(CONF_FILE, "w+b") as f:
-                  self.config.write(f)
-
-      def __show_menu_changed(self, menu, data=None):
-            """Update the config for showing the applet."""
-            value = menu.get_active()
-            self.config.set("ubuntuone", "show_applet", str(value))
-            self.__icon.update_config()
-            self.__icon.update_visibility()
-
-      def __conn_menu_changed(self, menu, data=None):
-            """Update the config for showing the applet."""
-            self.config.set("ubuntuone", "connect", str(menu.get_active()))
-
-      def __bw_limit_toggled(self, button, data=None):
-            """Toggle the bw limit panel."""
-            self.bw_enabled = self.limit_check.get_active()
-            self.bw_table.set_sensitive(self.bw_enabled)
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/config")
-                  iface = dbus.Interface(client, DBUS_IFACE_CONFIG_NAME)
-                  iface.set_throttling_limits(self.dn_limit, self.up_limit,
-                        reply_handler=dbus_async,
-                        error_handler=self.__throttle_error)
-                  if self.bw_enabled:
-                        iface.enable_bandwidth_throttling(
-                              reply_handler=dbus_async,
-                              error_handler=self.__throttle_error)
-                  else:
-                        iface.disable_bandwidth_throttling(
-                              reply_handler=dbus_async,
-                              error_handler=self.__throttle_error)
-            except DBusException, e:
-                  self.__throttle_error(e)
-
-      def __spinner_changed(self, button, data=None):
-            """Remove timeout and add anew."""
-            if self.__update_id != 0:
-                  gobject.source_remove(self.__update_id)
-
-            self.__update_id = gobject.timeout_add_seconds(
-                  1, self.__update_bw_settings)
-
-      def __construct(self):
-            """Construct the dialog's layout."""
-            area = self.get_content_area()
-
-            vbox = gtk.VBox(spacing=12)
-            vbox.set_border_width(12)
-            area.add(vbox)
-            vbox.show()
-
-            # Put the first set of options in a table.
-            table = gtk.Table(rows=2, columns=2)
-            table.set_row_spacings(12)
-            table.set_col_spacings(6)
-            vbox.add(table)
-            table.show()
-
-            label = gtk.Label(_("_Show icon:"))
-            label.set_use_underline(True)
-            label.set_alignment(0, 0.5)
-            table.attach(label, 0, 1, 0, 1)
-            label.show()
-
-            self.show_menu = gtk.combo_box_new_text()
-            self.show_menu.connect("changed", self.__show_menu_changed)
-            label.set_mnemonic_widget(self.show_menu)
-            self.show_menu.append_text(_("Always"))
-            self.show_menu.append_text(_("When updating"))
-            self.show_menu.append_text(_("Never"))
-            self.show_menu.set_active(self.config.getint("ubuntuone",
-                                                         "show_applet"))
-            table.attach(self.show_menu, 1, 2, 0, 1)
-            self.show_menu.show()
-
-            label = gtk.Label(_("Connect on start:"))
-            label.set_use_underline(True)
-            label.set_alignment(0, 0.5)
-            table.attach(label, 0, 1, 1, 2)
-            label.show()
-
-            self.conn_menu = gtk.combo_box_new_text()
-            self.conn_menu.connect("changed", self.__conn_menu_changed)
-            label.set_mnemonic_widget(self.conn_menu)
-            self.conn_menu.append_text(_("Automatically"))
-            self.conn_menu.append_text(_("Remember last"))
-            self.conn_menu.append_text(_("Never"))
-            self.conn_menu.set_active(self.config.getint("ubuntuone",
-                                                         "connect"))
-            table.attach(self.conn_menu, 1, 2, 1, 2)
-            self.conn_menu.show()
-
-            # Bandwidth limiting
-            self.limit_check = gtk.CheckButton(_("_Limit Bandwidth Usage"))
-            self.limit_check.connect("toggled", self.__bw_limit_toggled)
-            vbox.add(self.limit_check)
-            self.limit_check.show()
-
-            hbox = gtk.HBox(spacing=12)
-            vbox.add(hbox)
-            hbox.show()
-
-            label = gtk.Label()
-            hbox.add(label)
-            label.show()
-
-            # Now put the bw limit bits in a table too
-            self.bw_table = gtk.Table(rows=2, columns=2)
-            self.bw_table.set_row_spacings(6)
-            self.bw_table.set_col_spacings(6)
-            self.bw_table.set_sensitive(False)
-            hbox.add(self.bw_table)
-            self.bw_table.show()
-
-            # Upload speed
-            label = gtk.Label(_("Maximum _upload speed (KB/s):"))
-            label.set_use_underline(True)
-            label.set_alignment(0, 0.5)
-            self.bw_table.attach(label, 0, 1, 0, 1)
-            label.show()
-
-            adjustment = gtk.Adjustment(value=2048.0, lower=0.0, upper=4096.0,
-                                        step_incr=64.0, page_incr=128.0)
-            self.up_spin = gtk.SpinButton(adjustment)
-            self.up_spin.connect("value-changed", self.__spinner_changed)
-            label.set_mnemonic_widget(self.up_spin)
-            self.bw_table.attach(self.up_spin, 1, 2, 0, 1)
-            self.up_spin.show()
-
-            # Download speed
-            label = gtk.Label(_("Maximum _download speed (KB/s):"))
-            label.set_use_underline(True)
-            label.set_alignment(0, 0.5)
-            self.bw_table.attach(label, 0, 1, 1, 2)
-            label.show()
-            adjustment = gtk.Adjustment(value=2048.0, lower=0.0, upper=4096.0,
-                                        step_incr=64.0, page_incr=128.0)
-            self.dn_spin = gtk.SpinButton(adjustment)
-            self.dn_spin.connect("value-changed", self.__spinner_changed)
-            label.set_mnemonic_widget(self.dn_spin)
-            self.bw_table.attach(self.dn_spin, 1, 2, 1, 2)
-            self.dn_spin.show()
-
-            
+class AppletConfig(dbus.service.Object):
+      """DBus Service object"""
+
+      def __init__(self, icon, *args, **kwargs):
+            """Initialize our magic."""
+            self.icon = icon
+            self.path = "/config"
+            self.bus = dbus.SessionBus()
+            bus_name = dbus.service.BusName(APPLET_BUS_NAME,
+                                            bus=self.bus)
+            dbus.service.Object.__init__(self, bus_name=bus_name,
+                                         object_path=self.path)
+
+      @dbus.service.method(APPLET_CONFIG_NAME,
+                           in_signature='i', out_signature='')
+      def set_visibility_config(self, visibility):
+            self.icon.set_visibility_config(visibility)
+
+      @dbus.service.method(APPLET_CONFIG_NAME,
+                           in_signature='i', out_signature='')
+      def set_connection_config(self, connect):
+            self.icon.set_connection_config(connect)
+
+
 if __name__ == "__main__":
       gettext.bindtextdomain(clientdefs.GETTEXT_PACKAGE, clientdefs.LOCALEDIR)
       gettext.textdomain(clientdefs.GETTEXT_PACKAGE)
 
       # Register DBus service for making sure we run only one instance
       bus = dbus.SessionBus()
-      if bus.request_name("com.ubuntuone.ClientApplet", dbus.bus.NAME_FLAG_DO_NOT_QUEUE) == dbus.bus.REQUEST_NAME_REPLY_EXISTS:
+      if bus.request_name(APPLET_BUS_NAME, dbus.bus.NAME_FLAG_DO_NOT_QUEUE) == dbus.bus.REQUEST_NAME_REPLY_EXISTS:
             print _("Ubuntu One client applet already running, quitting")
-            sys.exit(-1)
+            do_config_open()
+            sys.exit(0)
 
       gtk.rc_parse_string(RCSTYLE)
 
 
=== added file 'bin/ubuntuone-client-preferences'
--- bin/ubuntuone-client-preferences	1970-01-01 00:00:00 +0000
+++ bin/ubuntuone-client-preferences	2009-09-28 14:55:20 +0000
@@ -0,0 +1,349 @@
+#!/usr/bin/python
+
+# ubuntuone-client-applet - Tray icon applet for managing Ubuntu One
+#
+# Author: Rodney Dawes <[e-mail]>
+#
+# Copyright 2009 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+from __future__ import with_statement
+
+import pygtk
+pygtk.require('2.0')
+import gobject
+import gtk
+import os
+import gettext
+from ubuntuone import clientdefs
+
+import dbus.service
+from ConfigParser import ConfigParser
+from dbus.exceptions import DBusException
+from dbus.mainloop.glib import DBusGMainLoop
+from xdg.BaseDirectory import xdg_config_home
+
+DBusGMainLoop(set_as_default=True)
+
+_ = gettext.gettext
+
+APPLET_IFACE_NAME = "com.ubuntuone.ClientApplet"
+APPLET_IFACE_CONFIG_NAME = APPLET_IFACE_NAME + ".Config"
+
+DBUS_IFACE_NAME = "com.ubuntuone.SyncDaemon"
+DBUS_IFACE_CONFIG_NAME = DBUS_IFACE_NAME + ".Config"
+
+# Why thank you GTK+ for enforcing style-set and breaking API
+RCSTYLE = """
+style 'dialogs' {
+  GtkDialog::action-area-border = 12
+  GtkDialog::button-spacing = 6
+  GtkDialog::content-area-border = 0
+}
+widget_class '*Dialog*' style 'dialogs'
+"""
+
+CONF_FILE = os.path.join(xdg_config_home, "ubuntuone", "ubuntuone-client.conf")
+
+def dbus_async(*args):
+      """Simple handler to make dbus do stuff async."""
+      pass
+
+
+class AppletConfigDialog(gtk.Dialog):
+      """Preferences dialog."""
+
+      def __init__(self, config=None, *args, **kw):
+            """Initializes our config dialog."""
+            super(AppletConfigDialog, self).__init__(*args, **kw)
+            self.set_title(_("Ubuntu One Preferences"))
+            self.set_has_separator(False)
+            self.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)
+            self.set_default_response(gtk.RESPONSE_CLOSE)
+            self.set_icon_name("ubuntuone-client")
+
+            self.connect("close", self.__handle_response, gtk.RESPONSE_CLOSE)
+            self.connect("response", self.__handle_response)
+
+            self.config = config
+
+            self.bw_enabled = False
+            self.up_limit = 2097152
+            self.dn_limit = 2097152
+
+            self.__bus = dbus.SessionBus()
+
+            try:
+                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/config")
+                  iface = dbus.Interface(client, DBUS_IFACE_CONFIG_NAME)
+                  iface.get_throttling_limits(
+                        reply_handler=self.__got_limits,
+                        error_handler=self.__dbus_error)
+                  iface.bandwidth_throttling_enabled(
+                        reply_handler=self.__got_enabled,
+                        error_handler=self.__dbus_error)
+            except DBusException, e:
+                  self.__dbus_error(e)
+
+            # Timeout ID to avoid spamming DBus from spinbutton changes
+            self.__update_id = 0
+
+            self.load_config()
+
+            self.__construct()
+
+      def load_config(self):
+            """Load the configuration, and initilize if empty."""
+            self.config = ConfigParser()
+            self.config.read(CONF_FILE)
+
+            if not self.config.has_section("ubuntuone"):
+                  self.config.add_section("ubuntuone")
+
+            if not self.config.has_option("ubuntuone", "show_applet"):
+                  self.config.set("ubuntuone", "show_applet", "1")
+
+            if not self.config.has_option("ubuntuone", "connect"):
+                  self.config.set("ubuntuone", "connect", "0")
+
+            if not self.config.has_option("ubuntuone", "connected"):
+                  self.config.set("ubuntuone", "connected", "False")
+
+            if not os.path.exists(CONF_FILE):
+                  self.save_config()
+
+      def save_config(self):
+            """Write the configuration back to a file."""
+            with open(CONF_FILE, "w+b") as f:
+                  self.config.write(f)
+
+      def quit(self):
+            """Exit the main loop."""
+            gtk.main_quit()
+
+      def __dbus_error(self, error):
+            """Error getting throttling config."""
+            print repr(error)
+
+      def __got_limits(self, limits):
+            """Got the throttling limits."""
+            self.up_limit = int(limits['upload'])
+            self.dn_limit = int(limits['download'])
+
+      def __got_enabled(self, enabled):
+            """Got the throttling enabled config."""
+            self.bw_enabled = bool(enabled)
+
+      def __update_bw_settings(self):
+            """Update the bandwidth throttling config in syncdaemon."""
+            self.bw_enabled = self.limit_check.get_active()
+            self.up_limit = self.up_spin.get_value_as_int() * 1024
+            self.dn_limit = self.dn_spin.get_value_as_int() * 1024
+
+            try:
+                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/config")
+                  iface = dbus.Interface(client, DBUS_IFACE_CONFIG_NAME)
+                  iface.set_throttling_limits(self.dn_limit, self.up_limit,
+                        reply_handler=dbus_async,
+                        error_handler=self.__dbus_error)
+                  if self.bw_enabled:
+                        iface.enable_bandwidth_throttling(
+                              reply_handler=dbus_async,
+                              error_handler=self.__dbus_error)
+                  else:
+                        iface.disable_bandwidth_throttling(
+                              reply_handler=dbus_async,
+                              error_handler=self.__dbus_error)
+            except DBusException, e:
+                  self.__dbus_error(e)
+
+      def __handle_response(self, dialog, response):
+            """Handle the dialog's response."""
+            self.hide()
+            self.config.set("ubuntuone", "show_applet",
+                            self.show_menu.get_active())
+            self.config.set("ubuntuone", "connect",
+                            self.conn_menu.get_active())
+
+            self.__update_bw_settings()
+            self.save_config()
+            gtk.main_quit()
+
+      def __show_menu_changed(self, menu, data=None):
+            """Update the config for showing the applet."""
+            value = menu.get_active()
+            self.config.set("ubuntuone", "show_applet", str(value))
+            try:
+                  client = self.__bus.get_object(APPLET_IFACE_NAME, "/config")
+                  iface = dbus.Interface(client, APPLET_IFACE_CONFIG_NAME)
+                  iface.set_visibility_config(value, reply_handler=dbus_async,
+                                              error_handler=self.__dbus_error)
+            except DBusException, e:
+                  self.__dbus_error(e)
+
+      def __conn_menu_changed(self, menu, data=None):
+            """Update the config for showing the applet."""
+            value = menu.get_active()
+            self.config.set("ubuntuone", "connect", str(value))
+            try:
+                  client = self.__bus.get_object(APPLET_IFACE_NAME, "/config")
+                  iface = dbus.Interface(client, APPLET_IFACE_CONFIG_NAME)
+                  iface.set_connection_config(value, reply_handler=dbus_async,
+                                              error_handler=self.__dbus_error)
+            except DBusException, e:
+                  self.__dbus_error(e)
+
+      def __bw_limit_toggled(self, button, data=None):
+            """Toggle the bw limit panel."""
+            self.bw_enabled = self.limit_check.get_active()
+            self.bw_table.set_sensitive(self.bw_enabled)
+            try:
+                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/config")
+                  iface = dbus.Interface(client, DBUS_IFACE_CONFIG_NAME)
+                  iface.set_throttling_limits(self.dn_limit, self.up_limit,
+                        reply_handler=dbus_async,
+                        error_handler=self.__dbus_error)
+                  if self.bw_enabled:
+                        iface.enable_bandwidth_throttling(
+                              reply_handler=dbus_async,
+                              error_handler=self.__dbus_error)
+                  else:
+                        iface.disable_bandwidth_throttling(
+                              reply_handler=dbus_async,
+                              error_handler=self.__dbus_error)
+            except DBusException, e:
+                  self.__dbus_error(e)
+
+      def __spinner_changed(self, button, data=None):
+            """Remove timeout and add anew."""
+            if self.__update_id != 0:
+                  gobject.source_remove(self.__update_id)
+
+            self.__update_id = gobject.timeout_add_seconds(
+                  1, self.__update_bw_settings)
+
+      def __construct(self):
+            """Construct the dialog's layout."""
+            area = self.get_content_area()
+
+            vbox = gtk.VBox(spacing=12)
+            vbox.set_border_width(12)
+            area.add(vbox)
+            vbox.show()
+
+            # Put the first set of options in a table.
+            table = gtk.Table(rows=2, columns=2)
+            table.set_row_spacings(12)
+            table.set_col_spacings(6)
+            vbox.add(table)
+            table.show()
+
+            label = gtk.Label(_("_Show icon:"))
+            label.set_use_underline(True)
+            label.set_alignment(0, 0.5)
+            table.attach(label, 0, 1, 0, 1)
+            label.show()
+
+            self.show_menu = gtk.combo_box_new_text()
+            self.show_menu.connect("changed", self.__show_menu_changed)
+            label.set_mnemonic_widget(self.show_menu)
+            self.show_menu.append_text(_("Always"))
+            self.show_menu.append_text(_("When updating"))
+            self.show_menu.append_text(_("Never"))
+            self.show_menu.set_active(self.config.getint("ubuntuone",
+                                                         "show_applet"))
+            table.attach(self.show_menu, 1, 2, 0, 1)
+            self.show_menu.show()
+
+            label = gtk.Label(_("Connect on start:"))
+            label.set_use_underline(True)
+            label.set_alignment(0, 0.5)
+            table.attach(label, 0, 1, 1, 2)
+            label.show()
+
+            self.conn_menu = gtk.combo_box_new_text()
+            self.conn_menu.connect("changed", self.__conn_menu_changed)
+            label.set_mnemonic_widget(self.conn_menu)
+            self.conn_menu.append_text(_("Automatically"))
+            self.conn_menu.append_text(_("Remember last"))
+            self.conn_menu.append_text(_("Never"))
+            self.conn_menu.set_active(self.config.getint("ubuntuone",
+                                                         "connect"))
+            table.attach(self.conn_menu, 1, 2, 1, 2)
+            self.conn_menu.show()
+
+            # Bandwidth limiting
+            self.limit_check = gtk.CheckButton(_("_Limit Bandwidth Usage"))
+            self.limit_check.connect("toggled", self.__bw_limit_toggled)
+            vbox.add(self.limit_check)
+            self.limit_check.show()
+
+            hbox = gtk.HBox(spacing=12)
+            vbox.add(hbox)
+            hbox.show()
+
+            label = gtk.Label()
+            hbox.add(label)
+            label.show()
+
+            # Now put the bw limit bits in a table too
+            self.bw_table = gtk.Table(rows=2, columns=2)
+            self.bw_table.set_row_spacings(6)
+            self.bw_table.set_col_spacings(6)
+            self.bw_table.set_sensitive(False)
+            hbox.add(self.bw_table)
+            self.bw_table.show()
+
+            # Upload speed
+            label = gtk.Label(_("Maximum _upload speed (KB/s):"))
+            label.set_use_underline(True)
+            label.set_alignment(0, 0.5)
+            self.bw_table.attach(label, 0, 1, 0, 1)
+            label.show()
+
+            adjustment = gtk.Adjustment(value=2048.0, lower=0.0, upper=4096.0,
+                                        step_incr=64.0, page_incr=128.0)
+            self.up_spin = gtk.SpinButton(adjustment)
+            self.up_spin.connect("value-changed", self.__spinner_changed)
+            label.set_mnemonic_widget(self.up_spin)
+            self.bw_table.attach(self.up_spin, 1, 2, 0, 1)
+            self.up_spin.show()
+
+            # Download speed
+            label = gtk.Label(_("Maximum _download speed (KB/s):"))
+            label.set_use_underline(True)
+            label.set_alignment(0, 0.5)
+            self.bw_table.attach(label, 0, 1, 1, 2)
+            label.show()
+            adjustment = gtk.Adjustment(value=2048.0, lower=0.0, upper=4096.0,
+                                        step_incr=64.0, page_incr=128.0)
+            self.dn_spin = gtk.SpinButton(adjustment)
+            self.dn_spin.connect("value-changed", self.__spinner_changed)
+            label.set_mnemonic_widget(self.dn_spin)
+            self.bw_table.attach(self.dn_spin, 1, 2, 1, 2)
+            self.dn_spin.show()
+
+
+if __name__ == "__main__":
+      gettext.bindtextdomain(clientdefs.GETTEXT_PACKAGE, clientdefs.LOCALEDIR)
+      gettext.textdomain(clientdefs.GETTEXT_PACKAGE)
+
+      gtk.rc_parse_string(RCSTYLE)
+
+      try:
+            dialog = AppletConfigDialog()
+            dialog.show()
+            gtk.main()
+      except KeyboardInterrupt:
+            pass
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2009-08-12 19:28:32 +0000
+++ data/Makefile.am	2009-09-28 14:55:20 +0000
@@ -12,7 +12,8 @@
 oauth_DATA = oauth_registration.d/ubuntuone
 
 desktopdir = $(datadir)/applications
-desktop_in_files = ubuntuone-client-applet.desktop.in
+desktop_in_files = ubuntuone-client-applet.desktop.in	\
+	ubuntuone-client-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
=== added file 'data/ubuntuone-client-preferences.desktop.in'
--- data/ubuntuone-client-preferences.desktop.in	1970-01-01 00:00:00 +0000
+++ data/ubuntuone-client-preferences.desktop.in	2009-09-28 14:55:20 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Ubuntu One
+_Comment=Configure the Ubuntu One file sharing client
+Exec=ubuntuone-client-preferences
+Icon=ubuntuone-client
+Terminal=false
+Type=Application
+Categories=GTK;Settings;
+X-Ubuntu-Gettext-Domain=ubuntuone-client
 
=== added file 'docs/man/ubuntuone-client-preferences.1'
--- docs/man/ubuntuone-client-preferences.1	1970-01-01 00:00:00 +0000
+++ docs/man/ubuntuone-client-preferences.1	2009-09-28 14:55:20 +0000
@@ -0,0 +1,16 @@
+.TH UBUNTUONE-CLIENT-PREFERENCES 1
+
+.SH NAME
+ubuntuone-client-preferences \- A dialog for configuring Ubuntu One 
+
+.SH SYNOPSYS
+.B ubutuone-client-preferences
+
+.SH DESCRIPTION
+This manual page briefly documents the
+.BR ubuntuone-client-preferences
+process, which provides a configuration dialog for configuring
+Ubuntu One file sharing.
+
+.SH AUTHOR
+This manual page was written by Rodney Dawes <[e-mail]>
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2009-06-17 16:08:17 +0000
+++ po/POTFILES.in	2009-09-28 14:55:20 +0000
@@ -1,7 +1,9 @@
 bin/ubuntuone-client-applet
+bin/ubuntuone-client-preferences
 data/emblem-ubuntuone-downloading.icon.in
 data/emblem-ubuntuone-unsynchronized.icon.in
 data/emblem-ubuntuone-uploading.icon.in
 data/ubuntuone-client-applet.desktop.in
+data/ubuntuone-client-preferences.desktop.in
 nautilus/ubuntuone-nautilus.c