Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py
eric6/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py
- changeset 7771
- 787a6b3f8c9f
- parent 7628
- f904d0eef264
- child 7779
- 757334671130
equal
deleted
inserted
replaced
| 7770:49f3377aebf1 | 7771:787a6b3f8c9f |
|---|---|
| 8 process. | 8 process. |
| 9 """ | 9 """ |
| 10 | 10 |
| 11 | 11 |
| 12 from PyQt5.QtCore import pyqtSlot, QFileInfo, Qt | 12 from PyQt5.QtCore import pyqtSlot, QFileInfo, Qt |
| 13 from PyQt5.QtGui import QTextCursor, QCursor | 13 from PyQt5.QtGui import QTextCursor |
| 14 from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QApplication | 14 from PyQt5.QtWidgets import QWidget, QDialogButtonBox |
| 15 | 15 |
| 16 from E5Gui import E5MessageBox, E5FileDialog | 16 from E5Gui import E5MessageBox, E5FileDialog |
| 17 from E5Gui.E5Application import e5App | 17 from E5Gui.E5Application import e5App |
| 18 | 18 |
| 19 from .Ui_GitDiffDialog import Ui_GitDiffDialog | 19 from .Ui_GitDiffDialog import Ui_GitDiffDialog |
| 167 else: | 167 else: |
| 168 msg = self.__modeMessages["stash"] | 168 msg = self.__modeMessages["stash"] |
| 169 self.contentsGroup.setTitle( | 169 self.contentsGroup.setTitle( |
| 170 self.tr("Difference ({0})").format(msg)) | 170 self.tr("Difference ({0})").format(msg)) |
| 171 | 171 |
| 172 QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) | |
| 173 procStarted = self.__diffGenerator.start( | 172 procStarted = self.__diffGenerator.start( |
| 174 fn, versions=versions, diffMode=diffMode, stashName=stashName) | 173 fn, versions=versions, diffMode=diffMode, stashName=stashName) |
| 175 if not procStarted: | 174 if not procStarted: |
| 176 QApplication.restoreOverrideCursor() | |
| 177 E5MessageBox.critical( | 175 E5MessageBox.critical( |
| 178 self, | 176 self, |
| 179 self.tr('Process Generation Error'), | 177 self.tr('Process Generation Error'), |
| 180 self.tr( | 178 self.tr( |
| 181 'The process {0} could not be started. ' | 179 'The process {0} could not be started. ' |
| 185 | 183 |
| 186 def __generatorFinished(self): | 184 def __generatorFinished(self): |
| 187 """ | 185 """ |
| 188 Private slot connected to the finished signal. | 186 Private slot connected to the finished signal. |
| 189 """ | 187 """ |
| 190 QApplication.restoreOverrideCursor() | |
| 191 self.refreshButton.setEnabled(True) | 188 self.refreshButton.setEnabled(True) |
| 192 | 189 |
| 193 diff1, diff2, errors, fileSeparators = self.__diffGenerator.getResult() | 190 diff1, diff2, errors, fileSeparators = self.__diffGenerator.getResult() |
| 194 | 191 |
| 195 if diff1: | 192 if diff1: |
