Mercurial Repositories > eric / file diff

diff -r 056d98a54dd4 -r c28d0cf3b639 Plugins/VcsPlugins/vcsPySvn/subversion.py
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sun Feb 22 12:16:32 2015 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sun Feb 22 19:21:55 2015 +0100
@@ -984,6 +984,7 @@
             from .SvnLogDialog import SvnLogDialog
             self.log = SvnLogDialog(self, isFile=isFile)
             self.log.show()
+            self.log.raise_()
             QApplication.processEvents()
             self.log.start(name, noEntries)
         
@@ -1012,9 +1013,11 @@
                 project = e5App().getObject("Project")
                 if nam == project.ppath and not project.saveAllScripts():
                     return
-        from .SvnDiffDialog import SvnDiffDialog
-        self.diff = SvnDiffDialog(self)
+        if self.diff is None:
+            from .SvnDiffDialog import SvnDiffDialog
+            self.diff = SvnDiffDialog(self)
         self.diff.show()
+        self.diff.raise_()
         QApplication.processEvents()
         self.diff.start(name, refreshable=True)
         
@@ -1026,9 +1029,11 @@
         @param name file/directory name(s) to show the status of
             (string or list of strings)
         """
-        from .SvnStatusDialog import SvnStatusDialog
-        self.status = SvnStatusDialog(self)
+        if self.status is None:
+            from .SvnStatusDialog import SvnStatusDialog
+            self.status = SvnStatusDialog(self)
         self.status.show()
+        self.status.raise_()
         QApplication.processEvents()
         self.status.start(name)
         
@@ -1873,9 +1878,11 @@
         @param name file/directory name (string or list of strings)
         @param recursive flag indicating a recursive list is requested
         """
-        from .SvnPropListDialog import SvnPropListDialog
-        self.propList = SvnPropListDialog(self)
+        if self.propList is None:
+            from .SvnPropListDialog import SvnPropListDialog
+            self.propList = SvnPropListDialog(self)
         self.propList.show()
+        self.propList.raise_()
         QApplication.processEvents()
         self.propList.start(name, recursive)
         
@@ -1993,9 +2000,11 @@
         @param tags flag indicating listing of branches or tags
                 (False = branches, True = tags)
         """
-        from .SvnTagBranchListDialog import SvnTagBranchListDialog
-        self.tagbranchList = SvnTagBranchListDialog(self)
+        if self.tagbranchList is None:
+            from .SvnTagBranchListDialog import SvnTagBranchListDialog
+            self.tagbranchList = SvnTagBranchListDialog(self)
         self.tagbranchList.show()
+        self.tagbranchList.raise_()
         QApplication.processEvents()
         res = self.tagbranchList.start(path, tags)
         if res:
@@ -2018,9 +2027,11 @@
         
         @param name file name to show the blame for (string)
         """
-        from .SvnBlameDialog import SvnBlameDialog
-        self.blame = SvnBlameDialog(self)
+        if self.blame is None:
+            from .SvnBlameDialog import SvnBlameDialog
+            self.blame = SvnBlameDialog(self)
         self.blame.show()
+        self.blame.raise_()
         QApplication.processEvents()
         self.blame.start(name)
         
@@ -2055,9 +2066,11 @@
         dlg = SvnRevisionSelectionDialog()
         if dlg.exec_() == QDialog.Accepted:
             revisions = dlg.getRevisions()
-            from .SvnDiffDialog import SvnDiffDialog
-            self.diff = SvnDiffDialog(self)
+            if self.diff is None:
+                from .SvnDiffDialog import SvnDiffDialog
+                self.diff = SvnDiffDialog(self)
             self.diff.show()
+            self.diff.raise_()
             QApplication.processEvents()
             self.diff.start(name, revisions)
         
@@ -2096,9 +2109,11 @@
                                     dname)
         if dlg.exec_() == QDialog.Accepted:
             urls, summary = dlg.getURLs()
-            from .SvnDiffDialog import SvnDiffDialog
-            self.diff = SvnDiffDialog(self)
+            if self.diff is None:
+                from .SvnDiffDialog import SvnDiffDialog
+                self.diff = SvnDiffDialog(self)
             self.diff.show()
+            self.diff.raise_()
             QApplication.processEvents()
             self.diff.start(name, urls=urls, summary=summary)
         
@@ -2209,6 +2224,7 @@
             from UI.CompareDialog import CompareDialog
             self.sbsDiff = CompareDialog()
         self.sbsDiff.show()
+        self.sbsDiff.raise_()
         self.sbsDiff.compare(output1, output2, name1, name2)
     
     def vcsLogBrowser(self, name, isFile=False):
@@ -2223,6 +2239,7 @@
             from .SvnLogBrowserDialog import SvnLogBrowserDialog
             self.logBrowser = SvnLogBrowserDialog(self)
         self.logBrowser.show()
+        self.logBrowser.raise_()
         QApplication.processEvents()
         self.logBrowser.start(name, isFile=isFile)
         
@@ -2378,9 +2395,12 @@
             if not ok or not url:
                 return
         
-        from .SvnRepoBrowserDialog import SvnRepoBrowserDialog
-        self.repoBrowser = SvnRepoBrowserDialog(self)
+        if self.repoBrowser is None:
+            from .SvnRepoBrowserDialog import SvnRepoBrowserDialog
+            self.repoBrowser = SvnRepoBrowserDialog(self)
         self.repoBrowser.start(url)
+        self.repoBrowser.show()
+        self.repoBrowser.raise_()
         
     def svnRemoveFromChangelist(self, names):
         """