Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- changeset 3591
- 2f2a4a76dd22
- parent 3586
- 6e3a6c5b58bf
- child 3619
- 4643a9ef7dd6
equal
deleted
inserted
replaced
| 3590:5280e37405b8 | 3591:2f2a4a76dd22 |
|---|---|
| 11 from __future__ import unicode_literals | 11 from __future__ import unicode_literals |
| 12 | 12 |
| 13 import os | 13 import os |
| 14 | 14 |
| 15 from PyQt4.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer | 15 from PyQt4.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer |
| 16 from PyQt4.QtGui import (QWidget, QAbstractButton, QDialogButtonBox, | 16 from PyQt4.QtGui import ( |
| 17 QHeaderView, QTreeWidgetItem, QLineEdit, QApplication) | 17 QWidget, QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem, |
| 18 QLineEdit, QApplication) | |
| 18 | 19 |
| 19 from E5Gui import E5MessageBox | 20 from E5Gui import E5MessageBox |
| 20 from E5Gui.E5Application import e5App | 21 from E5Gui.E5Application import e5App |
| 21 | 22 |
| 22 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog | 23 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog |
| 69 self.process.readyReadStandardOutput.connect(self.__readStdout) | 70 self.process.readyReadStandardOutput.connect(self.__readStdout) |
| 70 self.process.readyReadStandardError.connect(self.__readStderr) | 71 self.process.readyReadStandardError.connect(self.__readStderr) |
| 71 | 72 |
| 72 def closeEvent(self, e): | 73 def closeEvent(self, e): |
| 73 """ | 74 """ |
| 74 Private slot implementing a close event handler. | 75 Protected slot implementing a close event handler. |
| 75 | 76 |
| 76 @param e close event (QCloseEvent) | 77 @param e close event (QCloseEvent) |
| 77 """ | 78 """ |
| 78 if self.__hgClient: | 79 if self.__hgClient: |
| 79 if self.__hgClient.isExecuting(): | 80 if self.__hgClient.isExecuting(): |
| 362 | 363 |
| 363 @pyqtSlot(QTreeWidgetItem, int) | 364 @pyqtSlot(QTreeWidgetItem, int) |
| 364 def on_conflictsList_itemDoubleClicked(self, item, column): | 365 def on_conflictsList_itemDoubleClicked(self, item, column): |
| 365 """ | 366 """ |
| 366 Private slot to open the double clicked entry. | 367 Private slot to open the double clicked entry. |
| 368 | |
| 369 @param item reference to the double clicked item (QTreeWidgetItem) | |
| 370 @param column column that was double clicked (integer) | |
| 367 """ | 371 """ |
| 368 self.on_editButton_clicked() | 372 self.on_editButton_clicked() |
| 369 | 373 |
| 370 @pyqtSlot() | 374 @pyqtSlot() |
| 371 def on_conflictsList_itemSelectionChanged(self): | 375 def on_conflictsList_itemSelectionChanged(self): |
