Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- branch
- eric7
- changeset 8356
- 68ec9c3d4de5
- parent 8318
- 962bce857696
- child 8358
- 144a6b854f70
equal
deleted
inserted
replaced
| 8355:8a7677a63c8d | 8356:68ec9c3d4de5 |
|---|---|
| 12 from PyQt6.QtWidgets import ( | 12 from PyQt6.QtWidgets import ( |
| 13 QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem, | 13 QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem, |
| 14 QApplication, QWidget | 14 QApplication, QWidget |
| 15 ) | 15 ) |
| 16 | 16 |
| 17 from E5Gui.E5Application import e5App | 17 from E5Gui.EricApplication import ericApp |
| 18 | 18 |
| 19 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog | 19 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog |
| 20 | 20 |
| 21 import Utilities.MimeTypes | 21 import Utilities.MimeTypes |
| 22 | 22 |
| 56 self.refreshButton.setToolTip( | 56 self.refreshButton.setToolTip( |
| 57 self.tr("Press to refresh the list of conflicts")) | 57 self.tr("Press to refresh the list of conflicts")) |
| 58 self.refreshButton.setEnabled(False) | 58 self.refreshButton.setEnabled(False) |
| 59 | 59 |
| 60 self.vcs = vcs | 60 self.vcs = vcs |
| 61 self.project = e5App().getObject("Project") | 61 self.project = ericApp().getObject("Project") |
| 62 | 62 |
| 63 self.__hgClient = vcs.getClient() | 63 self.__hgClient = vcs.getClient() |
| 64 | 64 |
| 65 def closeEvent(self, e): | 65 def closeEvent(self, e): |
| 66 """ | 66 """ |
| 302 Private slot to open the selected file in an editor. | 302 Private slot to open the selected file in an editor. |
| 303 """ | 303 """ |
| 304 itm = self.conflictsList.selectedItems()[0] | 304 itm = self.conflictsList.selectedItems()[0] |
| 305 filename = itm.data(0, self.FilenameRole) | 305 filename = itm.data(0, self.FilenameRole) |
| 306 if Utilities.MimeTypes.isTextFile(filename): | 306 if Utilities.MimeTypes.isTextFile(filename): |
| 307 e5App().getObject("ViewManager").getEditor(filename) | 307 ericApp().getObject("ViewManager").getEditor(filename) |
