[Commits] (morgen) Now the "Test | Subscribe to Collection" dialog is hooked up to Stuart's

[commits at osafoundation.org]

Commit by: morgen
Modified files:
chandler/application/dialogs/Util.py 1.1 1.2
chandler/parcels/osaf/views/main/Main.py 1.35 1.36

Log message:
Now the "Test | Subscribe to Collection" dialog is hooked up to Stuart's 
webdav code.


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/application/dialogs/Util.py.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/Main.py.diff?r1=text&tr1=1.35&r2=text&tr2=1.36

Index: chandler/application/dialogs/Util.py
diff -u chandler/application/dialogs/Util.py:1.1 chandler/application/dialogs/Util.py:1.2
--- chandler/application/dialogs/Util.py:1.1	Thu Aug 19 11:26:12 2004
+++ chandler/application/dialogs/Util.py	Thu Aug 19 14:16:35 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.1 $"
-__date__ = "$Date: 2004/08/19 18:26:12 $"
+__version__ = "$Revision: 1.2 $"
+__date__ = "$Date: 2004/08/19 21:16:35 $"
 __copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -67,11 +67,12 @@
 
             if valueDict.get("password", False):
                 text = wx.TextCtrl(self, -1,
-                 item.getAttributeValue(valueDict["attr"]), size=(200,-1),
-                 style=wx.TE_PASSWORD)
+                 item.getAttributeValue(valueDict["attr"]),
+                 wxDefaultPosition, [400,-1], wx.TE_PASSWORD)
             else:
                 text = wx.TextCtrl(self, -1,
-                 item.getAttributeValue(valueDict["attr"]), size=(200,-1))
+                 item.getAttributeValue(valueDict["attr"]),
+                 wxDefaultPosition, [400,-1])
             box.Add(text, 1, wx.ALIGN_CENTRE|wx.ALL, 5)
 
             sizer.AddSizer(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
@@ -163,10 +164,10 @@
         box = wx.BoxSizer(wx.HORIZONTAL)
 
         if isPassword:
-            text = wx.TextCtrl(self, -1, value, size=(200,-1),
-             style=wx.TE_PASSWORD)
+            text = wx.TextCtrl(self, -1, value, wx.DefaultPosition, [400,-1],
+             wx.TE_PASSWORD)
         else:
-            text = wx.TextCtrl(self, -1, value, size=(200,-1))
+            text = wx.TextCtrl(self, -1, value, wx.DefaultPosition, [400,-1])
 
         box.Add(text, 1, wx.ALIGN_CENTRE|wx.ALL, 5)
 

Index: chandler/parcels/osaf/views/main/Main.py
diff -u chandler/parcels/osaf/views/main/Main.py:1.35 chandler/parcels/osaf/views/main/Main.py:1.36
--- chandler/parcels/osaf/views/main/Main.py:1.35	Thu Aug 19 11:27:55 2004
+++ chandler/parcels/osaf/views/main/Main.py	Thu Aug 19 14:16:35 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.35 $"
-__date__ = "$Date: 2004/08/19 18:27:55 $"
+__version__ = "$Revision: 1.36 $"
+__date__ = "$Date: 2004/08/19 21:16:35 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -18,6 +18,7 @@
 import osaf.contentmodel.tests.GenerateItems as GenerateItems
 from repository.persistence.RepositoryError import VersionConflictError
 import repository.util.UUID as UUID
+import osaf.framework.webdav.Dav
 
 class MainView(View):
     """
@@ -58,7 +59,8 @@
          Globals.wxApplication.mainFrame, "Subscribe to Collection...",
          "Collection URL:", "http://webdav.osafoundation.org/")
         if url is not None:
-            print "I would be subscribing to %s here" % url
+            item = osaf.framework.webdav.Dav.DAV(url).get( )
+            Globals.repository.commit()
 
     def onEditAccountPreferencesEvent (self, notification):
         # Triggered from "File | Prefs | Accounts..."