Menu
▾
▴
codelite-git — Commit logs
You can subscribe to this list here.
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
(40) |
May
(42) |
Jun
(47) |
Jul
(60) |
Aug
(55) |
Sep
(83) |
Oct
(78) |
Nov
(40) |
Dec
(106) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2014 |
Jan
(65) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Eran I. <no...@so...> - 2013-12-29 14:08: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 fc9e342adaadac19b5549c89e8bfbc4456790a5f (commit)
via 9ee1bf2b5ce47cf4dd386d971842988336a446d2 (commit)
from aa360de69949214f634627ef884acad2712debf3 (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/fc9e342adaadac19b5549c89e8bfbc4456790a5f
commit fc9e342adaadac19b5549c89e8bfbc4456790a5f
Merge: 9ee1bf2 aa360de
Author: Eran <era...@gm...>
Date: Sun Dec 29 16:08:20 2013 +0200
Merge branch 'master' of ssh://git.code.sf.net/p/codelite/codelitegit
# By dghart
# Via dghart
* 'master' of ssh://git.code.sf.net/p/codelite/codelitegit:
Make tabgroups work again
https://sourceforge.net/p/codelite/codelitegit/ci/9ee1bf2b5ce47cf4dd386d971842988336a446d2
commit 9ee1bf2b5ce47cf4dd386d971842988336a446d2
Author: Eran <era...@gm...>
Date: Sun Dec 29 16:06:00 2013 +0200
Applied path for non PCH compilation fix (petah)
diff --git a/Tweaks/tweaks.cpp b/Tweaks/tweaks.cpp
index 25c433a..ff1c416 100644
--- a/Tweaks/tweaks.cpp
+++ b/Tweaks/tweaks.cpp
@@ -1,5 +1,6 @@
#include "tweaks.h"
#include <wx/xrc/xmlres.h>
+#include <wx/menu.h>
#include "event_notifier.h"
#include "TweaksSettingsDlg.h"
#include "editor_config.h"
-----------------------------------------------------------------------
Summary of changes:
Tweaks/tweaks.cpp | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2013-12-29 12:38:34
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via aa360de69949214f634627ef884acad2712debf3 (commit)
from fce3e4e8c5414d857d9f21dff9a7c072aba5cab9 (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/aa360de69949214f634627ef884acad2712debf3
commit aa360de69949214f634627ef884acad2712debf3
Author: dghart <da...@4P...>
Date: Sun Dec 29 12:32:58 2013 +0000
Make tabgroups work again
Tabgroups had failed to load or save properly since March (without anyone noticing...). This is now fixed.
Also, tabgroups are now also stored inside the workspace's .codelite/ instead of in a global one. This means that any previous tabgroups (those ones that you failed to notice weren't working) will no longer be found; they'll need to be transferred by hand to the new locations.
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
index 018ee39..1e1e8c9 100644
--- a/LiteEditor/frame.cpp
+++ b/LiteEditor/frame.cpp
@@ -1004,9 +1004,6 @@ void clMainFrame::CreateGUIControls(void)
sessConfFile << clStandardPaths::Get().GetUserDataDir() << wxT("/config/sessions.xml");
SessionManager::Get().Load(sessConfFile);
- // Now the session's loaded, it's safe to fill the tabgroups tab
- GetWorkspacePane()->GetTabgroupsTab()->DisplayTabgroups();
-
//try to locate the build tools
long fix(1);
@@ -2041,7 +2038,7 @@ void clMainFrame::OnFileSaveTabGroup(wxCommandEvent& WXUNUSED(event))
TabGroupEntry session;
session.SetTabgroupName(path + sessionName);
GetMainBook()->SaveSession(session, intArr);
- SessionManager::Get().Save(session.GetTabgroupName(), session, wxString(wxT(".tabgroup")), tabgroupTag);
+ SessionManager::Get().Save(session.GetTabgroupName(), session, "tabgroup", tabgroupTag);
// Add the new tabgroup to the tabgroup manager and pane
GetWorkspacePane()->GetTabgroupsTab()->AddNewTabgroupToTree(filepath);
diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp
index 40d2152..f8b270c 100644
--- a/LiteEditor/manager.cpp
+++ b/LiteEditor/manager.cpp
@@ -90,6 +90,7 @@
#include "reconcileproject.h"
#include "cl_command_event.h"
#include "refactorengine.h"
+#include "tabgroupspane.h"
const wxEventType wxEVT_CMD_RESTART_CODELITE = wxNewEventType();
@@ -332,6 +333,7 @@ void Manager::DoSetupWorkspace ( const wxString &path )
clMainFrame::Get()->GetWorkspaceTab()->FreezeThaw(false);
GetBreakpointsMgr()->LoadSession(session);
clMainFrame::Get()->GetDebuggerPane()->GetBreakpointView()->Initialize();
+ clMainFrame::Get()->GetWorkspacePane()->GetTabgroupsTab()->DisplayTabgroups();
}
}
@@ -380,6 +382,8 @@ void Manager::CloseWorkspace()
// Delete any breakpoints belong to the current workspace
GetBreakpointsMgr()->DelAllBreakpoints();
+ clMainFrame::Get()->GetWorkspacePane()->GetTabgroupsTab()->ClearTabgroups();
+
// since we closed the workspace, we also need to set the 'LastActiveWorkspaceName' to be
// default
SessionManager::Get().SetLastWorkspaceName ( wxT ( "Default" ) );
diff --git a/LiteEditor/tabgroupmanager.cpp b/LiteEditor/tabgroupmanager.cpp
index 9475e90..a4a8fab 100644
--- a/LiteEditor/tabgroupmanager.cpp
+++ b/LiteEditor/tabgroupmanager.cpp
@@ -69,7 +69,7 @@ wxString TabgroupManager::GetTabgroupDirectory()
void TabgroupManager::SetTabgroupDirectory()
{
- wxFileName TabgrpPath = wxFileName::DirName( clStandardPaths::Get().GetUserDataDir() + wxT("/tabgroups/") );
+ wxFileName TabgrpPath = wxFileName::DirName(WorkspaceST::Get()->GetPrivateFolder() + wxT("/tabgroups/"));
if (!TabgrpPath.DirExists()) {
TabgrpPath.Mkdir(0777, wxPATH_MKDIR_FULL);
}
@@ -96,7 +96,7 @@ void TabgroupManager::LoadTabgroupData(const wxString& tabgroup)
// Load the data: we're only interested in the tab names here, not each CurrentLine etc
TabGroupEntry session;
wxString filepath = tabgroup.BeforeLast(wxT('.')); // FindSession() doesn't want the .ext here
- if (SessionManager::Get().GetSession(filepath, session, wxString(wxT(".tabgroup")), tabgroupTag) ) {
+ if (SessionManager::Get().GetSession(filepath, session, "tabgroup", tabgroupTag) ) {
wxArrayString tabnames;
const std::vector<TabInfo> &vTabInfoArr = session.GetTabInfoArr();
for (size_t i = 0; i < vTabInfoArr.size(); ++i) {
diff --git a/LiteEditor/tabgroupspane.h b/LiteEditor/tabgroupspane.h
index f7c6931..8d6bdf3 100644
--- a/LiteEditor/tabgroupspane.h
+++ b/LiteEditor/tabgroupspane.h
@@ -68,6 +68,9 @@ public:
TabgroupsPane(wxWindow* parent, const wxString& caption);
~TabgroupsPane();
void DisplayTabgroups();
+ void ClearTabgroups() {
+ m_tree->DeleteChildren(m_tree->GetRootItem());
+ }
bool AddNewTabgroupToTree(const wxString& newfilepath, wxTreeItemId selection = wxTreeItemId());
protected:
diff --git a/Plugin/sessionmanager.cpp b/Plugin/sessionmanager.cpp
index 9dda937..4dc3ead 100644
--- a/Plugin/sessionmanager.cpp
+++ b/Plugin/sessionmanager.cpp
@@ -119,7 +119,9 @@ bool SessionManager::Load(const wxString &fileName)
wxFileName SessionManager::GetSessionFileName(const wxString& name, const wxString& suffix /*=wxT("")*/) const
{
wxFileName sessionFileName(name);
- sessionFileName.AppendDir(".codelite");
+ if (suffix != "tabgroup") {
+ sessionFileName.AppendDir(".codelite");
+ }
sessionFileName.SetExt( suffix.IsEmpty() ? wxString("session") : suffix);
return sessionFileName;
}
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/frame.cpp | 5 +----
LiteEditor/manager.cpp | 4 ++++
LiteEditor/tabgroupmanager.cpp | 4 ++--
LiteEditor/tabgroupspane.h | 3 +++
Plugin/sessionmanager.cpp | 4 +++-
5 files changed, 13 insertions(+), 7 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-29 10:17:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via fce3e4e8c5414d857d9f21dff9a7c072aba5cab9 (commit)
from ee08453d1c46de5d6b11174e8e4d42957c6cf0e8 (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/fce3e4e8c5414d857d9f21dff9a7c072aba5cab9
commit fce3e4e8c5414d857d9f21dff9a7c072aba5cab9
Author: Eran <era...@gm...>
Date: Sun Dec 29 12:17:36 2013 +0200
Allow codelite to built with the --disable-compat28 wxWidgets build flag enabled (by petah)
diff --git a/CodeLite/refactoring_storage.cpp b/CodeLite/refactoring_storage.cpp
index 94fce47..c910efd 100644
--- a/CodeLite/refactoring_storage.cpp
+++ b/CodeLite/refactoring_storage.cpp
@@ -2,6 +2,7 @@
#include "event_notifier.h"
#include <wx/filename.h>
#include <wx/log.h>
+#include <wx/crt.h>
#include "cppwordscanner.h"
#include "refactorengine.h"
#include "ctags_manager.h"
diff --git a/CodeLite/xor_string.cpp b/CodeLite/xor_string.cpp
index ebcc835..2a00363 100644
--- a/CodeLite/xor_string.cpp
+++ b/CodeLite/xor_string.cpp
@@ -1,3 +1,4 @@
+#include <wx/crt.h>
#include "xor_string.h"
XORString::XORString()
diff --git a/codelite_terminal/main.cpp b/codelite_terminal/main.cpp
index 32fa713..b06d24f 100644
--- a/codelite_terminal/main.cpp
+++ b/codelite_terminal/main.cpp
@@ -7,6 +7,7 @@
#include <wx/dir.h>
#include <wx/log.h>
#include <wx/stdpaths.h>
+#include <wx/crt.h>
#include "commandlineparser.h"
#ifdef __WXMAC__
-----------------------------------------------------------------------
Summary of changes:
CodeLite/refactoring_storage.cpp | 1 +
CodeLite/xor_string.cpp | 1 +
codelite_terminal/main.cpp | 1 +
3 files changed, 3 insertions(+), 0 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-29 08:53: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 ee08453d1c46de5d6b11174e8e4d42957c6cf0e8 (commit)
from e2b952bba4c7f058541c0dcb3bac7edc51e8f41a (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/ee08453d1c46de5d6b11174e8e4d42957c6cf0e8
commit ee08453d1c46de5d6b11174e8e4d42957c6cf0e8
Author: Eran <era...@gm...>
Date: Sun Dec 29 10:53:31 2013 +0200
Disable the search for libssh when using CMake with -DENABLE_SFTP=0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebea866..a2549ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,30 +119,37 @@ endif(PREFIX)
#######################################
## Locate libssh
#######################################
-if (UNIX AND NOT APPLE )
- ## Linux
- find_library(LIBSSH_LIB NAMES libssh.so HINTS /usr/local/lib /usr/lib ${CMAKE_INSTALL_LIBDIR})
- find_path(LIBSSH_INCLUDE_DIR NAMES libssh.h HINTS /usr/local/include /usr/include PATH_SUFFIXES libssh)
- string(FIND ${LIBSSH_INCLUDE_DIR} "NOTFOUND" LIBSSH_NOT_FOUND_POS)
- if ( LIBSSH_NOT_FOUND_POS GREATER -1 )
- if (UNIX AND NOT APPLE )
- ## Linux / FreeBSD
- message("**** NOTICE: Install libssh-dev and try again")
- else (UNIX AND NOT APPLE )
- ## OSX
- message("**** NOTICE: Install libssh and try again (brew install libssh)")
- endif (UNIX AND NOT APPLE )
- message(FATAL_ERROR "-- Could not find libssh")
- endif( LIBSSH_NOT_FOUND_POS GREATER -1 )
-
-else ( UNIX AND NOT APPLE )
- ## OSX
- set( LIBSSH_INCLUDE_DIR ${CL_SRC_ROOT}/sdk/libssh/include)
- set( LIBSSH_LIB ${CL_SRC_ROOT}/sdk/libssh/lib/osx/libssh.a)
- include_directories(${LIBSSH_INCLUDE_DIR})
-endif ( UNIX AND NOT APPLE )
+## Enable SFTP support?
+if(ENABLE_SFTP MATCHES 0)
+ set( WITH_SFTP 0 )
+endif (ENABLE_SFTP MATCHES 0)
+unset(ENABLE_SFTP CACHE)
-message("-- LIBSSH_LIB is set to ${LIBSSH_LIB}")
+if ( WITH_SFTP )
+ if (UNIX AND NOT APPLE )
+ ## Linux
+ find_library(LIBSSH_LIB NAMES libssh.so HINTS /usr/local/lib /usr/lib ${CMAKE_INSTALL_LIBDIR})
+ find_path(LIBSSH_INCLUDE_DIR NAMES libssh.h HINTS /usr/local/include /usr/include PATH_SUFFIXES libssh)
+ string(FIND ${LIBSSH_INCLUDE_DIR} "NOTFOUND" LIBSSH_NOT_FOUND_POS)
+ if ( LIBSSH_NOT_FOUND_POS GREATER -1 )
+ if (UNIX AND NOT APPLE )
+ ## Linux / FreeBSD
+ message("**** NOTICE: Install libssh-dev and try again")
+ else (UNIX AND NOT APPLE )
+ ## OSX
+ message("**** NOTICE: Install libssh and try again (brew install libssh)")
+ endif (UNIX AND NOT APPLE )
+ message(FATAL_ERROR "-- Could not find libssh")
+ endif( LIBSSH_NOT_FOUND_POS GREATER -1 )
+
+ else ( UNIX AND NOT APPLE )
+ ## OSX
+ set( LIBSSH_INCLUDE_DIR ${CL_SRC_ROOT}/sdk/libssh/include)
+ set( LIBSSH_LIB ${CL_SRC_ROOT}/sdk/libssh/lib/osx/libssh.a)
+ include_directories(${LIBSSH_INCLUDE_DIR})
+ endif ( UNIX AND NOT APPLE )
+ message("-- LIBSSH_LIB is set to ${LIBSSH_LIB}")
+endif ( WITH_SFTP )
## enable clang support?
if(ENABLE_CLANG MATCHES 0)
@@ -150,12 +157,6 @@ if(ENABLE_CLANG MATCHES 0)
endif (ENABLE_CLANG MATCHES 0)
unset(ENABLE_CLANG CACHE)
-## Enable SFTP support?
-if(ENABLE_SFTP MATCHES 0)
- set( WITH_SFTP 0 )
-endif (ENABLE_SFTP MATCHES 0)
-unset(ENABLE_SFTP CACHE)
-
if (AUTOGEN_REVISION MATCHES 0)
set ( MAKE_AUTOGEN_REVISION_STRING 0)
else (AUTOGEN_REVISION MATCHES 1)
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 61 ++++++++++++++++++++++++++++---------------------------
1 files changed, 31 insertions(+), 30 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-29 08:48:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via e2b952bba4c7f058541c0dcb3bac7edc51e8f41a (commit)
from 8efc3aee6e5e7bd958fc45043f531aad3b6d32f1 (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/e2b952bba4c7f058541c0dcb3bac7edc51e8f41a
commit e2b952bba4c7f058541c0dcb3bac7edc51e8f41a
Author: Eran <era...@gm...>
Date: Sun Dec 29 10:48:05 2013 +0200
Make all codelite SFTP related code conditional (enabled by default)
Add new CMake option -DENABLE_SFTP=1|0. When set to 1 codelite is built with SFTP support. Default is to build _with_ SFTP support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c74877..ebea866 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,31 +1,31 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-##
-#######################################################################################################################################################################
-## #
-## codelite IDE cmake file #
-## Typical usage will be (build in release mode): #
-## #
-## > mkdir build #
-## > cd build #
-## > cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release .. #
-## > make -jN #
-## > sudo make install #
-## #
-## Optional command line arguments: #
-## #
-## -DCMAKE_BUILD_TYPE=Release|Debug|DebugFull // Build release, debug + optimisation or debug without optimisation (for others see the Cmake docs) #
-## -DPREFIX="<some-prefix>" // Installation prefix, default is set to /usr #
-## -DENABLE_CLANG=1|0 // Build codelite with clang code completion support?, default is 1 (with clang) #
-## -DWITH_WXC=1|0 // Build wxCrafter (sources are not part of codelite distribution) default is 0 #
-## -DCOPY_WX_LIBS=1|0 // Incorporate the wxWidgets libs into CodeLite so the binary doesn't depend on them. default is 0 #
-## -DPREVENT_WX_ASSERTS=1|0 // Prevent those annoying wxASSERTS. In release builds the default is 1, in debug 0 #
-## -DAUTOGEN_REVISION=1|0 // Should cmake generate makefiles that auto generates the autoversion.cpp file - default is 1 #
-## -DWITH_PCH=1|0 // Enable Pre Compiled Header? #
-## -DGTK_USE_NATIVEBOOK=1|0 // Under GTK, use wxNotebook instead of wxAuiNotebook. Default is set to 0 #
-## -DWITH_WXPATH=<fullpath> // Specify a particular wxWidgets build to use. The format must be /path/to/different_wx-config/directory/ #
-## -DMAKE_DEB=1|0 // When set to 1, you can use make package to create .deb file for codelite #
-#######################################################################################################################################################################
+#################################################################################################################################################################
+## #
+## codelite IDE cmake file #
+## Typical usage will be (build in release mode): #
+## #
+## > mkdir build #
+## > cd build #
+## > cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release .. #
+## > make -jN #
+## > sudo make install #
+## #
+## Optional command line arguments: #
+## #
+## -DCMAKE_BUILD_TYPE=Release|Debug|DebugFull // Build release, debug + optimisation or debug without optimisation (for others see the Cmake docs) #
+## -DPREFIX="<some-prefix>" // Installation prefix, default is set to /usr #
+## -DENABLE_CLANG=1|0 // Build codelite with clang code completion support?, default is 1 (with clang) #
+## -DWITH_WXC=1|0 // Build wxCrafter (sources are not part of codelite distribution) default is 0 #
+## -DCOPY_WX_LIBS=1|0 // Incorporate the wxWidgets libs into CodeLite so the binary doesn't depend on them. default is 0 #
+## -DPREVENT_WX_ASSERTS=1|0 // Prevent those annoying wxASSERTS. In release builds the default is 1, in debug 0 #
+## -DAUTOGEN_REVISION=1|0 // Should cmake generate makefiles that auto generates the autoversion.cpp file - default is 1 #
+## -DWITH_PCH=1|0 // Enable Pre Compiled Header? #
+## -DGTK_USE_NATIVEBOOK=1|0 // Under GTK, use wxNotebook instead of wxAuiNotebook. Default is set to 0 #
+## -DWITH_WXPATH=<fullpath> // Specify a particular wxWidgets build to use. The format must be /path/to/different_wx-config/directory/ #
+## -DMAKE_DEB=1|0 // When set to 1, you can use make package to create .deb file for codelite #
+## -DENABLE_SFTP=1|0 // When set to 1 codelite is built with SFTP support. Default is build _with_ SFTP support #
+#################################################################################################################################################################
#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") No, this breaks finding gtk2, so set this locally
@@ -45,6 +45,7 @@ set( USE_CLANG 1 )
set( IS_FREEBSD 0 )
set( BUILD_WXC 0 )
set( CL_COPY_WX_LIBS 0 )
+set( WITH_SFTP 1 )
if ( UNIX )
execute_process(COMMAND pwd OUTPUT_VARIABLE BUILD_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -133,7 +134,7 @@ if (UNIX AND NOT APPLE )
endif (UNIX AND NOT APPLE )
message(FATAL_ERROR "-- Could not find libssh")
endif( LIBSSH_NOT_FOUND_POS GREATER -1 )
-
+
else ( UNIX AND NOT APPLE )
## OSX
set( LIBSSH_INCLUDE_DIR ${CL_SRC_ROOT}/sdk/libssh/include)
@@ -149,6 +150,12 @@ if(ENABLE_CLANG MATCHES 0)
endif (ENABLE_CLANG MATCHES 0)
unset(ENABLE_CLANG CACHE)
+## Enable SFTP support?
+if(ENABLE_SFTP MATCHES 0)
+ set( WITH_SFTP 0 )
+endif (ENABLE_SFTP MATCHES 0)
+unset(ENABLE_SFTP CACHE)
+
if (AUTOGEN_REVISION MATCHES 0)
set ( MAKE_AUTOGEN_REVISION_STRING 0)
else (AUTOGEN_REVISION MATCHES 1)
@@ -192,15 +199,15 @@ unset(GTK_USE_NATIVEBOOK CACHE)
if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DebugFull)
message("-- Building in ${CMAKE_BUILD_TYPE} mode")
- set( DEBUG_BUILD 1 )
+ set( DEBUG_BUILD 1 )
set( CL_PCH_FILE "${CL_SRC_ROOT}/PCH/precompiled_header_dbg.h")
set( CL_PCH_TARGET "precompiled_header_dbg.h.gch")
-
+
## Set the libraries outout directory
set( CL_BIN_DIR bin)
set( CL_LIB_DIR lib)
add_custom_target(distclean COMMAND cd ${CL_SRC_ROOT}/PCH && $(MAKE) type=debug clean )
-
+
set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/${CL_LIB_DIR}" )
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/${CL_BIN_DIR}" )
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/${CL_LIB_DIR}" )
@@ -218,14 +225,14 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DebugFull)
message("-- Adding -DNDEBUG to definitions")
add_definitions(-DNDEBUG)
endif()
-
+
else ()
message("-- Building in Release mode")
- set ( DEBUG_BUILD 0 )
+ set ( DEBUG_BUILD 0 )
set( CL_PCH_FILE "${CL_SRC_ROOT}/PCH/precompiled_header_release.h")
set( CL_PCH_TARGET "precompiled_header_release.h.gch")
add_custom_target(distclean COMMAND cd ${CL_SRC_ROOT}/PCH && $(MAKE) type=release clean )
-
+
## Set the libraries outout directory
set( CL_BIN_DIR bin)
set( CL_LIB_DIR lib)
@@ -242,7 +249,7 @@ else ()
if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_EXE_LINKER_FLAGS "-s") ## Strip binary
endif(CMAKE_COMPILER_IS_GNUCXX)
-
+
## In release, add NDEBUG unless explicitly told not to
if (NOT PREVENT_WX_ASSERTS MATCHES 0)
message("-- Adding -DNDEBUG to definitions")
@@ -265,12 +272,12 @@ if ( UNIX AND NOT APPLE )
execute_process(COMMAND /bin/sh -c "lsb_release -a|grep -i Codename | cut -d: -f2" OUTPUT_VARIABLE OS_CODENAME OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
execute_process(COMMAND /bin/sh -c "lsb_release -a|grep -i Distributor | cut -d: -f2" OUTPUT_VARIABLE OS_DISTRO OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
execute_process(COMMAND /bin/sh -c "uname -m" OUTPUT_VARIABLE OS_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
-
+
## replace any tab/space with nothing
string(REPLACE " " "" DISTRO_CODENAME "${OS_DISTRO}-${OS_CODENAME}-${OS_ARCH}")
string(REPLACE "\t" "" DISTRO_CODENAME "${DISTRO_CODENAME}")
string(TOLOWER ${DISTRO_CODENAME} DISTRO_CODENAME)
-
+
set(CPACK_SYSTEM_NAME "${DISTRO_CODENAME}")
message("-- CPACK_SYSTEM_NAME ${CPACK_SYSTEM_NAME}")
endif ( UNIX AND NOT APPLE )
@@ -295,7 +302,7 @@ if ( MAKE_DEB )
message("-- CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64")
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
endif ()
-
+
set(CPACK_GENERATOR "DEB")
set(CPACK_PACKAGE_NAME "codelite")
set(CPACK_PACKAGE_VERSION "5.3")
@@ -337,6 +344,22 @@ else()
message( "-- *** NOTICE ***: clang support is disabled" )
endif(USE_CLANG)
+############################################
+## SFTP support
+############################################
+if (WITH_SFTP)
+
+ ## Default is set to 1
+ add_definitions(-DUSE_SFTP=1)
+ message("-- USE_SFTP is set to 1")
+
+else(WITH_SFTP)
+ add_definitions(-DUSE_SFTP=0)
+ message("-- USE_SFTP is set to 0")
+ message( "-- *** NOTICE ***: SFTP support is disabled " )
+
+endif(WITH_SFTP)
+
if ( APPLE )
execute_process(COMMAND mkdir -p pack)
execute_process(COMMAND cp ../Runtime/make_mac_bundle.sh pack)
@@ -383,11 +406,11 @@ if ( NOT NO_CPP_PLUGINS )
add_subdirectory(cppchecker)
add_subdirectory(cscope)
add_subdirectory(wxformbuilder)
-
+
if ( BUILD_WXC )
add_subdirectory(wxcrafter)
endif( BUILD_WXC )
-
+
if ( APPLE )
message("-- Adding MacBundler...")
add_subdirectory(MacBundler)
@@ -403,7 +426,10 @@ add_subdirectory(SnipWiz)
add_subdirectory(Subversion2)
add_subdirectory(ZoomNavigator)
add_subdirectory(git)
-add_subdirectory(SFTP)
+
+if (WITH_SFTP)
+ add_subdirectory(SFTP)
+endif(WITH_SFTP)
## Executables
add_subdirectory(LiteEditor)
diff --git a/CodeLite/CodeLite.project b/CodeLite/CodeLite.project
index 6895e17..96ba5f3 100644
--- a/CodeLite/CodeLite.project
+++ b/CodeLite/CodeLite.project
@@ -201,20 +201,9 @@
<File Name="cl_sftp_attribute.h"/>
<File Name="cl_sftp_attribute.cpp"/>
</VirtualDirectory>
+ <Dependencies Name="WinDebugUnicode"/>
+ <Dependencies Name="WinReleaseUnicode"/>
<Settings Type="Dynamic Library">
- <GlobalSettings>
- <Compiler Options="" C_Options="" Assembler="">
- <IncludePath Value="."/>
- <Preprocessor Value="__WX__"/>
- <Preprocessor Value="WXUSINGDLL"/>
- <Preprocessor Value="WXMAKINGDLL_CL"/>
- <Preprocessor Value="WXUSINGDLL_WXSQLITE3"/>
- </Compiler>
- <Linker Options="">
- <LibraryPath Value="."/>
- </Linker>
- <ResourceCompiler Options=""/>
- </GlobalSettings>
<Configuration Name="WinDebugUnicode" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="$(shell wx-config --cxxflags --debug=yes --unicode=yes);-g;-Wall" C_Options="-g;-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="."/>
@@ -223,6 +212,7 @@
<IncludePath Value="../sdk/codelite_indexer/network"/>
<IncludePath Value="../PCH"/>
<IncludePath Value="../sdk/libssh/include"/>
+ <Preprocessor Value="USE_SFTP=1"/>
</Compiler>
<Linker Options="$(shell wx-config --libs --debug=yes --unicode=yes);" Required="yes">
<LibraryPath Value="../lib/gcc_lib"/>
@@ -231,7 +221,7 @@
<Library Value="libssh"/>
</Linker>
<ResourceCompiler Options="" Required="no"/>
- <General OutputFile="../lib/gcc_lib/libcodeliteud.dll" IntermediateDirectory="./WinDebugUnicode" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="" PauseExecWhenProcTerminates="yes"/>
+ <General OutputFile="../lib/gcc_lib/libcodeliteud.dll" IntermediateDirectory="./WinDebugUnicode" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
@@ -266,13 +256,14 @@
</Completion>
</Configuration>
<Configuration Name="WinReleaseUnicode" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
- <Compiler Options="$(shell wx-config --cxxflags --debug=no --unicode=yes);-Wall;-O2;-Winvalid-pch" C_Options="$(shell wx-config --cxxflags --debug=no --unicode=yes);-Wall;-O2" Assembler="" Required="yes" PreCompiledHeader="../PCH/precompiled_header_release.h" PCHInCommandLine="yes" UseDifferentPCHFlags="yes" PCHFlags="$(shell wx-config --cxxflags --unicode=yes --debug=no) -O2">
+ <Compiler Options="$(shell wx-config --cxxflags --debug=no --unicode=yes);-Wall;-O2;-Winvalid-pch" C_Options="-Wall;-O2" Assembler="" Required="yes" PreCompiledHeader="../PCH/precompiled_header_release.h" PCHInCommandLine="yes" UseDifferentPCHFlags="yes" PCHFlags="$(shell wx-config --cxxflags --unicode=yes --debug=no) -O2">
<IncludePath Value="."/>
<IncludePath Value="./include"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../sdk/codelite_indexer/network"/>
<IncludePath Value="../PCH"/>
<IncludePath Value="../sdk/libssh/include"/>
+ <Preprocessor Value="USE_SFTP=1"/>
</Compiler>
<Linker Options="$(shell wx-config --libs --debug=no --unicode=yes);-s" Required="yes">
<LibraryPath Value="../lib/gcc_lib"/>
@@ -281,7 +272,7 @@
<Library Value="libssh"/>
</Linker>
<ResourceCompiler Options="" Required="no"/>
- <General OutputFile="../lib/gcc_lib/libcodeliteu.dll" IntermediateDirectory="./WinReleaseUnicode" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="" PauseExecWhenProcTerminates="yes"/>
+ <General OutputFile="../lib/gcc_lib/libcodeliteu.dll" IntermediateDirectory="./WinReleaseUnicode" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
@@ -327,7 +318,7 @@
<Library Value="libwxsqlite3ud.dll"/>
</Linker>
<ResourceCompiler Options="" Required="no"/>
- <General OutputFile="../lib/gcc_lib/libcodeliteud.dll" IntermediateDirectory="./WinDbg_29" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="" PauseExecWhenProcTerminates="yes"/>
+ <General OutputFile="../lib/gcc_lib/libcodeliteud.dll" IntermediateDirectory="./WinDbg_29" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
@@ -361,7 +352,18 @@
<SearchPaths/>
</Completion>
</Configuration>
+ <GlobalSettings>
+ <Compiler Options="" C_Options="" Assembler="">
+ <IncludePath Value="."/>
+ <Preprocessor Value="__WX__"/>
+ <Preprocessor Value="WXUSINGDLL"/>
+ <Preprocessor Value="WXMAKINGDLL_CL"/>
+ <Preprocessor Value="WXUSINGDLL_WXSQLITE3"/>
+ </Compiler>
+ <Linker Options="">
+ <LibraryPath Value="."/>
+ </Linker>
+ <ResourceCompiler Options=""/>
+ </GlobalSettings>
</Settings>
- <Dependencies Name="WinDebugUnicode"/>
- <Dependencies Name="WinReleaseUnicode"/>
</CodeLite_Project>
diff --git a/CodeLite/cl_sftp.cpp b/CodeLite/cl_sftp.cpp
index 19483b4..f90ad70 100644
--- a/CodeLite/cl_sftp.cpp
+++ b/CodeLite/cl_sftp.cpp
@@ -1,3 +1,4 @@
+#if USE_SFTP
#include "cl_sftp.h"
#include <wx/ffile.h>
#include <string.h>
@@ -167,7 +168,7 @@ wxString clSFTP::Read(const wxString& remotePath) throw (clException)
if (file == NULL) {
throw clException(wxString() << _("Failed to open remote file: ") << remotePath << ". " << ssh_get_error(m_ssh->GetSession()), sftp_get_error(m_sftp));
}
-
+
wxString content;
char buffer[1024];
int nbytes = 0;
@@ -175,11 +176,11 @@ wxString clSFTP::Read(const wxString& remotePath) throw (clException)
nbytes = sftp_read(file, buffer, sizeof(buffer));
while (nbytes > 0) {
content << wxString(buffer, nbytes);
-
+
memset(buffer, 0, sizeof(buffer));
nbytes = sftp_read(file, buffer, sizeof(buffer));
}
-
+
if ( nbytes < 0 ) {
sftp_close(file);
throw clException(wxString() << _("Failed to read remote file: ") << remotePath << ". " << ssh_get_error(m_ssh->GetSession()), sftp_get_error(m_sftp));
@@ -196,7 +197,7 @@ void clSFTP::CreateDir(const wxString& dirname) throw (clException)
int rc;
rc = sftp_mkdir(m_sftp, dirname.mb_str(wxConvISO8859_1).data(), S_IRWXU);
-
+
if ( rc != SSH_OK ) {
throw clException(wxString() << _("Failed to create directory: ") << dirname << ". " << ssh_get_error(m_ssh->GetSession()), sftp_get_error(m_sftp));
}
@@ -209,10 +210,10 @@ void clSFTP::Rename(const wxString& oldpath, const wxString& newpath) throw (clE
}
int rc;
- rc = sftp_rename(m_sftp,
- oldpath.mb_str(wxConvISO8859_1).data(),
+ rc = sftp_rename(m_sftp,
+ oldpath.mb_str(wxConvISO8859_1).data(),
newpath.mb_str(wxConvISO8859_1).data());
-
+
if ( rc != SSH_OK ) {
throw clException(wxString() << _("Failed to rename path. ") << ssh_get_error(m_ssh->GetSession()), sftp_get_error(m_sftp));
}
@@ -225,9 +226,9 @@ void clSFTP::RemoveDir(const wxString& dirname) throw (clException)
}
int rc;
- rc = sftp_rmdir(m_sftp,
+ rc = sftp_rmdir(m_sftp,
dirname.mb_str(wxConvISO8859_1).data());
-
+
if ( rc != SSH_OK ) {
throw clException(wxString() << _("Failed to remove directory: ") << dirname << ". " << ssh_get_error(m_ssh->GetSession()), sftp_get_error(m_sftp));
}
@@ -240,9 +241,9 @@ void clSFTP::UnlinkFile(const wxString& path) throw (clException)
}
int rc;
- rc = sftp_unlink(m_sftp,
+ rc = sftp_unlink(m_sftp,
path.mb_str(wxConvISO8859_1).data());
-
+
if ( rc != SSH_OK ) {
throw clException(wxString() << _("Failed to unlink path: ") << path << ". " << ssh_get_error(m_ssh->GetSession()), sftp_get_error(m_sftp));
}
@@ -253,7 +254,7 @@ SFTPAttribute::Ptr_t clSFTP::Stat(const wxString& path) throw (clException)
if ( !m_sftp ) {
throw clException("SFTP is not initialized");
}
-
+
sftp_attributes attr = sftp_stat(m_sftp, path.mb_str(wxConvISO8859_1).data());
if ( !attr ) {
throw clException(wxString() << _("Could not stat: ") << path << ". " << ssh_get_error(m_ssh->GetSession()), sftp_get_error(m_sftp));
@@ -261,3 +262,5 @@ SFTPAttribute::Ptr_t clSFTP::Stat(const wxString& path) throw (clException)
SFTPAttribute::Ptr_t pattr( new SFTPAttribute(attr) );
return pattr;
}
+
+#endif // USE_SFTP
diff --git a/CodeLite/cl_sftp.h b/CodeLite/cl_sftp.h
index fa2fcd9..9b6eae8 100644
--- a/CodeLite/cl_sftp.h
+++ b/CodeLite/cl_sftp.h
@@ -26,6 +26,8 @@
#ifndef CLSCP_H
#define CLSCP_H
+#if USE_SFTP
+
#include "cl_ssh.h"
#include "cl_exception.h"
#include <wx/filename.h>
@@ -87,7 +89,7 @@ public:
* @brief write the content of 'fileContent' into the remote file represented by remotePath
*/
void Write(const wxString &fileContent, const wxString &remotePath) throw (clException);
-
+
/**
* @brief read remote file and return its content
* @return the file content.
@@ -101,25 +103,25 @@ public:
* @throw clException incase an error occured
*/
SFTPAttribute::List_t List(const wxString &folder, size_t flags, const wxString &filter = "") throw (clException);
-
+
/**
* @brief create a directory
* @param dirname
*/
void CreateDir(const wxString &dirname) throw (clException);
-
+
/**
* @brief Remove a directoy.
* @param dirname
*/
void RemoveDir(const wxString &dirname) throw (clException);
-
+
/**
* @brief Unlink (delete) a file.
* @param dirname
*/
void UnlinkFile(const wxString &path) throw (clException);
-
+
/**
* @brief Rename or move a file or directory
* @param oldpath
@@ -131,7 +133,7 @@ public:
* @return
*/
SFTPAttribute::List_t CdUp(size_t flags, const wxString &filter) throw (clException);
-
+
/**
* @brief stat the path
*/
@@ -144,4 +146,5 @@ public:
}
};
+#endif // USE_SFTP
#endif // CLSCP_H
diff --git a/CodeLite/cl_sftp_attribute.cpp b/CodeLite/cl_sftp_attribute.cpp
index c4924fa..b1e429f 100644
--- a/CodeLite/cl_sftp_attribute.cpp
+++ b/CodeLite/cl_sftp_attribute.cpp
@@ -1,3 +1,5 @@
+#if USE_SFTP
+
#include "cl_sftp_attribute.h"
#include <libssh/sftp.h>
@@ -34,11 +36,11 @@ void SFTPAttribute::DoConstruct()
{
... 708 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-29 08:21: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 8efc3aee6e5e7bd958fc45043f531aad3b6d32f1 (commit)
from 603ae7d86069485338ffae12d5e2c48ce949673e (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/8efc3aee6e5e7bd958fc45043f531aad3b6d32f1
commit 8efc3aee6e5e7bd958fc45043f531aad3b6d32f1
Author: Eran <era...@gm...>
Date: Sun Dec 29 10:21:14 2013 +0200
SFTP: the authentication method order is set to: None -> Public Key -> Password -> Interactive Kbd
diff --git a/CodeLite/cl_ssh.cpp b/CodeLite/cl_ssh.cpp
index d16faf0..9e96cd8 100644
--- a/CodeLite/cl_ssh.cpp
+++ b/CodeLite/cl_ssh.cpp
@@ -224,10 +224,10 @@ void clSSH::Login() throw (clException)
} catch (clException &e) {
try {
- LoginInteractiveKBD();
+ LoginPassword();
} catch (clException &e2) {
- LoginPassword();
+ LoginInteractiveKBD();
}
}
}
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 4baacb9..69bcbb4 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -43,7 +43,7 @@
</Environment>
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
@@ -77,7 +77,7 @@
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="Win Debug Unicode" Selected="yes">
+ <WorkspaceConfiguration Name="Win Debug Unicode" Selected="no">
<Project Name="ZoomNavigator" ConfigName="WinDebugUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinDebugUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinDebugUnicode"/>
-----------------------------------------------------------------------
Summary of changes:
CodeLite/cl_ssh.cpp | 4 ++--
LiteEditor.workspace | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-29 08:19:16
|
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 603ae7d86069485338ffae12d5e2c48ce949673e (commit)
from 3d5fb6d224d6df2fb7a0153fa2c645fbef30422f (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/603ae7d86069485338ffae12d5e2c48ce949673e
commit 603ae7d86069485338ffae12d5e2c48ce949673e
Author: Eran <era...@gm...>
Date: Sun Dec 29 10:19:01 2013 +0200
SFTP: Fixed assertion when attempting to expand a folder without the proper permissions
diff --git a/CodeLite/cl_ssh.cpp b/CodeLite/cl_ssh.cpp
index 2f30d25..d16faf0 100644
--- a/CodeLite/cl_ssh.cpp
+++ b/CodeLite/cl_ssh.cpp
@@ -32,13 +32,13 @@ void clSSH::Connect() throw(clException)
}
int verbosity = SSH_LOG_NOLOG;
- int timeout = 5;
+ int timeout = 10;
ssh_options_set(m_session, SSH_OPTIONS_HOST, m_host.mb_str(wxConvUTF8).data());
ssh_options_set(m_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
ssh_options_set(m_session, SSH_OPTIONS_PORT, &m_port);
ssh_options_set(m_session, SSH_OPTIONS_USER, GetUsername().mb_str().data());
ssh_options_set(m_session, SSH_OPTIONS_TIMEOUT, &timeout);
-
+
int rc = ssh_connect(m_session);
if (rc != SSH_OK) {
throw clException(ssh_get_error(m_session));
@@ -112,7 +112,7 @@ void clSSH::AcceptServerAuthentication() throw (clException)
throw clException(msg);\
}\
return false;
-
+
bool clSSH::LoginPassword(bool throwExc) throw (clException)
{
if ( !m_session ) {
@@ -124,11 +124,11 @@ bool clSSH::LoginPassword(bool throwExc) throw (clException)
rc = ssh_userauth_password(m_session, NULL, GetPassword().mb_str().data());
if ( rc == SSH_AUTH_SUCCESS ) {
return true;
-
+
} else if ( rc == SSH_AUTH_DENIED ) {
THROW_OR_FALSE("Login failed: invalid username/password");
-
-
+
+
} else {
THROW_OR_FALSE(wxString() << _("Authentication error: ") << ssh_get_error(m_session));
}
@@ -160,7 +160,7 @@ bool clSSH::LoginInteractiveKBD(bool throwExc) throw (clException)
wxString answer = ::wxGetTextFromUser(prompt, "SSH");
if ( answer.IsEmpty() ) {
THROW_OR_FALSE(wxString() << "Login error: " << ssh_get_error(m_session));
-
+
}
if (ssh_userauth_kbdint_setanswer(m_session, iprompt, answer.mb_str(wxConvUTF8).data()) < 0) {
THROW_OR_FALSE(wxString() << "Login error: " << ssh_get_error(m_session));
@@ -184,7 +184,7 @@ bool clSSH::LoginPublicKey(bool throwExc) throw (clException)
if ( !m_session ) {
THROW_OR_FALSE("NULL SSH session");
}
-
+
int rc;
rc = ssh_userauth_autopubkey(m_session, NULL);
if (rc != SSH_AUTH_SUCCESS) {
@@ -198,55 +198,36 @@ void clSSH::Close()
if ( m_session && m_connected ) {
ssh_disconnect(m_session);
}
-
+
if ( m_session ) {
ssh_free(m_session);
}
-
+
m_connected = false;
m_session = NULL;
}
void clSSH::Login() throw (clException)
{
- int method, rc;
-
+ int rc;
+
rc = ssh_userauth_none(m_session, NULL);
if (rc == SSH_AUTH_SUCCESS) {
return;
}
-
- wxString errorMessage = "Unsupported login method";
- method = ssh_userauth_list(m_session, NULL);
- if ( method & SSH_AUTH_METHOD_PUBLICKEY ) {
- try {
- LoginPublicKey();
- return;
-
- } catch (clException &e) {
- errorMessage = e.What();
- }
- }
-
- if ( method & SSH_AUTH_METHOD_INTERACTIVE ) {
+
+ // Try the following 3 methods in order
+ // if non succeeded, this function will throw an exception
+
+ try {
+ LoginPublicKey();
+
+ } catch (clException &e) {
try {
LoginInteractiveKBD();
- return;
-
- } catch (clException &e) {
- errorMessage = e.What();
- }
- }
-
- if ( method & SSH_AUTH_METHOD_PASSWORD ) {
-
- try {
+
+ } catch (clException &e2) {
LoginPassword();
- return;
-
- } catch (clException &e) {
- errorMessage = e.What();
}
}
- throw clException(errorMessage);
}
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 69bcbb4..4baacb9 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -43,7 +43,7 @@
</Environment>
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
@@ -77,7 +77,7 @@
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="Win Debug Unicode" Selected="no">
+ <WorkspaceConfiguration Name="Win Debug Unicode" Selected="yes">
<Project Name="ZoomNavigator" ConfigName="WinDebugUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinDebugUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinDebugUnicode"/>
diff --git a/SFTP/SFTPTreeView.cpp b/SFTP/SFTPTreeView.cpp
index 19a6af2..6e47b8a 100644
--- a/SFTP/SFTPTreeView.cpp
+++ b/SFTP/SFTPTreeView.cpp
@@ -108,7 +108,6 @@ void SFTPTreeView::OnItemActivated(wxTreeListEvent& event)
if ( cd->IsFolder() ) {
m_treeListCtrl->Expand( event.GetItem() );
- DoExpandItem(event.GetItem());
} else {
@@ -125,8 +124,9 @@ void SFTPTreeView::OnItemActivated(wxTreeListEvent& event)
void SFTPTreeView::OnItemExpanding(wxTreeListEvent& event)
{
- wxUnusedVar(event);
- DoExpandItem(event.GetItem());
+ if ( !DoExpandItem(event.GetItem()) ) {
+ event.Veto();
+ }
}
void SFTPTreeView::OnOpenAccountManager(wxCommandEvent& event)
@@ -178,20 +178,15 @@ void SFTPTreeView::OnConnectUI(wxUpdateUIEvent& event)
event.Enable( !m_choiceAccount->GetStringSelection().IsEmpty() && !m_sftp );
}
-void SFTPTreeView::DoExpandItem(const wxTreeListItem& item)
+bool SFTPTreeView::DoExpandItem(const wxTreeListItem& item)
{
MyClientData *cd = GetItemData( item );
- CHECK_PTR_RET(cd);
+ CHECK_PTR_RET_FALSE(cd);
// already initialized this folder before?
if ( cd->IsInitialized() ) {
- return;
+ return true;
}
- cd->SetInitialized( true );
-
- // Remove the dummy item and replace it with real items
- wxTreeListItem dummyItem = m_treeListCtrl->GetFirstChild(item);
- m_treeListCtrl->DeleteItem( dummyItem );
// get list of files and populate the tree
SFTPAttribute::List_t attributes;
@@ -200,8 +195,14 @@ void SFTPTreeView::DoExpandItem(const wxTreeListItem& item)
} catch (clException &e) {
::wxMessageBox(e.What(), "SFTP", wxOK|wxICON_ERROR|wxCENTER, EventNotifier::Get()->TopFrame());
- return;
+ return false;
}
+
+ // Remove the dummy item and replace it with real items
+ wxTreeListItem dummyItem = m_treeListCtrl->GetFirstChild(item);
+ m_treeListCtrl->DeleteItem( dummyItem );
+ cd->SetInitialized( true );
+
SFTPAttribute::List_t::iterator iter = attributes.begin();
for( ; iter != attributes.end(); ++iter ) {
SFTPAttribute::Ptr_t attr = (*iter);
@@ -224,7 +225,7 @@ void SFTPTreeView::DoExpandItem(const wxTreeListItem& item)
wxString path;
path << cd->GetFullPath() << "/" << attr->GetName();
while (path.Replace("//", "/")) {}
-
+
MyClientData* childClientData = new MyClientData(path);
childClientData->SetIsFolder( attr->IsFolder() );
@@ -237,6 +238,7 @@ void SFTPTreeView::DoExpandItem(const wxTreeListItem& item)
m_treeListCtrl->AppendItem(child, "<dummy>");
}
}
+ return true;
}
MyClientData* SFTPTreeView::GetItemData(const wxTreeListItem& item)
@@ -280,7 +282,7 @@ void SFTPTreeView::OnContextMenu(wxTreeListEvent& event)
// Just incase, make sure the item is selected
m_treeListCtrl->Select(event.GetItem());
-
+
wxMenu menu;
if ( !cd->IsFolder() ) {
@@ -339,17 +341,17 @@ void SFTPTreeView::OnMenuNew(wxCommandEvent& event)
m_treeListCtrl->GetSelections(items);
if ( items.size() != 1)
return;
-
+
MyClientData *cd = GetItemData(items.at(0));
CHECK_PTR_RET(cd);
-
+
if ( !cd->IsFolder() ) {
return;
}
-
+
wxString new_name = ::wxGetTextFromUser(_("Enter the new directory name:"), _("New Directory"));
if ( !new_name.IsEmpty() ) {
-
+
wxString fullpath = cd->GetFullPath();
fullpath << "/" << new_name;
DoAddFolder(items.at(0), fullpath);
@@ -365,19 +367,19 @@ void SFTPTreeView::OnMenuRename(wxCommandEvent& event)
try {
for(size_t i=0; i<items.size(); ++i) {
-
+
MyClientData *cd = GetItemData(items.at(i));
if ( !cd ) continue; // ??
-
+
wxString new_name = ::wxGetTextFromUser(_("Enter new name:"), _("Rename"), cd->GetFullName());
if ( !new_name.IsEmpty() ) {
wxString old_path = cd->GetFullPath();
cd->SetFullName( new_name );
m_sftp->Rename( old_path, cd->GetFullPath() );
-
+
// Remove the selection
m_treeListCtrl->SetItemText(items.at(i), 0, new_name);
-
+
}
}
@@ -393,13 +395,13 @@ void SFTPTreeView::OnMenuOpen(wxCommandEvent& event)
m_treeListCtrl->GetSelections(items);
if ( items.empty() )
return;
-
+
for(size_t i=0; i<items.size(); ++i) {
MyClientData *cd = GetItemData(items.at(i));
if ( !cd || cd->IsFolder() ) {
continue;
}
-
+
RemoteFileInfo remoteFile;
remoteFile.SetAccount( m_account );
remoteFile.SetRemoteFile( cd->GetFullPath() );
@@ -420,14 +422,14 @@ wxTreeListItem SFTPTreeView::DoAddFolder(const wxTreeListItem& parent, const wxS
MyClientData *newCd = new MyClientData(path);
newCd->SetIsFolder( true );
newCd->SetInitialized(false);
-
+
wxTreeListItem child = m_treeListCtrl->AppendItem(parent, newCd->GetFullName(), m_bmpLoader.GetMimeImageId(FileExtManager::TypeFolder), wxNOT_FOUND, newCd);
m_treeListCtrl->SetItemText(child, 1, attr->GetTypeAsString());
m_treeListCtrl->SetItemText(child, 2, wxString() << attr->GetSize());
m_treeListCtrl->AppendItem(child, "<dummy>");
m_treeListCtrl->SetSortColumn(0);
return child;
-
+
} catch (clException &e) {
::wxMessageBox(e.What(), "SFTP", wxICON_ERROR|wxOK|wxCENTER);
}
diff --git a/SFTP/SFTPTreeView.h b/SFTP/SFTPTreeView.h
index 5324af3..b0a9d8d 100644
--- a/SFTP/SFTPTreeView.h
+++ b/SFTP/SFTPTreeView.h
@@ -58,11 +58,11 @@ protected:
virtual void OnMenuOpen(wxCommandEvent &event);
virtual void OnMenuDelete(wxCommandEvent &event);
virtual void OnMenuRename(wxCommandEvent &event);
-
+
void DoCloseSession();
- void DoExpandItem(const wxTreeListItem& item);
+ bool DoExpandItem(const wxTreeListItem& item);
wxTreeListItem DoAddFolder(const wxTreeListItem& parent, const wxString &path);
-
+
MyClientData* GetItemData(const wxTreeListItem& item);
MyClientDataVect_t GetSelectionsItemData();
-----------------------------------------------------------------------
Summary of changes:
CodeLite/cl_ssh.cpp | 63 +++++++++++++++++-------------------------------
LiteEditor.workspace | 4 +-
SFTP/SFTPTreeView.cpp | 54 +++++++++++++++++++++--------------------
SFTP/SFTPTreeView.h | 6 ++--
4 files changed, 55 insertions(+), 72 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-29 07:17: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 3d5fb6d224d6df2fb7a0153fa2c645fbef30422f (commit)
from 2a2813b090eedd17cfe76812f4bdd8a3b4da57de (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/3d5fb6d224d6df2fb7a0153fa2c645fbef30422f
commit 3d5fb6d224d6df2fb7a0153fa2c645fbef30422f
Author: Eran <era...@gm...>
Date: Sun Dec 29 09:16:57 2013 +0200
Updated CMake syntax highlight for black themes + removed some obsolete files
diff --git a/Runtime/lexers/lexers_black.xml b/Runtime/lexers/lexers_black.xml
index 8261b5c..86e5a6d 100644
--- a/Runtime/lexers/lexers_black.xml
+++ b/Runtime/lexers/lexers_black.xml
@@ -43,29 +43,29 @@
<KeyWords4/>
<Extensions>*.cmake;*.CMAKE;CMakeLists.txt</Extensions>
<Properties>
- <Property Id="0" Name="Default" Bold="no" Face="" Colour="#DADADA" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="1" Name="Comment" Bold="no" Face="" Colour="#808080" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="2" Name="String DQ" Bold="no" Face="" Colour="#F09812" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="3" Name="String LQ" Bold="no" Face="" Colour="#D9B259" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="4" Name="String RQ" Bold="no" Face="" Colour="#FA9B54" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="5" Name="Commands" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="6" Name="Parameters" Bold="no" Face="" Colour="#FB81ED" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="7" Name="Variables" Bold="no" Face="" Colour="#FB81ED" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="8" Name="UserDefined" Bold="no" Face="" Colour="#9CDA9C" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="9" Name="While Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="10" Name="Foreach Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="11" Name="If Defined Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="12" Name="Macro Def" Bold="no" Face="" Colour="#08DBD1" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="13" Name="String Var" Bold="no" Face="" Colour="#F1EF6F" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="14" Name="Number" Bold="no" Face="" Colour="#006400" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="-1" Name="Fold Margin" Bold="no" Face="" Colour="#FFFFFF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="0" Name="Default" Bold="no" Face="" Colour="#D0D0D0" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="1" Name="Comment" Bold="no" Face="" Colour="#808080" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="2" Name="String DQ" Bold="no" Face="" Colour="#F09812" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="3" Name="String LQ" Bold="no" Face="" Colour="#D9B259" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="4" Name="String RQ" Bold="no" Face="" Colour="#FA9B54" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="5" Name="Commands" Bold="no" Face="" Colour="#00C5FF" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="6" Name="Parameters" Bold="no" Face="" Colour="#FB81ED" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="7" Name="Variables" Bold="no" Face="" Colour="#FB81ED" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="8" Name="UserDefined" Bold="no" Face="" Colour="#9CDA9C" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="9" Name="While Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="10" Name="Foreach Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="11" Name="If Defined Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="12" Name="Macro Def" Bold="no" Face="" Colour="#08DBD1" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="13" Name="String Var" Bold="no" Face="" Colour="#F1EF6F" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="14" Name="Number" Bold="no" Face="" Colour="#006400" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="-1" Name="Fold Margin" Bold="no" Face="" Colour="#202020" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
<Property Id="-2" Name="Text Selection" Bold="no" Face="" Colour="" BgColour="#676767" Italic="no" Underline="no" EolFilled="no" Alpha="80" Size="11"/>
- <Property Id="-3" Name="Caret Colour" Bold="no" Face="" Colour="#FFFFFF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="-4" Name="Whitespace" Bold="no" Face="" Colour="" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="33" Name="Line Numbers" Bold="no" Face="" Colour="" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="34" Name="Brace match" Bold="yes" Face="" Colour="#FFFF00" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="35" Name="Brace bad match" Bold="no" Face="" Colour="red" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="37" Name="Indent Guide" Bold="no" Face="" Colour="#C0C0C0" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="-3" Name="Caret Colour" Bold="no" Face="" Colour="#FFFFFF" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="-4" Name="Whitespace" Bold="no" Face="" Colour="" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="33" Name="Line Numbers" Bold="no" Face="" Colour="#D0D0D0" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="34" Name="Brace match" Bold="yes" Face="" Colour="#FFFF00" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="35" Name="Brace bad match" Bold="no" Face="" Colour="red" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="37" Name="Indent Guide" Bold="no" Face="" Colour="#C0C0C0" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
</Properties>
</Lexer>
@@ -577,7 +577,7 @@ subpage subsection subsubsection test throw todo tparam typedef union until var
</Lexer>
<Lexer Name="css" Id="38">
<!-- CSS1 properties -->
- <KeyWords0>color background-color background-image background-repeat background-attachment background-position background font-family font-style font-variant font-weight font-size font word-spacing letter-spacing text-decoration vertical-align text-transform text-align text-indent line-height margin-top margin-right margin-bottom margin-left margin padding-top padding-right padding-bottom padding-left padding border-top-width border-right-width border-bottom-width border-left-width border-width border-top border-right border-bottom border-left border border-color border-style width height float clear display white-space list-style-type list-style-image list-style-position list-style auto none normal italic oblique small-caps bold bolder lighter xx-small x-small small medium large x-large xx-large larger smaller transparent repeat repeat-x repeat-y no-repeat scroll fixed top bottom left center right justify both underline overline line-through blink baseline sub super text-top middle text-bottom capitalize uppercase lowercase thin medium thick dotted dashed solid double groove ridge inset outset block inline list-item pre no-wrap inside outside disc circle square decimal lower-roman upper-roman lower-alpha upper-alpha aqua black blue fuchsia gray green lime maroon navy olive purple red silver teal white yellow
+ <KeyWords0>color background-color background-image background-repeat background-attachment background-position background font-family font-style font-variant font-weight font-size font word-spacing letter-spacing text-decoration vertical-align text-transform text-align text-indent line-height margin-top margin-right margin-bottom margin-left margin padding-top padding-right padding-bottom padding-left padding border-top-width border-right-width border-bottom-width border-left-width border-width border-top border-right border-bottom border-left border border-color border-style width height float clear display white-space list-style-type list-style-image list-style-position list-style auto none normal italic oblique small-caps bold bolder lighter xx-small x-small small medium large x-large xx-large larger smaller transparent repeat repeat-x repeat-y no-repeat scroll fixed top bottom left center right justify both underline overline line-through blink baseline sub super text-top middle text-bottom capitalize uppercase lowercase thin medium thick dotted dashed solid double groove ridge inset outset block inline list-item pre no-wrap inside outside disc circle square decimal lower-roman upper-roman lower-alpha upper-alpha aqua black blue fuchsia gray green lime maroon navy olive purple red silver teal white yellow
</KeyWords0>
<!-- pseudoClasses -->
<KeyWords1>
@@ -601,7 +601,7 @@ resize opacity word-wrap
</KeyWords3>
<!-- Pseudo Elements -->
<KeyWords4>
- first-letter first-line before after selection
+ first-letter first-line before after selection
</KeyWords4>
<Extensions>*.css</Extensions>
<Properties>
diff --git a/Runtime/lexers/lexers_zmrok.xml b/Runtime/lexers/lexers_zmrok.xml
index eb337d8..a57d071 100644
--- a/Runtime/lexers/lexers_zmrok.xml
+++ b/Runtime/lexers/lexers_zmrok.xml
@@ -8,29 +8,29 @@
<KeyWords4/>
<Extensions>*.cmake;*.CMAKE;CMakeLists.txt</Extensions>
<Properties>
- <Property Id="0" Name="Default" Bold="no" Face="" Colour="#DADADA" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="1" Name="Comment" Bold="no" Face="" Colour="#808080" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="2" Name="String DQ" Bold="no" Face="" Colour="#F09812" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="3" Name="String LQ" Bold="no" Face="" Colour="#D9B259" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="4" Name="String RQ" Bold="no" Face="" Colour="#FA9B54" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="5" Name="Commands" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="6" Name="Parameters" Bold="no" Face="" Colour="#FB81ED" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="7" Name="Variables" Bold="no" Face="" Colour="#FB81ED" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="8" Name="UserDefined" Bold="no" Face="" Colour="#9CDA9C" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="9" Name="While Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="10" Name="Foreach Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="11" Name="If Defined Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="12" Name="Macro Def" Bold="no" Face="" Colour="#08DBD1" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="13" Name="String Var" Bold="no" Face="" Colour="#F1EF6F" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="14" Name="Number" Bold="no" Face="" Colour="#006400" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="-1" Name="Fold Margin" Bold="no" Face="" Colour="#FFFFFF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="0" Name="Default" Bold="no" Face="" Colour="#D0D0D0" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="1" Name="Comment" Bold="no" Face="" Colour="#808080" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="2" Name="String DQ" Bold="no" Face="" Colour="#F09812" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="3" Name="String LQ" Bold="no" Face="" Colour="#D9B259" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="4" Name="String RQ" Bold="no" Face="" Colour="#FA9B54" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="5" Name="Commands" Bold="no" Face="" Colour="#00C5FF" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="6" Name="Parameters" Bold="no" Face="" Colour="#FB81ED" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="7" Name="Variables" Bold="no" Face="" Colour="#FB81ED" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="8" Name="UserDefined" Bold="no" Face="" Colour="#9CDA9C" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="9" Name="While Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="10" Name="Foreach Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="11" Name="If Defined Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="12" Name="Macro Def" Bold="no" Face="" Colour="#08DBD1" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="13" Name="String Var" Bold="no" Face="" Colour="#F1EF6F" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="14" Name="Number" Bold="no" Face="" Colour="#006400" BgColour="#101010" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="-1" Name="Fold Margin" Bold="no" Face="" Colour="#202020" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
<Property Id="-2" Name="Text Selection" Bold="no" Face="" Colour="" BgColour="#676767" Italic="no" Underline="no" EolFilled="no" Alpha="80" Size="11"/>
- <Property Id="-3" Name="Caret Colour" Bold="no" Face="" Colour="#FFFFFF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="-4" Name="Whitespace" Bold="no" Face="" Colour="" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="33" Name="Line Numbers" Bold="no" Face="" Colour="" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="34" Name="Brace match" Bold="yes" Face="" Colour="#FFFF00" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="35" Name="Brace bad match" Bold="no" Face="" Colour="red" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="37" Name="Indent Guide" Bold="no" Face="" Colour="#C0C0C0" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="-3" Name="Caret Colour" Bold="no" Face="" Colour="#FFFFFF" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="-4" Name="Whitespace" Bold="no" Face="" Colour="" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="33" Name="Line Numbers" Bold="no" Face="" Colour="#D0D0D0" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="34" Name="Brace match" Bold="yes" Face="" Colour="#FFFF00" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="35" Name="Brace bad match" Bold="no" Face="" Colour="red" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="37" Name="Indent Guide" Bold="no" Face="" Colour="#C0C0C0" BgColour="#101010" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
</Properties>
</Lexer>
<Lexer Name="Assembly" StylingWithinPreProcessor="yes" Id="34">
@@ -230,7 +230,7 @@
<KeyWords1>abstract boolean break byte case catch char class const continue debugger default delete do double else enum export extends false final finally float for function goto if implements import in instanceof int interface long native new null package private protected public return short static super switch synchronized this throw throws transient true try typeof var void volatile while with</KeyWords1>
<KeyWords2>addressof alias and as attribute base begin binary boolean byref byte byval call case compare const currency date decimal declare defbool defbyte defint deflng defcur defsng defdbl defdec defdate defstr defobj defvar dim do double each else elseif empty end enum eqv erase error event exit explicit false for friend function get gosub goto if imp implements in input integer is len let lib like load lock long loop lset me mid midb mod new next not nothing null object on option optional or paramarray preserve print private property public raiseevent randomize redim rem resume return rset seek select set single static step stop string sub then time to true type typeof unload until variant wend while with withevents xor</KeyWords2>
<KeyWords3>and assert break class continue def del elif else except exec finally for from global if import in is lambda None not or pass print raise return try while yield</KeyWords3>
- <KeyWords4>implements abstract and array as bool boolean break case cfunction class const continue declare default die directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exit extends false float for foreach function global if include include_once int integer isset list new null object old_function or parent print real require require_once resource return static stdclass string switch true unset use var while xor __class__ __file__ __function__ __line__ __sleep __namespace__ __trait__ __wakeup public protected private trait interface namespace final throw extends try catch</KeyWords4>
+ <KeyWords4>implements abstract and array as bool boolean break case cfunction class const continue declare default die directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exit extends false float for foreach function global if include include_once int integer isset list new null object old_function or parent print real require require_once resource return static stdclass string switch true unset use var while xor __class__ __file__ __function__ __line__ __sleep __namespace__ __trait__ __wakeup public protected private trait interface namespace final throw extends try catch</KeyWords4>
<Extensions>*.htm;*.html;*.xhtml;*.phtml;*.js;*.php;*.php3;*.inc</Extensions>
<Properties>
<Property Id="32" Name="Default" Bold="no" Face="" Colour="#C0C0C0" BgColour="#141414" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
@@ -722,7 +722,7 @@
</Lexer>
<Lexer Name="css" Id="38">
<!-- CSS1 properties -->
- <KeyWords0>color background-color background-image background-repeat background-attachment background-position background font-family font-style font-variant font-weight font-size font word-spacing letter-spacing text-decoration vertical-align text-transform text-align text-indent line-height margin-top margin-right margin-bottom margin-left margin padding-top padding-right padding-bottom padding-left padding border-top-width border-right-width border-bottom-width border-left-width border-width border-top border-right border-bottom border-left border border-color border-style width height float clear display white-space list-style-type list-style-image list-style-position list-style auto none normal italic oblique small-caps bold bolder lighter xx-small x-small small medium large x-large xx-large larger smaller transparent repeat repeat-x repeat-y no-repeat scroll fixed top bottom left center right justify both underline overline line-through blink baseline sub super text-top middle text-bottom capitalize uppercase lowercase thin medium thick dotted dashed solid double groove ridge inset outset block inline list-item pre no-wrap inside outside disc circle square decimal lower-roman upper-roman lower-alpha upper-alpha aqua black blue fuchsia gray green lime maroon navy olive purple red silver teal white yellow
+ <KeyWords0>color background-color background-image background-repeat background-attachment background-position background font-family font-style font-variant font-weight font-size font word-spacing letter-spacing text-decoration vertical-align text-transform text-align text-indent line-height margin-top margin-right margin-bottom margin-left margin padding-top padding-right padding-bottom padding-left padding border-top-width border-right-width border-bottom-width border-left-width border-width border-top border-right border-bottom border-left border border-color border-style width height float clear display white-space list-style-type list-style-image list-style-position list-style auto none normal italic oblique small-caps bold bolder lighter xx-small x-small small medium large x-large xx-large larger smaller transparent repeat repeat-x repeat-y no-repeat scroll fixed top bottom left center right justify both underline overline line-through blink baseline sub super text-top middle text-bottom capitalize uppercase lowercase thin medium thick dotted dashed solid double groove ridge inset outset block inline list-item pre no-wrap inside outside disc circle square decimal lower-roman upper-roman lower-alpha upper-alpha aqua black blue fuchsia gray green lime maroon navy olive purple red silver teal white yellow
</KeyWords0>
<!-- pseudoClasses -->
<KeyWords1>
@@ -746,7 +746,7 @@ resize opacity word-wrap
</KeyWords3>
<!-- Pseudo Elements -->
<KeyWords4>
- first-letter first-line before after selection
+ first-letter first-line before after selection
</KeyWords4>
<Extensions>*.css</Extensions>
<Properties>
diff --git a/le_makerevision.sh b/le_makerevision.sh
deleted file mode 100755
index 05a9d88..0000000
--- a/le_makerevision.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-################################################################################
-## This file is part of CodeLite IDE and is released
-## 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.
-################################################################################
-
-#!/bin/sh
-has_file=0
-has_svn=0
-
-if (test -f LiteEditor/svninfo.cpp); then
- has_file=1
-fi
-
-if (test -d ".svn"); then
- has_svn=1
- cur_rev=`LC_ALL=C svn info | grep Revision | awk '{print $2;}'`
-else
- cur_rev=""
-fi
-
-## generate the svninfo file
-## we always do this if svn is available, but even if it isn't, create a 'blank' file if none exists
-if [ $has_svn -eq 1 ] || [ $has_file -eq 0 ]; then
- echo "#include <wx/string.h>" > LiteEditor/svninfo.cpp
- printf "const wxChar * SvnRevision = wxT(\"%s\");\n" ${cur_rev} >> LiteEditor/svninfo.cpp
- echo "" >> LiteEditor/svninfo.cpp
- echo "Generating svninfo file..."
-fi
-
diff --git a/missing_include_error.txt b/missing_include_error.txt
deleted file mode 100644
index 2829b9b..0000000
--- a/missing_include_error.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-C:/Development/C++/codelite/CL_trunk/LiteEditor/importfilesdialog.cpp:39: error: 'TagsManagerST' has not been declared
-C:/Development/C++/codelite/CL_trunk/LiteEditor/importfilesdialog.cpp:40: error: 'TagsManagerST' has not been declared
-C:/Development/C++/codelite/CL_trunk/LiteEditor/importfilesdialog.cpp:40: error: 'CC_PARSE_EXT_LESS_FILES' was not declared in this scope
-C:/Development/C++/codelite/CL_trunk/LiteEditor/importfilesdialog.cpp:49: error: 'ProjectPtr' was not declared in this scope
-C:/Development/C++/codelite/CL_trunk/LiteEditor/importfilesdialog.cpp:49: error: expected ';' before 'proj'
-C:/Development/C++/codelite/CL_trunk/LiteEditor/importfilesdialog.cpp:50: error: 'proj' was not declared in this scope
-C:/Development/C++/codelite/CL_trunk/LiteEditor/importfilesdialog.cpp:58: error: invalid use of incomplete type 'struct CheckDirTreeCtrl'
-C:/Development/C++/codelite/CL_trunk/LiteEditor/importfilesdialog.h:51: error: forward declaration of 'struct CheckDirTreeCtrl'
-C:/Development/C++/codelite/CL_trunk/LiteEditor/importfilesdialog.cpp:59: error: invalid conversion from 'CheckDirTreeCtrl*' to 'int'
-C:/Development/C++/codelite/CL_trunk/LiteEditor/importfilesdialog.cpp:59: error: initializing argument 1 of 'wxSizerItem* wxSizer::Add(int, int, int, int, int, wxObject*)'
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
Runtime/lexers/lexers_black.xml | 48 ++++++++++++++++++------------------
Runtime/lexers/lexers_zmrok.xml | 50 +++++++++++++++++++-------------------
le_makerevision.sh | 31 ------------------------
missing_include_error.txt | 10 -------
4 files changed, 49 insertions(+), 90 deletions(-)
delete mode 100755 le_makerevision.sh
delete mode 100644 missing_include_error.txt
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-28 18:19: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 2a2813b090eedd17cfe76812f4bdd8a3b4da57de (commit)
from 2d3943ef260cab8f91efa5a71641151e566de298 (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/2a2813b090eedd17cfe76812f4bdd8a3b4da57de
commit 2a2813b090eedd17cfe76812f4bdd8a3b4da57de
Author: Eran <era...@gm...>
Date: Sat Dec 28 20:17:22 2013 +0200
Updated "manage plugins" dialog by changing its layout + adding {un}check all buttons
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index bb121ae..b57dd32 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -342,6 +342,7 @@
<File Name="plugindlgbase.cpp"/>
<File Name="plugindlgbase.h"/>
<File Name="pluginmgrdlg.cpp"/>
+ <File Name="plugindlgbase.wxcp"/>
</VirtualDirectory>
<VirtualDirectory Name="DoxygenUI">
<File Name="commentpagebase.h"/>
@@ -804,6 +805,7 @@
<File Name="new_virtual_folder_liteeditor_bitmaps.cpp"/>
<File Name="editor_options_misc_liteeditor_bitmaps.cpp"/>
<File Name="editor_options_caret_liteeditor_bitmaps.cpp"/>
+ <File Name="plugindlgbase_liteeditor_bitmaps.cpp"/>
</VirtualDirectory>
<File Name="../formbuilder/editorsettingslocalbase.wxcp"/>
<File Name="../formbuilder/findinfiles_dlg.wxcp"/>
diff --git a/LiteEditor/plugindlgbase.cpp b/LiteEditor/plugindlgbase.cpp
index 216c573..69f5f7d 100644
--- a/LiteEditor/plugindlgbase.cpp
+++ b/LiteEditor/plugindlgbase.cpp
@@ -1,65 +1,117 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 18 2010)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "plugindlgbase.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-PluginMgrDlgBase::PluginMgrDlgBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-{
- this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
- wxBoxSizer* bSizer1;
- bSizer1 = new wxBoxSizer( wxVERTICAL );
-
- m_staticText1 = new wxStaticText( this, wxID_ANY, _("Available Plugins:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText1->Wrap( -1 );
- bSizer1->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
- wxArrayString m_checkListPluginsListChoices;
- m_checkListPluginsList = new wxCheckListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_checkListPluginsListChoices, 0 );
- bSizer1->Add( m_checkListPluginsList, 1, wxALL|wxEXPAND, 5 );
-
- m_staticText2 = new wxStaticText( this, wxID_ANY, _("Description:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText2->Wrap( -1 );
- bSizer1->Add( m_staticText2, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
- m_htmlWinDesc = new wxHtmlWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
- bSizer1->Add( m_htmlWinDesc, 1, wxALL|wxEXPAND, 5 );
-
- m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
- bSizer1->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
-
- wxBoxSizer* bSizer2;
- bSizer2 = new wxBoxSizer( wxHORIZONTAL );
-
- m_buttonOk = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
- m_buttonOk->SetDefault();
- bSizer2->Add( m_buttonOk, 0, wxALL, 5 );
-
- m_buttonCancel = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer2->Add( m_buttonCancel, 0, wxALL, 5 );
-
- bSizer1->Add( bSizer2, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
- this->SetSizer( bSizer1 );
- this->Layout();
-
- this->Centre( wxBOTH );
-
- // Connect Events
- m_checkListPluginsList->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( PluginMgrDlgBase::OnItemSelected ), NULL, this );
- m_buttonOk->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PluginMgrDlgBase::OnButtonOK ), NULL, this );
-}
-
-PluginMgrDlgBase::~PluginMgrDlgBase()
-{
- // Disconnect Events
- m_checkListPluginsList->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( PluginMgrDlgBase::OnItemSelected ), NULL, this );
- m_buttonOk->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PluginMgrDlgBase::OnButtonOK ), NULL, this );
-
-}
+//////////////////////////////////////////////////////////////////////
+// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: plugindlgbase.wxcp
+// Do not modify this file by hand!
+//////////////////////////////////////////////////////////////////////
+
+#include "plugindlgbase.h"
+
+
+// Declare the bitmap loading function
+extern void wxCEF4InitBitmapResources();
+
+static bool bBitmapLoaded = false;
+
+
+PluginMgrDlgBase::PluginMgrDlgBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
+ : wxDialog(parent, id, title, pos, size, style)
+{
+ if ( !bBitmapLoaded ) {
+ // We need to initialise the default bitmap handler
+ wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler);
+ wxCEF4InitBitmapResources();
+ bBitmapLoaded = true;
+ }
+
+ bSizer1 = new wxBoxSizer(wxVERTICAL);
+ this->SetSizer(bSizer1);
+
+ boxSizer16 = new wxBoxSizer(wxHORIZONTAL);
+
+ bSizer1->Add(boxSizer16, 1, wxEXPAND, 5);
+
+ m_splitter2 = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxSize(500,300), wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME|wxSP_3DSASH);
+ m_splitter2->SetSashGravity(0.5);
+ m_splitter2->SetMinimumPaneSize(10);
+
+ boxSizer16->Add(m_splitter2, 1, wxALL|wxEXPAND, 5);
+
+ m_splitterPage6 = new wxPanel(m_splitter2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
+
+ boxSizer12 = new wxBoxSizer(wxVERTICAL);
+ m_splitterPage6->SetSizer(boxSizer12);
+
+ m_staticText1 = new wxStaticText(m_splitterPage6, wxID_ANY, _("Available Plugins:"), wxDefaultPosition, wxSize(-1, -1), 0);
+
+ boxSizer12->Add(m_staticText1, 0, wxLEFT|wxRIGHT|wxTOP, 5);
+
+ wxArrayString m_checkListPluginsListArr;
+ m_checkListPluginsList = new wxCheckListBox(m_splitterPage6, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), m_checkListPluginsListArr, wxLB_SINGLE);
+
+ boxSizer12->Add(m_checkListPluginsList, 1, wxALL|wxEXPAND, 5);
+
+ m_splitterPage10 = new wxPanel(m_splitter2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
+ m_splitter2->SplitVertically(m_splitterPage6, m_splitterPage10, 0);
+
+ boxSizer14 = new wxBoxSizer(wxVERTICAL);
+ m_splitterPage10->SetSizer(boxSizer14);
+
+ m_staticText2 = new wxStaticText(m_splitterPage10, wxID_ANY, _("Description:"), wxDefaultPosition, wxSize(-1, -1), 0);
+
+ boxSizer14->Add(m_staticText2, 0, wxLEFT|wxRIGHT|wxTOP, 5);
+
+ m_htmlWinDesc = new wxHtmlWindow(m_splitterPage10, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxHW_SCROLLBAR_AUTO|wxBORDER_THEME);
+ m_htmlWinDesc->SetPage(wxT("<b>wxHtmlWindow control!</b>"));
+
+ boxSizer14->Add(m_htmlWinDesc, 1, wxALL|wxEXPAND, 5);
+
+ boxSizer18 = new wxBoxSizer(wxVERTICAL);
+
+ boxSizer16->Add(boxSizer18, 0, wxEXPAND, 5);
+
+ m_button20 = new wxButton(this, wxID_ANY, _("Check &All"), wxDefaultPosition, wxSize(-1,-1), 0);
+
+ boxSizer18->Add(m_button20, 0, wxALL, 5);
+
+ m_button22 = new wxButton(this, wxID_ANY, _("Uncheck All"), wxDefaultPosition, wxSize(-1,-1), 0);
+
+ boxSizer18->Add(m_button22, 0, wxALL, 5);
+
+ bSizer2 = new wxBoxSizer(wxHORIZONTAL);
+
+ bSizer1->Add(bSizer2, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
+
+ m_buttonOk = new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_buttonOk->SetDefault();
+
+ bSizer2->Add(m_buttonOk, 0, wxALL, 5);
+
+ m_buttonCancel = new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize(-1, -1), 0);
+
+ bSizer2->Add(m_buttonCancel, 0, wxALL, 5);
+
+ SetSizeHints(-1,-1);
+ if ( GetSizer() ) {
+ GetSizer()->Fit(this);
+ }
+ Centre(wxBOTH);
+ // Connect events
+ m_checkListPluginsList->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(PluginMgrDlgBase::OnItemSelected), NULL, this);
+ m_button20->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PluginMgrDlgBase::OnCheckAll), NULL, this);
+ m_button20->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PluginMgrDlgBase::OnCheckAllUI), NULL, this);
+ m_button22->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PluginMgrDlgBase::OnUncheckAll), NULL, this);
+ m_button22->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PluginMgrDlgBase::OnUncheckAllUI), NULL, this);
+ m_buttonOk->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PluginMgrDlgBase::OnButtonOK), NULL, this);
+
+}
+
+PluginMgrDlgBase::~PluginMgrDlgBase()
+{
+ m_checkListPluginsList->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(PluginMgrDlgBase::OnItemSelected), NULL, this);
+ m_button20->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PluginMgrDlgBase::OnCheckAll), NULL, this);
+ m_button20->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PluginMgrDlgBase::OnCheckAllUI), NULL, this);
+ m_button22->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PluginMgrDlgBase::OnUncheckAll), NULL, this);
+ m_button22->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PluginMgrDlgBase::OnUncheckAllUI), NULL, this);
+ m_buttonOk->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PluginMgrDlgBase::OnButtonOK), NULL, this);
+
+}
diff --git a/LiteEditor/plugindlgbase.h b/LiteEditor/plugindlgbase.h
index 4b3e54a..3a52102 100644
--- a/LiteEditor/plugindlgbase.h
+++ b/LiteEditor/plugindlgbase.h
@@ -1,82 +1,58 @@
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-//
-// copyright : (C) 2013 by Eran Ifrah
-// file name : plugindlgbase.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: plugindlgbase.wxcp
+// Do not modify this file by hand!
+//////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 18 2010)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __plugindlgbase__
-#define __plugindlgbase__
-
-#include <wx/intl.h>
-
-#include <wx/string.h>
-#include <wx/stattext.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/checklst.h>
-#include <wx/html/htmlwin.h>
-#include <wx/statline.h>
-#include <wx/button.h>
-#include <wx/sizer.h>
-#include <wx/dialog.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class PluginMgrDlgBase
-///////////////////////////////////////////////////////////////////////////////
-class PluginMgrDlgBase : public wxDialog
-{
- private:
-
- protected:
- wxStaticText* m_staticText1;
- wxCheckListBox* m_checkListPluginsList;
- wxStaticText* m_staticText2;
- wxHtmlWindow* m_htmlWinDesc;
- wxStaticLine* m_staticline1;
- wxButton* m_buttonOk;
- wxButton* m_buttonCancel;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnItemSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
-
- PluginMgrDlgBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Manage Plugins:"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 672,425 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~PluginMgrDlgBase();
-
-};
-
-#endif //__plugindlgbase__
+#ifndef PLUGINDLGBASE_BASE_CLASSES_H
+#define PLUGINDLGBASE_BASE_CLASSES_H
+
+#include <wx/settings.h>
+#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/splitter.h>
+#include <wx/panel.h>
+#include <wx/stattext.h>
+#include <wx/checklst.h>
+#include <wx/html/htmlwin.h>
+#include <wx/button.h>
+
+class PluginMgrDlgBase : public wxDialog
+{
+protected:
+ wxBoxSizer* bSizer1;
+ wxBoxSizer* boxSizer16;
+ wxSplitterWindow* m_splitter2;
+ wxPanel* m_splitterPage6;
+ wxBoxSizer* boxSizer12;
+ wxStaticText* m_staticText1;
+ wxCheckListBox* m_checkListPluginsList;
+ wxPanel* m_splitterPage10;
+ wxBoxSizer* boxSizer14;
+ wxStaticText* m_staticText2;
+ wxHtmlWindow* m_htmlWinDesc;
+ wxBoxSizer* boxSizer18;
+ wxButton* m_button20;
+ wxButton* m_button22;
+ wxBoxSizer* bSizer2;
+ wxButton* m_buttonOk;
+ wxButton* m_buttonCancel;
+
+protected:
+ virtual void OnItemSelected(wxCommandEvent& event) { event.Skip(); }
+ virtual void OnCheckAll(wxCommandEvent& event) { event.Skip(); }
+ virtual void OnCheckAllUI(wxUpdateUIEvent& event) { event.Skip(); }
+ virtual void OnUncheckAll(wxCommandEvent& event) { event.Skip(); }
+ virtual void OnUncheckAllUI(wxUpdateUIEvent& event) { event.Skip(); }
+ virtual void OnButtonOK(wxCommandEvent& event) { event.Skip(); }
+
+public:
+ PluginMgrDlgBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Manage Plugins:"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
+ virtual ~PluginMgrDlgBase();
+};
+
+#endif
diff --git a/LiteEditor/plugindlgbase.wxcp b/LiteEditor/plugindlgbase.wxcp
new file mode 100644
index 0000000..7ceb5fd
--- /dev/null
+++ b/LiteEditor/plugindlgbase.wxcp
@@ -0,0 +1,1149 @@
+{
+ "metadata": {
+ "m_generatedFilesDir": ".",
+ "m_objCounter": 22,
+ "m_includeFiles": [],
+ "m_bitmapFunction": "wxCEF4InitBitmapResources",
+ "m_bitmapsFile": "plugindlgbase_liteeditor_bitmaps.cpp",
+ "m_GenerateCodeTypes": 2678125,
+ "m_outputFileName": "",
+ "m_firstWindowId": 1000,
+ "m_useEnum": false,
+ "m_templateClasses": []
+ },
+ "windows": [{
+ "m_type": 4421,
+ "proportion": 0,
+ "border": 0,
+ "gbSpan": ",",
+ "gbPosition": ",",
+ "m_styles": ["wxDEFAULT_DIALOG_STYLE", "wxRESIZE_BORDER"],
+ "m_sizerFlags": [],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "PluginMgrDlgBase"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Title:",
+ "m_value": "Manage Plugins:"
+ }, {
+ "type": "virtualFolderPicker",
+ "m_label": "Virtual Folder:",
+ "m_path": ""
+ }, {
+ "type": "choice",
+ "m_label": "Centre:",
+ "m_selection": 1,
+ "m_options": ["", "wxBOTH", "wxVERTICAL", "wxHORIZONTAL"]
+ }, {
+ "type": "string",
+ "m_label": "File:",
+ "m_value": "pluginmgrdlg"
+ }, {
+ "type": "string",
+ "m_label": "Inherited Class",
+ "m_value": "PluginMgrDlg"
+ }, {
+ "type": "string",
+ "m_label": "Class Decorator",
+ "m_value": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (16x16) :",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (32x32) :",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (64x64) :",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (128x128):",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (256x256):",
+ "m_path": ""
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4401,
+ "proportion": 0,
+ "border": 0,
+ "gbSpan": ",",
+ "gbPosition": ",",
+ "m_styles": [],
... 1668 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-28 17:16: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 2d3943ef260cab8f91efa5a71641151e566de298 (commit)
from 8060cd6340a4437ccafd73bf6260de4898059173 (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/2d3943ef260cab8f91efa5a71641151e566de298
commit 2d3943ef260cab8f91efa5a71641151e566de298
Author: Eran <era...@gm...>
Date: Sat Dec 28 19:14:52 2013 +0200
Hovering over a compiler error marker in an editor should now display the compiler message as a tooltip
diff --git a/LiteEditor/cl_editor.cpp b/LiteEditor/cl_editor.cpp
index 44b2784..abb73b2 100644
--- a/LiteEditor/cl_editor.cpp
+++ b/LiteEditor/cl_editor.cpp
@@ -1441,11 +1441,18 @@ void LEditor::OnDwellStart(wxStyledTextEvent & event)
if (MarkerGet(line) & mmt_all_breakpoints) {
tooltip = ManagerST::Get()->GetBreakpointsMgr()->GetTooltip(fname, line+1);
-
}
+
else if (MarkerGet(line) & mmt_all_bookmarks) {
tooltip = GetBookmarkTooltip(line);
}
+
+ // Compiler marker takes precedence over any other tooltip on that margin
+ if ( (MarkerGet(line) & mmt_compiler) && m_compilerMessagesMap.count(line) ) {
+ // Get the compiler tooltip
+ tooltip = m_compilerMessagesMap.find(line)->second;
+ }
+
wxString tmpTip = tooltip;
tmpTip.Trim().Trim(false);
@@ -3201,6 +3208,13 @@ void LEditor::ToggleBreakpoint(int lineno)
void LEditor::SetWarningMarker(int lineno, const wxString& annotationText)
{
if (lineno >= 0) {
+
+ // Keep the text message
+ if ( m_compilerMessagesMap.count(lineno) ) {
+ m_compilerMessagesMap.erase(lineno);
+ }
+ m_compilerMessagesMap.insert( std::make_pair(lineno, annotationText) );
+
BuildTabSettingsData options;
EditorConfigST::Get()->ReadObject(wxT("build_tab_settings"), &options);
@@ -3219,6 +3233,13 @@ void LEditor::SetWarningMarker(int lineno, const wxString& annotationText)
void LEditor::SetErrorMarker(int lineno, const wxString& annotationText)
{
if (lineno >= 0) {
+
+ // Keep the text message
+ if ( m_compilerMessagesMap.count(lineno) ) {
+ m_compilerMessagesMap.erase(lineno);
+ }
+ m_compilerMessagesMap.insert( std::make_pair(lineno, annotationText) );
+
BuildTabSettingsData options;
EditorConfigST::Get()->ReadObject(wxT("build_tab_settings"), &options);
@@ -3238,6 +3259,7 @@ void LEditor::DelAllCompilerMarkers()
MarkerDeleteAll(smt_warning);
MarkerDeleteAll(smt_error);
AnnotationClearAll();
+ m_compilerMessagesMap.clear();
}
// Maybe one day we'll display multiple bps differently
diff --git a/LiteEditor/cl_editor.h b/LiteEditor/cl_editor.h
index cbfefd3..a961267 100644
--- a/LiteEditor/cl_editor.h
+++ b/LiteEditor/cl_editor.h
@@ -145,7 +145,8 @@ class LEditor : public wxStyledTextCtrl, public IEditor
bool m_fullLineCopyCut;
std::vector< std::pair<int,int> > m_savedMarkers;
bool m_findBookmarksActive;
-
+ std::map<int, wxString> m_compilerMessagesMap;
+
public:
static bool m_ccShowPrivateMembers;
static bool m_ccShowItemsComments;
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/cl_editor.cpp | 24 +++++++++++++++++++++++-
LiteEditor/cl_editor.h | 3 ++-
2 files changed, 25 insertions(+), 2 deletions(-)
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2013-12-28 16:28:56
|
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 8060cd6340a4437ccafd73bf6260de4898059173 (commit)
from 85d42058411010d59935096963c96777a5b4873d (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/8060cd6340a4437ccafd73bf6260de4898059173
commit 8060cd6340a4437ccafd73bf6260de4898059173
Author: dghart <da...@4P...>
Date: Sat Dec 28 16:24:32 2013 +0000
Honour a change to the active Bookmark type even while the QuickFind bar's 'Highlight All Matches' button is active
Before, the change was delayed until the Highlight All button was reset. Now it takes effect immediately.
diff --git a/LiteEditor/cl_editor.cpp b/LiteEditor/cl_editor.cpp
index bcd8260..44b2784 100644
--- a/LiteEditor/cl_editor.cpp
+++ b/LiteEditor/cl_editor.cpp
@@ -2575,6 +2575,9 @@ void LEditor::OnChangeActiveBookmarkType(wxCommandEvent& event)
{
int requested = event.GetId() - XRCID("BookmarkTypes[start]");
BookmarkManager::Get().SetActiveBookmarkType(requested + smt_FIRST_BMK_TYPE -1);
+ if ((requested + smt_FIRST_BMK_TYPE -1) != smt_find_bookmark) {
+ SetFindBookmarksActive(false);
+ }
}
wxString LEditor::GetBookmarkTooltip(const int lineno)
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/cl_editor.cpp | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-28 16:27: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 85d42058411010d59935096963c96777a5b4873d (commit)
from 804f50c1268fea2f56431b50f94da47c02ccb37b (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/85d42058411010d59935096963c96777a5b4873d
commit 85d42058411010d59935096963c96777a5b4873d
Author: Eran <era...@gm...>
Date: Sat Dec 28 18:27:38 2013 +0200
OSX: Support only the "Fresh Farm" icon style
diff --git a/LiteEditor/editorsettingsmiscpanel.cpp b/LiteEditor/editorsettingsmiscpanel.cpp
index ded3479..01402f9 100644
--- a/LiteEditor/editorsettingsmiscpanel.cpp
+++ b/LiteEditor/editorsettingsmiscpanel.cpp
@@ -53,6 +53,13 @@ EditorSettingsMiscPanel::EditorSettingsMiscPanel( wxWindow* parent )
m_toolbarIconSize->SetSelection(1);
}
+#ifdef __WXMAC__
+ // On Mac we support only this image type
+ m_choiceIconSet->Clear();
+ m_choiceIconSet->Append("Fresh Farm");
+ m_choiceIconSet->SetSelection(0);
+
+#else
if(options->GetOptions() & OptionsConfig::Opt_IconSet_FreshFarm)
m_choiceIconSet->SetSelection(1);
@@ -61,6 +68,7 @@ EditorSettingsMiscPanel::EditorSettingsMiscPanel( wxWindow* parent )
else
m_choiceIconSet->SetSelection(0); // Default
+#endif
m_checkBoxEnableMSWTheme->SetValue(options->GetMswTheme());
m_useSingleToolbar->SetValue(!PluginManager::Get()->AllowToolbar());
@@ -103,7 +111,7 @@ EditorSettingsMiscPanel::EditorSettingsMiscPanel( wxWindow* parent )
bool showSplash = info.GetFlags() & CL_SHOW_SPLASH ? true : false;
m_showSplashScreen->SetValue(showSplash);
m_oldMswUseTheme = m_checkBoxEnableMSWTheme->IsChecked();
-
+
m_redirectLogOutput->SetValue(clConfig::Get().Read("RedirectLogOutput", true));
}
@@ -202,6 +210,12 @@ void EditorSettingsMiscPanel::Save(OptionsConfigPtr options)
flags &= ~(OptionsConfig::Opt_IconSet_FreshFarm);
flags &= ~(OptionsConfig::Opt_IconSet_Classic_Dark);
+#ifdef __WXMAC__
+ flags |= OptionsConfig::Opt_IconSet_FreshFarm;
+ oldIconFlags = OptionsConfig::Opt_IconSet_FreshFarm;
+ newIconFlags = OptionsConfig::Opt_IconSet_FreshFarm;
+
+#else
if(m_choiceIconSet->GetSelection() == 0) {
newIconFlags |= OptionsConfig::Opt_IconSet_Classic;
flags |= OptionsConfig::Opt_IconSet_Classic;
@@ -215,7 +229,7 @@ void EditorSettingsMiscPanel::Save(OptionsConfigPtr options)
flags |= OptionsConfig::Opt_IconSet_FreshFarm;
}
-
+#endif
clConfig::Get().Write("RedirectLogOutput", m_redirectLogOutput->IsChecked());
options->SetOptions(flags);
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
index ac225f3..018ee39 100644
--- a/LiteEditor/frame.cpp
+++ b/LiteEditor/frame.cpp
@@ -649,7 +649,7 @@ clMainFrame::clMainFrame(wxWindow *pParent, wxWindowID id, const wxString& title
ManagerST::Get(); // Dummy call
RefactoringEngine::Instance(); // Dummy call
-
+
//allow the main frame to receive files by drag and drop
SetDropTarget( new FileDropTarget() );
@@ -697,12 +697,12 @@ clMainFrame::~clMainFrame(void)
#if defined(__WXGTK__) && wxVERSION_NUMBER < 2904
delete m_myMenuBar;
#endif
-
+
if ( m_splashScreen ) {
m_splashScreen->Destroy();
m_splashScreen = NULL;
}
-
+
wxTheApp->Disconnect(wxID_COPY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(clMainFrame::DispatchCommandEvent), NULL, this);
wxTheApp->Disconnect(wxID_PASTE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(clMainFrame::DispatchCommandEvent), NULL, this);
wxTheApp->Disconnect(wxID_SELECTALL, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(clMainFrame::DispatchCommandEvent), NULL, this);
@@ -721,7 +721,7 @@ clMainFrame::~clMainFrame(void)
EventNotifier::Get()->Disconnect(wxEVT_WORKSPACE_CONFIG_CHANGED, wxCommandEventHandler(clMainFrame::OnUpdateCustomTargetsDropDownMenu), NULL, this);
EventNotifier::Get()->Disconnect(wxEVT_REFACTORING_ENGINE_CACHE_INITIALIZING, wxCommandEventHandler(clMainFrame::OnRefactoringCacheStatus), NULL, this);
EventNotifier::Get()->Disconnect(wxEVT_CL_THEME_CHANGED, wxCommandEventHandler(clMainFrame::OnThemeChanged), NULL, this);
-
+
wxDELETE(m_timer);
wxDELETE(m_statusbarTimer);
@@ -770,7 +770,7 @@ void clMainFrame::Initialize(bool loadLastSession)
}
inf.SetFrameSize( frameSize );
-
+
#if defined(NDEBUG) && !defined(__WXMAC__)
// we show splash only when using Release builds of codelite
if ( inf.GetFlags() & CL_SHOW_SPLASH ) {
@@ -845,24 +845,11 @@ void clMainFrame::CreateGUIControls(void)
m_mgr.SetArtProvider( new clAuiDockArt(PluginManager::Get()) );
SetAUIManagerFlags();
- wxColour gradientStart, gradientEnd;
- if ( EditorConfigST::Get()->GetOptions()->GetOptions() & OptionsConfig::Opt_IconSet_FreshFarm ) {
- gradientStart = wxColour(5, 96, 178);
- gradientEnd = wxColour(3, 78, 144);
-
- } else {
- gradientStart = wxColour(216, 112, 52);
- gradientEnd = wxColour(216, 98, 30);
- }
-
m_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_GRADIENT_TYPE, wxAUI_GRADIENT_HORIZONTAL);
m_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_CAPTION_SIZE, 22);
-
- m_mgr.GetArtProvider()->SetColor(wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR, gradientEnd);
- m_mgr.GetArtProvider()->SetColor(wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR, gradientStart);
- m_mgr.GetArtProvider()->SetColor(wxAUI_DOCKART_SASH_COLOUR, DrawingUtils::GetPanelBgColour());
- m_mgr.GetArtProvider()->SetColor(wxAUI_DOCKART_BACKGROUND_COLOUR, DrawingUtils::GetPanelBgColour());
+ m_mgr.GetArtProvider()->SetColor(wxAUI_DOCKART_SASH_COLOUR, DrawingUtils::GetPanelBgColour());
+ m_mgr.GetArtProvider()->SetColor(wxAUI_DOCKART_BACKGROUND_COLOUR, DrawingUtils::GetPanelBgColour());
//initialize debugger configuration tool
DebuggerConfigTool::Get()->Load(wxT("config/debuggers.xml"), wxT("5.11"));
@@ -928,7 +915,7 @@ void clMainFrame::CreateGUIControls(void)
m_mainBook->ShowNavBar( false );
}
BuildSettingsConfigST::Get()->Load(wxT("2.1"));
-
+
clConfig ccConfig("code-completion.conf");
ccConfig.ReadItem( &m_tagsOptionsData );
@@ -1882,11 +1869,11 @@ void clMainFrame::OnSwitchWorkspace(wxCommandEvent &event)
bool promptUser = true;
wxString wspFile;
const wxString WSP_EXT = "workspace";
-
- // Is it an internal command? (usually the workspace file name to load is set in the
+
+ // Is it an internal command? (usually the workspace file name to load is set in the
// event.SetString() )
if ( event.GetString().IsEmpty() || wxFileName(event.GetString()).GetExt() != WSP_EXT) {
-
+
clCommandEvent e(wxEVT_CMD_OPEN_WORKSPACE, GetId());
e.SetEventObject(this);
e.SetFileName( event.GetString() );
@@ -1894,14 +1881,14 @@ void clMainFrame::OnSwitchWorkspace(wxCommandEvent &event)
// the plugin processed it by itself
return;
}
-
+
if( e.GetFileName().IsEmpty() == false) {
// the plugin processed it by itself and the user already selected a file
// don't bother to prompt the user again just use what he already selected
promptUser = false;
wspFile = e.GetFileName();
}
-
+
} else if ( !event.GetString().IsEmpty() ) {
promptUser = false;
wspFile = event.GetString();
@@ -1967,11 +1954,11 @@ void clMainFrame::OnFileNew(wxCommandEvent &event)
void clMainFrame::OnFileOpen(wxCommandEvent & WXUNUSED(event))
{
const wxString ALL( wxT("All Files (*)|*") );
-
+
// Open a file using the current editor's path
LEditor * editor = GetMainBook()->GetActiveEditor();
wxString open_path;
-
+
if ( editor ) {
open_path = editor->GetFileName().GetPath();
} else {
@@ -1981,7 +1968,7 @@ void clMainFrame::OnFileOpen(wxCommandEvent & WXUNUSED(event))
open_path = project->GetFileName().GetPath();
}
}
-
+
wxFileDialog *dlg = new wxFileDialog(this, _("Open File"), open_path, wxEmptyString, ALL, wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_MULTIPLE, wxDefaultPosition);
if (dlg->ShowModal() == wxID_OK) {
wxArrayString paths;
@@ -2474,7 +2461,7 @@ void clMainFrame::OnBuildProject(wxCommandEvent &event)
wxUnusedVar(event);
bool enable = !ManagerST::Get()->IsBuildInProgress() && !ManagerST::Get()->GetActiveProjectName().IsEmpty();
if (enable) {
-
+
// Make sure that the working folder is set to the correct path
wxString workspacePath = WorkspaceST::Get()->GetWorkspaceFileName().GetPath();
::wxSetWorkingDirectory( workspacePath );
@@ -2600,7 +2587,7 @@ void clMainFrame::OnStopExecutedProgram(wxCommandEvent &event)
wxCommandEvent evtExecute(wxEVT_CMD_STOP_EXECUTED_PROGRAM);
if ( EventNotifier::Get()->ProcessEvent( evtExecute ) )
return;
-
+
wxUnusedVar(event);
Manager *mgr = ManagerST::Get();
if (mgr->IsProgramRunning()) {
@@ -2643,7 +2630,7 @@ void clMainFrame::OnExecuteNoDebug(wxCommandEvent &event)
wxCommandEvent evtExecute(wxEVT_CMD_EXECUTE_ACTIVE_PROJECT);
if ( EventNotifier::Get()->ProcessEvent( evtExecute ) )
return;
-
+
wxUnusedVar(event);
wxString projectName;
@@ -2660,7 +2647,7 @@ void clMainFrame::OnExecuteNoDebugUI(wxUpdateUIEvent &event)
e.SetEventObject(this);
e.SetInt(0);
EventNotifier::Get()->ProcessEvent(e);
-
+
bool normalCondition = ManagerST::Get()->GetActiveProjectName().IsEmpty() == false
&&
!ManagerST::Get()->IsBuildInProgress()
@@ -2693,12 +2680,12 @@ void clMainFrame::OnTimer(wxTimerEvent &event)
/////////////////////////////////////////////////////////////////////////////////////////
bool isUpdateRequired = (m_tagsOptionsData.GetVersion() != TagsOptionsData::CURRENT_VERSION);
if ( isUpdateRequired ) {
-
+
// Since the version numbers aren't the same
// we should merge the new settings with the old ones
TagsOptionsData tmp;
m_tagsOptionsData.Merge( tmp );
-
+
// Try to locate the paths automatically
wxArrayString paths;
wxArrayString excludePaths;
@@ -2713,7 +2700,7 @@ void clMainFrame::OnTimer(wxTimerEvent &event)
m_tagsOptionsData.SetParserExcludePaths( excludePaths );
m_tagsOptionsData.SetParserSearchPaths( paths );
m_tagsOptionsData.SetVersion( TagsOptionsData::CURRENT_VERSION );
-
+
//-----------------------
// clang
//-----------------------
@@ -2729,10 +2716,10 @@ void clMainFrame::OnTimer(wxTimerEvent &event)
ccConfig.WriteItem( &m_tagsOptionsData );
-
+
}
-
+
//clear navigation queue
if (GetMainBook()->GetCurrentPage() == 0) {
NavMgr::Get()->Clear();
@@ -2759,10 +2746,10 @@ void clMainFrame::OnTimer(wxTimerEvent &event)
ManagerST::Get()->UpdateMenuAccelerators();
wxModule::InitializeModules();
-
+
// Send initialization end event
SendCmdEvent(wxEVT_INIT_DONE);
-
+
event.Skip();
}
@@ -2969,7 +2956,7 @@ void clMainFrame::OnRecentWorkspace(wxCommandEvent &event)
if (idx < files.GetCount()) {
wxString file_name (files.Item(idx));
-
+
wxCommandEvent open_workspace_event(wxEVT_COMMAND_MENU_SELECTED, XRCID("switch_to_workspace"));
open_workspace_event.SetEventObject(this);
open_workspace_event.SetString( file_name );
@@ -3045,9 +3032,9 @@ void clMainFrame::CreateWelcomePage()
content.Replace(wxT("$(RecentFiles)"), _("Recently opened files:"));
welcomePage->SetPage(content);*/
- WelcomePage* welcomePage = new WelcomePage(GetMainBook());
+ WelcomePage* welcomePage = new WelcomePage(GetMainBook());
GetMainBook()->AddPage(welcomePage, _("Welcome!"), wxNullBitmap, true);
-
+
GetMainBook()->Layout();
// This is needed in >=wxGTK-2.9, otherwise the auinotebook doesn't fully expand at first
SendSizeEvent(wxSEND_EVENT_POST);
@@ -3115,7 +3102,7 @@ void clMainFrame::OnDebug(wxCommandEvent &e)
if (answer && build_first != wxID_CANCEL) {
// save the answer
EditorConfigST::Get()->SaveLongValue(wxT("BuildBeforeDebug"), build_first);
-
+
} else if ( build_first == wxID_CANCEL ) {
// Do nothing
return;
@@ -3348,7 +3335,7 @@ void clMainFrame::CompleteInitialization()
// Now everything is loaded, set the saved tab-order in the workspace pane
GetWorkspacePane()->ApplySavedTabOrder();
ManagerST::Get()->GetPerspectiveManager().ConnectEvents( &m_mgr );
-
+
wxCommandEvent evt(wxEVT_CL_THEME_CHANGED);
EventNotifier::Get()->AddPendingEvent( evt );
}
@@ -3359,22 +3346,22 @@ void clMainFrame::OnAppActivated(wxActivateEvent &e)
CodeCompletionBox::Get().CancelTip();
#endif
if (m_theFrame && e.GetActive()) {
-
+
m_theFrame->ReloadExternallyModifiedProjectFiles();
m_theFrame->GetMainBook()->ReloadExternallyModified(true);
-
+
if(ManagerST::Get()->IsWorkspaceOpen() && !ManagerST::Get()->IsWorkspaceClosing()) {
// Retag the workspace the light way
ManagerST::Get()->RetagWorkspace(TagsManager::Retag_Quick_No_Scan);
}
-
+
// Notify plugins that we got the focus.
// Some plugins want to hide some frames etc
wxCommandEvent evtGotFocus(wxEVT_CODELITE_MAINFRAME_GOT_FOCUS);
EventNotifier::Get()->AddPendingEvent( evtGotFocus );
-
+
} else if(m_theFrame) {
-
+
#ifndef __WXMAC__
/// this code causes crash on Mac, since it destorys an active CCBox
LEditor *editor = GetMainBook()->GetActiveEditor();
@@ -3386,7 +3373,7 @@ void clMainFrame::OnAppActivated(wxActivateEvent &e)
#endif
}
-
+
e.Skip();
}
@@ -3684,8 +3671,8 @@ void clMainFrame::OnNewVersionAvailable(wxCommandEvent& e)
} else {
if (!data->GetShowMessage()) {
- wxLogMessage(wxString() << "Info: codelite is up-to-date (or newer), version used: "
- << data->GetCurVersion()
+ wxLogMessage(wxString() << "Info: codelite is up-to-date (or newer), version used: "
+ << data->GetCurVersion()
<< ", version on site: "
<< data->GetNewVersion());
} else {
@@ -3819,18 +3806,18 @@ void clMainFrame::OnFunctionCalltipUI(wxUpdateUIEvent& event)
void clMainFrame::OnReloadWorkspace(wxCommandEvent& event)
{
wxUnusedVar(event);
-
+
// let the plugins close any custom workspace
clCommandEvent e(wxEVT_CMD_RELOAD_WORKSPACE, GetId());
e.SetEventObject(this);
if ( EventNotifier::Get()->ProcessEvent(e) )
return; // this event was handled by a plugin
-
+
IDebugger* dbgr = DebuggerMgr::Get().GetActiveDebugger();
if ( dbgr && dbgr->IsRunning() ) {
return;
}
-
+
// Save the current session before re-loading
SaveLayoutAndSession();
@@ -4089,7 +4076,7 @@ void clMainFrame::OnQuickDebug(wxCommandEvent& e)
#endif
dbgr->SetIsRemoteDebugging(false);
-
+
// Start the debugger
DebugSessionInfo si;
si.debuggerPath = dbgname;
@@ -4098,7 +4085,7 @@ void clMainFrame::OnQuickDebug(wxCommandEvent& e)
si.cmds = cmds;
si.bpList = bpList;
si.ttyName = tty;
-
+
dbgr->Start( si );
// notify plugins that the debugger just started
@@ -4171,7 +4158,7 @@ void clMainFrame::OnDebugCoreDump(wxCommandEvent& e)
// The next two are empty, but are required as parameters
std::vector<BreakpointInfo> bpList;
wxArrayString cmds;
-
+
DebugSessionInfo si;
si.debuggerPath = dbgname;
si.exeName = debuggingcommand;
@@ -5192,7 +5179,7 @@ void clMainFrame::OnShowAuiBuildMenu(wxAuiToolBarEvent& e)
void clMainFrame::OnUpdateCustomTargetsDropDownMenu(wxCommandEvent& e)
{
e.Skip();
-
+
wxMenu *buildDropDownMenu = new wxMenu;
DoCreateBuildDropDownMenu(buildDropDownMenu);
if ( GetToolBar() &&
@@ -5272,7 +5259,7 @@ void clMainFrame::OnFileSaveAllUI(wxUpdateUIEvent& event)
break;
}
}
-
+
event.Enable( hasModifiedEditor );
}
@@ -5282,32 +5269,32 @@ void clMainFrame::OnShowDebuggerWindow(wxCommandEvent& e)
clConfig conf("debugger-view.conf");
DebuggerPaneConfig item;
conf.ReadItem( &item );
-
+
bool show = e.IsChecked();
- if( e.GetId() == XRCID("debugger_win_locals") )
+ if( e.GetId() == XRCID("debugger_win_locals") )
item.ShowDebuggerWindow(DebuggerPaneConfig::Locals, show);
-
+
if( e.GetId() == XRCID("debugger_win_watches"))
item.ShowDebuggerWindow(DebuggerPaneConfig::Watches, show);
-
+
if( e.GetId() == XRCID("debugger_win_output"))
item.ShowDebuggerWindow(DebuggerPaneConfig::Output, show);
-
+
if( e.GetId() == XRCID("debugger_win_threads"))
item.ShowDebuggerWindow(DebuggerPaneConfig::Threads, show);
-
+
if( e.GetId() == XRCID("debugger_win_callstack"))
item.ShowDebuggerWindow(DebuggerPaneConfig::Callstack, show);
-
+
if( e.GetId() == XRCID("debugger_win_memory"))
item.ShowDebuggerWindow(DebuggerPaneConfig::Memory, show);
-
+
if( e.GetId() == XRCID("debugger_win_breakpoints"))
item.ShowDebuggerWindow(DebuggerPaneConfig::Breakpoints, show);
-
+
if( e.GetId() == XRCID("debugger_win_asciiview"))
item.ShowDebuggerWindow(DebuggerPaneConfig::AsciiViewer, show);
-
+
if( e.GetId() == XRCID("debugger_win_disassemble"))
item.ShowDebuggerWindow(DebuggerPaneConfig::Disassemble, show);
@@ -5322,33 +5309,33 @@ void clMainFrame::OnShowDebuggerWindowUI(wxUpdateUIEvent& e)
//clConfig conf("debugger-view.conf");
DebuggerPaneConfig item;
//conf.ReadItem( &item );
-
+
DebuggerPaneConfig::eDebuggerWindows winid = DebuggerPaneConfig::None;
... 83 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-28 14:50:02
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 804f50c1268fea2f56431b50f94da47c02ccb37b (commit)
via 08aa75afe3ab7a924370391a6ae1746617fd4b6e (commit)
via 5785ae4da8f4b37aaa2c4b560224f693c4676d50 (commit)
from 072e08ea82c3e9dc9ad39406f1da5f6bd487de10 (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/804f50c1268fea2f56431b50f94da47c02ccb37b
commit 804f50c1268fea2f56431b50f94da47c02ccb37b
Author: Eran <era...@gm...>
Date: Sat Dec 28 16:49:48 2013 +0200
Changed selected workspace
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 4baacb9..69bcbb4 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -43,7 +43,7 @@
</Environment>
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
@@ -77,7 +77,7 @@
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="Win Debug Unicode" Selected="yes">
+ <WorkspaceConfiguration Name="Win Debug Unicode" Selected="no">
<Project Name="ZoomNavigator" ConfigName="WinDebugUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinDebugUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinDebugUnicode"/>
https://sourceforge.net/p/codelite/codelitegit/ci/08aa75afe3ab7a924370391a6ae1746617fd4b6e
commit 08aa75afe3ab7a924370391a6ae1746617fd4b6e
Merge: 5785ae4 072e08e
Author: Eran <era...@gm...>
Date: Sat Dec 28 16:48:03 2013 +0200
Merge branch 'master' of ssh://git.code.sf.net/p/codelite/codelitegit
# By dghart
# Via dghart
* 'master' of ssh://git.code.sf.net/p/codelite/codelitegit:
Add a missing event.Skip() to SFTP::OnEditorClosed
https://sourceforge.net/p/codelite/codelitegit/ci/5785ae4da8f4b37aaa2c4b560224f693c4676d50
commit 5785ae4da8f4b37aaa2c4b560224f693c4676d50
Author: Eran <era...@gm...>
Date: Sat Dec 28 16:47:46 2013 +0200
Removed the RAW_LINES style from the "Import Files" dialog
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 69bcbb4..4baacb9 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -43,7 +43,7 @@
</Environment>
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
@@ -77,7 +77,7 @@
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="Win Debug Unicode" Selected="no">
+ <WorkspaceConfiguration Name="Win Debug Unicode" Selected="yes">
<Project Name="ZoomNavigator" ConfigName="WinDebugUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinDebugUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinDebugUnicode"/>
diff --git a/LiteEditor/foldermodel.cpp b/LiteEditor/foldermodel.cpp
index 810da0d..e4ca645 100644
--- a/LiteEditor/foldermodel.cpp
+++ b/LiteEditor/foldermodel.cpp
@@ -36,7 +36,7 @@ FolderModel::FolderModel()
FolderModel::~FolderModel()
{
for(size_t i=0; i<m_data.size(); ++i) {
- delete m_data.at(i);
+ wxDELETE(m_data.at(i));
}
m_data.clear();
}
@@ -76,6 +76,10 @@ wxString FolderModel::GetColumnType(unsigned int col) const
wxDataViewItem FolderModel::GetParent(const wxDataViewItem& item) const
{
+ if ( IsEmpty() ) {
+ return wxDataViewItem(NULL);
+ }
+
FolderModel_Item* node = reinterpret_cast<FolderModel_Item*>(item.m_pItem);
if ( node ) {
return wxDataViewItem(node->GetParent());
@@ -203,7 +207,7 @@ void FolderModel::DeleteItem(const wxDataViewItem& item)
if ( parent && parent->GetChildren().empty() )
DoChangeItemType(parentItem, false);
- delete node;
+ wxDELETE(node);
}
if ( IsEmpty() )
@@ -228,6 +232,7 @@ void FolderModel::Clear()
for(; iter != roots.end(); ++iter) {
DeleteItem( wxDataViewItem(*iter) );
}
+ m_data.clear();
Cleared();
}
diff --git a/LiteEditor/foldermodel.h b/LiteEditor/foldermodel.h
index 15f075c..cd244c9 100644
--- a/LiteEditor/foldermodel.h
+++ b/LiteEditor/foldermodel.h
@@ -1,28 +1,3 @@
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-//
-// copyright : (C) 2013 by Eran Ifrah
-// file name : foldermodel.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
// Do not modify this file by hand!
@@ -217,9 +192,9 @@ public:
protected:
// Helpers
- wxDataViewItem DoAppendItem(const wxDataViewItem& parent, const wxVector<wxVariant>& data, bool isContainer, wxClientData *clientData = NULL);
- wxDataViewItem DoInsertItem(const wxDataViewItem& insertBeforeMe, const wxVector<wxVariant>& data, bool isContainer, wxClientData *clientData);
- void DoChangeItemType(const wxDataViewItem& item, bool changeToContainer);
+ virtual wxDataViewItem DoAppendItem(const wxDataViewItem& parent, const wxVector<wxVariant>& data, bool isContainer, wxClientData *clientData = NULL);
+ virtual wxDataViewItem DoInsertItem(const wxDataViewItem& insertBeforeMe, const wxVector<wxVariant>& data, bool isContainer, wxClientData *clientData);
+ virtual void DoChangeItemType(const wxDataViewItem& item, bool changeToContainer);
public:
/**
diff --git a/LiteEditor/importfilesdialog.wxcp b/LiteEditor/importfilesdialog.wxcp
index 1a2bff2..d9dbc8c 100644
--- a/LiteEditor/importfilesdialog.wxcp
+++ b/LiteEditor/importfilesdialog.wxcp
@@ -7,6 +7,8 @@
"m_bitmapsFile": "importfilesdialog_liteeditor_bitmaps.cpp",
"m_GenerateCodeTypes": 5,
"m_outputFileName": "importfilesdialog_new",
+ "m_firstWindowId": 1000,
+ "m_useEnum": false,
"m_templateClasses": []
},
"windows": [{
@@ -67,6 +69,10 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Title:",
"m_value": "Import Files"
}, {
@@ -90,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": [{
@@ -105,6 +131,10 @@
"m_label": "Name:",
"m_value": "mainSizer"
}, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
"type": "choice",
"m_label": "Orientation:",
"m_selection": 0,
@@ -172,6 +202,10 @@
"m_label": "Include File:",
"m_value": ""
}, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
"type": "multi-string",
"m_label": "Title:",
"m_value": "Import Files"
@@ -185,7 +219,7 @@
"m_selection": 0,
"m_options": ["wxTOP", "wxBOTTOM", "wxLEFT", "wxRIGHT"]
}, {
- "type": "filePicker",
+ "type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": ""
}, {
@@ -261,6 +295,10 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Value:",
"m_value": ""
}, {
@@ -282,7 +320,7 @@
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": ["wxDV_ROW_LINES", "wxDV_SINGLE"],
+ "m_styles": ["wxDV_SINGLE"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
@@ -338,6 +376,10 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Generated Model Class Name",
"m_value": "FolderModel"
}, {
@@ -391,7 +433,7 @@
}, {
"type": "choice",
"m_label": "Cell Mode",
- "m_selection": 0,
+ "m_selection": 1,
"m_options": ["wxDATAVIEW_CELL_INERT", "wxDATAVIEW_CELL_ACTIVATABLE", "wxDATAVIEW_CELL_EDITABLE"]
}],
"m_events": [],
@@ -496,6 +538,10 @@
"m_label": "Include File:",
"m_value": ""
}, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
"type": "multi-string",
"m_label": "Label:",
"m_value": "Files extension to import:"
@@ -568,12 +614,24 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Value:",
"m_value": ""
}, {
"type": "string",
"m_label": "Max Length:",
"m_value": "0"
+ }, {
+ "type": "bool",
+ "m_label": "Auto Complete Directories:",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Auto Complete Files:",
+ "m_value": false
}],
"m_events": [],
"m_children": []
@@ -639,6 +697,10 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Label:",
"m_value": "Import files without extensions"
}, {
@@ -708,6 +770,10 @@
"type": "string",
"m_label": "Include File:",
"m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
}],
"m_events": [],
"m_children": []
@@ -724,6 +790,10 @@
"m_label": "Name:",
"m_value": "buttonSizer"
}, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
"type": "choice",
"m_label": "Orientation:",
"m_selection": 1,
@@ -792,6 +862,10 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Label:",
"m_value": "&Ok"
}, {
@@ -799,7 +873,7 @@
"m_label": "Default Button",
"m_value": true
}, {
- "type": "filePicker",
+ "type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": ""
}, {
@@ -871,6 +945,10 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Label:",
"m_value": "&Cancel"
}, {
@@ -878,7 +956,7 @@
"m_label": "Default Button",
"m_value": false
}, {
- "type": "filePicker",
+ "type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": ""
}, {
diff --git a/LiteEditor/importfilesdialog_liteeditor_bitmaps.cpp b/LiteEditor/importfilesdialog_liteeditor_bitmaps.cpp
index 2bad881..4c07a92 100644
--- a/LiteEditor/importfilesdialog_liteeditor_bitmaps.cpp
+++ b/LiteEditor/importfilesdialog_liteeditor_bitmaps.cpp
@@ -43,6 +43,6 @@ void wxC945BInitBitmapResources()
else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
}
- XRC_ADD_FILE(wxT("XRC_resource/importfilesdialog_liteeditor_bitmaps.cpp$._importfilesdialog_liteeditor_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
- wxXmlResource::Get()->Load(wxT("memory:XRC_resource/importfilesdialog_liteeditor_bitmaps.cpp$._importfilesdialog_liteeditor_bitmaps.xrc"));
+ XRC_ADD_FILE(wxT("XRC_resource/importfilesdialog_liteeditor_bitmaps.cpp$C__src_codelitegit_LiteEditor_importfilesdialog_liteeditor_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
+ wxXmlResource::Get()->Load(wxT("memory:XRC_resource/importfilesdialog_liteeditor_bitmaps.cpp$C__src_codelitegit_LiteEditor_importfilesdialog_liteeditor_bitmaps.xrc"));
}
diff --git a/LiteEditor/importfilesdialog_new.cpp b/LiteEditor/importfilesdialog_new.cpp
index d06ecfd..c8c7167 100644
--- a/LiteEditor/importfilesdialog_new.cpp
+++ b/LiteEditor/importfilesdialog_new.cpp
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: importfilesdialog.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -22,7 +23,7 @@ ImportFilesDialogNewBase::ImportFilesDialogNewBase(wxWindow* parent, wxWindowID
bBitmapLoaded = true;
}
- wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
+ mainSizer = new wxBoxSizer(wxVERTICAL);
this->SetSizer(mainSizer);
m_banner1 = new wxBannerWindow(this, wxID_ANY, wxTOP, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME);
@@ -39,7 +40,7 @@ ImportFilesDialogNewBase::ImportFilesDialogNewBase(wxWindow* parent, wxWindowID
mainSizer->Add(m_dirPicker, 0, wxALL|wxEXPAND, 5);
- m_dataview = new wxDataViewCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxDV_ROW_LINES|wxDV_SINGLE);
+ m_dataview = new wxDataViewCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxDV_SINGLE);
m_dataview->SetToolTip(_("Check the folders you wish to import\nfiles from"));
m_dataviewModel = new FolderModel;
@@ -48,7 +49,7 @@ ImportFilesDialogNewBase::ImportFilesDialogNewBase(wxWindow* parent, wxWindowID
mainSizer->Add(m_dataview, 1, wxALL|wxEXPAND, 5);
- m_dataview->AppendIconTextColumn(_("Folder"), m_dataview->GetColumnCount(), wxDATAVIEW_CELL_INERT, 300, wxALIGN_LEFT);
+ m_dataview->AppendIconTextColumn(_("Folder"), m_dataview->GetColumnCount(), wxDATAVIEW_CELL_ACTIVATABLE, 300, wxALIGN_LEFT);
m_dataview->AppendToggleColumn(_("Import?"), m_dataview->GetColumnCount(), wxDATAVIEW_CELL_ACTIVATABLE, 80, wxALIGN_LEFT);
m_staticText1 = new wxStaticText(this, wxID_ANY, _("Files extension to import:"), wxDefaultPosition, wxSize(-1, -1), 0);
@@ -68,7 +69,7 @@ ImportFilesDialogNewBase::ImportFilesDialogNewBase(wxWindow* parent, wxWindowID
mainSizer->Add(m_staticline1, 0, wxALL|wxEXPAND, 5);
- wxBoxSizer* buttonSizer = new wxBoxSizer(wxHORIZONTAL);
+ buttonSizer = new wxBoxSizer(wxHORIZONTAL);
mainSizer->Add(buttonSizer, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
@@ -81,7 +82,6 @@ ImportFilesDialogNewBase::ImportFilesDialogNewBase(wxWindow* parent, wxWindowID
buttonSizer->Add(m_buttonCancel, 0, wxALL, 5);
-
SetSizeHints(400,400);
if ( GetSizer() ) {
GetSizer()->Fit(this);
diff --git a/LiteEditor/importfilesdialog_new.h b/LiteEditor/importfilesdialog_new.h
index 0080fb3..4d3be3f 100644
--- a/LiteEditor/importfilesdialog_new.h
+++ b/LiteEditor/importfilesdialog_new.h
@@ -1,30 +1,6 @@
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-//
-// copyright : (C) 2013 by Eran Ifrah
-// file name : importfilesdialog_new.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.
-//
-//////////////////////////////////////////////////////////////////////////////
... 44 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2013-12-28 14:45:48
|
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 072e08ea82c3e9dc9ad39406f1da5f6bd487de10 (commit)
from 62bd1a0086448824a45370cff95bc1ac6013c01c (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/072e08ea82c3e9dc9ad39406f1da5f6bd487de10
commit 072e08ea82c3e9dc9ad39406f1da5f6bd487de10
Author: dghart <da...@4P...>
Date: Sat Dec 28 14:43:54 2013 +0000
Add a missing event.Skip() to SFTP::OnEditorClosed
This was preventing the 'Tabs' tab from updating when an editor was closed.
diff --git a/SFTP/sftp.cpp b/SFTP/sftp.cpp
index c9ba019..187083f 100644
--- a/SFTP/sftp.cpp
+++ b/SFTP/sftp.cpp
@@ -353,6 +353,7 @@ void SFTP::AddRemoteFile(const RemoteFileInfo& remoteFile)
void SFTP::OnEditorClosed(wxCommandEvent& e)
{
+ e.Skip();
IEditor* editor = (IEditor*) e.GetClientData();
if ( editor ) {
wxString localFile = editor->GetFileName().GetFullPath();
-----------------------------------------------------------------------
Summary of changes:
SFTP/sftp.cpp | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2013-12-28 11:43:43
|
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 62bd1a0086448824a45370cff95bc1ac6013c01c (commit)
from de8ff7fb88f4a065560b200c77a3ec5a5544fc7e (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/62bd1a0086448824a45370cff95bc1ac6013c01c
commit 62bd1a0086448824a45370cff95bc1ac6013c01c
Author: dghart <da...@4P...>
Date: Sat Dec 28 11:10:04 2013 +0000
When CodeLite loads, update the lexer files if needed
This is a fix for https://sourceforge.net/p/codelite/bugs/931/
Before, when the CodeLite lexer files were updated with a new property or lexer, the user could (if he noticed!) choose to use the new file, thus losing any altered colour or fontsize preferences. The only way to avoid this would have been to alter the files by hand.
Now when it loads, CodeLite reconciles each lexer file with the equivalent installed one. This adds (for me) about 350ms to the starting time when changes are needed, otherwise just 50ms.
diff --git a/Plugin/editor_config.cpp b/Plugin/editor_config.cpp
index 5df24d7..41a59a8 100644
--- a/Plugin/editor_config.cpp
+++ b/Plugin/editor_config.cpp
@@ -449,6 +449,66 @@ void EditorConfig::SaveStringValue(const wxString &key, const wxString &value)
WriteObject(key, &data);
}
+void EditorConfig::UpgradeUserLexer(const wxString& userLexer, const wxString& installedLexer)
+{
+ wxXmlDocument userdoc(userLexer), srcdoc(installedLexer);
+ if(userdoc.IsOk() && srcdoc.IsOk()) {
+ wxXmlNode* userroot = userdoc.GetRoot();
+ wxXmlNode* srcroot = srcdoc.GetRoot();
+ if (userroot && srcroot) {
+ bool dirty(false);
+
+ // Iterate through the lexers, looking for novelties
+ wxXmlNode* child = srcroot->GetChildren();
+ while (child) {
+ wxString name = child->GetAttribute("Name", "");
+ wxXmlNode* usernode = XmlUtils::FindNodeByName(userroot, "Lexer", name);
+ if (!usernode) {
+ usernode = XmlUtils::FindNodeByName(userroot, "Lexer", name.Lower());
+ if (usernode) {
+ // Lexers used to have lower-case names. Upgrade the spelling for compatibility; it shouldn't break anything
+ wxXmlAttribute* attrib = usernode->GetAttributes();
+ while (attrib) {
+ if (attrib->GetName() == "Name") {
+ attrib->SetValue(name);
+ dirty = true;
+ break;
+ }
+ attrib = attrib->GetNext();
+ }
+ }
+ }
+
+ if (!usernode) {
+ // Found a missing lexer, so copy it across
+ userroot->AddChild(new wxXmlNode(*child));
+ dirty = true;
+ } else {
+ // This lexer is already present, but check for any missing attributes
+ wxXmlNode* properties = XmlUtils::FindFirstByTagName(child, "Properties");
+ wxXmlNode* userproperties = XmlUtils::FindFirstByTagName(usernode, "Properties");
+ if (properties && userproperties) {
+ wxXmlNode* property = properties->GetChildren();
+ while (property) {
+ if (!XmlUtils::FindNodeByName(userproperties, "Property", property->GetAttribute("Name", ""))) {
+ // Found a missing attribute
+ userproperties->AddChild(new wxXmlNode(*property));
+ dirty = true;
+ }
+ property = property->GetNext();
+ }
+ }
+ }
+ child = child->GetNext();
+ }
+
+ if (dirty) {
+ userdoc.Save(userLexer);
+ }
+ }
+ }
+}
+
void EditorConfig::LoadLexers(bool loadDefault)
{
m_lexers.clear();
@@ -488,6 +548,8 @@ void EditorConfig::LoadLexers(bool loadDefault)
if ( wxFileName::FileExists( userLexer ) ) {
if ( !loadDefault ) {
+ // First try to merge any new lexers or new properties into the user's one, without overwriting any user-set preferences
+ UpgradeUserLexer(userLexer, fileToLoad);
fileToLoad = userLexer;
} else {
diff --git a/Plugin/editor_config.h b/Plugin/editor_config.h
index 906552e..8107e18 100644
--- a/Plugin/editor_config.h
+++ b/Plugin/editor_config.h
@@ -335,6 +335,14 @@ public:
*/
void SetPaneStickiness(const wxString& caption, bool stickiness);
+protected:
+ /**
+ * \brief Update the user's lexer with any novel lexers or attributes
+ * \param userLexer the current lexer, which may contain user prefs
+ * \param installedLexer the equivalent unaltered lexer from the CodeLite installation
+ */
+ void UpgradeUserLexer(const wxString& userLexer, const wxString& installedLexer);
+
private:
EditorConfig();
virtual ~EditorConfig();
-----------------------------------------------------------------------
Summary of changes:
Plugin/editor_config.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++++++
Plugin/editor_config.h | 8 ++++++
2 files changed, 70 insertions(+), 0 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-28 10:05:07
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via de8ff7fb88f4a065560b200c77a3ec5a5544fc7e (commit)
from 70d30867b1b474c2b40342b8dd664e15eb116005 (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/de8ff7fb88f4a065560b200c77a3ec5a5544fc7e
commit de8ff7fb88f4a065560b200c77a3ec5a5544fc7e
Author: Eran <era...@gm...>
Date: Sat Dec 28 12:04:50 2013 +0200
codeite-terminal: respect the "--exit" and "--wait" switches
diff --git a/codelite_terminal/codelite_terminal.project b/codelite_terminal/codelite_terminal.project
index 494904e..dd192ba 100644
--- a/codelite_terminal/codelite_terminal.project
+++ b/codelite_terminal/codelite_terminal.project
@@ -57,7 +57,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="-e -w -- cmake -G "MinGW Makefiles"" UseSeparateDebugArgs="yes" DebugArguments="-e -w -- cmake -G "MinGW Makefiles"" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/>
+ <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"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
diff --git a/codelite_terminal/commandlineparser.cpp b/codelite_terminal/commandlineparser.cpp
index e08d6f4..ada209d 100644
--- a/codelite_terminal/commandlineparser.cpp
+++ b/codelite_terminal/commandlineparser.cpp
@@ -51,10 +51,10 @@ void CommandLineParser::DoParse()
if ( oi.IsOk() ) {
if ( oi.GetFlags() & CommandLineParser::kOptionWithValue ) {
wxString value = NextToken();
- m_argsMap.insert( std::make_pair(optionName, value) );
+ m_argsMap.insert( std::make_pair(StripDash(optionName), value) );
} else {
- m_argsMap.insert( std::make_pair(optionName, "") );
+ m_argsMap.insert( std::make_pair(StripDash(optionName), "") );
}
}
}
@@ -100,3 +100,12 @@ CommandLineParser::OptionInfo CommandLineParser::GetOptionInfo(const wxString& n
}
return *iter;
}
+
+wxString CommandLineParser::StripDash(const wxString& opt) const
+{
+ wxString noPrefix (opt);
+ noPrefix.StartsWith("--", &noPrefix);
+ noPrefix.StartsWith("-", &noPrefix);
+ noPrefix.StartsWith("/", &noPrefix);
+ return noPrefix;
+}
diff --git a/codelite_terminal/commandlineparser.h b/codelite_terminal/commandlineparser.h
index 6d3f1f3..76d393a 100644
--- a/codelite_terminal/commandlineparser.h
+++ b/codelite_terminal/commandlineparser.h
@@ -91,7 +91,8 @@ protected:
bool HasMore();
CommandLineParser::OptionInfo GetOptionInfo(const wxString &name) const;
-
+ wxString StripDash(const wxString &opt) const;
+
public:
CommandLineParser(int argc, char **argv);
virtual ~CommandLineParser();
-----------------------------------------------------------------------
Summary of changes:
codelite_terminal/codelite_terminal.project | 2 +-
codelite_terminal/commandlineparser.cpp | 13 +++++++++++--
codelite_terminal/commandlineparser.h | 3 ++-
3 files changed, 14 insertions(+), 4 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-28 09:36: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 70d30867b1b474c2b40342b8dd664e15eb116005 (commit)
via 5bf67bb6b8c22b647d73f3dbf84beaee782f0291 (commit)
from 4860b58a8daabf8e36a0857930bf22c17a2ecc03 (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/70d30867b1b474c2b40342b8dd664e15eb116005
commit 70d30867b1b474c2b40342b8dd664e15eb116005
Author: Eran <era...@gm...>
Date: Sat Dec 28 11:36:12 2013 +0200
codelite-terminal: if no "--title" is provided, use the executed command as the title for the terminal window
Adjusted codelite's command to use the new codelite-terminal command line arguments
diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp
index 412ce5e..40d2152 100644
--- a/LiteEditor/manager.cpp
+++ b/LiteEditor/manager.cpp
@@ -311,11 +311,11 @@ void Manager::DoSetupWorkspace ( const wxString &path )
wxString errMsg;
wxBusyCursor cursor;
AddToRecentlyOpenedWorkspaces ( path );
-
+
wxCommandEvent evtWorkspaceLoaded(wxEVT_WORKSPACE_LOADED);
evtWorkspaceLoaded.SetString( path );
EventNotifier::Get()->ProcessEvent( evtWorkspaceLoaded );
-
+
// Update the refactoring cache
wxFileList_t allfiles;
GetWorkspaceFiles(allfiles, true);
@@ -609,11 +609,11 @@ bool Manager::RemoveProject ( const wxString &name, bool notify )
for ( size_t i = 0; i < projectFiles.size(); i++ ) {
prjfls.Add ( projectFiles[i].GetFullPath() );
}
-
+
if ( notify )
SendCmdEvent ( wxEVT_PROJ_FILE_REMOVED, ( void* ) &prjfls );
}
-
+
if ( notify )
SendCmdEvent ( wxEVT_PROJ_REMOVED, ( void* ) &name );
return true;
@@ -652,7 +652,7 @@ void Manager::SetActiveProject ( const wxString &name )
WorkspaceST::Get()->SetActiveProject ( WorkspaceST::Get()->GetActiveProjectName(), false );
WorkspaceST::Get()->SetActiveProject ( name, true );
clMainFrame::Get()->SelectBestEnvSet();
-
+
wxCommandEvent evt(wxEVT_ACTIVE_PROJECT_CHANGED);
evt.SetString(name);
EventNotifier::Get()->AddPendingEvent( evt );
@@ -666,7 +666,7 @@ BuildMatrixPtr Manager::GetWorkspaceBuildMatrix() const
void Manager::SetWorkspaceBuildMatrix ( BuildMatrixPtr matrix )
{
WorkspaceST::Get()->SetBuildMatrix ( matrix );
-
+
// Notify about the configuration change to the plugins
wxCommandEvent e(wxEVT_WORKSPACE_CONFIG_CHANGED);
e.SetString( matrix->GetSelectedConfigurationName() );
@@ -1010,7 +1010,7 @@ bool Manager::AddFileToProject ( const wxString &fileName, const wxString &vdFul
//project
wxArrayString files;
files.Add ( fileName );
-
+
clCommandEvent evtAddFiles(wxEVT_PROJ_FILE_ADDED);
evtAddFiles.SetStrings( files );
EventNotifier::Get()->AddPendingEvent( evtAddFiles );
@@ -1041,7 +1041,7 @@ void Manager::AddFilesToProject(const wxArrayString& files, const wxString& vdFu
// In Linux, files 'abc' and 'Abc' can happily co-exist, so see if that's what's happening
wxString projName = this->GetProjectNameByFile(file, true); // 'true' is case-sensitive comparison
if (projName.IsEmpty() || projName != project) {
- wxString msg1(wxString::Format(_("There is already a file in this folder with a name:\n%s\nthat matches using case-insensitive comparison"),
+ wxString msg1(wxString::Format(_("There is already a file in this folder with a name:\n%s\nthat matches using case-insensitive comparison"),
file));
wxString msg2(_("\nThis won't be a problem on Linux, but it may be on other, case-insensitive platforms"));
wxString msg3(_("\n\nAdd the file anyway?"));
@@ -1147,7 +1147,7 @@ bool Manager::RenameFile(const wxString &origName, const wxString &newName, cons
// to the workspace
wxArrayString files;
files.Add(newName);
-
+
clCommandEvent evtAddFiles(wxEVT_PROJ_FILE_ADDED);
evtAddFiles.SetStrings( files );
EventNotifier::Get()->AddPendingEvent( evtAddFiles );
@@ -1406,33 +1406,33 @@ wxString Manager::GetProjectExecutionCommand ( const wxString& projectName, wxSt
execLine.Trim().Trim(false);
wd = bldConf->GetWorkingDirectory();
wd = ExpandVariables ( wd, GetProject ( projectName ), clMainFrame::Get()->GetMainBook()->GetActiveEditor() );
-
+
wxFileName fnCodeliteTerminal(wxStandardPaths::Get().GetExecutablePath());
fnCodeliteTerminal.SetFullName("codelite-terminal");
-
+
wxString title;
title << cmd << " " << cmdArgs;
-
+
OptionsConfigPtr opts = EditorConfigST::Get()->GetOptions();
//change directory to the working directory
if ( considerPauseWhenExecuting && !bldConf->IsGUIProgram() ) {
-
+
ProjectPtr proj = GetProject ( projectName );
-
+
#if defined(__WXMAC__)
wxString newCommand;
newCommand << "/usr/bin/open " << fnCodeliteTerminal.GetPath(true) << "codelite-terminal.app --args ";
newCommand << " --exit ";
- if ( bldConf->GetPauseWhenExecEnds() ) {
+ if ( bldConf->GetPauseWhenExecEnds() ) {
newCommand << " --wait ";
}
-
+
wxFileName fnWD(wd, "");
if ( fnWD.IsRelative() ) {
fnWD.MakeAbsolute( GetProject(projectName)->GetFileName().GetPath() );
}
- newCommand << " --working-directory \"" << fnWD.GetFullPath() << "\" --title \"" << title << "\" --command \"" << title << "\"";
+ newCommand << " --working-directory \"" << fnWD.GetFullPath() << "\" --title \"" << title << "\" -- " << title;
execLine = newCommand;
#elif defined(__WXGTK__)
@@ -1440,13 +1440,13 @@ wxString Manager::GetProjectExecutionCommand ( const wxString& projectName, wxSt
// Set a console to the execute target
if ( opts->HasOption(OptionsConfig::Opt_Use_CodeLite_Terminal) && !bldConf->IsGUIProgram() ) {
wxString newCommand;
- newCommand << fnCodeliteTerminal.GetFullPath() << " -e ";
- if ( bldConf->GetPauseWhenExecEnds() ) {
- newCommand << " -w ";
+ newCommand << fnCodeliteTerminal.GetFullPath() << " --exit ";
+ if ( bldConf->GetPauseWhenExecEnds() ) {
+ newCommand << " --wait ";
}
- newCommand << " -t \"" << title << "\" -c \"" << title << "\"";
+ newCommand << " -- " << title;
execLine = newCommand;
-
+
} else {
wxString term;
term = opts->GetProgramConsoleCommand();
@@ -1474,27 +1474,25 @@ wxString Manager::GetProjectExecutionCommand ( const wxString& projectName, wxSt
if ( !bldConf->IsGUIProgram() ) {
if ( bldConf->GetPauseWhenExecEnds() && opts->HasOption(OptionsConfig::Opt_Use_CodeLite_Terminal) ) {
-
+
// codelite-terminal does not like forward slashes...
wxString commandToRun;
commandToRun << cmd << " ";
commandToRun.Replace("/", "\\");
commandToRun << cmdArgs;
commandToRun.Trim().Trim(false);
-
+
wxString newCommand;
- newCommand << fnCodeliteTerminal.GetFullPath() << " -e ";
- if ( bldConf->GetPauseWhenExecEnds() ) {
- newCommand << " -w ";
+ newCommand << fnCodeliteTerminal.GetFullPath() << " --exit ";
+ if ( bldConf->GetPauseWhenExecEnds() ) {
+ newCommand << " --wait ";
}
-
- newCommand << " -t \"" << commandToRun << "\" -c \"" << commandToRun << "\"";
+
+ newCommand << " -- " << commandToRun;
execLine = newCommand;
-
} else if ( bldConf->GetPauseWhenExecEnds() ) {
execLine.Prepend ("le_exec.exe ");
}
-
}
#endif
}
@@ -1631,7 +1629,7 @@ void Manager::TogglePanes()
{
static wxString savedLayout;
if ( savedLayout.IsEmpty() ) {
-
+
savedLayout = clMainFrame::Get()->GetDockingManager().SavePerspective();
wxAuiManager& aui = clMainFrame::Get()->GetDockingManager();
wxAuiPaneInfoArray &all_panes = aui.GetAllPanes();
@@ -1640,10 +1638,10 @@ void Manager::TogglePanes()
all_panes.Item(i).Hide();
}
}
-
+
//update changes
aui.Update();
-
+
} else {
clMainFrame::Get()->GetDockingManager().LoadPerspective(savedLayout);
savedLayout.Clear();
@@ -1913,13 +1911,13 @@ void Manager::ExecuteNoDebug ( const wxString &projectName )
// we call it here once for the 'wd'
wxString execLine;
ProjectPtr proj;
-
+
{
EnvSetter env1(NULL, NULL, projectName);
execLine = GetProjectExecutionCommand ( projectName, wd, true );
proj = GetProject ( projectName );
}
-
+
DirSaver ds;
//print the current directory
@@ -1987,7 +1985,7 @@ void Manager::UpdateDebuggerPane()
{
clCommandEvent evtDbgRefreshViews(wxEVT_DEBUGGER_UPDATE_VIEWS);
EventNotifier::Get()->AddPendingEvent( evtDbgRefreshViews );
-
+
DebuggerPane *pane = clMainFrame::Get()->GetDebuggerPane();
#if CL_USE_NATIVEBOOK
@@ -2195,11 +2193,11 @@ void Manager::DbgStart ( long attachPid )
userDebuggr.Trim().Trim ( false );
if ( userDebuggr.IsEmpty() == false ) {
// expand project macros
- userDebuggr = MacroManager::Instance()->Expand(userDebuggr,
- PluginManager::Get(),
- proj->GetName(),
+ userDebuggr = MacroManager::Instance()->Expand(userDebuggr,
+ PluginManager::Get(),
+ proj->GetName(),
bldConf->GetName());
-
+
// Convert any relative path to absolute path
// see bug# https://sourceforge.net/p/codelite/bugs/871/
wxFileName fnDebuggerPath(userDebuggr);
@@ -2214,16 +2212,16 @@ void Manager::DbgStart ( long attachPid )
// read the console command
dinfo.consoleCommand = EditorConfigST::Get()->GetOptions()->GetProgramConsoleCommand();
dbgr->SetDebuggerInformation ( dinfo );
-
+
// Apply the environment variables before starting
EnvSetter env(NULL, NULL, proj ? proj->GetName() : wxString());
-
+
if ( !bldConf && attachPid == wxNOT_FOUND ) {
wxString errmsg;
errmsg << _("Could not find project configuration!\n") << _("Make sure that everything is set properly in your project settings");
::wxMessageBox(errmsg, wxT("CodeLite"), wxOK|wxICON_ERROR);
return;
-
+
} else if ( attachPid == wxNOT_FOUND ) {
exepath = bldConf->GetCommand();
@@ -2299,18 +2297,18 @@ void Manager::DbgStart ( long attachPid )
si.PID = PID;
si.enablePrettyPrinting = dinfo.enableGDBPrettyPrinting;
si.cmds = ::wxStringTokenize(dinfo.startupCommands, "\r\n", wxTOKEN_STRTOK);
-
+
if ( bldConf ) {
si.searchPaths = bldConf->GetDebuggerSearchPaths();
}
-
+
if ( attachPid == wxNOT_FOUND ) {
//it is now OK to start the debugger...
dbg_cmds = wxStringTokenize ( bldConf->GetDebuggerStartupCmds(), wxT ( "\n" ), wxTOKEN_STRTOK );
-
+
// append project level commands to the global commands
si.cmds.insert(si.cmds.end(), dbg_cmds.begin(), dbg_cmds.end());
-
+
if ( !dbgr->Start ( si ) ) {
wxString errMsg;
errMsg << _("Failed to initialize debugger: ") << dbgname << wxT("\n");
@@ -2320,7 +2318,7 @@ void Manager::DbgStart ( long attachPid )
} else {
// append project level commands to the global commands
si.cmds.insert(si.cmds.end(), dbg_cmds.begin(), dbg_cmds.end());
-
+
//Attach to process...
if ( !dbgr->Attach ( si ) ) {
wxString errMsg;
@@ -2394,9 +2392,9 @@ void Manager::DbgStop()
{
{
IDebugger* dbgr = DebuggerMgr::Get().GetActiveDebugger();
-
+
if ( dbgr && dbgr->IsRunning() ) {
- // If the debugger is running assume that the current perspective is the
+ // If the debugger is running assume that the current perspective is the
// one that we want to use for our debugging purposes
#ifndef __WXMAC__
GetPerspectiveManager().SavePerspective(DEBUG_LAYOUT);
@@ -3219,15 +3217,15 @@ void Manager::DebuggerUpdate(const DebuggerEventData& event)
case DBG_UR_TYPE_RESOLVED:
if ( event.m_userReason == DBG_USERR_WATCHTABLE ) {
clMainFrame::Get()->GetDebuggerPane()->GetWatchesTable()->OnTypeResolved(event);
-
+
} else if ( event.m_userReason == DBG_USERR_QUICKWACTH ) {
wxString expr = ::DbgPrependCharPtrCastIfNeeded(event.m_expression, event.m_evaluated);
dbgr->CreateVariableObject(expr, false, DBG_USERR_QUICKWACTH);
-
+
} else {
// Default
UpdateTypeReolsved( event.m_expression, event.m_evaluated );
-
+
}
break;
diff --git a/Plugin/globals.cpp b/Plugin/globals.cpp
index 7d41c28..3444b46 100644
--- a/Plugin/globals.cpp
+++ b/Plugin/globals.cpp
@@ -81,12 +81,12 @@ const wxEventType wxEVT_COMMAND_CL_INTERNAL_1_ARGS = ::wxNewEventType();
// --------------------------------------------------------
class clInternalEventHandlerData : public wxClientData
{
-
-
+
+
wxObject* m_this;
clEventFunc_t m_funcPtr;
wxClientData* m_arg;
-
+
public:
clInternalEventHandlerData(wxObject* instance, clEventFunc_t func, wxClientData* arg)
: m_this(instance)
@@ -103,7 +103,7 @@ public:
virtual ~clInternalEventHandlerData() {
wxDELETE(m_arg);
}
-
+
wxClientData* GetArg() const {
return m_arg;
}
@@ -138,7 +138,7 @@ public:
wxClientData* arg = cd->GetArg();
clEventFunc_t func = cd->GetFuncPtr();
(obj->*func)(arg);
-
+
delete cd;
e.SetClientObject(NULL);
}
@@ -814,7 +814,7 @@ void GetProjectTemplateList ( IManager *manager, std::list<ProjectPtr> &list, st
if ( bmp.IsOk() && bmp.GetWidth() == 24 && bmp.GetHeight() == 24 ) {
int img_id = (*lstImages)->Add( bmp );
(*imageMap)[proj->GetName()] = img_id;
-
+
} else {
// wrong size...
bmp = wxBitmap();
@@ -822,7 +822,7 @@ void GetProjectTemplateList ( IManager *manager, std::list<ProjectPtr> &list, st
}
}
}
-
+
} else {
//if we ended up here, it means the installation got screwed up since
//there should be at least 8 project templates !
@@ -1516,13 +1516,13 @@ wxArrayString SplitString(const wxString &inString, bool trim)
{
wxArrayString lines;
wxString curline;
-
+
bool inContinuation = false;
for(size_t i=0; i<inString.length(); ++i) {
wxChar ch = inString.GetChar(i);
wxChar ch1 = (i + 1 < inString.length()) ? inString.GetChar(i+1) : wxUniChar(0);
wxChar ch2 = (i + 2 < inString.length()) ? inString.GetChar(i+2) : wxUniChar(0);
-
+
switch ( ch ) {
case '\r':
// do nothing
@@ -1531,7 +1531,7 @@ wxArrayString SplitString(const wxString &inString, bool trim)
case '\n':
if ( inContinuation ) {
curline << ch;
-
+
} else {
lines.Add( trim ? curline.Trim().Trim(false) : curline );
curline.clear();
@@ -1550,7 +1550,7 @@ wxArrayString SplitString(const wxString &inString, bool trim)
break;
}
}
-
+
// any leftovers?
if ( curline.IsEmpty() == false ) {
lines.Add( trim ? curline.Trim().Trim(false) : curline );
@@ -1564,11 +1564,11 @@ wxString MakeExecInShellCommand(const wxString& cmd, const wxString& wd, bool wa
//execute command & cmdArgs
wxString execLine ( cmd );
wxString title ( cmd );
-
+
OptionsConfigPtr opts = EditorConfigST::Get()->GetOptions();
wxFileName fnCodeliteTerminal(wxStandardPaths::Get().GetExecutablePath());
fnCodeliteTerminal.SetFullName("codelite-terminal");
-
+
//change directory to the working directory
#if defined(__WXMAC__)
wxString newCommand;
@@ -1576,21 +1576,21 @@ wxString MakeExecInShellCommand(const wxString& cmd, const wxString& wd, bool wa
if ( waitForAnyKey ) {
newCommand << " -w ";
}
- newCommand << " -t \"" << title << "\" -c \"" << title << "\"";
+ newCommand << " -- " << title;
execLine = newCommand;
-
+
#elif defined(__WXGTK__)
// Set a console to the execute target
if ( opts->HasOption(OptionsConfig::Opt_Use_CodeLite_Terminal)) {
wxString newCommand;
newCommand << fnCodeliteTerminal.GetFullPath() << " -e ";
- if ( waitForAnyKey ) {
+ if ( waitForAnyKey ) {
newCommand << " -w ";
}
- newCommand << " -t \"" << title << "\" -c \"" << title << "\"";
+ newCommand << " -- " << title;
execLine = newCommand;
-
+
} else {
wxString term;
term = opts->GetProgramConsoleCommand();
@@ -1614,7 +1614,7 @@ wxString MakeExecInShellCommand(const wxString& cmd, const wxString& wd, bool wa
#elif defined (__WXMSW__)
if ( opts->HasOption(OptionsConfig::Opt_Use_CodeLite_Terminal) ) {
-
+
// codelite-terminal does not like forward slashes...
wxString commandToRun;
commandToRun << cmd << " ";
@@ -1623,13 +1623,13 @@ wxString MakeExecInShellCommand(const wxString& cmd, const wxString& wd, bool wa
wxString newCommand;
newCommand << fnCodeliteTerminal.GetFullPath() << " -e ";
- if ( waitForAnyKey ) {
+ if ( waitForAnyKey ) {
newCommand << " -w ";
}
-
- newCommand << " -t \"" << commandToRun << "\" -c \"" << commandToRun << "\"";
+
+ newCommand << " -- " << commandToRun;
execLine = newCommand;
-
+
} else if ( waitForAnyKey ) {
execLine.Prepend ("le_exec.exe ");
}
diff --git a/codelite_terminal/main.cpp b/codelite_terminal/main.cpp
index 7d10228..32fa713 100644
--- a/codelite_terminal/main.cpp
+++ b/codelite_terminal/main.cpp
@@ -58,6 +58,9 @@ public:
... 897 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-28 07:23: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 4860b58a8daabf8e36a0857930bf22c17a2ecc03 (commit)
from b4edcf09542f0515e7a679592bb02858919b7380 (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/4860b58a8daabf8e36a0857930bf22c17a2ecc03
commit 4860b58a8daabf8e36a0857930bf22c17a2ecc03
Author: Eran <era...@gm...>
Date: Sat Dec 28 09:23:18 2013 +0200
Project settings: disable the "assembler" field options when the "Compiler is not needed" checkbox is ticked
diff --git a/LiteEditor/project_settings.wxcp b/LiteEditor/project_settings.wxcp
index 04090d0..da2fe64 100644
--- a/LiteEditor/project_settings.wxcp
+++ b/LiteEditor/project_settings.wxcp
@@ -4713,7 +4713,13 @@
"m_label": "Wrap:",
"m_value": "-1"
}],
- "m_events": [],
+ "m_events": [{
+ "m_eventName": "wxEVT_UPDATE_UI",
+ "m_eventClass": "wxUpdateUIEvent",
+ "m_eventHandler": "wxUpdateUIEventHandler",
+ "m_functionNameAndSignature": "OnCompiledNotNeededUI(wxUpdateUIEvent& event)",
+ "m_description": "Process a wxEVT_UPDATE_UI event"
+ }],
"m_children": []
}, {
"m_type": 4406,
@@ -4897,6 +4903,12 @@
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnButtonAddAssemblerOptions(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked."
+ }, {
+ "m_eventName": "wxEVT_UPDATE_UI",
+ "m_eventClass": "wxUpdateUIEvent",
+ "m_eventHandler": "wxUpdateUIEventHandler",
+ "m_functionNameAndSignature": "OnCompiledNotNeededUI(wxUpdateUIEvent& event)",
+ "m_description": "Process a wxEVT_UPDATE_UI event"
}],
"m_children": []
}, {
diff --git a/LiteEditor/project_settings_base_dlg.cpp b/LiteEditor/project_settings_base_dlg.cpp
index 1b87069..2095f49 100644
--- a/LiteEditor/project_settings_base_dlg.cpp
+++ b/LiteEditor/project_settings_base_dlg.cpp
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: project_settings.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -530,9 +531,11 @@ PSCompilerPageBase::PSCompilerPageBase(wxWindow* parent, wxWindowID id, const wx
m_textCtrlCCompilerOptions->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
m_button35->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PSCompilerPageBase::OnButtonAddCCompilerOptions), NULL, this);
m_button35->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
+ m_staticText94->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
m_textCtrlAssemblerOptions->Connect(wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(PSCompilerPageBase::OnCmdEvtVModified), NULL, this);
m_textCtrlAssemblerOptions->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
m_button98->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PSCompilerPageBase::OnButtonAddAssemblerOptions), NULL, this);
+ m_button98->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
m_staticText4->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
m_textAdditionalSearchPath->Connect(wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(PSCompilerPageBase::OnCmdEvtVModified), NULL, this);
m_textAdditionalSearchPath->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
@@ -573,9 +576,11 @@ PSCompilerPageBase::~PSCompilerPageBase()
m_textCtrlCCompilerOptions->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
m_button35->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PSCompilerPageBase::OnButtonAddCCompilerOptions), NULL, this);
m_button35->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
+ m_staticText94->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
m_textCtrlAssemblerOptions->Disconnect(wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(PSCompilerPageBase::OnCmdEvtVModified), NULL, this);
m_textCtrlAssemblerOptions->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
m_button98->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PSCompilerPageBase::OnButtonAddAssemblerOptions), NULL, this);
+ m_button98->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
m_staticText4->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
m_textAdditionalSearchPath->Disconnect(wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(PSCompilerPageBase::OnCmdEvtVModified), NULL, this);
m_textAdditionalSearchPath->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(PSCompilerPageBase::OnCompiledNotNeededUI), NULL, this);
diff --git a/LiteEditor/project_settings_base_dlg.h b/LiteEditor/project_settings_base_dlg.h
index 30d4b2d..46ebb3e 100644
--- a/LiteEditor/project_settings_base_dlg.h
+++ b/LiteEditor/project_settings_base_dlg.h
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: project_settings.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/project_settings.wxcp | 14 +++++++++++++-
LiteEditor/project_settings_base_dlg.cpp | 5 +++++
LiteEditor/project_settings_base_dlg.h | 1 +
3 files changed, 19 insertions(+), 1 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-28 07:19:11
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via b4edcf09542f0515e7a679592bb02858919b7380 (commit)
via 3e29bd360b12e9498a9bbf2252ecf432d60ec135 (commit)
via a525043e9d2b7e398bb8230aa0303db7b41d0268 (commit)
via cff628ca1cb68eb1c7ddcf3d8f2a0b1f3ab7334f (commit)
from 9d2a2c06e0b6098ba2588fea1f3ba924a679ac4b (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/b4edcf09542f0515e7a679592bb02858919b7380
commit b4edcf09542f0515e7a679592bb02858919b7380
Merge: 3e29bd3 9d2a2c0
Author: Eran <era...@gm...>
Date: Sat Dec 28 09:14:39 2013 +0200
Merge branch 'master' of ssh://git.code.sf.net/p/codelite/codelitegit
# By dghart
# Via dghart
* 'master' of ssh://git.code.sf.net/p/codelite/codelitegit:
Make Move Line Up (and Down) work on any selected lines
https://sourceforge.net/p/codelite/codelitegit/ci/3e29bd360b12e9498a9bbf2252ecf432d60ec135
commit 3e29bd360b12e9498a9bbf2252ecf432d60ec135
Author: Eran <era...@gm...>
Date: Sat Dec 28 09:12:58 2013 +0200
"Find In Files" dialog should now use distinct colours when used in dark themes
diff --git a/LiteEditor/findresultstab.cpp b/LiteEditor/findresultstab.cpp
index 816aaae..606c00b 100644
--- a/LiteEditor/findresultstab.cpp
+++ b/LiteEditor/findresultstab.cpp
@@ -120,7 +120,7 @@ FindResultsTab::FindResultsTab(wxWindow *parent, wxWindowID id, const wxString &
Connect( XRCID ( "stop_search" ), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler ( FindResultsTab::OnStopSearch ), NULL, this );
Connect( XRCID ( "stop_search" ), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( FindResultsTab::OnStopSearchUI), NULL, this );
m_tb->Realize();
-
+
EventNotifier::Get()->Connect(wxEVT_CL_THEME_CHANGED, wxCommandEventHandler(FindResultsTab::OnThemeChanged), NULL, this);
}
@@ -150,14 +150,16 @@ void FindResultsTab::SetStyles(wxStyledTextCtrl *sci)
sci->StyleSetForeground(i, DrawingUtils::GetOutputPaneFgColour());
sci->StyleSetBackground(i, DrawingUtils::GetOutputPaneBgColour());
}
-
+
sci->StyleSetForeground(LEX_FIF_DEFAULT, DrawingUtils::GetOutputPaneFgColour());
sci->StyleSetBackground(LEX_FIF_DEFAULT, DrawingUtils::GetOutputPaneBgColour());
- sci->StyleSetForeground(LEX_FIF_HEADER, DrawingUtils::GetOutputPaneFgColour());
+ wxColour headerColour = DrawingUtils::IsThemeDark() ? wxColour("GREY") : wxColour("BLACK");
+
+ sci->StyleSetForeground(LEX_FIF_HEADER, headerColour);
sci->StyleSetBackground(LEX_FIF_HEADER, DrawingUtils::GetOutputPaneBgColour());
- sci->StyleSetForeground(LEX_FIF_LINE_NUMBER, wxT("MAROON"));
+ sci->StyleSetForeground(LEX_FIF_LINE_NUMBER, DrawingUtils::IsThemeDark() ? wxColour("#FACE43") : wxColour("MAROON"));
sci->StyleSetBackground(LEX_FIF_LINE_NUMBER, DrawingUtils::GetOutputPaneBgColour());
sci->StyleSetForeground(LEX_FIF_MATCH, DrawingUtils::GetOutputPaneFgColour());
@@ -175,30 +177,16 @@ void FindResultsTab::SetStyles(wxStyledTextCtrl *sci)
LexerConfPtr cppLexer = EditorConfigST::Get()->GetLexer(wxT("C++"));
if(cppLexer) {
- std::list<StyleProperty> styles = cppLexer->GetLexerProperties();
- std::list<StyleProperty>::iterator iter = styles.begin();
- for (; iter != styles.end(); iter++) {
- if(iter->GetId() == wxSTC_C_COMMENTLINE) {
- fgColour = iter->GetFgColour();
- break;
-
- } else if(iter->GetId() == wxSTC_C_DEFAULT) {
- StyleProperty sp = (*iter);
- int size = sp.GetFontSize();
- wxString face = sp.GetFaceName();
- bool italic = sp.GetItalic();
-
- font = wxFont(size, wxFONTFAMILY_TELETYPE, italic ? wxITALIC : wxNORMAL , wxNORMAL, false, face);
- bold = wxFont(size, wxFONTFAMILY_TELETYPE, italic ? wxITALIC : wxNORMAL , wxBOLD, false, face);
- }
- }
+ font = cppLexer->GetFontForSyle(wxSTC_C_DEFAULT);
+ bold = font;
+ bold.SetWeight(wxFONTWEIGHT_BOLD);
}
sci->StyleSetForeground(LEX_FIF_MATCH_COMMENT, fgColour);
sci->StyleSetBackground(LEX_FIF_MATCH_COMMENT, DrawingUtils::GetOutputPaneBgColour());
sci->StyleSetEOLFilled (LEX_FIF_MATCH_COMMENT, true);
- sci->StyleSetForeground(LEX_FIF_FILE, DrawingUtils::GetOutputPaneFgColour());
+ sci->StyleSetForeground(LEX_FIF_FILE, headerColour);
sci->StyleSetBackground(LEX_FIF_FILE, DrawingUtils::GetOutputPaneBgColour());
sci->StyleSetEOLFilled (LEX_FIF_FILE, true);
@@ -209,23 +197,27 @@ void FindResultsTab::SetStyles(wxStyledTextCtrl *sci)
sci->StyleSetFont(LEX_FIF_FILE, font);
sci->StyleSetFont(LEX_FIF_DEFAULT, bold);
- sci->StyleSetFont(LEX_FIF_HEADER, bold);
+ sci->StyleSetFont(LEX_FIF_HEADER, bold);
sci->StyleSetFont(LEX_FIF_MATCH, font);
- sci->StyleSetFont(LEX_FIF_LINE_NUMBER, font);
+ sci->StyleSetFont(LEX_FIF_LINE_NUMBER, font);
sci->StyleSetFont(LEX_FIF_SCOPE, font);
sci->StyleSetFont(LEX_FIF_MATCH_COMMENT, font);
sci->StyleSetHotSpot(LEX_FIF_MATCH, true);
sci->StyleSetHotSpot(LEX_FIF_FILE, true);
sci->StyleSetHotSpot(LEX_FIF_MATCH_COMMENT, true);
- sci->SetHotspotActiveForeground(true, "BLUE");
+
+ sci->SetHotspotActiveForeground(true, DrawingUtils::GetOutputPaneFgColour());
+ sci->SetHotspotActiveUnderline(false);
+
sci->MarkerDefine (7, wxSTC_MARK_ARROW);
- sci->MarkerSetBackground(7, *wxBLACK);
+ sci->MarkerSetBackground(7, DrawingUtils::IsThemeDark() ? "YELLOW" : "BLACK");
+ sci->MarkerSetForeground(7, DrawingUtils::IsThemeDark() ? "YELLOW" : "BLACK");
- sci->IndicatorSetForeground(1, wxColour(wxT("#6495ED")));
+ sci->IndicatorSetForeground(1, DrawingUtils::IsThemeDark() ? *wxYELLOW : wxColour(wxT("#6495ED")));
sci->IndicatorSetStyle(1, wxSTC_INDIC_ROUNDBOX);
sci->IndicatorSetUnder(1, true);
-
+
sci->SetMarginWidth(0, 0);
sci->SetMarginWidth(1, 16);
sci->SetMarginWidth(2, 0);
@@ -303,9 +295,9 @@ void FindResultsTab::OnFindInFiles(wxCommandEvent &e)
::wxMessageBox(_("The search thread is currently busy"), _("CodeLite"), wxICON_INFORMATION|wxOK);
return;
}
-
+
FindInFilesDialog *dlg = new FindInFilesDialog(EventNotifier::Get()->TopFrame(), "FindInFilesData");
-
+
wxString rootDir = e.GetString();
if (!rootDir.IsEmpty()) {
dlg->SetRootDir(rootDir);
@@ -325,7 +317,7 @@ void FindResultsTab::OnSearchStart(wxCommandEvent& e)
wxStyledTextCtrl *sci = new wxStyledTextCtrl(m_book);
SetStyles(sci);
sci->Connect(wxEVT_STC_STYLENEEDED, wxStyledTextEventHandler(FindResultsTab::OnStyleNeeded), NULL, this);
-
+
// Make sure we can add more tabs, if not delete the last used tab and then add
// a new tab
@@ -573,7 +565,7 @@ void FindResultsTab::OnMouseDClick(wxStyledTextEvent &e)
if (style == LEX_FIF_FILE || style == LEX_FIF_HEADER) {
m_sci->ToggleFold(line);
-
+
} else {
size_t n = m_book ? m_book->GetSelection() : 0;
const MatchInfo& matchInfo = GetMatchInfo(n);
@@ -832,10 +824,10 @@ void FindResultsTab::StyleText(wxStyledTextCtrl* ctrl, wxStyledTextEvent& e)
int startPos = ctrl->GetEndStyled();
int endPos = e.GetPosition();
wxString text = ctrl->GetTextRange(startPos, endPos);
-
+
wxArrayString lines = ::wxStringTokenize(text, wxT("\r\n"), wxTOKEN_RET_DELIMS);
ctrl->StartStyling(startPos, 0x1f); // text styling
-
+
int bytes_left = 0;
bool inMatchLine = false;
int offset = 0;
@@ -843,29 +835,29 @@ void FindResultsTab::StyleText(wxStyledTextCtrl* ctrl, wxStyledTextEvent& e)
wxString curline = lines.Item(i);
bytes_left = curline.length();
offset = 0;
-
+
if ( curline.StartsWith("/") ) {
ctrl->SetStyling(curline.Length(), LEX_FIF_MATCH_COMMENT);
bytes_left = 0;
-
+
} else if ( curline.StartsWith(wxT(" ") ) ) {
ctrl->SetStyling(6, LEX_FIF_LINE_NUMBER); // first 6 chars are the line number
bytes_left -= 6;
inMatchLine = true;
offset = 6;
-
+
} else if ( curline.StartsWith("=") ) {
ctrl->SetFoldLevel(ctrl->LineFromPosition(startPos) + i, 1 | wxSTC_FOLDLEVELHEADERFLAG);
ctrl->SetStyling(curline.Length(), LEX_FIF_HEADER); // first 6 chars are the line number
bytes_left = 0;
-
+
} else {
// File name
ctrl->SetFoldLevel(ctrl->LineFromPosition(startPos) + i, 2 | wxSTC_FOLDLEVELHEADERFLAG);
ctrl->SetStyling(curline.Length(), LEX_FIF_FILE); // first 6 chars are the line number
bytes_left = 0;
}
-
+
// Check for scope
static wxRegEx reScopeName(" \\[[\\<\\>a-z0-9_:~ ]+\\] ", wxRE_DEFAULT|wxRE_ICASE);
size_t scopeStart = wxString::npos, scopeLen = 0;
@@ -880,7 +872,7 @@ void FindResultsTab::StyleText(wxStyledTextCtrl* ctrl, wxStyledTextEvent& e)
if ( inMatchLine && bytes_left > 0 ) {
// The remainder of this line should be a hyper link
ctrl->SetStyling(bytes_left, LEX_FIF_MATCH);
-
+
} else if( bytes_left > 0 ) {
ctrl->SetStyling(bytes_left, LEX_FIF_DEFAULT);
}
https://sourceforge.net/p/codelite/codelitegit/ci/a525043e9d2b7e398bb8230aa0303db7b41d0268
commit a525043e9d2b7e398bb8230aa0303db7b41d0268
Author: Eran <era...@gm...>
Date: Sat Dec 28 08:32:06 2013 +0200
Added the macro NDEBUG to all template projects in their release configuration
diff --git a/CodeLite/dirtraverser.cpp b/CodeLite/dirtraverser.cpp
index 772bc69..df1a39d 100644
--- a/CodeLite/dirtraverser.cpp
+++ b/CodeLite/dirtraverser.cpp
@@ -1,79 +1,79 @@
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
//
-// copyright : (C) 2008 by Eran Ifrah
-// file name : dirtraverser.cpp
-//
+// copyright : (C) 2008 by Eran Ifrah
+// file name : dirtraverser.cpp
+//
// -------------------------------------------------------------------------
-// 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.
-//
+// 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.
+//
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
#include "dirtraverser.h"
-#include "wx/tokenzr.h"
-#include "wx/filename.h"
-#include "wx/log.h"
-
-DirTraverser::DirTraverser(const wxString &filespec, bool includeExtLessFiles)
- : wxDirTraverser()
- , m_filespec(filespec)
- , m_extlessFiles(includeExtLessFiles)
-{
- m_specArray = wxStringTokenize(filespec, wxT(";"), wxTOKEN_STRTOK);
-}
-
-wxDirTraverseResult DirTraverser::OnFile(const wxString& filename)
-{
- // add the file to our array
- wxFileName fn(filename);
-
- for(size_t i=0; i<m_specArray.GetCount(); i++){
- if(wxMatchWild(m_specArray.Item(i), fn.GetFullName())){
- m_files.Add(filename);
- return wxDIR_CONTINUE;
- }
- }
-
- // if we reached this point, no pattern was suitable for our file
- // test for extensionless file flag
- if (fn.GetExt().IsEmpty() && m_extlessFiles) {
- m_files.Add(filename);
- }
-
- return wxDIR_CONTINUE;
-}
-
-wxDirTraverseResult DirTraverser::OnDir(const wxString &dirname)
+#include "wx/tokenzr.h"
+#include "wx/filename.h"
+#include "wx/log.h"
+
+DirTraverser::DirTraverser(const wxString &filespec, bool includeExtLessFiles)
+ : wxDirTraverser()
+ , m_filespec(filespec)
+ , m_extlessFiles(includeExtLessFiles)
+{
+ m_specArray = wxStringTokenize(filespec, wxT(";"), wxTOKEN_STRTOK);
+}
+
+wxDirTraverseResult DirTraverser::OnFile(const wxString& filename)
{
- for (size_t i=0; i<m_excludeDirs.GetCount(); i++) {
- wxString tmpDir(dirname);
- tmpDir.Replace(wxT("\\"), wxT("/"));
- wxArrayString toks = wxStringTokenize(tmpDir, wxT("/"), wxTOKEN_STRTOK);
- wxString dir = m_excludeDirs.Item(i);
- wxString onlyDirName;
-
- if (toks.GetCount() > 0) {
- onlyDirName = toks.Last();
- }
-
- if (onlyDirName == dir) {
- return wxDIR_IGNORE;
- }
- }
- return wxDIR_CONTINUE;
+ // add the file to our array
+ wxFileName fn(filename);
+
+ for(size_t i=0; i<m_specArray.GetCount(); i++) {
+ if(wxMatchWild(m_specArray.Item(i), fn.GetFullName())) {
+ m_files.Add(filename);
+ return wxDIR_CONTINUE;
+ }
+ }
+
+ // if we reached this point, no pattern was suitable for our file
+ // test for extensionless file flag
+ if (fn.GetExt().IsEmpty() && m_extlessFiles) {
+ m_files.Add(filename);
+ }
+
+ return wxDIR_CONTINUE;
+}
+
+wxDirTraverseResult DirTraverser::OnDir(const wxString &dirname)
+{
+ for (size_t i=0; i<m_excludeDirs.GetCount(); i++) {
+ wxString tmpDir(dirname);
+ tmpDir.Replace(wxT("\\"), wxT("/"));
+ wxArrayString toks = wxStringTokenize(tmpDir, wxT("/"), wxTOKEN_STRTOK);
+ wxString dir = m_excludeDirs.Item(i);
+ wxString onlyDirName;
+
+ if (toks.GetCount() > 0) {
+ onlyDirName = toks.Last();
+ }
+
+ if (onlyDirName == dir) {
+ return wxDIR_IGNORE;
+ }
+ }
+ return wxDIR_CONTINUE;
}
DirTraverser::~DirTraverser()
diff --git a/CodeLite/dirtraverser.h b/CodeLite/dirtraverser.h
index 292343c..e97d25a 100644
--- a/CodeLite/dirtraverser.h
+++ b/CodeLite/dirtraverser.h
@@ -1,96 +1,99 @@
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
//
-// copyright : (C) 2008 by Eran Ifrah
-// file name : dirtraverser.h
-//
+// copyright : (C) 2008 by Eran Ifrah
+// file name : dirtraverser.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.
-//
+// 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.
+//
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
- #ifndef DIRTRAVERSER_H
-#define DIRTRAVERSER_H
-
-#include "codelite_exports.h"
-#include <wx/dir.h>
-#include <wx/arrstr.h>
+#ifndef DIRTRAVERSER_H
+#define DIRTRAVERSER_H
+
+#include "codelite_exports.h"
+#include <wx/dir.h>
+#include <wx/arrstr.h>
#include <map>
-
-/**
- * A helper class that help us recurse into sub-directories.
- * For each found directory, sink.OnDir() is called and sink.OnFile() is called for every file.
- * Depending on the return value, the enumeration may continue or stop of one of the files, the
- * recurse may stop.
- * \ingroup CodeLite
- * \version 1.0
- * first version
- * \date 11-08-2006
- * \author Eran
- */
-class WXDLLIMPEXP_CL DirTraverser : public wxDirTraverser
-{
- wxArrayString m_files;
- wxString m_filespec;
- wxArrayString m_specArray;
-
- bool m_extlessFiles;
- wxArrayString m_excludeDirs;
+
+/**
+ * A helper class that help us recurse into sub-directories.
+ * For each found directory, sink.OnDir() is called and sink.OnFile() is called for every file.
+ * Depending on the return value, the enumeration may continue or stop of one of the files, the
+ * recurse may stop.
+ * \ingroup CodeLite
+ * \version 1.0
+ * first version
+ * \date 11-08-2006
+ * \author Eran
+ */
+class WXDLLIMPEXP_CL DirTraverser : public wxDirTraverser
+{
+ wxArrayString m_files;
+ wxString m_filespec;
+ wxArrayString m_specArray;
+
+ bool m_extlessFiles;
+ wxArrayString m_excludeDirs;
public:
- /**
- * Construct a DirTraverser with a given file spec
- */
- DirTraverser(const wxString &filespec, bool includExtLessFiles = false);
- virtual ~DirTraverser();
-
- /**
- * This function is called once a file is found. The traverse of the directories
- * can be stopped based on the return value from this function:
- * - wxDIR_IGNORE = -1, // ignore this directory but continue with others
- * - wxDIR_STOP, // stop traversing
- * - wxDIR_CONTINUE // continue into this directory
- * \param filename name of the file that was found
... 2346 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2013-12-27 14:00:51
|
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 9d2a2c06e0b6098ba2588fea1f3ba924a679ac4b (commit)
from c8dc1c1f8c56ca4fc1a768c0d88e83743c1d5cc4 (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/9d2a2c06e0b6098ba2588fea1f3ba924a679ac4b
commit 9d2a2c06e0b6098ba2588fea1f3ba924a679ac4b
Author: dghart <da...@4P...>
Date: Fri Dec 27 13:52:24 2013 +0000
Make Move Line Up (and Down) work on any selected lines
Previously these commands (from the Alt-PGUP and Alt-PGDOWN shortcuts) did nothing if there was a selection. Now all the lines involved in the selection are moved.
NB this doesn't work cleanly for a rectangular selection; still, there _is_ an Undo button ;)
diff --git a/LiteEditor/menu_event_handlers.cpp b/LiteEditor/menu_event_handlers.cpp
index ced214c..fbbb3b8 100644
--- a/LiteEditor/menu_event_handlers.cpp
+++ b/LiteEditor/menu_event_handlers.cpp
@@ -144,16 +144,30 @@ void EditHandler::ProcessCommandEvent(wxWindow *owner, wxCommandEvent &event)
int curline = editor->GetCurrentLine();
int lastline = editor->LineFromPosition(editor->GetLength()-1);
- // Dont transpose if we reached end of the document
- if(curline == lastline)
- return;
- editor->LineDown();
- editor->LineTranspose();
+ if (editor->GetSelection().empty()
+ || (editor->LineFromPos(editor->GetSelectionStart() == editor->LineFromPos(editor->GetSelectionEnd())))) {
+ // No selection (or only a trivial 1-line one)
+ if (curline != lastline) {
+ editor->LineDown();
+ editor->LineTranspose();
+ }
+
+ } else {
+ editor->MoveSelectedLinesDown(); // There is a selection, so we can move it direct
+ }
} else if (event.GetId() == XRCID("move_line_up")) {
- editor->LineTranspose();
- editor->LineUp();
+
+ if (editor->GetSelection().empty()
+ || (editor->LineFromPos(editor->GetSelectionStart() == editor->LineFromPos(editor->GetSelectionEnd())))) {
+ // No selection (or only a trivial 1-line one)
+ editor->LineTranspose();
+ editor->LineUp();
+
+ } else {
+ editor->MoveSelectedLinesUp(); // There is a selection, so we can move it direct
+ }
} else if (event.GetId() == XRCID("center_line")) {
//editor->VerticalCentreCaret();
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/menu_event_handlers.cpp | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-27 06:42: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 c8dc1c1f8c56ca4fc1a768c0d88e83743c1d5cc4 (commit)
from c144defc40151a767ea63e0400cf5884996eae07 (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/c8dc1c1f8c56ca4fc1a768c0d88e83743c1d5cc4
commit c8dc1c1f8c56ca4fc1a768c0d88e83743c1d5cc4
Author: Eran <era...@gm...>
Date: Fri Dec 27 08:42:39 2013 +0200
Yet another minor tab darwing fix
diff --git a/Plugin/cl_aui_dock_art.cpp b/Plugin/cl_aui_dock_art.cpp
index 1ad23fb..4800d5e 100644
--- a/Plugin/cl_aui_dock_art.cpp
+++ b/Plugin/cl_aui_dock_art.cpp
@@ -104,7 +104,7 @@ void clAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window, const wxString& text,
} else {
bgColour = DrawingUtils::DarkColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), 2.0);
- penColour = DrawingUtils::DarkColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), 1.0);
+ penColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
textColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT);
}
}
@@ -112,7 +112,9 @@ void clAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window, const wxString& text,
memDc.SetPen( penColour );
memDc.SetBrush( bgColour );
memDc.DrawRectangle( tmpRect );
-
+ memDc.SetPen( bgColour );
+ memDc.DrawLine( tmpRect.GetBottomLeft(), tmpRect.GetBottomRight() );
+
int caption_offset = 0;
if ( pane.icon.IsOk() ) {
DrawIcon(memDc, tmpRect, pane);
diff --git a/Plugin/cl_aui_notebook_art.cpp b/Plugin/cl_aui_notebook_art.cpp
index dfe70b3..9c68904 100644
--- a/Plugin/cl_aui_notebook_art.cpp
+++ b/Plugin/cl_aui_notebook_art.cpp
@@ -20,7 +20,7 @@ static const wxDouble X_DIAMETER = 2 * X_RADIUS;
# define TEXT_Y_SPACER 0
#elif defined(__WXMSW__)
# define TAB_HEIGHT_SPACER 10
-# define TAB_Y_OFFSET 2
+# define TAB_Y_OFFSET 3
# define TEXT_Y_SPACER 0
#else // GTK/FreeBSD
# define TAB_Y_OFFSET 5
-----------------------------------------------------------------------
Summary of changes:
Plugin/cl_aui_dock_art.cpp | 6 ++++--
Plugin/cl_aui_notebook_art.cpp | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-27 06:24:46
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via c144defc40151a767ea63e0400cf5884996eae07 (commit)
via e62e8da22fe56d9bd70446fc10058c35272ad572 (commit)
from 16176ce55028512d2380ac3f2190a4da515621fc (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/c144defc40151a767ea63e0400cf5884996eae07
commit c144defc40151a767ea63e0400cf5884996eae07
Merge: e62e8da 16176ce
Author: Eran <era...@gm...>
Date: Fri Dec 27 08:24:16 2013 +0200
Merge branch 'master' of ssh://git.code.sf.net/p/codelite/codelitegit
# By dghart
# Via dghart
* 'master' of ssh://git.code.sf.net/p/codelite/codelitegit:
ReconcileProject: When not using the wizard, attempt to guess which new virtual directories need to be created
ReconcileProject: When files are added to the project, remove them from the still-to-be-allocated set
https://sourceforge.net/p/codelite/codelitegit/ci/e62e8da22fe56d9bd70446fc10058c35272ad572
commit e62e8da22fe56d9bd70446fc10058c35272ad572
Author: Eran <era...@gm...>
Date: Fri Dec 27 08:24:01 2013 +0200
Fixed: https://sourceforge.net/p/codelite/bugs/944/ - Creating new Project with same name as existing project silently overwrites
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
index bae11df..ac225f3 100644
--- a/LiteEditor/frame.cpp
+++ b/LiteEditor/frame.cpp
@@ -2124,12 +2124,11 @@ void clMainFrame::OnProjectNewProject(wxCommandEvent &event)
}
wxUnusedVar(event);
- NewProjectDlg *dlg = new NewProjectDlg(this);
- if (dlg->ShowModal() == wxID_OK) {
- ProjectData data = dlg->GetProjectData();
+ NewProjectDlg dlg(this);
+ if (dlg.ShowModal() == wxID_OK) {
+ ProjectData data = dlg.GetProjectData();
ManagerST::Get()->CreateProject(data);
}
- dlg->Destroy();
}
void clMainFrame::OnProjectAddProject(wxCommandEvent &event)
diff --git a/LiteEditor/newprojectdlg.cpp b/LiteEditor/newprojectdlg.cpp
index ae4171d..cb89207 100644
--- a/LiteEditor/newprojectdlg.cpp
+++ b/LiteEditor/newprojectdlg.cpp
@@ -201,7 +201,12 @@ void NewProjectDlg::OnCreate(wxCommandEvent &event)
wxMessageBox(_("Invalid path: ") + fn.GetPath(), _("Error"), wxOK | wxICON_HAND);
return;
}
-
+
+ if ( fn.Exists() ) {
+ ::wxMessageBox(_("A project with this name already exists. Please select a different name"), "codelite", wxICON_ERROR|wxOK|wxCENTER, this);
+ return;
+ }
+
// make sure that there is no conflict in files between the template project and the selected path
if (m_projectData.m_srcProject) {
ProjectPtr p = m_projectData.m_srcProject;
diff --git a/LiteEditor/wxcrafter.cpp b/LiteEditor/wxcrafter.cpp
index aa12981..b02c5a8 100644
--- a/LiteEditor/wxcrafter.cpp
+++ b/LiteEditor/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!
//////////////////////////////////////////////////////////////////////
@@ -101,7 +102,7 @@ NewProjectDlgBaseClass::NewProjectDlgBaseClass(wxWindow* parent, wxWindowID id,
m_stxtFullFileName = new wxStaticText(m_splitterPageLeft, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), 0);
- boxSizer11->Add(m_stxtFullFileName, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
+ boxSizer11->Add(m_stxtFullFileName, 0, wxALL|wxEXPAND|wxALIGN_LEFT, 5);
m_txtDescription = new wxTextCtrl(m_splitterPageLeft, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), wxTE_RICH2|wxTE_READONLY|wxTE_MULTILINE);
diff --git a/LiteEditor/wxcrafter.h b/LiteEditor/wxcrafter.h
index 6393503..12b591c 100644
--- a/LiteEditor/wxcrafter.h
+++ b/LiteEditor/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!
//////////////////////////////////////////////////////////////////////
diff --git a/LiteEditor/wxcrafter.wxcp b/LiteEditor/wxcrafter.wxcp
index 74f64c8..2455af0 100644
--- a/LiteEditor/wxcrafter.wxcp
+++ b/LiteEditor/wxcrafter.wxcp
@@ -1264,7 +1264,7 @@
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
- "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_HORIZONTAL"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_LEFT"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/frame.cpp | 7 +++----
LiteEditor/newprojectdlg.cpp | 7 ++++++-
LiteEditor/wxcrafter.cpp | 3 ++-
LiteEditor/wxcrafter.h | 1 +
LiteEditor/wxcrafter.wxcp | 2 +-
5 files changed, 13 insertions(+), 7 deletions(-)
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2013-12-26 20:17:13
|
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 16176ce55028512d2380ac3f2190a4da515621fc (commit)
via 5023145d9f0e2d290ad88ce222a06d270e2484cb (commit)
from 0b7312ee7d42cfc059c0ee085e7af13f5eb8a837 (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/16176ce55028512d2380ac3f2190a4da515621fc
commit 16176ce55028512d2380ac3f2190a4da515621fc
Author: dghart <da...@4P...>
Date: Thu Dec 26 20:04:24 2013 +0000
ReconcileProject: When not using the wizard, attempt to guess which new virtual directories need to be created
At present, if a new file has a path <Projectname>/foo/bar/baz, and there aren't VDirs for all of these, the user has to create each by hand. Instead, offer to create the missing VDs in VirtualDirectorySelectorDlg::OnNewVD.
diff --git a/LiteEditor/reconcileproject.cpp b/LiteEditor/reconcileproject.cpp
index 9983d2d..04b6e6b 100644
--- a/LiteEditor/reconcileproject.cpp
+++ b/LiteEditor/reconcileproject.cpp
@@ -360,7 +360,12 @@ wxBitmap ReconcileProjectDlg::GetBitmap(const wxString& filename) const
void ReconcileProjectDlg::OnAddFile(wxCommandEvent& event)
{
- VirtualDirectorySelectorDlg selector(this, WorkspaceST::Get(), "", m_projname);
+ wxString suggestedPath, suggestedName;
+ bool guessed = GuessNewVirtualDirName(suggestedPath, suggestedName);
+ VirtualDirectorySelectorDlg selector(this, WorkspaceST::Get(), suggestedPath, m_projname);
+ if (guessed) {
+ selector.SetSuggestedName(suggestedName);
+ }
if ( selector.ShowModal() == wxID_OK ) {
wxString vd = selector.GetVirtualDirectoryPath();
wxDataViewItemArray items;
@@ -390,6 +395,56 @@ void ReconcileProjectDlg::OnAddFile(wxCommandEvent& event)
}
}
+bool ReconcileProjectDlg::GuessNewVirtualDirName(wxString& suggestedPath, wxString& suggestedName) const
+{
+ wxDataViewItemArray items;
+ m_dvListCtrl1Unassigned->GetSelections(items);
+ if (!items.GetCount()) {
+ return false;
+ }
+
+ // Test only the first item. For this to be useful, all the selections must have the same destination anyway
+ wxVariant v;
+ m_dvListCtrl1Unassigned->GetValue(v, m_dvListCtrl1Unassigned->GetStore()->GetRow(items.Item(0)), 0);
+
+ wxString path;
+ wxDataViewIconText iv;
+ if ( !v.IsNull() ) {
+ iv << v;
+ path = iv.GetText();
+ }
+
+ wxFileName fn(path);
+ fn.MakeAbsolute(m_toplevelDir);
+
+ VirtualDirectoryTree vdTree;
+ vdTree.BuildTree(m_projname);
+ wxString residue;
+ do {
+ wxString virtualFolder = vdTree.FindBestMatchVDir(fn.GetPath(), fn.GetExt());
+ if (!virtualFolder.empty()) {
+ suggestedPath = fn.GetPath();
+ suggestedName = residue;
+ return true;
+ }
+
+ wxString pathend = fn.GetPath().AfterLast(wxFILE_SEP_PATH);
+ if (pathend == m_projname) {
+ suggestedPath = pathend;
+ suggestedName = residue;
+ return true;
+ }
+
+ if (!residue.empty()) {
+ residue = ':' + residue;
+ }
+ residue = pathend + residue; // Save the name(s) of missing VDs
+ fn.RemoveLastDir();
+ } while (fn.GetDirCount());
+
+ return false;
+}
+
void ReconcileProjectDlg::OnAddFileUI(wxUpdateUIEvent& event)
{
event.Enable(m_dvListCtrl1Unassigned->GetSelectedItemsCount());
diff --git a/LiteEditor/reconcileproject.h b/LiteEditor/reconcileproject.h
index 8d844db..7793e58 100644
--- a/LiteEditor/reconcileproject.h
+++ b/LiteEditor/reconcileproject.h
@@ -68,6 +68,7 @@ protected:
protected:
void DoFindFiles();
wxBitmap GetBitmap(const wxString &filename) const;
+ bool GuessNewVirtualDirName(wxString& suggestedPath, wxString& suggestedName) const;
public:
ReconcileProjectDlg(wxWindow* parent, const wxString& projname);
diff --git a/Plugin/VirtualDirectorySelectorDlg.cpp b/Plugin/VirtualDirectorySelectorDlg.cpp
index cb21a34..1dfec30 100644
--- a/Plugin/VirtualDirectorySelectorDlg.cpp
+++ b/Plugin/VirtualDirectorySelectorDlg.cpp
@@ -249,18 +249,20 @@ void VirtualDirectorySelectorDlg::OnNewVD(wxCommandEvent& event)
return;
wxString curpath = DoGetPath(m_treeCtrl, id, false);
- wxString name;
- name << "Folder" << ++counter;
+ wxString name = m_suggestedName;
+ if (name.empty()) {
+ name << "Folder" << ++counter;
+ }
wxString newname = wxGetTextFromUser(_("New Virtual Folder Name:"), _("New Virtual Folder"), name);
newname.Trim().Trim(false);
if ( newname.IsEmpty() )
return;
- if ( newname.Contains(":") ) {
+/* if ( newname.Contains(":") ) { // No, don't check this: we may have been passed a multi-segment path, or be trying to create one
wxMessageBox(_("':' is not a valid virtual folder character"), "codelite");
return;
- }
+ }*/
curpath << ":" << newname;
wxString errmsg;
diff --git a/Plugin/VirtualDirectorySelectorDlg.h b/Plugin/VirtualDirectorySelectorDlg.h
index 34c989f..b9e56a0 100644
--- a/Plugin/VirtualDirectorySelectorDlg.h
+++ b/Plugin/VirtualDirectorySelectorDlg.h
@@ -37,6 +37,7 @@ class WXDLLIMPEXP_SDK VirtualDirectorySelectorDlg : public VirtualDirectorySelec
Workspace * m_workspace;
wxString m_projectName;
wxString m_initialPath;
+ wxString m_suggestedName;
wxImageList *m_images;
bool m_reloadTreeNeeded;
@@ -64,6 +65,9 @@ public:
}
bool SelectPath(const wxString &path);
void SetText(const wxString& text);
+ void SetSuggestedName(const wxString& suggestedName) {
+ m_suggestedName = suggestedName;
+ }
};
#endif // VIRTUALDIRECTORYSELECTORDLG_H
https://sourceforge.net/p/codelite/codelitegit/ci/5023145d9f0e2d290ad88ce222a06d270e2484cb
commit 5023145d9f0e2d290ad88ce222a06d270e2484cb
Author: dghart <da...@4P...>
Date: Wed Dec 25 15:36:28 2013 +0000
ReconcileProject: When files are added to the project, remove them from the still-to-be-allocated set
Before, it was possible to add a file to the project more than once, as follows:
Select one or more files, click the wizard button, then Apply(all). Now anything that results in the Available Files pane being refreshed e.g. selecting another file and click the wizard, would make the allocated files reappear, so they could be selected again and...
diff --git a/LiteEditor/reconcileproject.cpp b/LiteEditor/reconcileproject.cpp
index 3d61c52..9983d2d 100644
--- a/LiteEditor/reconcileproject.cpp
+++ b/LiteEditor/reconcileproject.cpp
@@ -528,8 +528,15 @@ void ReconcileProjectDlg::OnApply(wxCommandEvent& event)
for( ; from != range.second; ++from ) {
vdFiles.Add( from->second );
}
- AddMissingFiles(vdFiles, *iter);
- m_projectModified = true;
+ wxArrayString additions = AddMissingFiles(vdFiles, *iter);
+
+ if (additions.GetCount()) {
+ m_projectModified = true;
+ }
+ // We must also remove the processed files from m_newfiles, otherwise a rerun of the wizard will offer them for insertion again
+ for (size_t n=0; n < additions.GetCount(); ++n ) {
+ m_newfiles.erase(additions.Item(n));
+ }
}
m_dataviewAssignedModel->DeleteItems( wxDataViewItem(0), items );
}
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/reconcileproject.cpp | 68 ++++++++++++++++++++++++++++++-
LiteEditor/reconcileproject.h | 1 +
Plugin/VirtualDirectorySelectorDlg.cpp | 10 +++--
Plugin/VirtualDirectorySelectorDlg.h | 4 ++
4 files changed, 76 insertions(+), 7 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-26 16:55:31
|
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 0b7312ee7d42cfc059c0ee085e7af13f5eb8a837 (commit)
from b63a329ba8e4e7415f7eb6edb89d0a31f4ba526d (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/0b7312ee7d42cfc059c0ee085e7af13f5eb8a837
commit 0b7312ee7d42cfc059c0ee085e7af13f5eb8a837
Author: Eran <era...@gm...>
Date: Thu Dec 26 18:53:47 2013 +0200
Fixed: Call event.Skip() in BookmarkManager to make sure that the OnEditorSettingsChanged event will propogate to other classes of the IDE that handles this event
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index ac7c81d..69bcbb4 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -43,7 +43,7 @@
</Environment>
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
@@ -111,7 +111,7 @@
<Project Name="CallGraph" ConfigName="WinDebugUnicode"/>
<Project Name="abbreviation" 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/bookmark_manager.cpp b/Plugin/bookmark_manager.cpp
index f4451e4..8e486d3 100644
--- a/Plugin/bookmark_manager.cpp
+++ b/Plugin/bookmark_manager.cpp
@@ -25,7 +25,7 @@ BookmarkManager& BookmarkManager::Get()
void BookmarkManager::OnEditorSettingsChanged(wxCommandEvent& e)
{
- wxUnusedVar(e);
+ e.Skip();
DoPopulateDefaultLabels();
OptionsConfigPtr options = EditorConfigST::Get()->GetOptions();
for(int i=smt_FIRST_BMK_TYPE; i<=smt_LAST_BMK_TYPE; ++i) {
-----------------------------------------------------------------------
Summary of changes:
LiteEditor.workspace | 4 ++--
Plugin/bookmark_manager.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-26 09:42:37
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via b63a329ba8e4e7415f7eb6edb89d0a31f4ba526d (commit)
from 4af116f6b39d4f2adfd3040983c21cd6beac9fe0 (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/b63a329ba8e4e7415f7eb6edb89d0a31f4ba526d
commit b63a329ba8e4e7415f7eb6edb89d0a31f4ba526d
Author: Eran <era...@gm...>
Date: Thu Dec 26 11:42:05 2013 +0200
Fixed: CMake sytanx highlight for the dark themes
Fixed: C++ lexer should now handle hxx and h++ header files as C++ files
Fixed: ensure that cmake lexer will colour properly CMakeLists.txt file
diff --git a/CodeLite/tags_options_data.cpp b/CodeLite/tags_options_data.cpp
index 7b3fc87..54de0ae 100644
--- a/CodeLite/tags_options_data.cpp
+++ b/CodeLite/tags_options_data.cpp
@@ -134,7 +134,7 @@ TagsOptionsData::TagsOptionsData()
: clConfigItem("code-completion")
, m_ccFlags (CC_DISP_FUNC_CALLTIP | CC_LOAD_EXT_DB | CC_CPP_KEYWORD_ASISST | CC_COLOUR_VARS | CC_ACCURATE_SCOPE_RESOLVING | CC_PARSE_EXT_LESS_FILES)
, m_ccColourFlags (CC_COLOUR_DEFAULT)
- , m_fileSpec(wxT ("*.cpp;*.cc;*.cxx;*.h;*.hpp;*.c;*.c++;*.tcc"))
+ , m_fileSpec(wxT ("*.cpp;*.cc;*.cxx;*.h;*.hpp;*.c;*.c++;*.tcc;*.hxx;*.h++"))
, m_minWordLen (3)
, m_parserEnabled (true)
, m_maxItemToColour(1000)
@@ -440,7 +440,7 @@ void TagsOptionsData::FromJSON(const JSONElement& json)
m_ccColourFlags = json.namedObject(wxT("m_ccColourFlags")).toSize_t();
m_tokens = json.namedObject(wxT("m_tokens")).toArrayString();
m_types = json.namedObject(wxT("m_types")).toArrayString();
- m_fileSpec = json.namedObject(wxT("m_fileSpec")).toString();
+ m_fileSpec = json.namedObject(wxT("m_fileSpec")).toString(m_fileSpec);
m_languages = json.namedObject(wxT("m_languages")).toArrayString();
m_minWordLen = json.namedObject(wxT("m_minWordLen")).toInt();
m_parserSearchPaths = json.namedObject(wxT("m_parserSearchPaths")).toArrayString();
@@ -455,6 +455,10 @@ void TagsOptionsData::FromJSON(const JSONElement& json)
m_clangMacros = json.namedObject(wxT("m_clangMacros")).toString();
m_clangCachePolicy = json.namedObject(wxT("m_clangCachePolicy")).toString();
m_ccNumberOfDisplayItems = json.namedObject(wxT("m_ccNumberOfDisplayItems")).toSize_t();
+
+ if ( !m_fileSpec.Contains("*.hxx") ) {
+ m_fileSpec = "*.cpp;*.cc;*.cxx;*.h;*.hpp;*.c;*.c++;*.tcc;*.hxx;*.h++";
+ }
DoUpdateTokensWxMapReversed();
DoUpdateTokensWxMap();
diff --git a/Plugin/editor_config.cpp b/Plugin/editor_config.cpp
index 8e72e12..5df24d7 100644
--- a/Plugin/editor_config.cpp
+++ b/Plugin/editor_config.cpp
@@ -464,15 +464,13 @@ void EditorConfig::LoadLexers(bool loadDefault)
DirSaver ds;
wxSetWorkingDirectory(wxStandardPaths::Get().GetDataDir() + wxFileName::GetPathSeparator() + wxT("lexers"));
- wxString cwd = wxGetCwd();
+ wxString cwd = ::wxGetCwd();
// load all lexer configuration files
wxArrayString files;
wxDir::GetAllFiles(cwd, &files,wxT("*.xml"), wxDIR_FILES);
wxString path_( cwd + wxFileName::GetPathSeparator() );
- m_lexers.clear();
-
LexersInfo *pLexersInfo = NULL;
m_lexers.clear();
@@ -489,12 +487,11 @@ void EditorConfig::LoadLexers(bool loadDefault)
fn.GetFullName());
if ( wxFileName::FileExists( userLexer ) ) {
- if (!loadDefault) {
+ if ( !loadDefault ) {
fileToLoad = userLexer;
} else {
- // backup the old file
- wxRemoveFile(userLexer);
+ ::wxRemoveFile( userLexer );
}
}
diff --git a/Plugin/lexer_configuration.cpp b/Plugin/lexer_configuration.cpp
index 1241192..f6422fc 100644
--- a/Plugin/lexer_configuration.cpp
+++ b/Plugin/lexer_configuration.cpp
@@ -83,6 +83,20 @@ void LexerConf::FromXml(wxXmlNode *element)
node = XmlUtils::FindFirstByTagName(element, wxT("Extensions"));
if( node ) {
m_extension = node->GetNodeContent();
+
+ // Make sure that C++ lexer includes the hxx and h++ header extension
+ if ( m_lexerId == wxSTC_LEX_CPP ) { // C++ lexer
+ if ( !m_extension.Contains("*.hxx") ) {
+ m_extension = "*.cxx;*.hpp;*.cc;*.h;*.c;*.cpp;*.l;*.y;*.c++;*.hh;*.js;*.javascript;*.ipp;*.hxx;*.h++";
+ }
+ }
+
+ // Make sure that CMake includes the CMakeLists.txt file
+ if ( m_lexerId == wxSTC_LEX_CMAKE ) {
+ if ( !m_extension.Contains("CMakeLists.txt") ) {
+ m_extension = "*.cmake;*.CMAKE;*CMakeLists.txt";
+ }
+ }
}
// load properties
@@ -268,7 +282,7 @@ void LexerConf::Apply(wxStyledTextCtrl* ctrl, bool applyKeywords)
}
}
- if (foundDefaultStyle) {
+ if ( foundDefaultStyle && defaultFont.IsOk() ) {
for(int i=0; i<256; i++) {
ctrl->StyleSetFont(i, defaultFont);
}
diff --git a/Runtime/lexers/lexers_black.xml b/Runtime/lexers/lexers_black.xml
index 75fa5b1..8261b5c 100644
--- a/Runtime/lexers/lexers_black.xml
+++ b/Runtime/lexers/lexers_black.xml
@@ -35,37 +35,37 @@
<Property Id="38" Name="Calltip" Bold="no" Face="" Colour="#C0C0C0" BgColour="#FFFFFF" Italic="no" Underline="no" Size="11"/>
</Properties>
</Lexer>
- <Lexer Name="CMake" StylingWithinPreProcessor="yes" Id="80">
+ <Lexer Name="cmake" StylingWithinPreProcessor="yes" Id="80">
<KeyWords0>add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_subdirectory add_test aux_source_directory build_command build_name cmake_minimum_required configure_file create_test_sourcelist else elseif enable_language enable_testing endforeach endfunction endif endmacro endwhile exec_program execute_process export_library_dependencies file find_file find_library find_package find_path find_program fltk_wrap_ui foreach function get_cmake_property get_directory_property get_filename_component get_source_file_property get_target_property get_test_property if include include_directories include_external_msproject include_regular_expression install install_files install_programs install_targets link_directories link_libraries list load_cache load_command macro make_directory mark_as_advanced math message option output_required_files project qt_wrap_cpp qt_wrap_ui remove remove_definitions separate_arguments set set_directory_properties set_source_files_properties set_target_properties set_tests_properties site_name source_group string subdir_depends subdirs target_link_libraries try_compile try_run unset use_mangled_mesa utility_source variable_requires vtk_make_instantiator vtk_wrap_java vtk_wrap_python vtk_wrap_tcl while write_file</KeyWords0>
<KeyWords1/>
<KeyWords2/>
<KeyWords3/>
<KeyWords4/>
- <Extensions>*.cmake;*.CMAKE</Extensions>
+ <Extensions>*.cmake;*.CMAKE;CMakeLists.txt</Extensions>
<Properties>
- <Property Id="0" Name="Default" Bold="no" Face="" Colour="#808080" BgColour="#FFFFFF" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="1" Name="Comment" Bold="no" Face="" Colour="#808080" BgColour="white" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="2" Name="String DQ" Bold="no" Face="" Colour="#804040" BgColour="gold" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="3" Name="String LQ" Bold="no" Face="" Colour="#0000A0" BgColour="gold" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="4" Name="String RQ" Bold="no" Face="" Colour="#0000A0" BgColour="gold" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="5" Name="Commands" Bold="no" Face="" Colour="blue" BgColour="white" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="6" Name="Parameters" Bold="no" Face="" Colour="#006400" BgColour="#D0F4D0" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="7" Name="Variables" Bold="no" Face="" Colour="#006400" BgColour="#D0F4D0" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="8" Name="UserDefined" Bold="no" Face="" Colour="#006400" BgColour="#D0F4D0" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="9" Name="While Def" Bold="no" Face="" Colour="#006400" BgColour="#D0F4D0" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="10" Name="Foreach Def" Bold="no" Face="" Colour="#006400" BgColour="#D0F4D0" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="11" Name="If Defined Def" Bold="no" Face="" Colour="#006400" BgColour="#D0F4D0" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="12" Name="Macro Def" Bold="no" Face="" Colour="#006400" BgColour="#D0F4D0" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="13" Name="String Var" Bold="no" Face="" Colour="#006400" BgColour="#D0F4D0" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="14" Name="Number" Bold="no" Face="" Colour="#006400" BgColour="#D0F4D0" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="-1" Name="Fold Margin" Bold="no" Face="" Colour="#FFFFFF" BgColour="#D0D0D0" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="-2" Name="Text Selection" Bold="no" Face="" Colour="" BgColour="#D6D2D0" Italic="no" Underline="no" EolFilled="no" Alpha="80" Size="11"/>
- <Property Id="-3" Name="Caret Colour" Bold="no" Face="" Colour="" BgColour="" Italic="no" Underline="no" Size="11"/>
- <Property Id="-4" Name="Whitespace" Bold="no" Face="" Colour="" BgColour="" Italic="no" Underline="no" Size="11"/>
- <Property Id="33" Name="Line Numbers" Bold="no" Face="" Colour="" BgColour="" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="34" Name="Brace match" Bold="yes" Face="" Colour="#000000" BgColour="#80FFFF" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="35" Name="Brace bad match" Bold="no" Face="" Colour="red" BgColour="white" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="37" Name="Indent Guide" Bold="no" Face="" Colour="#C0C0C0" BgColour="#FFFFFF" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="0" Name="Default" Bold="no" Face="" Colour="#DADADA" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="1" Name="Comment" Bold="no" Face="" Colour="#808080" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="2" Name="String DQ" Bold="no" Face="" Colour="#F09812" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="3" Name="String LQ" Bold="no" Face="" Colour="#D9B259" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="4" Name="String RQ" Bold="no" Face="" Colour="#FA9B54" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="5" Name="Commands" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="6" Name="Parameters" Bold="no" Face="" Colour="#FB81ED" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="7" Name="Variables" Bold="no" Face="" Colour="#FB81ED" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="8" Name="UserDefined" Bold="no" Face="" Colour="#9CDA9C" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="9" Name="While Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="10" Name="Foreach Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="11" Name="If Defined Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="12" Name="Macro Def" Bold="no" Face="" Colour="#08DBD1" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="13" Name="String Var" Bold="no" Face="" Colour="#F1EF6F" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="14" Name="Number" Bold="no" Face="" Colour="#006400" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="-1" Name="Fold Margin" Bold="no" Face="" Colour="#FFFFFF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="-2" Name="Text Selection" Bold="no" Face="" Colour="" BgColour="#676767" Italic="no" Underline="no" EolFilled="no" Alpha="80" Size="11"/>
+ <Property Id="-3" Name="Caret Colour" Bold="no" Face="" Colour="#FFFFFF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="-4" Name="Whitespace" Bold="no" Face="" Colour="" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="33" Name="Line Numbers" Bold="no" Face="" Colour="" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="34" Name="Brace match" Bold="yes" Face="" Colour="#FFFF00" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="35" Name="Brace bad match" Bold="no" Face="" Colour="red" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="37" Name="Indent Guide" Bold="no" Face="" Colour="#C0C0C0" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
</Properties>
</Lexer>
@@ -142,7 +142,7 @@ subpage subsection subsubsection test throw todo tparam typedef union until var
</KeyWords2>
<KeyWords3></KeyWords3>
<KeyWords4></KeyWords4>
- <Extensions>*.cxx;*.hpp;*.cc;*.h;*.c;*.cpp;*.l;*.y;*.js;*.javascript;*.ipp</Extensions>
+ <Extensions>*.cxx;*.hpp;*.cc;*.h;*.c;*.cpp;*.l;*.y;*.c++;*.hh;*.js;*.javascript;*.ipp;*.hxx;*.h++</Extensions>
<Properties>
<Property Id="0" Name="Default" Bold="no" Face="" Colour="#808080" BgColour="#000000" Size="11"/>
<Property Id="1" Name="Common C style comment" Bold="no" Face="" Colour="#00FF00" BgColour="#000000" Size="11"/>
diff --git a/Runtime/lexers/lexers_default.xml b/Runtime/lexers/lexers_default.xml
index 7293302..1181813 100644
--- a/Runtime/lexers/lexers_default.xml
+++ b/Runtime/lexers/lexers_default.xml
@@ -66,7 +66,7 @@
<KeyWords2>a addindex addtogroup anchor arg attention author b brief bug c callgraph callergraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup internal invariant interface latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem </KeyWords2>
<KeyWords3/>
<KeyWords4/>
- <Extensions>*.cxx;*.hpp;*.cc;*.h;*.c;*.cpp;*.l;*.y;*.c++;*.hh;*.js;*.javascript;*.ipp</Extensions>
+ <Extensions>*.cxx;*.hpp;*.cc;*.h;*.c;*.cpp;*.l;*.y;*.c++;*.hh;*.js;*.javascript;*.ipp;*.hxx;*.h++</Extensions>
<Properties>
<Property Id="0" Name="Default" Bold="no" Face="" Colour="#808080" BgColour="#FFFFFF" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
<Property Id="1" Name="Common C style comment" Bold="no" Face="" Colour="#0080C0" BgColour="#FFFFFF" Italic="yes" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
diff --git a/Runtime/lexers/lexers_zmrok.xml b/Runtime/lexers/lexers_zmrok.xml
index 6c8549a..eb337d8 100644
--- a/Runtime/lexers/lexers_zmrok.xml
+++ b/Runtime/lexers/lexers_zmrok.xml
@@ -1,36 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<Lexers Theme="Zmrok-like" OutputView_Fg_Colour="#F8F8F8" OutputView_Bg_Colour="#141414">
- <Lexer Name="CMake" StylingWithinPreProcessor="yes" Id="80">
+ <Lexer Name="cmake" StylingWithinPreProcessor="yes" Id="80">
<KeyWords0>add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_subdirectory add_test aux_source_directory build_command build_name cmake_minimum_required configure_file create_test_sourcelist else elseif enable_language enable_testing endforeach endfunction endif endmacro endwhile exec_program execute_process export_library_dependencies file find_file find_library find_package find_path find_program fltk_wrap_ui foreach function get_cmake_property get_directory_property get_filename_component get_source_file_property get_target_property get_test_property if include include_directories include_external_msproject include_regular_expression install install_files install_programs install_targets link_directories link_libraries list load_cache load_command macro make_directory mark_as_advanced math message option output_required_files project qt_wrap_cpp qt_wrap_ui remove remove_definitions separate_arguments set set_directory_properties set_source_files_properties set_target_properties set_tests_properties site_name source_group string subdir_depends subdirs target_link_libraries try_compile try_run unset use_mangled_mesa utility_source variable_requires vtk_make_instantiator vtk_wrap_java vtk_wrap_python vtk_wrap_tcl while write_file</KeyWords0>
<KeyWords1/>
<KeyWords2/>
<KeyWords3/>
<KeyWords4/>
- <Extensions>*.cmake;*.CMAKE</Extensions>
+ <Extensions>*.cmake;*.CMAKE;CMakeLists.txt</Extensions>
<Properties>
- <Property Id="0" Name="Default" Bold="no" Face="" Colour="#808080" BgColour="#141414" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="1" Name="Comment" Bold="no" Face="" Colour="#808080" BgColour="white" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="2" Name="String DQ" Bold="no" Face="" Colour="#804040" BgColour="gold" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="3" Name="String LQ" Bold="no" Face="" Colour="#0000A0" BgColour="gold" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="4" Name="String RQ" Bold="no" Face="" Colour="#0000A0" BgColour="gold" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="5" Name="Commands" Bold="no" Face="" Colour="blue" BgColour="white" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="6" Name="Parameters" Bold="no" Face="" Colour="#006400" BgColour="#141414" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="7" Name="Variables" Bold="no" Face="" Colour="#006400" BgColour="#141414" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="8" Name="UserDefined" Bold="no" Face="" Colour="#006400" BgColour="#141414" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="9" Name="While Def" Bold="no" Face="" Colour="#006400" BgColour="#141414" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="10" Name="Foreach Def" Bold="no" Face="" Colour="#006400" BgColour="#141414" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="11" Name="If Defined Def" Bold="no" Face="" Colour="#006400" BgColour="#141414" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="12" Name="Macro Def" Bold="no" Face="" Colour="#006400" BgColour="#141414" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="13" Name="String Var" Bold="no" Face="" Colour="#006400" BgColour="#141414" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="14" Name="Number" Bold="no" Face="" Colour="#006400" BgColour="#141414" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
- <Property Id="-1" Name="Fold Margin" Bold="no" Face="" Colour="#FFFFFF" BgColour="#141414" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="-2" Name="Text Selection" Bold="no" Face="" Colour="" BgColour="#404040" Italic="no" Underline="no" EolFilled="no" Alpha="80" Size="11"/>
- <Property Id="-3" Name="Caret Colour" Bold="no" Face="" Colour="" BgColour="" Italic="no" Underline="no" Size="11"/>
- <Property Id="-4" Name="Whitespace" Bold="no" Face="" Colour="" BgColour="" Italic="no" Underline="no" Size="11"/>
- <Property Id="33" Name="Line Numbers" Bold="no" Face="" Colour="" BgColour="" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="34" Name="Brace match" Bold="yes" Face="" Colour="#000000" BgColour="#141414" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="35" Name="Brace bad match" Bold="no" Face="" Colour="red" BgColour="white" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
- <Property Id="37" Name="Indent Guide" Bold="no" Face="" Colour="#C0C0C0" BgColour="#141414" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="0" Name="Default" Bold="no" Face="" Colour="#DADADA" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="1" Name="Comment" Bold="no" Face="" Colour="#808080" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="2" Name="String DQ" Bold="no" Face="" Colour="#F09812" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="3" Name="String LQ" Bold="no" Face="" Colour="#D9B259" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="4" Name="String RQ" Bold="no" Face="" Colour="#FA9B54" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="5" Name="Commands" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="6" Name="Parameters" Bold="no" Face="" Colour="#FB81ED" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="7" Name="Variables" Bold="no" Face="" Colour="#FB81ED" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="8" Name="UserDefined" Bold="no" Face="" Colour="#9CDA9C" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="9" Name="While Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="10" Name="Foreach Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="11" Name="If Defined Def" Bold="no" Face="" Colour="#00C5FF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="12" Name="Macro Def" Bold="no" Face="" Colour="#08DBD1" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="13" Name="String Var" Bold="no" Face="" Colour="#F1EF6F" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="14" Name="Number" Bold="no" Face="" Colour="#006400" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="yes" Alpha="50" Size="11"/>
+ <Property Id="-1" Name="Fold Margin" Bold="no" Face="" Colour="#FFFFFF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="-2" Name="Text Selection" Bold="no" Face="" Colour="" BgColour="#676767" Italic="no" Underline="no" EolFilled="no" Alpha="80" Size="11"/>
+ <Property Id="-3" Name="Caret Colour" Bold="no" Face="" Colour="#FFFFFF" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="-4" Name="Whitespace" Bold="no" Face="" Colour="" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="33" Name="Line Numbers" Bold="no" Face="" Colour="" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="34" Name="Brace match" Bold="yes" Face="" Colour="#FFFF00" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="35" Name="Brace bad match" Bold="no" Face="" Colour="red" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
+ <Property Id="37" Name="Indent Guide" Bold="no" Face="" Colour="#C0C0C0" BgColour="#2D2828" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
</Properties>
</Lexer>
<Lexer Name="Assembly" StylingWithinPreProcessor="yes" Id="34">
@@ -99,7 +99,7 @@
<KeyWords2>a addindex addtogroup anchor arg attention author b brief bug c callgraph callergraph category class code cond copybrief copydetails copydoc date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endlatexonly endlink endmanonly endmsc endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup internal invariant interface latexonly li line link mainpage manonly memberof msc n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref relates relatesalso remarks return retval sa section see showinitializer since skip skipline struct subpage subsection subsubsection test throw todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem </KeyWords2>
<KeyWords3/>
<KeyWords4/>
- <Extensions>*.cxx;*.hpp;*.cc;*.h;*.c;*.cpp;*.l;*.y;*.js;*.javascript;*.ipp</Extensions>
+ <Extensions>*.cxx;*.hpp;*.cc;*.h;*.c;*.cpp;*.l;*.y;*.c++;*.hh;*.js;*.javascript;*.ipp;*.hxx;*.h++</Extensions>
<Properties>
<Property Id="0" Name="Default" Bold="no" Face="" Colour="#4A4A4A" BgColour="#141414" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
<Property Id="1" Name="Common C style comment" Bold="no" Face="" Colour="#888888" BgColour="#141414" Italic="no" Underline="no" EolFilled="no" Alpha="50" Size="11"/>
-----------------------------------------------------------------------
Summary of changes:
CodeLite/tags_options_data.cpp | 8 ++++-
Plugin/editor_config.cpp | 9 ++----
Plugin/lexer_configuration.cpp | 16 ++++++++++-
Runtime/lexers/lexers_black.xml | 52 ++++++++++++++++++------------------
Runtime/lexers/lexers_default.xml | 2 +-
Runtime/lexers/lexers_zmrok.xml | 52 ++++++++++++++++++------------------
6 files changed, 77 insertions(+), 62 deletions(-)
hooks/post-receive
--
codelite
|
