Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- changeset 3619
- 4643a9ef7dd6
- parent 3591
- 2f2a4a76dd22
- child 3656
- 441956d8fce5
equal
deleted
inserted
replaced
| 3618:49e7fbd66ef9 | 3619:4643a9ef7dd6 |
|---|---|
| 20 from E5Gui import E5MessageBox | 20 from E5Gui import E5MessageBox |
| 21 from E5Gui.E5Application import e5App | 21 from E5Gui.E5Application import e5App |
| 22 | 22 |
| 23 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog | 23 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog |
| 24 | 24 |
| 25 import Utilities.mimetypes | 25 import Utilities.MimeTypes |
| 26 | 26 |
| 27 | 27 |
| 28 class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog): | 28 class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog): |
| 29 """ | 29 """ |
| 30 Class implementing a dialog to show a list of files which had or still | 30 Class implementing a dialog to show a list of files which had or still |
| 388 self.resolvedButton.setEnabled(unresolved > 0) | 388 self.resolvedButton.setEnabled(unresolved > 0) |
| 389 self.unresolvedButton.setEnabled(resolved > 0) | 389 self.unresolvedButton.setEnabled(resolved > 0) |
| 390 self.reMergeButton.setEnabled(unresolved > 0) | 390 self.reMergeButton.setEnabled(unresolved > 0) |
| 391 self.editButton.setEnabled( | 391 self.editButton.setEnabled( |
| 392 selectedCount == 1 and | 392 selectedCount == 1 and |
| 393 Utilities.mimetypes.isTextFile( | 393 Utilities.MimeTypes.isTextFile( |
| 394 self.conflictsList.selectedItems()[0].data( | 394 self.conflictsList.selectedItems()[0].data( |
| 395 0, self.FilenameRole))) | 395 0, self.FilenameRole))) |
| 396 | 396 |
| 397 @pyqtSlot() | 397 @pyqtSlot() |
| 398 def on_resolvedButton_clicked(self): | 398 def on_resolvedButton_clicked(self): |
| 440 """ | 440 """ |
| 441 Private slot to open the selected file in an editor. | 441 Private slot to open the selected file in an editor. |
| 442 """ | 442 """ |
| 443 itm = self.conflictsList.selectedItems()[0] | 443 itm = self.conflictsList.selectedItems()[0] |
| 444 filename = itm.data(0, self.FilenameRole) | 444 filename = itm.data(0, self.FilenameRole) |
| 445 if Utilities.mimetypes.isTextFile(filename): | 445 if Utilities.MimeTypes.isTextFile(filename): |
| 446 e5App().getObject("ViewManager").getEditor(filename) | 446 e5App().getObject("ViewManager").getEditor(filename) |
