12 |
12 |
13 from PyQt6.QtCore import pyqtSlot, QFileInfo, Qt |
13 from PyQt6.QtCore import pyqtSlot, QFileInfo, Qt |
14 from PyQt6.QtGui import QTextCursor |
14 from PyQt6.QtGui import QTextCursor |
15 from PyQt6.QtWidgets import QWidget, QDialogButtonBox |
15 from PyQt6.QtWidgets import QWidget, QDialogButtonBox |
16 |
16 |
17 from E5Gui import EricMessageBox, EricFileDialog |
17 from EricWidgets import EricMessageBox, EricFileDialog |
18 from E5Gui.EricApplication import ericApp |
18 from EricWidgets.EricApplication import ericApp |
19 |
19 |
20 from .Ui_GitDiffDialog import Ui_GitDiffDialog |
20 from .Ui_GitDiffDialog import Ui_GitDiffDialog |
21 |
21 |
22 from .GitDiffHighlighter import GitDiffHighlighter |
22 from .GitDiffHighlighter import GitDiffHighlighter |
23 from .GitDiffGenerator import GitDiffGenerator |
23 from .GitDiffGenerator import GitDiffGenerator |
51 self.buttonBox.button( |
51 self.buttonBox.button( |
52 QDialogButtonBox.StandardButton.Close).setDefault(True) |
52 QDialogButtonBox.StandardButton.Close).setDefault(True) |
53 |
53 |
54 try: |
54 try: |
55 # insert the search widget if it is available |
55 # insert the search widget if it is available |
56 from E5Gui.EricTextEditSearchWidget import EricTextEditSearchWidget |
56 from EricWidgets.EricTextEditSearchWidget import EricTextEditSearchWidget |
57 self.searchWidget = EricTextEditSearchWidget(self.contentsGroup) |
57 self.searchWidget = EricTextEditSearchWidget(self.contentsGroup) |
58 self.searchWidget.setFocusPolicy(Qt.FocusPolicy.WheelFocus) |
58 self.searchWidget.setFocusPolicy(Qt.FocusPolicy.WheelFocus) |
59 self.searchWidget.setObjectName("searchWidget") |
59 self.searchWidget.setObjectName("searchWidget") |
60 self.contentsGroup.layout().insertWidget(1, self.searchWidget) |
60 self.contentsGroup.layout().insertWidget(1, self.searchWidget) |
61 self.searchWidget.attachTextEdit(self.contents) |
61 self.searchWidget.attachTextEdit(self.contents) |