add search to editor

TuringApp · Apr 13, 2018 · f31cae5 · f31cae5
1 parent 84c0fba
commit f31cae5
Show file tree

Hide file tree

Showing 5 changed files with 7,007 additions and 6,849 deletions.
diff --git a/src/forms/inline_code_editor.py b/src/forms/inline_code_editor.py
@@ -40,6 +40,8 @@ def __init__(self, parent=None):
         self.ui.btnClear.clicked.connect(self.clear)
         self.ui.btnClear.setVisible(False)
 
+        self.ui.txtSearch.textChanged.connect(self.search_changed)
+
         self.on_sel(0)
 
     def get_text(self):
@@ -49,9 +51,9 @@ def set_text(self, text: str):
         self.ui.txtExpr.setText(text)
 
     def on_sel(self, id: int):
-        for idx, items in enumerate(self.doc_items):
-            for it in items:
-                it.setHidden(idx != id)
+        self.current_sel = id
+        self.ui.txtSearch.setText("")
+        self.search_changed("")
 
     def load_funcs(self):
         self.functions = maths.lib.get_funcs()
@@ -96,3 +98,8 @@ def clear(self):
 
     def txt_changed(self, txt: str):
         self.ui.btnClear.setVisible(bool(txt))
+
+    def search_changed(self, txt: str):
+        for idx, items in enumerate(self.doc_items):
+            for it in items:
+                it.setHidden(idx != self.current_sel or txt not in it.statusTip())
diff --git a/src/forms/w_inline_code.py b/src/forms/w_inline_code.py
@@ -38,9 +38,27 @@ def setupUi(self, InlineCodeEditor):
         self.verticalLayout.addLayout(self.horizontalLayout)
         self.verticalLayout_2 = QtWidgets.QVBoxLayout()
         self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.cbxFuncs = QtWidgets.QComboBox(InlineCodeEditor)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.cbxFuncs.sizePolicy().hasHeightForWidth())
+        self.cbxFuncs.setSizePolicy(sizePolicy)
         self.cbxFuncs.setObjectName("cbxFuncs")
-        self.verticalLayout_2.addWidget(self.cbxFuncs)
+        self.horizontalLayout_2.addWidget(self.cbxFuncs)
+        self.txtSearch = QtWidgets.QLineEdit(InlineCodeEditor)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.txtSearch.sizePolicy().hasHeightForWidth())
+        self.txtSearch.setSizePolicy(sizePolicy)
+        self.txtSearch.setObjectName("txtSearch")
+        self.horizontalLayout_2.addWidget(self.txtSearch)
+        self.horizontalLayout_2.setStretch(0, 1)
+        self.horizontalLayout_2.setStretch(1, 2)
+        self.verticalLayout_2.addLayout(self.horizontalLayout_2)
         self.lstFuncs = QtWidgets.QListWidget(InlineCodeEditor)
         self.lstFuncs.setObjectName("lstFuncs")
         self.verticalLayout_2.addWidget(self.lstFuncs)
@@ -50,8 +68,7 @@ def setupUi(self, InlineCodeEditor):
         QtCore.QMetaObject.connectSlotsByName(InlineCodeEditor)
         InlineCodeEditor.setTabOrder(self.txtExpr, self.btnClear)
         InlineCodeEditor.setTabOrder(self.btnClear, self.btnSubmit)
-        InlineCodeEditor.setTabOrder(self.btnSubmit, self.cbxFuncs)
-        InlineCodeEditor.setTabOrder(self.cbxFuncs, self.lstFuncs)
+        InlineCodeEditor.setTabOrder(self.btnSubmit, self.lstFuncs)
 
     def retranslateUi(self, InlineCodeEditor):
         pass

diff --git a/src/forms/w_inline_code.ui b/src/forms/w_inline_code.ui
@@ -58,7 +58,28 @@
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
-      <widget class="QComboBox" name="cbxFuncs"/>
+      <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,2">
+       <item>
+        <widget class="QComboBox" name="cbxFuncs">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="txtSearch">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
       <widget class="QListWidget" name="lstFuncs"/>
@@ -71,7 +92,6 @@
   <tabstop>txtExpr</tabstop>
   <tabstop>btnClear</tabstop>
   <tabstop>btnSubmit</tabstop>
-  <tabstop>cbxFuncs</tabstop>
   <tabstop>lstFuncs</tabstop>
  </tabstops>
  <resources>

diff --git a/src/turing.qrc b/src/turing.qrc
@@ -56,6 +56,7 @@
         <file>media/zoom_in.png</file>
         <file>media/zoom_out.png</file>
         <file>media/zoom_reset.png</file>
+        <file>media/backspace.png</file>
     </qresource>
     <qresource prefix="/icon">
         <file>media/icon_16.png</file>