* work save : color scheme
This commit is contained in:
parent
a4da674e03
commit
94ae45cca4
|
@ -160,6 +160,9 @@
|
||||||
"foreground" : "#000000",
|
"foreground" : "#000000",
|
||||||
"background" : "#00FFFF"
|
"background" : "#00FFFF"
|
||||||
},
|
},
|
||||||
|
"Fold Line" : {
|
||||||
|
"foreground" : "#FFFF00"
|
||||||
|
},
|
||||||
"Active Line" : {
|
"Active Line" : {
|
||||||
"background" : "#000050"
|
"background" : "#000050"
|
||||||
},
|
},
|
||||||
|
|
|
@ -160,6 +160,9 @@
|
||||||
"foreground" : "#FFFFFF",
|
"foreground" : "#FFFFFF",
|
||||||
"background" : "#0000FF"
|
"background" : "#0000FF"
|
||||||
},
|
},
|
||||||
|
"Fold Line" : {
|
||||||
|
"foreground" : "#000000"
|
||||||
|
},
|
||||||
"Active Line" : {
|
"Active Line" : {
|
||||||
"background" : "#CCFFFF"
|
"background" : "#CCFFFF"
|
||||||
},
|
},
|
||||||
|
|
|
@ -160,6 +160,9 @@
|
||||||
"foreground" : "#FFFFFF",
|
"foreground" : "#FFFFFF",
|
||||||
"background" : "#0000FF"
|
"background" : "#0000FF"
|
||||||
},
|
},
|
||||||
|
"Fold Line" : {
|
||||||
|
"foreground" : "#000000"
|
||||||
|
},
|
||||||
"Active Line" : {
|
"Active Line" : {
|
||||||
"background" : "#CCFFFF"
|
"background" : "#CCFFFF"
|
||||||
},
|
},
|
||||||
|
|
|
@ -178,6 +178,9 @@
|
||||||
"foreground" : "#FFFFFF",
|
"foreground" : "#FFFFFF",
|
||||||
"background" : "#008E99"
|
"background" : "#008E99"
|
||||||
},
|
},
|
||||||
|
"Fold Line" : {
|
||||||
|
"foreground" : "#A5A5A5"
|
||||||
|
},
|
||||||
"Active Line" : {
|
"Active Line" : {
|
||||||
"background" : "#323232"
|
"background" : "#323232"
|
||||||
},
|
},
|
||||||
|
|
|
@ -160,6 +160,9 @@
|
||||||
"foreground" : "#FFFFFF",
|
"foreground" : "#FFFFFF",
|
||||||
"background" : "#0000FF"
|
"background" : "#0000FF"
|
||||||
},
|
},
|
||||||
|
"Fold Line" : {
|
||||||
|
"foreground" : "#000000"
|
||||||
|
},
|
||||||
"Active Line" : {
|
"Active Line" : {
|
||||||
"background" : "#CCFFFF"
|
"background" : "#CCFFFF"
|
||||||
},
|
},
|
||||||
|
|
|
@ -161,6 +161,9 @@
|
||||||
"foreground" : "#FFFFFF",
|
"foreground" : "#FFFFFF",
|
||||||
"background" : "#0000FF"
|
"background" : "#0000FF"
|
||||||
},
|
},
|
||||||
|
"Fold Line" : {
|
||||||
|
"foreground" : "#FF0000"
|
||||||
|
},
|
||||||
"Active Line" : {
|
"Active Line" : {
|
||||||
"background" : "#202020"
|
"background" : "#202020"
|
||||||
},
|
},
|
||||||
|
|
|
@ -160,6 +160,9 @@
|
||||||
"foreground" : "#FFFFFF",
|
"foreground" : "#FFFFFF",
|
||||||
"background" : "#00CCFF"
|
"background" : "#00CCFF"
|
||||||
},
|
},
|
||||||
|
"Fold Line" : {
|
||||||
|
"foreground" : "#C00000"
|
||||||
|
},
|
||||||
"Active Line" : {
|
"Active Line" : {
|
||||||
"background" : "#323232"
|
"background" : "#323232"
|
||||||
},
|
},
|
||||||
|
|
|
@ -171,6 +171,9 @@
|
||||||
"foreground" : "#FFFFFF",
|
"foreground" : "#FFFFFF",
|
||||||
"background" : "#33CCCC"
|
"background" : "#33CCCC"
|
||||||
},
|
},
|
||||||
|
"Fold Line" : {
|
||||||
|
"foreground" : "#FF9900"
|
||||||
|
},
|
||||||
"Active Line" : {
|
"Active Line" : {
|
||||||
"background" : "#323232"
|
"background" : "#323232"
|
||||||
},
|
},
|
||||||
|
|
|
@ -160,6 +160,9 @@
|
||||||
"foreground" : "#FFFFFF",
|
"foreground" : "#FFFFFF",
|
||||||
"background" : "#00CCFF"
|
"background" : "#00CCFF"
|
||||||
},
|
},
|
||||||
|
"Fold Line" : {
|
||||||
|
"foreground" : "#C00000"
|
||||||
|
},
|
||||||
"Active Line" : {
|
"Active Line" : {
|
||||||
"background" : "#323232"
|
"background" : "#323232"
|
||||||
},
|
},
|
||||||
|
|
|
@ -161,6 +161,9 @@
|
||||||
"foreground" : "#FFFFFF",
|
"foreground" : "#FFFFFF",
|
||||||
"background" : "#0000FF"
|
"background" : "#0000FF"
|
||||||
},
|
},
|
||||||
|
"Fold Line" : {
|
||||||
|
"foreground" : "#FFFFFF"
|
||||||
|
},
|
||||||
"Active Line" : {
|
"Active Line" : {
|
||||||
"background" : "#221111"
|
"background" : "#221111"
|
||||||
},
|
},
|
||||||
|
|
|
@ -158,6 +158,9 @@
|
||||||
"foreground" : "#FFFFCE",
|
"foreground" : "#FFFFCE",
|
||||||
"background" : "#00376F"
|
"background" : "#00376F"
|
||||||
},
|
},
|
||||||
|
"Fold Line" : {
|
||||||
|
"foreground" : "#C0C0C0"
|
||||||
|
},
|
||||||
"Active Line" : {
|
"Active Line" : {
|
||||||
"background" : "#323232"
|
"background" : "#323232"
|
||||||
},
|
},
|
||||||
|
|
|
@ -158,6 +158,8 @@
|
||||||
"foreground" : "#FFFFFF",
|
"foreground" : "#FFFFFF",
|
||||||
"background" : "#0000FF"
|
"background" : "#0000FF"
|
||||||
},
|
},
|
||||||
|
"Fold Line" : {
|
||||||
|
},
|
||||||
"Active Line" : {
|
"Active Line" : {
|
||||||
"background" : "#CCFFFF"
|
"background" : "#CCFFFF"
|
||||||
},
|
},
|
||||||
|
|
|
@ -213,10 +213,11 @@ void Compiler::processOutput(QString &line)
|
||||||
issue->line = getLineNumberFromOutputLine(line);
|
issue->line = getLineNumberFromOutputLine(line);
|
||||||
if (issue->line > 0) {
|
if (issue->line > 0) {
|
||||||
issue->column = getColunmnFromOutputLine(line);
|
issue->column = getColunmnFromOutputLine(line);
|
||||||
if (issue->column>0)
|
|
||||||
issue->type = getIssueTypeFromOutputLine(line);
|
issue->type = getIssueTypeFromOutputLine(line);
|
||||||
else
|
if (issue->column<=0 && issue->type == CompileIssueType::Other) {
|
||||||
issue->type = CompileIssueType::Error; //linkage error
|
issue->type = CompileIssueType::Error; //linkage error
|
||||||
|
mErrorCount += 1;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
issue->column = -1;
|
issue->column = -1;
|
||||||
issue->type = getIssueTypeFromOutputLine(line);
|
issue->type = getIssueTypeFromOutputLine(line);
|
||||||
|
|
|
@ -1213,11 +1213,11 @@ void Editor::applyColorScheme(const QString& schemeName)
|
||||||
}
|
}
|
||||||
item = pColorManager->getItem(schemeName,COLOR_SCHEME_FOLD_LINE);
|
item = pColorManager->getItem(schemeName,COLOR_SCHEME_FOLD_LINE);
|
||||||
if (item) {
|
if (item) {
|
||||||
//todo
|
codeFolding().folderBarLinesColor = item->foreground();
|
||||||
}
|
}
|
||||||
item = pColorManager->getItem(schemeName,COLOR_SCHEME_INDENT_GUIDE_LINE);
|
item = pColorManager->getItem(schemeName,COLOR_SCHEME_INDENT_GUIDE_LINE);
|
||||||
if (item) {
|
if (item) {
|
||||||
//todo
|
codeFolding().indentGuidesColor = item->foreground();
|
||||||
}
|
}
|
||||||
this->invalidate();
|
this->invalidate();
|
||||||
}
|
}
|
||||||
|
|
|
@ -3874,6 +3874,11 @@ void SynEdit::setUseCodeFolding(bool value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SynEditCodeFolding &SynEdit::codeFolding()
|
||||||
|
{
|
||||||
|
return mCodeFolding;
|
||||||
|
}
|
||||||
|
|
||||||
QString SynEdit::lineText()
|
QString SynEdit::lineText()
|
||||||
{
|
{
|
||||||
if (mCaretY >= 1 && mCaretY <= mLines->count())
|
if (mCaretY >= 1 && mCaretY <= mLines->count())
|
||||||
|
|
|
@ -273,6 +273,8 @@ public:
|
||||||
bool useCodeFolding() const;
|
bool useCodeFolding() const;
|
||||||
void setUseCodeFolding(bool value);
|
void setUseCodeFolding(bool value);
|
||||||
|
|
||||||
|
SynEditCodeFolding & codeFolding();
|
||||||
|
|
||||||
QString lineText();
|
QString lineText();
|
||||||
void setLineText(const QString s);
|
void setLineText(const QString s);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue