Menu
▾
▴
[Codelite-git] codelite git: codelite branch master updated. 14c3ae6a40b423e6590bc959ebc52a7645f91d40
|
From: David H. <no...@so...> - 2013-12-21 18:15:37
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 14c3ae6a40b423e6590bc959ebc52a7645f91d40 (commit)
from 79076b1b8254b19071519066ec401ff47bb7827a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sourceforge.net/p/codelite/codelitegit/ci/14c3ae6a40b423e6590bc959ebc52a7645f91d40
commit 14c3ae6a40b423e6590bc959ebc52a7645f91d40
Author: dghart <da...@4P...>
Date: Sat Dec 21 18:12:59 2013 +0000
Change the default bookmark colours and shape
The shape change is from rectangle to arrow, which in fact was the default in the code anyway; however it was overridden by the value in codelite.xml.default!
diff --git a/Plugin/optionsconfig.cpp b/Plugin/optionsconfig.cpp
index b54ed1f..6f518bf 100644
--- a/Plugin/optionsconfig.cpp
+++ b/Plugin/optionsconfig.cpp
@@ -37,25 +37,21 @@
const wxString defaultBookmarkLabels = wxString(';', CL_N0_OF_BOOKMARK_TYPES - 1) + "Find";
-wxString SetDefaultBookmarkColours(bool foreground)
+wxString SetDefaultBookmarkColours()
{
- // Confusingly, the 'foreground' is actually just the rim of the marker; the background is the central bulk
- wxString fgcol("#FF0080"), output;
- wxString findcol = foreground ? fgcol : "#FFFF00";
- const wxString arr[] = { "#FF0080", "#FFA080", "#80FFFF", "#B000FF" };
- for (size_t n=0; n < CL_N0_OF_BOOKMARK_TYPES - 1; ++n) { // Skip Find here
- if (foreground) {
- output << fgcol << ';';
+ // (Confusingly, the 'foreground' is actually just the rim of the marker; the background is the central bulk)
+ // NB: We want the 'find' colour always to be the most significant, so add any future extra items *before* the last one
+ const wxString arr[] = { "#FF0080", "#0000FF", "#FF0000", "#00FF00", "#FFFF00" };
+ wxString output;
+ for (size_t n=0; n < CL_N0_OF_BOOKMARK_TYPES; ++n) {
+ if (n < sizeof(arr)/sizeof(wxString)) {
+ output << arr[n] << ';';
} else {
- if (n < sizeof(arr)/sizeof(wxString)) {
- output << arr[n] << ';';
- } else {
- output << fgcol << ';';
- }
+ output << "#FF0080" << ';';
}
}
- return output + findcol; // We want 'find' colour always to be the most significant
+ return output;
}
OptionsConfig::OptionsConfig(wxXmlNode *node)
@@ -65,8 +61,8 @@ OptionsConfig::OptionsConfig(wxXmlNode *node)
, m_foldStyle(wxT("Arrows with Background Colour"))
, m_displayBookmarkMargin(true)
, m_bookmarkShape(wxT("Small Arrow"))
- , m_bookmarkBgColours(SetDefaultBookmarkColours(false))
- , m_bookmarkFgColours(SetDefaultBookmarkColours(true))
+ , m_bookmarkBgColours(SetDefaultBookmarkColours())
+ , m_bookmarkFgColours(SetDefaultBookmarkColours())
, m_bookmarkLabels(defaultBookmarkLabels)
, m_highlightCaretLine(true)
, m_displayLineNumbers(false)
@@ -226,12 +222,12 @@ OptionsConfig::OptionsConfig(wxXmlNode *node)
// Transitional calls. These checks are relevant for 2 years i.e. until the beginning of 2016
if (m_bookmarkFgColours.empty()) {
// This must be the first time with multiple BMs, so rescue any old user-set value
- m_bookmarkFgColours = SetDefaultBookmarkColours(true);
+ m_bookmarkFgColours = SetDefaultBookmarkColours();
wxString oldcolour = XmlUtils::ReadString(node, "BookmarkFgColour", "#FF0080");
SetBookmarkFgColour(oldcolour, 0);
}
if (m_bookmarkBgColours.empty()) {
- m_bookmarkBgColours = SetDefaultBookmarkColours(false);
+ m_bookmarkBgColours = SetDefaultBookmarkColours();
wxString oldcolour = XmlUtils::ReadString(node, "BookmarkBgColour", "#FF0080");
SetBookmarkBgColour(oldcolour, 0);
}
diff --git a/Runtime/config/codelite.xml.default b/Runtime/config/codelite.xml.default
index a856efd..cf796c2 100644
--- a/Runtime/config/codelite.xml.default
+++ b/Runtime/config/codelite.xml.default
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite Version="2.0.2">
- <Options DisplayFoldMargin="yes" UnderlineFoldedLine="yes" FoldStyle="Arrows" DisplayBookmarkMargin="yes" BookmarkShape="Small Rectangle" BookmarkBgColour="#FF0080" BookmarkFgColour="#FF0080" HighlightCaretLine="no" ShowLineNumber="yes" IndentationGuides="no" CaretLineColour="#BFD8D8" CaretColour="#000000" AutoAdjustHScrollBarWidth="no"/>
+ <Options DisplayFoldMargin="yes" UnderlineFoldedLine="yes" FoldStyle="Arrows" DisplayBookmarkMargin="yes" BookmarkShape="Small Arrow" BookmarkBgColour="#FF0080" BookmarkFgColour="#FF0080" HighlightCaretLine="no" ShowLineNumber="yes" IndentationGuides="no" CaretLineColour="#BFD8D8" CaretColour="#000000" AutoAdjustHScrollBarWidth="no"/>
<ArchiveObject Name="LexerTheme">
<wxString Value="Default" Name="m_value"/>
</ArchiveObject>
diff --git a/Runtime/config/codelite.xml.default.gtk b/Runtime/config/codelite.xml.default.gtk
index 18135ef..730be34 100644
--- a/Runtime/config/codelite.xml.default.gtk
+++ b/Runtime/config/codelite.xml.default.gtk
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite Version="2.0.2">
- <Options DisplayFoldMargin="yes" UnderlineFoldedLine="yes" FoldStyle="Arrows" DisplayBookmarkMargin="yes" BookmarkShape="Small Rectangle" BookmarkBgColour="#FF0080" BookmarkFgColour="#FF0080" HighlightCaretLine="no" ShowLineNumber="yes" IndentationGuides="no" CaretLineColour="#BFD8D8" CaretColour="#000000" AutoAdjustHScrollBarWidth="no"/>
+ <Options DisplayFoldMargin="yes" UnderlineFoldedLine="yes" FoldStyle="Arrows" DisplayBookmarkMargin="yes" BookmarkShape="Small Arrow" BookmarkBgColour="#FF0080" BookmarkFgColour="#FF0080" HighlightCaretLine="no" ShowLineNumber="yes" IndentationGuides="no" CaretLineColour="#BFD8D8" CaretColour="#000000" AutoAdjustHScrollBarWidth="no"/>
<ArchiveObject Name="LexerTheme">
<wxString Value="Default" Name="m_value"/>
</ArchiveObject>
diff --git a/Runtime/config/codelite.xml.default.mac b/Runtime/config/codelite.xml.default.mac
index a856efd..cf796c2 100644
--- a/Runtime/config/codelite.xml.default.mac
+++ b/Runtime/config/codelite.xml.default.mac
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite Version="2.0.2">
- <Options DisplayFoldMargin="yes" UnderlineFoldedLine="yes" FoldStyle="Arrows" DisplayBookmarkMargin="yes" BookmarkShape="Small Rectangle" BookmarkBgColour="#FF0080" BookmarkFgColour="#FF0080" HighlightCaretLine="no" ShowLineNumber="yes" IndentationGuides="no" CaretLineColour="#BFD8D8" CaretColour="#000000" AutoAdjustHScrollBarWidth="no"/>
+ <Options DisplayFoldMargin="yes" UnderlineFoldedLine="yes" FoldStyle="Arrows" DisplayBookmarkMargin="yes" BookmarkShape="Small Arrow" BookmarkBgColour="#FF0080" BookmarkFgColour="#FF0080" HighlightCaretLine="no" ShowLineNumber="yes" IndentationGuides="no" CaretLineColour="#BFD8D8" CaretColour="#000000" AutoAdjustHScrollBarWidth="no"/>
<ArchiveObject Name="LexerTheme">
<wxString Value="Default" Name="m_value"/>
</ArchiveObject>
-----------------------------------------------------------------------
Summary of changes:
Plugin/optionsconfig.cpp | 32 +++++++++++++-----------------
Runtime/config/codelite.xml.default | 2 +-
Runtime/config/codelite.xml.default.gtk | 2 +-
Runtime/config/codelite.xml.default.mac | 2 +-
4 files changed, 17 insertions(+), 21 deletions(-)
hooks/post-receive
--
codelite
|
