Mercurial Repositories > eric / changeset

--- a/PluginManager/PluginManager.py	Wed Aug 11 19:55:34 2010 +0200
+++ b/PluginManager/PluginManager.py	Wed Aug 11 20:16:03 2010 +0200
@@ -40,11 +40,11 @@
         was deactivated
     """
     shutdown = pyqtSignal()
-    pluginAboutToBeActivated = pyqtSignal(str, QObject)
-    pluginActivated = pyqtSignal(str, QObject)
+    pluginAboutToBeActivated = pyqtSignal(str, object)
+    pluginActivated = pyqtSignal(str, object)
     allPlugginsActivated = pyqtSignal()
-    pluginAboutToBeDeactivated = pyqtSignal(str, QObject)
-    pluginDeactivated = pyqtSignal(str, QObject)
+    pluginAboutToBeDeactivated = pyqtSignal(str, object)
+    pluginDeactivated = pyqtSignal(str, object)
     
     def __init__(self, parent = None, doLoadPlugins = True, develPlugin = None):
         """
@@ -708,7 +708,7 @@
         
         return details
     
-    def shutdown(self):
+    def doShutdown(self):
         """
         Public method called to perform actions upon shutdown of the IDE.
         """

--- a/Plugins/PluginVcsMercurial.py	Wed Aug 11 19:55:34 2010 +0200
+++ b/Plugins/PluginVcsMercurial.py	Wed Aug 11 20:16:03 2010 +0200
@@ -9,6 +9,7 @@
 
 import os
 
+from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QApplication
 
 from E5Gui.E5Application import e5App
@@ -129,7 +130,7 @@
     if not e5App().getObject("PluginManager").isPluginLoaded("PluginVcsMercurial"):
         Preferences.Prefs.settings.remove("Mercurial")
     
-class VcsMercurialPlugin(object):
+class VcsMercurialPlugin(QObject):
     """
     Class implementing the Mercurial version control plugin.
     """
@@ -225,4 +226,4 @@
         """
         Public method to prepare for an uninstallation.
         """
-        e5App().unregisterPluginObject(pluginTypename)
\ No newline at end of file
+        e5App().unregisterPluginObject(pluginTypename)

--- a/Plugins/PluginVcsPySvn.py	Wed Aug 11 19:55:34 2010 +0200
+++ b/Plugins/PluginVcsPySvn.py	Wed Aug 11 20:16:03 2010 +0200
@@ -9,6 +9,7 @@
 
 import os
 
+from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QApplication
 
 from E5Gui.E5Application import e5App
@@ -127,7 +128,7 @@
     if not e5App().getObject("PluginManager").isPluginLoaded("PluginVcsSubversion"):
         Preferences.Prefs.settings.remove("Subversion")
     
-class VcsPySvnPlugin(object):
+class VcsPySvnPlugin(QObject):
     """
     Class implementing the PySvn version control plugin.
     """
@@ -229,4 +230,4 @@
         """
         Public method to prepare for an uninstallation.
         """
-        e5App().unregisterPluginObject(pluginTypename)
\ No newline at end of file
+        e5App().unregisterPluginObject(pluginTypename)

--- a/Plugins/PluginVcsSubversion.py	Wed Aug 11 19:55:34 2010 +0200
+++ b/Plugins/PluginVcsSubversion.py	Wed Aug 11 20:16:03 2010 +0200
@@ -9,6 +9,7 @@
 
 import os
 
+from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QApplication
 
 from E5Gui.E5Application import e5App
@@ -129,7 +130,7 @@
     if not e5App().getObject("PluginManager").isPluginLoaded("PluginVcsSubversion"):
         Preferences.Prefs.settings.remove("Subversion")
     
-class VcsSubversionPlugin(object):
+class VcsSubversionPlugin(QObject):
     """
     Class implementing the Subversion version control plugin.
     """
@@ -229,4 +230,4 @@
         """
         Public method to prepare for an uninstallation.
         """
-        e5App().unregisterPluginObject(pluginTypename)
\ No newline at end of file
+        e5App().unregisterPluginObject(pluginTypename)

--- a/Plugins/PluginVmListspace.py	Wed Aug 11 19:55:34 2010 +0200
+++ b/Plugins/PluginVmListspace.py	Wed Aug 11 20:16:03 2010 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import QT_TRANSLATE_NOOP
+from PyQt4.QtCore import QT_TRANSLATE_NOOP, QObject
 from PyQt4.QtGui import QPixmap
 
 # Start-Of-Header
@@ -40,7 +40,7 @@
                          "ViewManagerPlugins", "Listspace", "preview.png")
     return QPixmap(fname)
     
-class VmListspacePlugin(object):
+class VmListspacePlugin(QObject):
     """
     Class implementing the Listspace view manager plugin.
     """
@@ -68,4 +68,4 @@
         Public method to deactivate this plugin.
         """
         # do nothing for the moment
-        pass
\ No newline at end of file
+        pass

--- a/Plugins/PluginVmMdiArea.py	Wed Aug 11 19:55:34 2010 +0200
+++ b/Plugins/PluginVmMdiArea.py	Wed Aug 11 20:16:03 2010 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import QT_TRANSLATE_NOOP
+from PyQt4.QtCore import QT_TRANSLATE_NOOP, QObject
 from PyQt4.QtGui import QPixmap
 
 # Start-Of-Header
@@ -40,7 +40,7 @@
                          "ViewManagerPlugins", "MdiArea", "preview.png")
     return QPixmap(fname)
     
-class VmMdiAreaPlugin(object):
+class VmMdiAreaPlugin(QObject):
     """
     Class implementing the Workspace view manager plugin.
     """
@@ -68,4 +68,4 @@
         Public method to deactivate this plugin.
         """
         # do nothing for the moment
-        pass
\ No newline at end of file
+        pass

--- a/Plugins/PluginVmTabview.py	Wed Aug 11 19:55:34 2010 +0200
+++ b/Plugins/PluginVmTabview.py	Wed Aug 11 20:16:03 2010 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import QT_TRANSLATE_NOOP
+from PyQt4.QtCore import QT_TRANSLATE_NOOP, QObject
 from PyQt4.QtGui import QPixmap
 
 # Start-Of-Header
@@ -40,7 +40,7 @@
                          "ViewManagerPlugins", "Tabview", "preview.png")
     return QPixmap(fname)
     
-class VmTabviewPlugin(object):
+class VmTabviewPlugin(QObject):
     """
     Class implementing the Tabview view manager plugin.
     """
@@ -68,4 +68,4 @@
         Public method to deactivate this plugin.
         """
         # do nothing for the moment
-        pass
\ No newline at end of file
+        pass

--- a/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Wed Aug 11 19:55:34 2010 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Wed Aug 11 20:16:03 2010 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the commit message.
 """
 
-from PyQt4.QtCore import pyqtSlot, Qt
+from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt
 from PyQt4.QtGui import QWidget, QDialogButtonBox
 
 from .Ui_HgCommitDialog import Ui_HgCommitDialog
@@ -21,6 +21,9 @@
     @signal accepted() emitted, if the dialog was accepted
     @signal rejected() emitted, if the dialog was rejected
     """
+    accepted = pyqtSignal()
+    rejected = pyqtSignal()
+    
     def __init__(self, vcs, parent = None):
         """
         Constructor

--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Wed Aug 11 19:55:34 2010 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Wed Aug 11 20:16:03 2010 +0200
@@ -23,6 +23,9 @@
     @signal accepted() emitted, if the dialog was accepted
     @signal rejected() emitted, if the dialog was rejected
     """
+    accepted = pyqtSignal()
+    rejected = pyqtSignal()
+    
     def __init__(self, parent = None):
         """
         Constructor

--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Wed Aug 11 19:55:34 2010 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Wed Aug 11 20:16:03 2010 +0200
@@ -21,6 +21,9 @@
     @signal accepted() emitted, if the dialog was accepted
     @signal rejected() emitted, if the dialog was rejected
     """
+    accepted = pyqtSignal()
+    rejected = pyqtSignal()
+    
     def __init__(self, vcs, parent = None):
         """
         Constructor

--- a/UI/UserInterface.py	Wed Aug 11 19:55:34 2010 +0200
+++ b/UI/UserInterface.py	Wed Aug 11 20:16:03 2010 +0200
@@ -5401,7 +5401,7 @@
             return False
         self.debuggerUI.shutdown()
         
-        self.pluginManager.shutdown()
+        self.pluginManager.doShutdown()
         
         if self.SAServer is not None:
             self.SAServer.shutdown()