Menu
▾
▴
codelite-git — Commit logs
You can subscribe to this list here.
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
(40) |
May
(42) |
Jun
(47) |
Jul
(60) |
Aug
(55) |
Sep
(83) |
Oct
(78) |
Nov
(40) |
Dec
(106) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2014 |
Jan
(65) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Eran I. <no...@so...> - 2014-01-19 07:35:46
|
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 e8cd1e9b0c04d64e851fe86acb4ebb6af6bfffc0 (commit)
from f66479e5bcc001edbb6ed2f916284595dcbe5a01 (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/e8cd1e9b0c04d64e851fe86acb4ebb6af6bfffc0
commit e8cd1e9b0c04d64e851fe86acb4ebb6af6bfffc0
Author: Eran <era...@gm...>
Date: Sun Jan 19 09:35:20 2014 +0200
Refactoring: make the synchronize function signature more reliable
diff --git a/CodeLite/entry.cpp b/CodeLite/entry.cpp
index 736e0f5..e76338b 100644
--- a/CodeLite/entry.cpp
+++ b/CodeLite/entry.cpp
@@ -22,6 +22,7 @@
//
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
+
#include "precompiled_header.h"
#include "ctags_manager.h"
#include "pptable.h"
@@ -201,23 +202,23 @@ void TagEntry::Create(const wxString &fileName,
}
}
}
-
- if (!path.IsEmpty()) {
- SetScope(path);
- } else {
- SetScope(wxT("<global>"));
- }
-
- // If there is no path, path is set to name
- if ( GetPath().IsEmpty() )
- SetPath( GetName() );
-
- // Get the parent name
- StringTokenizer tok(GetPath(), wxT("::"));
- wxString parent;
-
- (tok.Count() < 2) ? parent = wxT("<global>") : parent = tok[tok.Count()-2];
- SetParent(parent);
+
+ if (!path.IsEmpty()) {
+ SetScope(path);
+ } else {
+ SetScope(wxT("<global>"));
+ }
+
+ // If there is no path, path is set to name
+ if ( GetPath().IsEmpty() )
+ SetPath( GetName() );
+
+ // Get the parent name
+ StringTokenizer tok(GetPath(), wxT("::"));
+ wxString parent;
+
+ (tok.Count() < 2) ? parent = wxT("<global>") : parent = tok[tok.Count()-2];
+ SetParent(parent);
}
void TagEntry::Create(const tagEntry& entry)
@@ -571,32 +572,32 @@ void TagEntry::FromLine(const wxString& line)
pattern = pattern.Trim();
if (kind == wxT("enumerator")) {
- // enums are specials, they are a scope, when they declared as "enum class ..." (C++11),
- // but not a scope when declared as "enum ...". So, for "enum class ..." declaration
- //(and anonymous enums) we appear enumerators when typed:
+ // enums are specials, they are a scope, when they declared as "enum class ..." (C++11),
+ // but not a scope when declared as "enum ...". So, for "enum class ..." declaration
+ //(and anonymous enums) we appear enumerators when typed:
// enumName::
- //Is global scope there aren't appears. For "enum ..." declaration we appear
- //enumerators when typed:
- // enumName::
- //and when it global (or same namespace) scope.
+ //Is global scope there aren't appears. For "enum ..." declaration we appear
+ //enumerators when typed:
+ // enumName::
+ //and when it global (or same namespace) scope.
std::map<wxString,wxString>::iterator enumField = extFields.find(wxT("enum"));
if (enumField != extFields.end()) {
wxString enumName = enumField->second;
- bool isAnonymous = enumName.AfterLast(wxT(':')).StartsWith(wxT("__anon"));
-
- bool isInEnumNamespace = false;
- std::map<wxString,wxString>::const_iterator isInEnumNamespaceField = extFields.find(wxT("isInEnumNamespace"));
- if (isInEnumNamespaceField != extFields.end()) {
- wxString isInEnumNamespaceValue = isInEnumNamespaceField->second;
- isInEnumNamespace = isInEnumNamespaceValue.AfterLast(wxT(':')) == wxT("1") ? true : false;
- }
-
- if (!isInEnumNamespace) {
- enumField->second = enumField->second.BeforeLast(wxT(':')).BeforeLast(wxT(':'));
- if (!isAnonymous) {
- extFields[wxT("typeref")] = enumName;
- }
- }
+ bool isAnonymous = enumName.AfterLast(wxT(':')).StartsWith(wxT("__anon"));
+
+ bool isInEnumNamespace = false;
+ std::map<wxString,wxString>::const_iterator isInEnumNamespaceField = extFields.find(wxT("isInEnumNamespace"));
+ if (isInEnumNamespaceField != extFields.end()) {
+ wxString isInEnumNamespaceValue = isInEnumNamespaceField->second;
+ isInEnumNamespace = isInEnumNamespaceValue.AfterLast(wxT(':')) == wxT("1") ? true : false;
+ }
+
+ if (!isInEnumNamespace) {
+ enumField->second = enumField->second.BeforeLast(wxT(':')).BeforeLast(wxT(':'));
+ if (!isAnonymous) {
+ extFields[wxT("typeref")] = enumName;
+ }
+ }
}
}
@@ -785,11 +786,11 @@ TagEntryPtr TagEntry::ReplaceSimpleMacro()
return NULL;
}
-int TagEntry::CompareDisplayString(const TagEntryPtr& rhs) const
+int TagEntry::CompareDisplayString(const TagEntryPtr& rhs) const
{
wxString d1, d2;
-
+
d1 << GetReturnValue() << wxT(": ") << GetFullDisplayName() << wxT(":") << GetAccess();
d2 << rhs->GetReturnValue() << wxT(": ") << rhs->GetFullDisplayName() << wxT(":") << rhs->GetAccess();
return d1.Cmp(d2);
-}
+}
diff --git a/CodeLite/refactorengine.cpp b/CodeLite/refactorengine.cpp
index 9038a45..35f3e81 100644
--- a/CodeLite/refactorengine.cpp
+++ b/CodeLite/refactorengine.cpp
@@ -451,10 +451,10 @@ TagEntryPtr RefactoringEngine::SyncSignature(const wxFileName& fn,
if (bIsImpl) {
// The "source" is an implementaion, which means that we need to prepare declaration signature
// this could be tricky since we might lose the "default" values
- signature = TagsManagerST::Get()->NormalizeFunctionSig(func->GetSignature(), Normalize_Func_Default_value|Normalize_Func_Name);
+ signature = TagsManagerST::Get()->NormalizeFunctionSig(func->GetSignature(), Normalize_Func_Default_value|Normalize_Func_Name|Normalize_Func_Reverse_Macro);
} else {
// Prepare an "implementation" signature
- signature = TagsManagerST::Get()->NormalizeFunctionSig(func->GetSignature(), Normalize_Func_Name);
+ signature = TagsManagerST::Get()->NormalizeFunctionSig(func->GetSignature(), Normalize_Func_Name|Normalize_Func_Reverse_Macro);
}
tag->SetSignature(signature);
diff --git a/CodeLite/tags_storage_sqlite3.cpp b/CodeLite/tags_storage_sqlite3.cpp
index e79fd3e..4d02d93 100644
--- a/CodeLite/tags_storage_sqlite3.cpp
+++ b/CodeLite/tags_storage_sqlite3.cpp
@@ -1536,12 +1536,8 @@ void TagsStorageSQLite::DoAddNamePartToQuery(wxString &sql, const wxString& name
wxString from = name;
wxString until = name;
-#if wxVERSION_NUMBER < 2900
- until.Last() = until.Last() + 1;
-#else
wxChar ch = until.Last();
until.SetChar(until.length() - 1, ch + 1);
-#endif
// add the name condition
if (partial) {
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 08385ee..9a367b2 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -44,7 +44,7 @@
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/>
@@ -79,7 +79,7 @@
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="Win Debug Unicode" Selected="no">
+ <WorkspaceConfiguration Name="Win Debug Unicode" Selected="yes">
<Project Name="abbreviation" ConfigName="WinDebugUnicode"/>
<Project Name="CallGraph" ConfigName="WinDebugUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index 10a87e0..99b01c0 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -14,6 +14,15 @@
"buildType": "",
"arguments": [],
"parentProject": ""
+ }, {
+ "name": "WinDebugUnicode",
+ "enabled": false,
+ "buildDirectory": "build",
+ "sourceDirectory": "$(ProjectPath)",
+ "generator": "",
+ "buildType": "",
+ "arguments": [],
+ "parentProject": ""
}]]]>
</Plugin>
</Plugins>
@@ -1491,7 +1500,7 @@ resources.cpp: resources.xrc
<Library Value="liblibclang.dll"/>
</Linker>
<ResourceCompiler Options="$(shell wx-config --rcflags)" Required="yes"/>
- <General OutputFile="$(IntermediateDirectory)/codelite-dbg.exe" IntermediateDirectory="./Debug" Command="./codelite-dbg.exe" CommandArguments="-b . " UseSeparateDebugArgs="no" DebugArguments="-b . --no-plugins" WorkingDirectory="../Runtime " PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
+ <General OutputFile="$(IntermediateDirectory)/codelite-dbg.exe" IntermediateDirectory="./Debug" Command="./codelite-dbg.exe" CommandArguments="-b . " UseSeparateDebugArgs="yes" DebugArguments="-b . --no-plugins" WorkingDirectory="../Runtime " PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="Default" DbgSetName="">
<![CDATA[PATH=../sdk/clang/lib;$(WXWIN)\lib\gcc_dll;$(PATH)]]>
</Environment>
@@ -1525,7 +1534,8 @@ resources.cpp: resources.xrc
wxrc /c /v /o resources.cpp resources.xrc
svninfo.cpp:
- autorev .</CustomPreBuild>
+ autorev .
+</CustomPreBuild>
</AdditionalRules>
<Completion EnableCpp11="yes">
<ClangCmpFlagsC/>
diff --git a/LiteEditor/cc_box.cpp b/LiteEditor/cc_box.cpp
index 98c2755..6a4350c 100644
--- a/LiteEditor/cc_box.cpp
+++ b/LiteEditor/cc_box.cpp
@@ -962,3 +962,9 @@ void CCBox::OnClose(wxCommandEvent& e)
e.Skip();
Destroy();
}
+
+void CCBox::SortTags(std::vector<CCItemInfo>& tags, const wxString& userTyped)
+{
+ wxUnusedVar(tags);
+ wxUnusedVar(userTyped);
+}
diff --git a/LiteEditor/cc_box.h b/LiteEditor/cc_box.h
index 649caca..0423608 100644
--- a/LiteEditor/cc_box.h
+++ b/LiteEditor/cc_box.h
@@ -84,7 +84,8 @@ protected:
void OnDisplayTooltip(wxTimerEvent &event);
void OnRefreshList(wxTimerEvent &event);
void Display(LEditor *editor);
-
+ void SortTags(std::vector<CCItemInfo> &tags, const wxString &userTyped);
+
protected:
// helper methods
int GetImageId(TagEntryPtr entry);
diff --git a/LiteEditor/ccvirtuallistctrl.h b/LiteEditor/ccvirtuallistctrl.h
index 7a52b3a..741b4bd 100644
--- a/LiteEditor/ccvirtuallistctrl.h
+++ b/LiteEditor/ccvirtuallistctrl.h
@@ -22,48 +22,54 @@
//
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
- #ifndef __ccvirtuallistctrl__
+#ifndef __ccvirtuallistctrl__
#define __ccvirtuallistctrl__
#include <wx/listctrl.h>
#include <vector>
#include "entry.h"
-class CCItemInfo {
+class CCItemInfo
+{
public:
- int imgId;
- wxString displayName;
- TagEntry tag;
- std::vector<TagEntry> listOfTags;
- int currentIndex;
+ int imgId;
+ wxString displayName;
+ TagEntry tag;
+ std::vector<TagEntry> listOfTags;
+ int currentIndex;
- CCItemInfo() : imgId(wxNOT_FOUND), displayName(wxT("")), currentIndex(0) {}
- bool IsOk() const { return displayName.IsEmpty() == false; }
- void Reset() {
- imgId = wxNOT_FOUND;
- displayName = wxEmptyString;
- tag = TagEntry();
- listOfTags.clear();
- }
+ CCItemInfo() : imgId(wxNOT_FOUND), displayName(wxT("")), currentIndex(0) {}
+ bool IsOk() const {
+ return displayName.IsEmpty() == false;
+ }
+ void Reset() {
+ imgId = wxNOT_FOUND;
+ displayName = wxEmptyString;
+ tag = TagEntry();
+ listOfTags.clear();
+ }
};
-class CCVirtualListCtrl : public wxListView {
- std::vector<CCItemInfo> m_tags;
+class CCVirtualListCtrl : public wxListView
+{
+ std::vector<CCItemInfo> m_tags;
wxFont m_styleFont;
-
+
public:
- CCVirtualListCtrl( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 486,300 ), long style = wxTAB_TRAVERSAL );
- ~CCVirtualListCtrl();
+ CCVirtualListCtrl( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 486,300 ), long style = wxTAB_TRAVERSAL );
+ ~CCVirtualListCtrl();
public:
- void SetItems(const std::vector<CCItemInfo> &tags) { m_tags = tags; }
- bool GetItemTagEntry(int index, CCItemInfo &tag);
- virtual wxListItemAttr* OnGetItemAttr(long item) const;
- virtual int OnGetItemColumnImage(long item, long column) const;
- virtual int OnGetItemImage(long item) const;
- virtual wxString OnGetItemText(long item, long column) const;
- int FindMatch(const wxString &word, bool &fullMatch);
+ void SetItems(const std::vector<CCItemInfo> &tags) {
+ m_tags = tags;
+ }
+ bool GetItemTagEntry(int index, CCItemInfo &tag);
+ virtual wxListItemAttr* OnGetItemAttr(long item) const;
+ virtual int OnGetItemColumnImage(long item, long column) const;
+ virtual int OnGetItemImage(long item) const;
+ virtual wxString OnGetItemText(long item, long column) const;
+ int FindMatch(const wxString &word, bool &fullMatch);
};
#endif // __ccvirtuallistctrl__
diff --git a/LiteEditor/context_cpp.cpp b/LiteEditor/context_cpp.cpp
index aec27f6..de22bea 100644
--- a/LiteEditor/context_cpp.cpp
+++ b/LiteEditor/context_cpp.cpp
@@ -3168,12 +3168,12 @@ bool ContextCpp::DoGetSingatureRange(int line, int& start, int& end, LEditor *ct
int nDepth = 1;
while ((nCur < nLen) && nDepth > 0) {
- if(IsCommentOrString(nCur)) {
+ wxChar ch = ctrl->SafeGetChar(nCur);
+ if(ctrl->GetContext()->IsCommentOrString(nCur)) {
nCur++;
continue;
}
- wxChar ch = ctrl->SafeGetChar(nCur);
switch(ch) {
case wxT('('):
nDepth++;
-----------------------------------------------------------------------
Summary of changes:
CodeLite/entry.cpp | 85 +++++++++++++++++++------------------
CodeLite/refactorengine.cpp | 4 +-
CodeLite/tags_storage_sqlite3.cpp | 4 --
LiteEditor.workspace | 4 +-
LiteEditor/LiteEditor.project | 14 +++++-
LiteEditor/cc_box.cpp | 6 +++
LiteEditor/cc_box.h | 3 +-
LiteEditor/ccvirtuallistctrl.h | 60 ++++++++++++++------------
LiteEditor/context_cpp.cpp | 4 +-
9 files changed, 102 insertions(+), 82 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-18 22:30:08
|
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 f66479e5bcc001edbb6ed2f916284595dcbe5a01 (commit)
from b65da6fae6164cf2c5f4a5e5a933078f1286b8dd (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/f66479e5bcc001edbb6ed2f916284595dcbe5a01
commit f66479e5bcc001edbb6ed2f916284595dcbe5a01
Author: Eran <era...@gm...>
Date: Sun Jan 19 00:29:47 2014 +0200
Fixed: when double clicking on frame entry in teh debugger call-stack tab, don't scroll to the top
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 9a367b2..08385ee 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -44,7 +44,7 @@
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/>
@@ -79,7 +79,7 @@
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="Win Debug Unicode" Selected="yes">
+ <WorkspaceConfiguration Name="Win Debug Unicode" Selected="no">
<Project Name="abbreviation" ConfigName="WinDebugUnicode"/>
<Project Name="CallGraph" ConfigName="WinDebugUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
diff --git a/LiteEditor/DebuggerSettings.wxcp b/LiteEditor/DebuggerSettings.wxcp
index e1408d8..96a0577 100644
--- a/LiteEditor/DebuggerSettings.wxcp
+++ b/LiteEditor/DebuggerSettings.wxcp
@@ -2191,7 +2191,7 @@
"m_events": [],
"m_children": [{
"m_type": 4403,
- "proportion": 1,
+ "proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
diff --git a/LiteEditor/debuggersettingsbasedlg.cpp b/LiteEditor/debuggersettingsbasedlg.cpp
index c098212..1917398 100644
--- a/LiteEditor/debuggersettingsbasedlg.cpp
+++ b/LiteEditor/debuggersettingsbasedlg.cpp
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: DebuggerSettings.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -178,7 +179,7 @@ NewPreDefinedSetBaseDlg::NewPreDefinedSetBaseDlg(wxWindow* parent, wxWindowID id
wxBoxSizer* bSizer17 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizer17);
- wxFlexGridSizer* fgSizer2 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* fgSizer2 = new wxFlexGridSizer(0, 2, 0, 0);
fgSizer2->SetFlexibleDirection( wxBOTH );
fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer2->AddGrowableCol(1);
@@ -255,12 +256,12 @@ DbgPageGeneralBase::DbgPageGeneralBase(wxWindow* parent, wxWindowID id, const wx
wxBoxSizer* bSizer16 = new wxBoxSizer(wxVERTICAL);
m_panel6->SetSizer(bSizer16);
- wxFlexGridSizer* flexGridSizer49 = new wxFlexGridSizer( 0, 3, 0, 0);
+ wxFlexGridSizer* flexGridSizer49 = new wxFlexGridSizer(0, 3, 0, 0);
flexGridSizer49->SetFlexibleDirection( wxBOTH );
flexGridSizer49->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer49->AddGrowableCol(1);
- bSizer16->Add(flexGridSizer49, 1, wxALL|wxEXPAND, 5);
+ bSizer16->Add(flexGridSizer49, 0, wxALL|wxEXPAND, 5);
m_staticText1 = new wxStaticText(m_panel6, wxID_ANY, _("Debugger path:"), wxDefaultPosition, wxSize(-1, -1), 0);
@@ -278,7 +279,7 @@ DbgPageGeneralBase::DbgPageGeneralBase(wxWindow* parent, wxWindowID id, const wx
bSizer16->Add(sbSizer1, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, 5);
- wxGridSizer* gSizer3 = new wxGridSizer( 0, 1, 0, 0);
+ wxGridSizer* gSizer3 = new wxGridSizer(0, 1, 0, 0);
sbSizer1->Add(gSizer3, 0, wxEXPAND, 5);
@@ -315,7 +316,7 @@ DbgPageGeneralBase::DbgPageGeneralBase(wxWindow* parent, wxWindowID id, const wx
bSizer16->Add(sbSizer4, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, 5);
- wxGridSizer* gSizer31 = new wxGridSizer( 2, 1, 0, 0);
+ wxGridSizer* gSizer31 = new wxGridSizer(2, 1, 0, 0);
sbSizer4->Add(gSizer31, 0, wxEXPAND, 5);
@@ -334,7 +335,7 @@ DbgPageGeneralBase::DbgPageGeneralBase(wxWindow* parent, wxWindowID id, const wx
bSizer16->Add(sbSizer3, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, 5);
- wxFlexGridSizer* fgSizer21 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* fgSizer21 = new wxFlexGridSizer(0, 2, 0, 0);
fgSizer21->SetFlexibleDirection( wxBOTH );
fgSizer21->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -452,7 +453,7 @@ DbgPageMiscBase::DbgPageMiscBase(wxWindow* parent, wxWindowID id, const wxPoint&
bSizer17->Add(sbSizer6, 0, wxLEFT|wxRIGHT|wxEXPAND, 5);
- wxGridSizer* gSizer5 = new wxGridSizer( 0, 1, 0, 0);
+ wxGridSizer* gSizer5 = new wxGridSizer(0, 1, 0, 0);
sbSizer6->Add(gSizer5, 0, wxEXPAND, 5);
@@ -570,7 +571,7 @@ DebuggerDisassemblyTabBase::DebuggerDisassemblyTabBase(wxWindow* parent, wxWindo
wxBoxSizer* boxSizer14 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer14);
- wxFlexGridSizer* flexGridSizer22 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer22 = new wxFlexGridSizer(0, 2, 0, 0);
flexGridSizer22->SetFlexibleDirection( wxBOTH );
flexGridSizer22->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer22->AddGrowableCol(1);
diff --git a/LiteEditor/debuggersettingsbasedlg.h b/LiteEditor/debuggersettingsbasedlg.h
index 1526d57..4c39465 100644
--- a/LiteEditor/debuggersettingsbasedlg.h
+++ b/LiteEditor/debuggersettingsbasedlg.h
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: DebuggerSettings.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
diff --git a/LiteEditor/listctrlpanel.cpp b/LiteEditor/listctrlpanel.cpp
index 79691e3..c66441d 100644
--- a/LiteEditor/listctrlpanel.cpp
+++ b/LiteEditor/listctrlpanel.cpp
@@ -64,7 +64,7 @@ void ListCtrlPanel::Update ( const StackEntryArray &stackArr )
{
Clear();
m_stack.insert(m_stack.end(), stackArr.begin(), stackArr.end());
-
+ int activeFrame (-1);
if (!m_stack.empty()) {
for (int i=0; i<(int)m_stack.size(); i++) {
@@ -79,10 +79,13 @@ void ListCtrlPanel::Update ( const StackEntryArray &stackArr )
m_dvListCtrl->AppendItem( cols, (wxUIntPtr)new StackEntry(entry) );
if ( isactive ) {
- wxDataViewItem item = m_dvListCtrl->RowToItem(i);
- if ( item.IsOk() ) {
- m_dvListCtrl->EnsureVisible( item );
- }
+ activeFrame = i;
+ }
+ }
+ if ( activeFrame != wxNOT_FOUND ) {
+ wxDataViewItem item = m_dvListCtrl->RowToItem(activeFrame);
+ if ( item.IsOk() ) {
+ m_dvListCtrl->EnsureVisible( item );
}
}
}
-----------------------------------------------------------------------
Summary of changes:
LiteEditor.workspace | 4 ++--
LiteEditor/DebuggerSettings.wxcp | 2 +-
LiteEditor/debuggersettingsbasedlg.cpp | 17 +++++++++--------
LiteEditor/debuggersettingsbasedlg.h | 1 +
LiteEditor/listctrlpanel.cpp | 13 ++++++++-----
5 files changed, 21 insertions(+), 16 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-17 22:29:21
|
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 b65da6fae6164cf2c5f4a5e5a933078f1286b8dd (commit)
from 5467088304e8cb6631c9971213193153b8be1ac6 (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/b65da6fae6164cf2c5f4a5e5a933078f1286b8dd
commit b65da6fae6164cf2c5f4a5e5a933078f1286b8dd
Author: Eran <era...@gm...>
Date: Sat Jan 18 00:29:03 2014 +0200
Added new SDK event: wxEVT_DBG_UI_TOGGLE_BREAKPOINT - sent when the user toggles a breakpoints (either by the mouse click or by the keyboard shortcut). A plugin
can intercept this event and apply it to its own custom debugger
diff --git a/Interfaces/plugin.h b/Interfaces/plugin.h
index 5d7c8c5..af1d1d5 100644
--- a/Interfaces/plugin.h
+++ b/Interfaces/plugin.h
@@ -567,16 +567,17 @@ enum MenuType {
// If a plugin wishes to override codelite's default debugger (gdb)
// it simply needs to connect the event and avoid calling 'event.Skip();
//----------------------------------------------------------------------
-#define wxEVT_DBG_UI_START_OR_CONT 3547 // Start the debugger or continue
-#define wxEVT_DBG_UI_STOP 3549 // Stop the debugger
-#define wxEVT_DBG_UI_STEP_IN 3550 // Step into function
-#define wxEVT_DBG_UI_STEP_OUT 3551 // Step out of current frame
-#define wxEVT_DBG_UI_NEXT 3552 // Next line
-#define wxEVT_DBG_UI_NEXT_INST 3553 // Next instruction
-#define wxEVT_DBG_UI_INTERRUPT 3554 // Interrupt the debugger execution
-#define wxEVT_DBG_UI_SHOW_CURSOR 3555 // Set the focus to the current debugger file/line
-#define wxEVT_DBG_UI_RESTART 3556 // Restart the debug session
-#define wxEVT_DBG_IS_RUNNING 3557 // Use evet.SetAnswer() method to reply
+#define wxEVT_DBG_UI_START_OR_CONT 3547 // Start the debugger or continue
+#define wxEVT_DBG_UI_STOP 3549 // Stop the debugger
+#define wxEVT_DBG_UI_STEP_IN 3550 // Step into function
+#define wxEVT_DBG_UI_STEP_OUT 3551 // Step out of current frame
+#define wxEVT_DBG_UI_NEXT 3552 // Next line
+#define wxEVT_DBG_UI_NEXT_INST 3553 // Next instruction
+#define wxEVT_DBG_UI_INTERRUPT 3554 // Interrupt the debugger execution
+#define wxEVT_DBG_UI_SHOW_CURSOR 3555 // Set the focus to the current debugger file/line
+#define wxEVT_DBG_UI_RESTART 3556 // Restart the debug session
+#define wxEVT_DBG_IS_RUNNING 3557 // Use evet.SetAnswer() method to reply
+#define wxEVT_DBG_UI_TOGGLE_BREAKPOINT 3558 // Toggle breakpoint. Use event.GetFileName() / event.GetInt() for the file:line
//------------------------------------------------------------------
//each plugin must implement this interface
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 08385ee..9a367b2 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -44,7 +44,7 @@
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/>
@@ -79,7 +79,7 @@
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="Win Debug Unicode" Selected="no">
+ <WorkspaceConfiguration Name="Win Debug Unicode" Selected="yes">
<Project Name="abbreviation" ConfigName="WinDebugUnicode"/>
<Project Name="CallGraph" ConfigName="WinDebugUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
diff --git a/LiteEditor/cl_editor.cpp b/LiteEditor/cl_editor.cpp
index 4d8f394..ceb55e1 100644
--- a/LiteEditor/cl_editor.cpp
+++ b/LiteEditor/cl_editor.cpp
@@ -3214,11 +3214,19 @@ void LEditor::DelBreakpoint(int lineno /*= -1*/)
void LEditor::ToggleBreakpoint(int lineno)
{
-// Coming from OnMarginClick() means that lineno comes from the mouse position, not necessarily the current line
+ // Coming from OnMarginClick() means that lineno comes from the mouse position, not necessarily the current line
if (lineno == -1) {
lineno = GetCurrentLine()+1;
}
+ // Does any of the plugins want to handle this?
+ clDebugEvent dbgEvent(wxEVT_DBG_UI_TOGGLE_BREAKPOINT);
+ dbgEvent.SetInt( lineno );
+ dbgEvent.SetFileName( GetFileName().GetFullPath() );
+ if ( EventNotifier::Get()->ProcessEvent( dbgEvent ) ) {
+ return;
+ }
+
const BreakpointInfo &bp = ManagerST::Get()->GetBreakpointsMgr()->GetBreakpoint(GetFileName().GetFullPath(), lineno);
if ( bp.IsNull() ) {
-----------------------------------------------------------------------
Summary of changes:
Interfaces/plugin.h | 21 +++++++++++----------
LiteEditor.workspace | 4 ++--
LiteEditor/cl_editor.cpp | 10 +++++++++-
3 files changed, 22 insertions(+), 13 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-17 12:06:41
|
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 5467088304e8cb6631c9971213193153b8be1ac6 (commit)
from 17c87d85bd3f83e995328cc24b31bb441e7a2634 (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/5467088304e8cb6631c9971213193153b8be1ac6
commit 5467088304e8cb6631c9971213193153b8be1ac6
Author: Eran <era...@gm...>
Date: Fri Jan 17 14:05:16 2014 +0200
Fixed: set the proper debug level when codelite starts up
Fixed: perform a santiy check when a non-editor window is selected and the user attempts to click an entry in the "Outline" tab
diff --git a/LiteEditor/app.cpp b/LiteEditor/app.cpp
index 51bfb6d..7536e49 100644
--- a/LiteEditor/app.cpp
+++ b/LiteEditor/app.cpp
@@ -45,6 +45,7 @@
#include "frame.h"
#include "asyncprocess.h" // IProcess
#include "new_build_tab.h"
+#include "cl_config.h"
#define __PERFORMANCE
#include "performance.h"
@@ -493,9 +494,7 @@ bool CodeLiteApp::OnInit()
#endif
// Set the log file verbosity
- long log_verbosity(FileLogger::Error);
- EditorConfigST::Get()->GetLongValue(wxT("LogVerbosity"), log_verbosity);
- FileLogger::Get()->SetVerbosity(log_verbosity);
+ FileLogger::Get()->SetVerbosity( clConfig::Get().Read("LogVerbosity", FileLogger::Error) );
CL_SYSTEM(wxT("Starting codelite..."));
// check for single instance
diff --git a/Outline/outline_symbol_tree.cpp b/Outline/outline_symbol_tree.cpp
index d8a88e7..ac215b3 100644
--- a/Outline/outline_symbol_tree.cpp
+++ b/Outline/outline_symbol_tree.cpp
@@ -30,6 +30,7 @@
#include "stringsearcher.h"
#include <wx/stc/stc.h>
#include "fc_fileopener.h"
+#include "macros.h"
#include "outline_symbol_tree.h"
//#include "manager.h"
@@ -221,6 +222,9 @@ wxTreeItemId svSymbolTree::TryGetPrevItem(wxTreeItemId item)
void svSymbolTree::FindAndSelect(IEditor* editor, wxString& pattern, const wxString& name)
{
+ // sanity
+ CHECK_PTR_RET(editor);
+
if( editor->FindAndSelect(pattern, name, 0 /* from pos */, m_manager->GetNavigationMgr()) == false ) {
// Could not select, clear the selection
editor->GetSTC()->SetSelectionStart(wxNOT_FOUND);
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/app.cpp | 5 ++---
Outline/outline_symbol_tree.cpp | 4 ++++
2 files changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2014-01-17 11:36:24
|
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 17c87d85bd3f83e995328cc24b31bb441e7a2634 (commit)
from 4f5ed71f0facd87c8a5a8b4db6b8b5593c7ca656 (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/17c87d85bd3f83e995328cc24b31bb441e7a2634
commit 17c87d85bd3f83e995328cc24b31bb441e7a2634
Author: dghart <da...@4P...>
Date: Fri Jan 17 11:25:23 2014 +0000
When using wxCrafter in 'tabbed' mode, select the 'wxCrafter' workspace-view tab when the wxCrafter editor is activated, and workspace-view tab 0 when it isn't
Previously, when the wxC 'editor' was active and then a non-wxC editor was selected, the active workspace-view tab remained 'wxCrafter'. Now it changes to the first tab, which is the one most likely to be the user's preferred one.
diff --git a/LiteEditor/workspacetab.cpp b/LiteEditor/workspacetab.cpp
index 01da584..9666497 100644
--- a/LiteEditor/workspacetab.cpp
+++ b/LiteEditor/workspacetab.cpp
@@ -332,10 +332,19 @@ void WorkspaceTab::OnActiveEditorChanged(wxCommandEvent& e)
{
e.Skip();
if (m_isLinkedToEditor) {
- LEditor *editor = clMainFrame::Get()->GetMainBook()->GetActiveEditor();
+ MainBook* mainbook = clMainFrame::Get()->GetMainBook();
+ LEditor *editor = mainbook->GetActiveEditor();
if (editor && !editor->GetProject().IsEmpty()) {
m_fileView->ExpandToPath(editor->GetProject(), editor->GetFileName());
}
+
+ Notebook* book = clMainFrame::Get()->GetWorkspacePane()->GetNotebook();
+ if (book) {
+ size_t index = book->GetPageIndex("wxCrafter");
+ if (index == book->GetSelection()) {
+ book->SetSelection(0); // The most likely to be wanted
+ }
+ }
}
}
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/workspacetab.cpp | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-17 08:49:34
|
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 4f5ed71f0facd87c8a5a8b4db6b8b5593c7ca656 (commit)
from 5e5ecfa11a99b2f84de2f25403314520346baa00 (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/4f5ed71f0facd87c8a5a8b4db6b8b5593c7ca656
commit 4f5ed71f0facd87c8a5a8b4db6b8b5593c7ca656
Author: Eran <era...@gm...>
Date: Fri Jan 17 10:47:25 2014 +0200
Updated debuggers.xml.default version property to 5.4 to make sure that the debugger settings are persistent ( https://sourceforge.net/p/codelite/bugs/952/ )
diff --git a/Runtime/config/debuggers.xml.default b/Runtime/config/debuggers.xml.default
index 94cca1c..27ac67e 100644
--- a/Runtime/config/debuggers.xml.default
+++ b/Runtime/config/debuggers.xml.default
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Debuggers Version="5.11">
+<Debuggers Version="5.4">
<ArchiveObject Name="GNU gdb debugger">
<wxString Value="GNU gdb debugger" Name="name"/>
<wxString Value="" Name="path"/>
@@ -32,22 +32,5 @@ register_wx_printers (None)
end]]>
</CData>
</ArchiveObject>
- <ArchiveObject Name="DebuggerCommands">
- <long Value="1" Name="size"/>
- <SerializedObject Name="PreDefinedSet0">
- <wxString Value="Default" Name="m_name"/>
- <bool Value="1" Name="m_active"/>
- <long Value="2" Name="size"/>
- <SerializedObject Name="DebuggerCmd0">
- <wxString Value="std::string" Name="m_name"/>
- <wxString Value="($(Variable))._M_dataplus._M_p" Name="m_command"/>
- <wxString Value="print" Name="m_dbgCommand"/>
- </SerializedObject>
- <SerializedObject Name="DebuggerCmd1">
- <wxString Value="wxString" Name="m_name"/>
- <wxString Value="($(Variable)).m_impl._M_dataplus._M_p" Name="m_command"/>
- <wxString Value="print" Name="m_dbgCommand"/>
- </SerializedObject>
- </SerializedObject>
- </ArchiveObject>
+ <ArchiveObject Name="DebuggerCommands"/>
</Debuggers>
-----------------------------------------------------------------------
Summary of changes:
Runtime/config/debuggers.xml.default | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-16 06:45:30
|
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 5e5ecfa11a99b2f84de2f25403314520346baa00 (commit)
from dfd88ee6cdcd9ae72c8fc2d375aabaaba456c66a (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/5e5ecfa11a99b2f84de2f25403314520346baa00
commit 5e5ecfa11a99b2f84de2f25403314520346baa00
Author: Eran <era...@gm...>
Date: Thu Jan 16 08:45:20 2014 +0200
Place the GCC_COLORS environment variable inside the proper block (GTK). Should fix bug https://sourceforge.net/p/codelite/bugs/946/
diff --git a/LiteEditor/app.cpp b/LiteEditor/app.cpp
index 50ce391..51bfb6d 100644
--- a/LiteEditor/app.cpp
+++ b/LiteEditor/app.cpp
@@ -340,7 +340,15 @@ bool CodeLiteApp::OnInit()
// this is needed because python complies the files and in most cases the user
// running codelite has no write permissions to /usr/share/codelite/...
DoCopyGdbPrinters();
-
+
+ // Since GCC 4.8.2 gcc has a default colored output
+ // which breaks codelite output parsing
+ // to disable this, we need to set GCC_COLORS to an empty
+ // string.
+ // https://sourceforge.net/p/codelite/bugs/946/
+ // http://gcc.gnu.org/onlinedocs/gcc/Language-Independent-Options.html
+ ::wxSetEnv("GCC_COLORS", "");
+
#if defined (__WXGTK__)
if (homeDir.IsEmpty()) {
SetAppName(wxT("codelite"));
@@ -399,14 +407,6 @@ bool CodeLiteApp::OnInit()
//copy the settings from the global location if needed
CopySettings(homeDir, installPath);
- // Since GCC 4.8.2 gcc has a default colored output
- // which breaks codelite output parsing
- // to disable this, we need to set GCC_COLORS to an empty
- // string.
- // https://sourceforge.net/p/codelite/bugs/946/
- // http://gcc.gnu.org/onlinedocs/gcc/Language-Independent-Options.html
- ::wxSetEnv("GCC_COLORS", "");
-
#else //__WXMSW__
if (homeDir.IsEmpty()) { //did we got a basedir from user?
homeDir = ::wxGetCwd();
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/app.cpp | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-15 19:11:05
|
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 dfd88ee6cdcd9ae72c8fc2d375aabaaba456c66a (commit)
from 19cdd1b4f1645ec1855b0d13af50e5fa51aaa10c (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/dfd88ee6cdcd9ae72c8fc2d375aabaaba456c66a
commit dfd88ee6cdcd9ae72c8fc2d375aabaaba456c66a
Author: Eran <era...@gm...>
Date: Wed Jan 15 21:10:50 2014 +0200
Updated Svn commit dialog
diff --git a/Subversion2/SvnCommitDialog.cpp b/Subversion2/SvnCommitDialog.cpp
index 5e2b131..8ed9f0a 100644
--- a/Subversion2/SvnCommitDialog.cpp
+++ b/Subversion2/SvnCommitDialog.cpp
@@ -52,13 +52,17 @@ SvnCommitDialog::SvnCommitDialog(wxWindow* parent, Subversion2* plugin)
m_choiceMessages->Append(previews.Item(i), new CommitMessageStringData(lastMessages.Item(i)));
}
- m_textCtrlMessage->SetFocus();
WindowAttrManager::Load(this, wxT("SvnCommitDialog"), m_plugin->GetManager()->GetConfigTool());
-
int sashPos = m_plugin->GetSettings().GetCommitDlgSashPos();
if ( sashPos != wxNOT_FOUND ) {
m_splitterH->SetSashPosition(sashPos);
}
+
+ LexerConfPtr textLexer = EditorConfigST::Get()->GetLexer("text");
+ if ( textLexer ) {
+ textLexer->Apply( m_stcMessage );
+ }
+
}
SvnCommitDialog::SvnCommitDialog(wxWindow* parent, const wxArrayString &paths, const wxString &url, Subversion2 *plugin, const wxString &repoPath)
@@ -90,7 +94,6 @@ SvnCommitDialog::SvnCommitDialog(wxWindow* parent, const wxArrayString &paths, c
DoShowDiff(0);
}
- m_textCtrlMessage->SetFocus();
WindowAttrManager::Load(this, wxT("SvnCommitDialog"), m_plugin->GetManager()->GetConfigTool());
int sashPos = m_plugin->GetSettings().GetCommitDlgSashPos();
if ( sashPos != wxNOT_FOUND ) {
@@ -107,13 +110,18 @@ SvnCommitDialog::SvnCommitDialog(wxWindow* parent, const wxArrayString &paths, c
m_stcDiff->SetLexer(wxSTC_LEX_DIFF);
diffLexer->Apply( m_stcDiff );
}
+
+ LexerConfPtr textLexer = EditorConfigST::Get()->GetLexer("text");
+ if ( textLexer ) {
+ textLexer->Apply( m_stcMessage );
+ }
}
SvnCommitDialog::~SvnCommitDialog()
{
wxDELETE( m_process );
- wxString message = m_textCtrlMessage->GetValue();
+ wxString message = m_stcMessage->GetText();
m_plugin->GetCommitMessagesCache().AddMessage(message);
int sashPos = m_splitterH->GetSashPosition();
@@ -128,7 +136,7 @@ SvnCommitDialog::~SvnCommitDialog()
wxString SvnCommitDialog::GetMesasge()
{
SubversionLocalProperties props(m_url);
- wxString msg = NormalizeMessage(m_textCtrlMessage->GetValue());
+ wxString msg = NormalizeMessage(m_stcMessage->GetText());
msg << wxT("\n");
// Append any bug URLs to the commit message
@@ -230,7 +238,7 @@ void SvnCommitDialog::OnChoiceMessage(wxCommandEvent& e)
CommitMessageStringData* data = (CommitMessageStringData*)m_choiceMessages->GetClientObject(idx);
if(data) {
- m_textCtrlMessage->SetValue(data->GetData());
+ m_stcMessage->SetText( data->GetData() );
}
}
diff --git a/Subversion2/wxcrafter.cpp b/Subversion2/wxcrafter.cpp
index 2636b18..3381279 100644
--- a/Subversion2/wxcrafter.cpp
+++ b/Subversion2/wxcrafter.cpp
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: wxcrafter.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -25,7 +26,7 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
wxBoxSizer* boxSizer1 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer1);
- wxFlexGridSizer* flexGridSizer5 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer5 = new wxFlexGridSizer(0, 2, 0, 0);
flexGridSizer5->SetFlexibleDirection( wxBOTH );
flexGridSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer5->AddGrowableCol(1);
@@ -48,7 +49,7 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
flexGridSizer5->Add(m_textCtrlBugID, 0, wxALL|wxEXPAND, 5);
- m_splitterV = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxSP_LIVE_UPDATE);
+ m_splitterV = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME|wxSP_3DSASH);
m_splitterV->SetSashGravity(0.5);
m_splitterV->SetMinimumPaneSize(10);
@@ -63,7 +64,7 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
m_splitterH->SetSashGravity(0.5);
m_splitterH->SetMinimumPaneSize(10);
- boxSizer58->Add(m_splitterH, 1, wxALL|wxEXPAND, 5);
+ boxSizer58->Add(m_splitterH, 1, wxEXPAND, 5);
m_panel1 = new wxPanel(m_splitterH, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
@@ -77,7 +78,7 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
wxArrayString m_checkListFilesArr;
m_checkListFiles = new wxCheckListBox(m_panel1, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), m_checkListFilesArr, wxLB_SINGLE);
- boxSizer15->Add(m_checkListFiles, 1, wxEXPAND, 5);
+ boxSizer15->Add(m_checkListFiles, 1, wxALL|wxEXPAND, 2);
m_splitterPage14 = new wxPanel(m_splitterH, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_splitterH->SplitVertically(m_panel1, m_splitterPage14, 0);
@@ -106,14 +107,13 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
m_stcDiff->SetMarginSensitive(2, true);
// Configure the line numbers margin
- int m_stcDiff_PixelWidth = 4 + 5 *m_stcDiff->TextWidth(wxSTC_STYLE_LINENUMBER, wxT("9"));
m_stcDiff->SetMarginType(0, wxSTC_MARGIN_NUMBER);
- m_stcDiff->SetMarginWidth(0,m_stcDiff_PixelWidth);
+ m_stcDiff->SetMarginWidth(0,0);
// Configure the line symbol margin
m_stcDiff->SetMarginType(3, wxSTC_MARGIN_FORE);
m_stcDiff->SetMarginMask(3, 0);
- m_stcDiff->SetMarginWidth(3,1);
+ m_stcDiff->SetMarginWidth(3,0);
// Select the lexer
m_stcDiff->SetLexer(wxSTC_LEX_NULL);
// Set default font / styles
@@ -126,7 +126,7 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
m_stcDiff->SetKeyWords(3, wxT(""));
m_stcDiff->SetKeyWords(4, wxT(""));
- boxSizer16->Add(m_stcDiff, 1, wxEXPAND, 5);
+ boxSizer16->Add(m_stcDiff, 1, wxALL|wxEXPAND, 2);
m_splitterPage56 = new wxPanel(m_splitterV, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_splitterV->SplitHorizontally(m_splitterPage52, m_splitterPage56, 0);
@@ -138,40 +138,65 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
boxSizer60->Add(m_staticText62, 0, wxALL, 5);
- m_textCtrlMessage = new wxTextCtrl(m_splitterPage56, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), wxTE_RICH2|wxTE_PROCESS_ENTER|wxTE_MULTILINE);
- #ifdef __WXMSW__
- // To get the newer version of the font on MSW, we use font wxSYS_DEFAULT_GUI_FONT with family set to wxFONTFAMILY_TELETYPE
- wxFont m_textCtrlMessageFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
- m_textCtrlMessageFont.SetFamily(wxFONTFAMILY_TELETYPE);
- #else
- wxFont m_textCtrlMessageFont = wxSystemSettings::GetFont(wxSYS_ANSI_FIXED_FONT);
- #endif
- m_textCtrlMessage->SetFont(m_textCtrlMessageFont);
+ m_stcMessage = new wxStyledTextCtrl(m_splitterPage56, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME);
+ m_stcMessage->SetFocus();
+ // Configure the fold margin
+ m_stcMessage->SetMarginType (4, wxSTC_MARGIN_SYMBOL);
+ m_stcMessage->SetMarginMask (4, wxSTC_MASK_FOLDERS);
+ m_stcMessage->SetMarginSensitive(4, true);
+ m_stcMessage->SetMarginWidth (4, 0);
+
+ // Configure the tracker margin
+ m_stcMessage->SetMarginWidth(1, 0);
- boxSizer60->Add(m_textCtrlMessage, 1, wxALL|wxEXPAND, 5);
+ // Configure the symbol margin
+ m_stcMessage->SetMarginType (2, wxSTC_MARGIN_SYMBOL);
+ m_stcMessage->SetMarginMask (2, ~(wxSTC_MASK_FOLDERS));
+ m_stcMessage->SetMarginWidth(2, 0);
+ m_stcMessage->SetMarginSensitive(2, true);
+
+ // Configure the line numbers margin
+ m_stcMessage->SetMarginType(0, wxSTC_MARGIN_NUMBER);
+ m_stcMessage->SetMarginWidth(0,0);
+
+ // Configure the line symbol margin
+ m_stcMessage->SetMarginType(3, wxSTC_MARGIN_FORE);
+ m_stcMessage->SetMarginMask(3, 0);
+ m_stcMessage->SetMarginWidth(3,0);
+ // Select the lexer
+ m_stcMessage->SetLexer(wxSTC_LEX_NULL);
+ // Set default font / styles
+ m_stcMessage->StyleClearAll();
+ m_stcMessage->SetWrapMode(0);
+ m_stcMessage->SetIndentationGuides(0);
+ m_stcMessage->SetKeyWords(0, wxT(""));
+ m_stcMessage->SetKeyWords(1, wxT(""));
+ m_stcMessage->SetKeyWords(2, wxT(""));
+ m_stcMessage->SetKeyWords(3, wxT(""));
+ m_stcMessage->SetKeyWords(4, wxT(""));
+
+ boxSizer60->Add(m_stcMessage, 1, wxALL|wxEXPAND, 2);
wxStaticBoxSizer* statixBoxSizer24 = new wxStaticBoxSizer( new wxStaticBox(this, wxID_ANY, _("Recent commit messages:")), wxVERTICAL);
- boxSizer1->Add(statixBoxSizer24, 0, wxEXPAND|wxALL, 5);
+ boxSizer1->Add(statixBoxSizer24, 0, wxALL|wxEXPAND, 5);
wxArrayString m_choiceMessagesArr;
m_choiceMessages = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), m_choiceMessagesArr, 0);
- statixBoxSizer24->Add(m_choiceMessages, 0, wxEXPAND|wxALL, 5);
-
- wxBoxSizer* boxSizer2 = new wxBoxSizer(wxHORIZONTAL);
-
- boxSizer1->Add(boxSizer2, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+ statixBoxSizer24->Add(m_choiceMessages, 0, wxALL|wxEXPAND, 5);
- m_button3 = new wxButton(this, wxID_OK, _("C&ommit"), wxDefaultPosition, wxSize(-1,-1), 0);
- m_button3->SetDefault();
- m_button3->SetToolTip(_("Commit"));
+ m_stdBtnSizer66 = new wxStdDialogButtonSizer();
- boxSizer2->Add(m_button3, 0, wxALL, 5);
+ boxSizer1->Add(m_stdBtnSizer66, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
- m_button4 = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize(-1,-1), 0);
+ m_buttonCancel = new wxButton(this, wxID_CANCEL, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_stdBtnSizer66->AddButton(m_buttonCancel);
- boxSizer2->Add(m_button4, 0, wxALL, 5);
+ m_buttonOK = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_buttonOK->SetDefault();
+ m_stdBtnSizer66->AddButton(m_buttonOK);
+ m_stdBtnSizer66->Realize();
SetSizeHints(-1,-1);
if ( GetSizer() ) {
@@ -219,7 +244,7 @@ SvnSyncDialogBaseClass::SvnSyncDialogBaseClass(wxWindow* parent, wxWindowID id,
boxSizer32->Add(m_staticTextSvnInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
- wxFlexGridSizer* flexGridSizer37 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer37 = new wxFlexGridSizer(0, 2, 0, 0);
flexGridSizer37->SetFlexibleDirection( wxBOTH );
flexGridSizer37->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer37->AddGrowableCol(1);
diff --git a/Subversion2/wxcrafter.h b/Subversion2/wxcrafter.h
index 8dec9c0..30c43a5 100644
--- a/Subversion2/wxcrafter.h
+++ b/Subversion2/wxcrafter.h
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: wxcrafter.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -11,6 +12,7 @@
#include <wx/xrc/xh_bmp.h>
#include <wx/dialog.h>
#include <wx/iconbndl.h>
+#include <wx/artprov.h>
#include <wx/sizer.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
@@ -43,10 +45,11 @@ protected:
wxStyledTextCtrl* m_stcDiff;
wxPanel* m_splitterPage56;
wxStaticText* m_staticText62;
- wxTextCtrl* m_textCtrlMessage;
+ wxStyledTextCtrl* m_stcMessage;
wxChoice* m_choiceMessages;
- wxButton* m_button3;
- wxButton* m_button4;
+ wxStdDialogButtonSizer* m_stdBtnSizer66;
+ wxButton* m_buttonCancel;
+ wxButton* m_buttonOK;
protected:
virtual void OnFileSelected(wxCommandEvent& event) { event.Skip(); }
diff --git a/Subversion2/wxcrafter.wxcp b/Subversion2/wxcrafter.wxcp
index eff796c..a4fa5dd 100644
--- a/Subversion2/wxcrafter.wxcp
+++ b/Subversion2/wxcrafter.wxcp
@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
- "m_objCounter": 62,
+ "m_objCounter": 70,
"m_includeFiles": [],
"m_bitmapFunction": "wxC38D8InitBitmapResources",
"m_bitmapsFile": "wxcrafter_subversion2_bitmaps.cpp",
@@ -506,7 +506,7 @@
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": ["wxSP_LIVE_UPDATE"],
+ "m_styles": ["wxSP_LIVE_UPDATE", "wxSP_NO_XP_THEME", "wxSP_3DSASH"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
@@ -679,7 +679,7 @@
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxSP_LIVE_UPDATE", "wxSP_3DSASH"],
- "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_sizerFlags": ["wxEXPAND"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -922,11 +922,11 @@
}, {
"m_type": 4425,
"proportion": 1,
- "border": 5,
+ "border": 2,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxLB_SINGLE"],
- "m_sizerFlags": ["wxEXPAND"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -1165,11 +1165,11 @@
}, {
"m_type": 4466,
"proportion": 1,
- "border": 5,
+ "border": 2,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
- "m_sizerFlags": ["wxEXPAND"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -1221,11 +1221,11 @@
}, {
"type": "bool",
"m_label": "Line Number Margin",
- "m_value": true
+ "m_value": false
}, {
"type": "bool",
"m_label": "Separator Margin",
- "m_value": true
+ "m_value": false
}, {
"type": "bool",
"m_label": "Symbol Margin",
@@ -1451,12 +1451,12 @@
"m_events": [],
"m_children": []
}, {
- "m_type": 4406,
+ "m_type": 4466,
"proportion": 1,
- "border": 5,
+ "border": 2,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": ["wxTE_RICH2", "wxTE_PROCESS_ENTER", "wxTE_MULTILINE"],
+ "m_styles": ["wxBORDER_THEME"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
@@ -1473,24 +1473,12 @@
}, {
"type": "string",
"m_label": "Name:",
- "m_value": "m_textCtrlMessage"
+ "m_value": "m_stcMessage"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
- "type": "colour",
- "m_label": "Bg Colour:",
- "colour": "<Default>"
- }, {
- "type": "colour",
- "m_label": "Fg Colour:",
- "colour": "<Default>"
- }, {
- "type": "font",
- "m_label": "Font:",
- "m_value": "wxSYS_ANSI_FIXED_FONT,normal,normal,normal"
- }, {
"type": "bool",
"m_label": "Hidden",
"m_value": false
@@ -1501,7 +1489,7 @@
}, {
"type": "bool",
"m_label": "Focused",
- "m_value": false
+ "m_value": true
}, {
"type": "string",
"m_label": "Class Name:",
@@ -1515,21 +1503,69 @@
"m_label": "Style:",
"m_value": ""
}, {
- "type": "string",
- "m_label": "Value:",
- "m_value": ""
+ "type": "bool",
+ "m_label": "Fold Margin",
+ "m_value": false
}, {
- "type": "string",
- "m_label": "Max Length:",
- "m_value": "0"
+ "type": "bool",
+ "m_label": "Line Number Margin",
+ "m_value": false
}, {
"type": "bool",
- "m_label": "Auto Complete Directories:",
+ "m_label": "Separator Margin",
"m_value": false
}, {
"type": "bool",
- "m_label": "Auto Complete Files:",
+ "m_label": "Symbol Margin",
+ "m_value": false
+ }, {
+ "type": "choice",
+ "m_label": "Wrap Text",
+ "m_selection": 0,
+ "m_options": ["None", "Word", "Char"]
+ }, {
+ "type": "choice",
+ "m_label": "Indentation Guides",
+ "m_selection": 0,
+ "m_options": ["None", "Real", "Look Forward", "Look Both"]
+ }, {
+ "type": "choice",
+ "m_label": "EOL Mode",
+ "m_selection": 3,
+ "m_options": ["CRLF", "CR", "LF", "Default"]
+ }, {
+ "type": "bool",
+ "m_label": "Display EOL Markers",
"m_value": false
+ }, {
+ "type": "choice",
+ "m_label": "Lexer",
+ "m_selection": 58,
+ "m_options": ["wxSTC_LEX_ABAQUS", "wxSTC_LEX_ADA", "wxSTC_LEX_APDL", "wxSTC_LEX_ASM", "wxSTC_LEX_ASN1", "wxSTC_LEX_ASYMPTOTE", "wxSTC_LEX_AUTOMATIC", "wxSTC_LEX_AVE", "wxSTC_LEX_BAAN", "wxSTC_LEX_BASH", "wxSTC_LEX_BATCH", "wxSTC_LEX_BLITZBASIC", "wxSTC_LEX_BULLANT", "wxSTC_LEX_CAML", "wxSTC_LEX_CLW", "wxSTC_LEX_CLWNOCASE", "wxSTC_LEX_CMAKE", "wxSTC_LEX_COBOL", "wxSTC_LEX_CONF", "wxSTC_LEX_CONTAINER", "wxSTC_LEX_CPP", "wxSTC_LEX_CPPNOCASE", "wxSTC_LEX_CSOUND", "wxSTC_LEX_CSS", "wxSTC_LEX_D", "wxSTC_LEX_DIFF", "wxSTC_LEX_EIFFEL", "wxSTC_LEX_EIFFELKW", "wxSTC_LEX_ERLANG", "wxSTC_LEX_ERRORLIST", "wxSTC_LEX_ESCRIPT", "wxSTC_LEX_F77", "wxSTC_LEX_FLAGSHIP", "wxSTC_LEX_FORTH", "wxSTC_LEX_FORTRAN", "wxSTC_LEX_FREEBASIC", "wxSTC_LEX_GAP", "wxSTC_LEX_GUI4CLI", "wxSTC_LEX_HASKELL", "wxSTC_LEX_HTML", "wxSTC_LEX_INNOSETUP", "wxSTC_LEX_KIX", "wxSTC_LEX_LATEX", "wxSTC_LEX_LISP", "wxSTC_LEX_LOT", "wxSTC_LEX_LOUT", "wxSTC_LEX_LUA", "wxSTC_LEX_MAGIK", "wxSTC_LEX_MAKEFILE", "wxSTC_LEX_MARKDOWN", "wxSTC_LEX_MATLAB", "wxSTC_LEX_METAPOST", "wxSTC_LEX_MMIXAL", "wxSTC_LEX_MSSQL", "wxSTC_LEX_MYSQL", "wxSTC_LEX_NIMROD", "wxSTC_LEX_NNCRONTAB", "wxSTC_LEX_NSIS", "wxSTC_LEX_NULL", "wxSTC_LEX_OCTAVE", "wxSTC_LEX_OPAL", "wxSTC_LEX_PASCAL", "wxSTC_LEX_PERL", "wxSTC_LEX_PHPSCRIPT", "wxSTC_LEX_PLM", "wxSTC_LEX_PO", "wxSTC_LEX_POV", "wxSTC_LEX_POWERBASIC", "wxSTC_LEX_POWERPRO", "wxSTC_LEX_POWERSHELL", "wxSTC_LEX_PROGRESS", "wxSTC_LEX_PROPERTIES", "wxSTC_LEX_PS", "wxSTC_LEX_PUREBASIC", "wxSTC_LEX_PYTHON", "wxSTC_LEX_R", "wxSTC_LEX_REBOL", "wxSTC_LEX_RUBY", "wxSTC_LEX_SCRIPTOL", "wxSTC_LEX_SMALLTALK", "wxSTC_LEX_SML", "wxSTC_LEX_SORCUS", "wxSTC_LEX_SPECMAN", "wxSTC_LEX_SPICE", "wxSTC_LEX_SQL", "wxSTC_LEX_TACL", "wxSTC_LEX_TADS3", "wxSTC_LEX_TAL", "wxSTC_LEX_TCL", "wxSTC_LEX_TEX", "wxSTC_LEX_VB", "wxSTC_LEX_VBSCRIPT", "wxSTC_LEX_VERILOG", "wxSTC_LEX_VHDL", "wxSTC_LEX_XCODE", "wxSTC_LEX_XML", "wxSTC_LEX_YAML"]
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Keywords Set 1",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Keywords Set 2",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Keywords Set 3",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Keywords Set 4",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Keywords Set 5",
+ "m_value": ""
}],
"m_events": [],
"m_children": []
@@ -1543,7 +1579,7 @@
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
- "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "string",
... 276 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-15 17:07:08
|
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 19cdd1b4f1645ec1855b0d13af50e5fa51aaa10c (commit)
via d750a65e2b95343029be41ec2229136e7f5e671b (commit)
from dc37283854b912fe12b11ab962f70dd055aeb9b4 (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/19cdd1b4f1645ec1855b0d13af50e5fa51aaa10c
commit 19cdd1b4f1645ec1855b0d13af50e5fa51aaa10c
Author: Eran <era...@gm...>
Date: Wed Jan 15 19:06:53 2014 +0200
Removed another obsolete file
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index 9353379..10a87e0 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -207,7 +207,6 @@
<File Name="editor_options_bookmarks.wxcp"/>
<File Name="editor_options_bookmarks_liteeditor_bitmaps.cpp"/>
<File Name="syntaxhighlightbasedlg_liteeditor_bitmaps.cpp"/>
- <File Name="../yesnodlg.wxcp"/>
</VirtualDirectory>
<VirtualDirectory Name="CodeCompletion">
<File Name="quickoutlinedlg.cpp"/>
https://sourceforge.net/p/codelite/codelitegit/ci/d750a65e2b95343029be41ec2229136e7f5e671b
commit d750a65e2b95343029be41ec2229136e7f5e671b
Author: Eran <era...@gm...>
Date: Wed Jan 15 19:06:05 2014 +0200
Removed obsolete files from the workspace (which caused build errors on Windows)
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index d252ee0..08385ee 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -44,7 +44,7 @@
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/>
@@ -114,7 +114,7 @@
<Project Name="wxsqlite3" ConfigName="WinDebugUnicode"/>
<Project Name="ZoomNavigator" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="CMake_Release" Selected="yes">
+ <WorkspaceConfiguration Name="CMake_Release" Selected="no">
<Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index 0f7dfe2..9353379 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -904,8 +904,6 @@
<File Name="DebuggerSettings_liteeditor_bitmaps.cpp"/>
<File Name="FileExplorerTab.h"/>
<File Name="FileExplorerTab.cpp"/>
- <File Name="advance_settings.h"/>
- <File Name="advance_settings.cpp"/>
</VirtualDirectory>
<VirtualDirectory Name="ReconcileProject">
<File Name="reconcileproject.cpp"/>
-----------------------------------------------------------------------
Summary of changes:
LiteEditor.workspace | 4 ++--
LiteEditor/LiteEditor.project | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-15 14:43:09
|
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 dc37283854b912fe12b11ab962f70dd055aeb9b4 (commit)
via 477e1867f8337cd2f4f87a0c7bd492e8f4ed4716 (commit)
from c2d61cace8a1d97ec7a94951dffbea9501441e2f (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/dc37283854b912fe12b11ab962f70dd055aeb9b4
commit dc37283854b912fe12b11ab962f70dd055aeb9b4
Author: Eran <era...@gm...>
Date: Wed Jan 15 16:42:38 2014 +0200
Build settings: when creating new compiler, allow the user to copy the settins from an existing compiler
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 8b5820e..d252ee0 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -114,7 +114,7 @@
<Project Name="wxsqlite3" ConfigName="WinDebugUnicode"/>
<Project Name="ZoomNavigator" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="CMake_Release" Selected="no">
+ <WorkspaceConfiguration Name="CMake_Release" Selected="yes">
<Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
@@ -149,7 +149,7 @@
<Project Name="Tweaks" ConfigName="DebugUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="CMake_Debug" Selected="yes">
+ <WorkspaceConfiguration Name="CMake_Debug" Selected="no">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index 94819d1..0f7dfe2 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -271,6 +271,8 @@
<File Name="addoptioncheckdlgbase.cpp"/>
<File Name="compiler_page.wxcp"/>
<File Name="advance_settings.wxcp"/>
+ <File Name="NewCompilerDlg.h"/>
+ <File Name="NewCompilerDlg.cpp"/>
</VirtualDirectory>
<VirtualDirectory Name="Build">
<File Name="configuration_manager_base_dlg.cpp"/>
diff --git a/LiteEditor/NewCompilerDlg.cpp b/LiteEditor/NewCompilerDlg.cpp
new file mode 100644
index 0000000..9a33286
--- /dev/null
+++ b/LiteEditor/NewCompilerDlg.cpp
@@ -0,0 +1,37 @@
+#include "NewCompilerDlg.h"
+#include "windowattrmanager.h"
+#include "build_settings_config.h"
+
+NewCompilerDlg::NewCompilerDlg(wxWindow* parent)
+ : NewCompilerDlgBase(parent)
+{
+ BuildSettingsConfigCookie cookie;
+ m_choiceCompilers->Append("<None>");
+ CompilerPtr cmp = BuildSettingsConfigST::Get()->GetFirstCompiler(cookie);
+ while ( cmp ) {
+ m_choiceCompilers->Append(cmp->GetName());
+ cmp = BuildSettingsConfigST::Get()->GetNextCompiler(cookie);
+ }
+
+ m_choiceCompilers->SetStringSelection("<None>");
+ WindowAttrManager::Load(this, "NewCompilerDlg");
+}
+
+NewCompilerDlg::~NewCompilerDlg()
+{
+ WindowAttrManager::Save(this, "NewCompilerDlg");
+}
+
+void NewCompilerDlg::OnOkUI(wxUpdateUIEvent& event)
+{
+ event.Enable( !m_textCtrlCompilerName->IsEmpty() );
+}
+
+wxString NewCompilerDlg::GetMasterCompiler() const
+{
+ wxString compilerName = m_choiceCompilers->GetStringSelection();
+ if ( compilerName == "<None>" ) {
+ return wxEmptyString;
+ }
+ return compilerName;
+}
diff --git a/LiteEditor/NewCompilerDlg.h b/LiteEditor/NewCompilerDlg.h
new file mode 100644
index 0000000..1068801
--- /dev/null
+++ b/LiteEditor/NewCompilerDlg.h
@@ -0,0 +1,19 @@
+#ifndef NEWCOMPILERDLG_H
+#define NEWCOMPILERDLG_H
+#include "compiler_pages.h"
+
+class NewCompilerDlg : public NewCompilerDlgBase
+{
+public:
+ NewCompilerDlg(wxWindow* parent);
+ virtual ~NewCompilerDlg();
+
+ wxString GetCompilerName() const {
+ return m_textCtrlCompilerName->GetValue();
+ }
+
+ wxString GetMasterCompiler() const;
+protected:
+ virtual void OnOkUI(wxUpdateUIEvent& event);
+};
+#endif // NEWCOMPILERDLG_H
diff --git a/LiteEditor/advanced_settings.cpp b/LiteEditor/advanced_settings.cpp
index 4886149..79de6c4 100644
--- a/LiteEditor/advanced_settings.cpp
+++ b/LiteEditor/advanced_settings.cpp
@@ -49,6 +49,7 @@
#include "frame.h"
#include <wx/textdlg.h>
#include "advance_settings_base.h"
+#include "NewCompilerDlg.h"
BEGIN_EVENT_TABLE(AdvancedDlg, AdvancedDlgBase)
EVT_MENU(XRCID("delete_compiler"), AdvancedDlg::OnDeleteCompiler)
@@ -149,11 +150,9 @@ AdvancedDlg::~AdvancedDlg()
void AdvancedDlg::OnButtonNewClicked(wxCommandEvent &event)
{
wxUnusedVar(event);
- wxString newCompilerName = ::wxGetTextFromUser( _("Enter New Compiler Name:"), _("New Compiler"));
- TrimString(newCompilerName);
-
- if ( !newCompilerName.IsEmpty() ) {
- CreateDefaultNewCompiler(newCompilerName);
+ NewCompilerDlg dlg(this);
+ if ( dlg.ShowModal() == wxID_OK ) {
+ CreateNewCompiler(dlg.GetCompilerName(), dlg.GetMasterCompiler());
LoadCompilers();
if(m_compilersNotebook->GetPageCount() > ((m_compilerPagesMap.size() *6)-1) ) {
@@ -226,14 +225,19 @@ void AdvancedDlg::SaveCompilers()
}
}
-bool AdvancedDlg::CreateDefaultNewCompiler ( const wxString &name )
+bool AdvancedDlg::CreateNewCompiler (const wxString& name, const wxString& copyFrom)
{
if ( BuildSettingsConfigST::Get()->IsCompilerExist ( name ) ) {
wxMessageBox ( _( "A compiler with this name already exists" ), _( "Error" ), wxOK | wxICON_HAND );
return false;
}
-
- CompilerPtr cmp = BuildSettingsConfigST::Get()->GetCompiler ( name );
+
+ CompilerPtr cmp;
+ if ( !copyFrom.IsEmpty() ) {
+ cmp = BuildSettingsConfigST::Get()->GetCompiler ( copyFrom );
+ } else {
+ cmp = BuildSettingsConfigST::Get()->GetCompiler ( name );
+ }
cmp->SetName ( name );
BuildSettingsConfigST::Get()->SetCompiler ( cmp );
return true;
diff --git a/LiteEditor/advanced_settings.h b/LiteEditor/advanced_settings.h
index 5253bde..878dcd0 100644
--- a/LiteEditor/advanced_settings.h
+++ b/LiteEditor/advanced_settings.h
@@ -83,7 +83,7 @@ protected:
void OnContextMenu(wxContextMenuEvent &e);
void LoadCompilers();
- bool CreateDefaultNewCompiler(const wxString &name);
+ bool CreateNewCompiler(const wxString &name, const wxString ©From);
void AddCompiler(CompilerPtr cmp, bool selected);
bool DeleteCompiler(const wxString &name);
void SaveCompilers();
diff --git a/LiteEditor/compiler_page.wxcp b/LiteEditor/compiler_page.wxcp
index 2535990..0815d2f 100644
--- a/LiteEditor/compiler_page.wxcp
+++ b/LiteEditor/compiler_page.wxcp
@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
- "m_objCounter": 69,
+ "m_objCounter": 90,
"m_includeFiles": [],
"m_bitmapFunction": "wxCAD0CInitBitmapResources",
"m_bitmapsFile": "compiler_page_plugin_bitmaps.cpp",
@@ -7973,5 +7973,617 @@
}]
}]
}]
+ }, {
+ "m_type": 4421,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": ["wxDEFAULT_DIALOG_STYLE", "wxRESIZE_BORDER"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "NewCompilerDlgBase"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Title:",
+ "m_value": "New Compiler"
+ }, {
+ "type": "virtualFolderPicker",
+ "m_label": "Virtual Folder:",
+ "m_path": "LiteEditor:Dialogs:Compiler"
+ }, {
+ "type": "choice",
+ "m_label": "Centre:",
+ "m_selection": 1,
+ "m_options": ["", "wxBOTH", "wxVERTICAL", "wxHORIZONTAL"]
+ }, {
+ "type": "string",
+ "m_label": "File:",
+ "m_value": "NewCompilerDlg"
+ }, {
+ "type": "string",
+ "m_label": "Inherited Class",
+ "m_value": "NewCompilerDlg"
+ }, {
+ "type": "string",
+ "m_label": "Class Decorator",
+ "m_value": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (16x16) :",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (32x32) :",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (64x64) :",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (128x128):",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (256x256):",
+ "m_path": ""
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4401,
+ "proportion": 1,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "boxSizer73"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 0,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4403,
+ "proportion": 1,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "flexGridSizer82"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "# Columns:",
+ "m_value": "2"
+ }, {
+ "type": "string",
+ "m_label": "# Rows:",
+ "m_value": "0"
+ }, {
+ "type": "string",
+ "m_label": "Growable columns:",
+ "m_value": "1"
+ }, {
+ "type": "string",
+ "m_label": "Growable rows:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Horizontal gap:",
+ "m_value": "0"
+ }, {
+ "type": "string",
+ "m_label": "Vertical gap:",
+ "m_value": "0"
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4405,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT", "wxALIGN_CENTER_VERTICAL"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_staticText84"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Label:",
+ "m_value": "New compiler name:"
+ }, {
+ "type": "string",
+ "m_label": "Wrap:",
+ "m_value": "-1"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4406,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_textCtrlCompilerName"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": true
+ }, {
... 1330 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-15 10:11:23
|
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 c2d61cace8a1d97ec7a94951dffbea9501441e2f (commit)
from c77d6efee94ebd7c8e05aa9e050092b9d076a80c (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/c2d61cace8a1d97ec7a94951dffbea9501441e2f
commit c2d61cace8a1d97ec7a94951dffbea9501441e2f
Author: Eran <era...@gm...>
Date: Wed Jan 15 12:11:10 2014 +0200
Fixed: local workspace settings should now get saved again
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 08385ee..8b5820e 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -44,7 +44,7 @@
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/>
@@ -149,7 +149,7 @@
<Project Name="Tweaks" ConfigName="DebugUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="CMake_Debug" Selected="no">
+ <WorkspaceConfiguration Name="CMake_Debug" Selected="yes">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
diff --git a/LiteEditor/editorsettingslocalbase.cpp b/LiteEditor/editorsettingslocalbase.cpp
index 03259ea..cf6f424 100644
--- a/LiteEditor/editorsettingslocalbase.cpp
+++ b/LiteEditor/editorsettingslocalbase.cpp
@@ -313,6 +313,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
m_whitespaceStyleEnable->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::whitespaceStyleUpdateUI), NULL, this);
m_choiceEOLEnable->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::choiceEOLUpdateUI), NULL, this);
m_fileEncodingEnable->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::fileEncodingUpdateUI), NULL, this);
+ m_button19->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LocalEditorSettingsbase::OnOK), NULL, this);
}
@@ -332,5 +333,6 @@ LocalEditorSettingsbase::~LocalEditorSettingsbase()
m_whitespaceStyleEnable->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::whitespaceStyleUpdateUI), NULL, this);
m_choiceEOLEnable->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::choiceEOLUpdateUI), NULL, this);
m_fileEncodingEnable->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::fileEncodingUpdateUI), NULL, this);
+ m_button19->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LocalEditorSettingsbase::OnOK), NULL, this);
}
diff --git a/LiteEditor/editorsettingslocalbase.h b/LiteEditor/editorsettingslocalbase.h
index 997fd32..dc241c5 100644
--- a/LiteEditor/editorsettingslocalbase.h
+++ b/LiteEditor/editorsettingslocalbase.h
@@ -84,6 +84,7 @@ protected:
virtual void whitespaceStyleUpdateUI(wxUpdateUIEvent& event) { event.Skip(); }
virtual void choiceEOLUpdateUI(wxUpdateUIEvent& event) { event.Skip(); }
virtual void fileEncodingUpdateUI(wxUpdateUIEvent& event) { event.Skip(); }
+ virtual void OnOK(wxCommandEvent& event) { event.Skip(); }
public:
LocalEditorSettingsbase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Local Preferences"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1, -1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
diff --git a/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp b/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp
index 63d7857..eae0dc2 100644
--- a/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp
+++ b/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp
@@ -1,298 +1,298 @@
-//
-// This file was automatically generated by wxrc, do not edit by hand.
-//
-
-#include <wx/wxprec.h>
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include <wx/filesys.h>
-#include <wx/fs_mem.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/xrc/xh_all.h>
-
-#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
- #define XRC_ADD_FILE(name, data, size, mime) \
- wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
-#else
- #define XRC_ADD_FILE(name, data, size, mime) \
- wxMemoryFSHandler::AddFile(name, data, size)
-#endif
-
-static size_t xml_res_size_0 = 353;
-static unsigned char xml_res_file_0[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,4,103,65,77,65,0,0,175,200,55,5,138,233,0,0,0,25,
-116,69,88,116,83,111,102,116,119,97,114,101,0,65,100,111,98,101,32,73,109,
-97,103,101,82,101,97,100,121,113,201,101,60,0,0,0,243,73,68,65,84,56,203,
-99,252,255,255,63,3,37,128,137,129,66,64,177,1,44,48,70,121,121,249,255,
-127,255,254,49,252,249,243,7,142,127,255,254,13,199,191,126,253,130,211,
-32,188,119,239,94,70,144,62,70,74,195,0,238,130,206,45,239,174,148,251,
-8,233,192,248,177,177,177,215,145,109,68,199,103,206,156,209,68,49,224,
-199,239,191,12,153,139,158,92,189,117,251,107,200,222,102,245,235,64,69,
-138,184,52,131,48,12,128,189,208,178,249,197,127,17,110,54,134,79,223,127,
-51,156,190,243,245,204,195,91,95,226,78,77,213,187,78,140,23,224,97,144,
-179,248,197,149,87,239,191,51,221,189,250,41,248,236,76,253,235,158,158,
-158,87,96,182,253,252,249,19,110,51,204,91,15,31,62,212,65,241,194,183,
-159,255,24,86,229,41,106,193,189,244,227,135,10,186,179,145,99,3,195,5,
-20,199,130,183,183,247,127,124,129,134,156,38,64,248,243,231,207,84,78,
-7,182,182,182,255,177,5,22,178,173,31,62,124,96,196,25,11,3,150,153,0,9,
-38,9,133,50,72,142,137,0,0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_1 = 551;
-static unsigned char xml_res_file_1[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,
-65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,
-0,0,1,201,73,68,65,84,120,218,140,83,187,74,67,65,16,157,125,68,13,4,137,
-8,34,26,2,106,33,66,16,76,42,43,237,84,16,31,117,240,7,244,55,252,6,177,
-17,139,144,210,36,138,69,210,68,237,85,68,20,17,95,144,136,136,141,41,2,
-34,241,222,117,102,179,187,185,49,41,156,203,178,187,103,207,156,157,153,
-157,203,148,82,64,118,116,124,252,233,121,94,148,246,140,1,16,76,107,58,
-101,52,16,180,56,173,133,16,181,149,229,229,129,38,9,71,174,80,80,214,138,
-231,207,170,155,5,113,195,7,9,198,108,36,31,239,111,112,121,95,133,100,
-172,15,126,60,223,30,131,20,92,227,51,163,189,48,52,60,226,248,78,128,194,
-43,93,188,32,169,2,61,82,192,254,201,35,120,190,239,82,16,156,35,206,97,
-175,252,0,201,201,111,205,111,19,32,197,133,212,24,204,142,247,195,110,
-233,22,54,23,19,208,240,90,2,33,140,96,167,120,3,91,75,9,232,31,24,132,
-92,245,74,251,241,191,41,40,148,166,208,125,244,162,4,124,196,245,140,123,
-194,149,185,186,35,5,179,7,206,133,94,115,38,116,181,233,29,104,230,140,
-55,113,60,15,242,157,128,53,33,184,86,23,152,175,160,39,195,53,167,103,
-147,6,23,188,141,223,69,64,154,72,36,14,79,95,69,2,246,102,123,222,41,96,
-171,42,133,155,125,211,76,148,66,16,111,227,91,127,110,138,35,164,196,91,
-40,228,16,132,241,233,76,235,33,65,24,92,182,241,153,173,102,254,176,160,
-194,177,105,184,188,171,64,8,243,165,138,235,170,83,17,241,163,70,162,209,
-248,241,33,57,21,135,175,215,107,88,95,93,99,174,149,15,242,121,215,166,
-219,153,114,215,86,14,226,134,223,234,3,102,91,11,45,53,25,135,110,22,196,
-217,223,20,50,217,236,105,36,18,153,107,253,141,216,64,190,114,14,156,179,
-102,95,152,191,177,94,175,159,109,164,211,243,78,0,193,9,156,162,240,127,
-171,161,239,211,175,0,3,0,190,20,35,79,5,28,125,193,0,0,0,0,73,69,78,68,
-174,66,96,130};
-
-static size_t xml_res_size_2 = 3609;
-static unsigned char xml_res_file_2[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,9,112,72,89,115,0,0,11,18,0,0,11,18,1,210,221,126,
-252,0,0,10,79,105,67,67,80,80,104,111,116,111,115,104,111,112,32,73,67,
-67,32,112,114,111,102,105,108,101,0,0,120,218,157,83,103,84,83,233,22,61,
-247,222,244,66,75,136,128,148,75,111,82,21,8,32,82,66,139,128,20,145,38,
-42,33,9,16,74,136,33,161,217,21,81,193,17,69,69,4,27,200,160,136,3,142,
-142,128,140,21,81,44,12,138,10,216,7,228,33,162,142,131,163,136,138,202,
-251,225,123,163,107,214,188,247,230,205,254,181,215,62,231,172,243,157,
-179,207,7,192,8,12,150,72,51,81,53,128,12,169,66,30,17,224,131,199,196,
-198,225,228,46,64,129,10,36,112,0,16,8,179,100,33,115,253,35,1,0,248,126,
-60,60,43,34,192,7,190,0,1,120,211,11,8,0,192,77,155,192,48,28,135,255,15,
-234,66,153,92,1,128,132,1,192,116,145,56,75,8,128,20,0,64,122,142,66,166,
-0,64,70,1,128,157,152,38,83,0,160,4,0,96,203,99,98,227,0,80,45,0,96,39,
-127,230,211,0,128,157,248,153,123,1,0,91,148,33,21,1,160,145,0,32,19,101,
-136,68,0,104,59,0,172,207,86,138,69,0,88,48,0,20,102,75,196,57,0,216,45,
-0,48,73,87,102,72,0,176,183,0,192,206,16,11,178,0,8,12,0,48,81,136,133,
-41,0,4,123,0,96,200,35,35,120,0,132,153,0,20,70,242,87,60,241,43,174,16,
-231,42,0,0,120,153,178,60,185,36,57,69,129,91,8,45,113,7,87,87,46,30,40,
-206,73,23,43,20,54,97,2,97,154,64,46,194,121,153,25,50,129,52,15,224,243,
-204,0,0,160,145,21,17,224,131,243,253,120,206,14,174,206,206,54,142,182,
-14,95,45,234,191,6,255,34,98,98,227,254,229,207,171,112,64,0,0,225,116,
-126,209,254,44,47,179,26,128,59,6,128,109,254,162,37,238,4,104,94,11,160,
-117,247,139,102,178,15,64,181,0,160,233,218,87,243,112,248,126,60,60,69,
-161,144,185,217,217,229,228,228,216,74,196,66,91,97,202,87,125,254,103,
-194,95,192,87,253,108,249,126,60,252,247,245,224,190,226,36,129,50,93,129,
-71,4,248,224,194,204,244,76,165,28,207,146,9,132,98,220,230,143,71,252,
-183,11,255,252,29,211,34,196,73,98,185,88,42,20,227,81,18,113,142,68,154,
-140,243,50,165,34,137,66,146,41,197,37,210,255,100,226,223,44,251,3,62,
-223,53,0,176,106,62,1,123,145,45,168,93,99,3,246,75,39,16,88,116,192,226,
-247,0,0,242,187,111,193,212,40,8,3,128,104,131,225,207,119,255,239,63,253,
-71,160,37,0,128,102,73,146,113,0,0,94,68,36,46,84,202,179,63,199,8,0,0,
-68,160,129,42,176,65,27,244,193,24,44,192,6,28,193,5,220,193,11,252,96,
-54,132,66,36,196,194,66,16,66,10,100,128,28,114,96,41,172,130,66,40,134,
-205,176,29,42,96,47,212,64,29,52,192,81,104,134,147,112,14,46,194,85,184,
-14,61,112,15,250,97,8,158,193,40,188,129,9,4,65,200,8,19,97,33,218,136,
-1,98,138,88,35,142,8,23,153,133,248,33,193,72,4,18,139,36,32,201,136,20,
-81,34,75,145,53,72,49,82,138,84,32,85,72,29,242,61,114,2,57,135,92,70,186,
-145,59,200,0,50,130,252,134,188,71,49,148,129,178,81,61,212,12,181,67,185,
-168,55,26,132,70,162,11,208,100,116,49,154,143,22,160,155,208,114,180,26,
-61,140,54,161,231,208,171,104,15,218,143,62,67,199,48,192,232,24,7,51,196,
-108,48,46,198,195,66,177,56,44,9,147,99,203,177,34,172,12,171,198,26,176,
-86,172,3,187,137,245,99,207,177,119,4,18,129,69,192,9,54,4,119,66,32,97,
-30,65,72,88,76,88,78,216,72,168,32,28,36,52,17,218,9,55,9,3,132,81,194,
-39,34,147,168,75,180,38,186,17,249,196,24,98,50,49,135,88,72,44,35,214,
-18,143,19,47,16,123,136,67,196,55,36,18,137,67,50,39,185,144,2,73,177,164,
-84,210,18,210,70,210,110,82,35,233,44,169,155,52,72,26,35,147,201,218,100,
-107,178,7,57,148,44,32,43,200,133,228,157,228,195,228,51,228,27,228,33,
-242,91,10,157,98,64,113,164,248,83,226,40,82,202,106,74,25,229,16,229,52,
-229,6,101,152,50,65,85,163,154,82,221,168,161,84,17,53,143,90,66,173,161,
-182,82,175,81,135,168,19,52,117,154,57,205,131,22,73,75,165,173,162,149,
-211,26,104,23,104,247,105,175,232,116,186,17,221,149,30,78,151,208,87,210,
-203,233,71,232,151,232,3,244,119,12,13,134,21,131,199,136,103,40,25,155,
-24,7,24,103,25,119,24,175,152,76,166,25,211,139,25,199,84,48,55,49,235,
-152,231,153,15,153,111,85,88,42,182,42,124,21,145,202,10,149,74,149,38,
-149,27,42,47,84,169,170,166,170,222,170,11,85,243,85,203,84,143,169,94,
-83,125,174,70,85,51,83,227,169,9,212,150,171,85,170,157,80,235,83,27,83,
-103,169,59,168,135,170,103,168,111,84,63,164,126,89,253,137,6,89,195,76,
-195,79,67,164,81,160,177,95,227,188,198,32,11,99,25,179,120,44,33,107,13,
-171,134,117,129,53,196,38,177,205,217,124,118,42,187,152,253,29,187,139,
-61,170,169,161,57,67,51,74,51,87,179,82,243,148,102,63,7,227,152,113,248,
-156,116,78,9,231,40,167,151,243,126,138,222,20,239,41,226,41,27,166,52,
-76,185,49,101,92,107,170,150,151,150,88,171,72,171,81,171,71,235,189,54,
-174,237,167,157,166,189,69,187,89,251,129,14,65,199,74,39,92,39,71,103,
-143,206,5,157,231,83,217,83,221,167,10,167,22,77,61,58,245,174,46,170,107,
-165,27,161,187,68,119,191,110,167,238,152,158,190,94,128,158,76,111,167,
-222,121,189,231,250,28,125,47,253,84,253,109,250,167,245,71,12,88,6,179,
-12,36,6,219,12,206,24,60,197,53,113,111,60,29,47,199,219,241,81,67,93,195,
-64,67,165,97,149,97,151,225,132,145,185,209,60,163,213,70,141,70,15,140,
-105,198,92,227,36,227,109,198,109,198,163,38,6,38,33,38,75,77,234,77,238,
-154,82,77,185,166,41,166,59,76,59,76,199,205,204,205,162,205,214,153,53,
-155,61,49,215,50,231,155,231,155,215,155,223,183,96,90,120,90,44,182,168,
-182,184,101,73,178,228,90,166,89,238,182,188,110,133,90,57,89,165,88,85,
-90,93,179,70,173,157,173,37,214,187,173,187,167,17,167,185,78,147,78,171,
-158,214,103,195,176,241,182,201,182,169,183,25,176,229,216,6,219,174,182,
-109,182,125,97,103,98,23,103,183,197,174,195,238,147,189,147,125,186,125,
-141,253,61,7,13,135,217,14,171,29,90,29,126,115,180,114,20,58,86,58,222,
-154,206,156,238,63,125,197,244,150,233,47,103,88,207,16,207,216,51,227,
-182,19,203,41,196,105,157,83,155,211,71,103,23,103,185,115,131,243,136,
-139,137,75,130,203,46,151,62,46,155,27,198,221,200,189,228,74,116,245,113,
-93,225,122,210,245,157,155,179,155,194,237,168,219,175,238,54,238,105,238,
-135,220,159,204,52,159,41,158,89,51,115,208,195,200,67,224,81,229,209,63,
-11,159,149,48,107,223,172,126,79,67,79,129,103,181,231,35,47,99,47,145,
-87,173,215,176,183,165,119,170,247,97,239,23,62,246,62,114,159,227,62,227,
-60,55,222,50,222,89,95,204,55,192,183,200,183,203,79,195,111,158,95,133,
-223,67,127,35,255,100,255,122,255,209,0,167,128,37,1,103,3,137,129,65,129,
-91,2,251,248,122,124,33,191,142,63,58,219,101,246,178,217,237,65,140,160,
-185,65,21,65,143,130,173,130,229,193,173,33,104,200,236,144,173,33,247,
-231,152,206,145,206,105,14,133,80,126,232,214,208,7,97,230,97,139,195,126,
-12,39,133,135,133,87,134,63,142,112,136,88,26,209,49,151,53,119,209,220,
-67,115,223,68,250,68,150,68,222,155,103,49,79,57,175,45,74,53,42,62,170,
-46,106,60,218,55,186,52,186,63,198,46,102,89,204,213,88,157,88,73,108,75,
-28,57,46,42,174,54,110,108,190,223,252,237,243,135,226,157,226,11,227,123,
-23,152,47,200,93,112,121,161,206,194,244,133,167,22,169,46,18,44,58,150,
-64,76,136,78,56,148,240,65,16,42,168,22,140,37,242,19,119,37,142,10,121,
-194,29,194,103,34,47,209,54,209,136,216,67,92,42,30,78,242,72,42,77,122,
-146,236,145,188,53,121,36,197,51,165,44,229,185,132,39,169,144,188,76,13,
-76,221,155,58,158,22,154,118,32,109,50,61,58,189,49,131,146,145,144,113,
-66,170,33,77,147,182,103,234,103,230,102,118,203,172,101,133,178,254,197,
-110,139,183,47,30,149,7,201,107,179,144,172,5,89,45,10,182,66,166,232,84,
-90,40,215,42,7,178,103,101,87,102,191,205,137,202,57,150,171,158,43,205,
-237,204,179,202,219,144,55,156,239,159,255,237,18,194,18,225,146,182,165,
-134,75,87,45,29,88,230,189,172,106,57,178,60,113,121,219,10,227,21,5,43,
-134,86,6,172,60,184,138,182,42,109,213,79,171,237,87,151,174,126,189,38,
-122,77,107,129,94,193,202,130,193,181,1,107,235,11,85,10,229,133,125,235,
-220,215,237,93,79,88,47,89,223,181,97,250,134,157,27,62,21,137,138,174,
-20,219,23,151,21,127,216,40,220,120,229,27,135,111,202,191,153,220,148,
-180,169,171,196,185,100,207,102,210,102,233,230,222,45,158,91,14,150,170,
-151,230,151,14,110,13,217,218,180,13,223,86,180,237,245,246,69,219,47,151,
-205,40,219,187,131,182,67,185,163,191,60,184,188,101,167,201,206,205,59,
-63,84,164,84,244,84,250,84,54,238,210,221,181,97,215,248,110,209,238,27,
-123,188,246,52,236,213,219,91,188,247,253,62,201,190,219,85,1,85,77,213,
-102,213,101,251,73,251,179,247,63,174,137,170,233,248,150,251,109,93,173,
-78,109,113,237,199,3,210,3,253,7,35,14,182,215,185,212,213,29,210,61,84,
-82,143,214,43,235,71,14,199,31,190,254,157,239,119,45,13,54,13,85,141,156,
-198,226,35,112,68,121,228,233,247,9,223,247,30,13,58,218,118,140,123,172,
-225,7,211,31,118,29,103,29,47,106,66,154,242,154,70,155,83,154,251,91,98,
-91,186,79,204,62,209,214,234,222,122,252,71,219,31,15,156,52,60,89,121,
-74,243,84,201,105,218,233,130,211,147,103,242,207,140,157,149,157,125,126,
-46,249,220,96,219,162,182,123,231,99,206,223,106,15,111,239,186,16,116,
-225,210,69,255,139,231,59,188,59,206,92,242,184,116,242,178,219,229,19,
-87,184,87,154,175,58,95,109,234,116,234,60,254,147,211,79,199,187,156,187,
-154,174,185,92,107,185,238,122,189,181,123,102,247,233,27,158,55,206,221,
-244,189,121,241,22,255,214,213,158,57,61,221,189,243,122,111,247,197,247,
-245,223,22,221,126,114,39,253,206,203,187,217,119,39,238,173,188,79,188,
-95,244,64,237,65,217,67,221,135,213,63,91,254,220,216,239,220,127,106,192,
-119,160,243,209,220,71,247,6,133,131,207,254,145,245,143,15,67,5,143,153,
-143,203,134,13,134,235,158,56,62,57,57,226,63,114,253,233,252,167,67,207,
-100,207,38,158,23,254,162,254,203,174,23,22,47,126,248,213,235,215,206,
-209,152,209,161,151,242,151,147,191,109,124,165,253,234,192,235,25,175,
-219,198,194,198,30,190,201,120,51,49,94,244,86,251,237,193,119,220,119,
-29,239,163,223,15,79,228,124,32,127,40,255,104,249,177,245,83,208,167,251,
-147,25,147,147,255,4,3,152,243,252,99,51,45,219,0,0,0,32,99,72,82,77,0,
-0,122,37,0,0,128,131,0,0,249,255,0,0,128,233,0,0,117,48,0,0,234,96,0,0,
-58,152,0,0,23,111,146,95,197,70,0,0,3,68,73,68,65,84,120,218,60,147,203,
-107,156,85,28,134,159,115,206,55,201,132,204,100,102,160,73,26,29,205,197,
-90,107,110,77,67,21,33,137,90,13,110,181,118,37,136,98,2,218,40,37,85,40,
-184,112,33,24,80,112,97,66,131,46,218,162,232,66,177,32,180,255,128,120,
-69,148,46,106,90,141,153,166,73,154,219,76,205,164,233,36,157,219,119,126,
-231,184,168,233,187,127,31,120,22,143,242,222,179,187,137,169,201,61,192,
-230,123,227,39,221,199,159,125,250,115,60,22,27,136,199,227,20,10,133,242,
-216,43,175,214,77,76,77,26,43,126,207,251,239,188,157,219,253,168,93,192,
-196,212,228,62,99,204,95,10,118,172,200,176,49,230,199,209,55,94,175,7,
-248,226,236,57,140,214,207,148,202,229,51,38,48,15,198,234,234,7,78,140,
-140,252,113,15,48,49,53,217,97,140,153,61,250,226,209,200,236,149,43,100,
-174,47,184,214,116,90,239,109,106,70,107,88,203,230,88,94,93,163,163,173,
-181,242,104,119,119,237,197,11,23,112,98,123,223,61,49,62,19,0,104,173,
-135,141,49,193,250,141,21,82,137,20,143,247,39,181,247,224,188,195,139,
-162,185,177,145,166,198,70,128,218,236,242,50,38,48,84,170,225,211,192,
-204,61,133,15,167,79,95,75,183,180,60,116,127,203,125,160,192,3,222,123,
-196,90,130,32,130,82,119,157,87,215,215,217,220,218,146,241,145,209,0,64,
-125,48,249,73,4,136,104,173,243,253,189,189,81,99,12,0,183,110,223,102,
-45,155,173,40,165,10,70,235,100,235,3,233,72,180,54,138,181,150,63,175,
-94,37,209,208,208,180,184,178,86,212,90,235,124,60,22,219,238,238,233,142,
-122,192,138,80,42,151,184,190,176,88,9,195,48,61,62,50,218,84,42,151,159,
-93,90,94,9,173,8,160,232,234,234,162,90,13,255,137,214,6,219,26,208,29,
-109,237,90,137,199,90,193,138,229,78,177,136,247,126,238,212,241,177,13,
-128,83,199,199,126,178,34,197,106,24,34,78,240,226,104,111,107,75,121,241,
-74,123,208,235,185,44,133,157,2,86,4,43,130,49,1,74,171,246,179,223,124,
-29,1,248,252,252,183,157,64,157,243,30,107,45,219,119,182,201,222,204,225,
-52,4,78,36,85,19,137,212,45,46,46,109,236,127,120,191,81,10,180,209,36,
-19,137,250,124,126,179,240,209,244,244,14,144,108,136,199,2,177,22,15,44,
-44,45,209,245,200,129,84,96,12,193,193,206,206,138,19,95,185,225,87,23,
-54,242,27,251,82,169,20,10,72,37,147,42,22,143,71,173,181,209,154,72,4,
-163,13,34,194,173,173,45,106,35,53,146,170,79,108,37,234,234,209,14,207,
-165,153,203,61,98,109,71,60,30,71,196,253,175,226,80,64,36,8,240,222,99,
-197,98,157,35,22,139,81,42,151,204,247,191,255,50,116,100,104,16,237,67,
-135,247,254,128,181,86,172,21,170,97,133,108,46,135,136,197,57,135,56,135,
-181,66,46,151,35,12,67,68,132,48,180,197,98,177,220,14,160,5,79,127,79,
-207,121,15,163,115,153,57,151,153,203,132,155,249,252,119,127,207,206,186,
-106,24,226,196,145,185,150,161,88,46,95,202,100,50,91,243,243,243,78,161,
-78,14,15,61,245,37,128,14,109,21,20,60,118,232,208,87,98,109,179,21,73,
-28,238,235,59,102,140,209,74,41,172,88,0,158,56,216,119,216,121,151,46,
-85,42,233,35,3,131,103,158,123,114,240,110,141,43,107,235,252,240,219,175,
-104,99,120,233,249,23,218,128,24,176,247,181,183,222,124,185,185,165,229,
-24,74,169,127,111,102,47,158,155,154,62,13,108,3,59,222,251,197,221,156,
-255,27,0,50,132,177,177,162,209,252,223,0,0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_3 = 471;
-static unsigned char xml_res_file_3[] = {
-60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
-110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
-115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58,
-47,47,119,119,119,46,119,120,119,105,110,100,111,119,115,46,111,114,103,
-47,119,120,120,114,99,34,32,118,101,114,115,105,111,110,61,34,50,46,51,
-46,48,46,49,34,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,
-61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,105,110,
-100,101,110,116,34,62,101,100,105,116,111,114,115,101,116,116,105,110,103,
-115,108,111,99,97,108,98,97,115,101,95,102,111,114,109,98,117,105,108,100,
-101,114,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,105,99,111,
-110,115,95,105,110,100,101,110,116,46,112,110,103,60,47,111,98,106,101,
-99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,
-119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,109,97,114,103,
-105,110,115,34,62,101,100,105,116,111,114,115,101,116,116,105,110,103,115,
-108,111,99,97,108,98,97,115,101,95,102,111,114,109,98,117,105,108,100,101,
-114,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,105,99,111,110,
-115,95,109,97,114,103,105,110,115,46,112,110,103,60,47,111,98,106,101,99,
-116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,
-120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,109,105,115,99,34,
-62,101,100,105,116,111,114,115,101,116,116,105,110,103,115,108,111,99,97,
-108,98,97,115,101,95,102,111,114,109,98,117,105,108,100,101,114,95,98,105,
-116,109,97,112,115,46,99,112,112,36,46,46,95,105,99,111,110,115,95,109,
-105,115,99,46,112,110,103,60,47,111,98,106,101,99,116,62,10,60,47,114,101,
-115,111,117,114,99,101,62,10};
-
-void wxC2ED4InitBitmapResources()
-{
-
- // Check for memory FS. If not present, load the handler:
- {
- wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one"));
- wxFileSystem fsys;
- wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file"));
- wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file"));
- if (f) delete f;
- else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
- }
-
- XRC_ADD_FILE(wxT("XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$.._icons_indent.png"), xml_res_file_0, xml_res_size_0, wxT("image/png"));
- XRC_ADD_FILE(wxT("XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$.._icons_margins.png"), xml_res_file_1, xml_res_size_1, wxT("image/png"));
- XRC_ADD_FILE(wxT("XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$.._icons_misc.png"), xml_res_file_2, xml_res_size_2, wxT("image/png"));
- XRC_ADD_FILE(wxT("XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$C__src_codelitegit_formbuilder_editorsettingslocalbase_formbuilder_bitmaps.xrc"), xml_res_file_3, xml_res_size_3, wxT("text/xml"));
- wxXmlResource::Get()->Load(wxT("memory:XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$C__src_codelitegit_formbuilder_editorsettingslocalbase_formbuilder_bitmaps.xrc"));
-}
+//
+// This file was automatically generated by wxrc, do not edit by hand.
+//
+
+#include <wx/wxprec.h>
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#include <wx/filesys.h>
+#include <wx/fs_mem.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/xrc/xh_all.h>
+
+#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
+ #define XRC_ADD_FILE(name, data, size, mime) \
+ wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
+#else
+ #define XRC_ADD_FILE(name, data, size, mime) \
+ wxMemoryFSHandler::AddFile(name, data, size)
+#endif
+
+static size_t xml_res_size_0 = 353;
+static unsigned char xml_res_file_0[] = {
+137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
+0,31,243,255,97,0,0,0,4,103,65,77,65,0,0,175,200,55,5,138,233,0,0,0,25,
+116,69,88,116,83,111,102,116,119,97,114,101,0,65,100,111,98,101,32,73,109,
+97,103,101,82,101,97,100,121,113,201,101,60,0,0,0,243,73,68,65,84,56,203,
+99,252,255,255,63,3,37,128,137,129,66,64,177,1,44,48,70,121,121,249,255,
+127,255,254,49,252,249,243,7,142,127,255,254,13,199,191,126,253,130,211,
+32,188,119,239,94,70,144,62,70,74,195,0,238,130,206,45,239,174,148,251,
+8,233,192,248,177,177,177,215,145,109,68,199,103,206,156,209,68,49,224,
+199,239,191,12,153,139,158,92,189,117,251,107,200,222,102,245,235,64,69,
+138,184,52,131,48,12,128,189,208,178,249,197,127,17,110,54,134,79,223,127,
+51,156,190,243,245,204,195,91,95,226,78,77,213,187,78,140,23,224,97,144,
+179,248,197,149,87,239,191,51,221,189,250,41,248,236,76,253,235,158,158,
+158,87,96,182,253,252,249,19,110,51,204,91,15,31,62,212,65,241,194,183,
+159,255,24,86,229,41,106,193,189,244,227,135,10,186,179,145,99,3,195,5,
+20,199,130,183,183,247,127,124,129,134,156,38,64,248,243,231,207,84,78,
+7,182,182,182,255,177,5,22,178,173,31,62,124,96,196,25,11,3,150,153,0,9,
+38,9,133,50,72,142,137,0,0,0,0,73,69,78,68,174,66,96,130};
+
+static size_t xml_res_size_1 = 551;
+static unsigned char xml_res_file_1[] = {
+137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
+0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,
+65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,
+0,0,1,201,73,68,65,84,120,218,140,83,187,74,67,65,16,157,125,68,13,4,137,
+8,34,26,2,106,33,66,16,76,42,43,237,84,16,31,117,240,7,244,55,252,6,177,
+17,139,144,210,36,138,69,210,68,237,85,68,20,17,95,144,136,136,141,41,2,
+34,241,222,117,102,179,187,185,49,41,156,203,178,187,103,207,156,157,153,
+157,203,148,82,64,118,116,124,252,233,121,94,148,246,140,1,16,76,107,58,
+101,52,16,180,56,173,133,16,181,149,229,229,129,38,9,71,174,80,80,214,138,
+231,207,170,155,5,113,195,7,9,198,108,36,31,239,111,112,121,95,133,100,
+172,15,126,60,223,30,131,20,92,227,51,163,189,48,52,60,226,248,78,128,194,
+43,93,188,32,169,2,61,82,192,254,201,35,120,190,239,82,16,156,35,206,97,
+175,252,0,201,201,111,205,111,19,32,197,133,212,24,204,142,247,195,110,
+233,22,54,23,19,208,240,90,2,33,140,96,167,120,3,91,75,9,232,31,24,132,
+92,245,74,251,241,191,41,40,148,166,208,125,244,162,4,124,196,245,140,123,
+194,149,185,186,35,5,179,7,206,133,94,115,38,116,181,233,29,104,230,140,
+55,113,60,15,242,157,128,53,33,184,86,23,152,175,160,39,195,53,167,103,
+147,6,23,188,141,223,69,64,154,72,36,14,79,95,69,2,246,102,123,222,41,96,
+171,42,133,155,125,211,76,148,66,16,111,227,91,127,110,138,35,164,196,91,
+40,228,16,132,241,233,76,235,33,65,24,92,182,241,153,173,102,254,176,160,
+194,177,105,184,188,171,64,8,243,165,138,235,170,83,17,241,163,70,162,209,
+248,241,33,57,21,135,175,215,107,88,95,93,99,174,149,15,242,121,215,166,
+219,153,114,215,86,14,226,134,223,234,3,102,91,11,45,53,25,135,110,22,196,
+217,223,20,50,217,236,105,36,18,153,107,253,141,216,64,190,114,14,156,179,
+102,95,152,191,177,94,175,159,109,164,211,243,78,0,193,9,156,162,240,127,
+171,161,239,211,175,0,3,0,190,20,35,79,5,28,125,193,0,0,0,0,73,69,78,68,
+174,66,96,130};
+
+static size_t xml_res_size_2 = 3609;
+static unsigned char xml_res_file_2[] = {
+137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
+0,31,243,255,97,0,0,0,9,112,72,89,115,0,0,11,18,0,0,11,18,1,210,221,126,
+252,0,0,10,79,105,67,67,80,80,104,111,116,111,115,104,111,112,32,73,67,
+67,32,112,114,111,102,105,108,101,0,0,120,218,157,83,103,84,83,233,22,61,
+247,222,244,66,75,136,128,148,75,111,82,21,8,32,82,66,139,128,20,145,38,
+42,33,9,16,74,136,33,161,217,21,81,193,17,69,69,4,27,200,160,136,3,142,
+142,128,140,21,81,44,12,138,10,216,7,228,33,162,142,131,163,136,138,202,
+251,225,123,163,107,214,188,247,230,205,254,181,215,62,231,172,243,157,
+179,207,7,192,8,12,150,72,51,81,53,128,12,169,66,30,17,224,131,199,196,
+198,225,228,46,64,129,10,36,112,0,16,8,179,100,33,115,253,35,1,0,248,126,
+60,60,43,34,192,7,190,0,1,120,211,11,8,0,192,77,155,192,48,28,135,255,15,
+234,66,153,92,1,128,132,1,192,116,145,56,75,8,128,20,0,64,122,142,66,166,
+0,64,70,1,128,157,152,38,83,0,160,4,0,96,203,99,98,227,0,80,45,0,96,39,
+127,230,211,0,128,157,248,153,123,1,0,91,148,33,21,1,160,145,0,32,19,101,
+136,68,0,104,59,0,172,207,86,138,69,0,88,48,0,20,102,75,196,57,0,216,45,
+0,48,73,87,102,72,0,176,183,0,192,206,16,11,178,0,8,12,0,48,81,136,133,
+41,0,4,123,0,96,200,35,35,120,0,132,153,0,20,70,242,87,60,241,43,174,16,
+231,42,0,0,120,153,178,60,185,36,57,69,129,91,8,45,113,7,87,87,46,30,40,
+206,73,23,43,20,54,97,2,97,154,64,46,194,121,153,25,50,129,52,15,224,243,
+204,0,0,160,145,21,17,224,131,243,253,120,206,14,174,206,206,54,142,182,
+14,95,45,234,191,6,255,34,98,98,227,254,229,207,171,112,64,0,0,225,116,
+126,209,254,44,47,179,26,128,59,6,128,109,254,162,37,238,4,104,94,11,160,
+117,247,139,102,178,15,64,181,0,160,233,218,87,243,112,248,126,60,60,69,
+161,144,185,217,217,229,228,228,216,74,196,66,91,97,202,87,125,254,103,
+194,95,192,87,253,108,249,126,60,252,247,245,224,190,226,36,129,50,93,129,
+71,4,248,224,194,204,244,76,165,28,207,146,9,132,98,220,230,143,71,252,
+183,11,255,252,29,211,34,196,73,98,185,88,42,20,227,81,18,113,142,68,154,
+140,243,50,165,34,137,66,146,41,197,37,210,255,100,226,223,44,251,3,62,
+223,53,0,176,106,62,1,123,145,45,168,93,99,3,246,75,39,16,88,116,192,226,
+247,0,0,242,187,111,193,212,40,8,3,128,104,131,225,207,119,255,239,63,253,
+71,160,37,0,128,102,73,146,113,0,0,94,68,36,46,84,202,179,63,199,8,0,0,
+68,160,129,42,176,65,27,244,193,24,44,192,6,28,193,5,220,193,11,252,96,
+54,132,66,36,196,194,66,16,66,10,100,128,28,114,96,41,172,130,66,40,134,
+205,176,29,42,96,47,212,64,29,52,192,81,104,134,147,112,14,46,194,85,184,
+14,61,112,15,250,97,8,158,193,40,188,129,9,4,65,200,8,19,97,33,218,136,
+1,98,138,88,35,142,8,23,153,133,248,33,193,72,4,18,139,36,32,201,136,20,
+81,34,75,145,53,72,49,82,138,84,32,85,72,29,242,61,114,2,57,135,92,70,186,
+145,59,200,0,50,130,252,134,188,71,49,148,129,178,81,61,212,12,181,67,185,
+168,55,26,132,70,162,11,208,100,116,49,154,143,22,160,155,208,114,180,26,
+61,140,54,161,231,208,171,104,15,218,143,62,67,199,48,192,232,24,7,51,196,
+108,48,46,198,195,66,177,56,44,9,147,99,203,177,34,172,12,171,198,26,176,
+86,172,3,187,137,245,99,207,177,119,4,18,129,69,192,9,54,4,119,66,32,97,
+30,65,72,88,76,88,78,216,72,168,32,28,36,52,17,218,9,55,9,3,132,81,194,
+39,34,147,168,75,180,38,186,17,249,196,24,98,50,49,135,88,72,44,35,214,
+18,143,19,47,16,123,136,67,196,55,36,18,137,67,50,39,185,144,2,73,177,164,
+84,210,18,210,70,210,110,82,35,233,44,169,155,52,72,26,35,147,201,218,100,
+107,178,7,57,148,44,32,43,200,133,228,157,228,195,228,51,228,27,228,33,
+242,91,10,157,98,64,113,164,248,83,226,40,82,202,106,74,25,229,16,229,52,
+229,6,101,152,50,65,85,163,154,82,221,168,161,84,17,53,143,90,66,173,161,
+182,82,175,81,135,168,19,52,117,154,57,205,131,22,73,75,165,173,162,149,
+211,26,104,23,104,247,105,175,232,116,186,17,221,149,30,78,151,208,87,210,
+203,233,71,232,151,232,3,244,119,12,13,134,21,131,199,136,103,40,25,155,
+24,7,24,103,25,119,24,175,152,76,166,25,211,139,25,199,84,48,55,49,235,
... 199 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-15 06:48:11
|
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 c77d6efee94ebd7c8e05aa9e050092b9d076a80c (commit)
from 8f90b92a01e5db2290d8d0a85df1202e79efe1b6 (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/c77d6efee94ebd7c8e05aa9e050092b9d076a80c
commit c77d6efee94ebd7c8e05aa9e050092b9d076a80c
Author: Eran <era...@gm...>
Date: Wed Jan 15 08:47:42 2014 +0200
Updated codelite version to 6.0
diff --git a/LiteEditor/autoversion.cpp b/LiteEditor/autoversion.cpp
index 4014de2..44155e3 100644
--- a/LiteEditor/autoversion.cpp
+++ b/LiteEditor/autoversion.cpp
@@ -2,6 +2,6 @@
#define CL_GIT_REVISION
#include <wx/string.h>
-const wxChar* clGitRevision = wxT("5.4");
+const wxChar* clGitRevision = wxT("6.0");
#endif
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/autoversion.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-14 07:23:50
|
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 8f90b92a01e5db2290d8d0a85df1202e79efe1b6 (commit)
from 41e98e52c170362fefc7d67d6334d7860f2de58b (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/8f90b92a01e5db2290d8d0a85df1202e79efe1b6
commit 8f90b92a01e5db2290d8d0a85df1202e79efe1b6
Author: Eran <era...@gm...>
Date: Tue Jan 14 09:23:28 2014 +0200
Use the proper font for the 'Output' tab
diff --git a/LiteEditor/outputtabwindow.cpp b/LiteEditor/outputtabwindow.cpp
index 16994e6..49e5cd1 100644
--- a/LiteEditor/outputtabwindow.cpp
+++ b/LiteEditor/outputtabwindow.cpp
@@ -33,6 +33,7 @@
#include "pluginmanager.h"
#include "quickfindbar.h"
#include "event_notifier.h"
+#include "lexer_configuration.h"
BEGIN_EVENT_TABLE(OutputTabWindow, wxPanel)
EVT_MENU(XRCID("scroll_on_output"), OutputTabWindow::OnOutputScrolls)
@@ -102,7 +103,7 @@ void OutputTabWindow::InitStyle(wxStyledTextCtrl *sci, int lexer, bool folding)
}
wxFont defFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
- wxFont font(defFont.GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
+ wxFont font = EditorConfigST::Get()->GetLexer("text")->GetFontForSyle(0);
sci->StyleSetFont(0, font);
sci->SetIndicatorCurrent(1);
diff --git a/LiteEditor/shelltab.cpp b/LiteEditor/shelltab.cpp
index b84990a..d9fd39c 100644
--- a/LiteEditor/shelltab.cpp
+++ b/LiteEditor/shelltab.cpp
@@ -31,6 +31,8 @@
#include "frame.h"
#include "shelltab.h"
#include "pluginmanager.h"
+#include "editor_config.h"
+#include "lexer_configuration.h"
BEGIN_EVENT_TABLE(ShellTab, OutputTabWindow)
@@ -83,9 +85,9 @@ ShellTab::ShellTab(wxWindow* parent, wxWindowID id, const wxString& name)
m_vertSizer->Add(m_inputSizer, 0, wxEXPAND | wxALL, 1);
#ifdef __WXMAC__
- mainSizer->Insert(0, m_vertSizer, 1, wxEXPAND | wxALL, 1);
+ mainSizer->Insert(0, m_vertSizer, 1, wxEXPAND | wxALL, 1);
#else
- mainSizer->Add(m_vertSizer, 1, wxEXPAND | wxALL, 1);
+ mainSizer->Add(m_vertSizer, 1, wxEXPAND | wxALL, 1);
#endif
mainSizer->Layout();
@@ -98,19 +100,8 @@ ShellTab::~ShellTab()
void ShellTab::InitStyle(wxStyledTextCtrl* sci)
{
- int caretSlop = 1;
- int caretStrict = 0;
- int caretEven = 0;
- int caretJumps = 0;
- int caretZone = 20;
- sci->SetXCaretPolicy(caretStrict | caretSlop | caretEven | caretJumps, caretZone);
-
- caretSlop = 1;
- caretStrict = 4;
- caretEven = 8;
- caretJumps = 0;
- caretZone = 1;
- sci->SetYCaretPolicy(caretStrict | caretSlop | caretEven | caretJumps, caretZone);
+ LexerConfPtr text = EditorConfigST::Get()->GetLexer("text");
+ text->Apply(sci);
}
bool ShellTab::DoSendInput(const wxString &line)
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/outputtabwindow.cpp | 3 ++-
LiteEditor/shelltab.cpp | 21 ++++++---------------
2 files changed, 8 insertions(+), 16 deletions(-)
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2014-01-12 17:32:23
|
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 tag, 5.4 has been created
at 41e98e52c170362fefc7d67d6334d7860f2de58b (commit)
- Log -----------------------------------------------------------------
commit 41e98e52c170362fefc7d67d6334d7860f2de58b
Author: Eran <era...@gm...>
Date: Sun Jan 12 08:53:29 2014 +0200
Added minimum size to the CMake global settings dialog
-----------------------------------------------------------------------
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-12 06:54:07
|
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 41e98e52c170362fefc7d67d6334d7860f2de58b (commit)
from f46aba13034282f7b900d1069d2cb1a1d57db7d6 (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/41e98e52c170362fefc7d67d6334d7860f2de58b
commit 41e98e52c170362fefc7d67d6334d7860f2de58b
Author: Eran <era...@gm...>
Date: Sun Jan 12 08:53:29 2014 +0200
Added minimum size to the CMake global settings dialog
diff --git a/CMakePlugin/CMakePlugin.wxcp b/CMakePlugin/CMakePlugin.wxcp
index ef29af0..0f9ae2f 100644
--- a/CMakePlugin/CMakePlugin.wxcp
+++ b/CMakePlugin/CMakePlugin.wxcp
@@ -22,11 +22,11 @@
"m_properties": [{
"type": "string",
"m_label": "Size:",
- "m_value": "-1,-1"
+ "m_value": "400,150"
}, {
"type": "string",
"m_label": "Minimum Size:",
- "m_value": ""
+ "m_value": "400,150"
}, {
"type": "string",
"m_label": "Name:",
diff --git a/CMakePlugin/CMakePluginUi.cpp b/CMakePlugin/CMakePluginUi.cpp
index d98f4d5..e144056 100644
--- a/CMakePlugin/CMakePluginUi.cpp
+++ b/CMakePlugin/CMakePluginUi.cpp
@@ -65,7 +65,8 @@ CMakeSettingsDialogBase::CMakeSettingsDialogBase(wxWindow* parent, wxWindowID id
m_stdBtnSizer->AddButton(m_buttonCancel);
m_stdBtnSizer->Realize();
- SetSizeHints(-1,-1);
+ SetMinSize( wxSize(400,150) );
+ SetSizeHints(400,150);
if ( GetSizer() ) {
GetSizer()->Fit(this);
}
diff --git a/CMakePlugin/CMakePluginUi.h b/CMakePlugin/CMakePluginUi.h
index b29c811..e773067 100644
--- a/CMakePlugin/CMakePluginUi.h
+++ b/CMakePlugin/CMakePluginUi.h
@@ -47,7 +47,7 @@ protected:
protected:
public:
- CMakeSettingsDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("CMakePlugin Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
+ CMakeSettingsDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("CMakePlugin Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(400,150), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
virtual ~CMakeSettingsDialogBase();
};
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 86f724d..08385ee 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -44,7 +44,7 @@
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/>
@@ -219,7 +219,7 @@
<Project Name="Tweaks" ConfigName="DebugUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="OSX_Release" Selected="yes">
+ <WorkspaceConfiguration Name="OSX_Release" Selected="no">
<Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
diff --git a/git/gitui.wxcp b/git/gitui.wxcp
index 86eaa3a..af0f856 100644
--- a/git/gitui.wxcp
+++ b/git/gitui.wxcp
@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
- "m_objCounter": 296,
+ "m_objCounter": 292,
"m_includeFiles": [],
"m_bitmapFunction": "wxCrafterpca4kKInitBitmapResources",
"m_bitmapsFile": "gitui_git_bitmaps.cpp",
@@ -5127,7 +5127,7 @@
"m_properties": [{
"type": "string",
"m_label": "Size:",
- "m_value": "-1,-1"
+ "m_value": "879,600"
}, {
"type": "string",
"m_label": "Minimum Size:",
@@ -7032,7 +7032,7 @@
"m_properties": [{
"type": "string",
"m_label": "Size:",
- "m_value": "-1,-1"
+ "m_value": "500,300"
}, {
"type": "string",
"m_label": "Minimum Size:",
@@ -7157,7 +7157,7 @@
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": ["wxAUI_TB_PLAIN_BACKGROUND", "wxAUI_TB_DEFAULT_STYLE"],
+ "m_styles": ["wxAUI_TB_DEFAULT_STYLE"],
"m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxEXPAND"],
"m_properties": [{
"type": "winid",
@@ -7242,7 +7242,7 @@
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": ["wxBORDER_THEME"],
+ "m_styles": [],
"m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
@@ -7251,7 +7251,7 @@
}, {
"type": "string",
"m_label": "Size:",
- "m_value": "500,300"
+ "m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
@@ -7356,7 +7356,7 @@
"m_events": [],
"m_children": []
}, {
- "m_type": 4467,
+ "m_type": 4401,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
@@ -7364,65 +7364,22 @@
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_HORIZONTAL"],
"m_properties": [{
- "type": "winid",
- "m_label": "ID:",
- "m_winid": "wxID_ANY"
- }, {
- "type": "string",
- "m_label": "Size:",
- "m_value": "-1,-1"
- }, {
- "type": "string",
- "m_label": "Minimum Size:",
- "m_value": "-1,-1"
- }, {
"type": "string",
"m_label": "Name:",
- "m_value": "m_stdBtnSizer294"
- }, {
- "type": "multi-string",
- "m_label": "Tooltip:",
- "m_value": ""
- }, {
- "type": "colour",
- "m_label": "Bg Colour:",
- "colour": "<Default>"
- }, {
- "type": "colour",
- "m_label": "Fg Colour:",
- "colour": "<Default>"
- }, {
- "type": "font",
- "m_label": "Font:",
- "m_value": ""
- }, {
- "type": "bool",
- "m_label": "Hidden",
- "m_value": false
- }, {
- "type": "bool",
- "m_label": "Disabled",
- "m_value": false
- }, {
- "type": "bool",
- "m_label": "Focused",
- "m_value": false
- }, {
- "type": "string",
- "m_label": "Class Name:",
- "m_value": ""
- }, {
- "type": "string",
- "m_label": "Include File:",
- "m_value": ""
+ "m_value": "boxSizer126"
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 1,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
}],
"m_events": [],
"m_children": [{
- "m_type": 4468,
+ "m_type": 4400,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
@@ -7430,22 +7387,77 @@
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
- "type": "choice",
+ "type": "winid",
"m_label": "ID:",
- "m_selection": 0,
- "m_options": ["wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP"]
+ "m_winid": "wxID_OK"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
- "m_value": "m_button296"
+ "m_value": "m_button128"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Label:",
+ "m_value": "&OK"
+ }, {
"type": "bool",
"m_label": "Default Button",
"m_value": true
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File:",
+ "m_path": ""
+ }, {
+ "type": "string",
+ "m_label": "Margins:",
+ "m_value": "2,2"
}],
"m_events": [],
"m_children": []
@@ -9178,7 +9190,7 @@
}, {
"type": "bool",
"m_label": "Hidden",
- "m_value": false
+ "m_value": true
}, {
"type": "bool",
"m_label": "Disabled",
@@ -9352,7 +9364,7 @@
"m_children": [{
"m_type": 4405,
"proportion": 0,
- "border": 5,
+ "border": 2,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
@@ -9427,7 +9439,7 @@
}, {
"m_type": 4420,
"proportion": 0,
- "border": 5,
+ "border": 2,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxGA_SMOOTH", "wxGA_HORIZONTAL"],
-----------------------------------------------------------------------
Summary of changes:
CMakePlugin/CMakePlugin.wxcp | 4 +-
CMakePlugin/CMakePluginUi.cpp | 3 +-
CMakePlugin/CMakePluginUi.h | 2 +-
LiteEditor.workspace | 4 +-
git/gitui.wxcp | 140 ++++++++++++++++++++++-------------------
5 files changed, 83 insertions(+), 70 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-11 19:40:02
|
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 f46aba13034282f7b900d1069d2cb1a1d57db7d6 (commit)
from 42cd7c92b605078d0165a3eca2ec392135706295 (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/f46aba13034282f7b900d1069d2cb1a1d57db7d6
commit f46aba13034282f7b900d1069d2cb1a1d57db7d6
Author: eran <eran@osx-108.local>
Date: Sat Jan 11 13:39:41 2014 -0800
Git: by default hide the progress bar
diff --git a/git/gitui.cpp b/git/gitui.cpp
index 749baea..5090097 100644
--- a/git/gitui.cpp
+++ b/git/gitui.cpp
@@ -1074,6 +1074,7 @@ GitConsoleBase::GitConsoleBase(wxWindow* parent, wxWindowID id, const wxPoint& p
m_dvFiles->AppendIconTextColumn(_("File View"), m_dvFiles->GetColumnCount(), wxDATAVIEW_CELL_INERT, 400, wxALIGN_LEFT);
m_panelProgress = new wxPanel(m_splitterPageTreeView, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
+ m_panelProgress->Hide();
boxSizer94->Add(m_panelProgress, 0, wxEXPAND, 5);
diff --git a/git/gitui.wxcp b/git/gitui.wxcp
index aede19f..86eaa3a 100644
--- a/git/gitui.wxcp
+++ b/git/gitui.wxcp
@@ -9303,7 +9303,7 @@
}, {
"type": "bool",
"m_label": "Hidden",
- "m_value": false
+ "m_value": true
}, {
"type": "bool",
"m_label": "Disabled",
-----------------------------------------------------------------------
Summary of changes:
git/gitui.cpp | 1 +
git/gitui.wxcp | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-11 19:35:38
|
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 42cd7c92b605078d0165a3eca2ec392135706295 (commit)
from 1ed1e29e093c751db9d19684ae04ddadc47dc6bf (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/42cd7c92b605078d0165a3eca2ec392135706295
commit 42cd7c92b605078d0165a3eca2ec392135706295
Author: eran <eran@osx-108.local>
Date: Sat Jan 11 13:35:17 2014 -0800
Yet another UI tweak for OSX
diff --git a/git/gitui.cpp b/git/gitui.cpp
index 20e472f..749baea 100644
--- a/git/gitui.cpp
+++ b/git/gitui.cpp
@@ -1074,7 +1074,6 @@ GitConsoleBase::GitConsoleBase(wxWindow* parent, wxWindowID id, const wxPoint& p
m_dvFiles->AppendIconTextColumn(_("File View"), m_dvFiles->GetColumnCount(), wxDATAVIEW_CELL_INERT, 400, wxALIGN_LEFT);
m_panelProgress = new wxPanel(m_splitterPageTreeView, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
- m_panelProgress->Hide();
boxSizer94->Add(m_panelProgress, 0, wxEXPAND, 5);
@@ -1083,12 +1082,12 @@ GitConsoleBase::GitConsoleBase(wxWindow* parent, wxWindowID id, const wxPoint& p
m_staticTextGauge = new wxStaticText(m_panelProgress, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), 0);
- boxSizer272->Add(m_staticTextGauge, 0, wxALL, 2);
+ boxSizer272->Add(m_staticTextGauge, 0, wxALL, 5);
m_gauge = new wxGauge(m_panelProgress, wxID_ANY, 100, wxDefaultPosition, wxSize(-1,-1), wxGA_SMOOTH|wxGA_HORIZONTAL);
m_gauge->SetValue(10);
- boxSizer272->Add(m_gauge, 0, wxALL|wxEXPAND, 2);
+ boxSizer272->Add(m_gauge, 0, wxALL|wxEXPAND, 5);
m_splitterPage96 = new wxPanel(m_splitter, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_splitter->SplitVertically(m_splitterPageTreeView, m_splitterPage96, 0);
diff --git a/git/gitui.wxcp b/git/gitui.wxcp
index 28b8321..aede19f 100644
--- a/git/gitui.wxcp
+++ b/git/gitui.wxcp
@@ -9303,7 +9303,7 @@
}, {
"type": "bool",
"m_label": "Hidden",
- "m_value": true
+ "m_value": false
}, {
"type": "bool",
"m_label": "Disabled",
@@ -9352,7 +9352,7 @@
"m_children": [{
"m_type": 4405,
"proportion": 0,
- "border": 2,
+ "border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
@@ -9427,7 +9427,7 @@
}, {
"m_type": 4420,
"proportion": 0,
- "border": 2,
+ "border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxGA_SMOOTH", "wxGA_HORIZONTAL"],
-----------------------------------------------------------------------
Summary of changes:
git/gitui.cpp | 5 ++---
git/gitui.wxcp | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-11 19:33:21
|
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 1ed1e29e093c751db9d19684ae04ddadc47dc6bf (commit)
from 9b1a320b90a7500d2aa319634ec94631dcd35213 (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/1ed1e29e093c751db9d19684ae04ddadc47dc6bf
commit 1ed1e29e093c751db9d19684ae04ddadc47dc6bf
Author: eran <eran@osx-108.local>
Date: Sat Jan 11 13:32:55 2014 -0800
Added wxBORDER_THEME style to various git dialogs
diff --git a/git/gitCommitEditor.cpp b/git/gitCommitEditor.cpp
index ff7780a..3e2fa2c 100644
--- a/git/gitCommitEditor.cpp
+++ b/git/gitCommitEditor.cpp
@@ -5,7 +5,7 @@
#include "editor_config.h"
GitCommitEditor::GitCommitEditor(wxWindow* parent, wxWindowID id, const wxPoint &position, const wxSize& size, long style)
- : wxStyledTextCtrl(parent, id, position, size, style)
+ : wxStyledTextCtrl(parent, id, position, size, style|wxBORDER_THEME)
{
InitStyles();
}
diff --git a/git/gitui.cpp b/git/gitui.cpp
index 30ae0ca..20e472f 100644
--- a/git/gitui.cpp
+++ b/git/gitui.cpp
@@ -562,7 +562,7 @@ GitDiffDlgBase::GitDiffDlgBase(wxWindow* parent, wxWindowID id, const wxString&
m_sdbSizer1->AddButton(m_button145);
m_sdbSizer1->Realize();
- SetSizeHints(879,600);
+ SetSizeHints(-1,-1);
if ( GetSizer() ) {
GetSizer()->Fit(this);
}
diff --git a/git/gitui.h b/git/gitui.h
index 0554a17..b0ff3f8 100644
--- a/git/gitui.h
+++ b/git/gitui.h
@@ -154,7 +154,7 @@ protected:
virtual void OnChangeFile(wxCommandEvent& event) { event.Skip(); }
public:
- GitDiffDlgBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Current Diffs"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(879,600), long style = wxCAPTION|wxRESIZE_BORDER|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxCLOSE_BOX);
+ GitDiffDlgBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Current Diffs"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxCAPTION|wxRESIZE_BORDER|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxCLOSE_BOX);
virtual ~GitDiffDlgBase();
};
diff --git a/git/gitui.wxcp b/git/gitui.wxcp
index bc24a49..28b8321 100644
--- a/git/gitui.wxcp
+++ b/git/gitui.wxcp
@@ -5127,7 +5127,7 @@
"m_properties": [{
"type": "string",
"m_label": "Size:",
- "m_value": "879,600"
+ "m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
-----------------------------------------------------------------------
Summary of changes:
git/gitCommitEditor.cpp | 2 +-
git/gitui.cpp | 2 +-
git/gitui.h | 2 +-
git/gitui.wxcp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-11 19:25:06
|
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 9b1a320b90a7500d2aa319634ec94631dcd35213 (commit)
from d92dd1dd8a1f2edb4da8ca3feb609a7818716475 (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/9b1a320b90a7500d2aa319634ec94631dcd35213
commit 9b1a320b90a7500d2aa319634ec94631dcd35213
Author: eran <eran@osx-108.local>
Date: Sat Jan 11 13:23:47 2014 -0800
Adjusted various git dialogs to look better on OSX
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 08385ee..86f724d 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -44,7 +44,7 @@
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/>
@@ -219,7 +219,7 @@
<Project Name="Tweaks" ConfigName="DebugUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="OSX_Release" Selected="no">
+ <WorkspaceConfiguration Name="OSX_Release" Selected="yes">
<Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
diff --git a/git/gitui.cpp b/git/gitui.cpp
index 90b0d96..30ae0ca 100644
--- a/git/gitui.cpp
+++ b/git/gitui.cpp
@@ -689,7 +689,7 @@ GitFileDiffDlgBase::GitFileDiffDlgBase(wxWindow* parent, wxWindowID id, const wx
wxBoxSizer* boxSizer124 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer124);
- m_auibar132 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_DEFAULT_STYLE);
+ m_auibar132 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_PLAIN_BACKGROUND|wxAUI_TB_DEFAULT_STYLE);
m_auibar132->SetToolBitmapSize(wxSize(16,16));
boxSizer124->Add(m_auibar132, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5);
@@ -697,7 +697,7 @@ GitFileDiffDlgBase::GitFileDiffDlgBase(wxWindow* parent, wxWindowID id, const wx
m_auibar132->AddTool(wxID_SAVEAS, _("Save as patch"), wxXmlResource::Get()->LoadBitmap(wxT("save")), wxNullBitmap, wxITEM_NORMAL, _("Save as patch"), _("Save as patch"), NULL);
m_auibar132->Realize();
- m_editor = new GitCommitEditor(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), 0);
+ m_editor = new GitCommitEditor(this, wxID_ANY, wxDefaultPosition, wxSize(500,300), wxBORDER_THEME);
// Configure the fold margin
m_editor->SetMarginType (4, wxSTC_MARGIN_SYMBOL);
m_editor->SetMarginMask (4, wxSTC_MASK_FOLDERS);
@@ -735,16 +735,16 @@ GitFileDiffDlgBase::GitFileDiffDlgBase(wxWindow* parent, wxWindowID id, const wx
boxSizer124->Add(m_editor, 1, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, 5);
- wxBoxSizer* boxSizer126 = new wxBoxSizer(wxHORIZONTAL);
+ m_stdBtnSizer294 = new wxStdDialogButtonSizer();
- boxSizer124->Add(boxSizer126, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
+ boxSizer124->Add(m_stdBtnSizer294, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
- m_button128 = new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize(-1,-1), 0);
- m_button128->SetDefault();
+ m_button296 = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_button296->SetDefault();
+ m_stdBtnSizer294->AddButton(m_button296);
+ m_stdBtnSizer294->Realize();
- boxSizer126->Add(m_button128, 0, wxALL, 5);
-
- SetSizeHints(500,300);
+ SetSizeHints(-1,-1);
if ( GetSizer() ) {
GetSizer()->Fit(this);
}
diff --git a/git/gitui.h b/git/gitui.h
index 426346c..0554a17 100644
--- a/git/gitui.h
+++ b/git/gitui.h
@@ -189,13 +189,14 @@ class GitFileDiffDlgBase : public wxDialog
protected:
wxAuiToolBar* m_auibar132;
GitCommitEditor* m_editor;
- wxButton* m_button128;
+ wxStdDialogButtonSizer* m_stdBtnSizer294;
+ wxButton* m_button296;
protected:
virtual void OnSaveAsPatch(wxCommandEvent& event) { event.Skip(); }
public:
- GitFileDiffDlgBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("File diff"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(500,300), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
+ GitFileDiffDlgBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("File diff"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
virtual ~GitFileDiffDlgBase();
};
diff --git a/git/gitui.wxcp b/git/gitui.wxcp
index 71fb708..bc24a49 100644
--- a/git/gitui.wxcp
+++ b/git/gitui.wxcp
@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
- "m_objCounter": 292,
+ "m_objCounter": 296,
"m_includeFiles": [],
"m_bitmapFunction": "wxCrafterpca4kKInitBitmapResources",
"m_bitmapsFile": "gitui_git_bitmaps.cpp",
@@ -7032,7 +7032,7 @@
"m_properties": [{
"type": "string",
"m_label": "Size:",
- "m_value": "500,300"
+ "m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
@@ -7157,7 +7157,7 @@
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": ["wxAUI_TB_DEFAULT_STYLE"],
+ "m_styles": ["wxAUI_TB_PLAIN_BACKGROUND", "wxAUI_TB_DEFAULT_STYLE"],
"m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxEXPAND"],
"m_properties": [{
"type": "winid",
@@ -7242,7 +7242,7 @@
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": [],
+ "m_styles": ["wxBORDER_THEME"],
"m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
@@ -7251,7 +7251,7 @@
}, {
"type": "string",
"m_label": "Size:",
- "m_value": "-1,-1"
+ "m_value": "500,300"
}, {
"type": "string",
"m_label": "Minimum Size:",
@@ -7356,7 +7356,7 @@
"m_events": [],
"m_children": []
}, {
- "m_type": 4401,
+ "m_type": 4467,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
@@ -7364,22 +7364,65 @@
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_HORIZONTAL"],
"m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
"type": "string",
"m_label": "Name:",
- "m_value": "boxSizer126"
+ "m_value": "m_stdBtnSizer294"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
}, {
"type": "string",
- "m_label": "Style:",
+ "m_label": "Class Name:",
"m_value": ""
}, {
- "type": "choice",
- "m_label": "Orientation:",
- "m_selection": 1,
- "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
}],
"m_events": [],
"m_children": [{
- "m_type": 4400,
+ "m_type": 4468,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
@@ -7387,77 +7430,22 @@
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
- "type": "winid",
+ "type": "choice",
"m_label": "ID:",
- "m_winid": "wxID_OK"
- }, {
- "type": "string",
- "m_label": "Size:",
- "m_value": "-1,-1"
- }, {
- "type": "string",
- "m_label": "Minimum Size:",
- "m_value": "-1,-1"
+ "m_selection": 0,
+ "m_options": ["wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP"]
}, {
"type": "string",
"m_label": "Name:",
- "m_value": "m_button128"
+ "m_value": "m_button296"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
- "type": "colour",
- "m_label": "Bg Colour:",
- "colour": "<Default>"
- }, {
- "type": "colour",
- "m_label": "Fg Colour:",
- "colour": "<Default>"
- }, {
- "type": "font",
- "m_label": "Font:",
- "m_value": ""
- }, {
- "type": "bool",
- "m_label": "Hidden",
- "m_value": false
- }, {
- "type": "bool",
- "m_label": "Disabled",
- "m_value": false
- }, {
- "type": "bool",
- "m_label": "Focused",
- "m_value": false
- }, {
- "type": "string",
- "m_label": "Class Name:",
- "m_value": ""
- }, {
- "type": "string",
- "m_label": "Include File:",
- "m_value": ""
- }, {
- "type": "string",
- "m_label": "Style:",
- "m_value": ""
- }, {
- "type": "string",
- "m_label": "Label:",
- "m_value": "&OK"
- }, {
"type": "bool",
"m_label": "Default Button",
"m_value": true
- }, {
- "type": "bitmapPicker",
- "m_label": "Bitmap File:",
- "m_path": ""
- }, {
- "type": "string",
- "m_label": "Margins:",
- "m_value": "2,2"
}],
"m_events": [],
"m_children": []
diff --git a/git/gitui_git_bitmaps.cpp b/git/gitui_git_bitmaps.cpp
index 6d2ade5..9b833fb 100644
--- a/git/gitui_git_bitmaps.cpp
+++ b/git/gitui_git_bitmaps.cpp
@@ -1,1155 +1,1155 @@
-//
-// This file was automatically generated by wxrc, do not edit by hand.
-//
-
-#include <wx/wxprec.h>
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include <wx/filesys.h>
-#include <wx/fs_mem.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/xrc/xh_all.h>
-
-#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
- #define XRC_ADD_FILE(name, data, size, mime) \
- wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
-#else
- #define XRC_ADD_FILE(name, data, size, mime) \
- wxMemoryFSHandler::AddFile(name, data, size)
-#endif
-
-static size_t xml_res_size_0 = 790;
-static unsigned char xml_res_file_0[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,1,115,82,71,66,0,174,206,28,233,0,0,0,6,98,75,71,
-68,0,255,0,255,0,255,160,189,167,147,0,0,0,9,112,72,89,115,0,0,11,19,0,
-0,11,19,1,0,154,156,24,0,0,0,7,116,73,77,69,7,218,8,10,18,37,24,196,129,
-1,227,0,0,2,150,73,68,65,84,56,203,141,146,93,72,83,97,24,199,255,231,107,
-231,108,59,115,115,206,143,233,176,112,133,246,65,9,133,38,161,66,13,34,
-140,138,69,66,36,133,65,81,87,129,129,97,104,68,117,23,20,221,4,66,100,
-80,129,41,93,164,204,46,186,240,66,104,97,150,83,103,142,196,185,220,114,
-211,169,185,51,214,118,60,158,115,186,153,195,210,200,23,158,171,231,249,
-253,120,62,94,2,91,120,15,157,6,154,214,137,109,26,173,161,69,67,81,239,
-67,179,243,167,111,247,64,2,0,114,43,2,137,140,191,176,239,171,105,209,
-153,172,201,194,237,59,14,128,128,101,45,71,255,15,126,224,68,73,249,161,
-218,227,44,67,208,164,217,164,29,254,50,52,26,249,206,70,0,17,91,234,128,
-209,235,29,217,6,222,152,205,37,137,217,240,44,147,144,217,27,79,60,162,
-186,150,255,167,160,231,57,111,26,30,3,207,176,218,102,41,22,64,40,28,69,
-48,34,60,186,255,38,54,216,118,54,51,193,70,129,195,225,0,0,228,154,37,
-167,62,121,114,186,184,74,103,95,162,130,248,232,139,127,245,77,25,111,
-221,57,79,225,94,247,66,166,158,88,15,119,117,1,245,245,192,197,115,229,
-59,35,75,214,111,85,7,45,170,163,218,64,228,152,99,24,255,236,138,11,66,
-170,242,210,205,212,196,122,38,35,80,85,160,183,61,23,10,27,53,179,156,
-109,64,144,206,236,238,125,231,199,252,162,2,155,85,3,158,91,240,92,57,
-54,80,185,215,137,149,245,130,204,21,8,2,112,117,68,89,62,171,100,240,240,
-145,102,59,67,9,106,125,93,140,248,240,105,1,207,58,227,88,92,86,124,127,
-195,25,129,171,67,143,121,33,65,129,201,113,85,214,52,217,85,89,130,152,
-26,39,68,201,134,178,146,73,220,190,206,161,239,173,91,121,181,201,178,
-73,0,168,107,76,160,48,175,160,181,162,186,233,232,242,82,88,149,146,99,
-144,213,124,200,82,24,226,175,57,240,198,82,164,146,170,117,179,107,209,
-174,151,89,164,152,20,186,119,237,111,116,122,6,95,163,162,226,20,193,234,
-172,240,251,60,200,54,205,64,81,139,64,105,76,144,87,84,106,51,1,89,215,
-32,40,44,171,143,142,12,61,69,105,89,45,40,42,129,241,17,55,56,142,86,21,
-153,68,74,178,64,88,142,99,85,129,55,221,49,185,113,132,11,137,171,129,
-233,216,181,9,79,159,20,250,17,70,208,31,80,115,242,183,17,171,40,86,39,
-188,126,204,76,121,17,8,161,31,128,9,0,15,128,91,99,41,0,32,9,208,125,253,
-178,207,227,253,217,105,209,249,246,232,245,102,134,210,152,180,238,126,
-55,197,27,108,8,206,76,38,91,31,11,151,211,75,95,77,135,252,199,63,224,
-52,64,106,5,36,0,181,225,4,242,139,242,80,64,83,140,78,195,144,70,89,198,
-220,221,118,113,20,128,2,64,77,7,0,224,55,23,191,1,23,225,97,245,223,0,
-0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_1 = 318;
-static unsigned char xml_res_file_1[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,
-65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,
-0,0,0,224,73,68,65,84,120,218,98,252,255,255,63,3,37,128,17,221,0,199,3,
-190,200,220,221,80,218,21,38,176,223,97,51,138,122,22,44,134,10,2,177,49,
-18,27,4,92,160,244,89,32,126,79,200,0,99,36,155,177,185,100,15,33,3,206,
-34,57,185,3,74,87,32,201,17,244,194,123,36,91,96,206,221,67,116,32,30,112,
-143,84,2,82,161,56,212,175,118,216,185,252,30,33,23,40,33,57,29,155,247,
-112,27,144,158,158,206,192,160,192,7,114,174,50,84,161,49,82,76,128,13,
-112,64,51,145,9,139,45,105,64,124,23,41,16,119,67,241,76,168,235,240,6,
-162,32,84,211,44,36,177,78,104,96,150,163,59,31,155,11,96,78,174,64,243,
-115,39,148,78,35,38,26,145,65,5,161,188,128,238,130,61,80,155,118,35,249,
-87,16,234,124,99,108,233,1,155,11,194,160,6,220,197,226,26,162,82,226,89,
-104,52,134,34,69,225,106,108,1,8,2,0,1,6,0,131,130,58,203,4,57,91,201,0,
-0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_2 = 698;
-static unsigned char xml_res_file_2[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,
-65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,
-0,0,2,92,73,68,65,84,120,218,164,83,75,104,83,81,16,61,247,54,109,146,135,
-73,26,75,105,75,180,96,193,141,93,182,21,17,252,97,17,145,66,87,117,39,
-8,138,130,69,68,236,34,11,23,46,92,132,90,23,90,21,23,10,74,118,118,165,
-20,220,148,46,196,133,134,180,144,74,197,66,180,32,141,9,249,52,77,210,
-230,251,62,157,121,249,21,83,112,225,133,121,220,119,231,206,57,51,115,
-230,10,195,48,240,63,203,194,31,33,68,227,224,210,12,134,84,13,62,93,199,
-40,67,179,71,74,160,77,98,129,204,59,127,15,75,245,187,76,46,204,79,13,
-224,226,52,158,187,15,56,111,93,57,115,3,199,250,7,81,86,115,216,202,71,
-145,200,108,32,180,30,66,48,188,138,114,69,155,155,159,194,229,22,0,10,
-126,231,57,216,55,241,236,154,31,43,145,183,88,94,247,163,164,114,118,128,
-149,242,84,58,6,176,83,116,97,49,180,130,66,89,123,65,153,76,54,0,198,30,
-139,33,135,77,9,62,185,238,199,226,143,73,164,182,99,80,117,224,206,169,
-106,127,158,126,22,176,17,136,20,237,72,166,187,240,117,45,6,77,199,240,
-135,187,198,146,228,11,21,21,143,198,70,198,241,237,207,43,164,10,49,42,
-24,208,155,109,129,198,70,255,70,91,5,118,101,19,189,110,242,107,152,97,
-159,172,221,57,119,164,231,48,194,201,143,38,115,153,34,74,122,19,128,247,
-69,42,135,75,178,43,101,56,21,179,187,103,27,42,112,162,37,109,139,234,
-236,196,205,145,116,139,84,222,211,77,169,95,46,11,83,149,186,250,178,42,
-35,144,217,73,64,88,228,191,133,151,251,204,129,36,128,84,54,10,213,177,
-137,89,98,224,50,56,93,239,137,42,141,239,139,48,149,104,167,222,88,9,128,
-102,4,245,209,49,241,180,18,2,225,232,47,24,69,55,108,86,170,147,204,218,
-209,100,225,61,159,177,47,155,1,114,121,34,41,34,208,0,72,126,135,111,45,
-18,71,50,161,195,208,37,44,204,102,105,2,240,158,207,52,202,42,30,23,136,
-166,13,196,41,198,44,191,54,72,202,249,251,120,227,234,198,196,81,143,68,
-119,143,14,71,23,224,178,245,154,0,153,98,12,185,20,5,199,4,126,70,13,100,
-226,152,91,120,136,171,20,155,223,59,202,253,23,30,224,181,210,137,209,
-62,183,128,195,110,52,234,228,142,231,10,85,230,237,164,25,60,69,199,191,
-91,222,2,173,129,193,113,156,60,52,140,219,22,59,142,215,165,98,183,90,
-64,96,35,136,217,213,247,248,196,193,251,62,166,218,226,49,241,144,57,255,
-18,48,75,22,33,203,239,125,141,187,2,12,0,220,76,7,75,146,212,175,177,0,
-0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_3 = 673;
-static unsigned char xml_res_file_3[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,
-65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,
-0,0,2,67,73,68,65,84,120,218,148,147,79,72,84,81,20,198,127,247,205,200,
-52,106,163,97,80,72,80,68,96,69,17,49,86,214,162,41,208,44,138,198,69,100,
-80,16,33,22,180,41,137,18,102,83,180,72,237,15,185,170,133,171,192,77,65,
-97,18,65,3,146,8,45,130,105,64,44,26,33,203,178,22,141,36,54,58,218,56,
-243,222,237,220,55,180,48,39,165,3,151,203,61,220,239,59,223,249,238,185,
-234,232,93,200,217,244,84,20,19,182,109,208,44,12,165,224,251,20,88,22,
-120,21,15,159,95,214,39,194,157,10,73,227,53,8,219,33,124,233,200,89,230,
-178,57,156,66,4,102,121,52,142,163,120,253,33,209,120,160,67,53,70,91,181,
-106,16,18,175,185,32,196,140,218,79,200,138,132,66,10,180,73,206,106,44,
-181,156,237,85,59,168,92,181,135,250,14,165,125,69,34,46,44,45,204,166,
-232,247,248,9,217,133,202,75,56,66,176,102,53,108,219,8,129,0,148,251,215,
-241,241,83,25,47,227,131,247,92,5,209,171,52,201,86,206,34,81,125,134,253,
-227,19,220,170,219,43,138,189,163,148,174,20,98,155,38,151,64,84,140,176,
-68,60,109,97,100,247,121,86,12,86,16,9,213,64,169,223,53,220,103,205,235,
-53,111,135,167,16,129,20,153,76,125,163,59,61,35,134,230,36,145,203,187,
-107,253,49,201,244,47,143,96,203,222,167,255,229,67,13,161,18,159,28,50,
-130,205,228,243,150,1,231,4,60,59,135,238,60,217,77,38,43,102,202,60,56,
-78,30,100,118,33,93,38,228,231,202,74,2,247,15,109,221,135,22,240,76,202,
-21,48,167,180,48,212,182,43,125,231,84,23,241,177,102,126,138,180,222,1,
-233,195,51,191,250,206,13,155,168,221,178,139,100,234,177,60,247,20,239,
-198,32,246,150,71,234,224,77,244,181,227,55,24,26,143,184,213,54,87,158,
-198,99,217,238,244,169,188,47,152,34,70,105,114,58,206,228,175,247,76,167,
-225,217,43,120,113,133,181,238,43,164,179,19,168,34,1,8,193,112,234,129,
-91,221,16,252,61,141,89,33,73,124,134,161,132,128,91,169,22,99,191,152,
-124,176,182,141,216,133,134,102,126,88,93,124,77,66,255,64,126,238,23,144,
-200,57,155,38,218,119,157,136,128,223,184,73,243,153,12,73,93,27,186,103,
-248,152,174,111,119,85,7,23,89,235,77,75,102,130,205,114,71,217,32,122,
-91,8,30,190,77,204,206,16,247,21,187,23,231,69,207,69,141,249,60,75,133,
-1,86,241,31,241,91,128,1,0,121,204,231,72,83,203,130,185,0,0,0,0,73,69,
-78,68,174,66,96,130};
-
-static size_t xml_res_size_4 = 605;
-static unsigned char xml_res_file_4[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,2,36,73,68,65,84,120,94,149,146,77,107,19,65,28,198,
-127,179,179,205,38,105,83,171,180,41,245,37,42,244,229,44,189,20,42,168,
-31,64,61,52,185,168,71,253,120,162,224,65,15,189,9,210,90,15,161,133,54,
-104,180,180,144,218,208,68,221,38,155,125,73,102,199,97,9,75,211,22,193,
-7,30,134,25,120,126,252,31,254,35,180,214,8,33,110,3,203,252,159,182,77,
-182,110,147,136,229,32,8,95,71,81,136,16,150,49,198,34,49,198,130,81,217,
-182,205,216,216,216,26,80,183,24,42,12,67,186,158,135,215,235,225,7,65,
-234,192,184,103,222,14,54,222,210,216,122,195,175,227,67,148,82,41,44,5,
-8,75,32,165,52,182,176,44,11,105,108,238,8,224,100,231,3,115,51,147,204,
-206,22,201,185,123,156,182,127,146,78,147,146,132,192,4,71,172,99,197,239,
-175,31,153,155,158,74,170,89,8,50,249,41,90,245,205,75,38,24,2,228,208,
-38,205,159,111,159,184,54,110,19,71,17,194,118,136,85,31,173,66,252,126,
-76,70,74,113,41,192,26,134,221,250,6,87,114,130,216,119,137,3,23,191,125,
-72,63,232,177,127,212,102,97,229,49,145,82,26,192,62,15,208,38,124,186,
-191,73,193,137,209,94,155,65,167,5,104,188,64,97,48,44,60,120,134,147,203,
-95,172,128,16,16,43,92,51,118,65,42,180,239,50,232,182,12,224,24,207,235,
-226,50,193,226,195,231,100,243,19,73,221,11,0,173,6,52,171,239,201,246,
-91,248,238,9,122,16,130,214,132,178,128,43,139,44,61,122,145,132,207,43,
-173,112,248,249,29,197,171,57,68,28,163,123,167,248,126,128,138,76,29,123,
... 2143 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-11 19:17:57
|
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 d92dd1dd8a1f2edb4da8ca3feb609a7818716475 (commit)
from 458fd9ab1b803da992c8042f0a1bcac075c560ff (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/d92dd1dd8a1f2edb4da8ca3feb609a7818716475
commit d92dd1dd8a1f2edb4da8ca3feb609a7818716475
Author: Eran <era...@gm...>
Date: Sat Jan 11 21:17:39 2014 +0200
Added border theme to git commit dialog
diff --git a/git/gitui.wxcp b/git/gitui.wxcp
index e49743d..71fb708 100644
--- a/git/gitui.wxcp
+++ b/git/gitui.wxcp
@@ -2745,7 +2745,7 @@
"border": 5,
"gbSpan": ",",
"gbPosition": ",",
- "m_styles": [],
+ "m_styles": ["wxBORDER_THEME"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
-----------------------------------------------------------------------
Summary of changes:
git/gitui.wxcp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-11 17:31:26
|
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 458fd9ab1b803da992c8042f0a1bcac075c560ff (commit)
from 845aa45ee594c4a27ed847fabfe452e6bd650add (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/458fd9ab1b803da992c8042f0a1bcac075c560ff
commit 458fd9ab1b803da992c8042f0a1bcac075c560ff
Author: Eran <era...@gm...>
Date: Sat Jan 11 19:31:10 2014 +0200
Git: Use wxStyledTextCtrl for the different git commit/list dialogs
diff --git a/git/gitCommitDlg.cpp b/git/gitCommitDlg.cpp
index 7bd2308..af5a5d3 100644
--- a/git/gitCommitDlg.cpp
+++ b/git/gitCommitDlg.cpp
@@ -3,6 +3,8 @@
#include "windowattrmanager.h"
#include <wx/tokenzr.h>
#include "gitentry.h"
+#include "lexer_configuration.h"
+#include "editor_config.h"
GitCommitDlg::GitCommitDlg(wxWindow* parent, const wxString& repoDir)
@@ -18,6 +20,8 @@ GitCommitDlg::GitCommitDlg(wxWindow* parent, const wxString& repoDir)
m_splitterMain->SetSashPosition(data.GetGitCommitDlgVSashPos());
WindowAttrManager::Load(this, wxT("GitCommitDlg"), NULL);
+ LexerConfPtr lex = EditorConfigST::Get()->GetLexer("text");
+ lex->Apply(m_stcCommitMessage);
}
/*******************************************************************************/
@@ -46,10 +50,13 @@ void GitCommitDlg::AppendDiff(const wxString& diff)
if(line.StartsWith(wxT("diff"))) {
line.Replace(wxT("diff --git a/"), wxT(""));
currentFile = line.Left(line.Find(wxT(" ")));
+
} else if(line.StartsWith(wxT("Binary"))) {
m_diffMap[currentFile] = wxT("Binary diff");
+
} else {
m_diffMap[currentFile].Append(line+wxT("\n"));
+
}
++index;
}
@@ -65,14 +72,8 @@ void GitCommitDlg::AppendDiff(const wxString& diff)
m_listBox->Select(0);
m_editor->SetReadOnly(true);
}
-
- wxFont font(10, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
- wxTextAttr atr = m_commitMessage->GetDefaultStyle();
- atr.SetFont(font);
- m_commitMessage->SetDefaultStyle(atr);
- m_commitMessage->SetFont(font);
-
}
+
/*******************************************************************************/
wxArrayString GitCommitDlg::GetSelectedFiles()
{
@@ -86,7 +87,7 @@ wxArrayString GitCommitDlg::GetSelectedFiles()
/*******************************************************************************/
wxString GitCommitDlg::GetCommitMessage()
{
- wxString msg = m_commitMessage->GetValue();
+ wxString msg = m_stcCommitMessage->GetText();
msg.Replace(wxT("\""),wxT("\\\""));
return msg;
}
@@ -102,7 +103,7 @@ void GitCommitDlg::OnChangeFile(wxCommandEvent& e)
void GitCommitDlg::OnCommitOK(wxCommandEvent& event)
{
- if ( m_commitMessage->GetValue().IsEmpty() ) {
+ if ( m_stcCommitMessage->GetText().IsEmpty() ) {
::wxMessageBox(_("Git requires a commit message"), "codelite", wxICON_WARNING|wxOK|wxCENTER);
return;
}
diff --git a/git/gitCommitListDlg.cpp b/git/gitCommitListDlg.cpp
index 7a94e64..6b53874 100644
--- a/git/gitCommitListDlg.cpp
+++ b/git/gitCommitListDlg.cpp
@@ -31,7 +31,10 @@ GitCommitListDlg::GitCommitListDlg(wxWindow* parent, const wxString& workingDir,
if ( lex ) {
lex->Apply( m_stcDiff, true );
}
-
+
+ LexerConfPtr textLex = EditorConfigST::Get()->GetLexer("text");
+ textLex->Apply( m_stcCommitMessage, true );
+
clConfig conf("git.conf");
GitEntry data;
conf.ReadItem(&data);
@@ -87,13 +90,10 @@ void GitCommitListDlg::OnChangeFile(wxCommandEvent& e)
void GitCommitListDlg::OnProcessTerminated(wxCommandEvent &event)
{
ProcessEventData* ped = (ProcessEventData*)event.GetClientData();
- delete ped;
-
- if ( m_process )
- delete m_process;
- m_process = NULL;
+ wxDELETE(ped);
+ wxDELETE(m_process);
- m_commitMessage->Clear();
+ m_stcCommitMessage->ClearAll();
m_fileListBox->Clear();
m_diffMap.clear();
m_commandOutput.Replace(wxT("\r"), wxT(""));
@@ -103,15 +103,19 @@ void GitCommitListDlg::OnProcessTerminated(wxCommandEvent &event)
unsigned index = 0;
wxString currentFile;
while(index < diffList.GetCount()) {
+
wxString line = diffList[index];
if(line.StartsWith(wxT("diff"))) {
line.Replace(wxT("diff --git a/"), wxT(""));
currentFile = line.Left(line.Find(wxT(" ")));
foundFirstDiff = true;
+
} else if(line.StartsWith(wxT("Binary"))) {
m_diffMap[currentFile] = wxT("Binary diff");
+
} else if(!foundFirstDiff) {
- m_commitMessage->AppendText(line+wxT("\n"));
+ m_stcCommitMessage->AppendText(line+wxT("\n"));
+
} else {
m_diffMap[currentFile].Append(line+wxT("\n"));
}
@@ -121,7 +125,7 @@ void GitCommitListDlg::OnProcessTerminated(wxCommandEvent &event)
m_fileListBox->Append((*it).first);
}
m_stcDiff->SetReadOnly(false);
- m_stcDiff->SetText(wxT(""));
+ m_stcDiff->ClearAll();
if(m_diffMap.size() != 0) {
std::map<wxString,wxString>::iterator it=m_diffMap.begin();
diff --git a/git/gitui.cpp b/git/gitui.cpp
index 64f7f90..90b0d96 100644
--- a/git/gitui.cpp
+++ b/git/gitui.cpp
@@ -132,18 +132,17 @@ GitSettingsDlgBase::GitSettingsDlgBase(wxWindow* parent, wxWindowID id, const wx
boxSizer766->Add(m_checkBoxTrackTree, 0, wxALL, 5);
- wxBoxSizer* bSizer3 = new wxBoxSizer(wxHORIZONTAL);
+ m_stdBtnSizer284 = new wxStdDialogButtonSizer();
- mainSizer->Add(bSizer3, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
+ mainSizer->Add(m_stdBtnSizer284, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
- m_buttonOk = new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize(-1, -1), 0);
- m_buttonOk->SetDefault();
+ m_button286 = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_button286->SetDefault();
+ m_stdBtnSizer284->AddButton(m_button286);
- bSizer3->Add(m_buttonOk, 0, wxALL, 5);
-
- m_buttonCancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize(-1, -1), 0);
-
- bSizer3->Add(m_buttonCancel, 0, wxALL, 5);
+ m_button288 = new wxButton(this, wxID_CANCEL, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_stdBtnSizer284->AddButton(m_button288);
+ m_stdBtnSizer284->Realize();
m_treebook230->ExpandNode( 0, true );
m_treebook230->ExpandNode( 1, true );
@@ -159,7 +158,6 @@ GitSettingsDlgBase::GitSettingsDlgBase(wxWindow* parent, wxWindowID id, const wx
m_textCtrlLocalName->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
m_staticText258->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
m_textCtrlLocalEmail->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
- m_buttonOk->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GitSettingsDlgBase::OnOK), NULL, this);
}
@@ -169,7 +167,6 @@ GitSettingsDlgBase::~GitSettingsDlgBase()
m_textCtrlLocalName->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
m_staticText258->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
m_textCtrlLocalEmail->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitSettingsDlgBase::OnLocalRepoUI), NULL, this);
- m_buttonOk->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GitSettingsDlgBase::OnOK), NULL, this);
}
@@ -240,24 +237,55 @@ GitCommitDlgBase::GitCommitDlgBase(wxWindow* parent, wxWindowID id, const wxStri
bSizer13->Add(m_staticText8, 0, wxALL|wxALIGN_LEFT, 5);
- m_commitMessage = new wxTextCtrl(m_panel4, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), wxTE_WORDWRAP|wxTE_RICH2|wxTE_MULTILINE);
- wxFont m_commitMessageFont(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Sans"));
- m_commitMessage->SetFont(m_commitMessageFont);
+ m_stcCommitMessage = new wxStyledTextCtrl(m_panel4, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME);
+ // Configure the fold margin
+ m_stcCommitMessage->SetMarginType (4, wxSTC_MARGIN_SYMBOL);
+ m_stcCommitMessage->SetMarginMask (4, wxSTC_MASK_FOLDERS);
+ m_stcCommitMessage->SetMarginSensitive(4, true);
+ m_stcCommitMessage->SetMarginWidth (4, 0);
- bSizer13->Add(m_commitMessage, 1, wxALL|wxEXPAND, 5);
+ // Configure the tracker margin
+ m_stcCommitMessage->SetMarginWidth(1, 0);
- wxBoxSizer* bSizer5 = new wxBoxSizer(wxHORIZONTAL);
+ // Configure the symbol margin
+ m_stcCommitMessage->SetMarginType (2, wxSTC_MARGIN_SYMBOL);
+ m_stcCommitMessage->SetMarginMask (2, ~(wxSTC_MASK_FOLDERS));
+ m_stcCommitMessage->SetMarginWidth(2, 0);
+ m_stcCommitMessage->SetMarginSensitive(2, true);
- bSizer4->Add(bSizer5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
+ // Configure the line numbers margin
+ m_stcCommitMessage->SetMarginType(0, wxSTC_MARGIN_NUMBER);
+ m_stcCommitMessage->SetMarginWidth(0,0);
- m_button5 = new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize(-1, -1), 0);
- m_button5->SetDefault();
+ // Configure the line symbol margin
+ m_stcCommitMessage->SetMarginType(3, wxSTC_MARGIN_FORE);
+ m_stcCommitMessage->SetMarginMask(3, 0);
+ m_stcCommitMessage->SetMarginWidth(3,0);
+ // Select the lexer
+ m_stcCommitMessage->SetLexer(wxSTC_LEX_NULL);
+ // Set default font / styles
+ m_stcCommitMessage->StyleClearAll();
+ m_stcCommitMessage->SetWrapMode(0);
+ m_stcCommitMessage->SetIndentationGuides(0);
+ m_stcCommitMessage->SetKeyWords(0, wxT(""));
+ m_stcCommitMessage->SetKeyWords(1, wxT(""));
+ m_stcCommitMessage->SetKeyWords(2, wxT(""));
+ m_stcCommitMessage->SetKeyWords(3, wxT(""));
+ m_stcCommitMessage->SetKeyWords(4, wxT(""));
- bSizer5->Add(m_button5, 0, wxALL, 5);
+ bSizer13->Add(m_stcCommitMessage, 1, wxALL|wxEXPAND, 5);
- m_button6 = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_stdBtnSizer278 = new wxStdDialogButtonSizer();
- bSizer5->Add(m_button6, 0, wxALL, 5);
+ bSizer4->Add(m_stdBtnSizer278, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
+
+ m_buttonOK = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_buttonOK->SetDefault();
+ m_stdBtnSizer278->AddButton(m_buttonOK);
+
+ m_buttonCancel = new wxButton(this, wxID_CANCEL, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_stdBtnSizer278->AddButton(m_buttonCancel);
+ m_stdBtnSizer278->Realize();
SetSizeHints(-1,-1);
if ( GetSizer() ) {
@@ -266,14 +294,14 @@ GitCommitDlgBase::GitCommitDlgBase(wxWindow* parent, wxWindowID id, const wxStri
Centre(wxBOTH);
// Connect events
m_listBox->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(GitCommitDlgBase::OnChangeFile), NULL, this);
- m_button5->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GitCommitDlgBase::OnCommitOK), NULL, this);
+ m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GitCommitDlgBase::OnCommitOK), NULL, this);
}
GitCommitDlgBase::~GitCommitDlgBase()
{
m_listBox->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(GitCommitDlgBase::OnChangeFile), NULL, this);
- m_button5->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GitCommitDlgBase::OnCommitOK), NULL, this);
+ m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GitCommitDlgBase::OnCommitOK), NULL, this);
}
@@ -307,7 +335,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
m_dvListCtrlCommitList = new wxDataViewListCtrl(m_splitterPage178, wxID_ANY, wxDefaultPosition, wxSize(500,-1), wxDV_ROW_LINES|wxDV_SINGLE);
- boxSizer205->Add(m_dvListCtrlCommitList, 1, wxALL|wxEXPAND, 5);
+ boxSizer205->Add(m_dvListCtrlCommitList, 1, wxALL|wxEXPAND, 2);
m_dvListCtrlCommitList->AppendTextColumn(_("Commit"), wxDATAVIEW_CELL_INERT, 150, wxALIGN_LEFT);
m_dvListCtrlCommitList->AppendTextColumn(_("Author"), wxDATAVIEW_CELL_INERT, 100, wxALIGN_LEFT);
@@ -348,7 +376,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
wxArrayString m_fileListBoxArr;
m_fileListBox = new wxListBox(m_splitterPage200, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), m_fileListBoxArr, 0);
- boxSizer208->Add(m_fileListBox, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5);
+ boxSizer208->Add(m_fileListBox, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 2);
m_splitterPage204 = new wxPanel(m_splitter196, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_splitter196->SplitVertically(m_splitterPage200, m_splitterPage204, 0);
@@ -360,7 +388,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
boxSizer215->Add(m_staticText217, 0, wxALL, 5);
- m_stcDiff = new wxStyledTextCtrl(m_splitterPage204, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), 0);
+ m_stcDiff = new wxStyledTextCtrl(m_splitterPage204, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME);
// Configure the fold margin
m_stcDiff->SetMarginType (4, wxSTC_MARGIN_SYMBOL);
m_stcDiff->SetMarginMask (4, wxSTC_MASK_FOLDERS);
@@ -396,7 +424,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
m_stcDiff->SetKeyWords(3, wxT(""));
m_stcDiff->SetKeyWords(4, wxT(""));
- boxSizer215->Add(m_stcDiff, 1, wxALL|wxEXPAND, 5);
+ boxSizer215->Add(m_stcDiff, 1, wxALL|wxEXPAND, 2);
m_splitterPage194 = new wxPanel(m_splitter186, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_splitter186->SplitHorizontally(m_splitterPage190, m_splitterPage194, 100);
@@ -408,18 +436,52 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
boxSizer218->Add(m_staticText220, 0, wxALL, 5);
- m_commitMessage = new wxTextCtrl(m_splitterPage194, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), wxTE_RICH2|wxTE_MULTILINE);
+ m_stcCommitMessage = new wxStyledTextCtrl(m_splitterPage194, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME);
+ // Configure the fold margin
+ m_stcCommitMessage->SetMarginType (4, wxSTC_MARGIN_SYMBOL);
+ m_stcCommitMessage->SetMarginMask (4, wxSTC_MASK_FOLDERS);
+ m_stcCommitMessage->SetMarginSensitive(4, true);
+ m_stcCommitMessage->SetMarginWidth (4, 0);
- boxSizer218->Add(m_commitMessage, 1, wxALL|wxEXPAND, 5);
+ // Configure the tracker margin
+ m_stcCommitMessage->SetMarginWidth(1, 0);
- wxBoxSizer* boxSizer224 = new wxBoxSizer(wxHORIZONTAL);
+ // Configure the symbol margin
+ m_stcCommitMessage->SetMarginType (2, wxSTC_MARGIN_SYMBOL);
+ m_stcCommitMessage->SetMarginMask (2, ~(wxSTC_MASK_FOLDERS));
+ m_stcCommitMessage->SetMarginWidth(2, 0);
+ m_stcCommitMessage->SetMarginSensitive(2, true);
- bSizer17->Add(boxSizer224, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
+ // Configure the line numbers margin
+ m_stcCommitMessage->SetMarginType(0, wxSTC_MARGIN_NUMBER);
+ m_stcCommitMessage->SetMarginWidth(0,0);
- m_button226 = new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize(-1,-1), 0);
- m_button226->SetDefault();
+ // Configure the line symbol margin
+ m_stcCommitMessage->SetMarginType(3, wxSTC_MARGIN_FORE);
+ m_stcCommitMessage->SetMarginMask(3, 0);
+ m_stcCommitMessage->SetMarginWidth(3,0);
+ // Select the lexer
+ m_stcCommitMessage->SetLexer(wxSTC_LEX_NULL);
+ // Set default font / styles
+ m_stcCommitMessage->StyleClearAll();
+ m_stcCommitMessage->SetWrapMode(0);
+ m_stcCommitMessage->SetIndentationGuides(0);
+ m_stcCommitMessage->SetKeyWords(0, wxT(""));
+ m_stcCommitMessage->SetKeyWords(1, wxT(""));
+ m_stcCommitMessage->SetKeyWords(2, wxT(""));
+ m_stcCommitMessage->SetKeyWords(3, wxT(""));
+ m_stcCommitMessage->SetKeyWords(4, wxT(""));
+
+ boxSizer218->Add(m_stcCommitMessage, 1, wxALL|wxEXPAND, 2);
+
+ m_stdBtnSizer290 = new wxStdDialogButtonSizer();
- boxSizer224->Add(m_button226, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
+ bSizer17->Add(m_stdBtnSizer290, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
+
+ m_button292 = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_button292->SetDefault();
+ m_stdBtnSizer290->AddButton(m_button292);
+ m_stdBtnSizer290->Realize();
SetSizeHints(-1,-1);
if ( GetSizer() ) {
@@ -431,7 +493,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
m_dvListCtrlCommitList->Connect(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, wxDataViewEventHandler(GitCommitListDlgBase::OnSelectionChanged), NULL, this);
m_dvListCtrlCommitList->Connect(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEventHandler(GitCommitListDlgBase::OnContextMenu), NULL, this);
m_fileListBox->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(GitCommitListDlgBase::OnChangeFile), NULL, this);
- m_button226->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GitCommitListDlgBase::OnOK), NULL, this);
+ m_button292->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GitCommitListDlgBase::OnOK), NULL, this);
}
@@ -441,7 +503,7 @@ GitCommitListDlgBase::~GitCommitListDlgBase()
m_dvListCtrlCommitList->Disconnect(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, wxDataViewEventHandler(GitCommitListDlgBase::OnSelectionChanged), NULL, this);
m_dvListCtrlCommitList->Disconnect(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEventHandler(GitCommitListDlgBase::OnContextMenu), NULL, this);
m_fileListBox->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(GitCommitListDlgBase::OnChangeFile), NULL, this);
- m_button226->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GitCommitListDlgBase::OnOK), NULL, this);
+ m_button292->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GitCommitListDlgBase::OnOK), NULL, this);
}
@@ -516,6 +578,256 @@ GitDiffDlgBase::~GitDiffDlgBase()
}
+gitCloneDlgBaseClass::gitCloneDlgBaseClass(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
+ : wxDialog(parent, id, title, pos, size, style)
+{
+ if ( !bBitmapLoaded ) {
+ // We need to initialise the default bitmap handler
+ wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler);
+ wxCrafterpca4kKInitBitmapResources();
+ bBitmapLoaded = true;
+ }
+
+ wxBoxSizer* boxSizer17 = new wxBoxSizer(wxVERTICAL);
+ this->SetSizer(boxSizer17);
+
+ wxFlexGridSizer* flexGridSizer21 = new wxFlexGridSizer(0, 2, 0, 0);
+ flexGridSizer21->SetFlexibleDirection( wxBOTH );
+ flexGridSizer21->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+ flexGridSizer21->AddGrowableCol(1);
+
+ boxSizer17->Add(flexGridSizer21, 1, wxALL|wxEXPAND, 5);
+
+ m_staticText22 = new wxStaticText(this, wxID_ANY, _("Clone URL:"), wxDefaultPosition, wxSize(-1,-1), 0);
+
+ flexGridSizer21->Add(m_staticText22, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
+
+ m_textCtrlURL = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), 0);
+ m_textCtrlURL->SetToolTip(_("git URL to clone"));
+
+ flexGridSizer21->Add(m_textCtrlURL, 0, wxALL|wxEXPAND, 5);
+
+ m_staticText24 = new wxStaticText(this, wxID_ANY, _("Target Directory:"), wxDefaultPosition, wxSize(-1,-1), 0);
+
+ flexGridSizer21->Add(m_staticText24, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
+
+ m_dirPickerTargetDir = new wxDirPickerCtrl(this, wxID_ANY, wxEmptyString, wxT("Select a folder"), wxDefaultPosition, wxSize(-1,-1), wxDIRP_DEFAULT_STYLE|wxDIRP_DIR_MUST_EXIST);
+ m_dirPickerTargetDir->SetToolTip(_("Clone the sources into this target directory"));
+
+ flexGridSizer21->Add(m_dirPickerTargetDir, 0, wxALL|wxEXPAND, 5);
+
+ flexGridSizer21->Add(0, 0, 0, wxALL, 5);
+
+ m_checkBoxUseLogin = new wxCheckBox(this, wxID_ANY, _("Use login credentials:"), wxDefaultPosition, wxSize(-1,-1), 0);
+ m_checkBoxUseLogin->SetValue(false);
+
+ flexGridSizer21->Add(m_checkBoxUseLogin, 0, wxALL|wxALIGN_LEFT, 5);
+
+ m_staticText28 = new wxStaticText(this, wxID_ANY, _("Username:"), wxDefaultPosition, wxSize(-1,-1), 0);
+
+ flexGridSizer21->Add(m_staticText28, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
+
+ m_textCtrlUsername = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), 0);
+
+ flexGridSizer21->Add(m_textCtrlUsername, 0, wxALL|wxEXPAND, 5);
+
+ m_staticText30 = new wxStaticText(this, wxID_ANY, _("Password:"), wxDefaultPosition, wxSize(-1,-1), 0);
+
+ flexGridSizer21->Add(m_staticText30, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
+
+ m_textCtrlPassword = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), wxTE_PASSWORD);
+
+ flexGridSizer21->Add(m_textCtrlPassword, 0, wxALL|wxEXPAND, 5);
+
+ wxBoxSizer* boxSizer18 = new wxBoxSizer(wxHORIZONTAL);
+
+ boxSizer17->Add(boxSizer18, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+
+ m_buttonOK = new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize(-1,-1), 0);
+ m_buttonOK->SetDefault();
+
+ boxSizer18->Add(m_buttonOK, 0, wxALL, 5);
+
+ m_button20 = new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize(-1,-1), 0);
+
+ boxSizer18->Add(m_button20, 0, wxALL, 5);
+
+ SetSizeHints(500,-1);
+ if ( GetSizer() ) {
+ GetSizer()->Fit(this);
+ }
+ Centre(wxBOTH);
+ // Connect events
+ m_staticText28->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(gitCloneDlgBaseClass::OnUseCredentialsUI), NULL, this);
+ m_textCtrlUsername->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(gitCloneDlgBaseClass::OnUseCredentialsUI), NULL, this);
+ m_staticText30->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(gitCloneDlgBaseClass::OnUseCredentialsUI), NULL, this);
+ m_textCtrlPassword->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(gitCloneDlgBaseClass::OnUseCredentialsUI), NULL, this);
+ m_buttonOK->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(gitCloneDlgBaseClass::OnOKUI), NULL, this);
+
+}
+
+gitCloneDlgBaseClass::~gitCloneDlgBaseClass()
+{
+ m_staticText28->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(gitCloneDlgBaseClass::OnUseCredentialsUI), NULL, this);
+ m_textCtrlUsername->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(gitCloneDlgBaseClass::OnUseCredentialsUI), NULL, this);
+ m_staticText30->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(gitCloneDlgBaseClass::OnUseCredentialsUI), NULL, this);
+ m_textCtrlPassword->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(gitCloneDlgBaseClass::OnUseCredentialsUI), NULL, this);
+ m_buttonOK->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(gitCloneDlgBaseClass::OnOKUI), NULL, this);
+
+}
+
+GitFileDiffDlgBase::GitFileDiffDlgBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
+ : wxDialog(parent, id, title, pos, size, style)
+{
+ if ( !bBitmapLoaded ) {
... 4707 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-11 17:11:34
|
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 845aa45ee594c4a27ed847fabfe452e6bd650add (commit)
via d4cf5423346b83086fc0cfe04b7f0899e1760bfc (commit)
via 83a202c0e1eda036b6298fb43a2b92670987e9df (commit)
via a1b7603c08c39c9d84be8bf229af4969fb7721ba (commit)
from 0bab0c1d608ad91c6290e8f39c82c4f22ccdb15f (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/845aa45ee594c4a27ed847fabfe452e6bd650add
commit 845aa45ee594c4a27ed847fabfe452e6bd650add
Author: Eran <era...@gm...>
Date: Sat Jan 11 19:10:31 2014 +0200
updated TODO list
diff --git a/TODO.TXT b/TODO.TXT
index 93b27b7..335b0f5 100644
--- a/TODO.TXT
+++ b/TODO.TXT
@@ -1,3 +1,2 @@
-- Add events for all debugger UI actions so plugins code implement it instead of the default debugger
- Allow multiple file open in open-resource dialog
- New 'Find Bar'
https://sourceforge.net/p/codelite/codelitegit/ci/d4cf5423346b83086fc0cfe04b7f0899e1760bfc
commit d4cf5423346b83086fc0cfe04b7f0899e1760bfc
Author: Eran <era...@gm...>
Date: Sat Jan 11 19:06:37 2014 +0200
Compilation error
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
index cf1781e..c9393ae 100644
--- a/LiteEditor/frame.cpp
+++ b/LiteEditor/frame.cpp
@@ -3157,7 +3157,7 @@ void clMainFrame::OnDebugRestartUI(wxUpdateUIEvent &e)
CHECK_SHUTDOWN();
clDebugEvent event(wxEVT_DBG_IS_RUNNING);
- EventNotifier::Get()->ProcessEvent( event )
+ EventNotifier::Get()->ProcessEvent( event );
IDebugger *dbgr = DebuggerMgr::Get().GetActiveDebugger();
e.Enable(event.IsAnswer() || (dbgr && dbgr->IsRunning() && ManagerST::Get()->DbgCanInteract()) );
https://sourceforge.net/p/codelite/codelitegit/ci/83a202c0e1eda036b6298fb43a2b92670987e9df
commit 83a202c0e1eda036b6298fb43a2b92670987e9df
Author: Eran <era...@gm...>
Date: Sat Jan 11 19:04:39 2014 +0200
Make all debugger UI buttons available to plugins via special event type (clDebugEvent). With this change, a plugin can implement a full working debugger
diff --git a/Interfaces/plugin.h b/Interfaces/plugin.h
index 0a9fc97..5d7c8c5 100644
--- a/Interfaces/plugin.h
+++ b/Interfaces/plugin.h
@@ -574,7 +574,9 @@ enum MenuType {
#define wxEVT_DBG_UI_NEXT 3552 // Next line
#define wxEVT_DBG_UI_NEXT_INST 3553 // Next instruction
#define wxEVT_DBG_UI_INTERRUPT 3554 // Interrupt the debugger execution
-#define wxEVT_DBG_IS_RUNNING 3555 // Use evet.SetAnswer() method to reply
+#define wxEVT_DBG_UI_SHOW_CURSOR 3555 // Set the focus to the current debugger file/line
+#define wxEVT_DBG_UI_RESTART 3556 // Restart the debug session
+#define wxEVT_DBG_IS_RUNNING 3557 // Use evet.SetAnswer() method to reply
//------------------------------------------------------------------
//each plugin must implement this interface
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
index aa85bf9..cf1781e 100644
--- a/LiteEditor/frame.cpp
+++ b/LiteEditor/frame.cpp
@@ -3141,6 +3141,10 @@ void clMainFrame::OnDebugUI(wxUpdateUIEvent &e)
void clMainFrame::OnDebugRestart(wxCommandEvent &e)
{
+ clDebugEvent event(wxEVT_DBG_UI_RESTART);
+ if ( EventNotifier::Get()->ProcessEvent( event ) )
+ return;
+
IDebugger *dbgr = DebuggerMgr::Get().GetActiveDebugger();
if(dbgr && dbgr->IsRunning() && ManagerST::Get()->DbgCanInteract()) {
GetDebuggerPane()->GetLocalsTable()->Clear();
@@ -3151,8 +3155,12 @@ void clMainFrame::OnDebugRestart(wxCommandEvent &e)
void clMainFrame::OnDebugRestartUI(wxUpdateUIEvent &e)
{
CHECK_SHUTDOWN();
+
+ clDebugEvent event(wxEVT_DBG_IS_RUNNING);
+ EventNotifier::Get()->ProcessEvent( event )
+
IDebugger *dbgr = DebuggerMgr::Get().GetActiveDebugger();
- e.Enable(dbgr && dbgr->IsRunning() && ManagerST::Get()->DbgCanInteract());
+ e.Enable(event.IsAnswer() || (dbgr && dbgr->IsRunning() && ManagerST::Get()->DbgCanInteract()) );
}
void clMainFrame::OnDebugStop(wxCommandEvent &e)
@@ -3168,8 +3176,12 @@ void clMainFrame::OnDebugStop(wxCommandEvent &e)
void clMainFrame::OnDebugStopUI(wxUpdateUIEvent &e)
{
CHECK_SHUTDOWN();
+
+ clDebugEvent eventIsRunning(wxEVT_DBG_IS_RUNNING);
+ EventNotifier::Get()->ProcessEvent( eventIsRunning );
+
IDebugger *dbgr = DebuggerMgr::Get().GetActiveDebugger();
- e.Enable(dbgr && dbgr->IsRunning());
+ e.Enable( eventIsRunning.IsAnswer() || (dbgr && dbgr->IsRunning()) );
}
void clMainFrame::OnDebugManageBreakpointsUI(wxUpdateUIEvent &e)
@@ -3191,20 +3203,40 @@ void clMainFrame::OnDebugManageBreakpointsUI(wxUpdateUIEvent &e)
void clMainFrame::OnDebugCmd(wxCommandEvent &e)
{
int cmd(wxNOT_FOUND);
+ int eventId(wxNOT_FOUND);
+
if (e.GetId() == XRCID("pause_debugger")) {
cmd = DBG_PAUSE;
+ eventId = wxEVT_DBG_UI_INTERRUPT;
+
} else if (e.GetId() == XRCID("dbg_stepin")) {
cmd = DBG_STEPIN;
+ eventId = wxEVT_DBG_UI_STEP_IN;
+
} else if (e.GetId() == XRCID("dbg_stepout")) {
cmd = DBG_STEPOUT;
+ eventId = wxEVT_DBG_UI_STEP_OUT;
+
} else if (e.GetId() == XRCID("dbg_next")) {
cmd = DBG_NEXT;
+ eventId = wxEVT_DBG_UI_NEXT;
+
} else if (e.GetId() == XRCID("show_cursor")) {
cmd = DBG_SHOW_CURSOR;
+ eventId = wxEVT_DBG_UI_SHOW_CURSOR;
+
} else if ( e.GetId() == XRCID("dbg_nexti")) {
cmd = DBG_NEXTI;
+ eventId = wxEVT_DBG_UI_NEXT_INST;
+
}
-
+
+ // ALlow the plugins to handle this command first
+ clDebugEvent evnt(eventId);
+ if ( EventNotifier::Get()->ProcessEvent( evnt ) ) {
+ return;
+ }
+
if (cmd != wxNOT_FOUND) {
ManagerST::Get()->DbgDoSimpleCommand(cmd);
}
@@ -3213,6 +3245,10 @@ void clMainFrame::OnDebugCmd(wxCommandEvent &e)
void clMainFrame::OnDebugCmdUI(wxUpdateUIEvent &e)
{
CHECK_SHUTDOWN();
+
+ clDebugEvent eventIsRunning(wxEVT_DBG_IS_RUNNING);
+ EventNotifier::Get()->ProcessEvent( eventIsRunning );
+
if (e.GetId() == XRCID("pause_debugger") ||
e.GetId() == XRCID("dbg_stepin") ||
e.GetId() == XRCID("dbg_stepout") ||
@@ -3220,7 +3256,7 @@ void clMainFrame::OnDebugCmdUI(wxUpdateUIEvent &e)
e.GetId() == XRCID("dbg_nexti") ||
e.GetId() == XRCID("show_cursor")) {
IDebugger *dbgr = DebuggerMgr::Get().GetActiveDebugger();
- e.Enable(dbgr && dbgr->IsRunning());
+ e.Enable(eventIsRunning.IsAnswer() || (dbgr && dbgr->IsRunning()) );
}
}
https://sourceforge.net/p/codelite/codelitegit/ci/a1b7603c08c39c9d84be8bf229af4969fb7721ba
commit a1b7603c08c39c9d84be8bf229af4969fb7721ba
Author: Eran <era...@gm...>
Date: Sat Jan 11 18:49:14 2014 +0200
Removed debugger startup commands from Mac OSX
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
index 3823fc9..aa85bf9 100644
--- a/LiteEditor/frame.cpp
+++ b/LiteEditor/frame.cpp
@@ -856,7 +856,7 @@ void clMainFrame::CreateGUIControls(void)
m_mgr.GetArtProvider()->SetColor(wxAUI_DOCKART_BACKGROUND_COLOUR, DrawingUtils::GetPanelBgColour());
//initialize debugger configuration tool
- DebuggerConfigTool::Get()->Load(wxT("config/debuggers.xml"), wxT("5.11"));
+ DebuggerConfigTool::Get()->Load(wxT("config/debuggers.xml"), wxT("5.4"));
WorkspaceST::Get()->SetStartupDir(ManagerST::Get()->GetStarupDirectory());
#if wxCHECK_VERSION(2, 9, 5)
diff --git a/Runtime/config/debuggers.xml.gtk b/Runtime/config/debuggers.xml.gtk
index 77d73c5..17f1e2d 100644
--- a/Runtime/config/debuggers.xml.gtk
+++ b/Runtime/config/debuggers.xml.gtk
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Debuggers Version="5.11">
+<Debuggers Version="5.4">
<ArchiveObject Name="GNU gdb debugger">
<wxString Value="GNU gdb debugger" Name="name"/>
<wxString Value="" Name="path"/>
@@ -33,23 +33,6 @@ register_wx_printers (None)
end]]>
</CData>
</ArchiveObject>
- <ArchiveObject Name="DebuggerCommands">
- <long Value="1" Name="size"/>
- <SerializedObject Name="PreDefinedSet0">
- <wxString Value="Default" Name="m_name"/>
- <bool Value="1" Name="m_active"/>
- <long Value="2" Name="size"/>
- <SerializedObject Name="DebuggerCmd0">
- <wxString Value="std::string" Name="m_name"/>
- <wxString Value="($(Variable))._M_dataplus._M_p" Name="m_command"/>
- <wxString Value="print" Name="m_dbgCommand"/>
- </SerializedObject>
- <SerializedObject Name="DebuggerCmd1">
- <wxString Value="wxString" Name="m_name"/>
- <wxString Value="($(Variable)).m_impl._M_dataplus._M_p" Name="m_command"/>
- <wxString Value="print" Name="m_dbgCommand"/>
- </SerializedObject>
- </SerializedObject>
- </ArchiveObject>
+ <ArchiveObject Name="DebuggerCommands"/>
</Debuggers>
diff --git a/Runtime/config/debuggers.xml.mac b/Runtime/config/debuggers.xml.mac
new file mode 100644
index 0000000..c53f233
--- /dev/null
+++ b/Runtime/config/debuggers.xml.mac
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Debuggers Version="5.4">
+ <ArchiveObject Name="GNU gdb debugger">
+ <wxString Value="GNU gdb debugger" Name="name"/>
+ <wxString Value="" Name="path"/>
+ <bool Value="0" Name="enableDebugLog"/>
+ <bool Value="1" Name="enablePendingBreakpoints"/>
+ <bool Value="0" Name="breakAtWinMain"/>
+ <bool Value="0" Name="showTerminal"/>
+ <wxString Value="" Name="consoleCommand"/>
+ <bool Value="0" Name="useRelativeFilePaths"/>
+ <bool Value="0" Name="catchThrow"/>
+ <bool Value="1" Name="showTooltips"/>
+ <bool Value="0" Name="debugAsserts"/>
+ <int Value="200" Name="maxDisplayStringSize"/>
+ <bool Value="0" Name="resolveLocals"/>
+ <bool Value="0" Name="autoExpandTipItems"/>
+ <bool Value="1" Name="applyBreakpointsAfterProgramStarted"/>
+ <CData Name="startupCommands">
+ <![CDATA[]]>
+ </CData>
+ </ArchiveObject>
+ <ArchiveObject Name="DebuggerCommands"/>
+</Debuggers>
diff --git a/Runtime/make_mac_bundle.sh b/Runtime/make_mac_bundle.sh
index fbe5143..057ffc5 100755
--- a/Runtime/make_mac_bundle.sh
+++ b/Runtime/make_mac_bundle.sh
@@ -194,7 +194,7 @@ cp ../../Runtime/config/codelite.xml.default.mac ./codelite.app/Contents/SharedS
## replace the executable name according to the configuration used in the build
cat ../../Runtime/Info.plist.template | sed s/EXE_NAME/codelite/g >> ./codelite.app/Contents/Info.plist
-cp ../../Runtime/config/debuggers.xml.default ./codelite.app/Contents/SharedSupport/config
+cp ../../Runtime/config/debuggers.xml.mac ./codelite.app/Contents/SharedSupport/config/debuggers.xml.default
## License
cp ../../Runtime/../LICENSE ./codelite.app/Contents/SharedSupport/
diff --git a/TODO.TXT b/TODO.TXT
index e5c87fa..93b27b7 100644
--- a/TODO.TXT
+++ b/TODO.TXT
@@ -1,2 +1,3 @@
- Add events for all debugger UI actions so plugins code implement it instead of the default debugger
- Allow multiple file open in open-resource dialog
+- New 'Find Bar'
-----------------------------------------------------------------------
Summary of changes:
Interfaces/plugin.h | 4 ++-
LiteEditor/frame.cpp | 46 +++++++++++++++++++++++++++++++++----
Runtime/config/debuggers.xml.gtk | 21 +---------------
Runtime/config/debuggers.xml.mac | 24 +++++++++++++++++++
Runtime/make_mac_bundle.sh | 2 +-
TODO.TXT | 2 +-
6 files changed, 72 insertions(+), 27 deletions(-)
create mode 100644 Runtime/config/debuggers.xml.mac
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2014-01-11 17:08:17
|
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 0bab0c1d608ad91c6290e8f39c82c4f22ccdb15f (commit)
from 522dc333a39f754f39308ce610aaff09fe0a8d9b (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/0bab0c1d608ad91c6290e8f39c82c4f22ccdb15f
commit 0bab0c1d608ad91c6290e8f39c82c4f22ccdb15f
Author: dghart <da...@4P...>
Date: Sat Jan 11 17:06:45 2014 +0000
Make sure CodeLite's data dir actually exists before writing to it
Passing the commandline option --datadir with an invalid filepath caused asserts or worse. So explicitly create any missing dir if necessary.
diff --git a/LiteEditor/app.cpp b/LiteEditor/app.cpp
index 9765251..50ce391 100644
--- a/LiteEditor/app.cpp
+++ b/LiteEditor/app.cpp
@@ -344,7 +344,12 @@ bool CodeLiteApp::OnInit()
#if defined (__WXGTK__)
if (homeDir.IsEmpty()) {
SetAppName(wxT("codelite"));
- homeDir = clStandardPaths::Get().GetUserDataDir(); // ~/Library/Application Support/codelite or ~/.codelite
+ homeDir = clStandardPaths::Get().GetUserDataDir(); // By default, ~/Library/Application Support/codelite or ~/.codelite
+ if (!wxFileName::Exists(homeDir)) {
+ wxLogNull noLog;
+ wxFileName::Mkdir(homeDir, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL);
+ wxCHECK_MSG(wxFileName::DirExists(homeDir), false, "Failed to create the requested data dir");
+ }
//Create the directory structure
wxLogNull noLog;
@@ -370,6 +375,12 @@ bool CodeLiteApp::OnInit()
#elif defined (__WXMAC__)
SetAppName(wxT("codelite"));
homeDir = clStandardPaths::Get().GetUserDataDir();
+ if (!wxFileName::Exists(homeDir)) {
+ wxLogNull noLog;
+ wxFileName::Mkdir(homeDir, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL);
+ wxCHECK_MSG(wxFileName::DirExists(homeDir), false, "Failed to create the requested data dir");
+ }
+
{
wxLogNull noLog;
@@ -458,7 +469,7 @@ bool CodeLiteApp::OnInit()
#ifdef __WXMSW__
{
wxLogNull noLog;
- wxMkdir(clStandardPaths::Get().GetUserDataDir());
+ wxFileName::Mkdir(clStandardPaths::Get().GetUserDataDir(), wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL);
}
#endif
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/app.cpp | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2014-01-11 14:20:57
|
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 522dc333a39f754f39308ce610aaff09fe0a8d9b (commit)
from 3d16ef3517db1bc1d2a20342de928690bf0665d8 (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/522dc333a39f754f39308ce610aaff09fe0a8d9b
commit 522dc333a39f754f39308ce610aaff09fe0a8d9b
Author: dghart <da...@4P...>
Date: Sat Jan 11 14:19:48 2014 +0000
Prevent an assert when a gtk notebook page has no image
diff --git a/Plugin/gtk_notebook_ex.cpp b/Plugin/gtk_notebook_ex.cpp
index 53f8daf..ac866df 100644
--- a/Plugin/gtk_notebook_ex.cpp
+++ b/Plugin/gtk_notebook_ex.cpp
@@ -675,6 +675,10 @@ wxBitmap Notebook::GetPageBitmap(size_t page) const
}
int imgIdx = wxNotebook::GetPageImage(page);
+ if (imgIdx == wxNOT_FOUND) {
+ return wxNullBitmap;
+ }
+
return m_imgList->GetBitmap(imgIdx);
}
-----------------------------------------------------------------------
Summary of changes:
Plugin/gtk_notebook_ex.cpp | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-11 10:13:05
|
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 3d16ef3517db1bc1d2a20342de928690bf0665d8 (commit)
via 5169cc55ed030afe8df7db0afffdaa4681534762 (commit)
via 46f8ee21ce7ab86f1d23e87b17f93e8e0943eb88 (commit)
from 5efaee1ec1d6297ec6197e569671151f79c34dd0 (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/3d16ef3517db1bc1d2a20342de928690bf0665d8
commit 3d16ef3517db1bc1d2a20342de928690bf0665d8
Author: eran <eran@osx-108.local>
Date: Sat Jan 11 04:12:31 2014 -0800
Message pane: increased the size of the buttons by 2 pixels
diff --git a/LiteEditor/messagepane.wxcp b/LiteEditor/messagepane.wxcp
index d220301..528ac71 100644
--- a/LiteEditor/messagepane.wxcp
+++ b/LiteEditor/messagepane.wxcp
@@ -354,7 +354,7 @@
}, {
"type": "string",
"m_label": "Size:",
- "m_value": ""
+ "m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
@@ -686,7 +686,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
- "m_sizerFlags": ["wxALIGN_CENTER_VERTICAL"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"],
"m_properties": [{
"type": "string",
"m_label": "Name:",
@@ -709,7 +709,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
- "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxEXPAND"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -798,7 +798,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
- "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -887,7 +887,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
- "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
diff --git a/LiteEditor/messagepane_base.cpp b/LiteEditor/messagepane_base.cpp
index a015ae1..3af1a2e 100644
--- a/LiteEditor/messagepane_base.cpp
+++ b/LiteEditor/messagepane_base.cpp
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: messagepane.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -22,7 +23,7 @@ MessagePaneBase::MessagePaneBase(wxWindow* parent, wxWindowID id, const wxPoint&
bBitmapLoaded = true;
}
- bSizer8 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer8 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizer8);
m_panel2 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL|wxBORDER_SIMPLE);
@@ -30,14 +31,14 @@ MessagePaneBase::MessagePaneBase(wxWindow* parent, wxWindowID id, const wxPoint&
bSizer8->Add(m_panel2, 1, wxEXPAND, 0);
- mainSizer = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* mainSizer = new wxBoxSizer(wxHORIZONTAL);
m_panel2->SetSizer(mainSizer);
- bSizer81 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer81 = new wxBoxSizer(wxHORIZONTAL);
mainSizer->Add(bSizer81, 1, wxALIGN_CENTER_VERTICAL, 5);
- bSizer4 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer4 = new wxBoxSizer(wxHORIZONTAL);
bSizer81->Add(bSizer4, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
@@ -45,15 +46,15 @@ MessagePaneBase::MessagePaneBase(wxWindow* parent, wxWindowID id, const wxPoint&
bSizer4->Add(m_bitmap1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
- m_panel1 = new wxPanel(m_panel2, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxWANTS_CHARS|wxTAB_TRAVERSAL);
+ m_panel1 = new wxPanel(m_panel2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxWANTS_CHARS|wxTAB_TRAVERSAL);
m_panel1->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
bSizer4->Add(m_panel1, 1, wxALL|wxEXPAND, 5);
- bSizer2 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer2 = new wxBoxSizer(wxHORIZONTAL);
m_panel1->SetSizer(bSizer2);
- bSizer3 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer3 = new wxBoxSizer(wxVERTICAL);
bSizer2->Add(bSizer3, 1, wxALIGN_CENTER_VERTICAL, 5);
@@ -77,22 +78,22 @@ MessagePaneBase::MessagePaneBase(wxWindow* parent, wxWindowID id, const wxPoint&
bSizer3->Add(m_DontAnnoyMeCheck, 0, wxALL, 5);
- bSizer7 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer7 = new wxBoxSizer(wxVERTICAL);
- bSizer4->Add(bSizer7, 0, wxALIGN_CENTER_VERTICAL, 5);
+ bSizer4->Add(bSizer7, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
m_buttonClose = new wxButton(m_panel2, wxID_CANCEL, _("Hide"), wxDefaultPosition, wxSize(-1, -1), 0);
- bSizer7->Add(m_buttonClose, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5);
+ bSizer7->Add(m_buttonClose, 0, wxALL|wxEXPAND, 5);
m_buttonAction = new wxButton(m_panel2, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
m_buttonAction->SetDefault();
- bSizer7->Add(m_buttonAction, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
+ bSizer7->Add(m_buttonAction, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
m_buttonAction1 = new wxButton(m_panel2, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
- bSizer7->Add(m_buttonAction1, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
+ bSizer7->Add(m_buttonAction1, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
m_buttonAction2 = new wxButton(m_panel2, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
diff --git a/LiteEditor/messagepane_base.h b/LiteEditor/messagepane_base.h
index 46e0bbb..68714d3 100644
--- a/LiteEditor/messagepane_base.h
+++ b/LiteEditor/messagepane_base.h
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: messagepane.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -20,19 +21,12 @@
class MessagePaneBase : public wxPanel
{
protected:
- wxBoxSizer* bSizer8;
wxPanel* m_panel2;
- wxBoxSizer* mainSizer;
- wxBoxSizer* bSizer81;
- wxBoxSizer* bSizer4;
wxStaticBitmap* m_bitmap1;
wxPanel* m_panel1;
- wxBoxSizer* bSizer2;
- wxBoxSizer* bSizer3;
wxStaticText* m_staticText2;
wxStaticText* m_staticTextMessage;
wxCheckBox* m_DontAnnoyMeCheck;
- wxBoxSizer* bSizer7;
wxButton* m_buttonClose;
wxButton* m_buttonAction;
wxButton* m_buttonAction1;
diff --git a/LiteEditor/messagepane_liteeditor_bitmaps.cpp b/LiteEditor/messagepane_liteeditor_bitmaps.cpp
index 198916e..166f91b 100644
--- a/LiteEditor/messagepane_liteeditor_bitmaps.cpp
+++ b/LiteEditor/messagepane_liteeditor_bitmaps.cpp
@@ -1,48 +1,48 @@
-//
-// This file was automatically generated by wxrc, do not edit by hand.
-//
-
-#include <wx/wxprec.h>
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include <wx/filesys.h>
-#include <wx/fs_mem.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/xrc/xh_all.h>
-
-#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
- #define XRC_ADD_FILE(name, data, size, mime) \
- wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
-#else
- #define XRC_ADD_FILE(name, data, size, mime) \
- wxMemoryFSHandler::AddFile(name, data, size)
-#endif
-
-static size_t xml_res_size_0 = 108;
-static unsigned char xml_res_file_0[] = {
-60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
-110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
-115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58,
-47,47,119,119,119,46,119,120,119,105,110,100,111,119,115,46,111,114,103,
-47,119,120,120,114,99,34,32,118,101,114,115,105,111,110,61,34,50,46,51,
-46,48,46,49,34,47,62,10};
-
-void wxC2A73InitBitmapResources()
-{
-
- // Check for memory FS. If not present, load the handler:
- {
- wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one"));
- wxFileSystem fsys;
- wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file"));
- wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file"));
- if (f) delete f;
- else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
- }
-
- XRC_ADD_FILE(wxT("XRC_resource/messagepane_liteeditor_bitmaps.cpp$C__src_codelitegit_LiteEditor_messagepane_liteeditor_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
- wxXmlResource::Get()->Load(wxT("memory:XRC_resource/messagepane_liteeditor_bitmaps.cpp$C__src_codelitegit_LiteEditor_messagepane_liteeditor_bitmaps.xrc"));
-}
+//
+// This file was automatically generated by wxrc, do not edit by hand.
+//
+
+#include <wx/wxprec.h>
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#include <wx/filesys.h>
+#include <wx/fs_mem.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/xrc/xh_all.h>
+
+#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
+ #define XRC_ADD_FILE(name, data, size, mime) \
+ wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
+#else
+ #define XRC_ADD_FILE(name, data, size, mime) \
+ wxMemoryFSHandler::AddFile(name, data, size)
+#endif
+
+static size_t xml_res_size_0 = 108;
+static unsigned char xml_res_file_0[] = {
+60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
+110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
+115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58,
+47,47,119,119,119,46,119,120,119,105,110,100,111,119,115,46,111,114,103,
+47,119,120,120,114,99,34,32,118,101,114,115,105,111,110,61,34,50,46,51,
+46,48,46,49,34,47,62,10};
+
+void wxC2A73InitBitmapResources()
+{
+
+ // Check for memory FS. If not present, load the handler:
+ {
+ wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one"));
+ wxFileSystem fsys;
+ wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file"));
+ wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file"));
+ if (f) delete f;
+ else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
+ }
+
+ XRC_ADD_FILE(wxT("XRC_resource/messagepane_liteeditor_bitmaps.cpp$_Users_eran_devl_codelitegit_LiteEditor_messagepane_liteeditor_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
+ wxXmlResource::Get()->Load(wxT("memory:XRC_resource/messagepane_liteeditor_bitmaps.cpp$_Users_eran_devl_codelitegit_LiteEditor_messagepane_liteeditor_bitmaps.xrc"));
+}
https://sourceforge.net/p/codelite/codelitegit/ci/5169cc55ed030afe8df7db0afffdaa4681534762
commit 5169cc55ed030afe8df7db0afffdaa4681534762
Merge: 46f8ee2 5efaee1
Author: eran <eran@osx-108.local>
Date: Sat Jan 11 04:08:12 2014 -0800
Merge branch 'master' of ssh://git.code.sf.net/p/codelite/codelitegit
# By Eran
# Via Eran
* 'master' of ssh://git.code.sf.net/p/codelite/codelitegit:
Fixed: added missing border cmake's plugin settings dialog
Updated TODO list
https://sourceforge.net/p/codelite/codelitegit/ci/46f8ee21ce7ab86f1d23e87b17f93e8e0943eb88
commit 46f8ee21ce7ab86f1d23e87b17f93e8e0943eb88
Author: eran <eran@osx-108.local>
Date: Sat Jan 11 04:07:11 2014 -0800
Debugger: dont let the tooltip to minimize under 100x100 pixels
Git: OSX: set the default git binary to simply 'git'
diff --git a/LiteEditor/new_quick_watch_dlg.cpp b/LiteEditor/new_quick_watch_dlg.cpp
index dff859f..1affe82 100644
--- a/LiteEditor/new_quick_watch_dlg.cpp
+++ b/LiteEditor/new_quick_watch_dlg.cpp
@@ -37,7 +37,11 @@ DisplayVariableDlg::DisplayVariableDlg( wxWindow* parent)
WindowAttrManager::Load(this, "DebuggerTooltip", NULL);
m_timer2 = new wxTimer(this);
m_mousePosTimer = new wxTimer(this);
-
+
+ if (GetSize().x < 100 || GetSize().y < 100 ) {
+ SetSize( wxRect(GetPosition(), wxSize(100, 100) ) );
+ }
+
Connect(m_timer2->GetId(), wxEVT_TIMER, wxTimerEventHandler(DisplayVariableDlg::OnTimer2), NULL, this);
Connect(m_mousePosTimer->GetId(), wxEVT_TIMER, wxTimerEventHandler(DisplayVariableDlg::OnCheckMousePosTimer), NULL, this);
m_panelStatusBar->Connect(wxEVT_MOUSE_CAPTURE_LOST, wxMouseCaptureLostEventHandler(DisplayVariableDlg::OnCaptureLost), NULL, this);
@@ -604,7 +608,7 @@ void DisplayVariableDlg::DoUpdateSize(bool performClean)
if ( m_dragging ) {
wxRect curect = GetScreenRect();
curect.SetBottomRight( ::wxGetMousePosition() );
- if ( curect.GetHeight() <= 10 || curect.GetWidth() <= 10 ) {
+ if ( curect.GetHeight() <= 100 || curect.GetWidth() <= 100 ) {
if ( performClean ) {
m_dragging = false;
if ( m_panelStatusBar->HasCapture() ) {
diff --git a/LiteEditor/newquickwatch.cpp b/LiteEditor/newquickwatch.cpp
index 0f9a5df..c110a8a 100644
--- a/LiteEditor/newquickwatch.cpp
+++ b/LiteEditor/newquickwatch.cpp
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: newquickwatch.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -22,42 +23,42 @@ clDebuggerTipWindowBase::clDebuggerTipWindowBase(wxWindow* parent,long style)
bBitmapLoaded = true;
}
- boxSizer4 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer4 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer4);
- m_panel46 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(200,100), wxTAB_TRAVERSAL|wxBORDER_SIMPLE);
+ m_panel46 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL|wxBORDER_SIMPLE);
boxSizer4->Add(m_panel46, 1, wxEXPAND, 5);
- boxSizer48 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer48 = new wxBoxSizer(wxVERTICAL);
m_panel46->SetSizer(boxSizer48);
- m_scrollWin6 = new wxScrolledWindow(m_panel46, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBORDER_NONE|wxHSCROLL|wxVSCROLL);
+ m_scrollWin6 = new wxScrolledWindow(m_panel46, wxID_ANY, wxDefaultPosition, wxSize(200,100), wxBORDER_NONE|wxHSCROLL|wxVSCROLL);
m_scrollWin6->SetScrollRate(5, 5);
boxSizer48->Add(m_scrollWin6, 1, wxEXPAND, 2);
- bSizer5 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer5 = new wxBoxSizer(wxVERTICAL);
m_scrollWin6->SetSizer(bSizer5);
- m_treeCtrl = new wxTreeCtrl(m_scrollWin6, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTR_DEFAULT_STYLE|wxTR_SINGLE|wxBORDER_NONE);
+ m_treeCtrl = new wxTreeCtrl(m_scrollWin6, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTR_DEFAULT_STYLE|wxTR_SINGLE|wxBORDER_NONE);
m_treeCtrl->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
m_treeCtrl->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
bSizer5->Add(m_treeCtrl, 1, wxEXPAND, 0);
+ m_scrollWin6->SetMinSize(wxSize(200,100));
m_panelStatusBar = new wxPanel(m_panel46, wxID_ANY, wxDefaultPosition, wxSize(-1,22), wxTAB_TRAVERSAL);
m_panelStatusBar->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
boxSizer48->Add(m_panelStatusBar, 0, wxEXPAND, 2);
- boxSizer42 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer42 = new wxBoxSizer(wxVERTICAL);
m_panelStatusBar->SetSizer(boxSizer42);
m_staticBitmap44 = new wxStaticBitmap(m_panelStatusBar, wxID_ANY, wxXmlResource::Get()->LoadBitmap(wxT("resize")), wxDefaultPosition, wxSize(16,16), 0 );
boxSizer42->Add(m_staticBitmap44, 0, wxALL|wxALIGN_RIGHT|wxALIGN_BOTTOM, 5);
- m_panel46->SetMinSize(wxSize(200,100));
SetSizeHints(-1,-1);
if ( GetSizer() ) {
@@ -101,14 +102,14 @@ clDebuggerEditItemDlgBase::clDebuggerEditItemDlgBase(wxWindow* parent, wxWindowI
bBitmapLoaded = true;
}
- boxSizer24 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer24 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer24);
m_panel32 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
boxSizer24->Add(m_panel32, 1, wxALL|wxEXPAND, 5);
- boxSizer34 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer34 = new wxBoxSizer(wxVERTICAL);
m_panel32->SetSizer(boxSizer34);
m_staticText36 = new wxStaticText(m_panel32, wxID_ANY, _("Enter new expression:"), wxDefaultPosition, wxSize(-1,-1), 0);
@@ -119,7 +120,7 @@ clDebuggerEditItemDlgBase::clDebuggerEditItemDlgBase(wxWindow* parent, wxWindowI
boxSizer34->Add(m_textCtrl38, 0, wxALL|wxEXPAND, 5);
- boxSizer26 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* boxSizer26 = new wxBoxSizer(wxHORIZONTAL);
boxSizer24->Add(boxSizer26, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
diff --git a/LiteEditor/newquickwatch.h b/LiteEditor/newquickwatch.h
index 5e9449f..addd72e 100644
--- a/LiteEditor/newquickwatch.h
+++ b/LiteEditor/newquickwatch.h
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: newquickwatch.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -25,14 +26,10 @@
class clDebuggerTipWindowBase : public wxPopupWindow
{
protected:
- wxBoxSizer* boxSizer4;
wxPanel* m_panel46;
- wxBoxSizer* boxSizer48;
wxScrolledWindow* m_scrollWin6;
- wxBoxSizer* bSizer5;
wxTreeCtrl* m_treeCtrl;
wxPanel* m_panelStatusBar;
- wxBoxSizer* boxSizer42;
wxStaticBitmap* m_staticBitmap44;
protected:
@@ -55,12 +52,9 @@ public:
class clDebuggerEditItemDlgBase : public wxDialog
{
protected:
- wxBoxSizer* boxSizer24;
wxPanel* m_panel32;
- wxBoxSizer* boxSizer34;
wxStaticText* m_staticText36;
wxTextCtrl* m_textCtrl38;
- wxBoxSizer* boxSizer26;
wxButton* m_button28;
wxButton* m_button30;
diff --git a/LiteEditor/newquickwatch.wxcp b/LiteEditor/newquickwatch.wxcp
index 355412c..6f47160 100644
--- a/LiteEditor/newquickwatch.wxcp
+++ b/LiteEditor/newquickwatch.wxcp
@@ -136,11 +136,11 @@
}, {
"type": "string",
"m_label": "Size:",
- "m_value": "200,100"
+ "m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
- "m_value": "200,100"
+ "m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
@@ -225,11 +225,11 @@
}, {
"type": "string",
"m_label": "Size:",
- "m_value": "-1,-1"
+ "m_value": "200,100"
}, {
"type": "string",
"m_label": "Minimum Size:",
- "m_value": "-1,-1"
+ "m_value": "200,100"
}, {
"type": "string",
"m_label": "Name:",
@@ -322,11 +322,11 @@
}, {
"type": "string",
"m_label": "Size:",
- "m_value": ""
... 212 lines suppressed ...
hooks/post-receive
--
codelite
|
