[Commits] (morgen) Call the new dialog when using Test > Share > Share Collection

[commits at osafoundation.org]

Commit by: morgen
Modified files:
chandler/parcels/osaf/views/main/Main.py 1.158 1.159

Log message:
Call the new dialog when using Test > Share > Share Collection


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/Main.py.diff?r1=text&tr1=1.158&r2=text&tr2=1.159

Index: chandler/parcels/osaf/views/main/Main.py
diff -u chandler/parcels/osaf/views/main/Main.py:1.158 chandler/parcels/osaf/views/main/Main.py:1.159
--- chandler/parcels/osaf/views/main/Main.py:1.158	Fri Apr  8 19:05:52 2005
+++ chandler/parcels/osaf/views/main/Main.py	Thu Apr 14 23:45:54 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.158 $"
-__date__ = "$Date: 2005/04/09 02:05:52 $"
+__version__ = "$Revision: 1.159 $"
+__date__ = "$Date: 2005/04/15 06:45:54 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -30,6 +30,7 @@
 from osaf.framework.blocks.Block import Block
 from osaf.contentmodel.ItemCollection import ItemCollection
 import osaf.framework.sharing.ICalendar as ICalendar
+import osaf.framework.sharing.PublishCollection
 
 class MainView(View):
     """
@@ -470,9 +471,18 @@
 
     def onShareCollectionEvent (self, event):
         # Triggered from "Test | Share collection..."
+
+        # @@@MOR: This new dialog is a work in progress...
         collection = self.getSidebarSelectedCollection ()
         if collection is not None:
-            Sharing.manualPublishCollection(self.itsView, collection)
+            reload(osaf.framework.sharing.PublishCollection)
+            collection = self.getSidebarSelectedCollection()
+            osaf.framework.sharing.PublishCollection.ShowPublishDialog( \
+                wx.GetApp().mainFrame,
+                view=self.itsView,
+                collection=collection)
+            
+        # Sharing.manualPublishCollection(self.itsView, collection)
 
     def onShareCollectionEventUpdateUI (self, event):
         """
@@ -507,6 +517,7 @@
         changed to the entire summary view's collection.
         The "Collection | Share collection " menu item
         """
+    
         # Make sure we have all the accounts; returns False if the user cancels out and we don't.
         if not Sharing.ensureAccountSetUp(self.itsView):
             return
@@ -550,6 +561,7 @@
         reload(osaf.framework.sharing.ShareTool)
         osaf.framework.sharing.ShareTool.ShowShareToolDialog(wx.GetApp().mainFrame, view=self.itsView)
 
+ 
     def onSyncCollectionEvent (self, event):
         # Triggered from "Test | Sync collection..."
         self.itsView.commit()