Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py	Fri Nov 04 11:55:21 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py	Fri Nov 04 11:55:41 2022 +0100
@@ -17,6 +17,7 @@
 
 from eric7.EricWidgets import EricMessageBox, EricFileDialog
 from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricTextEditSearchWidget import EricTextEditSearchWidget
 
 from .Ui_GitDiffDialog import Ui_GitDiffDialog
 
@@ -50,33 +51,23 @@
         self.buttonBox.button(QDialogButtonBox.StandardButton.Save).setEnabled(False)
         self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True)
 
-        try:
-            # insert the search widget if it is available
-            from eric7.EricWidgets.EricTextEditSearchWidget import (
-                EricTextEditSearchWidget,
-            )
-
-            self.searchWidget = EricTextEditSearchWidget(self.contentsGroup)
-            self.searchWidget.setFocusPolicy(Qt.FocusPolicy.WheelFocus)
-            self.searchWidget.setObjectName("searchWidget")
-            self.contentsGroup.layout().insertWidget(1, self.searchWidget)
-            self.searchWidget.attachTextEdit(self.contents)
+        self.searchWidget = EricTextEditSearchWidget(self.contentsGroup)
+        self.searchWidget.setFocusPolicy(Qt.FocusPolicy.WheelFocus)
+        self.searchWidget.setObjectName("searchWidget")
+        self.contentsGroup.layout().insertWidget(1, self.searchWidget)
+        self.searchWidget.attachTextEdit(self.contents)
 
-            self.searchWidget2 = EricTextEditSearchWidget(self.contentsGroup)
-            self.searchWidget2.setFocusPolicy(Qt.FocusPolicy.WheelFocus)
-            self.searchWidget2.setObjectName("searchWidget2")
-            self.contentsGroup.layout().addWidget(self.searchWidget2)
-            self.searchWidget2.attachTextEdit(self.contents2)
+        self.searchWidget2 = EricTextEditSearchWidget(self.contentsGroup)
+        self.searchWidget2.setFocusPolicy(Qt.FocusPolicy.WheelFocus)
+        self.searchWidget2.setObjectName("searchWidget2")
+        self.contentsGroup.layout().addWidget(self.searchWidget2)
+        self.searchWidget2.attachTextEdit(self.contents2)
 
-            self.setTabOrder(self.filesCombo, self.searchWidget)
-            self.setTabOrder(self.searchWidget, self.contents)
-            self.setTabOrder(self.contents, self.contents2)
-            self.setTabOrder(self.contents2, self.searchWidget2)
-            self.setTabOrder(self.searchWidget2, self.errors)
-        except ImportError:
-            # eric version without search widget
-            self.searchWidget = None
-            self.searchWidget2 = None
+        self.setTabOrder(self.filesCombo, self.searchWidget)
+        self.setTabOrder(self.searchWidget, self.contents)
+        self.setTabOrder(self.contents, self.contents2)
+        self.setTabOrder(self.contents2, self.searchWidget2)
+        self.setTabOrder(self.searchWidget2, self.errors)
 
         self.vcs = vcs
 
@@ -150,8 +141,7 @@
         self.contents.clear()
         self.contents2.clear()
         self.contents2.setVisible(diffMode == "work2stage2repo")
-        if self.searchWidget2:
-            self.searchWidget2.setVisible(diffMode == "work2stage2repo")
+        self.searchWidget2.setVisible(diffMode == "work2stage2repo")
 
         self.filesCombo.clear()