Update qtextpad and re-add code folding support.

CMakeLists.txt

@@ -15,6 +15,7 @@ endif()
 find_package(HSPlasma REQUIRED)
 find_package(string_theory 2.0 REQUIRED)
 find_package(Qt5 5.8 REQUIRED COMPONENTS Core Gui Widgets)
+find_package(KF5SyntaxHighlighting REQUIRED)
 find_package(PythonInterp REQUIRED)
 
 if(KF5SyntaxHighlighting_VERSION VERSION_LESS "5.39.0")

src/PlasmaShop/OptionsDialog.cpp

@@ -90,6 +90,7 @@ OptionsDialog::OptionsDialog(QWidget* parent)
     // Editor tab
     QWidget* tabEditor = new QWidget(tabs);
     fSciLineNumbers = new QCheckBox(tr("&Line numbers"), tabEditor);
+    fSciFolding = new QCheckBox(tr("Code f&olding"), tabEditor);
     fSciUseSpaces = new QCheckBox(tr("Use &spaces instead of tabs"), tabEditor);
     fSciAutoIndent = new QCheckBox(tr("&Auto-indent"), tabEditor);
     fSciIndentGuides = new QCheckBox(tr("Show in&dentation guides"), tabEditor);
@@ -110,10 +111,11 @@ OptionsDialog::OptionsDialog(QWidget* parent)
     layEditor->setContentsMargins(8, 8, 8, 8);
     layEditor->setVerticalSpacing(4);
     layEditor->addWidget(fSciLineNumbers, 0, 0);
-    layEditor->addWidget(fSciUseSpaces, 1, 0);
-    layEditor->addWidget(fSciAutoIndent, 2, 0);
-    layEditor->addWidget(fSciIndentGuides, 3, 0);
-    layEditor->addWidget(fSciShowWhitespace, 4, 0);
+    layEditor->addWidget(fSciFolding, 1, 0);
+    layEditor->addWidget(fSciUseSpaces, 2, 0);
+    layEditor->addWidget(fSciAutoIndent, 3, 0);
+    layEditor->addWidget(fSciIndentGuides, 4, 0);
+    layEditor->addWidget(fSciShowWhitespace, 5, 0);
     layEditor->addItem(new QSpacerItem(32, 0, QSizePolicy::Minimum, QSizePolicy::Minimum), 0, 1);
     layEditor->addWidget(fSciFont, 0, 2, 1, 2);
     layEditor->addItem(new QSpacerItem(0, 16, QSizePolicy::Minimum, QSizePolicy::Minimum), 1, 2, 1, 2);
@@ -143,6 +145,7 @@ OptionsDialog::OptionsDialog(QWidget* parent)
     fVaultEditorPath->setText(settings.value("VaultEditorPath", DEFAULT_VAULT_EDITOR).toString());
     fImageEditorPath->setText(settings.value("ImageEditorPath", "").toString());
     fSciLineNumbers->setChecked(settings.value("SciLineNumberMargin", true).toBool());
+    fSciFolding->setChecked(settings.value("SciFoldMargin", false).toBool());
     fSciUseSpaces->setChecked(settings.value("SciUseSpaces", true).toBool());
     fSciAutoIndent->setChecked(settings.value("SciAutoIndent", true).toBool());
     fSciIndentGuides->setChecked(settings.value("SciIndentGuides", false).toBool());
@@ -198,6 +201,7 @@ void OptionsDialog::onSave()
     settings.setValue("VaultEditorPath", fVaultEditorPath->text());
     settings.setValue("ImageEditorPath", fImageEditorPath->text());
     settings.setValue("SciLineNumberMargin", fSciLineNumbers->isChecked());
+    settings.setValue("SciFoldMargin", fSciFolding->isChecked());
     settings.setValue("SciUseSpaces", fSciUseSpaces->isChecked());
     settings.setValue("SciAutoIndent", fSciAutoIndent->isChecked());
     settings.setValue("SciIndentGuides", fSciIndentGuides->isChecked());

src/PlasmaShop/OptionsDialog.h

@@ -43,6 +43,7 @@ class OptionsDialog : public QDialog
     QLineEdit* fImageEditorPath;
 
     QCheckBox* fSciLineNumbers;
+    QCheckBox* fSciFolding;
     QCheckBox* fSciUseSpaces;
     QCheckBox* fSciAutoIndent;
     QCheckBox* fSciIndentGuides;

src/PlasmaShop/QPlasmaTextDoc.cpp

@@ -346,10 +346,8 @@ void QPlasmaTextDoc::updateSettings()
                 ? SyntaxTextEdit::IndentSpaces : SyntaxTextEdit::IndentTabs);
     fEditor->setAutoIndent(settings.value("SciAutoIndent", true).toBool());
 
-    if (settings.value("SciMargin", true).toBool())
-        fEditor->setShowLineNumbers(settings.value("SciLineNumberMargin", true).toBool());
-    else
-        fEditor->setShowLineNumbers(false);
+    fEditor->setShowLineNumbers(settings.value("SciLineNumberMargin", true).toBool());
+    fEditor->setShowFolding(settings.value("SciFoldMargin", false).toBool());
 
     QTextOption opt = fEditor->document()->defaultTextOption();
     if (settings.value("SciShowWhitespace", false).toBool())
@@ -362,11 +360,6 @@ void QPlasmaTextDoc::updateSettings()
     fEditor->setShowLongLineEdge(settings.value("SciLongLineMark", false).toBool());
     fEditor->setLongLineWidth(settings.value("SciLongLineSize", 80).toInt());
     fEditor->setShowIndentGuides(settings.value("SciIndentGuides", false).toBool());
-
-    /* TODO if necessary:
-    if (settings.value("SciMargin", true).toBool())
-        fEditor->setFoldingEnabled(settings.value("SciFoldMargin", true).toBool());
-    */
 }
 
 void QPlasmaTextDoc::textFind()

src/PrpShop/QPrcEditor.cpp

@@ -114,16 +114,8 @@ void QPrcEditor::updateSettings()
     fEditor->setTabWidth(settings.value("SciTabWidth", 4).toInt());
     fEditor->setAutoIndent(settings.value("SciAutoIndent", true).toBool());
 
-    if (settings.value("SciMargin", true).toBool())
-        fEditor->setShowLineNumbers(settings.value("SciLineNumberMargin", true).toBool());
-    else
-        fEditor->setShowLineNumbers(false);
-
-    /* TODO if necessary:
-    fEditor->setIndentationGuides(settings.value("SciIndentGuides", false).toBool());
-    if (settings.value("SciMargin", true).toBool())
-        fEditor->setFoldingEnabled(settings.value("SciFoldMargin", true).toBool());
-    */
+    fEditor->setShowLineNumbers(settings.value("SciLineNumberMargin", true).toBool());
+    fEditor->setShowFolding(settings.value("SciFoldMargin", false).toBool());
 }
 
 void QPrcEditor::showCursorPosition()

src/QPlasmaTextEdit.cpp

@@ -38,10 +38,6 @@ QPlasmaTextEdit::QPlasmaTextEdit(QWidget* parent)
 {
     setTabWidth(8);
     setHighlightCurrentLine(true);
-
-    setTheme((palette().color(QPalette::Base).lightness() < 128)
-             ? SyntaxRepo()->defaultTheme(KSyntaxHighlighting::Repository::DarkTheme)
-             : SyntaxRepo()->defaultTheme(KSyntaxHighlighting::Repository::LightTheme));
 }
 
 void QPlasmaTextEdit::setSyntax(const QString& name)