conduit r1895 - in trunk: . conduit/modules/BoxDotNetModule po

[jstowers svn gnome org]

Author: jstowers
Date: Sun Feb 22 10:22:07 2009
New Revision: 1895
URL: http://svn.gnome.org/viewvc/conduit?rev=1895&view=rev

Log:
2009-02-22  John Stowers  <john stowers gmail com>

	* conduit/modules/BoxDotNetModule/BoxDotNetModule.py:
	* conduit/modules/BoxDotNetModule/Makefile.am:
	* conduit/modules/BoxDotNetModule/config.glade:
	* po/POTFILES.in: Port to new config system



Removed:
   trunk/conduit/modules/BoxDotNetModule/config.glade
Modified:
   trunk/ChangeLog
   trunk/conduit/modules/BoxDotNetModule/BoxDotNetModule.py
   trunk/conduit/modules/BoxDotNetModule/Makefile.am
   trunk/po/POTFILES.in

Modified: trunk/conduit/modules/BoxDotNetModule/BoxDotNetModule.py
==============================================================================
--- trunk/conduit/modules/BoxDotNetModule/BoxDotNetModule.py	(original)
+++ trunk/conduit/modules/BoxDotNetModule/BoxDotNetModule.py	Sun Feb 22 10:22:07 2009
@@ -40,10 +40,12 @@
     def __init__(self, *args):
         DataProvider.TwoWay.__init__(self)
 
+        self.update_configuration(
+            foldername = "",
+        )
         self.boxapi = None
         self.user_id = None
         self.token = None
-        self.foldername = ""
         self.folder_id = None
 
         self.files = {}
@@ -273,77 +275,30 @@
                             target='file',
                             target_id=LUID)
 
-    def configure(self, window):
-        """
-        Configures the BoxDotNet sink
-        """
-        import gtk
-        import gobject
-        def on_login_finish(*args):
-            if self.token:
-                build_folder_store()
-            Utils.dialog_reset_cursor(dlg)
-            
-        def on_response(sender, responseID):
-            if responseID == gtk.RESPONSE_OK:
-                self.foldername = foldernamecombo.child.get_text()
-                
-        def load_button_clicked(button):
-            Utils.dialog_set_busy_cursor(dlg)
+    def config_setup(self, config):
+
+        def _login_finished(*args):
+            folders = self._get_folders()
+            folders_config.set_choices([(f,f) for f in folders])
+
+        def _load_button_clicked(button):
             conduit.GLOBALS.syncManager.run_blocking_dataprovider_function_calls(
                                             self,
-                                            on_login_finish,
+                                            _login_finished,
                                             self._login)
 
-        def build_folder_store():
-            folder_store.clear()
-            folder_count = 0
-            folder_iter = None
-            for folder_name in self._get_folders().keys():
-                iter = folder_store.append((folder_name,))
-                if folder_name != "" and folder_name == self.foldername:
-                    folder_iter = iter
-                folder_count += 1
-
-            if folder_iter:
-                foldernamecombo.set_active_iter(folder_iter)
-            elif self.foldername:
-                foldernamecombo.child.set_text(self.foldername)
-            elif folder_count:
-                foldernamecombo.set_active(0)
-
-        tree = Utils.dataprovider_glade_get_widget(
-                        __file__,
-                        "config.glade",
-                        "BoxDotNetConfigDialog")
-
-        #get a whole bunch of widgets
-        foldernamecombo = tree.get_widget("foldernamecombo")
-        load_button = tree.get_widget("load_button")
-        dlg = tree.get_widget("BoxDotNetConfigDialog")
-
-        # setup combobox
-        folder_store = gtk.ListStore(gobject.TYPE_STRING)
-        foldernamecombo.set_model(folder_store)
-        cell = gtk.CellRendererText()
-        foldernamecombo.pack_start(cell, True)
-        foldernamecombo.set_text_column(0)
-
-        # load button
-        load_button.connect('clicked', load_button_clicked)
-        foldernamecombo.child.set_text(self.foldername)
-
-        # run the dialog
-        Utils.run_dialog_non_blocking(dlg, on_response, window)
+        config.add_section("Folder")
+        folders_config = config.add_item("Folder name", "combotext",
+            config_name = "foldername",
+            choices = [],
+        )
+        config.add_item("Load folders", "button",
+            initial_value = _load_button_clicked
+        )
 
     def is_configured (self, isSource, isTwoWay):
         return len(self.foldername) > 0
 
-    def get_configuration(self):
-        return {
-            "foldername" : self.foldername
-            }
-
     def get_UID(self):
         return "%s-%s" % (self.user_id, self.foldername)
 

Modified: trunk/conduit/modules/BoxDotNetModule/Makefile.am
==============================================================================
--- trunk/conduit/modules/BoxDotNetModule/Makefile.am	(original)
+++ trunk/conduit/modules/BoxDotNetModule/Makefile.am	Sun Feb 22 10:22:07 2009
@@ -3,8 +3,5 @@
 conduit_handlersdir = $(libdir)/conduit/modules/BoxDotNetModule
 conduit_handlers_PYTHON = BoxDotNetModule.py
 
-conduit_handlers_DATA = config.glade
-EXTRA_DIST = config.glade
-
 clean-local:
 	rm -rf *.pyc *.pyo

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Sun Feb 22 10:22:07 2009
@@ -16,7 +16,6 @@
 conduit/modules/BansheeModule/BansheeModule.py
 conduit/modules/BansheeModule/config.glade
 conduit/modules/BoxDotNetModule/BoxDotNetModule.py
-conduit/modules/BoxDotNetModule/config.glade
 conduit/modules/EvolutionModule/EvolutionModule.py
 conduit/modules/EvolutionModule/config.glade
 conduit/modules/FacebookModule/FacebookModule.py