Tue, 21 Dec 2021 15:21:28 +0100
Some optimizations to the find location and find in file panes.
--- a/eric7/UI/FindFileWidget.py Tue Dec 21 12:14:24 2021 +0100 +++ b/eric7/UI/FindFileWidget.py Tue Dec 21 15:21:28 2021 +0100 @@ -76,6 +76,10 @@ self.layout().setContentsMargins(0, 3, 0, 0) + self.caseToolButton.setIcon(UI.PixmapCache.getIcon("caseSensitive")) + self.wordToolButton.setIcon(UI.PixmapCache.getIcon("wholeWord")) + self.regexpToolButton.setIcon(UI.PixmapCache.getIcon("regexp")) + self.dirPicker.setMode(EricPathPickerModes.DIRECTORY_MODE) self.dirPicker.setInsertPolicy(QComboBox.InsertPolicy.InsertAtTop) self.dirPicker.setSizeAdjustPolicy( @@ -522,9 +526,9 @@ self.findProgress.setMaximum(len(files)) # retrieve the values - reg = self.regexpCheckBox.isChecked() - wo = self.wordCheckBox.isChecked() - cs = self.caseCheckBox.isChecked() + reg = self.regexpToolButton.isChecked() + wo = self.wordToolButton.isChecked() + cs = self.caseToolButton.isChecked() ct = self.findtextCombo.currentText() txt = ct if reg else re.escape(ct) if wo: @@ -595,7 +599,7 @@ if self.__cancelSearch: break - self.findProgressLabel.setPath(file) +# self.findProgressLabel.setPath(file) fn = ( os.path.join(self.project.getProjectPath(), file) @@ -672,6 +676,8 @@ self.findList.clear() self.replaceButton.setEnabled(False) self.clearButton.setEnabled(False) + self.findProgressLabel.setPath("") + self.findProgress.setValue(0) @pyqtSlot(QTreeWidgetItem, int) def on_findList_itemDoubleClicked(self, itm, column): @@ -784,7 +790,7 @@ file = itm.text(0) origHash = itm.data(0, self.md5Role) - self.findProgressLabel.setPath(file) +# self.findProgressLabel.setPath(file) if self.projectButton.isChecked(): fn = os.path.join(self.project.getProjectPath(), file)
--- 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>
--- a/eric7/UI/FindLocationWidget.ui Tue Dec 21 12:14:24 2021 +0100 +++ b/eric7/UI/FindLocationWidget.ui Tue Dec 21 15:21:28 2021 +0100 @@ -95,34 +95,30 @@ </layout> </item> <item> - <layout class="QHBoxLayout"> - <item> - <widget class="QCheckBox" name="projectCheckBox"> - <property name="toolTip"> - <string>Select to search in the project path</string> - </property> - <property name="text"> - <string>Search in &project</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="syspathCheckBox"> - <property name="toolTip"> - <string>Select to search in sys.path</string> - </property> - <property name="text"> - <string>Search in &sys.path</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - </layout> + <widget class="QCheckBox" name="projectCheckBox"> + <property name="toolTip"> + <string>Select to search in the project path</string> + </property> + <property name="text"> + <string>Search in &project</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="syspathCheckBox"> + <property name="toolTip"> + <string>Select to search in sys.path</string> + </property> + <property name="text"> + <string>Search in &sys.path</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_3">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric7/icons/breeze-dark/caseSensitive.svg Tue Dec 21 15:21:28 2021 +0100 @@ -0,0 +1,4 @@ +<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M16.5106 3.00008C16.8242 3.00452 17.1019 3.20362 17.2068 3.49919L22.7068 18.9992C22.8453 19.3896 22.6411 19.8183 22.2508 19.9568C21.8604 20.0953 21.4317 19.8912 21.2931 19.5008L19.8735 15.5L12.7558 15.5L11.1994 19.5207C11.0499 19.907 10.6155 20.099 10.2292 19.9494C9.84293 19.7999 9.651 19.3655 9.80053 18.9793L15.8005 3.47925C15.9137 3.18678 16.197 2.99563 16.5106 3.00008ZM16.4694 5.90659L13.3364 14L19.3412 14L16.4694 5.90659Z" fill="#eff0f1"/> +<path d="M5.50005 10.5014L5.78725 10.5113C7.74783 10.6088 8.91466 11.7373 8.9955 13.5555L9 13.7604V19.2604C9 19.6401 8.71785 19.9539 8.35177 20.0035L8.25 20.0104C7.8703 20.0104 7.55651 19.7282 7.50685 19.3621L7.5 19.2604L7.49865 19.156C6.51108 19.7214 5.59755 20.0104 4.75 20.0104C2.91158 20.0104 1.5 18.7159 1.5 16.7604C1.5 15.036 2.68843 13.7549 4.6597 13.5158C5.592 13.4028 6.53953 13.4736 7.49853 13.7255C7.4887 12.6184 6.94255 12.0706 5.71275 12.0095C4.75051 11.9616 4.07429 12.0967 3.67825 12.3744C3.33911 12.6123 2.87139 12.5301 2.63357 12.191C2.39576 11.8518 2.47789 11.3841 2.81703 11.1463C3.47484 10.685 4.37072 10.4807 5.50005 10.5014ZM7.499 15.3241L7.19613 15.2338C6.38875 15.0117 5.60483 14.9486 4.8403 15.0413C3.60791 15.1908 3 15.8461 3 16.7967C3 17.8934 3.7124 18.5467 4.75 18.5467C5.43032 18.5467 6.26848 18.2324 7.25129 17.583L7.499 17.4141V15.3241Z" fill="#eff0f1"/> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric7/icons/breeze-dark/regexp.svg Tue Dec 21 15:21:28 2021 +0100 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + version="1.1" + width="22" + height="22"> + <path + d="M 13.096762,14.649765 V 10.017722 L 9.2905676,12.355755 7.9487453,10.012608 11.920721,7.8337919 7.9487453,5.6225855 9.2973836,3.322179 13.096762,5.6499025 V 1 h 2.711763 V 5.6499025 L 19.642941,3.322179 21,5.6225855 17.010165,7.8337919 21,10.012608 19.637594,12.366407 15.808525,10.017722 v 4.632043 z m -6.4259499,3.507973 c 0,-2.179863 -2.3703053,-3.549673 -4.2563096,-2.459742 -1.88600371,1.089932 -1.88600324,3.829553 8e-7,4.919485 1.8860041,1.089931 4.2563088,-0.27988 4.2563088,-2.459743 z" + style="stroke-width:0.0391096;fill:#eff0f1;fill-opacity:1" /> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric7/icons/breeze-dark/wholeWord.svg Tue Dec 21 15:21:28 2021 +0100 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + width="22" + height="22" + viewBox="0 0 22 22" + fill="none" + version="1.1"> + <path + d="m 12.996936,3 c 0.452086,0 0.8186,0.3637724 0.8186,0.8125 V 8.8574315 C 14.353192,8.4095923 15.012765,8.1458332 15.725601,8.1458332 17.534052,8.1458332 19,9.8434165 19,11.937499 c 0,2.094084 -1.465948,3.791668 -3.274399,3.791668 -0.712836,0 -1.372409,-0.263793 -1.910065,-0.711642 V 15.1875 c 0,0.448717 -0.366514,0.8125 -0.8186,0.8125 -0.452085,0 -0.818599,-0.363783 -0.818599,-0.8125 V 3.8125 C 12.178337,3.3637724 12.544851,3 12.996936,3 Z m 2.728665,11.104166 c 0.676492,0 1.6372,-0.726049 1.6372,-2.166667 0,-1.440616 -0.960708,-2.1666659 -1.6372,-2.1666659 -0.67649,0 -1.637198,0.7260499 -1.637198,2.1666659 0,1.440618 0.960708,2.166667 1.637198,2.166667 z M 6.3433484,9.1610032 C 5.8429658,9.1801132 5.4161806,9.2958023 5.1771823,9.4144165 4.7728159,9.6150931 4.2810996,9.452409 4.0789164,9.0510556 3.8767332,8.6496916 4.0406387,8.1616499 4.4450051,7.9609732 4.9336544,7.7184691 5.5983354,7.5632599 6.2803708,7.5372057 c 0.6864557,-0.026228 1.4692552,0.075313 2.1712862,0.4238 1.550264,0.7695458 1.5456361,2.3020393 1.5439991,2.8461433 l -9.8e-5,0.04712 v 4.333118 c 0,0.448716 -0.3665039,0.812499 -0.8186001,0.812499 -0.431402,0 -0.7848623,-0.331283 -0.8163184,-0.751508 -0.9510926,0.583164 -2.0640824,0.921489 -3.2148478,0.61653 -2.2667351,-0.600816 -3.057273,-3.644225 -0.7894356,-5.144642 0.8453077,-0.559325 1.8583956,-0.706539 2.7572398,-0.661353 0.413873,0.0208 0.8224742,0.08314 1.2062337,0.175651 C 8.2596463,9.8977889 8.10659,9.6066106 7.7193378,9.4143732 7.3298918,9.2210631 6.8393105,9.1420556 6.3433484,9.1610032 Z m 2.01501,2.7758458 C 7.971772,11.804683 7.5080081,11.705774 7.0307864,11.681833 c -0.6863138,-0.03445 -1.3109489,0.08927 -1.7663523,0.390542 -1.0077834,0.666791 -0.7043995,1.955308 0.3037551,2.222567 0.8197019,0.217208 1.8207946,-0.198793 2.7901692,-1.079109 z" + style="stroke-width:1.08739;fill:#eff0f1;fill-opacity:1" /> + <path + style="fill:none;stroke:#eff0f1;stroke-width:1.46731px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" + d="m 1.7336471,13.001417 0.00998,5.16863 18.5176069,0.09314 0.0051,-5.257885" /> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric7/icons/breeze-light/caseSensitive.svg Tue Dec 21 15:21:28 2021 +0100 @@ -0,0 +1,4 @@ +<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M16.5106 3.00008C16.8242 3.00452 17.1019 3.20362 17.2068 3.49919L22.7068 18.9992C22.8453 19.3896 22.6411 19.8183 22.2508 19.9568C21.8604 20.0953 21.4317 19.8912 21.2931 19.5008L19.8735 15.5L12.7558 15.5L11.1994 19.5207C11.0499 19.907 10.6155 20.099 10.2292 19.9494C9.84293 19.7999 9.651 19.3655 9.80053 18.9793L15.8005 3.47925C15.9137 3.18678 16.197 2.99563 16.5106 3.00008ZM16.4694 5.90659L13.3364 14L19.3412 14L16.4694 5.90659Z" fill="#232629"/> +<path d="M5.50005 10.5014L5.78725 10.5113C7.74783 10.6088 8.91466 11.7373 8.9955 13.5555L9 13.7604V19.2604C9 19.6401 8.71785 19.9539 8.35177 20.0035L8.25 20.0104C7.8703 20.0104 7.55651 19.7282 7.50685 19.3621L7.5 19.2604L7.49865 19.156C6.51108 19.7214 5.59755 20.0104 4.75 20.0104C2.91158 20.0104 1.5 18.7159 1.5 16.7604C1.5 15.036 2.68843 13.7549 4.6597 13.5158C5.592 13.4028 6.53953 13.4736 7.49853 13.7255C7.4887 12.6184 6.94255 12.0706 5.71275 12.0095C4.75051 11.9616 4.07429 12.0967 3.67825 12.3744C3.33911 12.6123 2.87139 12.5301 2.63357 12.191C2.39576 11.8518 2.47789 11.3841 2.81703 11.1463C3.47484 10.685 4.37072 10.4807 5.50005 10.5014ZM7.499 15.3241L7.19613 15.2338C6.38875 15.0117 5.60483 14.9486 4.8403 15.0413C3.60791 15.1908 3 15.8461 3 16.7967C3 17.8934 3.7124 18.5467 4.75 18.5467C5.43032 18.5467 6.26848 18.2324 7.25129 17.583L7.499 17.4141V15.3241Z" fill="#232629"/> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric7/icons/breeze-light/regexp.svg Tue Dec 21 15:21:28 2021 +0100 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + version="1.1" + width="22" + height="22"> + <path + d="M 13.096762,14.649765 V 10.017722 L 9.2905676,12.355755 7.9487453,10.012608 11.920721,7.8337919 7.9487453,5.6225855 9.2973836,3.322179 13.096762,5.6499025 V 1 h 2.711763 V 5.6499025 L 19.642941,3.322179 21,5.6225855 17.010165,7.8337919 21,10.012608 19.637594,12.366407 15.808525,10.017722 v 4.632043 z m -6.4259499,3.507973 c 0,-2.179863 -2.3703053,-3.549673 -4.2563096,-2.459742 -1.88600371,1.089932 -1.88600324,3.829553 8e-7,4.919485 1.8860041,1.089931 4.2563088,-0.27988 4.2563088,-2.459743 z" + style="stroke-width:0.0391096;fill:#232629;fill-opacity:1" /> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric7/icons/breeze-light/wholeWord.svg Tue Dec 21 15:21:28 2021 +0100 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + width="22" + height="22" + viewBox="0 0 22 22" + fill="none" + version="1.1"> + <path + d="m 12.996936,3 c 0.452086,0 0.8186,0.3637724 0.8186,0.8125 V 8.8574315 C 14.353192,8.4095923 15.012765,8.1458332 15.725601,8.1458332 17.534052,8.1458332 19,9.8434165 19,11.937499 c 0,2.094084 -1.465948,3.791668 -3.274399,3.791668 -0.712836,0 -1.372409,-0.263793 -1.910065,-0.711642 V 15.1875 c 0,0.448717 -0.366514,0.8125 -0.8186,0.8125 -0.452085,0 -0.818599,-0.363783 -0.818599,-0.8125 V 3.8125 C 12.178337,3.3637724 12.544851,3 12.996936,3 Z m 2.728665,11.104166 c 0.676492,0 1.6372,-0.726049 1.6372,-2.166667 0,-1.440616 -0.960708,-2.1666659 -1.6372,-2.1666659 -0.67649,0 -1.637198,0.7260499 -1.637198,2.1666659 0,1.440618 0.960708,2.166667 1.637198,2.166667 z M 6.3433484,9.1610032 C 5.8429658,9.1801132 5.4161806,9.2958023 5.1771823,9.4144165 4.7728159,9.6150931 4.2810996,9.452409 4.0789164,9.0510556 3.8767332,8.6496916 4.0406387,8.1616499 4.4450051,7.9609732 4.9336544,7.7184691 5.5983354,7.5632599 6.2803708,7.5372057 c 0.6864557,-0.026228 1.4692552,0.075313 2.1712862,0.4238 1.550264,0.7695458 1.5456361,2.3020393 1.5439991,2.8461433 l -9.8e-5,0.04712 v 4.333118 c 0,0.448716 -0.3665039,0.812499 -0.8186001,0.812499 -0.431402,0 -0.7848623,-0.331283 -0.8163184,-0.751508 -0.9510926,0.583164 -2.0640824,0.921489 -3.2148478,0.61653 -2.2667351,-0.600816 -3.057273,-3.644225 -0.7894356,-5.144642 0.8453077,-0.559325 1.8583956,-0.706539 2.7572398,-0.661353 0.413873,0.0208 0.8224742,0.08314 1.2062337,0.175651 C 8.2596463,9.8977889 8.10659,9.6066106 7.7193378,9.4143732 7.3298918,9.2210631 6.8393105,9.1420556 6.3433484,9.1610032 Z m 2.01501,2.7758458 C 7.971772,11.804683 7.5080081,11.705774 7.0307864,11.681833 c -0.6863138,-0.03445 -1.3109489,0.08927 -1.7663523,0.390542 -1.0077834,0.666791 -0.7043995,1.955308 0.3037551,2.222567 0.8197019,0.217208 1.8207946,-0.198793 2.7901692,-1.079109 z" + style="stroke-width:1.08739;fill:#232629;fill-opacity:1" /> + <path + style="fill:none;stroke:#232629;stroke-width:1.46731px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" + d="m 1.7336471,13.001417 0.00998,5.16863 18.5176069,0.09314 0.0051,-5.257885" /> +</svg>