--- a/eric7/UI/FindFileWidget.ui Tue Dec 21 12:14:24 2021 +0100 +++ b/eric7/UI/FindFileWidget.ui Tue Dec 21 15:21:28 2021 +0100 @@ -10,7 +10,7 @@ <height>800</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> <layout class="QGridLayout" name="gridLayout_3"> <item row="0" column="0"> @@ -87,219 +87,62 @@ </layout> </item> <item> - <layout class="QGridLayout" name="gridLayout_4"> - <item row="0" column="0"> - <widget class="QCheckBox" name="caseCheckBox"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>0</number> + </property> + <item> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QToolButton" name="caseToolButton"> <property name="toolTip"> <string>Select to match case sensitive</string> </property> - <property name="text"> - <string>&Match upper/lower case</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QCheckBox" name="wordCheckBox"> - <property name="toolTip"> - <string>Select to match whole words only</string> - </property> - <property name="text"> - <string>Whole &word</string> - </property> - </widget> - </item> - <item row="1" column="0" colspan="2"> - <widget class="QCheckBox" name="regexpCheckBox"> - <property name="toolTip"> - <string>Select if the searchtext is a regular expression</string> - </property> - <property name="text"> - <string>Regular &Expression</string> + <property name="checkable"> + <bool>true</bool> </property> </widget> </item> - </layout> - </item> - <item> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0" rowspan="2"> - <widget class="QGroupBox" name="groupBox"> - <property name="title"> - <string>File type</string> + <item> + <widget class="QToolButton" name="wordToolButton"> + <property name="toolTip"> + <string>Select to match whole words only</string> </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QCheckBox" name="sourcesCheckBox"> - <property name="toolTip"> - <string>Search in source files</string> - </property> - <property name="text"> - <string>&Sources</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QCheckBox" name="interfacesCheckBox"> - <property name="toolTip"> - <string>Search in interfaces</string> - </property> - <property name="text"> - <string>&Interfaces</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="formsCheckBox"> - <property name="toolTip"> - <string>Search in forms</string> - </property> - <property name="text"> - <string>&Forms</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QCheckBox" name="protocolsCheckBox"> - <property name="toolTip"> - <string>Search in protocols</string> - </property> - <property name="text"> - <string>&Protocols</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QCheckBox" name="resourcesCheckBox"> - <property name="toolTip"> - <string>Search in resources</string> - </property> - <property name="text"> - <string>&Resources</string> - </property> - </widget> - </item> - <item row="3" column="0" colspan="2"> - <widget class="Line" name="line"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item row="4" column="0" colspan="2"> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QCheckBox" name="filterCheckBox"> - <property name="toolTip"> - <string>Select to filter the files by a given filename pattern</string> - </property> - <property name="text"> - <string>Fi&lter</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="filterEdit"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enter the filename wildcards separated by ';'</string> - </property> - <property name="clearButtonEnabled"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </item> - </layout> + <property name="checkable"> + <bool>true</bool> + </property> </widget> </item> - <item row="0" column="1"> - <widget class="QGroupBox" name="groupBox_2"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Find in</string> + <item> + <widget class="QToolButton" name="regexpToolButton"> + <property name="toolTip"> + <string>Select if the searchtext is a regular expression</string> </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QRadioButton" name="projectButton"> - <property name="toolTip"> - <string>Search in files of the current project</string> - </property> - <property name="text"> - <string>&Project</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="dirButton"> - <property name="toolTip"> - <string>Search in files of a directory tree to be entered below</string> - </property> - <property name="text"> - <string>&Directory tree</string> - </property> - </widget> - </item> - <item> - <widget class="EricComboPathPicker" name="dirPicker" native="true"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="focusPolicy"> - <enum>Qt::WheelFocus</enum> - </property> - <property name="toolTip"> - <string>Enter the directory to search in</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="openFilesButton"> - <property name="toolTip"> - <string>Search in open files only </string> - </property> - <property name="text"> - <string>&Open files only</string> - </property> - </widget> - </item> - </layout> + <property name="checkable"> + <bool>true</bool> + </property> </widget> </item> - <item row="1" column="1"> - <spacer name="verticalSpacer"> + <item> + <spacer name="horizontalSpacer_4"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>20</width> - <height>13</height> + <width>40</width> + <height>20</height> </size> </property> </spacer> @@ -307,6 +150,185 @@ </layout> </item> <item> + <widget class="QTabWidget" name="fileOptionsWidget"> + <property name="currentIndex"> + <number>0</number> + </property> + <widget class="QWidget" name="fileTypeTab"> + <attribute name="title"> + <string>File Type</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="0"> + <widget class="QCheckBox" name="sourcesCheckBox"> + <property name="toolTip"> + <string>Search in source files</string> + </property> + <property name="text"> + <string>&Sources</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QCheckBox" name="interfacesCheckBox"> + <property name="toolTip"> + <string>Search in interfaces</string> + </property> + <property name="text"> + <string>&Interfaces</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="formsCheckBox"> + <property name="toolTip"> + <string>Search in forms</string> + </property> + <property name="text"> + <string>&Forms</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QCheckBox" name="protocolsCheckBox"> + <property name="toolTip"> + <string>Search in protocols</string> + </property> + <property name="text"> + <string>&Protocols</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="resourcesCheckBox"> + <property name="toolTip"> + <string>Search in resources</string> + </property> + <property name="text"> + <string>&Resources</string> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QCheckBox" name="filterCheckBox"> + <property name="toolTip"> + <string>Select to filter the files by a given filename pattern</string> + </property> + <property name="text"> + <string>Fi&lter</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="filterEdit"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter the filename wildcards separated by ';'</string> + </property> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <widget class="QWidget" name="findInTab"> + <attribute name="title"> + <string>Find In</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QRadioButton" name="projectButton"> + <property name="toolTip"> + <string>Search in files of the current project</string> + </property> + <property name="text"> + <string>&Project</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="dirButton"> + <property name="toolTip"> + <string>Search in files of a directory tree to be entered below</string> + </property> + <property name="text"> + <string>&Directory tree</string> + </property> + </widget> + </item> + <item> + <widget class="EricComboPathPicker" name="dirPicker" native="true"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::WheelFocus</enum> + </property> + <property name="toolTip"> + <string>Enter the directory to search in</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="openFilesButton"> + <property name="toolTip"> + <string>Search in open files only </string> + </property> + <property name="text"> + <string>&Open files only</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </widget> + </item> + <item> <widget class="QCheckBox" name="excludeHiddenCheckBox"> <property name="toolTip"> <string>Select to exclude hidden files and directories when searching a directory tree.</string> @@ -477,9 +499,10 @@ <tabstop>findtextCombo</tabstop> <tabstop>modeToggleButton</tabstop> <tabstop>replacetextCombo</tabstop> - <tabstop>caseCheckBox</tabstop> - <tabstop>wordCheckBox</tabstop> - <tabstop>regexpCheckBox</tabstop> + <tabstop>caseToolButton</tabstop> + <tabstop>wordToolButton</tabstop> + <tabstop>regexpToolButton</tabstop> + <tabstop>fileOptionsWidget</tabstop> <tabstop>sourcesCheckBox</tabstop> <tabstop>formsCheckBox</tabstop> <tabstop>resourcesCheckBox</tabstop> @@ -499,38 +522,5 @@ <tabstop>replaceButton</tabstop> </tabstops> <resources/> - <connections> - <connection> - <sender>filterCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>filterEdit</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>53</x> - <y>195</y> - </hint> - <hint type="destinationlabel"> - <x>191</x> - <y>196</y> - </hint> - </hints> - </connection> - <connection> - <sender>dirButton</sender> - <signal>toggled(bool)</signal> - <receiver>dirPicker</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>409</x> - <y>144</y> - </hint> - <hint type="destinationlabel"> - <x>408</x> - <y>176</y> - </hint> - </hints> - </connection> - </connections> + <connections/> </ui>