diff --git a/RedPandaIDE/colorschemes/Borland.scheme b/RedPandaIDE/colorschemes/Borland.scheme index 4c2ab152..2f2a8145 100644 --- a/RedPandaIDE/colorschemes/Borland.scheme +++ b/RedPandaIDE/colorschemes/Borland.scheme @@ -160,6 +160,9 @@ "foreground" : "#000000", "background" : "#00FFFF" }, + "Fold Line" : { + "foreground" : "#FFFF00" + }, "Active Line" : { "background" : "#000050" }, diff --git a/RedPandaIDE/colorschemes/Classic.scheme b/RedPandaIDE/colorschemes/Classic.scheme index 54af015c..37ae4883 100644 --- a/RedPandaIDE/colorschemes/Classic.scheme +++ b/RedPandaIDE/colorschemes/Classic.scheme @@ -160,6 +160,9 @@ "foreground" : "#FFFFFF", "background" : "#0000FF" }, + "Fold Line" : { + "foreground" : "#000000" + }, "Active Line" : { "background" : "#CCFFFF" }, diff --git a/RedPandaIDE/colorschemes/Classic_Plus.scheme b/RedPandaIDE/colorschemes/Classic_Plus.scheme index e2b132df..65b3dab1 100644 --- a/RedPandaIDE/colorschemes/Classic_Plus.scheme +++ b/RedPandaIDE/colorschemes/Classic_Plus.scheme @@ -160,6 +160,9 @@ "foreground" : "#FFFFFF", "background" : "#0000FF" }, + "Fold Line" : { + "foreground" : "#000000" + }, "Active Line" : { "background" : "#CCFFFF" }, diff --git a/RedPandaIDE/colorschemes/GSS_Hacker.scheme b/RedPandaIDE/colorschemes/GSS_Hacker.scheme index d8393394..e5509fe2 100644 --- a/RedPandaIDE/colorschemes/GSS_Hacker.scheme +++ b/RedPandaIDE/colorschemes/GSS_Hacker.scheme @@ -178,6 +178,9 @@ "foreground" : "#FFFFFF", "background" : "#008E99" }, + "Fold Line" : { + "foreground" : "#A5A5A5" + }, "Active Line" : { "background" : "#323232" }, diff --git a/RedPandaIDE/colorschemes/Intellij_Classic.scheme b/RedPandaIDE/colorschemes/Intellij_Classic.scheme index 83022258..54d8a414 100644 --- a/RedPandaIDE/colorschemes/Intellij_Classic.scheme +++ b/RedPandaIDE/colorschemes/Intellij_Classic.scheme @@ -160,6 +160,9 @@ "foreground" : "#FFFFFF", "background" : "#0000FF" }, + "Fold Line" : { + "foreground" : "#000000" + }, "Active Line" : { "background" : "#CCFFFF" }, diff --git a/RedPandaIDE/colorschemes/Matrix.scheme b/RedPandaIDE/colorschemes/Matrix.scheme index 94bfc495..9a5da5b7 100644 --- a/RedPandaIDE/colorschemes/Matrix.scheme +++ b/RedPandaIDE/colorschemes/Matrix.scheme @@ -161,6 +161,9 @@ "foreground" : "#FFFFFF", "background" : "#0000FF" }, + "Fold Line" : { + "foreground" : "#FF0000" + }, "Active Line" : { "background" : "#202020" }, diff --git a/RedPandaIDE/colorschemes/Obsidian.scheme b/RedPandaIDE/colorschemes/Obsidian.scheme index 0425cce9..e72d36aa 100644 --- a/RedPandaIDE/colorschemes/Obsidian.scheme +++ b/RedPandaIDE/colorschemes/Obsidian.scheme @@ -160,6 +160,9 @@ "foreground" : "#FFFFFF", "background" : "#00CCFF" }, + "Fold Line" : { + "foreground" : "#C00000" + }, "Active Line" : { "background" : "#323232" }, diff --git a/RedPandaIDE/colorschemes/Obvilion.scheme b/RedPandaIDE/colorschemes/Obvilion.scheme index f7c8fbda..8e15615a 100644 --- a/RedPandaIDE/colorschemes/Obvilion.scheme +++ b/RedPandaIDE/colorschemes/Obvilion.scheme @@ -171,6 +171,9 @@ "foreground" : "#FFFFFF", "background" : "#33CCCC" }, + "Fold Line" : { + "foreground" : "#FF9900" + }, "Active Line" : { "background" : "#323232" }, diff --git a/RedPandaIDE/colorschemes/Plastic_Code_Wrap.scheme b/RedPandaIDE/colorschemes/Plastic_Code_Wrap.scheme index 0bef601e..7f3b39c0 100644 --- a/RedPandaIDE/colorschemes/Plastic_Code_Wrap.scheme +++ b/RedPandaIDE/colorschemes/Plastic_Code_Wrap.scheme @@ -160,6 +160,9 @@ "foreground" : "#FFFFFF", "background" : "#00CCFF" }, + "Fold Line" : { + "foreground" : "#C00000" + }, "Active Line" : { "background" : "#323232" }, diff --git a/RedPandaIDE/colorschemes/Twilight.scheme b/RedPandaIDE/colorschemes/Twilight.scheme index bb11d7e0..ef3a29a3 100644 --- a/RedPandaIDE/colorschemes/Twilight.scheme +++ b/RedPandaIDE/colorschemes/Twilight.scheme @@ -161,6 +161,9 @@ "foreground" : "#FFFFFF", "background" : "#0000FF" }, + "Fold Line" : { + "foreground" : "#FFFFFF" + }, "Active Line" : { "background" : "#221111" }, diff --git a/RedPandaIDE/colorschemes/VS_Code.scheme b/RedPandaIDE/colorschemes/VS_Code.scheme index c5a9da22..e6369033 100644 --- a/RedPandaIDE/colorschemes/VS_Code.scheme +++ b/RedPandaIDE/colorschemes/VS_Code.scheme @@ -158,6 +158,9 @@ "foreground" : "#FFFFCE", "background" : "#00376F" }, + "Fold Line" : { + "foreground" : "#C0C0C0" + }, "Active Line" : { "background" : "#323232" }, diff --git a/RedPandaIDE/colorschemes/Visual_Studio.scheme b/RedPandaIDE/colorschemes/Visual_Studio.scheme index fc9abccb..ce5b86c3 100644 --- a/RedPandaIDE/colorschemes/Visual_Studio.scheme +++ b/RedPandaIDE/colorschemes/Visual_Studio.scheme @@ -158,6 +158,8 @@ "foreground" : "#FFFFFF", "background" : "#0000FF" }, + "Fold Line" : { + }, "Active Line" : { "background" : "#CCFFFF" }, diff --git a/RedPandaIDE/compiler/compiler.cpp b/RedPandaIDE/compiler/compiler.cpp index 63f0ffcb..7c11b1c5 100644 --- a/RedPandaIDE/compiler/compiler.cpp +++ b/RedPandaIDE/compiler/compiler.cpp @@ -213,10 +213,11 @@ void Compiler::processOutput(QString &line) issue->line = getLineNumberFromOutputLine(line); if (issue->line > 0) { issue->column = getColunmnFromOutputLine(line); - if (issue->column>0) - issue->type = getIssueTypeFromOutputLine(line); - else + issue->type = getIssueTypeFromOutputLine(line); + if (issue->column<=0 && issue->type == CompileIssueType::Other) { issue->type = CompileIssueType::Error; //linkage error + mErrorCount += 1; + } } else { issue->column = -1; issue->type = getIssueTypeFromOutputLine(line); diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index 6f46d5be..4873ddb7 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -1213,11 +1213,11 @@ void Editor::applyColorScheme(const QString& schemeName) } item = pColorManager->getItem(schemeName,COLOR_SCHEME_FOLD_LINE); if (item) { - //todo + codeFolding().folderBarLinesColor = item->foreground(); } item = pColorManager->getItem(schemeName,COLOR_SCHEME_INDENT_GUIDE_LINE); if (item) { - //todo + codeFolding().indentGuidesColor = item->foreground(); } this->invalidate(); } diff --git a/RedPandaIDE/qsynedit/SynEdit.cpp b/RedPandaIDE/qsynedit/SynEdit.cpp index 418288c5..d51832d1 100644 --- a/RedPandaIDE/qsynedit/SynEdit.cpp +++ b/RedPandaIDE/qsynedit/SynEdit.cpp @@ -3874,6 +3874,11 @@ void SynEdit::setUseCodeFolding(bool value) } } +SynEditCodeFolding &SynEdit::codeFolding() +{ + return mCodeFolding; +} + QString SynEdit::lineText() { if (mCaretY >= 1 && mCaretY <= mLines->count()) diff --git a/RedPandaIDE/qsynedit/SynEdit.h b/RedPandaIDE/qsynedit/SynEdit.h index 8c5f1c68..32b6b90e 100644 --- a/RedPandaIDE/qsynedit/SynEdit.h +++ b/RedPandaIDE/qsynedit/SynEdit.h @@ -273,6 +273,8 @@ public: bool useCodeFolding() const; void setUseCodeFolding(bool value); + SynEditCodeFolding & codeFolding(); + QString lineText(); void setLineText(const QString s);