Mercurial Repositories > eric / file diff

--- a/UI/UserInterface.py	Sun Mar 28 09:27:19 2010 +0000
+++ b/UI/UserInterface.py	Tue Mar 30 13:49:13 2010 +0000
@@ -471,6 +471,22 @@
                      self.__checkActions)
         self.connect(self.viewmanager, SIGNAL('editorChanged'),
                      self.projectBrowser.handleEditorChanged)
+        self.connect(self.viewmanager, SIGNAL('checkActions'),
+                     self.cooperation.checkEditorActions)
+        
+        self.connect(self.cooperation, SIGNAL('shareEditor(bool)'),
+                     self.viewmanager.shareEditor)
+        self.connect(self.cooperation, SIGNAL('startEdit()'),
+                     self.viewmanager.startSharedEdit)
+        self.connect(self.cooperation, SIGNAL('sendEdit()'),
+                     self.viewmanager.sendSharedEdit)
+        self.connect(self.cooperation, SIGNAL('cancelEdit()'),
+                     self.viewmanager.cancelSharedEdit)
+        self.connect(self.cooperation, SIGNAL('connected(bool)'),
+                     self.viewmanager.shareConnected)
+        self.connect(self.cooperation, SIGNAL('editorCommand(QString, QString, QString)'),
+                     self.viewmanager.receive)
+        self.viewmanager.setCooperationClient(self.cooperation.getClient())
         
         # Generate the unittest dialog
         self.unittestDialog = UnittestDialog(None, self.debuggerUI.debugServer, self)
@@ -530,7 +546,7 @@
         e5App().registerObject("DummyHelpViewer", self.dummyHelpViewer)
         e5App().registerObject("PluginManager", self.pluginManager)
         e5App().registerObject("ToolbarManager", self.toolbarManager)
-        e5App().registerObject("Terminal", self.terminal)
+        e5App().registerObject("Terminal", self.terminal)
         e5App().registerObject("Cooperation", self.cooperation)
         
         # Initialize the actions, menus, toolbars and statusbar