Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- changeset 5848
- 56388f41b1e6
- parent 5588
- 6ba512d9f46a
- child 6048
- 82ad8ec9548c
equal
deleted
inserted
replaced
| 5847:fd1262c3fa79 | 5848:56388f41b1e6 |
|---|---|
| 20 from E5Gui.E5Application import e5App | 20 from E5Gui.E5Application import e5App |
| 21 | 21 |
| 22 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog | 22 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog |
| 23 | 23 |
| 24 import Utilities.MimeTypes | 24 import Utilities.MimeTypes |
| 25 from Globals import strToQByteArray | |
| 25 | 26 |
| 26 | 27 |
| 27 class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog): | 28 class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog): |
| 28 """ | 29 """ |
| 29 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 |
| 334 self.errors.ensureCursorVisible() | 335 self.errors.ensureCursorVisible() |
| 335 else: | 336 else: |
| 336 self.errors.insertPlainText(inputTxt) | 337 self.errors.insertPlainText(inputTxt) |
| 337 self.errors.ensureCursorVisible() | 338 self.errors.ensureCursorVisible() |
| 338 | 339 |
| 339 self.process.write(inputTxt) | 340 self.process.write(strToQByteArray(inputTxt)) |
| 340 | 341 |
| 341 self.passwordCheckBox.setChecked(False) | 342 self.passwordCheckBox.setChecked(False) |
| 342 self.input.clear() | 343 self.input.clear() |
| 343 | 344 |
| 344 def on_input_returnPressed(self): | 345 def on_input_returnPressed(self): |
