--- a/src/eric7/QScintilla/SearchReplaceWidget.ui	Tue Dec 19 09:31:02 2023 +0100
+++ b/src/eric7/QScintilla/SearchReplaceWidget.ui	Tue Dec 19 11:04:03 2023 +0100
@@ -32,13 +32,23 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="0" column="0">
-    <widget class="QToolButton" name="closeButton">
+   <item row="1" column="2">
+    <widget class="QLabel" name="replaceLabel">
+     <property name="text">
+      <string>&amp;Replace:</string>
+     </property>
+     <property name="buddy">
+      <cstring>replacetextCombo</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="10">
+    <widget class="QCheckBox" name="selectionCheckBox">
      <property name="toolTip">
-      <string>Press to close the window</string>
+      <string>Select to search in the current selection only</string>
      </property>
      <property name="text">
-      <string/>
+      <string>&amp;Selection only</string>
      </property>
     </widget>
    </item>
@@ -59,28 +69,13 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="3">
-    <widget class="QComboBox" name="findtextCombo">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   <item row="0" column="5">
+    <widget class="QCheckBox" name="caseCheckBox">
+     <property name="toolTip">
+      <string>Select to match case sensitive</string>
      </property>
-     <property name="minimumSize">
-      <size>
-       <width>300</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="editable">
-      <bool>true</bool>
-     </property>
-     <property name="insertPolicy">
-      <enum>QComboBox::InsertAtTop</enum>
-     </property>
-     <property name="duplicatesEnabled">
-      <bool>false</bool>
+     <property name="text">
+      <string>&amp;Match case</string>
      </property>
     </widget>
    </item>
@@ -112,53 +107,8 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="5">
-    <widget class="QCheckBox" name="caseCheckBox">
-     <property name="text">
-      <string>&amp;Match case</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="6">
-    <widget class="QCheckBox" name="wordCheckBox">
-     <property name="text">
-      <string>Whole &amp;word</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="7">
-    <widget class="QCheckBox" name="regexpCheckBox">
-     <property name="text">
-      <string>Rege&amp;xp</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="8">
-    <widget class="QCheckBox" name="wrapCheckBox">
-     <property name="text">
-      <string>Wrap &amp;around</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="9">
-    <widget class="QCheckBox" name="selectionCheckBox">
-     <property name="text">
-      <string>&amp;Selection only</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2">
-    <widget class="QLabel" name="replaceLabel">
-     <property name="text">
-      <string>&amp;Replace:</string>
-     </property>
-     <property name="buddy">
-      <cstring>replacetextCombo</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="3">
-    <widget class="QComboBox" name="replacetextCombo">
+   <item row="0" column="3">
+    <widget class="QComboBox" name="findtextCombo">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -210,6 +160,81 @@
      </item>
     </layout>
    </item>
+   <item row="0" column="8">
+    <widget class="QCheckBox" name="regexpCheckBox">
+     <property name="toolTip">
+      <string>Select if the searchtext is a regular expression</string>
+     </property>
+     <property name="text">
+      <string>Rege&amp;xp</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QToolButton" name="closeButton">
+     <property name="toolTip">
+      <string>Press to close the window</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="9">
+    <widget class="QCheckBox" name="wrapCheckBox">
+     <property name="toolTip">
+      <string>Select to continue the search at the beginning or end</string>
+     </property>
+     <property name="text">
+      <string>Wrap &amp;around</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="3">
+    <widget class="QComboBox" name="replacetextCombo">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>300</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="editable">
+      <bool>true</bool>
+     </property>
+     <property name="insertPolicy">
+      <enum>QComboBox::InsertAtTop</enum>
+     </property>
+     <property name="duplicatesEnabled">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="6">
+    <widget class="QCheckBox" name="wordCheckBox">
+     <property name="toolTip">
+      <string>Select to match whole words only</string>
+     </property>
+     <property name="text">
+      <string>Whole &amp;word</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="7">
+    <widget class="QCheckBox" name="escapeCheckBox">
+     <property name="toolTip">
+      <string>Select if the search or replace text contains escape codes</string>
+     </property>
+     <property name="text">
+      <string>Escape</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>
@@ -223,10 +248,12 @@
   <tabstop>replaceButton</tabstop>
   <tabstop>caseCheckBox</tabstop>
   <tabstop>wordCheckBox</tabstop>
+  <tabstop>escapeCheckBox</tabstop>
   <tabstop>regexpCheckBox</tabstop>
   <tabstop>wrapCheckBox</tabstop>
   <tabstop>selectionCheckBox</tabstop>
   <tabstop>closeButton</tabstop>
+  <tabstop>modeToggleButton</tabstop>
  </tabstops>
  <resources/>
  <connections/>