Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Mon Aug 30 20:16:34 2010 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Tue Aug 31 12:17:02 2010 +0200
@@ -15,6 +15,7 @@
 from PyQt4.QtGui import *
 
 from E5Gui.E5Application import e5App
+from E5Gui import E5MessageBox
 
 from VCS.VersionControl import VersionControl
 
@@ -204,7 +205,7 @@
         """
         success = self.vcsImport(vcsDataDict, project.ppath)[0]
         if not success:
-            QMessageBox.critical(None,
+            E5MessageBox.critical(self.__ui,
                 self.trUtf8("Create project in repository"),
                 self.trUtf8("""The project could not be created in the repository."""
                             """ Maybe the given repository doesn't exist or the"""
@@ -226,7 +227,7 @@
             if not os.path.isfile(pfn):
                 pfn += "z"
             if not os.path.isfile(pfn):
-                QMessageBox.critical(None,
+                E5MessageBox.critical(self.__ui,
                     self.trUtf8("New project"),
                     self.trUtf8("""The project could not be checked out of the"""
                                 """ repository.<br />"""
@@ -808,7 +809,7 @@
         
         reposURL = self.svnGetReposName(dname)
         if reposURL is None:
-            QMessageBox.critical(None,
+            E5MessageBox.critical(self.__ui,
                 self.trUtf8("Subversion Error"),
                 self.trUtf8("""The URL of the project repository could not be"""
                     """ retrieved from the working copy. The tag operation will"""
@@ -832,7 +833,7 @@
         if self.otherData["standardLayout"]:
             rx_base = QRegExp('(.+)/(trunk|tags|branches).*')
             if not rx_base.exactMatch(reposURL):
-                QMessageBox.critical(None,
+                E5MessageBox.critical(self.__ui,
                     self.trUtf8("Subversion Error"),
                     self.trUtf8("""The URL of the project repository has an"""
                         """ invalid format. The tag operation will"""
@@ -902,7 +903,7 @@
         
         reposURL = self.svnGetReposName(dname)
         if reposURL is None:
-            QMessageBox.critical(None,
+            E5MessageBox.critical(self.__ui,
                 self.trUtf8("Subversion Error"),
                 self.trUtf8("""The URL of the project repository could not be"""
                     """ retrieved from the working copy. The switch operation will"""
@@ -926,7 +927,7 @@
         if self.otherData["standardLayout"]:
             rx_base = QRegExp('(.+)/(trunk|tags|branches).*')
             if not rx_base.exactMatch(reposURL):
-                QMessageBox.critical(None,
+                E5MessageBox.critical(self.__ui,
                     self.trUtf8("Subversion Error"),
                     self.trUtf8("""The URL of the project repository has an"""
                         """ invalid format. The switch operation will"""
@@ -1384,7 +1385,7 @@
         if dlg.exec_() == QDialog.Accepted:
             propName, fileFlag, propValue = dlg.getData()
             if not propName:
-                QMessageBox.critical(None,
+                E5MessageBox.critical(self.__ui,
                     self.trUtf8("Subversion Set Property"),
                     self.trUtf8("""You have to supply a property name. Aborting."""))
                 return
@@ -1427,7 +1428,7 @@
             return
         
         if not propName:
-            QMessageBox.critical(None,
+            E5MessageBox.critical(self.__ui,
                 self.trUtf8("Subversion Delete Property"),
                 self.trUtf8("""You have to supply a property name. Aborting."""))
             return
@@ -1826,4 +1827,4 @@
         @param interval check interval for the monitor thread in seconds (integer)
         @return reference to the monitor thread (QThread)
         """
-        return SvnStatusMonitorThread(interval, project, self)
+        return SvnStatusMonitorThread(interval, project, self)
\ No newline at end of file