eric: comparison eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py

-:8a7677a63c8d
+:68ec9c3d4de5
 from PyQt6.QtWidgets import (
 QWidget, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QApplication,
 QLineEdit, QMenu, QInputDialog
 )
-from E5Gui.E5Application import e5App
+from E5Gui.EricApplication import ericApp
-from E5Gui import E5MessageBox, E5FileDialog
+from E5Gui import EricMessageBox, EricFileDialog
-from E5Gui.E5OverrideCursor import E5OverrideCursorProcess
+from E5Gui.EricOverrideCursor import EricOverrideCursorProcess
 from Globals import strToQByteArray
 from .Ui_GitLogBrowserDialog import Ui_GitLogBrowserDialog
 self.__logTreeNormalFont = self.logTree.font()
 self.__logTreeNormalFont.setBold(False)
 self.__logTreeBoldFont = self.logTree.font()
 self.__logTreeBoldFont.setBold(True)
-self.__logTreeHasDarkBackground = e5App().usesDarkPalette()
+self.__logTreeHasDarkBackground = ericApp().usesDarkPalette()
 font = Preferences.getEditorOtherFonts("MonospacedFont")
 self.diffEdit.document().setDefaultFont(font)
 self.diffHighlighter = GitDiffHighlighter(self.diffEdit.document())
 self.__committerMailRole = Qt.ItemDataRole.UserRole + 7
 # roles used in the file tree
 self.__diffFileLineRole = Qt.ItemDataRole.UserRole
-self.__process = E5OverrideCursorProcess()
+self.__process = EricOverrideCursorProcess()
 self.__process.finished.connect(self.__procFinished)
 self.__process.readyReadStandardOutput.connect(self.__readStdout)
 self.__process.readyReadStandardError.connect(self.__readStderr)
 self.flags = {
 "The git process did not finish within 30s.")
 else:
 errMsg = self.tr("Could not start the git executable.")
 if errMsg:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self,
 self.tr("Git Error"),
 errMsg)
 if output:
 self.__process.start('git', args)
 procStarted = self.__process.waitForStarted(5000)
 if not procStarted:
 self.inputGroup.setEnabled(False)
 self.inputGroup.hide()
-E5MessageBox.critical(
+EricMessageBox.critical(
 self,
 self.tr('Process Generation Error'),
 self.tr(
 'The process {0} could not be started. '
 'Ensure, that it is in the search path.'
 for itm in self.logTree.selectedItems():
 index = self.logTree.indexOfTopLevelItem(itm)
 commits[index] = itm.text(self.CommitIdColumn)
 if commits:
-pfile = e5App().getObject("Project").getProjectFile()
+pfile = ericApp().getObject("Project").getProjectFile()
 lastModified = QFileInfo(pfile).lastModified().toString()
 shouldReopen = (
 self.vcs.gitCherryPick(
 self.repodir,
 [commits[i] for i in sorted(commits.keys(), reverse=True)]
 ) or
 QFileInfo(pfile).lastModified().toString() != lastModified
 )
 if shouldReopen:
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 None,
 self.tr("Copy Changesets"),
 self.tr(
 """The project should be reread. Do this now?"""),
 yesDefault=True)
 if res:
-e5App().getObject("Project").reopenProject()
+ericApp().getObject("Project").reopenProject()
 return
 self.on_refreshButton_clicked()
 @pyqtSlot()
 branch = ""
 if branch:
 rev = branch
 else:
 rev = commit
-pfile = e5App().getObject("Project").getProjectFile()
+pfile = ericApp().getObject("Project").getProjectFile()
 lastModified = QFileInfo(pfile).lastModified().toString()
 shouldReopen = (
 self.vcs.vcsUpdate(self.repodir, revision=rev) or
 QFileInfo(pfile).lastModified().toString() != lastModified
 )
 if shouldReopen:
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 None,
 self.tr("Switch"),
 self.tr(
 """The project should be reread. Do this now?"""),
 yesDefault=True)
 if res:
-e5App().getObject("Project").reopenProject()
+ericApp().getObject("Project").reopenProject()
 return
 self.on_refreshButton_clicked()
 @pyqtSlot()
 0, False)
 if not ok:
 return
 else:
 branch = ""
-pfile = e5App().getObject("Project").getProjectFile()
+pfile = ericApp().getObject("Project").getProjectFile()
 lastModified = QFileInfo(pfile).lastModified().toString()
 res, shouldReopen = self.vcs.gitBranch(
 self.repodir, revision=commit, branchName=branch,
 branchOp=GitBranchDialog.CreateSwitchBranch)
 shouldReopen = (
 shouldReopen or
 QFileInfo(pfile).lastModified().toString() != lastModified
 )
 if res:
 if shouldReopen:
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 None,
 self.tr("Switch"),
 self.tr(
 """The project should be reread. Do this now?"""),
 yesDefault=True)
 if res:
-e5App().getObject("Project").reopenProject()
+ericApp().getObject("Project").reopenProject()
 return
 self.on_refreshButton_clicked()
 @pyqtSlot()
 txt = topItem.text(fieldIndex)
 if searchRx.search(txt) is not None:
 self.logTree.setCurrentItem(self.logTree.topLevelItem(index))
 break
 else:
-E5MessageBox.information(
+EricMessageBox.information(
 self,
 self.tr("Find Commit"),
 self.tr("""'{0}' was not found.""").format(self.rxEdit.text()))
 ##################################################################
 if fname != '.':
 fname = "{0}.diff".format(self.__filename)
 else:
 fname = dname
-fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
 self,
 self.tr("Save Diff"),
 fname,
 self.tr("Patch Files (*.diff)"),
 None,
-E5FileDialog.DontConfirmOverwrite)
+EricFileDialog.DontConfirmOverwrite)
 if not fname:
 return  # user aborted
 ext = QFileInfo(fname).suffix()
 if not ext:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 if ex:
 fname += ex
 if QFileInfo(fname).exists():
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 self,
 self.tr("Save Diff"),
 self.tr("<p>The patch file <b>{0}</b> already exists."
 " Overwrite it?</p>").format(fname),
-icon=E5MessageBox.Warning)
+icon=EricMessageBox.Warning)
 if not res:
 return
 fname = Utilities.toNativeSeparators(fname)
-eol = e5App().getObject("Project").getEolString()
+eol = ericApp().getObject("Project").getEolString()
 try:
 with open(fname, "w", encoding="utf-8", newline="") as f:
 f.write(eol.join(self.diffEdit.toPlainText().splitlines()))
 f.write(eol)
 except OSError as why:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self, self.tr('Save Diff'),
 self.tr(
 '<p>The patch file <b>{0}</b> could not be saved.'
 '<br>Reason: {1}</p>')
 .format(fname, str(why)))

Mercurial Repositories > eric / file comparison

comparison: eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py

eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py