Editor Update

.coveragerc

@@ -2,6 +2,9 @@
 timid = True
 branch = True
 source = src
+omit =
+    cq_editor/__main__.py
+    cq_editor/widgets/pyhighlight.py
 
 [report]
 exclude_lines =

conda/meta.yaml

@@ -14,21 +14,21 @@ build:
     - CQ-editor = cq_editor.__main__:main
 requirements:
   build:
-    - python >=3.8
+    - python >=3.10
     - setuptools
 
   run:
-    - python >=3.9
+    - python >=3.10
     - cadquery=master
     - ocp
     - logbook
     - pyqt=5.*
     - pyqtgraph
-    - spyder >=5.5.6,<6
+    - qtawesome=1.4.0
     - path
     - logbook
     - requests
-    - qtconsole >=5.5.1,<5.6.0
+    - qtconsole >=5.5.1,<5.7.0
 test:
   imports:
     - cq_editor

cq_editor/__main__.py

@@ -18,9 +18,16 @@ def main():
 
     args = parser.parse_args(app.arguments()[1:])
 
-    win = MainWindow(filename=args.filename if args.filename else None)
-    win.show()
-    sys.exit(app.exec_())
+    # sys.exit(app.exec_())
+
+    try:
+        win = MainWindow(filename=args.filename if args.filename else None)
+        win.show()
+        app.exec_()
+    except Exception as e:
+        import traceback
+
+        traceback.print_exc()
 
 
 if __name__ == "__main__":

cq_editor/icons.py

@@ -15,21 +15,21 @@
 import qtawesome as qta
 
 _icons_specs = {
-    "new": (("fa.file-o",), {}),
-    "open": (("fa.folder-open-o",), {}),
+    "new": (("fa5.file",), {}),
+    "open": (("fa5.folder-open",), {}),
     # borrowed from spider-ide
     "autoreload": [
-        ("fa.repeat", "fa.clock-o"),
+        ("fa5s.redo-alt", "fa5.clock"),
         {
             "options": [
                 {"scale_factor": 0.75, "offset": (-0.1, -0.1)},
                 {"scale_factor": 0.5, "offset": (0.25, 0.25)},
             ]
         },
     ],
-    "save": (("fa.save",), {}),
+    "save": (("fa5.save",), {}),
     "save_as": (
-        ("fa.save", "fa.pencil"),
+        ("fa5.save", "fa5s.pencil-alt"),
         {
             "options": [
                 {
@@ -39,12 +39,13 @@
             ]
         },
     ),
-    "run": (("fa.play",), {}),
-    "delete": (("fa.trash",), {}),
+    "run": (("fa5s.play",), {}),
+    "debug": (("fa5s.bug",), {}),
+    "delete": (("fa5s.trash",), {}),
     "delete-many": (
         (
-            "fa.trash",
-            "fa.trash",
+            "fa5s.trash",
+            "fa5s.trash",
         ),
         {
             "options": [
@@ -53,25 +54,30 @@
             ]
         },
     ),
-    "help": (("fa.life-ring",), {}),
-    "about": (("fa.info",), {}),
-    "preferences": (("fa.cogs",), {}),
+    "help": (("fa5s.life-ring",), {}),
+    "about": (("fa5s.info",), {}),
+    "preferences": (("fa5s.cogs",), {}),
     "inspect": (
-        ("fa.cubes", "fa.search"),
+        ("fa5s.cubes", "fa5s.search"),
         {"options": [{"scale_factor": 0.8, "offset": (0, 0), "color": "gray"}, {}]},
     ),
-    "screenshot": (("fa.camera",), {}),
+    "screenshot": (("fa5s.camera",), {}),
     "screenshot-save": (
-        ("fa.save", "fa.camera"),
+        ("fa5.save", "fa5s.camera"),
         {
             "options": [
                 {"scale_factor": 0.8},
                 {"scale_factor": 0.8, "offset": (0.2, 0.2)},
             ]
         },
     ),
-    "toggle-comment": (("fa.hashtag",), {}),
-    "search": (("fa.search",), {}),
+    "toggle-comment": (("fa5s.hashtag",), {}),
+    "search": (("fa5s.search",), {}),
+    "arrow-step-over": (("fa5s.step-forward",), {}),
+    "arrow-step-in": (("fa5s.angle-down",), {}),
+    "arrow-continue": (("fa5s.arrow-right",), {}),
+    "clear": (("fa5s.eraser",), {}),
+    "clear-2": (("fa5s.broom",), {}),
 }
 
 

cq_editor/main_window.py

@@ -323,6 +323,16 @@ def prepare_menubar(self):
         )
         menu_edit.addAction(self.autocomplete_action)
 
+        # Add the menu action to open the code search controls
+        self.search_action = QAction(
+            icon("search"),
+            "Search",
+            self,
+            shortcut="ctrl+F",
+            triggered=self.components["editor"].search_widget.show_search,
+        )
+        menu_edit.addAction(self.search_action)
+
         menu_edit.addAction(
             QAction(
                 icon("preferences"),

cq_editor/preferences.py

@@ -63,7 +63,7 @@ def add(self, name, component):
             for child in component.preferences.children():
                 # Fill the editor color scheme drop down list
                 if child.name() == "Color scheme":
-                    child.setLimits(["Spyder", "Monokai", "Zenburn"])
+                    child.setLimits(["Light", "Dark"])
                 # Fill the camera projection type
                 elif child.name() == "Projection Type":
                     child.setLimits(