Menu
▾
▴
codelite-svn — Commit logs
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(104) |
Aug
(140) |
Sep
(148) |
Oct
(135) |
Nov
(130) |
Dec
(166) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(108) |
Feb
(38) |
Mar
(16) |
Apr
(19) |
May
(18) |
Jun
(25) |
Jul
(24) |
Aug
(17) |
Sep
(177) |
Oct
(192) |
Nov
(150) |
Dec
(163) |
| 2010 |
Jan
(103) |
Feb
(126) |
Mar
(197) |
Apr
(43) |
May
(9) |
Jun
(34) |
Jul
(121) |
Aug
(142) |
Sep
(60) |
Oct
(113) |
Nov
(87) |
Dec
(62) |
| 2011 |
Jan
(40) |
Feb
(36) |
Mar
(13) |
Apr
(20) |
May
(17) |
Jun
(151) |
Jul
(48) |
Aug
(39) |
Sep
(39) |
Oct
(107) |
Nov
(150) |
Dec
(35) |
| 2012 |
Jan
(24) |
Feb
(18) |
Mar
(19) |
Apr
(57) |
May
(76) |
Jun
(41) |
Jul
(45) |
Aug
(119) |
Sep
(119) |
Oct
(32) |
Nov
(38) |
Dec
(112) |
| 2013 |
Jan
(142) |
Feb
(2) |
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-11 08:13:33
|
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 5efaee1ec1d6297ec6197e569671151f79c34dd0 (commit)
via c06c6e724af5ca92a90bdaf0072d17c134d0b15d (commit)
from beb9047e53c21140e443d55c508d81a3a5b7b78d (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/5efaee1ec1d6297ec6197e569671151f79c34dd0
commit 5efaee1ec1d6297ec6197e569671151f79c34dd0
Author: Eran <era...@gm...>
Date: Sat Jan 11 10:13:10 2014 +0200
Fixed: added missing border cmake's plugin settings dialog
diff --git a/CMakePlugin/CMakePlugin.wxcp b/CMakePlugin/CMakePlugin.wxcp
index 8f071d7..ef29af0 100644
--- a/CMakePlugin/CMakePlugin.wxcp
+++ b/CMakePlugin/CMakePlugin.wxcp
@@ -265,7 +265,7 @@
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxFLP_DEFAULT_STYLE", "wxFLP_USE_TEXTCTRL"],
- "m_sizerFlags": ["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/CMakePlugin/CMakePluginUi.cpp b/CMakePlugin/CMakePluginUi.cpp
index 54fe09b..d98f4d5 100644
--- a/CMakePlugin/CMakePluginUi.cpp
+++ b/CMakePlugin/CMakePluginUi.cpp
@@ -40,7 +40,7 @@ CMakeSettingsDialogBase::CMakeSettingsDialogBase(wxWindow* parent, wxWindowID id
m_filePickerProgram = new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, wxT("Select a file"), wxT("*"), wxDefaultPosition, wxSize(-1,-1), wxFLP_DEFAULT_STYLE|wxFLP_USE_TEXTCTRL);
m_filePickerProgram->SetToolTip(_("Path to cmake executable."));
- flexGridSizer->Add(m_filePickerProgram, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
+ flexGridSizer->Add(m_filePickerProgram, 1, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
m_filePickerProgram->SetMinSize(wxSize(200,-1));
m_staticTextDefaultGenerator = new wxStaticText(this, wxID_ANY, _("Default Generator:"), wxDefaultPosition, wxSize(-1,-1), 0);
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"/>
https://sourceforge.net/p/codelite/codelitegit/ci/c06c6e724af5ca92a90bdaf0072d17c134d0b15d
commit c06c6e724af5ca92a90bdaf0072d17c134d0b15d
Author: Eran <era...@gm...>
Date: Sat Jan 11 09:25:20 2014 +0200
Updated TODO list
diff --git a/TODO.TXT b/TODO.TXT
index d80b88d..e5c87fa 100644
--- a/TODO.TXT
+++ b/TODO.TXT
@@ -1,3 +1,2 @@
-- wxCrafter: make sure that after code generation an event is sent to git/svn views are updated accordingly
- 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
-----------------------------------------------------------------------
Summary of changes:
CMakePlugin/CMakePlugin.wxcp | 2 +-
CMakePlugin/CMakePluginUi.cpp | 2 +-
LiteEditor.workspace | 4 ++--
TODO.TXT | 1 -
4 files changed, 4 insertions(+), 5 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-11 08:07:29
|
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 beb9047e53c21140e443d55c508d81a3a5b7b78d (commit)
from c8fc8a13b854aaa57bb9be3b31f193804aacd54a (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/beb9047e53c21140e443d55c508d81a3a5b7b78d
commit beb9047e53c21140e443d55c508d81a3a5b7b78d
Author: eran <er...@os...>
Date: Sat Jan 11 02:07:02 2014 -0800
OSX: Better drawing the wxAuiNotebook
OSX: Make sure that when dismissing the 'Help' or any dialog, the project settings dialog remains on top
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 5fe354b..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"/>
@@ -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"/>
@@ -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"/>
@@ -184,7 +184,7 @@
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="OSX_Debug" Selected="yes">
+ <WorkspaceConfiguration Name="OSX_Debug" Selected="no">
<Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
@@ -219,5 +219,40 @@
<Project Name="Tweaks" ConfigName="DebugUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
+ <WorkspaceConfiguration Name="OSX_Release" Selected="yes">
+ <Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
+ <Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
+ <Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
+ <Project Name="wxFormBuilder" ConfigName="WinReleaseUnicode"/>
+ <Project Name="UnitTestPP" ConfigName="WinReleaseUnicode"/>
+ <Project Name="Tweaks" ConfigName="DebugUnicode"/>
+ <Project Name="Subversion2" ConfigName="WinReleaseUnicode"/>
+ <Project Name="sqlite3" ConfigName="Common"/>
+ <Project Name="snipwiz" ConfigName="WinReleaseUnicode"/>
+ <Project Name="SFTP" ConfigName="DebugUnicode"/>
+ <Project Name="QMakePlugin" ConfigName="WinReleaseUnicode"/>
+ <Project Name="plugin_sdk" ConfigName="WinReleaseUnicode"/>
+ <Project Name="PCH" ConfigName="Release"/>
+ <Project Name="Outline" ConfigName="WinDebugUnicode"/>
+ <Project Name="MacBundler" ConfigName="WinDebugUnicode"/>
+ <Project Name="LiteEditor" ConfigName="OSX_Release"/>
+ <Project Name="Interfaces" ConfigName="Common"/>
+ <Project Name="Gizmos" ConfigName="WinDebugUnicode"/>
+ <Project Name="git" ConfigName="DebugUnicode"/>
+ <Project Name="ExternalTools" ConfigName="WinDebugUnicode"/>
+ <Project Name="DebuggerGDB" ConfigName="WinDebugUnicode"/>
+ <Project Name="databaselayer_sqlite" ConfigName="DebugUnicode"/>
+ <Project Name="DatabaseExplorer" ConfigName="DebugUnicode"/>
+ <Project Name="Cscope" ConfigName="WinDebugUnicode"/>
+ <Project Name="CppChecker" ConfigName="WinDebugUnicode"/>
+ <Project Name="Copyright" ConfigName="WinDebugUnicode"/>
+ <Project Name="ContinuousBuild" ConfigName="WinDebugUnicode"/>
+ <Project Name="CodeLite" ConfigName="WinDebugUnicode"/>
+ <Project Name="CodeFormatter" ConfigName="WinDebugUnicode"/>
+ <Project Name="CodeBeautifier" ConfigName="DebugUnicode"/>
+ <Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
+ <Project Name="CallGraph" ConfigName="DebugUnicode"/>
+ <Project Name="abbreviation" ConfigName="WinDebugUnicode"/>
+ </WorkspaceConfiguration>
</BuildMatrix>
</CodeLite_Workspace>
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index e3b9e02..0ba880a 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -4,6 +4,18 @@
<Plugin Name="qmake">
<![CDATA[00080001N0004Unix0000000000000001N0011Unix_Make_J0000000000000001N0010Unix_Wx_290000000000000001N0015WinDebugUnicode0000000000000001N0011WinDebug_290000000000000001N0017WinReleaseUnicode0000000000000001N0013WinRelease_290000000000000001N0016Win_wxWidgets_29000000000000]]>
</Plugin>
+ <Plugin Name="CMakePlugin">
+ <![CDATA[[{
+ "name": "OSX_Release",
+ "enabled": false,
+ "buildDirectory": "build",
+ "sourceDirectory": "$(ProjectPath)",
+ "generator": "",
+ "buildType": "",
+ "arguments": [],
+ "parentProject": ""
+ }]]]>
+ </Plugin>
</Plugins>
<Reconciliation>
<Ignorefiles/>
@@ -895,6 +907,198 @@
<File Name="reconcileprojectbase.cpp"/>
<File Name="reconcileprojectbase.h"/>
</VirtualDirectory>
+ <Dependencies Name="CMake_Debug">
+ <Project Name="wxscintilla"/>
+ <Project Name="sqlite3"/>
+ <Project Name="wxsqlite3"/>
+ <Project Name="CodeLite"/>
+ <Project Name="plugin_sdk"/>
+ <Project Name="CodeFormatter"/>
+ <Project Name="DebuggerGDB"/>
+ <Project Name="Subversion"/>
+ <Project Name="Gizmos"/>
+ <Project Name="Cscope"/>
+ <Project Name="Copyright"/>
+ <Project Name="UnitTestPP"/>
+ </Dependencies>
+ <Dependencies Name="CMake_Debug_DBE_MySQL">
+ <Project Name="wxscintilla"/>
+ <Project Name="sqlite3"/>
+ <Project Name="wxsqlite3"/>
+ <Project Name="CodeLite"/>
+ <Project Name="plugin_sdk"/>
+ <Project Name="CodeFormatter"/>
+ <Project Name="DebuggerGDB"/>
+ <Project Name="Subversion"/>
+ <Project Name="Gizmos"/>
+ <Project Name="Cscope"/>
+ <Project Name="Copyright"/>
+ <Project Name="UnitTestPP"/>
+ </Dependencies>
+ <Dependencies Name="CMake_Debug_Essential">
+ <Project Name="wxscintilla"/>
+ <Project Name="sqlite3"/>
+ <Project Name="wxsqlite3"/>
+ <Project Name="CodeLite"/>
+ <Project Name="plugin_sdk"/>
+ <Project Name="CodeFormatter"/>
+ <Project Name="DebuggerGDB"/>
+ <Project Name="Subversion"/>
+ <Project Name="Gizmos"/>
+ <Project Name="Cscope"/>
+ <Project Name="Copyright"/>
+ <Project Name="UnitTestPP"/>
+ </Dependencies>
+ <Dependencies Name="CMake_Release">
+ <Project Name="wxscintilla"/>
+ <Project Name="sqlite3"/>
+ <Project Name="wxsqlite3"/>
+ <Project Name="CodeLite"/>
+ <Project Name="plugin_sdk"/>
+ <Project Name="CodeFormatter"/>
+ <Project Name="DebuggerGDB"/>
+ <Project Name="Subversion"/>
+ <Project Name="Gizmos"/>
+ <Project Name="Cscope"/>
+ <Project Name="Copyright"/>
+ <Project Name="UnitTestPP"/>
+ </Dependencies>
+ <Dependencies Name="CMake_Release_DBE_MySQL">
+ <Project Name="wxscintilla"/>
+ <Project Name="sqlite3"/>
+ <Project Name="wxsqlite3"/>
+ <Project Name="CodeLite"/>
+ <Project Name="plugin_sdk"/>
+ <Project Name="CodeFormatter"/>
+ <Project Name="DebuggerGDB"/>
+ <Project Name="Subversion"/>
+ <Project Name="Gizmos"/>
+ <Project Name="Cscope"/>
+ <Project Name="Copyright"/>
+ <Project Name="UnitTestPP"/>
+ </Dependencies>
+ <Dependencies Name="CMake_Release_Essential">
+ <Project Name="wxscintilla"/>
+ <Project Name="sqlite3"/>
+ <Project Name="wxsqlite3"/>
+ <Project Name="CodeLite"/>
+ <Project Name="plugin_sdk"/>
+ <Project Name="CodeFormatter"/>
+ <Project Name="DebuggerGDB"/>
+ <Project Name="Subversion"/>
+ <Project Name="Gizmos"/>
+ <Project Name="Cscope"/>
+ <Project Name="Copyright"/>
+ <Project Name="UnitTestPP"/>
+ </Dependencies>
+ <Dependencies Name="OSX_Debug">
+ <Project Name="wxscintilla"/>
+ <Project Name="sqlite3"/>
+ <Project Name="wxsqlite3"/>
+ <Project Name="CodeLite"/>
+ <Project Name="plugin_sdk"/>
+ <Project Name="CodeFormatter"/>
+ <Project Name="DebuggerGDB"/>
+ <Project Name="Subversion"/>
+ <Project Name="Gizmos"/>
+ <Project Name="Cscope"/>
+ <Project Name="Copyright"/>
+ <Project Name="UnitTestPP"/>
+ </Dependencies>
+ <Dependencies Name="WinDebugUnicode">
+ <Project Name="PCH"/>
+ <Project Name="sqlite3"/>
+ <Project Name="wxsqlite3"/>
+ <Project Name="databaselayer_sqlite"/>
+ <Project Name="wxshapeframework"/>
+ <Project Name="CodeLite"/>
+ <Project Name="plugin_sdk"/>
+ <Project Name="CodeFormatter"/>
+ <Project Name="DebuggerGDB"/>
+ <Project Name="Gizmos"/>
+ <Project Name="Cscope"/>
+ <Project Name="Copyright"/>
+ <Project Name="UnitTestPP"/>
+ <Project Name="ExternalTools"/>
+ <Project Name="snipwiz"/>
+ <Project Name="wxFormBuilder"/>
+ <Project Name="abbreviation"/>
+ <Project Name="ContinuousBuild"/>
+ <Project Name="QMakePlugin"/>
+ <Project Name="CppChecker"/>
+ <Project Name="Subversion2"/>
+ <Project Name="Outline"/>
+ <Project Name="git"/>
+ <Project Name="DatabaseExplorer"/>
+ <Project Name="CallGraph"/>
+ <Project Name="ZoomNavigator"/>
+ <Project Name="CodeBeautifier"/>
+ <Project Name="SFTP"/>
+ <Project Name="Tweaks"/>
+ </Dependencies>
+ <Dependencies Name="WinReleaseUnicode">
+ <Project Name="PCH"/>
+ <Project Name="sqlite3"/>
+ <Project Name="wxsqlite3"/>
+ <Project Name="databaselayer_sqlite"/>
+ <Project Name="wxshapeframework"/>
+ <Project Name="CodeLite"/>
+ <Project Name="plugin_sdk"/>
+ <Project Name="CodeFormatter"/>
+ <Project Name="DebuggerGDB"/>
+ <Project Name="Gizmos"/>
+ <Project Name="Cscope"/>
+ <Project Name="Copyright"/>
+ <Project Name="UnitTestPP"/>
+ <Project Name="ExternalTools"/>
+ <Project Name="snipwiz"/>
+ <Project Name="wxFormBuilder"/>
+ <Project Name="abbreviation"/>
+ <Project Name="ContinuousBuild"/>
+ <Project Name="QMakePlugin"/>
+ <Project Name="CppChecker"/>
+ <Project Name="Subversion2"/>
+ <Project Name="Outline"/>
+ <Project Name="git"/>
+ <Project Name="DatabaseExplorer"/>
+ <Project Name="CallGraph"/>
+ <Project Name="ZoomNavigator"/>
+ <Project Name="SFTP"/>
+ <Project Name="Tweaks"/>
+ <Project Name="CMakePlugin"/>
+ </Dependencies>
+ <Dependencies Name="WinDebugUnicode">
+ <Project Name="PCH"/>
+ <Project Name="sqlite3"/>
+ <Project Name="wxsqlite3"/>
+ <Project Name="databaselayer_sqlite"/>
+ <Project Name="wxshapeframework"/>
+ <Project Name="CodeLite"/>
+ <Project Name="plugin_sdk"/>
+ <Project Name="CodeFormatter"/>
+ <Project Name="DebuggerGDB"/>
+ <Project Name="Gizmos"/>
+ <Project Name="Cscope"/>
+ <Project Name="Copyright"/>
+ <Project Name="UnitTestPP"/>
+ <Project Name="ExternalTools"/>
+ <Project Name="snipwiz"/>
+ <Project Name="wxFormBuilder"/>
+ <Project Name="abbreviation"/>
+ <Project Name="ContinuousBuild"/>
+ <Project Name="QMakePlugin"/>
+ <Project Name="CppChecker"/>
+ <Project Name="Subversion2"/>
+ <Project Name="Outline"/>
+ <Project Name="git"/>
+ <Project Name="DatabaseExplorer"/>
+ <Project Name="CallGraph"/>
+ <Project Name="ZoomNavigator"/>
+ <Project Name="CodeBeautifier"/>
+ <Project Name="SFTP"/>
+ <Project Name="Tweaks"/>
+ <Project Name="CMakePlugin"/>
+ </Dependencies>
<Settings Type="Executable">
<GlobalSettings>
<Compiler Options="" C_Options="" Assembler="">
@@ -1219,6 +1423,48 @@ resources.cpp: resources.xrc
<SearchPaths/>
</Completion>
</Configuration>
+ <Configuration Name="OSX_Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
+ <Compiler Options="-g -Wall" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
+ <IncludePath Value="."/>
+ </Compiler>
+ <Linker Options="-O0" Required="yes">
+ <LibraryPath Value="."/>
+ <LibraryPath Value="Debug"/>
+ </Linker>
+ <ResourceCompiler Options="" Required="no"/>
+ <General OutputFile="" IntermediateDirectory="./Debug" Command="../build-release/pack/codelite.app/Contents/MacOS/codelite" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/>
+ <Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
+ <![CDATA[]]>
+ </Environment>
+ <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="">
+ <DebuggerSearchPaths/>
+ <PostConnectCommands/>
+ <StartupCommands/>
+ </Debugger>
+ <PreBuild/>
+ <PostBuild/>
+ <CustomBuild Enabled="yes">
+ <Target Name="CMake_Plus_Build">./mac-build.sh --cmake --wxc</Target>
+ <RebuildCommand>cd build-release && make clean && cd .. && ./mac-build.sh --wxc</RebuildCommand>
+ <CleanCommand>cd build-release && make clean</CleanCommand>
+ <BuildCommand>./mac-build.sh --wxc</BuildCommand>
+ <PreprocessFileCommand/>
+ <SingleFileCommand/>
+ <MakefileGenerationCommand/>
+ <ThirdPartyToolName/>
+ <WorkingDirectory>$(WorkspacePath)</WorkingDirectory>
+ </CustomBuild>
+ <AdditionalRules>
+ <CustomPostBuild/>
+ <CustomPreBuild/>
+ </AdditionalRules>
+ <Completion EnableCpp11="no">
+ <ClangCmpFlagsC/>
+ <ClangCmpFlags/>
+ <ClangPP/>
+ <SearchPaths/>
+ </Completion>
+ </Configuration>
<Configuration Name="WinDebugUnicode" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-g;-Wall;$(shell wx-config --debug=yes --cxxflags --unicode=yes);-Winvalid-pch" C_Options="-Wall" Assembler="" Required="yes" PreCompiledHeader="../PCH/precompiled_header_dbg.h" PCHInCommandLine="yes" UseDifferentPCHFlags="yes" PCHFlags="$(shell wx-config --cxxflags --debug=yes --unicode=yes) -g">
<IncludePath Value="."/>
@@ -1274,8 +1520,7 @@ resources.cpp: resources.xrc
wxrc /c /v /o resources.cpp resources.xrc
svninfo.cpp:
- autorev .
-</CustomPreBuild>
+ autorev .</CustomPreBuild>
</AdditionalRules>
<Completion EnableCpp11="yes">
<ClangCmpFlagsC/>
@@ -1343,196 +1588,4 @@ resources.cpp: resources.xrc
</Completion>
</Configuration>
</Settings>
- <Dependencies Name="CMake_Debug">
- <Project Name="wxscintilla"/>
- <Project Name="sqlite3"/>
- <Project Name="wxsqlite3"/>
- <Project Name="CodeLite"/>
- <Project Name="plugin_sdk"/>
- <Project Name="CodeFormatter"/>
- <Project Name="DebuggerGDB"/>
- <Project Name="Subversion"/>
- <Project Name="Gizmos"/>
- <Project Name="Cscope"/>
- <Project Name="Copyright"/>
- <Project Name="UnitTestPP"/>
- </Dependencies>
- <Dependencies Name="CMake_Debug_DBE_MySQL">
- <Project Name="wxscintilla"/>
- <Project Name="sqlite3"/>
- <Project Name="wxsqlite3"/>
- <Project Name="CodeLite"/>
- <Project Name="plugin_sdk"/>
- <Project Name="CodeFormatter"/>
- <Project Name="DebuggerGDB"/>
- <Project Name="Subversion"/>
- <Project Name="Gizmos"/>
- <Project Name="Cscope"/>
- <Project Name="Copyright"/>
- <Project Name="UnitTestPP"/>
- </Dependencies>
- <Dependencies Name="CMake_Debug_Essential">
- <Project Name="wxscintilla"/>
- <Project Name="sqlite3"/>
- <Project Name="wxsqlite3"/>
- <Project Name="CodeLite"/>
- <Project Name="plugin_sdk"/>
- <Project Name="CodeFormatter"/>
- <Project Name="DebuggerGDB"/>
- <Project Name="Subversion"/>
- <Project Name="Gizmos"/>
- <Project Name="Cscope"/>
- <Project Name="Copyright"/>
- <Project Name="UnitTestPP"/>
- </Dependencies>
- <Dependencies Name="CMake_Release">
- <Project Name="wxscintilla"/>
- <Project Name="sqlite3"/>
- <Project Name="wxsqlite3"/>
- <Project Name="CodeLite"/>
- <Project Name="plugin_sdk"/>
- <Project Name="CodeFormatter"/>
- <Project Name="DebuggerGDB"/>
- <Project Name="Subversion"/>
- <Project Name="Gizmos"/>
- <Project Name="Cscope"/>
- <Project Name="Copyright"/>
- <Project Name="UnitTestPP"/>
- </Dependencies>
- <Dependencies Name="CMake_Release_DBE_MySQL">
- <Project Name="wxscintilla"/>
- <Project Name="sqlite3"/>
- <Project Name="wxsqlite3"/>
- <Project Name="CodeLite"/>
- <Project Name="plugin_sdk"/>
- <Project Name="CodeFormatter"/>
- <Project Name="DebuggerGDB"/>
- <Project Name="Subversion"/>
- <Project Name="Gizmos"/>
- <Project Name="Cscope"/>
- <Project Name="Copyright"/>
- <Project Name="UnitTestPP"/>
- </Dependencies>
- <Dependencies Name="CMake_Release_Essential">
- <Project Name="wxscintilla"/>
- <Project Name="sqlite3"/>
- <Project Name="wxsqlite3"/>
- <Project Name="CodeLite"/>
- <Project Name="plugin_sdk"/>
- <Project Name="CodeFormatter"/>
- <Project Name="DebuggerGDB"/>
- <Project Name="Subversion"/>
- <Project Name="Gizmos"/>
- <Project Name="Cscope"/>
- <Project Name="Copyright"/>
- <Project Name="UnitTestPP"/>
- </Dependencies>
- <Dependencies Name="OSX_Debug">
- <Project Name="wxscintilla"/>
- <Project Name="sqlite3"/>
- <Project Name="wxsqlite3"/>
- <Project Name="CodeLite"/>
- <Project Name="plugin_sdk"/>
- <Project Name="CodeFormatter"/>
- <Project Name="DebuggerGDB"/>
- <Project Name="Subversion"/>
- <Project Name="Gizmos"/>
- <Project Name="Cscope"/>
- <Project Name="Copyright"/>
- <Project Name="UnitTestPP"/>
- </Dependencies>
- <Dependencies Name="WinDebugUnicode">
- <Project Name="PCH"/>
- <Project Name="sqlite3"/>
- <Project Name="wxsqlite3"/>
- <Project Name="databaselayer_sqlite"/>
- <Project Name="wxshapeframework"/>
- <Project Name="CodeLite"/>
- <Project Name="plugin_sdk"/>
- <Project Name="CodeFormatter"/>
- <Project Name="DebuggerGDB"/>
- <Project Name="Gizmos"/>
- <Project Name="Cscope"/>
- <Project Name="Copyright"/>
- <Project Name="UnitTestPP"/>
- <Project Name="ExternalTools"/>
- <Project Name="snipwiz"/>
- <Project Name="wxFormBuilder"/>
- <Project Name="abbreviation"/>
- <Project Name="ContinuousBuild"/>
... 1723 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-11 07:24:32
|
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 c8fc8a13b854aaa57bb9be3b31f193804aacd54a (commit)
from 524f5ffaeddd69ca05e8b2a289109d06f8a2acff (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/c8fc8a13b854aaa57bb9be3b31f193804aacd54a
commit c8fc8a13b854aaa57bb9be3b31f193804aacd54a
Author: eran <er...@os...>
Date: Sat Jan 11 01:24:10 2014 -0800
Improved the CMake PLugin help tab on OSX
diff --git a/CMakePlugin/CMakePlugin.wxcp b/CMakePlugin/CMakePlugin.wxcp
index 1813074..8f071d7 100644
--- a/CMakePlugin/CMakePlugin.wxcp
+++ b/CMakePlugin/CMakePlugin.wxcp
@@ -265,7 +265,7 @@
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxFLP_DEFAULT_STYLE", "wxFLP_USE_TEXTCTRL"],
- "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
+ "m_sizerFlags": ["wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -1681,7 +1681,7 @@
"border": 0,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": ["wxHW_SCROLLBAR_AUTO", "wxBORDER_STATIC"],
+ "m_styles": ["wxHW_SCROLLBAR_AUTO", "wxBORDER_THEME"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
diff --git a/CMakePlugin/CMakePluginUi.cpp b/CMakePlugin/CMakePluginUi.cpp
index d11f7c0..54fe09b 100644
--- a/CMakePlugin/CMakePluginUi.cpp
+++ b/CMakePlugin/CMakePluginUi.cpp
@@ -40,7 +40,7 @@ CMakeSettingsDialogBase::CMakeSettingsDialogBase(wxWindow* parent, wxWindowID id
m_filePickerProgram = new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, wxT("Select a file"), wxT("*"), wxDefaultPosition, wxSize(-1,-1), wxFLP_DEFAULT_STYLE|wxFLP_USE_TEXTCTRL);
m_filePickerProgram->SetToolTip(_("Path to cmake executable."));
- flexGridSizer->Add(m_filePickerProgram, 1, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
+ flexGridSizer->Add(m_filePickerProgram, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
m_filePickerProgram->SetMinSize(wxSize(200,-1));
m_staticTextDefaultGenerator = new wxStaticText(this, wxID_ANY, _("Default Generator:"), wxDefaultPosition, wxSize(-1,-1), 0);
@@ -160,7 +160,7 @@ CMakeHelpTabBase::CMakeHelpTabBase(wxWindow* parent, wxWindowID id, const wxPoin
wxBoxSizer* boxSizerText = new wxBoxSizer(wxVERTICAL);
m_splitterPageText->SetSizer(boxSizerText);
- m_htmlWinText = new wxHtmlWindow(m_splitterPageText, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxHW_SCROLLBAR_AUTO|wxBORDER_STATIC);
+ m_htmlWinText = new wxHtmlWindow(m_splitterPageText, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxHW_SCROLLBAR_AUTO|wxBORDER_THEME);
m_htmlWinText->SetPage(wxT(""));
boxSizerText->Add(m_htmlWinText, 1, wxALL|wxEXPAND, 0);
diff --git a/CMakePlugin/CMakePluginUi_bitmaps.cpp b/CMakePlugin/CMakePluginUi_bitmaps.cpp
index 3e8c72f..d8a5fca 100644
--- a/CMakePlugin/CMakePluginUi_bitmaps.cpp
+++ b/CMakePlugin/CMakePluginUi_bitmaps.cpp
@@ -1,98 +1,98 @@
-//
-// 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 = 843;
-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,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,222,1,10,22,14,18,195,172,157,47,0,0,2,216,73,68,65,84,56,203,125,
-144,75,108,84,101,24,134,159,255,220,254,115,254,115,198,206,12,51,211,
-153,78,47,12,157,38,69,211,146,64,48,81,23,85,49,66,21,52,40,27,48,129,
-138,1,12,154,24,22,44,88,145,176,195,181,59,23,134,141,75,55,174,140,18,
-13,11,119,82,140,81,161,244,66,112,72,40,244,54,215,83,206,233,204,239,
-98,90,23,84,248,86,223,226,251,158,231,205,107,242,156,57,248,234,251,111,
-103,131,212,27,149,165,202,12,16,121,192,198,83,55,198,211,79,59,118,244,
-110,173,78,161,252,250,123,227,217,242,213,227,176,31,32,252,31,201,54,
-192,242,242,34,0,231,63,251,242,181,142,59,240,110,106,221,72,231,18,206,
-59,128,2,240,132,120,54,32,157,254,207,238,233,206,224,33,219,218,181,211,
-213,30,10,227,248,4,236,5,8,181,126,54,96,101,165,107,159,154,186,178,183,
-211,73,159,168,213,122,88,119,2,61,100,203,226,176,101,30,6,124,0,101,24,
-219,1,91,246,209,81,95,69,81,254,112,28,23,250,91,205,142,142,172,128,188,
-84,12,73,249,241,91,82,190,4,208,234,116,182,3,182,236,99,99,23,94,52,205,
-190,211,139,139,14,237,88,211,18,190,136,165,210,227,74,229,6,165,252,80,
-24,134,2,240,55,83,24,221,230,243,0,76,78,78,168,56,206,30,107,52,138,185,
-122,125,93,71,145,22,117,146,196,118,130,33,229,177,91,169,51,7,148,26,
-1,104,110,166,48,186,205,63,4,32,138,198,202,182,189,243,92,165,98,16,69,
-176,186,178,74,216,169,35,19,190,48,29,169,95,238,233,73,13,120,222,169,
-146,235,74,128,192,52,49,210,233,174,253,228,201,115,210,117,251,78,45,
-45,229,146,97,24,233,106,245,177,200,229,254,102,226,128,36,91,72,98,58,
-14,253,65,192,43,169,212,217,130,227,12,3,52,218,109,204,48,108,0,160,245,
-224,72,38,243,230,215,243,243,190,29,71,143,25,222,53,35,78,124,148,99,
-160,232,17,204,206,147,168,86,133,229,56,186,207,247,157,153,48,100,36,
-8,126,248,179,209,208,6,192,197,139,95,89,197,226,248,249,202,63,105,213,
-108,220,215,131,165,95,197,145,67,30,41,207,226,209,90,131,13,199,198,85,
-10,219,113,232,245,125,14,230,243,103,110,86,171,195,0,38,192,194,194,98,
-169,144,63,122,237,206,237,71,70,241,232,143,212,46,223,16,127,245,222,
-98,245,193,10,205,133,13,70,151,90,12,196,33,134,101,10,211,178,244,80,
-16,88,179,205,166,55,93,173,126,111,106,173,185,254,211,253,171,119,239,
-138,253,253,159,92,215,149,47,110,136,57,57,203,3,235,33,183,51,51,204,
-246,205,177,28,173,97,222,107,83,220,240,232,113,37,129,43,133,180,237,
-61,223,85,42,223,138,212,11,133,210,232,216,167,115,242,244,180,184,53,
-249,139,94,107,175,9,34,224,9,16,1,45,176,234,6,201,102,130,221,119,50,
-28,249,61,195,7,181,172,46,41,95,124,62,253,219,53,81,222,119,236,155,236,
-165,250,212,205,145,159,121,18,71,208,222,124,140,128,245,46,128,214,230,
-30,131,107,72,242,181,148,158,152,75,138,242,31,78,252,47,183,191,5,89,
-119,238,104,246,0,0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_1 = 210;
-static unsigned char xml_res_file_1[] = {
-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,99,109,97,
-107,101,95,49,54,34,62,67,77,97,107,101,80,108,117,103,105,110,85,105,95,
-98,105,116,109,97,112,115,46,99,112,112,36,99,109,97,107,101,45,49,54,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 wxCrafterR3nJ3cInitBitmapResources()
-{
-
- // 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/CMakePluginUi_bitmaps.cpp$cmake-16.png"), xml_res_file_0, xml_res_size_0, wxT("image/png"));
- XRC_ADD_FILE(wxT("XRC_resource/CMakePluginUi_bitmaps.cpp$C__src_codelitegit_CMakePlugin_CMakePluginUi_bitmaps.xrc"), xml_res_file_1, xml_res_size_1, wxT("text/xml"));
- wxXmlResource::Get()->Load(wxT("memory:XRC_resource/CMakePluginUi_bitmaps.cpp$C__src_codelitegit_CMakePlugin_CMakePluginUi_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 = 843;
+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,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,222,1,10,22,14,18,195,172,157,47,0,0,2,216,73,68,65,84,56,203,125,
+144,75,108,84,101,24,134,159,255,220,254,115,254,115,198,206,12,51,211,
+153,78,47,12,157,38,69,211,146,64,48,81,23,85,49,66,21,52,40,27,48,129,
+138,1,12,154,24,22,44,88,145,176,195,181,59,23,134,141,75,55,174,140,18,
+13,11,119,82,140,81,161,244,66,112,72,40,244,54,215,83,206,233,204,239,
+98,90,23,84,248,86,223,226,251,158,231,205,107,242,156,57,248,234,251,111,
+103,131,212,27,149,165,202,12,16,121,192,198,83,55,198,211,79,59,118,244,
+110,173,78,161,252,250,123,227,217,242,213,227,176,31,32,252,31,201,54,
+192,242,242,34,0,231,63,251,242,181,142,59,240,110,106,221,72,231,18,206,
+59,128,2,240,132,120,54,32,157,254,207,238,233,206,224,33,219,218,181,211,
+213,30,10,227,248,4,236,5,8,181,126,54,96,101,165,107,159,154,186,178,183,
+211,73,159,168,213,122,88,119,2,61,100,203,226,176,101,30,6,124,0,101,24,
+219,1,91,246,209,81,95,69,81,254,112,28,23,250,91,205,142,142,172,128,188,
+84,12,73,249,241,91,82,190,4,208,234,116,182,3,182,236,99,99,23,94,52,205,
+190,211,139,139,14,237,88,211,18,190,136,165,210,227,74,229,6,165,252,80,
+24,134,2,240,55,83,24,221,230,243,0,76,78,78,168,56,206,30,107,52,138,185,
+122,125,93,71,145,22,117,146,196,118,130,33,229,177,91,169,51,7,148,26,
+1,104,110,166,48,186,205,63,4,32,138,198,202,182,189,243,92,165,98,16,69,
+176,186,178,74,216,169,35,19,190,48,29,169,95,238,233,73,13,120,222,169,
+146,235,74,128,192,52,49,210,233,174,253,228,201,115,210,117,251,78,45,
+45,229,146,97,24,233,106,245,177,200,229,254,102,226,128,36,91,72,98,58,
+14,253,65,192,43,169,212,217,130,227,12,3,52,218,109,204,48,108,0,160,245,
+224,72,38,243,230,215,243,243,190,29,71,143,25,222,53,35,78,124,148,99,
+160,232,17,204,206,147,168,86,133,229,56,186,207,247,157,153,48,100,36,
+8,126,248,179,209,208,6,192,197,139,95,89,197,226,248,249,202,63,105,213,
+108,220,215,131,165,95,197,145,67,30,41,207,226,209,90,131,13,199,198,85,
+10,219,113,232,245,125,14,230,243,103,110,86,171,195,0,38,192,194,194,98,
+169,144,63,122,237,206,237,71,70,241,232,143,212,46,223,16,127,245,222,
+98,245,193,10,205,133,13,70,151,90,12,196,33,134,101,10,211,178,244,80,
+16,88,179,205,166,55,93,173,126,111,106,173,185,254,211,253,171,119,239,
+138,253,253,159,92,215,149,47,110,136,57,57,203,3,235,33,183,51,51,204,
+246,205,177,28,173,97,222,107,83,220,240,232,113,37,129,43,133,180,237,
+61,223,85,42,223,138,212,11,133,210,232,216,167,115,242,244,180,184,53,
+249,139,94,107,175,9,34,224,9,16,1,45,176,234,6,201,102,130,221,119,50,
+28,249,61,195,7,181,172,46,41,95,124,62,253,219,53,81,222,119,236,155,236,
+165,250,212,205,145,159,121,18,71,208,222,124,140,128,245,46,128,214,230,
+30,131,107,72,242,181,148,158,152,75,138,242,31,78,252,47,183,191,5,89,
+119,238,104,246,0,0,0,0,73,69,78,68,174,66,96,130};
+
+static size_t xml_res_size_1 = 210;
+static unsigned char xml_res_file_1[] = {
+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,99,109,97,
+107,101,95,49,54,34,62,67,77,97,107,101,80,108,117,103,105,110,85,105,95,
+98,105,116,109,97,112,115,46,99,112,112,36,99,109,97,107,101,45,49,54,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 wxCrafterR3nJ3cInitBitmapResources()
+{
+
+ // 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/CMakePluginUi_bitmaps.cpp$cmake-16.png"), xml_res_file_0, xml_res_size_0, wxT("image/png"));
+ XRC_ADD_FILE(wxT("XRC_resource/CMakePluginUi_bitmaps.cpp$_Users_eran_devl_codelitegit_CMakePlugin_CMakePluginUi_bitmaps.xrc"), xml_res_file_1, xml_res_size_1, wxT("text/xml"));
+ wxXmlResource::Get()->Load(wxT("memory:XRC_resource/CMakePluginUi_bitmaps.cpp$_Users_eran_devl_codelitegit_CMakePlugin_CMakePluginUi_bitmaps.xrc"));
+}
diff --git a/LiteEditor/theme_handler.cpp b/LiteEditor/theme_handler.cpp
index e385801..46b14cc 100644
--- a/LiteEditor/theme_handler.cpp
+++ b/LiteEditor/theme_handler.cpp
@@ -10,6 +10,10 @@
#include <wx/aui/framemanager.h>
#include "cl_aui_tb_are.h"
+#ifdef __WXMAC__
+#include <wx/srchctrl.h>
+#endif
+
#define CHECK_POINTER(p) if ( !p ) return;
ThemeHandler::ThemeHandler()
@@ -73,6 +77,12 @@ void ThemeHandler::OnEditorThemeChanged(wxCommandEvent& e)
void ThemeHandler::DoUpdateColours(wxWindow* win, const wxColour& bg, const wxColour& fg)
{
+#ifdef __WXMAC__
+ if ( dynamic_cast<wxSearchCtrl*>(win) ) {
+ // On OSX, this looks bad...
+ // so dont alter its colours, so we simply do nothing here
+ } else
+#endif
if ( dynamic_cast<wxTreeCtrl*>(win) || dynamic_cast<wxListBox*>(win) || dynamic_cast<wxDataViewCtrl*>(win) || dynamic_cast<wxTextCtrl*>(win) || dynamic_cast<wxListCtrl*>(win)) {
win->SetBackgroundColour( bg );
win->SetForegroundColour( fg );
-----------------------------------------------------------------------
Summary of changes:
CMakePlugin/CMakePlugin.wxcp | 4 +-
CMakePlugin/CMakePluginUi.cpp | 4 +-
CMakePlugin/CMakePluginUi_bitmaps.cpp | 196 ++++++++++++++++----------------
LiteEditor/theme_handler.cpp | 10 ++
4 files changed, 112 insertions(+), 102 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-11 06:12:54
|
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 524f5ffaeddd69ca05e8b2a289109d06f8a2acff (commit)
from dc02d280645d63f4bc52b84aad2cf8c547dbad4c (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/524f5ffaeddd69ca05e8b2a289109d06f8a2acff
commit 524f5ffaeddd69ca05e8b2a289109d06f8a2acff
Author: Eran <era...@gm...>
Date: Sat Jan 11 08:12:30 2014 +0200
When detaching a pane from the workspace view with a valid bitmap, make sure we restore once its redocked back to the notebook
diff --git a/LiteEditor/editorsettingslocalbase.cpp b/LiteEditor/editorsettingslocalbase.cpp
index 8644ffe..03259ea 100644
--- a/LiteEditor/editorsettingslocalbase.cpp
+++ b/LiteEditor/editorsettingslocalbase.cpp
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: editorsettingslocalbase.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -25,7 +26,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
this->SetSizer(mainSizer);
- m_staticText = new wxStaticText(this, wxID_ANY, _("Untick one or more checkboxes to set any local preferences, "), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_staticText = new wxStaticText(this, wxID_ANY, _("Untick one or more checkboxes to set any local preferences,"), wxDefaultPosition, wxSize(-1, -1), 0);
wxFont m_staticTextFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
m_staticTextFont.SetWeight(wxFONTWEIGHT_BOLD);
m_staticText->SetFont(m_staticTextFont);
@@ -46,7 +47,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
wxBoxSizer* boxSizer3 = new wxBoxSizer(wxVERTICAL);
m_panel2->SetSizer(boxSizer3);
- wxFlexGridSizer* fgSizer31 = new wxFlexGridSizer( 0, 2, 0, 20);
+ wxFlexGridSizer* fgSizer31 = new wxFlexGridSizer(0, 2, 0, 20);
fgSizer31->SetFlexibleDirection( wxBOTH );
fgSizer31->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer31->AddGrowableCol(1);
@@ -81,6 +82,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
m_tabWidth = new wxSpinCtrl(m_panel2, wxID_ANY, wxT("4"), wxDefaultPosition, wxSize(-1, -1), wxSP_ARROW_KEYS);
m_tabWidth->SetRange(1, 20);
+ m_tabWidth->SetValue(4);
bSizer7->Add(m_tabWidth, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
@@ -101,6 +103,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
m_indentWidth = new wxSpinCtrl(m_panel2, wxID_ANY, wxT("4"), wxDefaultPosition, wxSize(-1, -1), wxSP_ARROW_KEYS);
m_indentWidth->SetRange(1, 20);
+ m_indentWidth->SetValue(4);
bSizer6->Add(m_indentWidth, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
@@ -112,7 +115,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
wxBoxSizer* boxSizer2 = new wxBoxSizer(wxVERTICAL);
m_panel3->SetSizer(boxSizer2);
- wxFlexGridSizer* fgSizer21 = new wxFlexGridSizer( 0, 2, 0, 20);
+ wxFlexGridSizer* fgSizer21 = new wxFlexGridSizer(0, 2, 0, 20);
fgSizer21->SetFlexibleDirection( wxBOTH );
fgSizer21->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer21->AddGrowableCol(1);
@@ -170,7 +173,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
wxBoxSizer* boxSizer5 = new wxBoxSizer(wxVERTICAL);
m_panel4->SetSizer(boxSizer5);
- wxFlexGridSizer* fgSizer2 = new wxFlexGridSizer( 0, 2, 0, 20);
+ wxFlexGridSizer* fgSizer2 = new wxFlexGridSizer(0, 2, 0, 20);
fgSizer2->SetFlexibleDirection( wxBOTH );
fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer2->AddGrowableCol(1);
@@ -220,7 +223,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
fgSizer2->Add(m_checkBoxAppendLF, 0, wxALL, 5);
- wxFlexGridSizer* flexGridSizer15 = new wxFlexGridSizer( 0, 3, 0, 0);
+ wxFlexGridSizer* flexGridSizer15 = new wxFlexGridSizer(0, 3, 0, 0);
flexGridSizer15->SetFlexibleDirection( wxBOTH );
flexGridSizer15->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer15->AddGrowableCol(2);
@@ -274,15 +277,17 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
mainSizer->Add(bSizer4, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
- m_button1 = new wxButton(this, wxID_OK, _("&Ok"), wxDefaultPosition, wxSize(-1, -1), 0);
- m_button1->SetDefault();
+ m_stdBtnSizer17 = new wxStdDialogButtonSizer();
- bSizer4->Add(m_button1, 0, wxALL, 5);
+ bSizer4->Add(m_stdBtnSizer17, 0, wxALL, 5);
- m_button2 = new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize(-1, -1), 0);
-
- bSizer4->Add(m_button2, 0, wxALL, 5);
+ m_button19 = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_button19->SetDefault();
+ m_stdBtnSizer17->AddButton(m_button19);
+ m_button21 = new wxButton(this, wxID_CANCEL, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_stdBtnSizer17->AddButton(m_button21);
+ m_stdBtnSizer17->Realize();
m_treebook1->ExpandNode( 0, true );
m_treebook1->ExpandNode( 1, true );
@@ -308,7 +313,6 @@ 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_button1->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LocalEditorSettingsbase::OnOK), NULL, this);
}
@@ -328,6 +332,5 @@ 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_button1->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LocalEditorSettingsbase::OnOK), NULL, this);
}
diff --git a/LiteEditor/editorsettingslocalbase.h b/LiteEditor/editorsettingslocalbase.h
index b6de546..997fd32 100644
--- a/LiteEditor/editorsettingslocalbase.h
+++ b/LiteEditor/editorsettingslocalbase.h
@@ -1,30 +1,6 @@
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-//
-// copyright : (C) 2013 by Eran Ifrah
-// file name : editorsettingslocalbase.h
-//
-// -------------------------------------------------------------------------
-// A
-// _____ _ _ _ _
-// / __ \ | | | | (_) |
-// | / \/ ___ __| | ___| | _| |_ ___
-// | | / _ \ / _ |/ _ \ | | | __/ _ )
-// | \__/\ (_) | (_| | __/ |___| | || __/
-// \____/\___/ \__,_|\___\_____/_|\__\___|
-//
-// F i l e
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: editorsettingslocalbase.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -35,6 +11,8 @@
#include <wx/xrc/xmlres.h>
#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/treebook.h>
@@ -87,8 +65,9 @@ protected:
wxCheckBox* m_fileEncodingEnable;
wxStaticText* m_staticTextfileEncoding;
wxChoice* m_fileEncoding;
- wxButton* m_button1;
- wxButton* m_button2;
+ wxStdDialogButtonSizer* m_stdBtnSizer17;
+ wxButton* m_button19;
+ wxButton* m_button21;
protected:
virtual void indentsUsesTabsUpdateUI(wxUpdateUIEvent& event) { event.Skip(); }
@@ -105,7 +84,6 @@ 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 b77704b..63d7857 100644
--- a/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp
+++ b/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp
@@ -293,6 +293,6 @@ void wxC2ED4InitBitmapResources()
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$._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$._editorsettingslocalbase_formbuilder_bitmaps.xrc"));
+ 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"));
}
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
index 8a38258..3823fc9 100644
--- a/LiteEditor/frame.cpp
+++ b/LiteEditor/frame.cpp
@@ -3691,7 +3691,7 @@ void clMainFrame::OnDetachWorkspaceViewTab(wxCommandEvent& e)
size_t sel = GetWorkspacePane()->GetNotebook()->GetSelection();
wxWindow *page = GetWorkspacePane()->GetNotebook()->GetCurrentPage();
wxString text = GetWorkspacePane()->GetNotebook()->GetPageText(sel);
- wxBitmap bmp;
+ wxBitmap bmp = GetWorkspacePane()->GetNotebook()->GetPageBitmap(sel); // We might have a bitmap on the tab, make sure we restore it
#if !CL_USE_NATIVEBOOK
DockablePane *pane = new DockablePane(this, GetWorkspacePane()->GetNotebook(), text, bmp, wxSize(200, 200));
diff --git a/formbuilder/editorsettingslocalbase.wxcp b/formbuilder/editorsettingslocalbase.wxcp
index caf07aa..d48189c 100644
--- a/formbuilder/editorsettingslocalbase.wxcp
+++ b/formbuilder/editorsettingslocalbase.wxcp
@@ -1,12 +1,14 @@
{
"metadata": {
"m_generatedFilesDir": "../LiteEditor/",
- "m_objCounter": 15,
+ "m_objCounter": 21,
"m_includeFiles": [],
"m_bitmapFunction": "wxC2ED4InitBitmapResources",
"m_bitmapsFile": "editorsettingslocalbase_formbuilder_bitmaps.cpp",
"m_GenerateCodeTypes": 5,
"m_outputFileName": "editorsettingslocalbase",
+ "m_firstWindowId": 1000,
+ "m_useEnum": false,
"m_templateClasses": []
},
"windows": [{
@@ -46,6 +48,18 @@
"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": ""
@@ -55,6 +69,10 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Title:",
"m_value": "Local Preferences"
}, {
@@ -78,6 +96,26 @@
"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": [{
@@ -93,6 +131,10 @@
"m_label": "Name:",
"m_value": "mainSizer"
}, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
"type": "choice",
"m_label": "Orientation:",
"m_selection": 0,
@@ -140,6 +182,18 @@
"m_label": "Font:",
"m_value": "wxSYS_DEFAULT_GUI_FONT,normal,bold,normal"
}, {
+ "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": ""
@@ -148,6 +202,10 @@
"m_label": "Include File:",
"m_value": ""
}, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
"type": "multi-string",
"m_label": "Label:",
"m_value": "Untick one or more checkboxes to set any local preferences, "
@@ -199,6 +257,18 @@
"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": ""
@@ -206,6 +276,10 @@
"type": "string",
"m_label": "Include File:",
"m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
}],
"m_events": [],
"m_children": [{
@@ -249,6 +323,18 @@
"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": ""
@@ -258,10 +344,14 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Label:",
"m_value": "Indentation"
}, {
- "type": "filePicker",
+ "type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../icons/indent.png"
}, {
@@ -270,6 +360,10 @@
"m_value": true
}, {
"type": "bool",
+ "m_label": "Null Page",
+ "m_value": false
+ }, {
+ "type": "bool",
"m_label": "Expand Node",
"m_value": true
}],
@@ -287,6 +381,10 @@
"m_label": "Name:",
"m_value": "boxSizer3"
}, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
"type": "choice",
"m_label": "Orientation:",
"m_selection": 0,
@@ -307,6 +405,10 @@
"m_value": "fgSizer31"
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "# Columns:",
"m_value": "2"
}, {
@@ -372,6 +474,18 @@
"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": ""
@@ -381,6 +495,10 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Label:",
"m_value": "Use global setting"
}, {
@@ -437,6 +555,18 @@
"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": ""
@@ -446,6 +576,10 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Label:",
"m_value": "Use tabs in indentation"
}, {
@@ -496,6 +630,18 @@
"m_label": "Font:",
"m_value": ""
}, {
+ "type": "bool",
+ "m_label": "Hidden",
... 1321 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-10 22:54:28
|
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 dc02d280645d63f4bc52b84aad2cf8c547dbad4c (commit)
from bc5687e8d33054008f9bd28f070ded6ecf80ad2b (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/dc02d280645d63f4bc52b84aad2cf8c547dbad4c
commit dc02d280645d63f4bc52b84aad2cf8c547dbad4c
Author: Eran <era...@gm...>
Date: Sat Jan 11 00:54:12 2014 +0200
CMakePlugin / wxCrafter: use icon for the tabs
diff --git a/CMakePlugin/CMakePlugin.cpp b/CMakePlugin/CMakePlugin.cpp
index 81d509b..e3bee9b 100644
--- a/CMakePlugin/CMakePlugin.cpp
+++ b/CMakePlugin/CMakePlugin.cpp
@@ -193,11 +193,14 @@ CMakePlugin::CMakePlugin(IManager* manager)
m_cmake.reset(new CMake(m_configuration->GetProgramPath()));
Notebook* book = m_mgr->GetWorkspacePaneNotebook();
+ cmakeImages images;
+ const wxBitmap &bmp = images.Bitmap("cmake_16");
if (IsPaneDetached()) {
- DockablePane* cp = new DockablePane(book->GetParent()->GetParent(), book, HELP_TAB_NAME, wxNullBitmap, wxSize(200, 200));
+ DockablePane* cp = new DockablePane(book->GetParent()->GetParent(), book, HELP_TAB_NAME, bmp, wxSize(200, 200));
cp->SetChildNoReparent(new CMakeHelpTab(cp, this));
+
} else {
- book->AddPage(new CMakeHelpTab(book, this), HELP_TAB_NAME, false);
+ book->AddPage(new CMakeHelpTab(book, this), HELP_TAB_NAME, false, bmp);
}
// Bind events
diff --git a/CMakePlugin/CMakePlugin.wxcp b/CMakePlugin/CMakePlugin.wxcp
index bd40109..1813074 100644
--- a/CMakePlugin/CMakePlugin.wxcp
+++ b/CMakePlugin/CMakePlugin.wxcp
@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
- "m_objCounter": 225,
+ "m_objCounter": 227,
"m_includeFiles": [],
"m_bitmapFunction": "wxCrafterR3nJ3cInitBitmapResources",
"m_bitmapsFile": "CMakePluginUi_bitmaps.cpp",
@@ -3050,5 +3050,59 @@
"m_children": []
}]
}]
+ }, {
+ "m_type": 4481,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": [],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "cmakeImages"
+ }, {
+ "type": "string",
+ "m_label": "File:",
+ "m_value": ""
+ }, {
+ "type": "virtualFolderPicker",
+ "m_label": "Virtual Folder:",
+ "m_path": "CMakePlugin:wxcrafter"
+ }, {
+ "type": "string",
+ "m_label": "Class Decorator",
+ "m_value": ""
+ }, {
+ "type": "integer",
+ "m_label": "Bitmap Size:",
+ "m_value": 16
+ }, {
+ "type": "bool",
+ "m_label": "Bitmap Mask",
+ "m_value": true
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4482,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": [],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "cmake_16"
+ }, {
+ "type": "filePicker",
+ "m_label": "Bitmap File:",
+ "m_path": "cmake-16.png"
+ }],
+ "m_events": [],
+ "m_children": []
+ }]
}]
}
\ No newline at end of file
diff --git a/CMakePlugin/CMakePluginUi.cpp b/CMakePlugin/CMakePluginUi.cpp
index d13f9bd..d11f7c0 100644
--- a/CMakePlugin/CMakePluginUi.cpp
+++ b/CMakePlugin/CMakePluginUi.cpp
@@ -343,3 +343,28 @@ CMakeProjectSettingsPanelBase::~CMakeProjectSettingsPanelBase()
m_textCtrlArguments->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeProjectSettingsPanelBase::OnCheck2), NULL, this);
}
+
+cmakeImages::cmakeImages()
+ : wxImageList(16, 16, true)
+{
+ if ( !bBitmapLoaded ) {
+ // We need to initialise the default bitmap handler
+ wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler);
+ wxCrafterR3nJ3cInitBitmapResources();
+ bBitmapLoaded = true;
+ }
+
+ {
+ wxBitmap bmp;
+ wxIcon icn;
+ bmp = wxXmlResource::Get()->LoadBitmap(wxT("cmake_16"));
+ icn.CopyFromBitmap( bmp );
+ this->Add( icn );
+ m_bitmaps.insert( std::make_pair(wxT("cmake_16"), bmp ) );
+ }
+
+}
+
+cmakeImages::~cmakeImages()
+{
+}
diff --git a/CMakePlugin/CMakePluginUi.h b/CMakePlugin/CMakePluginUi.h
index bf942ac..b29c811 100644
--- a/CMakePlugin/CMakePluginUi.h
+++ b/CMakePlugin/CMakePluginUi.h
@@ -28,6 +28,10 @@
#include <wx/checkbox.h>
#include <wx/combobox.h>
#include <wx/textctrl.h>
+#include <wx/imaglist.h>
+#include <wx/bitmap.h>
+#include <map>
+#include <wx/icon.h>
class CMakeSettingsDialogBase : public wxDialog
{
@@ -106,4 +110,24 @@ public:
virtual ~CMakeProjectSettingsPanelBase();
};
+
+class cmakeImages : public wxImageList
+{
+protected:
+ // Maintain a map of all bitmaps representd by their name
+ std::map<wxString, wxBitmap> m_bitmaps;
+
+
+protected:
+
+public:
+ cmakeImages();
+ const wxBitmap& Bitmap(const wxString &name) const {
+ if ( !m_bitmaps.count(name) )
+ return wxNullBitmap;
+ return m_bitmaps.find(name)->second;
+ }
+ virtual ~cmakeImages();
+};
+
#endif
diff --git a/CMakePlugin/CMakePluginUi_bitmaps.cpp b/CMakePlugin/CMakePluginUi_bitmaps.cpp
index 0302b40..3e8c72f 100644
--- a/CMakePlugin/CMakePluginUi_bitmaps.cpp
+++ b/CMakePlugin/CMakePluginUi_bitmaps.cpp
@@ -21,14 +21,63 @@
wxMemoryFSHandler::AddFile(name, data, size)
#endif
-static size_t xml_res_size_0 = 108;
+static size_t xml_res_size_0 = 843;
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,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,222,1,10,22,14,18,195,172,157,47,0,0,2,216,73,68,65,84,56,203,125,
+144,75,108,84,101,24,134,159,255,220,254,115,254,115,198,206,12,51,211,
+153,78,47,12,157,38,69,211,146,64,48,81,23,85,49,66,21,52,40,27,48,129,
+138,1,12,154,24,22,44,88,145,176,195,181,59,23,134,141,75,55,174,140,18,
+13,11,119,82,140,81,161,244,66,112,72,40,244,54,215,83,206,233,204,239,
+98,90,23,84,248,86,223,226,251,158,231,205,107,242,156,57,248,234,251,111,
+103,131,212,27,149,165,202,12,16,121,192,198,83,55,198,211,79,59,118,244,
+110,173,78,161,252,250,123,227,217,242,213,227,176,31,32,252,31,201,54,
+192,242,242,34,0,231,63,251,242,181,142,59,240,110,106,221,72,231,18,206,
+59,128,2,240,132,120,54,32,157,254,207,238,233,206,224,33,219,218,181,211,
+213,30,10,227,248,4,236,5,8,181,126,54,96,101,165,107,159,154,186,178,183,
+211,73,159,168,213,122,88,119,2,61,100,203,226,176,101,30,6,124,0,101,24,
+219,1,91,246,209,81,95,69,81,254,112,28,23,250,91,205,142,142,172,128,188,
+84,12,73,249,241,91,82,190,4,208,234,116,182,3,182,236,99,99,23,94,52,205,
+190,211,139,139,14,237,88,211,18,190,136,165,210,227,74,229,6,165,252,80,
+24,134,2,240,55,83,24,221,230,243,0,76,78,78,168,56,206,30,107,52,138,185,
+122,125,93,71,145,22,117,146,196,118,130,33,229,177,91,169,51,7,148,26,
+1,104,110,166,48,186,205,63,4,32,138,198,202,182,189,243,92,165,98,16,69,
+176,186,178,74,216,169,35,19,190,48,29,169,95,238,233,73,13,120,222,169,
+146,235,74,128,192,52,49,210,233,174,253,228,201,115,210,117,251,78,45,
+45,229,146,97,24,233,106,245,177,200,229,254,102,226,128,36,91,72,98,58,
+14,253,65,192,43,169,212,217,130,227,12,3,52,218,109,204,48,108,0,160,245,
+224,72,38,243,230,215,243,243,190,29,71,143,25,222,53,35,78,124,148,99,
+160,232,17,204,206,147,168,86,133,229,56,186,207,247,157,153,48,100,36,
+8,126,248,179,209,208,6,192,197,139,95,89,197,226,248,249,202,63,105,213,
+108,220,215,131,165,95,197,145,67,30,41,207,226,209,90,131,13,199,198,85,
+10,219,113,232,245,125,14,230,243,103,110,86,171,195,0,38,192,194,194,98,
+169,144,63,122,237,206,237,71,70,241,232,143,212,46,223,16,127,245,222,
+98,245,193,10,205,133,13,70,151,90,12,196,33,134,101,10,211,178,244,80,
+16,88,179,205,166,55,93,173,126,111,106,173,185,254,211,253,171,119,239,
+138,253,253,159,92,215,149,47,110,136,57,57,203,3,235,33,183,51,51,204,
+246,205,177,28,173,97,222,107,83,220,240,232,113,37,129,43,133,180,237,
+61,223,85,42,223,138,212,11,133,210,232,216,167,115,242,244,180,184,53,
+249,139,94,107,175,9,34,224,9,16,1,45,176,234,6,201,102,130,221,119,50,
+28,249,61,195,7,181,172,46,41,95,124,62,253,219,53,81,222,119,236,155,236,
+165,250,212,205,145,159,121,18,71,208,222,124,140,128,245,46,128,214,230,
+30,131,107,72,242,181,148,158,152,75,138,242,31,78,252,47,183,191,5,89,
+119,238,104,246,0,0,0,0,73,69,78,68,174,66,96,130};
+
+static size_t xml_res_size_1 = 210;
+static unsigned char xml_res_file_1[] = {
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};
+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,99,109,97,
+107,101,95,49,54,34,62,67,77,97,107,101,80,108,117,103,105,110,85,105,95,
+98,105,116,109,97,112,115,46,99,112,112,36,99,109,97,107,101,45,49,54,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 wxCrafterR3nJ3cInitBitmapResources()
{
@@ -43,6 +92,7 @@ void wxCrafterR3nJ3cInitBitmapResources()
else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
}
- XRC_ADD_FILE(wxT("XRC_resource/CMakePluginUi_bitmaps.cpp$C__src_codelitegit_CMakePlugin_CMakePluginUi_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
+ XRC_ADD_FILE(wxT("XRC_resource/CMakePluginUi_bitmaps.cpp$cmake-16.png"), xml_res_file_0, xml_res_size_0, wxT("image/png"));
+ XRC_ADD_FILE(wxT("XRC_resource/CMakePluginUi_bitmaps.cpp$C__src_codelitegit_CMakePlugin_CMakePluginUi_bitmaps.xrc"), xml_res_file_1, xml_res_size_1, wxT("text/xml"));
wxXmlResource::Get()->Load(wxT("memory:XRC_resource/CMakePluginUi_bitmaps.cpp$C__src_codelitegit_CMakePlugin_CMakePluginUi_bitmaps.xrc"));
}
diff --git a/CMakePlugin/cmake-16.png b/CMakePlugin/cmake-16.png
new file mode 100644
index 0000000..caa0c32
Binary files /dev/null and b/CMakePlugin/cmake-16.png differ
diff --git a/LiteEditor/mainbook.cpp b/LiteEditor/mainbook.cpp
index a4c28d4..46a47b6 100644
--- a/LiteEditor/mainbook.cpp
+++ b/LiteEditor/mainbook.cpp
@@ -598,7 +598,7 @@ bool MainBook::AddPage(wxWindow *win, const wxString &text, const wxBitmap &bmp,
// the selection programtically
int next_pos = m_book->GetPageCount();
#endif
- m_book->AddPage(win, text, closeLastTab ? true : selected);
+ m_book->AddPage(win, text, closeLastTab ? true : selected, bmp);
#if CL_USE_NATIVEBOOK
// If the newly added page is expected to be the selected one
@@ -614,7 +614,7 @@ bool MainBook::AddPage(wxWindow *win, const wxString &text, const wxBitmap &bmp,
}
#endif
} else {
- m_book->InsertPage(insert_at_index, win, text, closeLastTab ? true : selected);
+ m_book->InsertPage(insert_at_index, win, text, closeLastTab ? true : selected, bmp);
}
if( closeLastTab ) {
diff --git a/LiteEditor/workspace_pane.cpp b/LiteEditor/workspace_pane.cpp
index cd27b5c..588e74b 100644
--- a/LiteEditor/workspace_pane.cpp
+++ b/LiteEditor/workspace_pane.cpp
@@ -192,11 +192,16 @@ void WorkspacePane::UpdateTabs()
DoShowTab(flags & View_Show_Tabs_Tab, _("Tabs"));
DoShowTab(flags & View_Show_Tabgroups_Tab, _("Tabgroups"));
}
+typedef struct {
+ wxString text;
+ wxWindow* win;
+ wxBitmap bmp;
+} tagTabInfo;
#include "file_logger.h"
void WorkspacePane::ApplySavedTabOrder() const
{
- typedef std::pair<wxString, wxWindow*> spTab;
+
wxArrayString tabs;
int index = -1;
@@ -206,7 +211,7 @@ void WorkspacePane::ApplySavedTabOrder() const
// There are (currently) 4 'standard' panes and a variable number of plugin ones
// NB Since we're only dealing with panes currently in the notebook, this shouldn't
// be broken by floating panes or non-loaded plugins
- std::vector<spTab> vTempstore;
+ std::vector<tagTabInfo> vTempstore;
for (size_t t=0; t < tabs.GetCount(); ++t) {
wxString title = tabs.Item(t);
if (title.empty()) {
@@ -214,7 +219,11 @@ void WorkspacePane::ApplySavedTabOrder() const
}
for (size_t n=0; n < m_book->GetPageCount(); ++n) {
if (title == m_book->GetPageText(n)) {
- spTab Tab(title, m_book->GetPage(n));
+ tagTabInfo Tab;
+ Tab.text = title;
+ Tab.win = m_book->GetPage(n);
+ Tab.bmp = m_book->GetPageBitmap(n);
+
vTempstore.push_back(Tab);
m_book->RemovePage(n);
break;
@@ -226,7 +235,7 @@ void WorkspacePane::ApplySavedTabOrder() const
// All the matched tabs are now stored in the vector. Any left in m_book are presumably new additions
// Now prepend the ordered tabs, so that any additions will effectively be appended
for (size_t n=0; n < vTempstore.size(); ++n) {
- m_book->InsertPage(n, vTempstore.at(n).second, vTempstore.at(n).first);
+ m_book->InsertPage(n, vTempstore.at(n).win, vTempstore.at(n).text, false, vTempstore.at(n).bmp);
}
//wxPrintf("After load");for (size_t n=0; n < m_book->GetPageCount(); ++n) CL_DEBUG1(wxString::Format("Tab %i: %zs",(int)n,m_book->GetPageText(n)));
diff --git a/Plugin/cl_aui_notebook_art.cpp b/Plugin/cl_aui_notebook_art.cpp
index 50a5a22..a5860d3 100644
--- a/Plugin/cl_aui_notebook_art.cpp
+++ b/Plugin/cl_aui_notebook_art.cpp
@@ -143,7 +143,7 @@ void clAuiGlossyTabArt::DrawTab(wxDC& dc,
#endif
/// the tab start position (x)
- curx = rr.x + 8;
+ curx = rr.x + 7;
// Set clipping region
int clip_width = rr.width;
@@ -153,7 +153,7 @@ void clAuiGlossyTabArt::DrawTab(wxDC& dc,
// since the above code above doesn't play well with WXDFB or WXCOCOA,
// we'll just use a rectangle for the clipping region for now --
gdc.SetClippingRegion(rr.x, rr.y, clip_width, rr.height);
- path.AddRoundedRectangle(rr.x, rr.y, rr.width-1, rr.height, 6.0);
+ path.AddRoundedRectangle(rr.x, rr.y, rr.width-1, rr.height, 3.0);
gdc.SetBrush( bgColour );
gdc.GetGraphicsContext()->FillPath( path );
@@ -164,12 +164,8 @@ void clAuiGlossyTabArt::DrawTab(wxDC& dc,
gdc.SetPen(originalPenColour);
gdc.DrawLine(in_rect.GetBottomLeft(), in_rect.GetBottomRight());
- } else {
- // gdc.SetPen(bgColour);
- // gdc.DrawLine(in_rect.GetBottomLeft(), in_rect.GetBottomRight());
}
- /// Draw the text
wxString caption = page.caption;
if ( caption.IsEmpty() ) {
caption = "Tp";
@@ -184,23 +180,24 @@ void clAuiGlossyTabArt::DrawTab(wxDC& dc,
if ( caption == "Tp" )
caption.Clear();
- gdc.SetTextForeground( textColour );
- gdc.GetGraphicsContext()->DrawText( page.caption, rr.x + 8, (rr.y + (rr.height - ext.y)/2)-TAB_Y_OFFSET+TEXT_Y_SPACER);
-
- // advance the X offset
- curx += ext.x;
-
/// Draw the bitmap
if ( page.bitmap.IsOk() ) {
- curx += 4;
int bmpy = (rr.y + (rr.height - page.bitmap.GetHeight())/2)-TAB_Y_OFFSET;
gdc.GetGraphicsContext()->DrawBitmap( page.bitmap, curx, bmpy, page.bitmap.GetWidth(), page.bitmap.GetHeight());
- curx += 8;
+ curx += page.bitmap.GetWidth();
+ curx += 3;
}
+ /// Draw the text
+ gdc.SetTextForeground( textColour );
+ gdc.GetGraphicsContext()->DrawText( page.caption, curx, (rr.y + (rr.height - ext.y)/2)-TAB_Y_OFFSET+TEXT_Y_SPACER);
+
+ // advance the X offset
+ curx += ext.x;
+ curx += 3;
+
/// Draw the X button on the tab
if ( close_button_state != wxAUI_BUTTON_STATE_HIDDEN ) {
- curx += 4;
int btny = (rr.y + (rr.height/2))-TAB_Y_OFFSET+TEXT_Y_SPACER;
if ( close_button_state == wxAUI_BUTTON_STATE_PRESSED ) {
curx += 1;
@@ -264,19 +261,22 @@ wxSize clAuiGlossyTabArt::GetTabSize(wxDC& dc,
// add padding around the text
wxCoord tab_width = measured_textx;
wxCoord tab_height = measured_texty;
-
+
+ if ( tab_height < 16 )
+ tab_height = 16;
+
// if the close button is showing, add space for it
if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
tab_width += X_DIAMETER + 3;
// if there's a bitmap, add space for it
+
+ // NOTE: we only support 16 pixels bitmap (or smaller)
+ // so there is no need to adjust the tab height!
+ tab_height += TAB_HEIGHT_SPACER;
if (bitmap.IsOk()) {
tab_width += bitmap.GetWidth();
tab_width += 3; // right side bitmap padding
- tab_height = wxMax(tab_height, bitmap.GetHeight());
- tab_height += TAB_HEIGHT_SPACER;
- } else {
- tab_height += TAB_HEIGHT_SPACER;
}
// add padding
diff --git a/TODO.TXT b/TODO.TXT
index 6e8f147..d80b88d 100644
--- a/TODO.TXT
+++ b/TODO.TXT
@@ -1,3 +1,3 @@
- wxCrafter: make sure that after code generation an event is sent to git/svn views are updated accordingly
-- CMakePlugin / wxCrafter: use icon for the tabs?
- 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
-----------------------------------------------------------------------
Summary of changes:
CMakePlugin/CMakePlugin.cpp | 7 +++-
CMakePlugin/CMakePlugin.wxcp | 56 ++++++++++++++++++++++++++++++++-
CMakePlugin/CMakePluginUi.cpp | 25 ++++++++++++++
CMakePlugin/CMakePluginUi.h | 24 ++++++++++++++
CMakePlugin/CMakePluginUi_bitmaps.cpp | 56 +++++++++++++++++++++++++++++++--
CMakePlugin/cmake-16.png | Bin 0 -> 843 bytes
LiteEditor/mainbook.cpp | 4 +-
LiteEditor/workspace_pane.cpp | 17 +++++++--
Plugin/cl_aui_notebook_art.cpp | 40 ++++++++++++------------
TODO.TXT | 2 +-
10 files changed, 198 insertions(+), 33 deletions(-)
create mode 100644 CMakePlugin/cmake-16.png
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-10 21:24:27
|
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 bc5687e8d33054008f9bd28f070ded6ecf80ad2b (commit)
from 4125137b1e079ee8b42ed62a882a71d87c27cf41 (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/bc5687e8d33054008f9bd28f070ded6ecf80ad2b
commit bc5687e8d33054008f9bd28f070ded6ecf80ad2b
Author: Eran <era...@gm...>
Date: Fri Jan 10 23:24:12 2014 +0200
Git: fixed crash when sorting an invalid column in the "browse history" dialog
diff --git a/git/gitCommitListDlg.cpp b/git/gitCommitListDlg.cpp
index 393f11c..7a94e64 100644
--- a/git/gitCommitListDlg.cpp
+++ b/git/gitCommitListDlg.cpp
@@ -144,6 +144,10 @@ void GitCommitListDlg::OnProcessOutput(wxCommandEvent &event)
void GitCommitListDlg::OnSelectionChanged(wxDataViewEvent& event)
{
wxVariant v;
+ if ( !event.GetItem().IsOk() ) {
+ return;
+ }
+
m_dvListCtrlCommitList->GetValue(v, m_dvListCtrlCommitList->ItemToRow(event.GetItem()), 0);
wxString commitID = v.GetString();
wxString command = wxString::Format(wxT("%s --no-pager show %s"), m_gitPath.c_str(), commitID.c_str());
-----------------------------------------------------------------------
Summary of changes:
git/gitCommitListDlg.cpp | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-10 21:16:00
|
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 4125137b1e079ee8b42ed62a882a71d87c27cf41 (commit)
from 92c1969433f7d303c83bbe2dc74ea43b9f453e7b (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/4125137b1e079ee8b42ed62a882a71d87c27cf41
commit 4125137b1e079ee8b42ed62a882a71d87c27cf41
Author: Eran <era...@gm...>
Date: Fri Jan 10 23:15:46 2014 +0200
Remove prepended dot from git log status message
diff --git a/git/git.cpp b/git/git.cpp
index 117f968..ecf93f7 100644
--- a/git/git.cpp
+++ b/git/git.cpp
@@ -1534,7 +1534,7 @@ void GitPlugin::OnProcessOutput(wxCommandEvent &event)
number.Trim(false);
unsigned long current;
if(number.ToULong(¤t)) {
- message.Prepend(m_progressMessage+wxT(". Status: "));
+ message.Prepend(m_progressMessage + " Status: ");
m_console->UpdateProgress(current, message);
}
}
-----------------------------------------------------------------------
Summary of changes:
git/git.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-10 21:13:36
|
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 92c1969433f7d303c83bbe2dc74ea43b9f453e7b (commit)
from e8e45f67329b8a726784d82366452fa852eeacf0 (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/92c1969433f7d303c83bbe2dc74ea43b9f453e7b
commit 92c1969433f7d303c83bbe2dc74ea43b9f453e7b
Author: Eran <era...@gm...>
Date: Fri Jan 10 23:13:22 2014 +0200
Don't use newline separator in git messages
diff --git a/TODO.TXT b/TODO.TXT
index 02c61b0..6e8f147 100644
--- a/TODO.TXT
+++ b/TODO.TXT
@@ -1,2 +1,3 @@
- wxCrafter: make sure that after code generation an event is sent to git/svn views are updated accordingly
- CMakePlugin / wxCrafter: use icon for the tabs?
+- Add events for all debugger UI actions so plugins code implement it instead of the default debugger
diff --git a/git/git.cpp b/git/git.cpp
index 985ff59..117f968 100644
--- a/git/git.cpp
+++ b/git/git.cpp
@@ -1534,7 +1534,7 @@ void GitPlugin::OnProcessOutput(wxCommandEvent &event)
number.Trim(false);
unsigned long current;
if(number.ToULong(¤t)) {
- message.Prepend(m_progressMessage+wxT("\nStatus: "));
+ message.Prepend(m_progressMessage+wxT(". Status: "));
m_console->UpdateProgress(current, message);
}
}
-----------------------------------------------------------------------
Summary of changes:
TODO.TXT | 1 +
git/git.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-10 19:52:03
|
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 e8e45f67329b8a726784d82366452fa852eeacf0 (commit)
via 4a17b97c05ec3cd44e74937e7daadb70e828dc8d (commit)
from ec47bf4d3be9ea901c874f3ffd76b750c8afd6dc (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/e8e45f67329b8a726784d82366452fa852eeacf0
commit e8e45f67329b8a726784d82366452fa852eeacf0
Author: Eran <era...@gm...>
Date: Fri Jan 10 21:51:44 2014 +0200
Git: remove the progress dialog and use an inline progress bar
diff --git a/TODO.TXT b/TODO.TXT
index 203d93a..02c61b0 100644
--- a/TODO.TXT
+++ b/TODO.TXT
@@ -1,4 +1,2 @@
- wxCrafter: make sure that after code generation an event is sent to git/svn views are updated accordingly
-- Git: remove the progress dialog and use an inline progress bar
- CMakePlugin / wxCrafter: use icon for the tabs?
-- Change the default "50" entries warning message
diff --git a/git/GitConsole.cpp b/git/GitConsole.cpp
index 7e3a171..48324d3 100644
--- a/git/GitConsole.cpp
+++ b/git/GitConsole.cpp
@@ -172,18 +172,6 @@ GitConsole::GitConsole(wxWindow* parent, GitPlugin* git)
m_auibar->AddTool(XRCID("git_commit_diff"), _("Diffs"), m_images.Bitmap("gitDiffs"), _("Show current diffs"));
m_auibar->AddTool(XRCID("git_browse_commit_list"), _("Log"), m_images.Bitmap("gitCommitedFiles"), _("Browse commit history"));
-#if 0
- //m_auibar->AddTool(XRCID("git_bisect_start"), _("Bisect"), XPM_BITMAP(menu_start_bisect), _("Start bisect"));
- //m_auibar->EnableTool(XRCID("git_bisect_start"),false);
- //m_auibar->AddTool(XRCID("git_bisect_good"), _("Good commit"), wxArtProvider::GetIcon(wxART_TICK_MARK), _("Mark commit as good"));
- //m_auibar->EnableTool(XRCID("git_bisect_good"),false);
- //m_auibar->AddTool(XRCID("git_bisect_bad"), _("Bad commit"), wxArtProvider::GetIcon(wxART_ERROR), _("Mark commit as bad"));
- //m_auibar->EnableTool(XRCID("git_bisect_bad"),false);
- //m_auibar->AddTool(XRCID("git_bisect_reset"), _("End bisect"), wxArtProvider::GetIcon(wxART_QUIT), _("Quit bisect"));
- //m_auibar->EnableTool(XRCID("git_bisect_reset"),false);
- //m_auibar->AddSeparator();
-#endif
-
wxAuiToolBarItemArray prepend_items;
wxAuiToolBarItemArray append_items;
PopulateAuiToolbarOverflow(append_items, m_images);
@@ -583,3 +571,49 @@ void GitConsole::OnDropDownMenuEvent(wxCommandEvent& event)
conf.WriteItem(&data);
conf.Save();
}
+
+void GitConsole::HideProgress()
+{
+ if ( m_panelProgress->IsShown() ) {
+ m_gauge->SetValue(0);
+ m_staticTextGauge->SetLabel("");
+ m_panelProgress->Hide();
+ m_splitterPageTreeView->GetSizer()->Layout();
+ }
+}
+
+void GitConsole::ShowProgress(const wxString& message, bool pulse)
+{
+ if ( !m_panelProgress->IsShown() ) {
+ m_panelProgress->Show();
+ m_splitterPageTreeView->GetSizer()->Layout();
+ }
+
+ wxString trimmedMessage = message;
+ m_staticTextGauge->SetLabel( trimmedMessage.Trim().Trim(false) );
+ if ( pulse ) {
+ m_gauge->Pulse();
+ m_gauge->Update();
+
+ } else {
+ m_gauge->SetValue(0);
+ m_gauge->Update();
+ }
+}
+
+void GitConsole::UpdateProgress(unsigned long current, const wxString& message)
+{
+ wxString trimmedMessage = message;
+ m_gauge->SetValue(current);
+ m_staticTextGauge->SetLabel( trimmedMessage.Trim().Trim(false) );
+}
+
+bool GitConsole::IsProgressShown() const
+{
+ return m_panelProgress->IsShown();
+}
+
+void GitConsole::PulseProgress()
+{
+ m_gauge->Pulse();
+}
diff --git a/git/GitConsole.h b/git/GitConsole.h
index 0d890cf..f5d10d2 100644
--- a/git/GitConsole.h
+++ b/git/GitConsole.h
@@ -28,6 +28,16 @@ public:
void AddRawText(const wxString &text);
bool IsVerbose() const;
void UpdateTreeView(const wxString &output);
+
+ //
+ // Progress bar API
+ //
+ void ShowProgress(const wxString& message, bool pulse = false);
+ void HideProgress();
+ void UpdateProgress(unsigned long current, const wxString &message);
+ bool IsProgressShown() const;
+ void PulseProgress();
+
protected:
virtual void OnApplyPatch(wxCommandEvent& event);
virtual void OnFileActivated(wxDataViewEvent& event);
diff --git a/git/git.cpp b/git/git.cpp
index 2638eb0..985ff59 100644
--- a/git/git.cpp
+++ b/git/git.cpp
@@ -90,7 +90,6 @@ GitPlugin::GitPlugin(IManager *manager)
, m_pathGITExecutable(wxT("git"))
, m_pathGITKExecutable(wxT("gitk"))
#endif
- , m_progressDialog(NULL)
, m_bActionRequiresTreUpdate(false)
, m_process(NULL)
, m_eventHandler(NULL)
@@ -119,7 +118,6 @@ GitPlugin::GitPlugin(IManager *manager)
/*******************************************************************************/
GitPlugin::~GitPlugin()
{
- wxDELETE(m_progressDialog);
}
/*******************************************************************************/
@@ -1527,7 +1525,7 @@ void GitPlugin::OnProcessOutput(wxCommandEvent &event)
}
}
- if(m_progressDialog && m_progressDialog->IsShown()) {
+ if( m_console->IsProgressShown() ) {
wxString message = output.Left(output.Find(':'));
int percent = output.Find('%',true);
if(percent != wxNOT_FOUND) {
@@ -1537,8 +1535,7 @@ void GitPlugin::OnProcessOutput(wxCommandEvent &event)
unsigned long current;
if(number.ToULong(¤t)) {
message.Prepend(m_progressMessage+wxT("\nStatus: "));
- m_progressDialog->Update(current, message);
- m_progressDialog->Layout();
+ m_console->UpdateProgress(current, message);
}
}
}
@@ -1704,42 +1701,28 @@ void GitPlugin::CreateFilesTreeIDsMap(std::map<wxString, wxTreeItemId>& IDs, boo
/*******************************************************************************/
void GitPlugin::OnProgressTimer(wxTimerEvent& Event)
{
- if(m_progressDialog && m_progressDialog->IsShown())
- m_progressDialog->Pulse(wxT(""));
+ if( m_console->IsProgressShown() )
+ m_console->PulseProgress();
}
/*******************************************************************************/
void GitPlugin::ShowProgress(const wxString& message, bool pulse)
{
- // The dialog was previously created in OnInitDone(), but this caused a brief,
- // or not-so-brief, 'show' before a Hide() took effect (and one lucky user
- // got to see the dialog permanently...). So now it's created on demand
- if(!m_progressDialog) {
- m_progressDialog = new wxProgressDialog(wxT("Git progress"),
- wxT("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\n\n"),
- 101, m_topWindow);
- m_progressDialog->SetIcon(wxICON(icon_git));
- }
-
+ m_console->ShowProgress(message, pulse);
+
if(pulse) {
- m_progressDialog->Pulse(message);
- m_progressDialog->Layout();
m_progressTimer.Start(50);
+
} else {
m_progressMessage = message;
- m_progressDialog->Update(0, message);
- m_progressDialog->Layout();
}
- m_progressDialog->Show();
}
/*******************************************************************************/
void GitPlugin::HideProgress()
{
- if(m_progressDialog) {
- m_progressDialog->Hide();
- m_progressTimer.Stop();
- }
+ m_console->HideProgress();
+ m_progressTimer.Stop();
}
void GitPlugin::OnEnableGitRepoExists(wxUpdateUIEvent& e)
diff --git a/git/git.h b/git/git.h
index 30b6163..2d54f2f 100644
--- a/git/git.h
+++ b/git/git.h
@@ -93,7 +93,6 @@ class GitPlugin : public IPlugin
wxString m_currentBranch;
std::queue<gitAction> m_gitActionQueue;
wxTimer m_progressTimer;
- wxProgressDialog* m_progressDialog;
wxString m_progressMessage;
wxString m_commandOutput;
bool m_bActionRequiresTreUpdate;
diff --git a/git/gitui.cpp b/git/gitui.cpp
index f9475a3..64f7f90 100644
--- a/git/gitui.cpp
+++ b/git/gitui.cpp
@@ -36,7 +36,7 @@ GitSettingsDlgBase::GitSettingsDlgBase(wxWindow* parent, wxWindowID id, const wx
wxBoxSizer* boxSizer240 = new wxBoxSizer(wxVERTICAL);
m_panel232->SetSizer(boxSizer240);
- wxFlexGridSizer* fgSizer11 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* fgSizer11 = new wxFlexGridSizer(0, 2, 0, 0);
fgSizer11->SetFlexibleDirection( wxBOTH );
fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer11->AddGrowableCol(1);
@@ -65,7 +65,7 @@ GitSettingsDlgBase::GitSettingsDlgBase(wxWindow* parent, wxWindowID id, const wx
wxBoxSizer* boxSizer242 = new wxBoxSizer(wxVERTICAL);
m_panel234->SetSizer(boxSizer242);
- wxFlexGridSizer* flexGridSizer244 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer244 = new wxFlexGridSizer(0, 2, 0, 0);
flexGridSizer244->SetFlexibleDirection( wxBOTH );
flexGridSizer244->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer244->AddGrowableCol(1);
@@ -725,7 +725,7 @@ gitCloneDlgBaseClass::gitCloneDlgBaseClass(wxWindow* parent, wxWindowID id, cons
wxBoxSizer* boxSizer17 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer17);
- wxFlexGridSizer* flexGridSizer21 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer21 = new wxFlexGridSizer(0, 2, 0, 0);
flexGridSizer21->SetFlexibleDirection( wxBOTH );
flexGridSizer21->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer21->AddGrowableCol(1);
@@ -845,12 +845,12 @@ GitConsoleBase::GitConsoleBase(wxWindow* parent, wxWindowID id, const wxPoint& p
boxSizer36->Add(m_splitter, 1, wxEXPAND, 5);
- m_splitterPage100 = new wxPanel(m_splitter, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
+ m_splitterPageTreeView = new wxPanel(m_splitter, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
wxBoxSizer* boxSizer94 = new wxBoxSizer(wxVERTICAL);
- m_splitterPage100->SetSizer(boxSizer94);
+ m_splitterPageTreeView->SetSizer(boxSizer94);
- m_dvFiles = new wxDataViewCtrl(m_splitterPage100, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxDV_NO_HEADER|wxDV_MULTIPLE|wxBORDER_THEME);
+ m_dvFiles = new wxDataViewCtrl(m_splitterPageTreeView, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxDV_NO_HEADER|wxDV_MULTIPLE|wxBORDER_THEME);
m_dvFilesModel = new DataViewFilesModel;
m_dvFilesModel->SetColCount( 1 );
@@ -859,8 +859,25 @@ GitConsoleBase::GitConsoleBase(wxWindow* parent, wxWindowID id, const wxPoint& p
boxSizer94->Add(m_dvFiles, 1, wxALL|wxEXPAND, 2);
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);
+
+ wxBoxSizer* boxSizer272 = new wxBoxSizer(wxVERTICAL);
+ m_panelProgress->SetSizer(boxSizer272);
+
+ m_staticTextGauge = new wxStaticText(m_panelProgress, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), 0);
+
+ boxSizer272->Add(m_staticTextGauge, 0, wxALL, 2);
+
+ 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);
+
m_splitterPage96 = new wxPanel(m_splitter, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
- m_splitter->SplitVertically(m_splitterPage100, m_splitterPage96, 0);
+ m_splitter->SplitVertically(m_splitterPageTreeView, m_splitterPage96, 0);
wxBoxSizer* boxSizer92 = new wxBoxSizer(wxVERTICAL);
m_splitterPage96->SetSizer(boxSizer92);
@@ -1046,7 +1063,7 @@ GitApplyPatchDlgBase::GitApplyPatchDlgBase(wxWindow* parent, wxWindowID id, cons
wxBoxSizer* boxSizer154 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer154);
- wxFlexGridSizer* flexGridSizer162 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer162 = new wxFlexGridSizer(0, 2, 0, 0);
flexGridSizer162->SetFlexibleDirection( wxBOTH );
flexGridSizer162->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer162->AddGrowableCol(1);
diff --git a/git/gitui.h b/git/gitui.h
index c9c4c4d..4b96e62 100644
--- a/git/gitui.h
+++ b/git/gitui.h
@@ -35,6 +35,7 @@
#include <wx/aui/auibar.h>
#include <wx/toolbar.h>
#include "dataviewfilesmodel.h"
+#include <wx/gauge.h>
class GitSettingsDlgBase : public wxDialog
{
@@ -206,10 +207,13 @@ class GitConsoleBase : public wxPanel
protected:
wxAuiToolBar* m_auibar;
wxSplitterWindow* m_splitter;
- wxPanel* m_splitterPage100;
+ wxPanel* m_splitterPageTreeView;
wxDataViewCtrl* m_dvFiles;
wxObjectDataPtr<DataViewFilesModel> m_dvFilesModel;
+ wxPanel* m_panelProgress;
+ wxStaticText* m_staticTextGauge;
+ wxGauge* m_gauge;
wxPanel* m_splitterPage96;
wxStyledTextCtrl* m_stcLog;
diff --git a/git/gitui.wxcp b/git/gitui.wxcp
index c0bc70c..b9572c9 100644
--- a/git/gitui.wxcp
+++ b/git/gitui.wxcp
@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
- "m_objCounter": 262,
+ "m_objCounter": 272,
"m_includeFiles": [],
"m_bitmapFunction": "wxCrafterpca4kKInitBitmapResources",
"m_bitmapsFile": "gitui_git_bitmaps.cpp",
@@ -8035,7 +8035,7 @@
}, {
"type": "string",
"m_label": "Name:",
- "m_value": "m_splitterPage100"
+ "m_value": "m_splitterPageTreeView"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
@@ -8226,6 +8226,247 @@
"m_events": [],
"m_children": []
}]
+ }, {
+ "m_type": 4408,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": ["wxTAB_TRAVERSAL"],
+ "m_sizerFlags": ["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_panelProgress"
+ }, {
+ "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": true
+ }, {
+ "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": ""
+ }],
+ "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": "boxSizer272"
+ }, {
+ "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": 4405,
+ "proportion": 0,
+ "border": 2,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+ "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_staticTextGauge"
+ }, {
+ "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",
... 168 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-10 17:07:44
|
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 ec47bf4d3be9ea901c874f3ffd76b750c8afd6dc (commit)
from d823e31239b34c81d69a8275e3ba9669668edcf9 (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/ec47bf4d3be9ea901c874f3ffd76b750c8afd6dc
commit ec47bf4d3be9ea901c874f3ffd76b750c8afd6dc
Author: Eran <era...@gm...>
Date: Fri Jan 10 19:07:26 2014 +0200
Git: colorizing tree works over time
Generate the file cppcheck.list under WORKSPACE_PATH/.codelite
diff --git a/TODO.TXT b/TODO.TXT
index 4f305d7..203d93a 100644
--- a/TODO.TXT
+++ b/TODO.TXT
@@ -1,7 +1,4 @@
-- Move the following files to WORKSPACE_PATH/.codelite:
- cppcheck.list
-
- wxCrafter: make sure that after code generation an event is sent to git/svn views are updated accordingly
- Git: remove the progress dialog and use an inline progress bar
-- Git: colorizing tree works over time (when it should not be working at all)
- CMakePlugin / wxCrafter: use icon for the tabs?
+- Change the default "50" entries warning message
diff --git a/cppchecker/cppchecker.cpp b/cppchecker/cppchecker.cpp
index b98d3f6..f3168bd 100644
--- a/cppchecker/cppchecker.cpp
+++ b/cppchecker/cppchecker.cpp
@@ -482,14 +482,12 @@ wxString CppCheckPlugin::DoGetCommand()
wxString CppCheckPlugin::DoGenerateFileList()
{
//create temporary file and save the file there
- wxString wspPath = m_mgr->GetWorkspace()->GetWorkspaceFileName().GetPath(wxPATH_GET_VOLUME|wxPATH_GET_SEPARATOR);
- wxString list_file( wspPath );
- list_file << wxT("cppcheck.list");
+ wxFileName fnFileList( WorkspaceST::Get()->GetPrivateFolder(), "cppcheck.list");
//create temporary file and save the file there
- wxFFile file(list_file, wxT("w+b"));
+ wxFFile file(fnFileList.GetFullPath(), wxT("w+b"));
if (!file.IsOpened()) {
- wxMessageBox(_("Failed to open temporary file ") + list_file, _("Warning"), wxOK|wxCENTER|wxICON_WARNING);
+ wxMessageBox(_("Failed to open temporary file ") + fnFileList.GetFullPath(), _("Warning"), wxOK|wxCENTER|wxICON_WARNING);
return wxEmptyString;
}
@@ -501,8 +499,7 @@ wxString CppCheckPlugin::DoGenerateFileList()
file.Write( content );
file.Flush();
file.Close();
-
- return list_file;
+ return fnFileList.GetFullPath();
}
void CppCheckPlugin::OnCppCheckReadData(wxCommandEvent& e)
diff --git a/git/git.cpp b/git/git.cpp
index 5e4aa85..2638eb0 100644
--- a/git/git.cpp
+++ b/git/git.cpp
@@ -1086,6 +1086,13 @@ void GitPlugin::ProcessGitActionQueue(const wxString& commandString /*= ""*/)
/*******************************************************************************/
void GitPlugin::FinishGitListAction(const gitAction& ga)
{
+ clConfig conf("git.conf");
+ GitEntry data;
+ conf.ReadItem(&data);
+
+ if ( !(data.GetFlags() & GitEntry::Git_Colour_Tree_View) )
+ return;
+
wxArrayString tmpArray = wxStringTokenize(m_commandOutput, wxT("\n"), wxTOKEN_STRTOK);
// Convert path to absolute
-----------------------------------------------------------------------
Summary of changes:
TODO.TXT | 5 +----
cppchecker/cppchecker.cpp | 11 ++++-------
git/git.cpp | 7 +++++++
3 files changed, 12 insertions(+), 11 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-10 13:46:55
|
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 d823e31239b34c81d69a8275e3ba9669668edcf9 (commit)
from 4dbb082c8829b8f6bb2a579e7b412bafadafd2ae (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/d823e31239b34c81d69a8275e3ba9669668edcf9
commit d823e31239b34c81d69a8275e3ba9669668edcf9
Author: Eran <era...@gm...>
Date: Fri Jan 10 15:45:37 2014 +0200
updated TODO list
diff --git a/TODO.TXT b/TODO.TXT
index 21374f4..4f305d7 100644
--- a/TODO.TXT
+++ b/TODO.TXT
@@ -1,5 +1,7 @@
- Move the following files to WORKSPACE_PATH/.codelite:
cppcheck.list
-- codelite-make allow user to execute the build using --build argument
-
\ No newline at end of file
+- wxCrafter: make sure that after code generation an event is sent to git/svn views are updated accordingly
+- Git: remove the progress dialog and use an inline progress bar
+- Git: colorizing tree works over time (when it should not be working at all)
+- CMakePlugin / wxCrafter: use icon for the tabs?
-----------------------------------------------------------------------
Summary of changes:
TODO.TXT | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2014-01-10 13:38:04
|
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 4dbb082c8829b8f6bb2a579e7b412bafadafd2ae (commit)
from e97e1d93b209ee4e7b8d21396f07c51f38531994 (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/4dbb082c8829b8f6bb2a579e7b412bafadafd2ae
commit 4dbb082c8829b8f6bb2a579e7b412bafadafd2ae
Author: dghart <da...@4P...>
Date: Fri Jan 10 13:35:52 2014 +0000
Update CMakeLists.txt to check for >=wx3.0 rather than 2.9.5
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cdd1cb..546aab6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,9 +85,9 @@ if (UNIX)
string(SUBSTRING "${WX_VERSION}" "0" "1" wxMAJOR_VERSION)
string(SUBSTRING "${WX_VERSION}" "2" "1" wxMINOR_VERSION)
string(SUBSTRING "${WX_VERSION}" "4" "1" wxRELEASE_NUMBER)
- if ( wxMAJOR_VERSION LESS 3 AND (wxMINOR_VERSION LESS 9 OR wxRELEASE_NUMBER LESS 5) )
+ if ( wxMAJOR_VERSION LESS 3 )
message(FATAL_ERROR
-"\nI'm afraid your wxWidgets version is too old.\nBuilding CodeLite requires at least wxWidgets-2.9.5"
+"\nI'm afraid your wxWidgets version is too old.\nBuilding CodeLite requires at least wxWidgets-3.0.0"
)
endif()
endif()
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-10 12:37: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 e97e1d93b209ee4e7b8d21396f07c51f38531994 (commit)
via 3817a5d60218c61130e4c31eafa92381a5c21c55 (commit)
from 5c7e4747d0d4e8d4b31884d1cc69273fd32e9733 (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/e97e1d93b209ee4e7b8d21396f07c51f38531994
commit e97e1d93b209ee4e7b8d21396f07c51f38531994
Author: Eran <era...@gm...>
Date: Fri Jan 10 14:37:24 2014 +0200
CMakePlugin: make sure that the 'topic' selection control is disabled while help content is being constructed
diff --git a/CMakePlugin/CMakeHelpTab.cpp b/CMakePlugin/CMakeHelpTab.cpp
index c71ad06..3412d0b 100644
--- a/CMakePlugin/CMakeHelpTab.cpp
+++ b/CMakePlugin/CMakeHelpTab.cpp
@@ -65,7 +65,7 @@ CMakeHelpTab::CMakeHelpTab(wxWindow* parent, CMakePlugin* plugin)
Bind(EVT_THREAD_DONE, &CMakeHelpTab::OnThreadDone, this);
// Initial load
- //LoadData();
+ LoadData();
}
/* ************************************************************************ */
diff --git a/CMakePlugin/CMakePlugin.wxcp b/CMakePlugin/CMakePlugin.wxcp
index 15e8ca3..bd40109 100644
--- a/CMakePlugin/CMakePlugin.wxcp
+++ b/CMakePlugin/CMakePlugin.wxcp
@@ -1019,7 +1019,13 @@
"m_label": "Wrap:",
"m_value": "-1"
}],
- "m_events": [],
+ "m_events": [{
+ "m_eventName": "wxEVT_UPDATE_UI",
+ "m_eventClass": "wxUpdateUIEvent",
+ "m_eventHandler": "wxUpdateUIEventHandler",
+ "m_functionNameAndSignature": "OnUpdateUi(wxUpdateUIEvent& event)",
+ "m_description": "Process a wxEVT_UPDATE_UI event"
+ }],
"m_children": []
}, {
"m_type": 4411,
@@ -1100,6 +1106,12 @@
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnChangeTopic(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_CHOICE_SELECTED event, when an item on the list is selected."
+ }, {
+ "m_eventName": "wxEVT_UPDATE_UI",
+ "m_eventClass": "wxUpdateUIEvent",
+ "m_eventHandler": "wxUpdateUIEventHandler",
+ "m_functionNameAndSignature": "OnUpdateUi(wxUpdateUIEvent& event)",
+ "m_description": "Process a wxEVT_UPDATE_UI event"
}],
"m_children": []
}, {
diff --git a/CMakePlugin/CMakePluginUi.cpp b/CMakePlugin/CMakePluginUi.cpp
index d205f91..d13f9bd 100644
--- a/CMakePlugin/CMakePluginUi.cpp
+++ b/CMakePlugin/CMakePluginUi.cpp
@@ -180,7 +180,9 @@ CMakeHelpTabBase::CMakeHelpTabBase(wxWindow* parent, wxWindowID id, const wxPoin
// Connect events
m_staticTextVersion->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeHelpTabBase::OnUpdateUi), NULL, this);
m_staticTextVersionValue->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeHelpTabBase::OnUpdateUi), NULL, this);
+ m_staticText222->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeHelpTabBase::OnUpdateUi), NULL, this);
m_choiceTopics->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(CMakeHelpTabBase::OnChangeTopic), NULL, this);
+ m_choiceTopics->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeHelpTabBase::OnUpdateUi), NULL, this);
m_buttonReload->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CMakeHelpTabBase::OnReload), NULL, this);
m_buttonReload->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeHelpTabBase::OnUpdateUi), NULL, this);
m_splitter->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(CMakeHelpTabBase::OnRightClick), NULL, this);
@@ -199,7 +201,9 @@ CMakeHelpTabBase::~CMakeHelpTabBase()
{
m_staticTextVersion->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeHelpTabBase::OnUpdateUi), NULL, this);
m_staticTextVersionValue->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeHelpTabBase::OnUpdateUi), NULL, this);
+ m_staticText222->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeHelpTabBase::OnUpdateUi), NULL, this);
m_choiceTopics->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(CMakeHelpTabBase::OnChangeTopic), NULL, this);
+ m_choiceTopics->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeHelpTabBase::OnUpdateUi), NULL, this);
m_buttonReload->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CMakeHelpTabBase::OnReload), NULL, this);
m_buttonReload->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeHelpTabBase::OnUpdateUi), NULL, this);
m_splitter->Disconnect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(CMakeHelpTabBase::OnRightClick), NULL, this);
diff --git a/CMakePlugin/CMakePluginUi_bitmaps.cpp b/CMakePlugin/CMakePluginUi_bitmaps.cpp
index 778c9f6..0302b40 100644
--- a/CMakePlugin/CMakePluginUi_bitmaps.cpp
+++ b/CMakePlugin/CMakePluginUi_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 wxCrafterR3nJ3cInitBitmapResources()
-{
-
- // 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/CMakePluginUi_bitmaps.cpp$C__Users_Geo_Development_Cpp_codelite-dev_CMakePlugin_CMakePluginUi_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
- wxXmlResource::Get()->Load(wxT("memory:XRC_resource/CMakePluginUi_bitmaps.cpp$C__Users_Geo_Development_Cpp_codelite-dev_CMakePlugin_CMakePluginUi_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 wxCrafterR3nJ3cInitBitmapResources()
+{
+
+ // 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/CMakePluginUi_bitmaps.cpp$C__src_codelitegit_CMakePlugin_CMakePluginUi_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
+ wxXmlResource::Get()->Load(wxT("memory:XRC_resource/CMakePluginUi_bitmaps.cpp$C__src_codelitegit_CMakePlugin_CMakePluginUi_bitmaps.xrc"));
+}
https://sourceforge.net/p/codelite/codelitegit/ci/3817a5d60218c61130e4c31eafa92381a5c21c55
commit 3817a5d60218c61130e4c31eafa92381a5c21c55
Author: Eran <era...@gm...>
Date: Fri Jan 10 14:28:28 2014 +0200
CMakePlugin: make sure that the worker thread is joined before exiting codelite while the worker thread is working
CMakePlugin: don't attempt to load the help content automatically
diff --git a/CMakePlugin/CMake.cpp b/CMakePlugin/CMake.cpp
index 0d29802..a2a2263 100644
--- a/CMakePlugin/CMake.cpp
+++ b/CMakePlugin/CMake.cpp
@@ -191,7 +191,8 @@ CMake::LoadData(bool force, LoadNotifier* notifier)
}
// Load data
- LoadFromCMake(notifier);
+ if ( !LoadFromCMake(notifier) )
+ return false;
// Request to stop
if (notifier && notifier->RequestStop()) {
@@ -283,7 +284,8 @@ CMake::LoadFromCMake(LoadNotifier* notifier)
}
// Load
- LoadList(types[i].first, *types[i].second, notifier, STEP);
+ if ( !LoadList(types[i].first, *types[i].second, notifier, STEP) )
+ return false;
}
return true;
@@ -446,7 +448,7 @@ CMake::StoreIntoDatabase()
/* ************************************************************************ */
-void
+bool
CMake::LoadList(const wxString& type, CMake::HelpMap& list,
LoadNotifier* notifier, int limit)
{
@@ -466,7 +468,12 @@ CMake::LoadList(const wxString& type, CMake::HelpMap& list,
// Foreach names
for (wxArrayString::const_iterator it = names.begin(), ite = names.end(); it != ite; ++it) {
-
+
+ if ( notifier && notifier->RequestStop() ) {
+ // Someone called 'wxThread::Delete'
+ return false;
+ }
+
// Trim name
wxString name = *it;
name.Trim().Trim(false);
@@ -496,6 +503,7 @@ CMake::LoadList(const wxString& type, CMake::HelpMap& list,
loaded = 0;
}
}
+ return true;
}
/* ************************************************************************ */
diff --git a/CMakePlugin/CMake.h b/CMakePlugin/CMake.h
index 3f1d1ac..b6a7290 100644
--- a/CMakePlugin/CMake.h
+++ b/CMakePlugin/CMake.h
@@ -94,7 +94,11 @@ public:
* @brief Loading is done.
*/
virtual void Done() = 0;
-
+
+ /**
+ * @brief stop the current thread
+ */
+ virtual void Stop() = 0;
};
@@ -283,8 +287,10 @@ private:
* @param list Output variable.
* @param handler Progress notifier.
* @param limit Notifier limit.
+ * @return false incase 'RequestStop' was called during the loading of the help
+ * true otherwise
*/
- void LoadList(const wxString& type, CMake::HelpMap& list,
+ bool LoadList(const wxString& type, CMake::HelpMap& list,
LoadNotifier* notifier, int limit);
diff --git a/CMakePlugin/CMakeHelpTab.cpp b/CMakePlugin/CMakeHelpTab.cpp
index dfbf180..c71ad06 100644
--- a/CMakePlugin/CMakeHelpTab.cpp
+++ b/CMakePlugin/CMakeHelpTab.cpp
@@ -65,7 +65,7 @@ CMakeHelpTab::CMakeHelpTab(wxWindow* parent, CMakePlugin* plugin)
Bind(EVT_THREAD_DONE, &CMakeHelpTab::OnThreadDone, this);
// Initial load
- LoadData();
+ //LoadData();
}
/* ************************************************************************ */
@@ -432,4 +432,15 @@ CMakeHelpTab::Done()
AddPendingEvent(wxThreadEvent(EVT_THREAD_DONE));
}
-/* ************************************************************************ */
+void CMakeHelpTab::Stop()
+{
+ if ( GetThread() && GetThread()->IsAlive() ) {
+ GetThread()->Delete(NULL, wxTHREAD_WAIT_BLOCK);
+
+ } else if ( GetThread() ) {
+ GetThread()->Wait(wxTHREAD_WAIT_BLOCK);
+ }
+}
+
+
+/* ************************************************************************ */
diff --git a/CMakePlugin/CMakeHelpTab.h b/CMakePlugin/CMakeHelpTab.h
index 972b1e6..9149004 100644
--- a/CMakePlugin/CMakeHelpTab.h
+++ b/CMakePlugin/CMakeHelpTab.h
@@ -49,13 +49,12 @@ class CMakePlugin;
* @brief Dockable window with CMake help.
*/
class CMakeHelpTab : public CMakeHelpTabBase, public wxThreadHelper,
- public CMake::LoadNotifier
+ public CMake::LoadNotifier
{
// Public Ctors & Dtors
public:
-
-
+
/**
* @brief Constructor.
*
@@ -230,7 +229,11 @@ public:
*/
virtual void Done();
-
+ /**
+ * @brief stop the worker thread
+ */
+ virtual void Stop();
+
// Protected Operations
protected:
@@ -289,4 +292,4 @@ private:
/* ************************************************************************ */
-#endif // CMAKE_HELP_TAB_H_
+#endif // CMAKE_HELP_TAB_H_
diff --git a/CMakePlugin/CMakePlugin.cpp b/CMakePlugin/CMakePlugin.cpp
index ac31550..81d509b 100644
--- a/CMakePlugin/CMakePlugin.cpp
+++ b/CMakePlugin/CMakePlugin.cpp
@@ -444,9 +444,14 @@ CMakePlugin::UnPlug()
size_t pos = notebook->GetPageIndex("CMake Help");
if (pos != Notebook::npos) {
+ CMakeHelpTab* helpTab = dynamic_cast<CMakeHelpTab*>( notebook->GetPage(pos) );
+ if ( helpTab ) {
+ helpTab->Stop();
+ }
notebook->RemovePage(pos);
}
-
+
+
// Unbind events
wxTheApp->Unbind(wxEVT_COMMAND_MENU_SELECTED, &CMakePlugin::OnSettings, this, XRCID("cmake_settings"));
diff --git a/CMakePlugin/CMakePlugin.project b/CMakePlugin/CMakePlugin.project
index 1a3ea17..6385723 100644
--- a/CMakePlugin/CMakePlugin.project
+++ b/CMakePlugin/CMakePlugin.project
@@ -1,6 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<CodeLite_Project Name="CMakePlugin">
<Plugins>
+ <Plugin Name="CMakePlugin">
+ <![CDATA[[{
+ "name": "WinDebugUnicode",
+ "enabled": false,
+ "buildDirectory": "build",
+ "sourceDirectory": "$(ProjectPath)",
+ "generator": "",
+ "buildType": "",
+ "arguments": [],
+ "parentProject": ""
+ }]]]>
+ </Plugin>
<Plugin Name="qmake">
<![CDATA[00030001N0015WinDebugUnicode0000000000000001N0011WinDebug_290000000000000001N0013WinRelease_29000000000000]]>
</Plugin>
@@ -60,6 +72,7 @@
<File Name="CMakePlugin.wxcp"/>
</VirtualDirectory>
<Dependencies Name="WinDebugUnicode"/>
+ <Dependencies Name="WinReleaseUnicode"/>
<Settings Type="Dynamic Library">
<GlobalSettings>
<Compiler Options="" C_Options="" Assembler="">
@@ -92,7 +105,7 @@
<Library Value="libwxsqlite3ud.dll"/>
</Linker>
<ResourceCompiler Options="" Required="no"/>
- <General OutputFile="$(IntermediateDirectory)/$(ProjectName)-dbg.dll" IntermediateDirectory="./WinDebugUnicode" Command="./CodeLite" CommandArguments="-b ." UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="../Runtime" PauseExecWhenProcTerminates="no"/>
+ <General OutputFile="$(IntermediateDirectory)/$(ProjectName)-dbg.dll" IntermediateDirectory="./WinDebugUnicode" Command="./codelite-dbg.exe" CommandArguments="-b . --with-plugins CMakePlugin" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="../Runtime" PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
@@ -144,7 +157,7 @@
<Library Value="libwxsqlite3u.dll"/>
</Linker>
<ResourceCompiler Options="" Required="no"/>
- <General OutputFile="$(IntermediateDirectory)/$(ProjectName).dll" IntermediateDirectory="./WinReleaseUnicode" Command="./CodeLite" CommandArguments="-b ." UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="../Runtime" PauseExecWhenProcTerminates="no"/>
+ <General OutputFile="$(IntermediateDirectory)/$(ProjectName).dll" IntermediateDirectory="./WinReleaseUnicode" Command="./CodeLite" CommandArguments="-b ." UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="../Runtime" PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
@@ -194,7 +207,7 @@
<Library Value="libwxsqlite3ud.dll"/>
</Linker>
<ResourceCompiler Options="" Required="no"/>
- <General OutputFile="../Runtime/plugins/CMakePlugin.dll" IntermediateDirectory="./WinDbg_29" Command="./CodeLite" CommandArguments="-b ." UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="../Runtime" PauseExecWhenProcTerminates="no"/>
+ <General OutputFile="../Runtime/plugins/CMakePlugin.dll" IntermediateDirectory="./WinDbg_29" Command="./CodeLite" CommandArguments="-b ." UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="../Runtime" PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
@@ -227,5 +240,4 @@
</Completion>
</Configuration>
</Settings>
- <Dependencies Name="WinReleaseUnicode"/>
</CodeLite_Project>
-----------------------------------------------------------------------
Summary of changes:
CMakePlugin/CMake.cpp | 16 ++++--
CMakePlugin/CMake.h | 10 +++-
CMakePlugin/CMakeHelpTab.cpp | 13 ++++-
CMakePlugin/CMakeHelpTab.h | 13 +++--
CMakePlugin/CMakePlugin.cpp | 7 ++-
CMakePlugin/CMakePlugin.project | 20 ++++++--
CMakePlugin/CMakePlugin.wxcp | 14 +++++-
CMakePlugin/CMakePluginUi.cpp | 4 ++
CMakePlugin/CMakePluginUi_bitmaps.cpp | 96 ++++++++++++++++----------------
9 files changed, 127 insertions(+), 66 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-10 11:41:01
|
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 5c7e4747d0d4e8d4b31884d1cc69273fd32e9733 (commit)
via 9e1d381a8c2a693880bb50f2ed9ca9e2ef9f1b13 (commit)
via f2e94071f3a714ae463c6486016f972e8ce05bba (commit)
from 01e9ad1445f85649660e086e0c53ead90d453f4e (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/5c7e4747d0d4e8d4b31884d1cc69273fd32e9733
commit 5c7e4747d0d4e8d4b31884d1cc69273fd32e9733
Author: Eran <era...@gm...>
Date: Fri Jan 10 13:40:40 2014 +0200
Add dependency to sqlite to CMakePlugin
OSX: Include CMake plugin
diff --git a/CMakePlugin/CMakeLists.txt b/CMakePlugin/CMakeLists.txt
index d4be049..d11720c 100644
--- a/CMakePlugin/CMakeLists.txt
+++ b/CMakePlugin/CMakeLists.txt
@@ -30,6 +30,7 @@ include_directories(
# Define some macros about DLL
add_definitions(-DWXUSINGDLL_CL)
add_definitions(-DWXUSINGDLL_SDK)
+add_definitions(-DWXUSINGDLL_SDK)
# Only with precompiled headers
if (USE_PCH)
@@ -54,7 +55,8 @@ target_link_libraries(${PLUGIN_NAME}
-L"${CL_LIBPATH}"
-llibcodelite
-lplugin
-
+ -lwxsqlite3
+ -lsqlite3lib
)
# The plugin library is required
diff --git a/CMakePlugin/CMakePlugin.project b/CMakePlugin/CMakePlugin.project
index 8aca785..1a3ea17 100644
--- a/CMakePlugin/CMakePlugin.project
+++ b/CMakePlugin/CMakePlugin.project
@@ -20,6 +20,7 @@
<File Name="CMake.cpp"/>
<File Name="CMakeSettingsManager.cpp"/>
<File Name="CMakeParser.cpp"/>
+ <File Name="CMakeLists.txt"/>
</VirtualDirectory>
<VirtualDirectory Name="include">
<File Name="CMakePlugin.h"/>
diff --git a/Gizmos/Gizmos.project b/Gizmos/Gizmos.project
index 864e4b3..74d92a9 100644
--- a/Gizmos/Gizmos.project
+++ b/Gizmos/Gizmos.project
@@ -12,6 +12,7 @@
<File Name="newplugindata.h"/>
<File Name="new_class_dlg_data.h"/>
<File Name="new_class_dlg_data.cpp"/>
+ <File Name="CMakeLists.txt"/>
</VirtualDirectory>
<VirtualDirectory Name="Wizard">
<File Name="PluginWizard.h"/>
diff --git a/Runtime/make_mac_bundle.sh b/Runtime/make_mac_bundle.sh
index 7170d15..fbe5143 100755
--- a/Runtime/make_mac_bundle.sh
+++ b/Runtime/make_mac_bundle.sh
@@ -218,10 +218,10 @@ cp ../lib/cppchecker.dylib ./codelite.app/Contents/SharedSupport/plugins/
cp ../lib/MacBundler.dylib ./codelite.app/Contents/SharedSupport/plugins/
cp ../lib/DatabaseExplorer.dylib ./codelite.app/Contents/SharedSupport/plugins/
cp ../lib/Tweaks.dylib ./codelite.app/Contents/SharedSupport/plugins/
-##cp ../lib/CallGraph.dylib ./codelite.app/Contents/SharedSupport/plugins/
cp ../lib/git.dylib ./codelite.app/Contents/SharedSupport/plugins/
cp ../lib/ZoomNavigator.dylib ./codelite.app/Contents/SharedSupport/plugins/
cp ../lib/SFTP.dylib ./codelite.app/Contents/SharedSupport/plugins/
+cp ../lib/CMakePlugin.dylib ./codelite.app/Contents/SharedSupport/plugins/
if [ -f ../lib/wxcrafter.dylib ]; then
cp ../lib/wxcrafter.dylib ./codelite.app/Contents/SharedSupport/plugins/
https://sourceforge.net/p/codelite/codelitegit/ci/9e1d381a8c2a693880bb50f2ed9ca9e2ef9f1b13
commit 9e1d381a8c2a693880bb50f2ed9ca9e2ef9f1b13
Author: Eran <era...@gm...>
Date: Fri Jan 10 13:32:02 2014 +0200
Updated CMakePlugin to the latest from GitHub
diff --git a/CMakePlugin/CMake.cpp b/CMakePlugin/CMake.cpp
new file mode 100644
index 0000000..0d29802
--- /dev/null
+++ b/CMakePlugin/CMake.cpp
@@ -0,0 +1,501 @@
+/* ************************************************************************ */
+/* */
+/* CMakePlugin for Codelite */
+/* Copyright (C) 2013 JiÅÃ Fatka <nt...@gm...> */
+/* */
+/* This program is free software: you can redistribute it and/or modify */
+/* it under the terms of the GNU General Public License as published by */
+/* the Free Software Foundation, either version 3 of the License, or */
+/* (at your option) any later version. */
+/* */
+/* This program is distributed in the hope that it will be useful, */
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
+/* GNU General Public License for more details. */
+/* */
+/* You should have received a copy of the GNU General Public License */
+/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
+/* */
+/* ************************************************************************ */
+
+/* ************************************************************************ */
+/* INCLUDES */
+/* ************************************************************************ */
+
+// Declaration
+#include "CMake.h"
+
+// C++
+#include <utility>
+
+// wxWidgets
+#include <wx/regex.h>
+#include <wx/event.h>
+#include <wx/thread.h>
+#include <wx/scopedptr.h>
+
+// Codelite
+#include "procutils.h"
+#include "workspace.h"
+#include "globals.h"
+#include "file_logger.h"
+
+/* ************************************************************************ */
+/* FUNCTIONS */
+/* ************************************************************************ */
+
+/**
+ * @brief Joins array of strings into single string.
+ *
+ * @param array Input array.
+ *
+ * @return Result string.
+ */
+static wxString CreateHtml(const wxArrayString& array)
+{
+ wxString result;
+
+ for (wxArrayString::const_iterator it = array.begin(), ite = array.end(); it != ite; ++it) {
+ if (it != array.begin()) {
+ result += "<br />";
+ }
+ wxString esc = *it;
+ // Escape
+ esc.Replace("<", "<");
+ esc.Replace(">", ">");
+ result += esc;
+ }
+
+ return result;
+}
+
+/* ************************************************************************ */
+/* CLASSES */
+/* ************************************************************************ */
+
+CMake::CMake(const wxFileName& path)
+ : m_path(path)
+ , m_version("?")
+ , m_dbFileName(wxStandardPaths::Get().GetUserDataDir(), "cmake.db")
+{
+ // Prepare database
+ PrepareDatabase();
+}
+
+/* ************************************************************************ */
+
+wxArrayString
+CMake::GetVersions()
+{
+ static const wxString VERSIONS[] = {
+ "2.8.11",
+ "2.8.10",
+ "2.8.9",
+ "2.8.8",
+ "2.8.7",
+ "2.8.6",
+ "2.8.5",
+ "2.8.4",
+ "2.8.3",
+ "2.8.2",
+ "2.8.1",
+ "2.8.0",
+ "2.6.4",
+ "2.6.3",
+ "2.6.2",
+ "2.6.1",
+ "2.6.0",
+ "2.4.8",
+ "2.4.7",
+ "2.4.6",
+ "2.4.5",
+ "2.4.4",
+ "2.4.3",
+ "2.2.3",
+ "2.0.6",
+ "1.8.3"
+ };
+
+ return wxArrayString(sizeof(VERSIONS) / sizeof(VERSIONS[0]), VERSIONS);
+}
+
+/* ************************************************************************ */
+
+bool
+CMake::IsOk() const
+{
+ wxArrayString output;
+ ProcUtils::SafeExecuteCommand(GetPath().GetFullPath() + " -h", output);
+
+ // SafeExecuteCommand doesn't return status code so the only way
+ // to test the success is the output emptiness.
+ return !output.empty();
+}
+
+/* ************************************************************************ */
+
+bool
+CMake::LoadData(bool force, LoadNotifier* notifier)
+{
+ // Clear old data
+ m_version.clear();
+ m_commands.clear();
+ m_modules.clear();
+ m_properties.clear();
+ m_variables.clear();
+
+ if (notifier) {
+ notifier->Start();
+ }
+
+ // Load data from database
+ if (!force && m_dbInitialized && LoadFromDatabase()) {
+ // Loading is done
+ if (notifier) {
+ notifier->Done();
+ }
+ return true;
+ }
+
+ // Unable to use CMake
+ if (!IsOk())
+ return false;
+
+ // Request to stop
+ if (notifier && notifier->RequestStop()) {
+ return false;
+ }
+
+ // Get cmake program path
+ const wxString program = GetPath().GetFullPath();
+
+ // Version
+ {
+ wxArrayString output;
+ ProcUtils::SafeExecuteCommand(program + " --version", output);
+
+ // Unable to find version
+ if (!output.IsEmpty()) {
+ const wxString& versionLine = output[0];
+ wxRegEx expression("cmake version (.+)");
+
+ if (expression.IsValid() && expression.Matches(versionLine)) {
+ m_version = expression.GetMatch(versionLine, 1).Trim().Trim(false);
+ }
+ }
+ }
+
+ // Request to stop
+ if (notifier && notifier->RequestStop()) {
+ return false;
+ }
+
+ // Load data
+ LoadFromCMake(notifier);
+
+ // Request to stop
+ if (notifier && notifier->RequestStop()) {
+ return false;
+ }
+
+ // Database is open so we can store result into database
+ if (m_dbInitialized) {
+ StoreIntoDatabase();
+ }
+
+ // Loading is done
+ if (notifier) {
+ notifier->Update(100);
+ notifier->Done();
+ }
+
+ return true;
+}
+
+/* ************************************************************************ */
+
+void
+CMake::PrepareDatabase()
+{
+ m_dbInitialized = false;
+
+ try {
+
+ /// Open database only for initializing
+ wxSQLite3Database db;
+
+ // Try to open database
+ db.Open(GetDatabaseFileName().GetFullPath());
+
+ // Not opened
+ if (!db.IsOpen())
+ return;
+
+ // Create tables
+ db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS commands (name TEXT, desc TEXT)");
+ db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS modules (name TEXT, desc TEXT)");
+ db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS properties (name TEXT, desc TEXT)");
+ db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS variables (name TEXT, desc TEXT)");
+ db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS strings (name TEXT, desc TEXT)");
+
+ // Create indices
+ db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS commands_idx ON commands(name)");
+ db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS modules_idx ON modules(name)");
+ db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS properties_idx ON properties(name)");
+ db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS variables_idx ON variables(name)");
+ db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS strings_idx ON strings(name)");
+
+ // Everything is OK
+ m_dbInitialized = true;
+
+ } catch (const wxSQLite3Exception& e) {
+ // Unable to use SQLite database
+ CL_ERROR("CMake DoPrepareDatabase error: %s", e.GetMessage());
+ }
+}
+
+/* ************************************************************************ */
+
+bool
+CMake::LoadFromCMake(LoadNotifier* notifier)
+{
+ // Possible types
+ static const std::pair<wxString, HelpMap*> types[] = {
+ std::make_pair("command", &m_commands),
+ std::make_pair("module", &m_modules),
+ std::make_pair("property", &m_properties),
+ std::make_pair("variable", &m_variables)
+ // make_pair("policy", &m_policies)
+ };
+ static const int typesCount = sizeof(types) / sizeof(types[0]);
+ static const int PROGRESS = 90;
+ static const int STEP = PROGRESS / typesCount;
+
+ // Foreach all types
+ for (int i = 0; i < typesCount; ++i) {
+ // Notify??
+ if (notifier) {
+ // Stop request?
+ if (notifier->RequestStop())
+ return false;
+
+ notifier->Update(STEP * i);
+ }
+
+ // Load
+ LoadList(types[i].first, *types[i].second, notifier, STEP);
+ }
+
+ return true;
+}
+
+/* ************************************************************************ */
+
+bool
+CMake::LoadFromDatabase()
+{
+ if (!m_dbInitialized) {
+ return false;
+ }
+
+ try
+ {
+ /// Open database only for reading
+ wxSQLite3Database db;
+
+ // Open
+ db.Open(GetDatabaseFileName().GetFullPath());
+
+ // Not opened
+ if (!db.IsOpen())
+ return false;
+
+ // Strings - Version
+ {
+ wxSQLite3ResultSet res = db.ExecuteQuery("SELECT desc FROM strings WHERE name = 'version'");
+ if (res.NextRow()) {
+ m_version = res.GetAsString(0);
+ }
+ }
+
+ // No data stored
+ if (m_version.IsEmpty())
+ return false;
+
+ // Commands
+ {
+ wxSQLite3ResultSet res = db.ExecuteQuery("SELECT name, desc FROM commands");
+ while (res.NextRow()) {
+ m_commands[res.GetAsString(0)] = res.GetAsString(1);
+ }
+ }
+
+ // Modules
+ {
+ wxSQLite3ResultSet res = db.ExecuteQuery("SELECT name, desc FROM modules");
+ while (res.NextRow()) {
+ m_modules[res.GetAsString(0)] = res.GetAsString(1);
+ }
+ }
+
+ // Properties
+ {
+ wxSQLite3ResultSet res = db.ExecuteQuery("SELECT name, desc FROM properties");
+ while (res.NextRow()) {
+ m_properties[res.GetAsString(0)] = res.GetAsString(1);
+ }
+ }
+
+ // Variables
+ {
+ wxSQLite3ResultSet res = db.ExecuteQuery("SELECT name, desc FROM variables");
+ while (res.NextRow()) {
+ m_variables[res.GetAsString(0)] = res.GetAsString(1);
+ }
+ }
+
+ } catch (const wxSQLite3Exception& e) {
+ CL_ERROR("Error occured while loading data from CMake database: %s", e.GetMessage());
+ }
+
+ // Everything is loaded
+ return true;
+}
+
+/* ************************************************************************ */
+
+void
+CMake::StoreIntoDatabase()
+{
+ if (!m_dbInitialized) {
+ CL_WARNING("CMake: can't store data into database. Database was not initialized properly");
+ return;
+ }
+
+ try
+ {
+ /// Open database only for writing
+ wxSQLite3Database db;
+
+ // Open
+ db.Open(GetDatabaseFileName().GetFullPath());
+
+ // Not opened
+ if (!db.IsOpen())
+ return;
+
+ db.Begin();
+
+ // Commands
+ {
+ db.ExecuteUpdate("DELETE FROM commands");
+ wxSQLite3Statement stmt = db.PrepareStatement("INSERT INTO commands (name, desc) VALUES(?, ?)");
+ for (HelpMap::const_iterator it = m_commands.begin(), ite = m_commands.end(); it != ite; ++it) {
+ stmt.Bind(1, it->first);
+ stmt.Bind(2, it->second);
+ stmt.ExecuteUpdate();
+ }
+ }
+
+ // Modules
+ {
+ db.ExecuteUpdate("DELETE FROM modules");
+ wxSQLite3Statement stmt = db.PrepareStatement("INSERT INTO modules (name, desc) VALUES(?, ?)");
+ for (HelpMap::const_iterator it = m_modules.begin(), ite = m_modules.end(); it != ite; ++it) {
... 25432 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-10 09:31:10
|
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 01e9ad1445f85649660e086e0c53ead90d453f4e (commit)
via cabf3cdb524702231a64178f5fd27673a25b5a43 (commit)
from ddb49421c9355eda174f884ee0f521b7f43f445c (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/01e9ad1445f85649660e086e0c53ead90d453f4e
commit 01e9ad1445f85649660e086e0c53ead90d453f4e
Author: Eran <era...@gm...>
Date: Fri Jan 10 11:30:55 2014 +0200
Limit the effect of the command line macro GTK_USE_NATIVEBOOK to GTK only
diff --git a/Interfaces/cl_defs.h b/Interfaces/cl_defs.h
index 761c9d2..8f32b22 100644
--- a/Interfaces/cl_defs.h
+++ b/Interfaces/cl_defs.h
@@ -32,10 +32,12 @@
# endif
# define CL_USE_NATIVEBOOK 0
#else
+ // MSW / OSX and the rest of the world
# define CL_USE_NATIVEBOOK 0
#endif
-// Allow override the default CL_USE_NATIVEBOOK by cmake variable
+// Allow override the default CL_USE_NATIVEBOOK by cmake variable (GTK only)
+#ifdef __WXGTK__
#if GTK_USE_NATIVEBOOK
# ifdef CL_USE_NATIVEBOOK
# undef CL_USE_NATIVEBOOK
@@ -47,6 +49,7 @@
# endif
# define CL_USE_NATIVEBOOK 0
#endif
+#endif
#if wxVERSION_NUMBER < 2904
# define CL_USE_NEW_BUILD_TAB 0
https://sourceforge.net/p/codelite/codelitegit/ci/cabf3cdb524702231a64178f5fd27673a25b5a43
commit cabf3cdb524702231a64178f5fd27673a25b5a43
Author: Eran <era...@gm...>
Date: Fri Jan 10 11:01:26 2014 +0200
Removed the "Style" field from the status bar
diff --git a/LiteEditor/cl_editor.cpp b/LiteEditor/cl_editor.cpp
index 4b23792..4d8f394 100644
--- a/LiteEditor/cl_editor.cpp
+++ b/LiteEditor/cl_editor.cpp
@@ -961,9 +961,7 @@ void LEditor::OnSciUpdateUI(wxStyledTextEvent &event)
<< wxT(", Col ")
<< GetColumn(pos)
<< wxT(", Pos ")
- << pos
- << ", Style "
- << GetStyleAt(pos);
+ << pos;
message << ", ";
-----------------------------------------------------------------------
Summary of changes:
Interfaces/cl_defs.h | 5 ++++-
LiteEditor/cl_editor.cpp | 4 +---
2 files changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-10 08:53:15
|
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 ddb49421c9355eda174f884ee0f521b7f43f445c (commit)
from 1b4fce2de80fe8a184ebba99dd7d4ebe8996f834 (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/ddb49421c9355eda174f884ee0f521b7f43f445c
commit ddb49421c9355eda174f884ee0f521b7f43f445c
Author: Eran <era...@gm...>
Date: Fri Jan 10 10:52:28 2014 +0200
codelite-terminal: added support for saving the terminal content into a file
diff --git a/codelite_terminal/MainFrame.cpp b/codelite_terminal/MainFrame.cpp
index b87f1d2..1917c24 100644
--- a/codelite_terminal/MainFrame.cpp
+++ b/codelite_terminal/MainFrame.cpp
@@ -5,6 +5,7 @@
#include <wx/settings.h>
#include <wx/colordlg.h>
#include "SettingsDlg.h"
+#include <wx/filedlg.h>
#ifndef __WXMSW__
#if defined(__WXGTK__)
@@ -147,11 +148,11 @@ void MainFrame::DoExecuteCurrentLine(const wxString &command)
cmd.RemoveLast();
async = true;
}
-
+
if ( command.IsEmpty() ) {
AppendNewLine();
}
-
+
if ( cmd.IsEmpty() ) {
SetCartAtEnd();
return;
@@ -413,3 +414,19 @@ void MainFrame::DoApplySettings()
DoSetColour( m_config.GetBgColour(), true );
DoSetFont ( m_config.GetFont() );
}
+
+void MainFrame::OnSaveContent(wxCommandEvent& event)
+{
+ const wxString ALL(wxT("All Files (*)|*"));
+ wxFileDialog dlg(this, _("Save As"), ::wxGetCwd(), "codelite-terminal.txt", ALL,
+ wxFD_SAVE | wxFD_OVERWRITE_PROMPT ,
+ wxDefaultPosition);
+ if ( dlg.ShowModal() == wxID_OK ) {
+ m_stc->SaveFile( dlg.GetPath() );
+ }
+}
+
+void MainFrame::OnSaveContentUI(wxUpdateUIEvent& event)
+{
+ event.Enable( !m_stc->IsEmpty() );
+}
diff --git a/codelite_terminal/MainFrame.h b/codelite_terminal/MainFrame.h
index fb9c14f..6d44739 100644
--- a/codelite_terminal/MainFrame.h
+++ b/codelite_terminal/MainFrame.h
@@ -23,6 +23,8 @@ class MainFrame : public MainFrameBaseClass
MyConfig m_config;
protected:
+ virtual void OnSaveContentUI(wxUpdateUIEvent& event);
+ virtual void OnSaveContent(wxCommandEvent& event);
virtual void OnSettings(wxCommandEvent& event);
virtual void OnSignalInferiorUI(wxUpdateUIEvent& event);
virtual void OnSignalinferior(wxAuiToolBarEvent& event);
diff --git a/codelite_terminal/codelite_terminal.project b/codelite_terminal/codelite_terminal.project
index fd30674..470ddb9 100644
--- a/codelite_terminal/codelite_terminal.project
+++ b/codelite_terminal/codelite_terminal.project
@@ -3,6 +3,15 @@
<Plugins>
<Plugin Name="CMakePlugin">
<![CDATA[[{
+ "name": "Debug",
+ "enabled": false,
+ "buildDirectory": "build",
+ "sourceDirectory": "$(ProjectPath)",
+ "generator": "",
+ "buildType": "",
+ "arguments": [],
+ "parentProject": ""
+ }, {
"name": "Debug_Linux",
"enabled": false,
"buildDirectory": "build",
@@ -71,7 +80,7 @@
</Compiler>
<Linker Options="$(shell wx-config --libs std,stc --debug);-mwindows" Required="yes"/>
<ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/>
- <General OutputFile="$(IntermediateDirectory)/codelite-terminal" IntermediateDirectory="./Debug" Command="./codelite-terminal" CommandArguments="--exit --wait -- D:\src\cmake\build-debug\bin\cmake.exe -G "CodeLite - MinGW Makefiles" .." UseSeparateDebugArgs="yes" DebugArguments="--exit --wait -- D:\src\cmake\build-debug\bin\cmake.exe -G "CodeLite - MinGW Makefiles" .." WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/>
+ <General OutputFile="$(IntermediateDirectory)/codelite-terminal" IntermediateDirectory="./Debug" Command="./codelite-terminal" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
diff --git a/codelite_terminal/codelite_terminal.workspace b/codelite_terminal/codelite_terminal.workspace
index ef815cb..bfb51eb 100644
--- a/codelite_terminal/codelite_terminal.workspace
+++ b/codelite_terminal/codelite_terminal.workspace
@@ -8,10 +8,10 @@
<WorkspaceConfiguration Name="Debug" Selected="no">
<Project Name="codelite_terminal" ConfigName="Debug"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="Release" Selected="no">
+ <WorkspaceConfiguration Name="Release" Selected="yes">
<Project Name="codelite_terminal" ConfigName="Release"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="Debug_Linux" Selected="yes">
+ <WorkspaceConfiguration Name="Debug_Linux" Selected="no">
<Project Name="codelite_terminal" ConfigName="Debug_Linux"/>
</WorkspaceConfiguration>
</BuildMatrix>
diff --git a/codelite_terminal/resources/stop.png b/codelite_terminal/resources/stop.png
index 5df4c6d..ac10f17 100644
Binary files a/codelite_terminal/resources/stop.png and b/codelite_terminal/resources/stop.png differ
diff --git a/codelite_terminal/terminal-16.png b/codelite_terminal/terminal-16.png
index 0ba97eb..7ee6a00 100644
Binary files a/codelite_terminal/terminal-16.png and b/codelite_terminal/terminal-16.png differ
diff --git a/codelite_terminal/terminal-32.png b/codelite_terminal/terminal-32.png
index bb40fe0..e168af8 100644
Binary files a/codelite_terminal/terminal-32.png and b/codelite_terminal/terminal-32.png differ
diff --git a/codelite_terminal/wxcrafter.cpp b/codelite_terminal/wxcrafter.cpp
index bfa7a04..64c7ba5 100644
--- a/codelite_terminal/wxcrafter.cpp
+++ b/codelite_terminal/wxcrafter.cpp
@@ -54,11 +54,13 @@ MainFrameBaseClass::MainFrameBaseClass(wxWindow* parent, wxWindowID id, const wx
boxSizer11->Add(m_auibar17, 0, wxEXPAND, 5);
- m_auibar17->AddTool(wxID_CLEAR, _("Clear"), wxXmlResource::Get()->LoadBitmap(wxT("clean")), wxNullBitmap, wxITEM_NORMAL, _("Clear view"), _("Clear view"), NULL);
+ m_auibar17->AddTool(wxID_CLEAR, _("Clear"), wxXmlResource::Get()->LoadBitmap(wxT("stop")), wxNullBitmap, wxITEM_NORMAL, _("Clear view"), _("Clear view"), NULL);
- m_auibar17->AddTool(ID_KILL_INFIRIOR, _("Send inferior process signal"), wxXmlResource::Get()->LoadBitmap(wxT("stop")), wxNullBitmap, wxITEM_NORMAL, wxT(""), _("Send inferior process signal"), NULL)->SetHasDropDown(true);
+ m_auibar17->AddTool(ID_KILL_INFIRIOR, _("Send inferior process signal"), wxXmlResource::Get()->LoadBitmap(wxT("signal")), wxNullBitmap, wxITEM_NORMAL, wxT(""), _("Send inferior process signal"), NULL)->SetHasDropDown(true);
- m_auibar17->AddTool(ID_SETTINGS, _("Settings..."), wxXmlResource::Get()->LoadBitmap(wxT("cog")), wxNullBitmap, wxITEM_NORMAL, _("Settings..."), _("Settings..."), NULL);
+ m_auibar17->AddTool(ID_SETTINGS, _("Settings..."), wxXmlResource::Get()->LoadBitmap(wxT("settings")), wxNullBitmap, wxITEM_NORMAL, _("Settings..."), _("Settings..."), NULL);
+
+ m_auibar17->AddTool(wxID_SAVE, _("Save"), wxXmlResource::Get()->LoadBitmap(wxT("save")), wxNullBitmap, wxITEM_NORMAL, _("Save"), _("Save"), NULL);
m_auibar17->Realize();
m_stc = new wxStyledTextCtrl(m_mainPanel, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), 0);
@@ -142,6 +144,8 @@ MainFrameBaseClass::MainFrameBaseClass(wxWindow* parent, wxWindowID id, const wx
this->Connect(ID_KILL_INFIRIOR, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrameBaseClass::OnSignalInferiorUI), NULL, this);
this->Connect(ID_KILL_INFIRIOR, wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEventHandler(MainFrameBaseClass::OnSignalinferior), NULL, this);
this->Connect(ID_SETTINGS, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(MainFrameBaseClass::OnSettings), NULL, this);
+ this->Connect(wxID_SAVE, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(MainFrameBaseClass::OnSaveContent), NULL, this);
+ this->Connect(wxID_SAVE, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrameBaseClass::OnSaveContentUI), NULL, this);
m_stc->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MainFrameBaseClass::OnKeyDown), NULL, this);
m_stc->Connect(wxEVT_STC_UPDATEUI, wxStyledTextEventHandler(MainFrameBaseClass::OnStcUpdateUI), NULL, this);
this->Connect(m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrameBaseClass::OnExit), NULL, this);
@@ -158,6 +162,8 @@ MainFrameBaseClass::~MainFrameBaseClass()
this->Disconnect(ID_KILL_INFIRIOR, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrameBaseClass::OnSignalInferiorUI), NULL, this);
this->Disconnect(ID_KILL_INFIRIOR, wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEventHandler(MainFrameBaseClass::OnSignalinferior), NULL, this);
this->Disconnect(ID_SETTINGS, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(MainFrameBaseClass::OnSettings), NULL, this);
+ this->Disconnect(wxID_SAVE, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(MainFrameBaseClass::OnSaveContent), NULL, this);
+ this->Disconnect(wxID_SAVE, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrameBaseClass::OnSaveContentUI), NULL, this);
m_stc->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(MainFrameBaseClass::OnKeyDown), NULL, this);
m_stc->Disconnect(wxEVT_STC_UPDATEUI, wxStyledTextEventHandler(MainFrameBaseClass::OnStcUpdateUI), NULL, this);
this->Disconnect(m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrameBaseClass::OnExit), NULL, this);
@@ -182,7 +188,7 @@ SettingsDlgBase::SettingsDlgBase(wxWindow* parent, wxWindowID id, const wxString
wxBoxSizer* boxSizer27 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer27);
- wxFlexGridSizer* flexGridSizer29 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer29 = new wxFlexGridSizer(0, 2, 0, 0);
flexGridSizer29->SetFlexibleDirection( wxBOTH );
flexGridSizer29->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer29->AddGrowableCol(1);
diff --git a/codelite_terminal/wxcrafter.h b/codelite_terminal/wxcrafter.h
index d8a8069..bfd0666 100644
--- a/codelite_terminal/wxcrafter.h
+++ b/codelite_terminal/wxcrafter.h
@@ -52,6 +52,8 @@ protected:
virtual void OnSignalInferiorUI(wxUpdateUIEvent& event) { event.Skip(); }
virtual void OnSignalinferior(wxAuiToolBarEvent& event) { event.Skip(); }
virtual void OnSettings(wxCommandEvent& event) { event.Skip(); }
+ virtual void OnSaveContent(wxCommandEvent& event) { event.Skip(); }
+ virtual void OnSaveContentUI(wxUpdateUIEvent& event) { event.Skip(); }
virtual void OnKeyDown(wxKeyEvent& event) { event.Skip(); }
virtual void OnStcUpdateUI(wxStyledTextEvent& event) { event.Skip(); }
virtual void OnExit(wxCommandEvent& event) { event.Skip(); }
diff --git a/codelite_terminal/wxcrafter.wxcp b/codelite_terminal/wxcrafter.wxcp
index 9203d2a..b8b24a0 100644
--- a/codelite_terminal/wxcrafter.wxcp
+++ b/codelite_terminal/wxcrafter.wxcp
@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
- "m_objCounter": 47,
+ "m_objCounter": 49,
"m_includeFiles": [],
"m_bitmapFunction": "wxC9ED9InitBitmapResources",
"m_bitmapsFile": "wxcrafter_bitmaps.cpp",
@@ -300,7 +300,7 @@
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
- "m_path": "resources/clean.png"
+ "m_path": "resources/stop.png"
}, {
"type": "filePicker",
"m_label": "Disabled-Bitmap File",
@@ -356,7 +356,7 @@
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
- "m_path": "resources/stop.png"
+ "m_path": "resources/signal.png"
}, {
"type": "filePicker",
"m_label": "Disabled-Bitmap File",
@@ -418,7 +418,7 @@
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
- "m_path": "resources/cog.png"
+ "m_path": "resources/settings.png"
}, {
"type": "filePicker",
"m_label": "Disabled-Bitmap File",
@@ -437,6 +437,62 @@
"m_description": "Process a wxEVT_COMMAND_TOOL_CLICKED event (a synonym for wxEVT_COMMAND_MENU_SELECTED). Pass the id of the tool"
}],
"m_children": []
+ }, {
+ "m_type": 4462,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": [],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_SAVE"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_toolbarItemSaveContent"
+ }, {
+ "type": "string",
+ "m_label": "Label:",
+ "m_value": "Save"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": "Save"
+ }, {
+ "type": "string",
+ "m_label": "Help String:",
+ "m_value": "Save"
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File:",
+ "m_path": "resources/save.png"
+ }, {
+ "type": "filePicker",
+ "m_label": "Disabled-Bitmap File",
+ "m_path": ""
+ }, {
+ "type": "choice",
+ "m_label": "Kind:",
+ "m_selection": 0,
+ "m_options": ["normal", "checkable", "radio", "separator", "dropdown"]
+ }],
+ "m_events": [{
+ "m_eventName": "wxEVT_COMMAND_TOOL_CLICKED",
+ "m_eventClass": "wxCommandEvent",
+ "m_eventHandler": "wxCommandEventHandler",
+ "m_functionNameAndSignature": "OnSaveContent(wxCommandEvent& event)",
+ "m_description": "Process a wxEVT_COMMAND_TOOL_CLICKED event (a synonym for wxEVT_COMMAND_MENU_SELECTED). Pass the id of the tool"
+ }, {
+ "m_eventName": "wxEVT_UPDATE_UI",
+ "m_eventClass": "wxUpdateUIEvent",
+ "m_eventHandler": "wxUpdateUIEventHandler",
+ "m_functionNameAndSignature": "OnSaveContentUI(wxUpdateUIEvent& event)",
+ "m_description": "Process a wxEVT_UPDATE_UI event"
+ }],
+ "m_children": []
}]
}, {
"m_type": 4466,
diff --git a/codelite_terminal/wxcrafter_bitmaps.cpp b/codelite_terminal/wxcrafter_bitmaps.cpp
index 63e3750..ad4a808 100644
--- a/codelite_terminal/wxcrafter_bitmaps.cpp
+++ b/codelite_terminal/wxcrafter_bitmaps.cpp
@@ -1,329 +1,258 @@
-//
-// 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 = 697;
-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,6,98,75,71,68,0,255,0,255,0,255,160,189,167,147,0,
-0,2,110,73,68,65,84,56,141,101,208,77,79,19,65,24,7,240,255,51,59,187,219,
-45,133,182,208,64,5,162,225,70,122,35,192,93,18,15,94,12,39,62,133,49,49,
-28,49,16,130,137,223,193,131,55,63,134,23,15,154,120,52,242,162,81,15,130,
-82,66,183,165,165,47,59,187,243,242,120,161,4,178,207,101,50,153,249,255,
-230,121,134,112,83,251,251,251,98,117,125,253,101,154,168,237,66,20,213,
-125,223,247,132,16,55,167,12,165,148,27,37,73,79,72,249,190,86,169,108,
-111,108,108,24,0,144,99,96,121,185,241,37,25,141,214,90,173,24,169,74,80,
-156,136,32,165,4,179,67,150,101,208,218,10,95,6,213,114,101,234,197,133,
-202,54,1,60,186,7,88,230,181,56,190,66,187,117,137,110,175,235,6,253,1,
-57,231,8,0,136,8,97,24,242,244,244,44,44,11,42,70,193,195,113,238,22,56,
-63,191,196,226,66,29,243,245,121,40,165,68,166,13,51,216,18,59,38,65,30,
-17,145,32,66,162,82,116,186,125,228,0,149,170,209,209,241,143,98,20,249,
-168,207,213,17,69,17,73,223,247,216,57,88,231,160,146,4,205,139,38,146,
-68,163,80,40,36,57,160,56,17,189,243,101,240,56,213,217,210,217,191,139,
-18,114,197,0,209,104,114,178,244,43,136,194,79,57,128,72,156,213,106,229,
-207,155,207,158,110,197,113,28,28,30,30,46,182,219,253,58,179,35,173,71,
-215,71,223,127,186,181,149,149,46,164,220,26,12,134,205,28,96,157,237,36,
-74,173,2,64,20,69,166,209,104,252,185,186,26,158,14,135,87,244,251,244,
-180,148,40,253,64,4,30,167,42,155,178,218,124,205,1,70,187,142,38,93,30,
-239,211,155,85,3,112,214,18,59,67,66,8,78,211,172,106,157,137,115,0,179,
-237,24,77,101,34,162,123,2,0,107,5,49,59,146,144,208,198,78,25,235,218,
-249,17,82,125,201,146,171,249,207,3,156,179,4,0,94,232,177,209,186,98,153,
-242,29,36,194,116,66,139,60,160,1,235,28,17,9,246,216,227,76,103,181,140,
-108,30,136,107,181,206,92,179,93,5,128,111,39,39,75,231,167,103,79,180,
-206,102,141,113,66,141,70,131,202,100,233,88,8,175,101,44,87,2,214,183,
-35,208,221,199,118,246,94,183,22,234,211,147,206,113,232,73,193,218,104,
-24,109,200,89,230,110,175,135,153,153,154,137,59,215,253,55,7,187,51,227,
-140,184,11,8,230,15,127,155,237,112,48,76,48,24,14,41,12,11,52,51,93,69,
-52,81,164,160,80,164,184,221,243,61,193,31,239,102,238,117,0,0,175,118,
-15,246,0,60,55,214,213,140,117,2,0,60,65,142,136,123,129,47,223,30,236,
-239,238,16,17,143,239,255,7,118,216,77,24,194,230,243,31,0,0,0,0,73,69,
-78,68,174,66,96,130};
-
-static size_t xml_res_size_1 = 797;
-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,6,98,75,71,68,0,255,0,255,0,255,160,189,167,147,0,
-0,2,210,73,68,65,84,56,141,117,83,61,79,35,87,20,61,111,230,61,227,145,
-103,20,201,51,46,40,221,33,26,203,150,5,169,182,218,184,177,210,44,43,167,
-164,216,34,37,93,228,252,130,72,73,195,15,32,18,180,68,161,72,194,22,78,
-170,109,64,66,107,107,186,181,64,32,170,17,120,6,102,134,49,158,175,251,
-94,26,108,37,209,230,86,247,74,231,20,231,158,115,24,254,103,78,78,78,62,
-22,69,209,1,0,206,249,100,103,103,167,243,57,28,91,46,199,199,199,95,0,
-248,65,41,53,98,140,189,39,162,172,223,239,3,0,78,79,79,161,235,250,26,
-17,245,117,93,255,10,192,247,131,193,32,2,0,237,31,228,15,182,109,191,35,
-162,147,162,40,50,203,178,22,68,4,34,130,105,154,105,81,20,153,82,234,87,
-219,182,223,1,248,240,194,1,7,0,34,250,201,182,237,141,86,171,85,201,178,
-12,68,132,60,207,141,171,171,43,0,192,230,230,102,85,8,1,198,24,51,12,163,
-50,153,76,54,124,223,255,17,192,183,26,0,228,121,254,155,231,121,149,56,
-142,193,24,195,245,245,53,166,211,41,210,52,69,154,166,152,78,167,184,188,
-188,132,174,235,152,207,231,240,60,79,228,121,254,251,74,130,97,24,35,41,
-37,164,148,184,185,185,129,16,2,205,102,19,140,49,48,198,208,108,54,97,
-24,6,110,111,111,49,159,207,65,68,204,48,140,17,0,176,195,195,195,143,68,
-212,49,77,51,109,183,219,85,207,243,208,104,52,48,30,143,19,34,250,83,41,
-197,56,231,175,59,157,142,57,155,205,176,190,190,14,215,117,23,113,28,27,
-156,243,9,47,203,178,211,235,245,0,160,250,248,248,136,90,173,134,187,187,
-59,16,209,251,221,221,221,111,0,224,232,232,232,151,251,251,251,183,166,
-105,34,77,83,108,111,111,27,0,48,26,141,218,92,74,9,34,2,0,104,154,6,93,
-215,241,34,103,101,241,210,13,93,215,161,105,218,10,47,165,4,59,56,56,24,
-151,101,217,182,44,43,237,118,187,213,165,11,174,235,38,121,158,255,165,
-105,26,227,156,191,110,181,90,53,206,57,132,16,56,63,63,47,210,52,21,156,
-243,9,123,201,65,197,247,253,172,219,237,194,52,77,40,165,240,252,252,140,
-32,8,192,24,67,189,94,71,173,86,3,0,100,89,134,179,179,51,56,142,179,54,
-24,12,114,14,0,65,16,244,148,82,74,8,193,0,64,8,129,122,189,14,203,178,
-176,188,165,148,40,203,18,68,4,41,37,130,32,232,1,248,67,123,209,248,181,
-227,56,69,165,82,193,98,177,64,20,69,200,178,108,101,99,150,101,8,195,16,
-139,197,2,134,97,192,113,156,92,41,213,95,37,49,73,146,239,0,124,233,186,
-238,198,108,54,19,74,41,102,154,102,186,181,181,85,5,128,139,139,139,244,
-233,233,169,202,24,83,141,70,163,120,120,120,248,148,36,201,112,21,164,
-225,112,24,37,73,242,42,8,130,3,41,229,155,48,12,215,226,56,174,46,191,
-31,69,81,53,12,195,53,41,229,27,223,247,127,78,146,228,213,112,56,140,254,
-213,198,255,206,254,254,254,152,136,218,203,58,239,237,237,125,182,206,
-127,3,135,56,141,125,58,109,237,180,0,0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_2 = 912;
-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,6,98,75,71,68,0,255,0,255,0,255,160,189,167,147,0,
-0,3,69,73,68,65,84,56,141,93,147,79,104,28,101,24,198,127,223,204,236,102,
-103,19,155,77,54,113,147,138,137,201,166,77,107,76,76,178,105,66,91,108,
-171,8,34,226,85,168,32,138,21,44,37,136,24,69,140,22,68,69,48,86,208,83,
-200,205,131,20,196,91,17,170,54,82,234,33,45,228,143,208,54,45,146,52,33,
-150,196,100,187,187,73,246,223,236,204,124,223,124,30,98,99,245,57,61,135,
-135,247,133,247,125,126,130,255,105,105,168,179,71,133,173,211,134,197,
-11,218,83,77,0,34,108,174,107,165,47,32,245,68,199,212,237,155,15,230,197,
-125,51,223,213,21,166,86,143,155,17,251,100,237,83,71,170,162,157,73,195,
-106,136,3,32,51,89,202,127,220,9,182,175,76,185,202,175,156,103,139,51,
-93,243,243,222,238,128,203,39,78,88,181,78,230,183,135,146,201,222,248,
-179,79,219,148,55,209,165,77,180,95,217,217,18,138,32,170,235,32,26,35,
-51,121,217,41,221,89,154,91,104,185,121,252,165,31,80,22,128,93,200,156,
-171,106,109,233,173,237,235,183,239,77,77,145,117,10,180,214,239,193,180,
-76,0,148,220,102,37,183,64,60,186,135,186,190,148,237,57,126,95,235,114,
-48,6,183,70,140,43,61,157,109,202,176,94,141,61,209,109,59,55,174,227,54,
-63,70,251,240,40,203,233,34,110,182,132,155,45,177,156,46,210,62,60,138,
-219,212,138,115,227,58,117,221,61,81,95,132,95,255,181,239,96,171,249,74,
-211,222,79,99,201,142,163,150,244,13,63,151,165,229,212,105,234,134,142,
-98,183,117,176,120,233,18,91,174,228,192,7,31,243,240,224,97,106,170,107,
-216,158,252,5,173,5,68,170,67,229,123,91,134,121,178,33,49,209,208,209,
-30,83,233,13,180,231,83,188,118,149,200,254,253,196,82,135,136,238,59,64,
-227,177,103,104,76,29,162,244,251,44,107,159,127,66,80,241,80,21,15,179,
-62,110,100,238,174,54,27,142,36,97,4,2,63,95,66,186,18,191,80,100,229,236,
-40,217,153,105,26,83,3,52,166,6,200,206,78,243,231,217,15,241,243,69,164,
-43,145,249,34,70,0,174,20,77,150,23,8,237,151,29,164,39,17,128,54,4,127,
-57,30,113,21,236,254,90,42,205,202,118,145,38,64,4,26,13,8,167,130,27,8,
-12,169,140,141,98,46,79,160,64,185,62,171,174,79,239,216,151,36,134,134,
-40,76,207,80,152,158,33,49,56,200,147,95,140,177,234,73,148,235,19,40,40,
-229,242,200,192,88,55,159,223,147,104,15,105,61,16,181,76,67,57,21,186,
-191,58,71,226,248,49,182,175,94,99,241,237,17,114,23,127,38,218,245,56,
-13,71,14,83,159,236,32,251,227,69,68,149,77,58,95,81,249,146,251,173,249,
-92,253,222,91,133,178,60,21,171,182,35,218,113,209,91,155,152,53,213,44,
-188,245,30,178,84,70,85,60,114,63,77,98,239,75,146,62,255,61,165,149,53,
-252,176,205,98,166,152,47,251,230,107,2,224,155,71,250,191,142,134,66,111,
-60,90,99,87,83,41,35,2,133,64,239,246,92,3,26,129,54,76,136,68,185,91,168,
-20,11,190,63,241,206,218,236,187,22,64,243,106,114,100,57,177,52,80,150,
-78,95,162,202,142,90,58,0,173,32,248,231,144,134,1,194,68,106,131,141,173,
-114,185,226,201,185,182,116,242,125,152,253,23,166,9,82,161,245,70,198,
-5,226,229,26,163,42,108,27,166,105,137,29,92,164,214,56,74,170,130,118,
-93,33,196,119,137,180,30,126,147,89,255,63,52,222,215,71,241,254,131,58,
-176,206,32,120,81,235,96,7,103,97,172,11,29,92,192,8,198,63,203,206,221,
-126,48,255,55,47,73,136,107,100,21,126,183,0,0,0,0,73,69,78,68,174,66,96,
-130};
-
-static size_t xml_res_size_3 = 739;
-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,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112,
-72,89,115,0,0,13,215,0,0,13,215,1,66,40,155,120,0,0,0,25,116,69,88,116,
-83,111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,
-101,46,111,114,103,155,238,60,26,0,0,2,96,73,68,65,84,56,141,165,147,65,
-139,92,69,20,133,191,91,85,253,90,103,8,137,104,76,24,97,132,136,89,205,
-98,112,229,239,208,149,11,127,144,63,64,68,240,47,184,113,167,217,40,89,
-4,113,17,35,68,36,40,8,50,65,140,51,221,233,126,239,85,189,170,186,247,
-186,104,18,220,231,194,7,119,119,14,135,115,196,221,121,149,75,15,190,189,
-127,126,116,237,232,139,245,48,72,74,43,137,34,110,128,106,183,82,23,47,
-75,182,156,179,237,166,93,155,115,118,237,221,77,205,204,204,231,101,249,
-60,29,221,56,254,250,214,187,39,119,82,74,132,16,94,82,107,165,181,198,
-60,207,140,227,72,216,173,89,231,140,170,34,34,136,8,155,127,47,63,76,143,
-239,63,124,242,221,151,223,220,185,113,124,157,163,245,49,235,180,198,212,
-40,203,66,46,153,125,222,241,116,243,23,87,227,134,231,211,150,205,184,
-165,180,76,235,157,219,239,156,252,150,54,155,171,101,251,207,37,55,79,
-111,51,63,203,148,144,49,117,106,171,44,189,178,219,111,24,247,123,242,
-60,145,243,68,153,51,83,157,48,55,150,101,241,180,44,139,55,53,78,239,190,
-199,173,211,19,174,46,158,241,248,199,135,152,59,184,163,214,72,146,72,
-97,69,140,137,24,35,34,2,14,110,78,154,242,108,75,45,132,85,164,183,206,
-52,206,228,150,233,189,82,234,204,210,27,230,134,136,19,136,68,137,8,2,
-128,153,122,154,242,168,219,188,229,251,123,247,64,59,49,28,212,68,2,181,
-87,186,27,106,138,186,131,56,34,28,28,0,170,74,218,239,119,122,57,109,176,
-191,159,112,188,122,141,183,174,191,205,221,179,51,162,4,230,121,226,209,
-207,63,209,189,99,166,152,57,32,4,9,8,130,169,121,202,75,209,113,222,129,
-58,125,125,141,170,202,254,193,15,116,173,136,193,210,11,173,41,221,20,
-115,195,204,113,7,23,161,107,247,84,74,238,165,45,168,118,186,118,74,47,
-140,249,57,170,157,33,14,8,66,213,122,160,87,186,53,204,20,113,71,187,146,
-74,41,214,251,130,199,21,150,119,212,94,17,55,82,72,12,105,64,8,168,119,
-170,54,106,111,180,222,121,81,126,119,247,52,188,62,132,55,110,190,73,138,
-137,16,19,32,152,42,81,14,137,187,131,171,65,15,16,34,49,172,72,10,170,
-13,162,12,233,163,79,63,57,63,251,224,28,128,16,2,238,254,18,51,67,85,249,
-255,224,94,252,238,206,159,191,255,241,126,250,229,209,175,31,95,60,189,
-248,202,122,31,212,60,170,169,184,90,52,55,113,243,0,7,83,34,193,69,68,
-67,8,22,131,104,136,177,149,82,63,147,87,157,243,127,10,190,199,6,186,193,
-251,38,0,0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_4 = 1731;
-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,32,0,0,0,32,8,6,0,0,
-0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112,
-72,89,115,0,0,13,215,0,0,13,215,1,66,40,155,120,0,0,0,25,116,69,88,116,
-83,111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,
-101,46,111,114,103,155,238,60,26,0,0,6,64,73,68,65,84,88,133,205,151,79,
-171,37,87,21,197,127,123,159,170,251,94,63,211,118,154,134,104,80,49,17,
-37,233,64,32,25,68,4,13,162,168,51,51,16,28,57,205,103,112,234,39,240,35,
-136,146,153,3,71,130,144,97,34,40,65,236,38,38,180,166,237,16,210,104,119,
-147,215,6,211,221,247,222,170,115,246,31,7,167,238,237,215,175,85,116,98,
-172,162,168,130,226,214,89,103,237,181,215,94,87,50,147,143,243,208,143,
-117,245,255,7,0,3,192,251,215,222,187,121,246,220,39,31,211,162,168,170,
... 420 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2014-01-09 21:16:35
|
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 1b4fce2de80fe8a184ebba99dd7d4ebe8996f834 (commit)
from 45e7aeac867493c4a973567bf28b381af83fca05 (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/1b4fce2de80fe8a184ebba99dd7d4ebe8996f834
commit 1b4fce2de80fe8a184ebba99dd7d4ebe8996f834
Author: dghart <da...@4P...>
Date: Thu Jan 9 21:15:37 2014 +0000
Move the active-bookmark statusbar display from the 3rd to the 2nd pane
diff --git a/LiteEditor/cl_editor.cpp b/LiteEditor/cl_editor.cpp
index abaa34d..4b23792 100644
--- a/LiteEditor/cl_editor.cpp
+++ b/LiteEditor/cl_editor.cpp
@@ -965,6 +965,14 @@ void LEditor::OnSciUpdateUI(wxStyledTextEvent &event)
<< ", Style "
<< GetStyleAt(pos);
+ message << ", ";
+
+ wxString bookmarkString = GetBookmarkLabel((sci_marker_types)GetActiveBookmarkType());
+ if (!bookmarkString.Lower().Contains("type")) {
+ message << _("Bookmark type") << ": ";
+ }
+ message << bookmarkString;
+
// Always update the status bar with event, calling it directly causes performance degredation
DoSetStatusMessage(message, 1);
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
index 6555811..51b888c 100644
--- a/LiteEditor/frame.cpp
+++ b/LiteEditor/frame.cpp
@@ -4624,23 +4624,9 @@ void clMainFrame::SelectBestEnvSet()
preDefTypeMap.SetActive(dbgSetName);
DebuggerConfigTool::Get()->WriteObject(wxT("DebuggerCommands"), &preDefTypeMap);
- wxString bookmarkString;
- LEditor* editor = GetMainBook()->GetActiveEditor();
- if (editor) {
- sci_marker_types activeBMtype = (sci_marker_types)editor->GetActiveBookmarkType();
- bookmarkString = editor->GetBookmarkLabel(activeBMtype);
- }
-
wxString displayString = wxString::Format(wxT("Env: %s, Dbg: %s"),
activeSetName.c_str(),
preDefTypeMap.GetActiveSet().GetName().c_str());
- if (editor) {
- displayString << ", ";
- if (!bookmarkString.Lower().Contains("type")) {
- displayString << _("Bookmark type") << ": ";
- }
- displayString << bookmarkString;
- }
SetStatusMessage(displayString, 2);
}
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/cl_editor.cpp | 8 ++++++++
LiteEditor/frame.cpp | 14 --------------
2 files changed, 8 insertions(+), 14 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-09 18:22:54
|
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 45e7aeac867493c4a973567bf28b381af83fca05 (commit)
from a58d42c13040494b37f02afe4137bad605a8874a (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/45e7aeac867493c4a973567bf28b381af83fca05
commit 45e7aeac867493c4a973567bf28b381af83fca05
Author: Eran <era...@gm...>
Date: Thu Jan 9 20:22:37 2014 +0200
Minor UI updates to the "Add Include Files" dialog
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 5604af9..767af17 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/AddIncludeFile.wxcp b/LiteEditor/AddIncludeFile.wxcp
index d276b2d..8668096 100644
--- a/LiteEditor/AddIncludeFile.wxcp
+++ b/LiteEditor/AddIncludeFile.wxcp
@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
- "m_objCounter": 12,
+ "m_objCounter": 14,
"m_includeFiles": [],
"m_bitmapFunction": "wxC10CDInitBitmapResources",
"m_bitmapsFile": "AddIncludeFile_liteeditor_bitmaps.cpp",
@@ -231,334 +231,6 @@
}],
"m_events": [],
"m_children": [{
- "m_type": 4401,
- "proportion": 1,
- "border": 5,
- "gbSpan": ",",
- "gbPosition": ",",
- "m_styles": [],
- "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
- "m_properties": [{
- "type": "string",
- "m_label": "Name:",
- "m_value": "bSizer12"
- }, {
- "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": 4466,
- "proportion": 1,
- "border": 5,
- "gbSpan": "1,1",
- "gbPosition": "0,0",
- "m_styles": [],
- "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxEXPAND"],
- "m_properties": [{
- "type": "winid",
- "m_label": "ID:",
- "m_winid": "wxID_ANY"
- }, {
- "type": "string",
- "m_label": "Size:",
- "m_value": "400,300"
- }, {
- "type": "string",
- "m_label": "Minimum Size:",
- "m_value": "-1,-1"
- }, {
- "type": "string",
- "m_label": "Name:",
- "m_value": "m_textCtrlPreview"
- }, {
- "type": "multi-string",
- "m_label": "Tooltip:",
- "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": "bool",
- "m_label": "Fold Margin",
- "m_value": false
- }, {
- "type": "bool",
- "m_label": "Line Number Margin",
- "m_value": true
- }, {
- "type": "bool",
- "m_label": "Separator Margin",
- "m_value": false
- }, {
- "type": "bool",
- "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": 20,
- "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": "wxSYS_ANSI_FIXED_FONT,normal,normal,normal"
- }, {
- "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": []
- }, {
- "m_type": 4463,
- "proportion": 0,
- "border": 5,
- "gbSpan": "1,1",
- "gbPosition": "0,0",
- "m_styles": ["wxAUI_TB_DEFAULT_STYLE"],
- "m_sizerFlags": ["wxLEFT", "wxRIGHT", "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": "Name:",
- "m_value": "m_auibar6"
- }, {
- "type": "string",
- "m_label": "Tooltip:",
- "m_value": ""
- }, {
- "type": "string",
- "m_label": "Bitmap Size:",
- "m_value": "16,16"
- }, {
- "type": "string",
- "m_label": "Margins:",
- "m_value": "-1,-1"
- }],
- "m_events": [],
- "m_children": [{
- "m_type": 4462,
- "proportion": 0,
- "border": 5,
- "gbSpan": "1,1",
- "gbPosition": "0,0",
- "m_styles": [],
- "m_sizerFlags": [],
- "m_properties": [{
- "type": "winid",
- "m_label": "ID:",
- "m_winid": "ID_LINEUP"
- }, {
- "type": "string",
- "m_label": "Name:",
- "m_value": "m_toolbarItemUp"
- }, {
- "type": "string",
- "m_label": "Label:",
- "m_value": "Move Up"
- }, {
- "type": "multi-string",
- "m_label": "Tooltip:",
- "m_value": "Move the #include statement one line up"
- }, {
- "type": "string",
- "m_label": "Help String:",
- "m_value": "Move the #include statement one line up"
- }, {
- "type": "bitmapPicker",
- "m_label": "Bitmap File:",
- "m_path": "../git/icons/png/arrow-up.png"
- }, {
- "type": "filePicker",
- "m_label": "Disabled-Bitmap File",
- "m_path": ""
- }, {
- "type": "choice",
- "m_label": "Kind:",
- "m_selection": 0,
- "m_options": ["normal", "checkable", "radio", "separator", "dropdown"]
- }],
- "m_events": [{
- "m_eventName": "wxEVT_COMMAND_TOOL_CLICKED",
- "m_eventClass": "wxCommandEvent",
- "m_eventHandler": "wxCommandEventHandler",
- "m_functionNameAndSignature": "OnButtonUp(wxCommandEvent& event)",
- "m_description": "Process a wxEVT_COMMAND_TOOL_CLICKED event (a synonym for wxEVT_COMMAND_MENU_SELECTED). Pass the id of the tool"
- }],
- "m_children": []
- }, {
- "m_type": 4462,
- "proportion": 0,
- "border": 5,
- "gbSpan": "1,1",
- "gbPosition": "0,0",
- "m_styles": [],
- "m_sizerFlags": [],
- "m_properties": [{
- "type": "winid",
- "m_label": "ID:",
- "m_winid": "ID_LINEDOWN"
- }, {
- "type": "string",
- "m_label": "Name:",
- "m_value": "m_toolbarItemDown"
- }, {
- "type": "string",
- "m_label": "Label:",
- "m_value": "Move Down"
- }, {
- "type": "multi-string",
- "m_label": "Tooltip:",
- "m_value": "Move the #include statement one line down"
- }, {
- "type": "string",
- "m_label": "Help String:",
- "m_value": "Move the #include statement one line down"
- }, {
- "type": "bitmapPicker",
- "m_label": "Bitmap File:",
- "m_path": "../git/icons/png/git-arrow-down.png"
- }, {
- "type": "filePicker",
- "m_label": "Disabled-Bitmap File",
- "m_path": ""
- }, {
- "type": "choice",
- "m_label": "Kind:",
- "m_selection": 0,
- "m_options": ["normal", "checkable", "radio", "separator", "dropdown"]
- }],
- "m_events": [{
- "m_eventName": "wxEVT_COMMAND_TOOL_CLICKED",
- "m_eventClass": "wxCommandEvent",
- "m_eventHandler": "wxCommandEventHandler",
- "m_functionNameAndSignature": "OnButtonDown(wxCommandEvent& event)",
- "m_description": "Process a wxEVT_COMMAND_TOOL_CLICKED event (a synonym for wxEVT_COMMAND_MENU_SELECTED). Pass the id of the tool"
- }],
- "m_children": []
- }, {
- "m_type": 4462,
- "proportion": 0,
- "border": 5,
- "gbSpan": "1,1",
- "gbPosition": "0,0",
- "m_styles": [],
- "m_sizerFlags": [],
- "m_properties": [{
- "type": "winid",
- "m_label": "ID:",
- "m_winid": "wxID_CLEAR"
- }, {
- "type": "string",
- "m_label": "Name:",
- "m_value": "m_toolbarItemClear"
- }, {
- "type": "string",
- "m_label": "Label:",
- "m_value": "Clear Cached Paths"
- }, {
- "type": "multi-string",
- "m_label": "Tooltip:",
- "m_value": "Clear Cached Paths"
- }, {
- "type": "string",
- "m_label": "Help String:",
- "m_value": "Clear Cached Paths"
- }, {
- "type": "bitmapPicker",
- "m_label": "Bitmap File:",
- "m_path": "../codelite-icons/toolbars/16/build/clean.png"
- }, {
- "type": "filePicker",
- "m_label": "Disabled-Bitmap File",
- "m_path": ""
- }, {
- "type": "choice",
- "m_label": "Kind:",
- "m_selection": 0,
- "m_options": ["normal", "checkable", "radio", "separator", "dropdown"]
- }],
- "m_events": [{
- "m_eventName": "wxEVT_COMMAND_TOOL_CLICKED",
- "m_eventClass": "wxCommandEvent",
- "m_eventHandler": "wxCommandEventHandler",
- "m_functionNameAndSignature": "OnClearCachedPaths(wxCommandEvent& event)",
- "m_description": "Process a wxEVT_COMMAND_TOOL_CLICKED event (a synonym for wxEVT_COMMAND_MENU_SELECTED). Pass the id of the tool"
- }],
- "m_children": []
- }]
- }]
- }, {
"m_type": 4403,
"proportion": 0,
"border": 5,
@@ -667,7 +339,7 @@
}, {
"type": "multi-string",
"m_label": "Label:",
- "m_value": "Line that will be added:"
+ "m_value": "Edit the include line:"
}, {
"type": "string",
"m_label": "Wrap:",
@@ -923,6 +595,409 @@
"m_events": [],
"m_children": []
}]
+ }, {
+ "m_type": 4401,
+ "proportion": 1,
+ "border": 5,
+ "gbSpan": ",",
+ "gbPosition": ",",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "bSizer12"
+ }, {
+ "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": 4405,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "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_staticText14"
+ }, {
+ "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_DEFAULT_GUI_FONT,normal,bold,normal"
+ }, {
+ "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": "Preview (read only):"
+ }, {
+ "type": "string",
+ "m_label": "Wrap:",
+ "m_value": "-1"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4463,
+ "proportion": 0,
... 533 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-09 14:55: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 a58d42c13040494b37f02afe4137bad605a8874a (commit)
from 8722ffe27ef47fdcb99c10d1cc6cca7d7df64a50 (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/a58d42c13040494b37f02afe4137bad605a8874a
commit a58d42c13040494b37f02afe4137bad605a8874a
Author: Eran <era...@gm...>
Date: Thu Jan 9 16:55:03 2014 +0200
Fixed: https://sourceforge.net/p/codelite/bugs/945/
Compiler dialog: don't resize the dialog once a new compiler has been added/deleted
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 767af17..5604af9 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"/>
@@ -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"/>
diff --git a/LiteEditor/advanced_settings.cpp b/LiteEditor/advanced_settings.cpp
index de3be07..663a92e 100644
--- a/LiteEditor/advanced_settings.cpp
+++ b/LiteEditor/advanced_settings.cpp
@@ -22,7 +22,7 @@
//
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
- ///////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version May 5 2007)
// http://www.wxformbuilder.org/
//
@@ -47,300 +47,295 @@
#include "compilerlinkeroptionspage.h"
#include "globals.h"
#include "frame.h"
+#include <wx/textdlg.h>
BEGIN_EVENT_TABLE(AdvancedDlg, wxDialog)
- EVT_MENU(XRCID("delete_compiler"), AdvancedDlg::OnDeleteCompiler)
+ EVT_MENU(XRCID("delete_compiler"), AdvancedDlg::OnDeleteCompiler)
END_EVENT_TABLE()
///////////////////////////////////////////////////////////////////////////
AdvancedDlg::AdvancedDlg( wxWindow* parent, size_t selected_page, int id, wxString title, wxPoint pos, wxSize size, int style )
- : wxDialog( parent, id, title, pos, size, style | wxRESIZE_BORDER )
- , m_rightclickMenu(NULL)
+ : wxDialog( parent, id, title, pos, size, style | wxRESIZE_BORDER )
+ , m_rightclickMenu(NULL)
{
- wxBoxSizer* mainSizer;
- mainSizer = new wxBoxSizer( wxVERTICAL );
+ wxBoxSizer* mainSizer;
+ mainSizer = new wxBoxSizer( wxVERTICAL );
+
+ m_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize);
+ m_compilersPage = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- m_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize);
- m_compilersPage = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+ wxBoxSizer* bSizer5;
+ bSizer5 = new wxBoxSizer( wxVERTICAL );
- wxBoxSizer* bSizer5;
- bSizer5 = new wxBoxSizer( wxVERTICAL );
+ wxBoxSizer* bSizer4;
+ bSizer4 = new wxBoxSizer( wxHORIZONTAL );
- wxBoxSizer* bSizer4;
- bSizer4 = new wxBoxSizer( wxHORIZONTAL );
+ m_staticText1 = new wxStaticText( m_compilersPage, wxID_ANY, _("Create New Compiler:"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer4->Add( m_staticText1, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
- m_staticText1 = new wxStaticText( m_compilersPage, wxID_ANY, _("Create New Compiler:"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer4->Add( m_staticText1, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ m_buttonNewCompiler = new wxButton( m_compilersPage, wxID_ANY, _("New..."), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer4->Add( m_buttonNewCompiler, 0, wxALL|wxALIGN_RIGHT, 5 );
- m_buttonNewCompiler = new wxButton( m_compilersPage, wxID_ANY, _("New..."), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer4->Add( m_buttonNewCompiler, 0, wxALL|wxALIGN_RIGHT, 5 );
+ bSizer5->Add( bSizer4, 0, wxALIGN_RIGHT|wxEXPAND, 5 );
- bSizer5->Add( bSizer4, 0, wxALIGN_RIGHT|wxEXPAND, 5 );
+ m_staticline2 = new wxStaticLine( m_compilersPage, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+ bSizer5->Add( m_staticline2, 0, wxEXPAND | wxRIGHT | wxLEFT, 5 );
- m_staticline2 = new wxStaticLine( m_compilersPage, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
- bSizer5->Add( m_staticline2, 0, wxEXPAND | wxRIGHT | wxLEFT, 5 );
+ m_compilersNotebook = new wxTreebook(m_compilersPage, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBK_DEFAULT );
+ bSizer5->Add( m_compilersNotebook, 1, wxALL|wxEXPAND, 5 );
+ MSWSetNativeTheme(m_compilersNotebook->GetTreeCtrl());
- m_compilersNotebook = new wxTreebook(m_compilersPage, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBK_DEFAULT );
- bSizer5->Add( m_compilersNotebook, 1, wxALL|wxEXPAND, 5 );
- MSWSetNativeTheme(m_compilersNotebook->GetTreeCtrl());
-
- m_compilersPage->SetSizer( bSizer5 );
- m_compilersPage->Layout();
- bSizer5->Fit( m_compilersPage );
- m_notebook->AddPage( m_compilersPage, _("Compilers"), true );
+ m_compilersPage->SetSizer( bSizer5 );
+ m_compilersPage->Layout();
+ bSizer5->Fit( m_compilersPage );
+ m_notebook->AddPage( m_compilersPage, _("Compilers"), true );
- mainSizer->Add( m_notebook, 1, wxEXPAND | wxALL, 5 );
+ mainSizer->Add( m_notebook, 1, wxEXPAND | wxALL, 5 );
- wxBoxSizer* btnSizer;
- btnSizer = new wxBoxSizer( wxHORIZONTAL );
+ wxBoxSizer* btnSizer;
+ btnSizer = new wxBoxSizer( wxHORIZONTAL );
- m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
- btnSizer->Add( m_buttonOK, 0, wxALL, 5 );
+ m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ btnSizer->Add( m_buttonOK, 0, wxALL, 5 );
- m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
- btnSizer->Add( m_buttonCancel, 0, wxALL, 5 );
+ m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+ btnSizer->Add( m_buttonCancel, 0, wxALL, 5 );
- m_buttonRestoreDefaults = new wxButton( this, wxID_REVERT, _("Load Defaults..."), wxDefaultPosition, wxDefaultSize, 0 );
- btnSizer->Add( m_buttonRestoreDefaults, 0, wxALL, 5 );
- m_buttonRestoreDefaults->SetToolTip(_("Revert all the changes and restore all the build settings to the factory defaults"));
- mainSizer->Add( btnSizer, 0, wxALIGN_RIGHT, 5 );
+ m_buttonRestoreDefaults = new wxButton( this, wxID_REVERT, _("Load Defaults..."), wxDefaultPosition, wxDefaultSize, 0 );
+ btnSizer->Add( m_buttonRestoreDefaults, 0, wxALL, 5 );
+ m_buttonRestoreDefaults->SetToolTip(_("Revert all the changes and restore all the build settings to the factory defaults"));
+ mainSizer->Add( btnSizer, 0, wxALIGN_RIGHT, 5 );
- m_buildSettings = new BuildTabSetting(m_notebook);
- m_notebook->AddPage(m_buildSettings, _("Build Output Appearance"), false);
+ m_buildSettings = new BuildTabSetting(m_notebook);
+ m_notebook->AddPage(m_buildSettings, _("Build Output Appearance"), false);
- m_buildPage = new BuildPage(m_notebook);
- m_notebook->AddPage(m_buildPage, _("Build Systems"), false);
+ m_buildPage = new BuildPage(m_notebook);
+ m_notebook->AddPage(m_buildPage, _("Build Systems"), false);
- this->SetSizer( mainSizer );
- this->Layout();
+ this->SetSizer( mainSizer );
+ this->Layout();
- m_compilersNotebook->GetTreeCtrl()->Connect(wxEVT_CONTEXT_MENU, wxContextMenuEventHandler(AdvancedDlg::OnContextMenu), NULL, this);
- m_rightclickMenu = wxXmlResource::Get()->LoadMenu(wxT("delete_compiler_menu"));
+ m_compilersNotebook->GetTreeCtrl()->Connect(wxEVT_CONTEXT_MENU, wxContextMenuEventHandler(AdvancedDlg::OnContextMenu), NULL, this);
+ m_rightclickMenu = wxXmlResource::Get()->LoadMenu(wxT("delete_compiler_menu"));
- LoadCompilers();
+ LoadCompilers();
- if(m_compilersNotebook->GetPageCount()){
- if(m_compilersNotebook->GetSelection() != wxNOT_FOUND) {
- m_compilersNotebook->ExpandNode(m_compilersNotebook->GetSelection());
- }
- }
+ if(m_compilersNotebook->GetPageCount()) {
+ if(m_compilersNotebook->GetSelection() != wxNOT_FOUND) {
+ m_compilersNotebook->ExpandNode(m_compilersNotebook->GetSelection());
+ }
+ }
- ConnectButton(m_buttonNewCompiler, AdvancedDlg::OnButtonNewClicked);
- ConnectButton(m_buttonOK, AdvancedDlg::OnButtonOKClicked);
- ConnectButton(m_buttonRestoreDefaults, AdvancedDlg::OnRestoreDefaults);
-
- m_notebook->SetSelection( selected_page );
+ ConnectButton(m_buttonNewCompiler, AdvancedDlg::OnButtonNewClicked);
+ ConnectButton(m_buttonOK, AdvancedDlg::OnButtonOKClicked);
+ ConnectButton(m_buttonRestoreDefaults, AdvancedDlg::OnRestoreDefaults);
- // center the dialog
- Centre();
- this->Layout();
- GetSizer()->Fit(this);
- m_buttonOK->SetDefault();
- m_compilersNotebook->SetFocus();
- WindowAttrManager::Load(this, wxT("BuildSettingsDlg"), NULL);
+ m_notebook->SetSelection( selected_page );
+
+ // center the dialog
+ Centre();
+ this->Layout();
+ GetSizer()->Fit(this);
+ m_buttonOK->SetDefault();
+ m_compilersNotebook->SetFocus();
+ WindowAttrManager::Load(this, wxT("BuildSettingsDlg"), NULL);
}
void AdvancedDlg::LoadCompilers()
{
- m_compilerPagesMap.clear();
- m_compilersNotebook->Freeze();
- m_compilersNotebook->DeleteAllPages();
-
- BuildSettingsConfigCookie cookie;
-
- wxString proj, conf;
- ManagerST::Get()->GetActiveProjectAndConf(proj, conf);
-
- wxString cmpType;
- BuildConfigPtr bldConf = WorkspaceST::Get()->GetProjBuildConf(proj, conf);
- if(bldConf) {
- cmpType = bldConf->GetCompilerType();
- }
-
- CompilerPtr cmp = BuildSettingsConfigST::Get()->GetFirstCompiler(cookie);
- while (cmp) {
- AddCompiler(cmp, cmpType == cmp->GetName());
- cmp = BuildSettingsConfigST::Get()->GetNextCompiler(cookie);
- }
- m_compilersNotebook->Thaw();
+ m_compilerPagesMap.clear();
+ m_compilersNotebook->Freeze();
+ m_compilersNotebook->DeleteAllPages();
+
+ BuildSettingsConfigCookie cookie;
+
+ wxString proj, conf;
+ ManagerST::Get()->GetActiveProjectAndConf(proj, conf);
+
+ wxString cmpType;
+ BuildConfigPtr bldConf = WorkspaceST::Get()->GetProjBuildConf(proj, conf);
+ if(bldConf) {
+ cmpType = bldConf->GetCompilerType();
+ }
+
+ CompilerPtr cmp = BuildSettingsConfigST::Get()->GetFirstCompiler(cookie);
+ while (cmp) {
+ AddCompiler(cmp, cmpType == cmp->GetName());
+ cmp = BuildSettingsConfigST::Get()->GetNextCompiler(cookie);
+ }
+ m_compilersNotebook->Thaw();
}
AdvancedDlg::~AdvancedDlg()
{
- delete m_rightclickMenu;
- WindowAttrManager::Save(this, wxT("BuildSettingsDlg"), NULL);
+ delete m_rightclickMenu;
+ WindowAttrManager::Save(this, wxT("BuildSettingsDlg"), NULL);
}
void AdvancedDlg::OnButtonNewClicked(wxCommandEvent &event)
{
- wxUnusedVar(event);
- wxTextEntryDialog *dlg = new wxTextEntryDialog(this, _("Enter New Compiler Name:"), _("New Compiler"));
- if (dlg->ShowModal() == wxID_OK) {
- wxString name = dlg->GetValue();
- TrimString(name);
- if (name.IsEmpty() == false) {
- CreateDefaultNewCompiler(name);
- LoadCompilers();
-
- if(m_compilersNotebook->GetPageCount() > ((m_compilerPagesMap.size() *6)-1) ) {
- int start_pos = (m_compilerPagesMap.size()-1)*6;
- m_compilersNotebook->ExpandNode(start_pos);
- m_compilersNotebook->SetSelection(start_pos + 1);
- }
- SetSizerAndFit(GetSizer());
- }
- }
- dlg->Destroy();
+ wxUnusedVar(event);
+ wxString newCompilerName = ::wxGetTextFromUser( _("Enter New Compiler Name:"), _("New Compiler"));
+ TrimString(newCompilerName);
+
+ if ( !newCompilerName.IsEmpty() ) {
+ CreateDefaultNewCompiler(newCompilerName);
+ LoadCompilers();
+
+ if(m_compilersNotebook->GetPageCount() > ((m_compilerPagesMap.size() *6)-1) ) {
+ int start_pos = (m_compilerPagesMap.size()-1)*6;
+ m_compilersNotebook->ExpandNode(start_pos);
+ m_compilersNotebook->SetSelection(start_pos + 1);
+ }
+ }
}
void AdvancedDlg::OnButtonOKClicked(wxCommandEvent &event)
{
- wxUnusedVar(event);
- //save all compiler pages
- SaveCompilers();
-
- //save the build page
- m_buildPage->Save();
- m_buildSettings->Save();
-
- //mark all the projects as dirty
- wxArrayString projects;
- WorkspaceST::Get()->GetProjectList( projects );
- for ( size_t i=0; i< projects.size(); i++ ) {
- ProjectPtr proj = ManagerST::Get()->GetProject( projects.Item(i) );
- if ( proj ) {
- proj->SetModified( true );
- }
- }
- EndModal(wxID_OK);
+ wxUnusedVar(event);
+ //save all compiler pages
+ SaveCompilers();
+
+ //save the build page
+ m_buildPage->Save();
+ m_buildSettings->Save();
+
+ //mark all the projects as dirty
+ wxArrayString projects;
+ WorkspaceST::Get()->GetProjectList( projects );
+ for ( size_t i=0; i< projects.size(); i++ ) {
+ ProjectPtr proj = ManagerST::Get()->GetProject( projects.Item(i) );
+ if ( proj ) {
+ proj->SetModified( true );
+ }
+ }
+ EndModal(wxID_OK);
}
void AdvancedDlg::OnDeleteCompiler(wxCommandEvent & event)
{
- wxUnusedVar(event);
- int sel = m_compilersNotebook->GetSelection();
-
- if (sel != wxNOT_FOUND) {
- wxString name = m_compilersNotebook->GetPageText((size_t)sel);
- if (DeleteCompiler(name)) {
- m_compilersNotebook->DeletePage((size_t)sel);
-
- std::map<wxString, std::vector<ICompilerSubPage*> >::iterator iter = m_compilerPagesMap.find(name);
- if(iter != m_compilerPagesMap.end()){
- m_compilerPagesMap.erase(iter);
- }
-
- if(m_compilersNotebook->GetPageCount()){
- m_compilersNotebook->ExpandNode(0);
- m_compilersNotebook->SetSelection(1);
- }
- SetSizerAndFit(GetSizer());
- }
- }
+ wxUnusedVar(event);
+ int sel = m_compilersNotebook->GetSelection();
+
+ if (sel != wxNOT_FOUND) {
+ wxString name = m_compilersNotebook->GetPageText((size_t)sel);
+ if (DeleteCompiler(name)) {
+ m_compilersNotebook->DeletePage((size_t)sel);
+
+ std::map<wxString, std::vector<ICompilerSubPage*> >::iterator iter = m_compilerPagesMap.find(name);
+ if(iter != m_compilerPagesMap.end()) {
+ m_compilerPagesMap.erase(iter);
+ }
+
+ if(m_compilersNotebook->GetPageCount()) {
+ m_compilersNotebook->ExpandNode(0);
+ m_compilersNotebook->SetSelection(1);
+ }
+ }
+ }
}
void AdvancedDlg::SaveCompilers()
{
- std::map<wxString, std::vector<ICompilerSubPage*> >::iterator iter = m_compilerPagesMap.begin();
- for(; iter != m_compilerPagesMap.end(); iter ++){
- std::vector<ICompilerSubPage*> items = iter->second;
- wxString cmpname = iter->first;
- CompilerPtr cmp = BuildSettingsConfigST::Get()->GetCompiler(cmpname);
- if(cmp){
- for(size_t i=0; i<items.size(); i++){
- ICompilerSubPage* p = items.at(i);
- p->Save(cmp);
- }
- BuildSettingsConfigST::Get()->SetCompiler(cmp);//save changes
- }
- }
+ std::map<wxString, std::vector<ICompilerSubPage*> >::iterator iter = m_compilerPagesMap.begin();
+ for(; iter != m_compilerPagesMap.end(); iter ++) {
+ std::vector<ICompilerSubPage*> items = iter->second;
+ wxString cmpname = iter->first;
+ CompilerPtr cmp = BuildSettingsConfigST::Get()->GetCompiler(cmpname);
+ if(cmp) {
+ for(size_t i=0; i<items.size(); i++) {
+ ICompilerSubPage* p = items.at(i);
+ p->Save(cmp);
+ }
+ BuildSettingsConfigST::Get()->SetCompiler(cmp);//save changes
+ }
+ }
}
bool AdvancedDlg::CreateDefaultNewCompiler ( const wxString &name )
{
- 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 );
- cmp->SetName ( name );
- BuildSettingsConfigST::Get()->SetCompiler ( cmp );
- return true;
+ 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 );
+ cmp->SetName ( name );
+ BuildSettingsConfigST::Get()->SetCompiler ( cmp );
+ return true;
}
void AdvancedDlg::AddCompiler(CompilerPtr cmp, bool selected)
{
- std::vector<ICompilerSubPage*> pages;
-
- // add the root node
- m_compilersNotebook->AddPage(0, cmp->GetName(), selected);
-
- CompilerToolsPage *p3 = new CompilerToolsPage(m_compilersNotebook, cmp->GetName());
- pages.push_back(p3);
- m_compilersNotebook->AddSubPage(p3, _("Tools"), selected);
-
- CompilerPatternsPage *p2 = new CompilerPatternsPage(m_compilersNotebook, cmp->GetName());
- pages.push_back(p2);
- m_compilersNotebook->AddSubPage(p2, _("Patterns"), false);
-
- CompilerSwitchesPage *p4 = new CompilerSwitchesPage(m_compilersNotebook, cmp->GetName());
- pages.push_back(p4);
- m_compilersNotebook->AddSubPage(p4, _("Switches"), false);
-
- CompilerFileTypePage *p5 = new CompilerFileTypePage(m_compilersNotebook, cmp->GetName());
- pages.push_back(p5);
- m_compilersNotebook->AddSubPage(p5, _("File Types"), false);
-
- CompilerCompilerOptionsPage *p6 = new CompilerCompilerOptionsPage(m_compilersNotebook, cmp->GetName());
- pages.push_back(p6);
- m_compilersNotebook->AddSubPage(p6, _("Compiler options"), false);
-
- CompilerLinkerOptionsPage *p7 = new CompilerLinkerOptionsPage(m_compilersNotebook, cmp->GetName());
- pages.push_back(p7);
- m_compilersNotebook->AddSubPage(p7, _("Linker options"), false);
-
- CompilerAdvancePage *p8 = new CompilerAdvancePage(m_compilersNotebook, cmp->GetName());
- pages.push_back(p8);
- m_compilersNotebook->AddSubPage(p8, _("Advanced"), false);
-
- m_compilerPagesMap[cmp->GetName()] = pages;
+ std::vector<ICompilerSubPage*> pages;
+
+ // add the root node
+ m_compilersNotebook->AddPage(0, cmp->GetName(), selected);
+
+ CompilerToolsPage *p3 = new CompilerToolsPage(m_compilersNotebook, cmp->GetName());
+ pages.push_back(p3);
+ m_compilersNotebook->AddSubPage(p3, _("Tools"), selected);
+
+ CompilerPatternsPage *p2 = new CompilerPatternsPage(m_compilersNotebook, cmp->GetName());
+ pages.push_back(p2);
+ m_compilersNotebook->AddSubPage(p2, _("Patterns"), false);
+
+ CompilerSwitchesPage *p4 = new CompilerSwitchesPage(m_compilersNotebook, cmp->GetName());
+ pages.push_back(p4);
+ m_compilersNotebook->AddSubPage(p4, _("Switches"), false);
+
+ CompilerFileTypePage *p5 = new CompilerFileTypePage(m_compilersNotebook, cmp->GetName());
+ pages.push_back(p5);
+ m_compilersNotebook->AddSubPage(p5, _("File Types"), false);
+
+ CompilerCompilerOptionsPage *p6 = new CompilerCompilerOptionsPage(m_compilersNotebook, cmp->GetName());
+ pages.push_back(p6);
+ m_compilersNotebook->AddSubPage(p6, _("Compiler options"), false);
+
... 462 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2014-01-07 17:05:52
|
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 8722ffe27ef47fdcb99c10d1cc6cca7d7df64a50 (commit)
from 8c14e6d9be6d3cb0602fc87c27b205e91a26d1c2 (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/8722ffe27ef47fdcb99c10d1cc6cca7d7df64a50
commit 8722ffe27ef47fdcb99c10d1cc6cca7d7df64a50
Author: dghart <da...@4P...>
Date: Sun Jan 5 20:31:15 2014 +0000
Partially fix a scrollbar bug when using the non-native notebook on wxGTK
Since the change to using the wxAuiNotebook by default, there's been an annoying glitch with scrollbar drawing: after the notebook selection is changed, any scrollbars are briefly drawn but then disappear, leaving a grey gap.
This commit fixes that when the selection changes because of a tab-click, but not when the change comes from a Workspace View selection.
diff --git a/Plugin/notebook_ex.cpp b/Plugin/notebook_ex.cpp
index 9d705e1..f4f5e8c 100644
--- a/Plugin/notebook_ex.cpp
+++ b/Plugin/notebook_ex.cpp
@@ -462,7 +462,7 @@ void Notebook::DoPageChangedEvent(wxAuiNotebookEvent& e)
event.SetSelection ( e.GetSelection() );
event.SetOldSelection( e.GetOldSelection() );
event.SetEventObject ( this );
- GetEventHandler()->AddPendingEvent(event);
+ GetEventHandler()->ProcessEvent(event);
PushPageHistory( GetPage(e.GetSelection()) );
e.Skip();
-----------------------------------------------------------------------
Summary of changes:
Plugin/notebook_ex.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-06 18:55: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 8c14e6d9be6d3cb0602fc87c27b205e91a26d1c2 (commit)
via ca04172bd7c0a3824784d8655633f93babf7b85f (commit)
from 421d9db81311cff374166305ceff24f0902479b0 (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/8c14e6d9be6d3cb0602fc87c27b205e91a26d1c2
commit 8c14e6d9be6d3cb0602fc87c27b205e91a26d1c2
Author: Eran <era...@gm...>
Date: Mon Jan 6 20:55:22 2014 +0200
Fixed wrong colors used in tags-settings dialog
diff --git a/LiteEditor/tags_options_base_dlg.cpp b/LiteEditor/tags_options_base_dlg.cpp
index cd71675..e77783c 100644
--- a/LiteEditor/tags_options_base_dlg.cpp
+++ b/LiteEditor/tags_options_base_dlg.cpp
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: tags_options_base_dlg.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -22,7 +23,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
bBitmapLoaded = true;
}
- mainSizer = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
this->SetSizer(mainSizer);
m_treebook2 = new wxTreebook(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBK_DEFAULT);
@@ -32,14 +33,14 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
m_paneDisplayAndBehavior = new wxPanel(m_treebook2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_treebook2->AddPage(m_paneDisplayAndBehavior, _("Display and Behavior"), false, wxNOT_FOUND);
- bSizer19 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer19 = new wxBoxSizer(wxVERTICAL);
m_paneDisplayAndBehavior->SetSizer(bSizer19);
- sbSizer2 = new wxStaticBoxSizer( new wxStaticBox(m_paneDisplayAndBehavior, wxID_ANY, _("Display:")), wxVERTICAL);
+ wxStaticBoxSizer* sbSizer2 = new wxStaticBoxSizer( new wxStaticBox(m_paneDisplayAndBehavior, wxID_ANY, _("Display:")), wxVERTICAL);
bSizer19->Add(sbSizer2, 0, wxALL|wxEXPAND, 5);
- flexGridSizer12 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer12 = new wxFlexGridSizer( 0, 2, 0, 0);
flexGridSizer12->SetFlexibleDirection( wxBOTH );
flexGridSizer12->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer12->AddGrowableCol(1);
@@ -83,11 +84,11 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
flexGridSizer12->Add(m_checkBoxKeepFunctionSignature, 0, wxALL|wxEXPAND, 5);
- sbSizer15 = new wxStaticBoxSizer( new wxStaticBox(m_paneDisplayAndBehavior, wxID_ANY, _("Behavior:")), wxVERTICAL);
+ wxStaticBoxSizer* sbSizer15 = new wxStaticBoxSizer( new wxStaticBox(m_paneDisplayAndBehavior, wxID_ANY, _("Behavior:")), wxVERTICAL);
bSizer19->Add(sbSizer15, 0, wxALL|wxEXPAND, 5);
- gSizer2 = new wxGridSizer( 3, 1, 0, 0);
+ wxGridSizer* gSizer2 = new wxGridSizer( 3, 1, 0, 0);
sbSizer15->Add(gSizer2, 1, wxEXPAND, 5);
@@ -112,14 +113,14 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
m_paneColouring = new wxPanel(m_treebook2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_treebook2->AddPage(m_paneColouring, _("Colouring"), false, wxNOT_FOUND);
- bSizer16 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer16 = new wxBoxSizer(wxVERTICAL);
m_paneColouring->SetSizer(bSizer16);
- sbSizer4 = new wxStaticBoxSizer( new wxStaticBox(m_paneColouring, wxID_ANY, wxT("")), wxVERTICAL);
+ wxStaticBoxSizer* sbSizer4 = new wxStaticBoxSizer( new wxStaticBox(m_paneColouring, wxID_ANY, wxT("")), wxVERTICAL);
bSizer16->Add(sbSizer4, 0, wxALL|wxEXPAND, 5);
- bSizer11 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer11 = new wxBoxSizer(wxHORIZONTAL);
sbSizer4->Add(bSizer11, 0, wxEXPAND, 5);
@@ -146,7 +147,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
sbSizer4->Add(m_checkColourProjTags, 0, wxALL|wxEXPAND, 5);
- fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0);
+ wxFlexGridSizer* fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0);
fgSizer3->SetFlexibleDirection( wxBOTH );
fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -215,14 +216,14 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
m_paneTriggering = new wxPanel(m_treebook2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_treebook2->AddPage(m_paneTriggering, _("Triggering"), false, wxNOT_FOUND);
- bSizer17 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer17 = new wxBoxSizer(wxVERTICAL);
m_paneTriggering->SetSizer(bSizer17);
- sbSizer7 = new wxStaticBoxSizer( new wxStaticBox(m_paneTriggering, wxID_ANY, _("Automatic Word Completion:")), wxVERTICAL);
+ wxStaticBoxSizer* sbSizer7 = new wxStaticBoxSizer( new wxStaticBox(m_paneTriggering, wxID_ANY, _("Automatic Word Completion:")), wxVERTICAL);
bSizer17->Add(sbSizer7, 0, wxALL|wxEXPAND, 5);
- fgSizer4 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* fgSizer4 = new wxFlexGridSizer( 0, 2, 0, 0);
fgSizer4->SetFlexibleDirection( wxBOTH );
fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer4->AddGrowableCol(1);
@@ -258,7 +259,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
m_panelCtagsSearchPaths = new wxPanel(m_treebook2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_treebook2->InsertSubPage(3, m_panelCtagsSearchPaths, _("Search paths"), false, wxNOT_FOUND);
- bSizer7 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer7 = new wxBoxSizer(wxVERTICAL);
m_panelCtagsSearchPaths->SetSizer(bSizer7);
m_notebook36 = new wxNotebook(m_panelCtagsSearchPaths, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBK_DEFAULT);
@@ -268,18 +269,18 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
m_panel38 = new wxPanel(m_notebook36, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_notebook36->AddPage(m_panel38, _("Search Paths"), true);
- boxSizer30 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer30 = new wxBoxSizer(wxVERTICAL);
m_panel38->SetSizer(boxSizer30);
m_banner34 = new wxBannerWindow(m_panel38, wxID_ANY, wxTOP, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME);
m_banner34->SetBitmap(wxNullBitmap);
m_banner34->SetText(_("Search paths"), _("codelite will search for include files in these locations"));
- m_banner34->SetGradient(wxColour(wxT("rgb(48,48,48)")), wxColour(wxT("rgb(48,48,48)")));
- m_banner34->SetForegroundColour(wxColour(wxT("rgb(255,255,255)")));
+ m_banner34->SetGradient(wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION), wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION));
+ m_banner34->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
boxSizer30->Add(m_banner34, 0, wxALL|wxEXPAND, 5);
- bSizer9 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer9 = new wxBoxSizer(wxHORIZONTAL);
boxSizer30->Add(bSizer9, 1, wxEXPAND, 5);
@@ -296,7 +297,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
bSizer9->Add(m_textCtrlCtagsSearchPaths, 1, wxALL|wxEXPAND, 5);
- bSizer8 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer8 = new wxBoxSizer(wxVERTICAL);
bSizer9->Add(bSizer8, 0, wxEXPAND, 5);
@@ -307,18 +308,18 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
m_panel40 = new wxPanel(m_notebook36, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_notebook36->AddPage(m_panel40, _("Exclude Paths"), false);
- boxSizer42 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer42 = new wxBoxSizer(wxVERTICAL);
m_panel40->SetSizer(boxSizer42);
m_banner44 = new wxBannerWindow(m_panel40, wxID_ANY, wxTOP, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME);
m_banner44->SetBitmap(wxNullBitmap);
m_banner44->SetText(_("Exclude paths"), _("codelite code completion will ignore any files found in one of the paths below"));
- m_banner44->SetGradient(wxColour(wxT("rgb(48,48,48)")), wxColour(wxT("rgb(48,48,48)")));
- m_banner44->SetForegroundColour(wxColour(wxT("rgb(255,255,255)")));
+ m_banner44->SetGradient(wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION), wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION));
+ m_banner44->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
boxSizer42->Add(m_banner44, 0, wxALL|wxEXPAND, 5);
- bSizer91 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer91 = new wxBoxSizer(wxHORIZONTAL);
boxSizer42->Add(bSizer91, 1, wxEXPAND, 5);
@@ -335,7 +336,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
bSizer91->Add(m_textCtrlCtagsExcludePaths, 1, wxALL|wxEXPAND, 5);
- bSizer81 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer81 = new wxBoxSizer(wxVERTICAL);
bSizer91->Add(bSizer81, 0, wxEXPAND, 5);
@@ -346,10 +347,10 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
m_panelCtagsAdvanced = new wxPanel(m_treebook2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_treebook2->InsertSubPage(3, m_panelCtagsAdvanced, _("Advanced"), false, wxNOT_FOUND);
- bSizer6 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer6 = new wxBoxSizer(wxVERTICAL);
m_panelCtagsAdvanced->SetSizer(bSizer6);
- 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);
@@ -364,7 +365,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
fgSizer2->Add(m_textFileSpec, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
- bSizer14 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer14 = new wxBoxSizer(wxVERTICAL);
bSizer6->Add(bSizer14, 0, wxEXPAND, 5);
@@ -372,7 +373,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
bSizer14->Add(m_staticText92, 0, wxALL|wxEXPAND, 5);
- bSizer15 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer15 = new wxBoxSizer(wxHORIZONTAL);
bSizer14->Add(bSizer15, 1, wxEXPAND, 5);
@@ -392,7 +393,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
m_panelClangGeneral->SetToolTip(_("List here list of tokens to be pre-processed by codelite-indexer. \nUsually, you would like to add here macros which confuse the parser\nClick the below link to read more about this feature and the syntax supported.\n"));
m_notebook2->AddPage(m_panelClangGeneral, _("Tokens"), false);
- bSizer5 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer5 = new wxBoxSizer(wxVERTICAL);
m_panelClangGeneral->SetSizer(bSizer5);
m_textPrep = new wxTextCtrl(m_panelClangGeneral, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), wxTE_RICH2|wxTE_PROCESS_TAB|wxTE_PROCESS_ENTER|wxTE_MULTILINE|wxTE_DONTWRAP);
@@ -408,7 +409,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
bSizer5->Add(m_textPrep, 1, wxEXPAND, 5);
- sbSizer52 = new wxStaticBoxSizer( new wxStaticBox(m_panelClangGeneral, wxID_ANY, wxT("")), wxVERTICAL);
+ wxStaticBoxSizer* sbSizer52 = new wxStaticBoxSizer( new wxStaticBox(m_panelClangGeneral, wxID_ANY, wxT("")), wxVERTICAL);
bSizer5->Add(sbSizer52, 0, wxALL|wxEXPAND, 5);
@@ -421,17 +422,17 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
sbSizer52->Add(m_hyperlink1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
- bSizer131 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer131 = new wxBoxSizer(wxHORIZONTAL);
bSizer5->Add(bSizer131, 0, wxEXPAND, 5);
m_panel5 = new wxPanel(m_notebook2, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL);
m_notebook2->AddPage(m_panel5, _("Types"), false);
- bSizer13 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer13 = new wxBoxSizer(wxVERTICAL);
m_panel5->SetSizer(bSizer13);
- sbSizer521 = new wxStaticBoxSizer( new wxStaticBox(m_panel5, wxID_ANY, wxT("")), wxVERTICAL);
+ wxStaticBoxSizer* sbSizer521 = new wxStaticBoxSizer( new wxStaticBox(m_panel5, wxID_ANY, wxT("")), wxVERTICAL);
bSizer13->Add(sbSizer521, 0, wxALL|wxEXPAND, 5);
@@ -455,7 +456,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
m_panelClang = new wxPanel(m_treebook2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_treebook2->AddPage(m_panelClang, _("Clang"), false, wxNOT_FOUND);
- bSizer18 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer18 = new wxBoxSizer(wxVERTICAL);
m_panelClang->SetSizer(bSizer18);
m_checkBoxEnableClangCC = new wxCheckBox(m_panelClang, wxID_ANY, _("Enable clang code completion"), wxDefaultPosition, wxSize(-1, -1), 0);
@@ -470,10 +471,10 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
m_panel3 = new wxPanel(m_notebookClang, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL);
m_notebookClang->AddPage(m_panel3, _("General"), false);
- bSizer20 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer20 = new wxBoxSizer(wxVERTICAL);
m_panel3->SetSizer(bSizer20);
- fgSizer5 = new wxFlexGridSizer( 0, 1, 0, 0);
+ wxFlexGridSizer* fgSizer5 = new wxFlexGridSizer( 0, 1, 0, 0);
fgSizer5->SetFlexibleDirection( wxBOTH );
fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer5->AddGrowableCol(0);
@@ -494,7 +495,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
bSizer20->Add(m_panel8, 1, wxALL|wxEXPAND, 5);
- bSizer24 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer24 = new wxBoxSizer(wxVERTICAL);
m_panel8->SetSizer(bSizer24);
m_textCtrlClangSearchPaths = new wxTextCtrl(m_panel8, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), wxTE_RICH2|wxTE_PROCESS_TAB|wxTE_PROCESS_ENTER|wxTE_MULTILINE);
@@ -518,10 +519,10 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
m_panel4 = new wxPanel(m_notebookClang, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL);
m_notebookClang->AddPage(m_panel4, _("Cache"), false);
- bSizer21 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer21 = new wxBoxSizer(wxVERTICAL);
m_panel4->SetSizer(bSizer21);
- fgSizerClangCache = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* fgSizerClangCache = new wxFlexGridSizer( 0, 2, 0, 0);
fgSizerClangCache->SetFlexibleDirection( wxBOTH );
fgSizerClangCache->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizerClangCache->AddGrowableCol(1);
@@ -549,7 +550,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
fgSizerClangCache->Add(m_choiceCachePolicy, 0, wxALL|wxEXPAND|wxALIGN_RIGHT, 5);
- bSizer3 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer3 = new wxBoxSizer(wxHORIZONTAL);
mainSizer->Add(bSizer3, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
diff --git a/LiteEditor/tags_options_base_dlg.h b/LiteEditor/tags_options_base_dlg.h
index 8cce056..c5539d8 100644
--- a/LiteEditor/tags_options_base_dlg.h
+++ b/LiteEditor/tags_options_base_dlg.h
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: tags_options_base_dlg.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -31,12 +32,8 @@
class TagsOptionsBaseDlg : public wxDialog
{
protected:
- wxBoxSizer* mainSizer;
wxTreebook* m_treebook2;
wxPanel* m_paneDisplayAndBehavior;
- wxBoxSizer* bSizer19;
- wxStaticBoxSizer* sbSizer2;
- wxFlexGridSizer* flexGridSizer12;
wxStaticText* m_staticText14;
wxTextCtrl* m_spinCtrlNumberOfCCItems;
wxCheckBox* m_checkBoxEnableCaseSensitiveCompletion;
@@ -44,21 +41,15 @@ protected:
wxCheckBox* m_checkDisplayFunctionTip;
wxCheckBox* m_checkCppKeywordAssist;
wxCheckBox* m_checkBoxKeepFunctionSignature;
- wxStaticBoxSizer* sbSizer15;
- wxGridSizer* gSizer2;
wxCheckBox* m_checkBoxretagWorkspaceOnStartup;
wxCheckBox* m_checkDisableParseOnSave;
wxCheckBox* m_checkBoxDeepUsingNamespaceResolving;
wxPanel* m_paneColouring;
- wxBoxSizer* bSizer16;
- wxStaticBoxSizer* sbSizer4;
- wxBoxSizer* bSizer11;
wxStaticText* m_staticText72;
wxTextCtrl* m_spinCtrlMaxItemToColour;
wxCheckBox* m_checkColourLocalVars;
wxCheckBox* m_checkBoxColourMacroBlocks;
wxCheckBox* m_checkColourProjTags;
- wxFlexGridSizer* fgSizer3;
wxCheckBox* m_checkBoxClass;
wxCheckBox* m_checkBoxStruct;
wxCheckBox* m_checkBoxFunction;
@@ -72,75 +63,49 @@ protected:
wxCheckBox* m_checkBoxMember;
wxCheckBox* m_checkBoxVariable;
wxPanel* m_paneTriggering;
- wxBoxSizer* bSizer17;
- wxStaticBoxSizer* sbSizer7;
- wxFlexGridSizer* fgSizer4;
wxCheckBox* m_checkWordAssist;
wxStaticText* m_staticTextMinWordLen;
wxSlider* m_sliderMinWordLen;
wxCheckBox* m_checkAutoInsertSingleChoice;
wxPanel* m_panelCtags;
wxPanel* m_panelCtagsSearchPaths;
- wxBoxSizer* bSizer7;
wxNotebook* m_notebook36;
wxPanel* m_panel38;
- wxBoxSizer* boxSizer30;
wxBannerWindow* m_banner34;
- wxBoxSizer* bSizer9;
wxTextCtrl* m_textCtrlCtagsSearchPaths;
- wxBoxSizer* bSizer8;
wxButton* m_buttonAddSearchPath;
wxPanel* m_panel40;
- wxBoxSizer* boxSizer42;
wxBannerWindow* m_banner44;
- wxBoxSizer* bSizer91;
wxTextCtrl* m_textCtrlCtagsExcludePaths;
- wxBoxSizer* bSizer81;
wxButton* m_buttonAddExcludePath;
wxPanel* m_panelCtagsAdvanced;
- wxBoxSizer* bSizer6;
- wxFlexGridSizer* fgSizer2;
wxStaticText* m_staticText3;
wxTextCtrl* m_textFileSpec;
- wxBoxSizer* bSizer14;
wxStaticText* m_staticText92;
- wxBoxSizer* bSizer15;
wxTextCtrl* m_textCtrlFilesList;
wxButton* m_buttonParse;
wxNotebook* m_notebook2;
wxPanel* m_panelClangGeneral;
- wxBoxSizer* bSizer5;
wxTextCtrl* m_textPrep;
- wxStaticBoxSizer* sbSizer52;
wxStaticText* m_staticText9;
wxHyperlinkCtrl* m_hyperlink1;
- wxBoxSizer* bSizer131;
wxPanel* m_panel5;
- wxBoxSizer* bSizer13;
- wxStaticBoxSizer* sbSizer521;
wxStaticText* m_staticText91;
wxTextCtrl* m_textTypes;
wxPanel* m_panelClang;
- wxBoxSizer* bSizer18;
wxCheckBox* m_checkBoxEnableClangCC;
wxNotebook* m_notebookClang;
wxPanel* m_panel3;
- wxBoxSizer* bSizer20;
- wxFlexGridSizer* fgSizer5;
wxCheckBox* m_checkBoxClangFirst;
wxStaticText* m_staticText13;
wxPanel* m_panel8;
- wxBoxSizer* bSizer24;
wxTextCtrl* m_textCtrlClangSearchPaths;
wxButton* m_buttonSuggest;
wxPanel* m_panel4;
- wxBoxSizer* bSizer21;
- wxFlexGridSizer* fgSizerClangCache;
wxStaticText* m_staticText101;
wxButton* m_buttonClearCache;
wxStaticText* m_staticText12;
wxChoice* m_choiceCachePolicy;
- wxBoxSizer* bSizer3;
wxButton* m_buttonOK;
wxButton* m_buttonCancel;
diff --git a/formbuilder/tags_options_base_dlg.wxcp b/formbuilder/tags_options_base_dlg.wxcp
index 1d54b8d..8fa8b0a 100644
--- a/formbuilder/tags_options_base_dlg.wxcp
+++ b/formbuilder/tags_options_base_dlg.wxcp
@@ -3689,7 +3689,7 @@
}, {
"type": "colour",
"m_label": "Fg Colour:",
- "colour": "(255,255,255)"
+ "colour": "CaptionText"
}, {
"type": "font",
"m_label": "Font:",
@@ -3738,11 +3738,11 @@
}, {
"type": "colour",
"m_label": "Gradient Start",
- "colour": "(48,48,48)"
+ "colour": "ActiveCaption"
}, {
"type": "colour",
"m_label": "Gradient End",
- "colour": "(48,48,48)"
+ "colour": "ActiveCaption"
}],
"m_events": [],
"m_children": []
@@ -4108,7 +4108,7 @@
}, {
"type": "colour",
"m_label": "Fg Colour:",
- "colour": "(255,255,255)"
+ "colour": "CaptionText"
}, {
"type": "font",
"m_label": "Font:",
@@ -4157,11 +4157,11 @@
}, {
"type": "colour",
"m_label": "Gradient Start",
- "colour": "(48,48,48)"
+ "colour": "ActiveCaption"
}, {
"type": "colour",
"m_label": "Gradient End",
- "colour": "(48,48,48)"
+ "colour": "ActiveCaption"
}],
"m_events": [],
"m_children": []
https://sourceforge.net/p/codelite/codelitegit/ci/ca04172bd7c0a3824784d8655633f93babf7b85f
commit ca04172bd7c0a3824784d8655633f93babf7b85f
Author: Eran <era...@gm...>
Date: Mon Jan 6 20:52:20 2014 +0200
Updated codelite's frame title default value
diff --git a/LiteEditor/editor_options_misc.wxcp b/LiteEditor/editor_options_misc.wxcp
index dcdbd33..ea64c2a 100644
--- a/LiteEditor/editor_options_misc.wxcp
+++ b/LiteEditor/editor_options_misc.wxcp
@@ -1605,7 +1605,7 @@
}, {
"type": "multi-string",
"m_label": "Label:",
- "m_value": "the current user name"
... 263 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-06 18:28: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 421d9db81311cff374166305ceff24f0902479b0 (commit)
from 33acd005457afcc25e89c8c659d5ceed59e15d13 (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/421d9db81311cff374166305ceff24f0902479b0
commit 421d9db81311cff374166305ceff24f0902479b0
Author: Eran <era...@gm...>
Date: Mon Jan 6 20:28:46 2014 +0200
Set GCC_COLORS to an empty string to disable GCC 4.8.2 colored output (https://sourceforge.net/p/codelite/bugs/946/)
diff --git a/LiteEditor/app.cpp b/LiteEditor/app.cpp
index 61e8f4d..9765251 100644
--- a/LiteEditor/app.cpp
+++ b/LiteEditor/app.cpp
@@ -387,7 +387,15 @@ bool CodeLiteApp::OnInit()
ManagerST::Get()->SetInstallDir( installPath );
//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();
@@ -496,7 +504,7 @@ bool CodeLiteApp::OnInit()
EnvironmentConfig::Instance()->WriteObject(wxT("Variables"), &vars);
//---------------------------------------------------------
-
+
#ifdef __WXMSW__
// Read registry values
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/app.cpp | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-06 18:14:01
|
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 33acd005457afcc25e89c8c659d5ceed59e15d13 (commit)
from 1b39567a3cb29d29dd5a772fea486bf360a29a72 (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/33acd005457afcc25e89c8c659d5ceed59e15d13
commit 33acd005457afcc25e89c8c659d5ceed59e15d13
Author: Eran <era...@gm...>
Date: Mon Jan 6 20:13:47 2014 +0200
Fixed compilation on Windows
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 5604af9..767af17 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/Plugin/notebook_ex.cpp b/Plugin/notebook_ex.cpp
index 9c0f31c..9d705e1 100644
--- a/Plugin/notebook_ex.cpp
+++ b/Plugin/notebook_ex.cpp
@@ -152,11 +152,6 @@ void Notebook::SetSelection(size_t page, bool notify)
PushPageHistory(GetPage(page));
}
-size_t Notebook::GetSelection()
-{
- return static_cast<size_t>(wxAuiNotebook::GetSelection());
-}
-
wxWindow* Notebook::GetPage(size_t page) const
{
if (page >= GetPageCount())
diff --git a/Plugin/notebook_ex.h b/Plugin/notebook_ex.h
index ba0c609..ee9ad5e 100644
--- a/Plugin/notebook_ex.h
+++ b/Plugin/notebook_ex.h
@@ -79,12 +79,6 @@ public:
virtual ~Notebook();
/**
- * \brief return the currently selected item index
- * \return the currently selected item, of the book is empty, return Notebook::npos
- */
- size_t GetSelection();
-
- /**
* \brief set page at given index to be the selected page. this function does not trigger an event
* \param page
*/
-----------------------------------------------------------------------
Summary of changes:
LiteEditor.workspace | 4 ++--
Plugin/notebook_ex.cpp | 5 -----
Plugin/notebook_ex.h | 6 ------
3 files changed, 2 insertions(+), 13 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-06 16:22: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 1b39567a3cb29d29dd5a772fea486bf360a29a72 (commit)
from f6f6a667a07905f04dfe0ec31d72289d6f391b6a (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/1b39567a3cb29d29dd5a772fea486bf360a29a72
commit 1b39567a3cb29d29dd5a772fea486bf360a29a72
Author: Eran <era...@gm...>
Date: Mon Jan 6 18:21:54 2014 +0200
Fixed: codelite-terminal: title typo
Fixed: codelite-terminal: changes the command directive from "--" to "--cmd" as it seems as if the bash termninal "eats" these directives
Fixed: GUI applications did not run when using codelite-terminal as the built-in terminal emulator and "Is GUI Application" flags is unticked (GTK only)
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index e713b0e..5604af9 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/manager.cpp b/LiteEditor/manager.cpp
index fe0449e..7f2ec99 100644
--- a/LiteEditor/manager.cpp
+++ b/LiteEditor/manager.cpp
@@ -1437,7 +1437,7 @@ wxString Manager::GetProjectExecutionCommand ( const wxString& projectName, wxSt
if ( fnWD.IsRelative() ) {
fnWD.MakeAbsolute( GetProject(projectName)->GetFileName().GetPath() );
}
- newCommand << " --working-directory \"" << fnWD.GetFullPath() << "\" --title \"" << title << "\" -- " << title;
+ newCommand << " --working-directory \"" << fnWD.GetFullPath() << "\" --title \"" << title << "\" --cmd " << title;
execLine = newCommand;
#elif defined(__WXGTK__)
@@ -1449,8 +1449,9 @@ wxString Manager::GetProjectExecutionCommand ( const wxString& projectName, wxSt
if ( bldConf->GetPauseWhenExecEnds() ) {
newCommand << " --wait ";
}
- newCommand << " -- " << title;
+ newCommand << " --cmd " << title;
execLine = newCommand;
+
} else if ( bldConf->IsGUIProgram() ) {
// do nothing run the command as-is
@@ -1495,7 +1496,7 @@ wxString Manager::GetProjectExecutionCommand ( const wxString& projectName, wxSt
newCommand << " --wait ";
}
- newCommand << " -- " << commandToRun;
+ newCommand << " --cmd " << commandToRun;
execLine = newCommand;
} else if ( bldConf->GetPauseWhenExecEnds() ) {
execLine.Prepend ("le_exec.exe ");
diff --git a/Plugin/globals.cpp b/Plugin/globals.cpp
index 3444b46..14465c8 100644
--- a/Plugin/globals.cpp
+++ b/Plugin/globals.cpp
@@ -1572,11 +1572,11 @@ wxString MakeExecInShellCommand(const wxString& cmd, const wxString& wd, bool wa
//change directory to the working directory
#if defined(__WXMAC__)
wxString newCommand;
- newCommand << fnCodeliteTerminal.GetFullPath() << " -e ";
+ newCommand << fnCodeliteTerminal.GetFullPath() << " --exit ";
if ( waitForAnyKey ) {
- newCommand << " -w ";
+ newCommand << " --wait ";
}
- newCommand << " -- " << title;
+ newCommand << " --cmd " << title;
execLine = newCommand;
#elif defined(__WXGTK__)
@@ -1584,11 +1584,11 @@ wxString MakeExecInShellCommand(const wxString& cmd, const wxString& wd, bool wa
// Set a console to the execute target
if ( opts->HasOption(OptionsConfig::Opt_Use_CodeLite_Terminal)) {
wxString newCommand;
- newCommand << fnCodeliteTerminal.GetFullPath() << " -e ";
+ newCommand << fnCodeliteTerminal.GetFullPath() << " --exit ";
if ( waitForAnyKey ) {
- newCommand << " -w ";
+ newCommand << " --wait ";
}
- newCommand << " -- " << title;
+ newCommand << " --cmd " << title;
execLine = newCommand;
} else {
@@ -1622,12 +1622,12 @@ wxString MakeExecInShellCommand(const wxString& cmd, const wxString& wd, bool wa
commandToRun.Trim().Trim(false);
wxString newCommand;
- newCommand << fnCodeliteTerminal.GetFullPath() << " -e ";
+ newCommand << fnCodeliteTerminal.GetFullPath() << " --exit ";
if ( waitForAnyKey ) {
- newCommand << " -w ";
+ newCommand << " --wait";
}
- newCommand << " -- " << commandToRun;
+ newCommand << " --cmd " << commandToRun;
execLine = newCommand;
} else if ( waitForAnyKey ) {
diff --git a/codelite_terminal/codelite_terminal.project b/codelite_terminal/codelite_terminal.project
index dd192ba..fd30674 100644
--- a/codelite_terminal/codelite_terminal.project
+++ b/codelite_terminal/codelite_terminal.project
@@ -1,5 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Project Name="codelite_terminal" InternalType="GUI">
+ <Plugins>
+ <Plugin Name="CMakePlugin">
+ <![CDATA[[{
+ "name": "Debug_Linux",
+ "enabled": false,
+ "buildDirectory": "build",
+ "sourceDirectory": "$(ProjectPath)",
+ "generator": "",
+ "buildType": "",
+ "arguments": [],
+ "parentProject": ""
+ }]]]>
+ </Plugin>
+ </Plugins>
<Description/>
<Dependencies/>
<VirtualDirectory Name="src">
@@ -97,7 +111,7 @@
<Library Value="util"/>
</Linker>
<ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/>
- <General OutputFile="$(IntermediateDirectory)/codelite-terminal" IntermediateDirectory="./Debug" Command="./codelite-terminal" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/>
+ <General OutputFile="$(IntermediateDirectory)/codelite-terminal" IntermediateDirectory="./Debug" Command="/home/eran/devl/codelitegit/codelite_terminal/Debug/codelite-terminal" CommandArguments="--exit --wait --cmd ./TestWXC_Grid" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="/home/eran/devl/TestArea/TestWXC_Grid/Debug" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
diff --git a/codelite_terminal/codelite_terminal.workspace b/codelite_terminal/codelite_terminal.workspace
index bfb51eb..ef815cb 100644
--- a/codelite_terminal/codelite_terminal.workspace
+++ b/codelite_terminal/codelite_terminal.workspace
@@ -8,10 +8,10 @@
<WorkspaceConfiguration Name="Debug" Selected="no">
<Project Name="codelite_terminal" ConfigName="Debug"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="Release" Selected="yes">
+ <WorkspaceConfiguration Name="Release" Selected="no">
<Project Name="codelite_terminal" ConfigName="Release"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="Debug_Linux" Selected="no">
+ <WorkspaceConfiguration Name="Debug_Linux" Selected="yes">
<Project Name="codelite_terminal" ConfigName="Debug_Linux"/>
</WorkspaceConfiguration>
</BuildMatrix>
diff --git a/codelite_terminal/commandlineparser.cpp b/codelite_terminal/commandlineparser.cpp
index ada209d..0f504b1 100644
--- a/codelite_terminal/commandlineparser.cpp
+++ b/codelite_terminal/commandlineparser.cpp
@@ -35,7 +35,7 @@ void CommandLineParser::DoParse()
// when we see the "--" we consider the rest as the command
while ( HasMore() ) {
wxString optionName = NextToken();
- if ( optionName == "--" ) {
+ if ( optionName == "--cmd" ) {
// Stop parsing, from this point on, everything is the command to execute
while ( HasMore() ) {
wxString cmdToken = NextToken();
diff --git a/codelite_terminal/main.cpp b/codelite_terminal/main.cpp
index b06d24f..4bf1516 100644
--- a/codelite_terminal/main.cpp
+++ b/codelite_terminal/main.cpp
@@ -22,7 +22,7 @@ public:
virtual ~MainApp() {}
void PrintUsage() {
- wxPrintf("%s [-t <title>] [-e] [-w] [-d <working directory>] -- <command to execute>\n", wxApp::argv[0]);
+ wxPrintf("%s [-t <title>] [-e] [-w] [-d <working directory>] [--cmd <command to execute>]\n", wxApp::argv[0]);
wxPrintf("-t | --title Set the console title\n");
wxPrintf("-e | --exit Exit when execution of command terminates\n");
wxPrintf("-w | --wait Wait for any key to be pressed before exiting\n");
diff --git a/codelite_terminal/terminal_options.cpp b/codelite_terminal/terminal_options.cpp
index 377bbd6..3b27582 100644
--- a/codelite_terminal/terminal_options.cpp
+++ b/codelite_terminal/terminal_options.cpp
@@ -3,7 +3,7 @@
TerminalOptions::TerminalOptions()
: m_flags(0)
- , m_title(_("codeilte-terminal"))
+ , m_title(_("codelite-terminal"))
{
}
diff --git a/codelite_terminal/wxcrafter.cpp b/codelite_terminal/wxcrafter.cpp
index e00b5b5..bfa7a04 100644
--- a/codelite_terminal/wxcrafter.cpp
+++ b/codelite_terminal/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!
//////////////////////////////////////////////////////////////////////
@@ -38,14 +39,14 @@ MainFrameBaseClass::MainFrameBaseClass(wxWindow* parent, wxWindowID id, const wx
SetIcons( app_icons );
- boxSizer1 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer1 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer1);
m_mainPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(800,600), wxTAB_TRAVERSAL);
boxSizer1->Add(m_mainPanel, 1, wxEXPAND, 5);
- boxSizer11 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer11 = new wxBoxSizer(wxVERTICAL);
m_mainPanel->SetSizer(boxSizer11);
m_auibar17 = new wxAuiToolBar(m_mainPanel, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_PLAIN_BACKGROUND|wxAUI_TB_DEFAULT_STYLE);
@@ -178,10 +179,10 @@ SettingsDlgBase::SettingsDlgBase(wxWindow* parent, wxWindowID id, const wxString
bBitmapLoaded = true;
}
- boxSizer27 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer27 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer27);
- flexGridSizer29 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer29 = new wxFlexGridSizer( 0, 2, 0, 0);
flexGridSizer29->SetFlexibleDirection( wxBOTH );
flexGridSizer29->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer29->AddGrowableCol(1);
@@ -220,7 +221,7 @@ SettingsDlgBase::SettingsDlgBase(wxWindow* parent, wxWindowID id, const wxString
flexGridSizer29->Add(m_fontPicker, 0, wxALL|wxEXPAND, 5);
- boxSizer43 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* boxSizer43 = new wxBoxSizer(wxHORIZONTAL);
boxSizer27->Add(boxSizer43, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
diff --git a/codelite_terminal/wxcrafter.h b/codelite_terminal/wxcrafter.h
index 5684ac9..d8a8069 100644
--- a/codelite_terminal/wxcrafter.h
+++ b/codelite_terminal/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!
//////////////////////////////////////////////////////////////////////
@@ -34,9 +35,7 @@ protected:
ID_SETTINGS = 1002,
};
protected:
- wxBoxSizer* boxSizer1;
wxPanel* m_mainPanel;
- wxBoxSizer* boxSizer11;
wxAuiToolBar* m_auibar17;
wxStyledTextCtrl* m_stc;
wxMenuBar* m_menuBar;
@@ -60,7 +59,7 @@ protected:
virtual void OnAddMarker(wxTimerEvent& event) { event.Skip(); }
public:
- MainFrameBaseClass(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("My Frame"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_FRAME_STYLE);
+ MainFrameBaseClass(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("codelite-terminal"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_FRAME_STYLE);
virtual ~MainFrameBaseClass();
};
@@ -68,15 +67,12 @@ public:
class SettingsDlgBase : public wxDialog
{
protected:
- wxBoxSizer* boxSizer27;
- wxFlexGridSizer* flexGridSizer29;
wxStaticText* m_staticText31;
wxColourPickerCtrl* m_colourPickerFG;
wxStaticText* m_staticText35;
wxColourPickerCtrl* m_colourPickerBG;
wxStaticText* m_staticText39;
wxFontPickerCtrl* m_fontPicker;
- wxBoxSizer* boxSizer43;
wxButton* m_button45;
wxButton* m_button47;
diff --git a/codelite_terminal/wxcrafter.wxcp b/codelite_terminal/wxcrafter.wxcp
index 2068e12..9203d2a 100644
--- a/codelite_terminal/wxcrafter.wxcp
+++ b/codelite_terminal/wxcrafter.wxcp
@@ -74,7 +74,7 @@
}, {
"type": "string",
"m_label": "Title:",
- "m_value": "My Frame"
+ "m_value": "codelite-terminal"
}, {
"type": "virtualFolderPicker",
"m_label": "Virtual Folder:",
diff --git a/codelite_terminal/wxcrafter_bitmaps.cpp b/codelite_terminal/wxcrafter_bitmaps.cpp
index 1dd8e13..63e3750 100644
--- a/codelite_terminal/wxcrafter_bitmaps.cpp
+++ b/codelite_terminal/wxcrafter_bitmaps.cpp
@@ -1,329 +1,329 @@
-//
-// 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 = 697;
-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,6,98,75,71,68,0,255,0,255,0,255,160,189,167,147,0,
-0,2,110,73,68,65,84,56,141,101,208,77,79,19,65,24,7,240,255,51,59,187,219,
-45,133,182,208,64,5,162,225,70,122,35,192,93,18,15,94,12,39,62,133,49,49,
-28,49,16,130,137,223,193,131,55,63,134,23,15,154,120,52,242,162,81,15,130,
-82,66,183,165,165,47,59,187,243,242,120,161,4,178,207,101,50,153,249,255,
-230,121,134,112,83,251,251,251,98,117,125,253,101,154,168,237,66,20,213,
-125,223,247,132,16,55,167,12,165,148,27,37,73,79,72,249,190,86,169,108,
-111,108,108,24,0,144,99,96,121,185,241,37,25,141,214,90,173,24,169,74,80,
-156,136,32,165,4,179,67,150,101,208,218,10,95,6,213,114,101,234,197,133,
-202,54,1,60,186,7,88,230,181,56,190,66,187,117,137,110,175,235,6,253,1,
-57,231,8,0,136,8,97,24,242,244,244,44,44,11,42,70,193,195,113,238,22,56,
-63,191,196,226,66,29,243,245,121,40,165,68,166,13,51,216,18,59,38,65,30,
-17,145,32,66,162,82,116,186,125,228,0,149,170,209,209,241,143,98,20,249,
-168,207,213,17,69,17,73,223,247,216,57,88,231,160,146,4,205,139,38,146,
-68,163,80,40,36,57,160,56,17,189,243,101,240,56,213,217,210,217,191,139,
-18,114,197,0,209,104,114,178,244,43,136,194,79,57,128,72,156,213,106,229,
-207,155,207,158,110,197,113,28,28,30,30,46,182,219,253,58,179,35,173,71,
-215,71,223,127,186,181,149,149,46,164,220,26,12,134,205,28,96,157,237,36,
-74,173,2,64,20,69,166,209,104,252,185,186,26,158,14,135,87,244,251,244,
-180,148,40,253,64,4,30,167,42,155,178,218,124,205,1,70,187,142,38,93,30,
-239,211,155,85,3,112,214,18,59,67,66,8,78,211,172,106,157,137,115,0,179,
-237,24,77,101,34,162,123,2,0,107,5,49,59,146,144,208,198,78,25,235,218,
-249,17,82,125,201,146,171,249,207,3,156,179,4,0,94,232,177,209,186,98,153,
-242,29,36,194,116,66,139,60,160,1,235,28,17,9,246,216,227,76,103,181,140,
-108,30,136,107,181,206,92,179,93,5,128,111,39,39,75,231,167,103,79,180,
-206,102,141,113,66,141,70,131,202,100,233,88,8,175,101,44,87,2,214,183,
-35,208,221,199,118,246,94,183,22,234,211,147,206,113,232,73,193,218,104,
-24,109,200,89,230,110,175,135,153,153,154,137,59,215,253,55,7,187,51,227,
-140,184,11,8,230,15,127,155,237,112,48,76,48,24,14,41,12,11,52,51,93,69,
-52,81,164,160,80,164,184,221,243,61,193,31,239,102,238,117,0,0,175,118,
-15,246,0,60,55,214,213,140,117,2,0,60,65,142,136,123,129,47,223,30,236,
-239,238,16,17,143,239,255,7,118,216,77,24,194,230,243,31,0,0,0,0,73,69,
-78,68,174,66,96,130};
-
-static size_t xml_res_size_1 = 797;
-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,6,98,75,71,68,0,255,0,255,0,255,160,189,167,147,0,
-0,2,210,73,68,65,84,56,141,117,83,61,79,35,87,20,61,111,230,61,227,145,
-103,20,201,51,46,40,221,33,26,203,150,5,169,182,218,184,177,210,44,43,167,
-164,216,34,37,93,228,252,130,72,73,195,15,32,18,180,68,161,72,194,22,78,
-170,109,64,66,107,107,186,181,64,32,170,17,120,6,102,134,49,158,175,251,
-94,26,108,37,209,230,86,247,74,231,20,231,158,115,24,254,103,78,78,78,62,
-22,69,209,1,0,206,249,100,103,103,167,243,57,28,91,46,199,199,199,95,0,
-248,65,41,53,98,140,189,39,162,172,223,239,3,0,78,79,79,161,235,250,26,
-17,245,117,93,255,10,192,247,131,193,32,2,0,237,31,228,15,182,109,191,35,
-162,147,162,40,50,203,178,22,68,4,34,130,105,154,105,81,20,153,82,234,87,
-219,182,223,1,248,240,194,1,7,0,34,250,201,182,237,141,86,171,85,201,178,
-12,68,132,60,207,141,171,171,43,0,192,230,230,102,85,8,1,198,24,51,12,163,
-50,153,76,54,124,223,255,17,192,183,26,0,228,121,254,155,231,121,149,56,
-142,193,24,195,245,245,53,166,211,41,210,52,69,154,166,152,78,167,184,188,
-188,132,174,235,152,207,231,240,60,79,228,121,254,251,74,130,97,24,35,41,
-37,164,148,184,185,185,129,16,2,205,102,19,140,49,48,198,208,108,54,97,
-24,6,110,111,111,49,159,207,65,68,204,48,140,17,0,176,195,195,195,143,68,
-212,49,77,51,109,183,219,85,207,243,208,104,52,48,30,143,19,34,250,83,41,
-197,56,231,175,59,157,142,57,155,205,176,190,190,14,215,117,23,113,28,27,
-156,243,9,47,203,178,211,235,245,0,160,250,248,248,136,90,173,134,187,187,
-59,16,209,251,221,221,221,111,0,224,232,232,232,151,251,251,251,183,166,
-105,34,77,83,108,111,111,27,0,48,26,141,218,92,74,9,34,2,0,104,154,6,93,
-215,241,34,103,101,241,210,13,93,215,161,105,218,10,47,165,4,59,56,56,24,
-151,101,217,182,44,43,237,118,187,213,165,11,174,235,38,121,158,255,165,
-105,26,227,156,191,110,181,90,53,206,57,132,16,56,63,63,47,210,52,21,156,
-243,9,123,201,65,197,247,253,172,219,237,194,52,77,40,165,240,252,252,140,
-32,8,192,24,67,189,94,71,173,86,3,0,100,89,134,179,179,51,56,142,179,54,
-24,12,114,14,0,65,16,244,148,82,74,8,193,0,64,8,129,122,189,14,203,178,
-176,188,165,148,40,203,18,68,4,41,37,130,32,232,1,248,67,123,209,248,181,
-227,56,69,165,82,193,98,177,64,20,69,200,178,108,101,99,150,101,8,195,16,
-139,197,2,134,97,192,113,156,92,41,213,95,37,49,73,146,239,0,124,233,186,
-238,198,108,54,19,74,41,102,154,102,186,181,181,85,5,128,139,139,139,244,
-233,233,169,202,24,83,141,70,163,120,120,120,248,148,36,201,112,21,164,
-225,112,24,37,73,242,42,8,130,3,41,229,155,48,12,215,226,56,174,46,191,
-31,69,81,53,12,195,53,41,229,27,223,247,127,78,146,228,213,112,56,140,254,
-213,198,255,206,254,254,254,152,136,218,203,58,239,237,237,125,182,206,
-127,3,135,56,141,125,58,109,237,180,0,0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_2 = 912;
-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,6,98,75,71,68,0,255,0,255,0,255,160,189,167,147,0,
-0,3,69,73,68,65,84,56,141,93,147,79,104,28,101,24,198,127,223,204,236,102,
-103,19,155,77,54,113,147,138,137,201,166,77,107,76,76,178,105,66,91,108,
-171,8,34,226,85,168,32,138,21,44,37,136,24,69,140,22,68,69,48,86,208,83,
-200,205,131,20,196,91,17,170,54,82,234,33,45,228,143,208,54,45,146,52,33,
-150,196,100,187,187,73,246,223,236,204,124,223,124,30,98,99,245,57,61,135,
-135,247,133,247,125,126,130,255,105,105,168,179,71,133,173,211,134,197,
-11,218,83,77,0,34,108,174,107,165,47,32,245,68,199,212,237,155,15,230,197,
-125,51,223,213,21,166,86,143,155,17,251,100,237,83,71,170,162,157,73,195,
-106,136,3,32,51,89,202,127,220,9,182,175,76,185,202,175,156,103,139,51,
-93,243,243,222,238,128,203,39,78,88,181,78,230,183,135,146,201,222,248,
-179,79,219,148,55,209,165,77,180,95,217,217,18,138,32,170,235,32,26,35,
-51,121,217,41,221,89,154,91,104,185,121,252,165,31,80,22,128,93,200,156,
-171,106,109,233,173,237,235,183,239,77,77,145,117,10,180,214,239,193,180,
-76,0,148,220,102,37,183,64,60,186,135,186,190,148,237,57,126,95,235,114,
-48,6,183,70,140,43,61,157,109,202,176,94,141,61,209,109,59,55,174,227,54,
-63,70,251,240,40,203,233,34,110,182,132,155,45,177,156,46,210,62,60,138,
-219,212,138,115,227,58,117,221,61,81,95,132,95,255,181,239,96,171,249,74,
-211,222,79,99,201,142,163,150,244,13,63,151,165,229,212,105,234,134,142,
-98,183,117,176,120,233,18,91,174,228,192,7,31,243,240,224,97,106,170,107,
-216,158,252,5,173,5,68,170,67,229,123,91,134,121,178,33,49,209,208,209,
-30,83,233,13,180,231,83,188,118,149,200,254,253,196,82,135,136,238,59,64,
-227,177,103,104,76,29,162,244,251,44,107,159,127,66,80,241,80,21,15,179,
-62,110,100,238,174,54,27,142,36,97,4,2,63,95,66,186,18,191,80,100,229,236,
-40,217,153,105,26,83,3,52,166,6,200,206,78,243,231,217,15,241,243,69,164,
-43,145,249,34,70,0,174,20,77,150,23,8,237,151,29,164,39,17,128,54,4,127,
-57,30,113,21,236,254,90,42,205,202,118,145,38,64,4,26,13,8,167,130,27,8,
-12,169,140,141,98,46,79,160,64,185,62,171,174,79,239,216,151,36,134,134,
-40,76,207,80,152,158,33,49,56,200,147,95,140,177,234,73,148,235,19,40,40,
-229,242,200,192,88,55,159,223,147,104,15,105,61,16,181,76,67,57,21,186,
-191,58,71,226,248,49,182,175,94,99,241,237,17,114,23,127,38,218,245,56,
-13,71,14,83,159,236,32,251,227,69,68,149,77,58,95,81,249,146,251,173,249,
-92,253,222,91,133,178,60,21,171,182,35,218,113,209,91,155,152,53,213,44,
-188,245,30,178,84,70,85,60,114,63,77,98,239,75,146,62,255,61,165,149,53,
-252,176,205,98,166,152,47,251,230,107,2,224,155,71,250,191,142,134,66,111,
-60,90,99,87,83,41,35,2,133,64,239,246,92,3,26,129,54,76,136,68,185,91,168,
-20,11,190,63,241,206,218,236,187,22,64,243,106,114,100,57,177,52,80,150,
-78,95,162,202,142,90,58,0,173,32,248,231,144,134,1,194,68,106,131,141,173,
-114,185,226,201,185,182,116,242,125,152,253,23,166,9,82,161,245,70,198,
-5,226,229,26,163,42,108,27,166,105,137,29,92,164,214,56,74,170,130,118,
-93,33,196,119,137,180,30,126,147,89,255,63,52,222,215,71,241,254,131,58,
-176,206,32,120,81,235,96,7,103,97,172,11,29,92,192,8,198,63,203,206,221,
-126,48,255,55,47,73,136,107,100,21,126,183,0,0,0,0,73,69,78,68,174,66,96,
-130};
-
-static size_t xml_res_size_3 = 739;
-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,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112,
-72,89,115,0,0,13,215,0,0,13,215,1,66,40,155,120,0,0,0,25,116,69,88,116,
-83,111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,
-101,46,111,114,103,155,238,60,26,0,0,2,96,73,68,65,84,56,141,165,147,65,
-139,92,69,20,133,191,91,85,253,90,103,8,137,104,76,24,97,132,136,89,205,
-98,112,229,239,208,149,11,127,144,63,64,68,240,47,184,113,167,217,40,89,
-4,113,17,35,68,36,40,8,50,65,140,51,221,233,126,239,85,189,170,186,247,
-186,104,18,220,231,194,7,119,119,14,135,115,196,221,121,149,75,15,190,189,
-127,126,116,237,232,139,245,48,72,74,43,137,34,110,128,106,183,82,23,47,
-75,182,156,179,237,166,93,155,115,118,237,221,77,205,204,204,231,101,249,
-60,29,221,56,254,250,214,187,39,119,82,74,132,16,94,82,107,165,181,198,
-60,207,140,227,72,216,173,89,231,140,170,34,34,136,8,155,127,47,63,76,143,
-239,63,124,242,221,151,223,220,185,113,124,157,163,245,49,235,180,198,212,
-40,203,66,46,153,125,222,241,116,243,23,87,227,134,231,211,150,205,184,
-165,180,76,235,157,219,239,156,252,150,54,155,171,101,251,207,37,55,79,
-111,51,63,203,148,144,49,117,106,171,44,189,178,219,111,24,247,123,242,
-60,145,243,68,153,51,83,157,48,55,150,101,241,180,44,139,55,53,78,239,190,
-199,173,211,19,174,46,158,241,248,199,135,152,59,184,163,214,72,146,72,
-97,69,140,137,24,35,34,2,14,110,78,154,242,108,75,45,132,85,164,183,206,
-52,206,228,150,233,189,82,234,204,210,27,230,134,136,19,136,68,137,8,2,
-128,153,122,154,242,168,219,188,229,251,123,247,64,59,49,28,212,68,2,181,
-87,186,27,106,138,186,131,56,34,28,28,0,170,74,218,239,119,122,57,109,176,
... 518 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-06 12:59: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 f6f6a667a07905f04dfe0ec31d72289d6f391b6a (commit)
from 934609332a1b063343d58cefe5fe12eb80aa27ad (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/f6f6a667a07905f04dfe0ec31d72289d6f391b6a
commit f6f6a667a07905f04dfe0ec31d72289d6f391b6a
Author: Eran <era...@gm...>
Date: Mon Jan 6 14:58:51 2014 +0200
Fixed: launching a "GUI" appliaction with codelite-terminal is working properly
diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp
index 6fb2aa3..fe0449e 100644
--- a/LiteEditor/manager.cpp
+++ b/LiteEditor/manager.cpp
@@ -1451,7 +1451,9 @@ wxString Manager::GetProjectExecutionCommand ( const wxString& projectName, wxSt
}
newCommand << " -- " << title;
execLine = newCommand;
-
+ } else if ( bldConf->IsGUIProgram() ) {
+ // do nothing run the command as-is
+
} else {
wxString term;
term = opts->GetProgramConsoleCommand();
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/manager.cpp | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
hooks/post-receive
--
codelite
|
