Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- changeset 3534
- 325a637dbb14
- parent 3531
- c4b36c72184d
- parent 3532
- 86ac124f322c
- child 3536
- c06338ca892b
equal
deleted
inserted
replaced
| 3531:c4b36c72184d | 3534:325a637dbb14 |
|---|---|
| 4 # | 4 # |
| 5 | 5 |
| 6 """ | 6 """ |
| 7 Module implementing a dialog to browse the log history. | 7 Module implementing a dialog to browse the log history. |
| 8 """ | 8 """ |
| 9 | |
| 10 from __future__ import unicode_literals | |
| 11 try: | |
| 12 str = unicode | |
| 13 except NameError: | |
| 14 pass | |
| 9 | 15 |
| 10 import os | 16 import os |
| 11 import re | 17 import re |
| 12 | 18 |
| 13 from PyQt4.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \ | 19 from PyQt4.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \ |
| 54 | 60 |
| 55 @param vcs reference to the vcs object | 61 @param vcs reference to the vcs object |
| 56 @param mode mode of the dialog (string; one of log, incoming, outgoing) | 62 @param mode mode of the dialog (string; one of log, incoming, outgoing) |
| 57 @param parent parent widget (QWidget) | 63 @param parent parent widget (QWidget) |
| 58 """ | 64 """ |
| 59 super().__init__(parent) | 65 super(HgLogBrowserDialog, self).__init__(parent) |
| 60 self.setupUi(self) | 66 self.setupUi(self) |
| 61 | 67 |
| 62 self.__position = QPoint() | 68 self.__position = QPoint() |
| 63 | 69 |
| 64 if mode == "log": | 70 if mode == "log": |
| 223 """ | 229 """ |
| 224 if not self.__position.isNull(): | 230 if not self.__position.isNull(): |
| 225 self.move(self.__position) | 231 self.move(self.__position) |
| 226 self.__resetUI() | 232 self.__resetUI() |
| 227 | 233 |
| 228 super().show() | 234 super(HgLogBrowserDialog, self).show() |
| 229 | 235 |
| 230 def __resetUI(self): | 236 def __resetUI(self): |
| 231 """ | 237 """ |
| 232 Private method to reset the user interface. | 238 Private method to reset the user interface. |
| 233 """ | 239 """ |
| 1464 """ | 1470 """ |
| 1465 if self.intercept: | 1471 if self.intercept: |
| 1466 self.intercept = False | 1472 self.intercept = False |
| 1467 evt.accept() | 1473 evt.accept() |
| 1468 return | 1474 return |
| 1469 super().keyPressEvent(evt) | 1475 super(HgLogBrowserDialog, self).keyPressEvent(evt) |
| 1470 | 1476 |
| 1471 @pyqtSlot() | 1477 @pyqtSlot() |
| 1472 def __phaseActTriggered(self): | 1478 def __phaseActTriggered(self): |
| 1473 """ | 1479 """ |
| 1474 Private slot to handle the Change Phase action. | 1480 Private slot to handle the Change Phase action. |
