Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py
Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py
- changeset 4145
- 0cbff03680bb
- parent 4132
- 04f395eef728
- child 4631
- 5c1a96925da4
equal
deleted
inserted
replaced
| 4143:565002034bdb | 4145:0cbff03680bb |
|---|---|
| 72 self.process = QProcess() | 72 self.process = QProcess() |
| 73 self.process.finished.connect(self.__procFinished) | 73 self.process.finished.connect(self.__procFinished) |
| 74 self.process.readyReadStandardOutput.connect(self.__readStdout) | 74 self.process.readyReadStandardOutput.connect(self.__readStdout) |
| 75 self.process.readyReadStandardError.connect(self.__readStderr) | 75 self.process.readyReadStandardError.connect(self.__readStderr) |
| 76 | 76 |
| 77 self.__hDiffSplitterState = None | 77 self.diffSplitter.setSizes([350, 250]) |
| 78 self.__diffSplitterState = None | |
| 78 | 79 |
| 79 self.statusList.headerItem().setText(self.__lastColumn, "") | 80 self.statusList.headerItem().setText(self.__lastColumn, "") |
| 80 self.statusList.header().setSortIndicator( | 81 self.statusList.header().setSortIndicator( |
| 81 self.__pathColumn, Qt.AscendingOrder) | 82 self.__pathColumn, Qt.AscendingOrder) |
| 82 | 83 |
| 192 """ | 193 """ |
| 193 Public slot to show the dialog. | 194 Public slot to show the dialog. |
| 194 """ | 195 """ |
| 195 super(HgStatusDialog, self).show() | 196 super(HgStatusDialog, self).show() |
| 196 | 197 |
| 197 if not self.__mq and self.__hDiffSplitterState: | 198 if not self.__mq and self.__diffSplitterState: |
| 198 self.diffSplitter.restoreState(self.__hDiffSplitterState) | 199 self.diffSplitter.restoreState(self.__diffSplitterState) |
| 199 | 200 |
| 200 def __resort(self): | 201 def __resort(self): |
| 201 """ | 202 """ |
| 202 Private method to resort the tree. | 203 Private method to resort the tree. |
| 203 """ | 204 """ |
| 253 self.process.terminate() | 254 self.process.terminate() |
| 254 QTimer.singleShot(2000, self.process.kill) | 255 QTimer.singleShot(2000, self.process.kill) |
| 255 self.process.waitForFinished(3000) | 256 self.process.waitForFinished(3000) |
| 256 | 257 |
| 257 if not self.__mq: | 258 if not self.__mq: |
| 258 self.__hDiffSplitterState = self.diffSplitter.saveState() | 259 self.__diffSplitterState = self.diffSplitter.saveState() |
| 259 | 260 |
| 260 e.accept() | 261 e.accept() |
| 261 | 262 |
| 262 def start(self, fn): | 263 def start(self, fn): |
| 263 """ | 264 """ |
