WIP: Enable case sensitive and add icons

preditor/gui/find_files.py

@@ -3,9 +3,11 @@
 from collections import deque
 
 from Qt.QtCore import Qt
+from Qt.QtGui import QIcon
 from Qt.QtWidgets import QApplication, QShortcut, QWidget
 
-from ..gui import loadUi
+from .. import resourcePath
+from . import loadUi
 
 
 class FindFiles(QWidget):
@@ -18,19 +20,38 @@ def __init__(self, parent=None, managers=None, console=None):
 
         loadUi(__file__, self)
 
+        # Set the icons
+        self.uiCaseSensitiveBTN.setIcon(
+            QIcon(resourcePath("img/format-letter-case.svg"))
+        )
+        self.uiCloseBTN.setIcon(QIcon(resourcePath('img/close-thick.png')))
+        self.uiRegexBTN.setIcon(QIcon(resourcePath("img/regex.svg")))
+
+        # Create shortcuts
         self.uiCloseSCT = QShortcut(
             Qt.Key_Escape, self, context=Qt.WidgetWithChildrenShortcut
         )
         self.uiCloseSCT.activated.connect(self.hide)
 
+        self.uiCaseSensitiveSCT = QShortcut(
+            Qt.AltModifier | Qt.Key_C, self, context=Qt.WidgetWithChildrenShortcut
+        )
+        self.uiCaseSensitiveSCT.activated.connect(self.uiCaseSensitiveBTN.toggle)
+
+        self.uiRegexSCT = QShortcut(
+            Qt.AltModifier | Qt.Key_R, self, context=Qt.WidgetWithChildrenShortcut
+        )
+        self.uiRegexSCT.activated.connect(self.uiRegexBTN.toggle)
+
     def activate(self):
         """Called to make this widget ready for the user to interact with."""
         self.show()
         self.uiFindTXT.setFocus()
 
     def find(self):
         find_text = self.uiFindTXT.text()
-        self.insert_text("\nFind in workboxs: {}\n\n".format(find_text))
+        cs = " (case sensitive)" if self.uiCaseSensitiveBTN.isChecked() else ""
+        self.insert_text('\nFind in workboxs: "{}"{}\n\n'.format(find_text, cs))
 
         for manager in self.managers:
             for (
@@ -118,7 +139,14 @@ def search_file_simple(self, editor, path, workbox_id):
         find_text = self.uiFindTXT.text()
         # Ensure the editor text is loaded
         editor.__show__()
-        raw_lines = editor.__text__().splitlines()
+
+        raw_text = editor.__text__()
+        # Handle case-insensitive searching
+        if not self.uiCaseSensitiveBTN.isChecked():
+            find_text = find_text.lower()
+            raw_lines = raw_text.lower()
+
+        raw_lines = raw_text.splitlines()
         # Add enough padding to cover the number of lines in the file
         padding = len(str(len(raw_lines)))
         fmt = "  {{num: >{}}}{{split}} {{line}}".format(padding)

preditor/gui/ui/find_files.ui

@@ -25,28 +25,37 @@
     <layout class="QHBoxLayout" name="uiFindOptionsLYT">
      <item>
       <widget class="QToolButton" name="uiRegexBTN">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
        <property name="toolTip">
-        <string>Regex</string>
+        <string>Regex (Alt + R)</string>
        </property>
        <property name="text">
         <string>Regex</string>
        </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="uiCaseSensitiveBTN">
        <property name="toolTip">
-        <string>Case Sensitive</string>
+        <string>Case Sensitive (Alt + C)</string>
        </property>
        <property name="text">
         <string>Case Sensitive</string>
        </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item>
       <widget class="QSpinBox" name="uiContextSPN">
        <property name="toolTip">
-        <string>Context Lines</string>
+        <string># of lines of context to show</string>
        </property>
        <property name="buttonSymbols">
         <enum>QAbstractSpinBox::PlusMinus</enum>

preditor/gui/ui/loggerwindow.ui

@@ -134,7 +134,7 @@
    </widget>
    <widget class="QMenu" name="menu_Run">
     <property name="title">
-     <string>&amp;Run</string>
+     <string>Run</string>
     </property>
     <addaction name="uiRunSelectedACT"/>
     <addaction name="uiRunAllACT"/>

preditor/resource/img/README.md

@@ -5,3 +5,13 @@
 Converted to multi-resolution icon using: https://convertico.com/svg-to-ico/
 
 Most other icons downloaded from https://materialdesignicons.com/.
+
+Svg icons are preferred as they are plain text files that play nicely with git.
+Please make sure to update the sources table when adding or updating images.
+
+# Sources for resources
+
+| File | Source | Notes | Author |
+|---|---|---|---|
+| ![](preditor/resource/img/format-letter-case.svg) [content-save.svg](preditor/resource/img/format-letter-case.svg) | https://pictogrammers.com/library/mdi/icon/format-letter-case/ |  | [Austin Andrews](https://pictogrammers.com/contributor/Templarian/) |
+| ![](preditor/resource/img/regex.svg) [content-save.svg](preditor/resource/img/regex.svg) | https://pictogrammers.com/library/mdi/icon/regex/ |  | [Doug C. Hardester](https://pictogrammers.com/contributor/r3volution11/) |