diff -r 056d98a54dd4 -r c28d0cf3b639 Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sun Feb 22 12:16:32 2015 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sun Feb 22 19:21:55 2015 +0100
@@ -65,10 +65,14 @@
self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
self.diff = None
- self.process = None
self.vcs = vcs
self.vcs.committed.connect(self.__committed)
+ self.process = QProcess()
+ self.process.finished.connect(self.__procFinished)
+ self.process.readyReadStandardOutput.connect(self.__readStdout)
+ self.process.readyReadStandardError.connect(self.__readStderr)
+
self.statusList.headerItem().setText(self.__lastColumn, "")
self.statusList.header().setSortIndicator(self.__pathColumn,
Qt.AscendingOrder)
@@ -348,6 +352,7 @@
self.statusFilterCombo.clear()
self.__statusFilters = []
+ self.statusList.clear()
self.currentChangelist = ""
self.changelistFound = False
@@ -358,13 +363,7 @@
self.hideHistoryColumn = True
self.hideSwitchedColumn = True
- if self.process:
- self.process.kill()
- else:
- self.process = QProcess()
- self.process.finished.connect(self.__procFinished)
- self.process.readyReadStandardOutput.connect(self.__readStdout)
- self.process.readyReadStandardError.connect(self.__readStderr)
+ self.process.kill()
args = []
args.append('status')
@@ -404,8 +403,13 @@
'Ensure, that it is in the search path.'
).format('svn'))
else:
+ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
+ self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
+ self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+
self.inputGroup.setEnabled(True)
self.inputGroup.show()
+ self.refreshButton.setEnabled(False)
def __finish(self):
"""
@@ -435,8 +439,6 @@
for act in self.menuactions:
act.setEnabled(True)
- self.process = None
-
self.__resort()
self.__resizeColumns()
@@ -585,16 +587,6 @@
"""
Private slot to refresh the status display.
"""
- self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
- self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
- self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
-
- self.inputGroup.setEnabled(True)
- self.inputGroup.show()
- self.refreshButton.setEnabled(False)
-
- self.statusList.clear()
-
self.start(self.args)
def __updateButtons(self):
