Release 3 01

.gitignore

@@ -47,3 +47,5 @@ android-libvesc_tool.so-deployment-settings.json
 android_release_vesctool.keystore
 build_android_signed
 *.DS_Store
+
+res/firmwares/*/

QCodeEditor/include/LispHighlighter

@@ -0,0 +1,3 @@
+#pragma once
+
+#include <internal/LispHighlighter.hpp>

QCodeEditor/include/QLispCompleter

@@ -0,0 +1,3 @@
+#pragma once
+
+#include <internal/QLispCompleter.hpp>

QCodeEditor/include/internal/LispHighlighter.hpp

@@ -0,0 +1,37 @@
+#pragma once
+
+// QCodeEditor
+#include <QStyleSyntaxHighlighter> // Required for inheritance
+#include <QHighlightRule>
+
+// Qt
+#include <QRegularExpression>
+#include <QVector>
+
+class QSyntaxStyle;
+
+/**
+ * @brief Class, that describes C++ code
+ * highlighter.
+ */
+class LispHighlighter : public QStyleSyntaxHighlighter
+{
+    Q_OBJECT
+public:
+
+    /**
+     * @brief Constructor.
+     * @param document Pointer to document.
+     */
+    explicit LispHighlighter(QTextDocument* document=nullptr);
+
+protected:
+    void highlightBlock(const QString& text) override;
+
+private:
+    QVector<QHighlightRule> m_highlightRules;
+    QVector<QHighlightRule> m_highlightRulesLang;
+    QRegularExpression m_keyRegex;
+
+};
+

QCodeEditor/include/internal/QCodeEditor.hpp

@@ -51,13 +51,25 @@ class QCodeEditor : public QTextEdit
     void searchPreviousResult();
     void searchSetCaseSensitive(bool isCaseSensitive);
 
+    QString getCommentStr() const;
+    void setCommentStr(const QString &commentStr);
+
+    void setIndentStrs(const QString &start, const QString &end);
+
+    bool getSeparateMinus() const;
+    void setSeparateMinus(bool separateMinus);
+
+    bool highlightBlocks() const;
+    void setHighlightBlocks(bool newHighlightBlocks);
+
 signals:
     void saveTriggered();
     void runEmbeddedTriggered();
     void runWindowTriggered();
     void stopTriggered();
     void clearConsoleTriggered();
     void searchTriggered();
+    void runBlockTriggered(QString text);
 
 public Q_SLOTS:
 
@@ -124,6 +136,7 @@ public Q_SLOTS:
      * 4. Auto parenthesis
      */
     void keyPressEvent(QKeyEvent* e) override;
+    void keyReleaseEvent(QKeyEvent* e) override;
 
     /**
      * @brief Method, that's called on focus into widget.
@@ -184,7 +197,9 @@ public Q_SLOTS:
      * @brief Method, that adds highlighting of
      * parenthesis if available.
      */
-    void highlightParenthesis(QList<QTextEdit::ExtraSelection>& extraSelection);
+    void highlightParenthesis(
+            QList<QTextEdit::ExtraSelection>& extraSelection,
+            bool selectBlock);
 
     void highlightSearch(QList<QTextEdit::ExtraSelection>& extraSelection);
 
@@ -210,5 +225,12 @@ public Q_SLOTS:
     bool m_autoParentheses;
     bool m_replaceTab;
     QString m_tabReplace;
+    QString m_commentStr;
+    QString m_indentStartStr;
+    QString m_indentEndStr;
+    bool m_separateMinus;
+    bool m_highlightBlocks;
+    QString m_highlightedBlock;
+
 };
 

QCodeEditor/include/internal/QLispCompleter.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <QCompleter>
+
+class QLispCompleter : public QCompleter
+{
+    Q_OBJECT
+
+public:
+    explicit QLispCompleter(QObject* parent=nullptr);
+
+};
+
+

QCodeEditor/qcodeeditor.pri

@@ -1,4 +1,5 @@
 HEADERS += \
+    $$PWD/include/internal/LispHighlighter.hpp \
     $$PWD/include/internal/QCodeEditor.hpp \
     $$PWD/include/internal/QCXXHighlighter.hpp \
     $$PWD/include/internal/QFramedTextAttribute.hpp \
@@ -9,6 +10,7 @@ HEADERS += \
     $$PWD/include/internal/QJSONHighlighter.hpp \
     $$PWD/include/internal/QLanguage.hpp \
     $$PWD/include/internal/QLineNumberArea.hpp \
+    $$PWD/include/internal/QLispCompleter.hpp \
     $$PWD/include/internal/QLuaCompleter.hpp \
     $$PWD/include/internal/QLuaHighlighter.hpp \
     $$PWD/include/internal/QPythonCompleter.hpp \
@@ -20,6 +22,7 @@ HEADERS += \
     $$PWD/include/internal/QVescCompleter.hpp
 
 SOURCES += \
+    $$PWD/src/internal/LispHighlighter.cpp \
     $$PWD/src/internal/QCodeEditor.cpp \
     $$PWD/src/internal/QCXXHighlighter.cpp \
     $$PWD/src/internal/QFramedTextAttribute.cpp \
@@ -28,6 +31,7 @@ SOURCES += \
     $$PWD/src/internal/QJSONHighlighter.cpp \
     $$PWD/src/internal/QLanguage.cpp \
     $$PWD/src/internal/QLineNumberArea.cpp \
+    $$PWD/src/internal/QLispCompleter.cpp \
     $$PWD/src/internal/QLuaCompleter.cpp \
     $$PWD/src/internal/QLuaHighlighter.cpp \
     $$PWD/src/internal/QPythonCompleter.cpp \

QCodeEditor/resources/dark_style.xml

@@ -63,4 +63,5 @@
     <style name="Declaration" bold="true"/>
     <style name="FunctionDefinition"/>
     <style name="OutputArgument" italic="true"/>
+    <style name="HighlightedBlock" background="#276727"/>
 </style-scheme>

QCodeEditor/resources/default_style.xml

@@ -63,4 +63,5 @@
     <style name="Declaration" bold="true"/>
     <style name="FunctionDefinition"/>
     <style name="OutputArgument" italic="true"/>
+    <style name="HighlightedBlock" background="#ccccff"/>
 </style-scheme>