Menu
▾
▴
codelite-svn — Commit logs
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(104) |
Aug
(140) |
Sep
(148) |
Oct
(135) |
Nov
(130) |
Dec
(166) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(108) |
Feb
(38) |
Mar
(16) |
Apr
(19) |
May
(18) |
Jun
(25) |
Jul
(24) |
Aug
(17) |
Sep
(177) |
Oct
(192) |
Nov
(150) |
Dec
(163) |
| 2010 |
Jan
(103) |
Feb
(126) |
Mar
(197) |
Apr
(43) |
May
(9) |
Jun
(34) |
Jul
(121) |
Aug
(142) |
Sep
(60) |
Oct
(113) |
Nov
(87) |
Dec
(62) |
| 2011 |
Jan
(40) |
Feb
(36) |
Mar
(13) |
Apr
(20) |
May
(17) |
Jun
(151) |
Jul
(48) |
Aug
(39) |
Sep
(39) |
Oct
(107) |
Nov
(150) |
Dec
(35) |
| 2012 |
Jan
(24) |
Feb
(18) |
Mar
(19) |
Apr
(57) |
May
(76) |
Jun
(41) |
Jul
(45) |
Aug
(119) |
Sep
(119) |
Oct
(32) |
Nov
(38) |
Dec
(112) |
| 2013 |
Jan
(142) |
Feb
(2) |
Mar
|
Apr
(40) |
May
(42) |
Jun
(47) |
Jul
(60) |
Aug
(55) |
Sep
(83) |
Oct
(78) |
Nov
(40) |
Dec
(106) |
| 2014 |
Jan
(65) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Eran I. <no...@so...> - 2014-01-06 12:24:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 934609332a1b063343d58cefe5fe12eb80aa27ad (commit)
from e206e5a47381ba8542a7e0d55acdead877a217c1 (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/934609332a1b063343d58cefe5fe12eb80aa27ad
commit 934609332a1b063343d58cefe5fe12eb80aa27ad
Author: Eran <era...@gm...>
Date: Mon Jan 6 14:19:02 2014 +0200
Fixed undefined symbol when using native book API
diff --git a/Plugin/gtk_notebook_ex.cpp b/Plugin/gtk_notebook_ex.cpp
index 5ee7bab..53f8daf 100644
--- a/Plugin/gtk_notebook_ex.cpp
+++ b/Plugin/gtk_notebook_ex.cpp
@@ -178,12 +178,7 @@ void Notebook::SetSelection(size_t page, bool notify)
}
-size_t Notebook::GetSelection()
-{
- return static_cast<size_t>(wxNotebook::GetSelection());
-}
-
-wxWindow* Notebook::GetPage(size_t page)
+wxWindow* Notebook::GetPage(size_t page) const
{
if (page >= GetPageCount())
return NULL;
@@ -302,7 +297,7 @@ void Notebook::SetRightClickMenu(wxMenu* menu)
m_contextMenu = menu;
}
-wxWindow* Notebook::GetCurrentPage()
+wxWindow* Notebook::GetCurrentPage() const
{
size_t selection = GetSelection();
if (selection != Notebook::npos) {
@@ -311,7 +306,7 @@ wxWindow* Notebook::GetCurrentPage()
return NULL;
}
-size_t Notebook::GetPageIndex(wxWindow *page)
+size_t Notebook::GetPageIndex(wxWindow *page) const
{
if ( !page )
return Notebook::npos;
@@ -324,7 +319,7 @@ size_t Notebook::GetPageIndex(wxWindow *page)
return Notebook::npos;
}
-size_t Notebook::GetPageIndex(const wxString& text)
+size_t Notebook::GetPageIndex(const wxString& text) const
{
for (size_t i=0; i< GetPageCount(); i++) {
diff --git a/Plugin/gtk_notebook_ex.h b/Plugin/gtk_notebook_ex.h
index 3a52281..54cefbf 100644
--- a/Plugin/gtk_notebook_ex.h
+++ b/Plugin/gtk_notebook_ex.h
@@ -76,7 +76,7 @@ class Notebook : public wxNotebook
public:
- static const size_t npos = static_cast<size_t>(-1);
+ static const size_t npos = static_cast<size_t>(wxNOT_FOUND);
protected:
void Initialize();
@@ -106,12 +106,6 @@ public:
virtual ~Notebook();
/**
- * \brief return the currently selected item index
- * \return the currently selected item, of the book is empty, return Notebook::npos
- */
- size_t GetSelection();
-
- /**
* \brief set page at given index to be the selected page. this function does not trigger an event
* \param page
*/
@@ -131,7 +125,7 @@ public:
* \param page page's index
* \return the page or NULL if index is out of bounds
*/
- wxWindow *GetPage(size_t page);
+ wxWindow *GetPage(size_t page) const ;
/**
* \brief return the page caption
@@ -176,21 +170,21 @@ public:
* \brief return the active page
* \return active page or NULL if there are no pages in the book
*/
- wxWindow *GetCurrentPage();
+ wxWindow *GetCurrentPage() const ;
/**
* \brief return page index by window pointer
* \param page page to search
* \return page index, or Notebook::npos if page does not exist in the notebook
*/
- size_t GetPageIndex(wxWindow *page);
+ size_t GetPageIndex(wxWindow *page) const;
/**
* \brief return page index by page text
* \param text text to search for
* \return page index, or Notebook::npos if page does not exist in the notebook
*/
- size_t GetPageIndex(const wxString &text);
+ size_t GetPageIndex(const wxString &text) const;
/**
* \brief set the text for page at a given index
diff --git a/Plugin/notebook_ex.cpp b/Plugin/notebook_ex.cpp
index ffd2da3..9c0f31c 100644
--- a/Plugin/notebook_ex.cpp
+++ b/Plugin/notebook_ex.cpp
@@ -262,7 +262,7 @@ void Notebook::SetRightClickMenu(wxMenu* menu)
m_contextMenu = menu;
}
-wxWindow* Notebook::GetCurrentPage()
+wxWindow* Notebook::GetCurrentPage() const
{
size_t selection = GetSelection();
if (selection != Notebook::npos) {
diff --git a/Plugin/notebook_ex.h b/Plugin/notebook_ex.h
index 1e9f708..ba0c609 100644
--- a/Plugin/notebook_ex.h
+++ b/Plugin/notebook_ex.h
@@ -144,7 +144,7 @@ public:
* \brief return the active page
* \return active page or NULL if there are no pages in the book
*/
- wxWindow *GetCurrentPage();
+ wxWindow *GetCurrentPage() const;
/**
* \brief return page index by window pointer
-----------------------------------------------------------------------
Summary of changes:
Plugin/gtk_notebook_ex.cpp | 13 ++++---------
Plugin/gtk_notebook_ex.h | 16 +++++-----------
Plugin/notebook_ex.cpp | 2 +-
Plugin/notebook_ex.h | 2 +-
4 files changed, 11 insertions(+), 22 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-06 11:57:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via e206e5a47381ba8542a7e0d55acdead877a217c1 (commit)
from 3e9d09a06952f8e74378adc92c1ab8360d016144 (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/e206e5a47381ba8542a7e0d55acdead877a217c1
commit e206e5a47381ba8542a7e0d55acdead877a217c1
Author: Eran <era...@gm...>
Date: Mon Jan 6 13:57:18 2014 +0200
Updated wxformbuilder template files within codelite
diff --git a/Runtime/templates/gizmos/gui-dialog.fbp.wizard b/Runtime/templates/gizmos/gui-dialog.fbp.wizard
index fb92297..34cd492 100644
--- a/Runtime/templates/gizmos/gui-dialog.fbp.wizard
+++ b/Runtime/templates/gizmos/gui-dialog.fbp.wizard
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
- <FileVersion major="1" minor="9" />
+ <FileVersion major="1" minor="11" />
<object class="Project" expanded="1">
<property name="class_decoration"></property>
<property name="code_generation">C++</property>
<property name="disconnect_events">1</property>
+ <property name="disconnect_mode">source_name</property>
+ <property name="disconnect_php_events">0</property>
+ <property name="disconnect_python_events">0</property>
+ <property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
- <property name="event_handler">impl_virtual</property>
<property name="file">gui</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
@@ -17,13 +20,21 @@
<property name="path">.</property>
<property name="precompiled_header"></property>
<property name="relative_path">1</property>
+ <property name="skip_lua_events">1</property>
+ <property name="skip_php_events">1</property>
+ <property name="skip_python_events">1</property>
+ <property name="ui_table">UI</property>
<property name="use_enum">0</property>
<property name="use_microsoft_bom">0</property>
<object class="Dialog" expanded="1">
+ <property name="aui_managed">0</property>
+ <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg"></property>
<property name="center">wxBOTH</property>
<property name="context_help"></property>
+ <property name="context_menu">1</property>
<property name="enabled">1</property>
+ <property name="event_handler">impl_virtual</property>
<property name="extra_style"></property>
<property name="fg"></property>
<property name="font"></property>
@@ -38,15 +49,17 @@
<property name="subclass"></property>
<property name="title">wxMiniApp</property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnActivate"></event>
<event name="OnActivateApp"></event>
+ <event name="OnAuiFindManager"></event>
+ <event name="OnAuiPaneButton"></event>
+ <event name="OnAuiPaneClose"></event>
+ <event name="OnAuiPaneMaximize"></event>
+ <event name="OnAuiPaneRestore"></event>
+ <event name="OnAuiRender"></event>
<event name="OnChar"></event>
<event name="OnClose">OnCloseDialog</event>
<event name="OnEnterWindow"></event>
@@ -95,26 +108,54 @@
<property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticLine" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
<property name="bg"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
<property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default_pane">0</property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
+ <property name="floatable">1</property>
<property name="font"></property>
+ <property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
<property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
<property name="minimum_size"></property>
+ <property name="moveable">1</property>
<property name="name">m_staticLine</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
<property name="permission">protected</property>
+ <property name="pin_button">1</property>
<property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="show">1</property>
<property name="size"></property>
<property name="style">wxLI_HORIZONTAL</property>
<property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
diff --git a/Runtime/templates/gizmos/gui-frame.fbp.wizard b/Runtime/templates/gizmos/gui-frame.fbp.wizard
index 3d99a09..1a363c4 100644
--- a/Runtime/templates/gizmos/gui-frame.fbp.wizard
+++ b/Runtime/templates/gizmos/gui-frame.fbp.wizard
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
- <FileVersion major="1" minor="9" />
+ <FileVersion major="1" minor="11" />
<object class="Project" expanded="1">
<property name="class_decoration"></property>
<property name="code_generation">C++</property>
<property name="disconnect_events">1</property>
+ <property name="disconnect_mode">source_name</property>
+ <property name="disconnect_php_events">0</property>
+ <property name="disconnect_python_events">0</property>
+ <property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
- <property name="event_handler">impl_virtual</property>
<property name="file">gui</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
@@ -17,13 +20,21 @@
<property name="path">.</property>
<property name="precompiled_header"></property>
<property name="relative_path">1</property>
+ <property name="skip_lua_events">1</property>
+ <property name="skip_php_events">1</property>
+ <property name="skip_python_events">1</property>
+ <property name="ui_table">UI</property>
<property name="use_enum">0</property>
<property name="use_microsoft_bom">0</property>
<object class="Frame" expanded="1">
+ <property name="aui_managed">0</property>
+ <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg"></property>
<property name="center">wxBOTH</property>
<property name="context_help"></property>
+ <property name="context_menu">1</property>
<property name="enabled">1</property>
+ <property name="event_handler">impl_virtual</property>
<property name="extra_style"></property>
<property name="fg"></property>
<property name="font"></property>
@@ -38,16 +49,18 @@
<property name="subclass"></property>
<property name="title">wxMiniApp</property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<property name="xrc_skip_sizer">1</property>
<event name="OnActivate"></event>
<event name="OnActivateApp"></event>
+ <event name="OnAuiFindManager"></event>
+ <event name="OnAuiPaneButton"></event>
+ <event name="OnAuiPaneClose"></event>
+ <event name="OnAuiPaneMaximize"></event>
+ <event name="OnAuiPaneRestore"></event>
+ <event name="OnAuiRender"></event>
<event name="OnChar"></event>
<event name="OnClose">OnCloseFrame</event>
<event name="OnEnterWindow"></event>
@@ -78,6 +91,7 @@
<object class="wxMenuBar" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
+ <property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
@@ -93,10 +107,6 @@
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@@ -153,6 +163,7 @@
<object class="wxStatusBar" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
+ <property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="fields">1</property>
@@ -168,10 +179,6 @@
<property name="style">wxST_SIZEGRIP</property>
<property name="subclass"></property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
diff --git a/Runtime/templates/projects/executable-wx-dialog/executable-wx-dialog.project b/Runtime/templates/projects/executable-wx-dialog/executable-wx-dialog.project
index a22e6f5..3452e23 100644
--- a/Runtime/templates/projects/executable-wx-dialog/executable-wx-dialog.project
+++ b/Runtime/templates/projects/executable-wx-dialog/executable-wx-dialog.project
@@ -71,5 +71,6 @@ Note that this project is set to work with the GNU toolchain (gdb, g++)</Descrip
</VirtualDirectory>
<VirtualDirectory Name="resources">
<File Name="gui.fbp"/>
+ <File Name="win_resources.rc"/>
</VirtualDirectory>
</CodeLite_Project>
diff --git a/Runtime/templates/projects/executable-wx-dialog/gui.cpp b/Runtime/templates/projects/executable-wx-dialog/gui.cpp
index d983629..c2c5ac8 100644
--- a/Runtime/templates/projects/executable-wx-dialog/gui.cpp
+++ b/Runtime/templates/projects/executable-wx-dialog/gui.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Feb 8 2009)
+// C++ code generated with wxFormBuilder (version Nov 5 2013)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -28,8 +28,10 @@ MainDialogBase::MainDialogBase( wxWindow* parent, wxWindowID id, const wxString&
m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
m_sdbSizer->AddButton( m_sdbSizerCancel );
m_sdbSizer->Realize();
+
mainSizer->Add( m_sdbSizer, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT, 5 );
+
this->SetSizer( mainSizer );
this->Layout();
@@ -47,4 +49,5 @@ MainDialogBase::~MainDialogBase()
this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogBase::OnCloseDialog ) );
m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogBase::OnCancelClick ), NULL, this );
m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogBase::OnOKClick ), NULL, this );
+
}
diff --git a/Runtime/templates/projects/executable-wx-dialog/gui.fbp b/Runtime/templates/projects/executable-wx-dialog/gui.fbp
index fb92297..1e81a0d 100644
--- a/Runtime/templates/projects/executable-wx-dialog/gui.fbp
+++ b/Runtime/templates/projects/executable-wx-dialog/gui.fbp
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
- <FileVersion major="1" minor="9" />
+ <FileVersion major="1" minor="11" />
<object class="Project" expanded="1">
<property name="class_decoration"></property>
<property name="code_generation">C++</property>
<property name="disconnect_events">1</property>
+ <property name="disconnect_mode">source_name</property>
+ <property name="disconnect_php_events">0</property>
+ <property name="disconnect_python_events">0</property>
+ <property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
- <property name="event_handler">impl_virtual</property>
<property name="file">gui</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
@@ -17,13 +20,21 @@
<property name="path">.</property>
<property name="precompiled_header"></property>
<property name="relative_path">1</property>
+ <property name="skip_lua_events">1</property>
+ <property name="skip_php_events">1</property>
+ <property name="skip_python_events">1</property>
+ <property name="ui_table">UI</property>
<property name="use_enum">0</property>
<property name="use_microsoft_bom">0</property>
<object class="Dialog" expanded="1">
+ <property name="aui_managed">0</property>
+ <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg"></property>
<property name="center">wxBOTH</property>
<property name="context_help"></property>
+ <property name="context_menu">1</property>
<property name="enabled">1</property>
+ <property name="event_handler">impl_virtual</property>
<property name="extra_style"></property>
<property name="fg"></property>
<property name="font"></property>
@@ -36,17 +47,19 @@
<property name="size">400,300</property>
<property name="style">wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE</property>
<property name="subclass"></property>
- <property name="title">wxMiniApp</property>
+ <property name="title"></property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnActivate"></event>
<event name="OnActivateApp"></event>
+ <event name="OnAuiFindManager"></event>
+ <event name="OnAuiPaneButton"></event>
+ <event name="OnAuiPaneClose"></event>
+ <event name="OnAuiPaneMaximize"></event>
+ <event name="OnAuiPaneRestore"></event>
+ <event name="OnAuiRender"></event>
<event name="OnChar"></event>
<event name="OnClose">OnCloseDialog</event>
<event name="OnEnterWindow"></event>
@@ -95,26 +108,54 @@
<property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticLine" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
<property name="bg"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
<property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default_pane">0</property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
+ <property name="floatable">1</property>
<property name="font"></property>
+ <property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
<property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
<property name="minimum_size"></property>
+ <property name="moveable">1</property>
<property name="name">m_staticLine</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
<property name="permission">protected</property>
+ <property name="pin_button">1</property>
<property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="show">1</property>
<property name="size"></property>
<property name="style">wxLI_HORIZONTAL</property>
<property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
diff --git a/Runtime/templates/projects/executable-wx-dialog/gui.h b/Runtime/templates/projects/executable-wx-dialog/gui.h
index b10ac47..0bb5b3a 100644
--- a/Runtime/templates/projects/executable-wx-dialog/gui.h
+++ b/Runtime/templates/projects/executable-wx-dialog/gui.h
@@ -1,15 +1,16 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Feb 8 2009)
+// C++ code generated with wxFormBuilder (version Nov 5 2013)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
-#ifndef __gui__
-#define __gui__
+#ifndef __GUI_H__
+#define __GUI_H__
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
-
#include <wx/statline.h>
#include <wx/gdicmn.h>
#include <wx/font.h>
@@ -31,7 +32,6 @@ class MainDialogBase : public wxDialog
private:
protected:
-
wxStaticLine* m_staticLine;
wxStdDialogButtonSizer* m_sdbSizer;
wxButton* m_sdbSizerOK;
@@ -45,9 +45,9 @@ class MainDialogBase : public wxDialog
public:
- MainDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("wxMiniApp"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,300 ), long style = wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE );
+ MainDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,300 ), long style = wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE );
~MainDialogBase();
};
-#endif //__gui__
+#endif //__GUI_H__
diff --git a/Runtime/templates/projects/executable-wx-dialog/win_resources.rc b/Runtime/templates/projects/executable-wx-dialog/win_resources.rc
new file mode 100644
index 0000000..fa70c15
--- /dev/null
+++ b/Runtime/templates/projects/executable-wx-dialog/win_resources.rc
@@ -0,0 +1,2 @@
+#include "wx/msw/wx.rc"
+1 24 "wx/msw/wx.manifest"
diff --git a/Runtime/templates/projects/executable-wx-frame/executable-wx-frame.project b/Runtime/templates/projects/executable-wx-frame/executable-wx-frame.project
index 567d13e..35d0b2b 100644
--- a/Runtime/templates/projects/executable-wx-frame/executable-wx-frame.project
+++ b/Runtime/templates/projects/executable-wx-frame/executable-wx-frame.project
@@ -80,5 +80,6 @@ Note that this project is set to work with the GNU toolchain (gdb, g++)</Descrip
</VirtualDirectory>
<VirtualDirectory Name="resources">
<File Name="gui.fbp"/>
+ <File Name="win_resources.rc"/>
</VirtualDirectory>
</CodeLite_Project>
diff --git a/Runtime/templates/projects/executable-wx-frame/gui.cpp b/Runtime/templates/projects/executable-wx-frame/gui.cpp
index 3a9abdd..78e5a4f 100644
--- a/Runtime/templates/projects/executable-wx-frame/gui.cpp
+++ b/Runtime/templates/projects/executable-wx-frame/gui.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Feb 8 2009)
+// C++ code generated with wxFormBuilder (version Nov 5 2013)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -19,13 +19,14 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
menuFileExit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) + wxT('\t') + wxT("Alt+X"), wxEmptyString, wxITEM_NORMAL );
m_menuFile->Append( menuFileExit );
- m_menuBar->Append( m_menuFile, _("&File") );
+ m_menuBar->Append( m_menuFile, _("&File") );
this->SetMenuBar( m_menuBar );
... 189 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-06 11:37:38
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 3e9d09a06952f8e74378adc92c1ab8360d016144 (commit)
via 71f2d5513b291d14642b1d1dd727eeb7871af9c3 (commit)
from 59632da27975cfb06c2e51b95a838d87a92c4f30 (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/3e9d09a06952f8e74378adc92c1ab8360d016144
commit 3e9d09a06952f8e74378adc92c1ab8360d016144
Author: Eran <era...@gm...>
Date: Mon Jan 6 13:37:20 2014 +0200
Make the default notebook on GTK as wxNotebook and not wxAuiNotebook
Disable tweaks plugin tab colours feature while using native notebook
diff --git a/Tweaks/TweaksSettingsDlg.cpp b/Tweaks/TweaksSettingsDlg.cpp
index 5844a98..22325df 100644
--- a/Tweaks/TweaksSettingsDlg.cpp
+++ b/Tweaks/TweaksSettingsDlg.cpp
@@ -16,13 +16,6 @@ TweaksSettingsDlg::TweaksSettingsDlg(wxWindow* parent)
DoPopulateList();
WindowAttrManager::Load(this, "TweaksSettingsDlg", NULL);
-#if defined(__WXGTK__)
-#if CL_USE_NATIVEBOOK
- // Under GTK, when native books are enabled, the tab coloring is not
- // available
- m_tabEditorTabsColours->Disable();
-#endif
-#endif
}
TweaksSettingsDlg::~TweaksSettingsDlg()
@@ -73,11 +66,11 @@ void TweaksSettingsDlg::DoPopulateList()
m_colourProperties.push_back( m_pgMgrTabColours->AppendIn(parentProject, new wxSystemColourProperty(labelFG, wxPG_LABEL, pt.GetTabFgColour() )) );
} else {
wxPGProperty* prop(NULL);
-
+
prop = m_pgMgrTabColours->AppendIn(parentProject, new wxSystemColourProperty(labelBG));
prop->SetValueToUnspecified();
m_colourProperties.push_back( prop );
-
+
prop = m_pgMgrTabColours->AppendIn(parentProject, new wxSystemColourProperty(labelFG));
prop->SetValueToUnspecified();
m_colourProperties.push_back( prop );
@@ -161,3 +154,17 @@ void TweaksSettingsDlg::OnResetColours(wxCommandEvent& event)
m_pgPropGlobalTabFG->SetValueToUnspecified();
m_settings.ResetColours();
}
+
+void TweaksSettingsDlg::OnEnableColoursTableUI(wxUpdateUIEvent& event)
+{
+#if defined(__WXGTK__)
+#if CL_USE_NATIVEBOOK
+ // Under GTK, when native books are enabled, the tab coloring is not
+ // available
+ event.Enable(false);
+ return;
+#endif
+#endif
+
+ event.Enable( m_checkBoxEnableTweaks->IsChecked() && WorkspaceST::Get()->IsOpen() );
+}
diff --git a/Tweaks/TweaksSettingsDlg.h b/Tweaks/TweaksSettingsDlg.h
index 9d032ed..b4ed389 100644
--- a/Tweaks/TweaksSettingsDlg.h
+++ b/Tweaks/TweaksSettingsDlg.h
@@ -10,7 +10,7 @@ class TweaksSettingsDlg : public TweaksSettingsDlgBase
typedef std::list<wxPGProperty*> PropPtrList_t;
TweaksSettings m_settings;
PropPtrList_t m_colourProperties;
-
+
public:
TweaksSettingsDlg(wxWindow* parent);
virtual ~TweaksSettingsDlg();
@@ -19,6 +19,7 @@ public:
}
protected:
+ virtual void OnEnableColoursTableUI(wxUpdateUIEvent& event);
virtual void OnResetColours(wxCommandEvent& event);
virtual void OnImageSelected(wxPropertyGridEvent& event);
virtual void OnColourChanged(wxPropertyGridEvent& event);
diff --git a/Tweaks/wxcrafter.cpp b/Tweaks/wxcrafter.cpp
index ec6ece5..4bfee39 100644
--- a/Tweaks/wxcrafter.cpp
+++ b/Tweaks/wxcrafter.cpp
@@ -128,7 +128,9 @@ TweaksSettingsDlgBase::TweaksSettingsDlgBase(wxWindow* parent, wxWindowID id, co
m_checkBoxEnableTweaks->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(TweaksSettingsDlgBase::OnEnableTweaks), NULL, this);
m_checkBoxEnableTweaks->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TweaksSettingsDlgBase::OnEnableTweaksCheckboxUI), NULL, this);
m_notebook12->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TweaksSettingsDlgBase::OnEnableTweaksUI), NULL, this);
+ m_banner136->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TweaksSettingsDlgBase::OnEnableColoursTableUI), NULL, this);
m_pgMgrTabColours->Connect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(TweaksSettingsDlgBase::OnColourChanged), NULL, this);
+ m_pgMgrTabColours->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TweaksSettingsDlgBase::OnEnableColoursTableUI), NULL, this);
m_button124->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TweaksSettingsDlgBase::OnResetColours), NULL, this);
m_pgMgr->Connect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(TweaksSettingsDlgBase::OnImageSelected), NULL, this);
@@ -139,7 +141,9 @@ TweaksSettingsDlgBase::~TweaksSettingsDlgBase()
m_checkBoxEnableTweaks->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(TweaksSettingsDlgBase::OnEnableTweaks), NULL, this);
m_checkBoxEnableTweaks->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TweaksSettingsDlgBase::OnEnableTweaksCheckboxUI), NULL, this);
m_notebook12->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TweaksSettingsDlgBase::OnEnableTweaksUI), NULL, this);
+ m_banner136->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TweaksSettingsDlgBase::OnEnableColoursTableUI), NULL, this);
m_pgMgrTabColours->Disconnect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(TweaksSettingsDlgBase::OnColourChanged), NULL, this);
+ m_pgMgrTabColours->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TweaksSettingsDlgBase::OnEnableColoursTableUI), NULL, this);
m_button124->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TweaksSettingsDlgBase::OnResetColours), NULL, this);
m_pgMgr->Disconnect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(TweaksSettingsDlgBase::OnImageSelected), NULL, this);
diff --git a/Tweaks/wxcrafter.h b/Tweaks/wxcrafter.h
index 7fd611c..6447244 100644
--- a/Tweaks/wxcrafter.h
+++ b/Tweaks/wxcrafter.h
@@ -48,6 +48,7 @@ protected:
virtual void OnEnableTweaks(wxCommandEvent& event) { event.Skip(); }
virtual void OnEnableTweaksCheckboxUI(wxUpdateUIEvent& event) { event.Skip(); }
virtual void OnEnableTweaksUI(wxUpdateUIEvent& event) { event.Skip(); }
+ virtual void OnEnableColoursTableUI(wxUpdateUIEvent& event) { event.Skip(); }
virtual void OnColourChanged(wxPropertyGridEvent& event) { event.Skip(); }
virtual void OnResetColours(wxCommandEvent& event) { event.Skip(); }
virtual void OnImageSelected(wxPropertyGridEvent& event) { event.Skip(); }
diff --git a/Tweaks/wxcrafter.wxcp b/Tweaks/wxcrafter.wxcp
index 9085de5..e38a114 100644
--- a/Tweaks/wxcrafter.wxcp
+++ b/Tweaks/wxcrafter.wxcp
@@ -495,7 +495,13 @@
"m_label": "Gradient End",
"colour": "Tooltip"
}],
- "m_events": [],
+ "m_events": [{
+ "m_eventName": "wxEVT_UPDATE_UI",
+ "m_eventClass": "wxUpdateUIEvent",
+ "m_eventHandler": "wxUpdateUIEventHandler",
+ "m_functionNameAndSignature": "OnEnableColoursTableUI(wxUpdateUIEvent& event)",
+ "m_description": "Process a wxEVT_UPDATE_UI event"
+ }],
"m_children": []
}, {
"m_type": 4485,
@@ -568,6 +574,12 @@
"m_eventHandler": "wxPropertyGridEventHandler",
"m_functionNameAndSignature": "OnColourChanged(wxPropertyGridEvent& event)",
"m_description": "Respond to wxEVT_PG_CHANGED event, generated when property value has been changed by the user"
+ }, {
+ "m_eventName": "wxEVT_UPDATE_UI",
+ "m_eventClass": "wxUpdateUIEvent",
+ "m_eventHandler": "wxUpdateUIEventHandler",
+ "m_functionNameAndSignature": "OnEnableColoursTableUI(wxUpdateUIEvent& event)",
+ "m_description": "Process a wxEVT_UPDATE_UI event"
}],
"m_children": [{
"m_type": 4486,
https://sourceforge.net/p/codelite/codelitegit/ci/71f2d5513b291d14642b1d1dd727eeb7871af9c3
commit 71f2d5513b291d14642b1d1dd727eeb7871af9c3
Author: Eran <era...@gm...>
Date: Mon Jan 6 12:04:59 2014 +0200
GTK: Use native notebook
GTK: Disable tab colouring when using native notebook
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c0008f..6cdd1cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
## -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 #
+## -DGTK_USE_AUIBOOK=1|0 // Under GTK, use wxAuiNotebook instead of wxNotebook. 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 #
@@ -185,14 +185,16 @@ add_definitions(-DINSTALL_DIR=\"${CL_PREFIX}/share/codelite\")
add_definitions(-DPLUGINS_DIR=\"${PLUGINS_DIR}\")
## Allow user to use wxAuiNotebook instead of the native notebook
-if ( GTK_USE_NATIVEBOOK )
- add_definitions( -DGTK_USE_NATIVEBOOK=1 )
- message("-- Using wxNotebook")
-else ( GTK_USE_NATIVEBOOK )
+if ( GTK_USE_AUIBOOK )
add_definitions( -DGTK_USE_NATIVEBOOK=0 )
message("-- Using wxAuiNotebook")
-endif ( GTK_USE_NATIVEBOOK )
-unset(GTK_USE_NATIVEBOOK CACHE)
+
+else ( GTK_USE_AUIBOOK )
+ add_definitions( -DGTK_USE_NATIVEBOOK=1 )
+ message("-- Using wxNotebook")
+
+endif ( GTK_USE_AUIBOOK )
+unset(GTK_USE_AUIBOOK CACHE)
#############################################
## Global optimizations
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 5fe354b..e713b0e 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -44,7 +44,7 @@
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/>
@@ -114,7 +114,7 @@
<Project Name="wxsqlite3" ConfigName="WinDebugUnicode"/>
<Project Name="ZoomNavigator" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="CMake_Release" Selected="yes">
+ <WorkspaceConfiguration Name="CMake_Release" Selected="no">
<Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
diff --git a/Tweaks/TweaksSettingsDlg.cpp b/Tweaks/TweaksSettingsDlg.cpp
index 7cd8d2e..5844a98 100644
--- a/Tweaks/TweaksSettingsDlg.cpp
+++ b/Tweaks/TweaksSettingsDlg.cpp
@@ -6,6 +6,7 @@
#include "macros.h"
#include <wx/msgdlg.h>
#include <wx/richmsgdlg.h>
+#include "cl_defs.h"
TweaksSettingsDlg::TweaksSettingsDlg(wxWindow* parent)
: TweaksSettingsDlgBase(parent)
@@ -15,6 +16,13 @@ TweaksSettingsDlg::TweaksSettingsDlg(wxWindow* parent)
DoPopulateList();
WindowAttrManager::Load(this, "TweaksSettingsDlg", NULL);
+#if defined(__WXGTK__)
+#if CL_USE_NATIVEBOOK
+ // Under GTK, when native books are enabled, the tab coloring is not
+ // available
+ m_tabEditorTabsColours->Disable();
+#endif
+#endif
}
TweaksSettingsDlg::~TweaksSettingsDlg()
diff --git a/Tweaks/tweaks.cpp b/Tweaks/tweaks.cpp
index ff1c416..dceef75 100644
--- a/Tweaks/tweaks.cpp
+++ b/Tweaks/tweaks.cpp
@@ -110,6 +110,14 @@ void Tweaks::OnSettings(wxCommandEvent& e)
void Tweaks::OnColourTab(clColourEvent& e)
{
+#ifdef __WXGTK__
+#if CL_USE_NATIVEBOOK
+ // Not supported with native notebooks
+ e.Skip();
+ return;
+#endif
+#endif
+
TWEAKS_ENABLED_EVENT_HANDLER();
IEditor* editor = FindEditorByPage( e.GetPage() );
@@ -226,6 +234,13 @@ void Tweaks::OnCustomizeProject(clColourEvent& e)
void Tweaks::OnTabBorderColour(clColourEvent& e)
{
+#ifdef __WXGTK__
+#if CL_USE_NATIVEBOOK
+ // Not supported with native notebooks
+ e.Skip();
+ return;
+#endif
+#endif
TWEAKS_ENABLED_EVENT_HANDLER();
if ( m_settings.IsEnableTweaks() && m_settings.GetGlobalBgColour().IsOk() ) {
e.SetBorderColour( DrawingUtils::DarkColour(m_settings.GetGlobalBgColour(), 1.5) );
diff --git a/Tweaks/wxcrafter.cpp b/Tweaks/wxcrafter.cpp
index ad5f3f4..ec6ece5 100644
--- a/Tweaks/wxcrafter.cpp
+++ b/Tweaks/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!
//////////////////////////////////////////////////////////////////////
@@ -22,7 +23,7 @@ TweaksSettingsDlgBase::TweaksSettingsDlgBase(wxWindow* parent, wxWindowID id, co
bBitmapLoaded = true;
}
- boxSizer2 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer2 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer2);
m_checkBoxEnableTweaks = new wxCheckBox(this, wxID_ANY, _("Enable Tweaks"), wxDefaultPosition, wxSize(-1,-1), 0);
@@ -34,13 +35,13 @@ TweaksSettingsDlgBase::TweaksSettingsDlgBase(wxWindow* parent, wxWindowID id, co
boxSizer2->Add(m_notebook12, 1, wxALL|wxEXPAND, 5);
- m_panel62 = new wxPanel(m_notebook12, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
- m_notebook12->AddPage(m_panel62, _("Editor Tabs"), true);
+ m_tabEditorTabsColours = new wxPanel(m_notebook12, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
+ m_notebook12->AddPage(m_tabEditorTabsColours, _("Editor Tabs"), true);
- boxSizer126 = new wxBoxSizer(wxVERTICAL);
- m_panel62->SetSizer(boxSizer126);
+ wxBoxSizer* boxSizer126 = new wxBoxSizer(wxVERTICAL);
+ m_tabEditorTabsColours->SetSizer(boxSizer126);
- m_banner136 = new wxBannerWindow(m_panel62, wxID_ANY, wxTOP, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME);
+ m_banner136 = new wxBannerWindow(m_tabEditorTabsColours, wxID_ANY, wxTOP, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME);
m_banner136->SetBitmap(wxNullBitmap);
m_banner136->SetText(_("Configure Editor Tab Colours"), _("Customize your editor tab colours globally or per project"));
m_banner136->SetGradient(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK), wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
@@ -52,7 +53,7 @@ TweaksSettingsDlgBase::TweaksSettingsDlgBase(wxWindow* parent, wxWindowID id, co
wxUnusedVar(m_pgMgrTabColoursArr);
wxArrayInt m_pgMgrTabColoursIntArr;
wxUnusedVar(m_pgMgrTabColoursIntArr);
- m_pgMgrTabColours = new wxPropertyGridManager(m_panel62, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxPG_SPLITTER_AUTO_CENTER|wxPG_BOLD_MODIFIED);
+ m_pgMgrTabColours = new wxPropertyGridManager(m_tabEditorTabsColours, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxPG_SPLITTER_AUTO_CENTER|wxPG_BOLD_MODIFIED);
boxSizer126->Add(m_pgMgrTabColours, 1, wxALL|wxEXPAND, 5);
@@ -70,22 +71,22 @@ TweaksSettingsDlgBase::TweaksSettingsDlgBase(wxWindow* parent, wxWindowID id, co
m_pgPropProjectsColours = m_pgMgrTabColours->Append( new wxPropertyCategory( _("Tab Colours Per Project") ) );
m_pgPropProjectsColours->SetHelpString(wxT(""));
- boxSizer122 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer122 = new wxBoxSizer(wxVERTICAL);
boxSizer126->Add(boxSizer122, 0, wxEXPAND, 5);
- m_button124 = new wxButton(m_panel62, wxID_CLEAR, _("&Reset colours"), wxDefaultPosition, wxSize(-1,-1), 0);
+ m_button124 = new wxButton(m_tabEditorTabsColours, wxID_CLEAR, _("&Reset colours"), wxDefaultPosition, wxSize(-1,-1), 0);
m_button124->SetToolTip(_("Reset colours"));
boxSizer122->Add(m_button124, 0, wxALL|wxEXPAND, 5);
- m_panel84 = new wxPanel(m_notebook12, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
- m_notebook12->AddPage(m_panel84, _("Images"), false);
+ m_tabProjectIcons = new wxPanel(m_notebook12, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
+ m_notebook12->AddPage(m_tabProjectIcons, _("Images"), false);
- boxSizer241 = new wxBoxSizer(wxVERTICAL);
- m_panel84->SetSizer(boxSizer241);
+ wxBoxSizer* boxSizer241 = new wxBoxSizer(wxVERTICAL);
+ m_tabProjectIcons->SetSizer(boxSizer241);
- m_banner138 = new wxBannerWindow(m_panel84, wxID_ANY, wxTOP, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME);
+ m_banner138 = new wxBannerWindow(m_tabProjectIcons, wxID_ANY, wxTOP, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME);
m_banner138->SetBitmap(wxNullBitmap);
m_banner138->SetText(_("Configure Project Images"), _("Set a different image for a every project in the workspace"));
m_banner138->SetGradient(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK), wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
@@ -97,14 +98,14 @@ TweaksSettingsDlgBase::TweaksSettingsDlgBase(wxWindow* parent, wxWindowID id, co
wxUnusedVar(m_pgMgrArr);
wxArrayInt m_pgMgrIntArr;
wxUnusedVar(m_pgMgrIntArr);
- m_pgMgr = new wxPropertyGridManager(m_panel84, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxPG_SPLITTER_AUTO_CENTER|wxPG_BOLD_MODIFIED);
+ m_pgMgr = new wxPropertyGridManager(m_tabProjectIcons, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxPG_SPLITTER_AUTO_CENTER|wxPG_BOLD_MODIFIED);
boxSizer241->Add(m_pgMgr, 1, wxALL|wxEXPAND, 5);
m_pgPropProjects = m_pgMgr->Append( new wxPropertyCategory( _("Projects") ) );
m_pgPropProjects->SetHelpString(wxT(""));
- boxSizer4 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* boxSizer4 = new wxBoxSizer(wxHORIZONTAL);
boxSizer2->Add(boxSizer4, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
diff --git a/Tweaks/wxcrafter.h b/Tweaks/wxcrafter.h
index f5290dc..7fd611c 100644
--- a/Tweaks/wxcrafter.h
+++ b/Tweaks/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!
//////////////////////////////////////////////////////////////////////
@@ -26,25 +27,20 @@
class TweaksSettingsDlgBase : public wxDialog
{
protected:
- wxBoxSizer* boxSizer2;
wxCheckBox* m_checkBoxEnableTweaks;
wxNotebook* m_notebook12;
- wxPanel* m_panel62;
- wxBoxSizer* boxSizer126;
+ wxPanel* m_tabEditorTabsColours;
wxBannerWindow* m_banner136;
wxPropertyGridManager* m_pgMgrTabColours;
wxPGProperty* m_pgProp114;
wxPGProperty* m_pgPropGlobalTabBG;
wxPGProperty* m_pgPropGlobalTabFG;
wxPGProperty* m_pgPropProjectsColours;
- wxBoxSizer* boxSizer122;
wxButton* m_button124;
- wxPanel* m_panel84;
- wxBoxSizer* boxSizer241;
+ wxPanel* m_tabProjectIcons;
wxBannerWindow* m_banner138;
wxPropertyGridManager* m_pgMgr;
wxPGProperty* m_pgPropProjects;
- wxBoxSizer* boxSizer4;
wxButton* m_button8;
wxButton* m_button88;
diff --git a/Tweaks/wxcrafter.wxcp b/Tweaks/wxcrafter.wxcp
index ce742a8..9085de5 100644
--- a/Tweaks/wxcrafter.wxcp
+++ b/Tweaks/wxcrafter.wxcp
@@ -323,7 +323,7 @@
}, {
"type": "string",
"m_label": "Name:",
- "m_value": "m_panel62"
+ "m_value": "m_tabEditorTabsColours"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
@@ -948,7 +948,7 @@
}, {
"type": "string",
"m_label": "Name:",
- "m_value": "m_panel84"
+ "m_value": "m_tabProjectIcons"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 16 +++++++++-------
LiteEditor.workspace | 4 ++--
Tweaks/TweaksSettingsDlg.cpp | 19 +++++++++++++++++--
Tweaks/TweaksSettingsDlg.h | 3 ++-
Tweaks/tweaks.cpp | 15 +++++++++++++++
Tweaks/wxcrafter.cpp | 37 +++++++++++++++++++++----------------
Tweaks/wxcrafter.h | 11 ++++-------
Tweaks/wxcrafter.wxcp | 18 +++++++++++++++---
8 files changed, 85 insertions(+), 38 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-05 18:03:38
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 59632da27975cfb06c2e51b95a838d87a92c4f30 (commit)
from 32c8e2df94fd7bd694868489b5f4b044eb7aeee0 (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/59632da27975cfb06c2e51b95a838d87a92c4f30
commit 59632da27975cfb06c2e51b95a838d87a92c4f30
Author: Eran <era...@gm...>
Date: Sun Jan 5 20:03:19 2014 +0200
CMake Plugin: the helper thread now checks after executing each command whether it was requested to exi
git: move the chevron from the far right side to be next to the other tools
diff --git a/CMakePlugin/CMake.cpp b/CMakePlugin/CMake.cpp
index 4a52d03..d11662e 100644
--- a/CMakePlugin/CMake.cpp
+++ b/CMakePlugin/CMake.cpp
@@ -390,7 +390,6 @@ void CMake::OnHelpLoadCompleted()
// Save the info into the database
StoreIntoDatabase();
-
m_plugin->GetManager()->SetStatusMessage(_("CMake help content load is completed!"));
}
diff --git a/CMakePlugin/cmakehelpthread.cpp b/CMakePlugin/cmakehelpthread.cpp
index 50a89ad..727ac84 100644
--- a/CMakePlugin/cmakehelpthread.cpp
+++ b/CMakePlugin/cmakehelpthread.cpp
@@ -4,21 +4,16 @@
#include "procutils.h"
#include <wx/ffile.h>
-/**
- * @brief Loads help of type from command into list.
- *
- * @param command CMake command.
- * @param type Help type.
- * @param list Output variable.
- */
-static void LoadList(const wxString& command, const wxString& type, CMake::HelpMap& list)
+
+bool CMakeHelpThread::LoadList(const wxString& command, const wxString& type, CMake::HelpMap& list)
{
// Get list
wxArrayString names;
ProcUtils::SafeExecuteCommand(command + " --help-" + type + "-list", names);
if ( names.IsEmpty() )
- return;
+ // something bad just happened
+ return false;
// Remove version
names.RemoveAt(0);
@@ -30,6 +25,10 @@ static void LoadList(const wxString& command, const wxString& type, CMake::HelpM
// Foreach names
for (size_t i=0; i<names.GetCount(); ++i) {
+ if ( TestDestroy() ) {
+ return false;
+ }
+
// Export help
wxArrayString dummy;
wxString commandToRun;
@@ -57,6 +56,7 @@ static void LoadList(const wxString& command, const wxString& type, CMake::HelpM
list.insert( std::make_pair(commandName, html) );
}
}
+ return true;
}
CMakeHelpThread::CMakeHelpThread(CMake* cmake, const wxString &command)
@@ -73,25 +73,26 @@ CMakeHelpThread::~CMakeHelpThread()
void* CMakeHelpThread::Entry()
{
CMake::HelpMap* commands = new CMake::HelpMap;
- LoadList(m_command, "command", *commands);
- m_cmake->CallAfter( &CMake::OnCommandsHelpLoaded, commands );
- if ( TestDestroy() )
+ if ( !LoadList(m_command, "command", *commands) )
return NULL;
+ m_cmake->CallAfter( &CMake::OnCommandsHelpLoaded, commands );
+
CMake::HelpMap* property = new CMake::HelpMap;
- LoadList(m_command, "property", *property);
- m_cmake->CallAfter( &CMake::OnPropertiesHelpLoaded, property );
- if ( TestDestroy() )
+ if ( !LoadList(m_command, "property", *property) )
return NULL;
+
+ m_cmake->CallAfter( &CMake::OnPropertiesHelpLoaded, property );
CMake::HelpMap* module = new CMake::HelpMap;
- LoadList(m_command, "module", *module);
- m_cmake->CallAfter( &CMake::OnModulesHelpLoaded, module );
- if ( TestDestroy() )
+ if ( !LoadList(m_command, "module", *module) )
return NULL;
+ m_cmake->CallAfter( &CMake::OnModulesHelpLoaded, module );
CMake::HelpMap* variable = new CMake::HelpMap;
- LoadList(m_command, "variable", *variable);
+ if ( !LoadList(m_command, "variable", *variable) )
+ return NULL;
+
m_cmake->CallAfter( &CMake::OnVariablesHelpLoaded, variable );
// Notify that we are done
diff --git a/CMakePlugin/cmakehelpthread.h b/CMakePlugin/cmakehelpthread.h
index 2ee6248..5185e9e 100644
--- a/CMakePlugin/cmakehelpthread.h
+++ b/CMakePlugin/cmakehelpthread.h
@@ -3,6 +3,7 @@
#include <wx/thread.h> // Base class: wxThread
#include <wx/string.h>
+#include "CMake.h"
class CMake;
class CMakeHelpThread : public wxThread
@@ -18,6 +19,17 @@ public:
return m_busy;
}
+protected:
+ /**
+ * @brief Loads help of type from command into list.
+ *
+ * @param command CMake command.
+ * @param type Help type.
+ * @param list Output variable.
+ * @return false if the thread was requested to terminate while executing cmake help commands
+ */
+ bool LoadList(const wxString& command, const wxString& type, CMake::HelpMap& list);
+
public:
virtual void* Entry();
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 5604af9..5fe354b 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -44,7 +44,7 @@
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/>
@@ -149,7 +149,7 @@
<Project Name="Tweaks" ConfigName="DebugUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="CMake_Debug" Selected="no">
+ <WorkspaceConfiguration Name="CMake_Debug" Selected="yes">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
diff --git a/git/gitui.cpp b/git/gitui.cpp
index 457045f..f9475a3 100644
--- a/git/gitui.cpp
+++ b/git/gitui.cpp
@@ -826,7 +826,7 @@ GitConsoleBase::GitConsoleBase(wxWindow* parent, wxWindowID id, const wxPoint& p
m_auibar = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_PLAIN_BACKGROUND|wxAUI_TB_DEFAULT_STYLE|wxAUI_TB_OVERFLOW);
m_auibar->SetToolBitmapSize(wxSize(16,16));
- boxSizer36->Add(m_auibar, 0, wxLEFT|wxRIGHT|wxEXPAND, 0);
+ boxSizer36->Add(m_auibar, 0, wxLEFT|wxRIGHT, 0);
m_auibar->AddTool(XRCID("git_clear_log"), _("Clear Log"), wxXmlResource::Get()->LoadBitmap(wxT("clear")), wxNullBitmap, wxITEM_NORMAL, _("Clear Log"), _("Clear Log"), NULL);
diff --git a/git/gitui.wxcp b/git/gitui.wxcp
index 12971cf..c0bc70c 100644
--- a/git/gitui.wxcp
+++ b/git/gitui.wxcp
@@ -7633,7 +7633,7 @@
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxAUI_TB_PLAIN_BACKGROUND", "wxAUI_TB_DEFAULT_STYLE", "wxAUI_TB_OVERFLOW"],
- "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxEXPAND"],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
diff --git a/git/gitui_git_bitmaps.cpp b/git/gitui_git_bitmaps.cpp
index 1b4f017..6d2ade5 100644
--- a/git/gitui_git_bitmaps.cpp
+++ b/git/gitui_git_bitmaps.cpp
@@ -1,1155 +1,1155 @@
-//
-// This file was automatically generated by wxrc, do not edit by hand.
-//
-
-#include <wx/wxprec.h>
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#include <wx/filesys.h>
-#include <wx/fs_mem.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/xrc/xh_all.h>
-
-#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
- #define XRC_ADD_FILE(name, data, size, mime) \
- wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
-#else
- #define XRC_ADD_FILE(name, data, size, mime) \
- wxMemoryFSHandler::AddFile(name, data, size)
-#endif
-
-static size_t xml_res_size_0 = 790;
-static unsigned char xml_res_file_0[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,1,115,82,71,66,0,174,206,28,233,0,0,0,6,98,75,71,
-68,0,255,0,255,0,255,160,189,167,147,0,0,0,9,112,72,89,115,0,0,11,19,0,
-0,11,19,1,0,154,156,24,0,0,0,7,116,73,77,69,7,218,8,10,18,37,24,196,129,
-1,227,0,0,2,150,73,68,65,84,56,203,141,146,93,72,83,97,24,199,255,231,107,
-231,108,59,115,115,206,143,233,176,112,133,246,65,9,133,38,161,66,13,34,
-140,138,69,66,36,133,65,81,87,129,129,97,104,68,117,23,20,221,4,66,100,
-80,129,41,93,164,204,46,186,240,66,104,97,150,83,103,142,196,185,220,114,
-211,169,185,51,214,118,60,158,115,186,153,195,210,200,23,158,171,231,249,
-253,120,62,94,2,91,120,15,157,6,154,214,137,109,26,173,161,69,67,81,239,
-67,179,243,167,111,247,64,2,0,114,43,2,137,140,191,176,239,171,105,209,
-153,172,201,194,237,59,14,128,128,101,45,71,255,15,126,224,68,73,249,161,
-218,227,44,67,208,164,217,164,29,254,50,52,26,249,206,70,0,17,91,234,128,
-209,235,29,217,6,222,152,205,37,137,217,240,44,147,144,217,27,79,60,162,
-186,150,255,167,160,231,57,111,26,30,3,207,176,218,102,41,22,64,40,28,69,
-48,34,60,186,255,38,54,216,118,54,51,193,70,129,195,225,0,0,228,154,37,
-167,62,121,114,186,184,74,103,95,162,130,248,232,139,127,245,77,25,111,
-221,57,79,225,94,247,66,166,158,88,15,119,117,1,245,245,192,197,115,229,
-59,35,75,214,111,85,7,45,170,163,218,64,228,152,99,24,255,236,138,11,66,
-170,242,210,205,212,196,122,38,35,80,85,160,183,61,23,10,27,53,179,156,
-109,64,144,206,236,238,125,231,199,252,162,2,155,85,3,158,91,240,92,57,
-54,80,185,215,137,149,245,130,204,21,8,2,112,117,68,89,62,171,100,240,240,
-145,102,59,67,9,106,125,93,140,248,240,105,1,207,58,227,88,92,86,124,127,
-195,25,129,171,67,143,121,33,65,129,201,113,85,214,52,217,85,89,130,152,
-26,39,68,201,134,178,146,73,220,190,206,161,239,173,91,121,181,201,178,
-73,0,168,107,76,160,48,175,160,181,162,186,233,232,242,82,88,149,146,99,
-144,213,124,200,82,24,226,175,57,240,198,82,164,146,170,117,179,107,209,
-174,151,89,164,152,20,186,119,237,111,116,122,6,95,163,162,226,20,193,234,
-172,240,251,60,200,54,205,64,81,139,64,105,76,144,87,84,106,51,1,89,215,
-32,40,44,171,143,142,12,61,69,105,89,45,40,42,129,241,17,55,56,142,86,21,
-153,68,74,178,64,88,142,99,85,129,55,221,49,185,113,132,11,137,171,129,
-233,216,181,9,79,159,20,250,17,70,208,31,80,115,242,183,17,171,40,86,39,
-188,126,204,76,121,17,8,161,31,128,9,0,15,128,91,99,41,0,32,9,208,125,253,
-178,207,227,253,217,105,209,249,246,232,245,102,134,210,152,180,238,126,
-55,197,27,108,8,206,76,38,91,31,11,151,211,75,95,77,135,252,199,63,224,
-52,64,106,5,36,0,181,225,4,242,139,242,80,64,83,140,78,195,144,70,89,198,
-220,221,118,113,20,128,2,64,77,7,0,224,55,23,191,1,23,225,97,245,223,0,
-0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_1 = 318;
-static unsigned char xml_res_file_1[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,
-65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,
-0,0,0,224,73,68,65,84,120,218,98,252,255,255,63,3,37,128,17,221,0,199,3,
-190,200,220,221,80,218,21,38,176,223,97,51,138,122,22,44,134,10,2,177,49,
-18,27,4,92,160,244,89,32,126,79,200,0,99,36,155,177,185,100,15,33,3,206,
-34,57,185,3,74,87,32,201,17,244,194,123,36,91,96,206,221,67,116,32,30,112,
-143,84,2,82,161,56,212,175,118,216,185,252,30,33,23,40,33,57,29,155,247,
-112,27,144,158,158,206,192,160,192,7,114,174,50,84,161,49,82,76,128,13,
-112,64,51,145,9,139,45,105,64,124,23,41,16,119,67,241,76,168,235,240,6,
-162,32,84,211,44,36,177,78,104,96,150,163,59,31,155,11,96,78,174,64,243,
-115,39,148,78,35,38,26,145,65,5,161,188,128,238,130,61,80,155,118,35,249,
-87,16,234,124,99,108,233,1,155,11,194,160,6,220,197,226,26,162,82,226,89,
-104,52,134,34,69,225,106,108,1,8,2,0,1,6,0,131,130,58,203,4,57,91,201,0,
-0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_2 = 698;
-static unsigned char xml_res_file_2[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,
-65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,
-0,0,2,92,73,68,65,84,120,218,164,83,75,104,83,81,16,61,247,54,109,146,135,
-73,26,75,105,75,180,96,193,141,93,182,21,17,252,97,17,145,66,87,117,39,
-8,138,130,69,68,236,34,11,23,46,92,132,90,23,90,21,23,10,74,118,118,165,
-20,220,148,46,196,133,134,180,144,74,197,66,180,32,141,9,249,52,77,210,
-230,251,62,157,121,249,21,83,112,225,133,121,220,119,231,206,57,51,115,
-230,10,195,48,240,63,203,194,31,33,68,227,224,210,12,134,84,13,62,93,199,
-40,67,179,71,74,160,77,98,129,204,59,127,15,75,245,187,76,46,204,79,13,
-224,226,52,158,187,15,56,111,93,57,115,3,199,250,7,81,86,115,216,202,71,
-145,200,108,32,180,30,66,48,188,138,114,69,155,155,159,194,229,22,0,10,
-126,231,57,216,55,241,236,154,31,43,145,183,88,94,247,163,164,114,118,128,
-149,242,84,58,6,176,83,116,97,49,180,130,66,89,123,65,153,76,54,0,198,30,
-139,33,135,77,9,62,185,238,199,226,143,73,164,182,99,80,117,224,206,169,
-106,127,158,126,22,176,17,136,20,237,72,166,187,240,117,45,6,77,199,240,
-135,187,198,146,228,11,21,21,143,198,70,198,241,237,207,43,164,10,49,42,
-24,208,155,109,129,198,70,255,70,91,5,118,101,19,189,110,242,107,152,97,
-159,172,221,57,119,164,231,48,194,201,143,38,115,153,34,74,122,19,128,247,
-69,42,135,75,178,43,101,56,21,179,187,103,27,42,112,162,37,109,139,234,
-236,196,205,145,116,139,84,222,211,77,169,95,46,11,83,149,186,250,178,42,
-35,144,217,73,64,88,228,191,133,151,251,204,129,36,128,84,54,10,213,177,
-137,89,98,224,50,56,93,239,137,42,141,239,139,48,149,104,167,222,88,9,128,
-102,4,245,209,49,241,180,18,2,225,232,47,24,69,55,108,86,170,147,204,218,
-209,100,225,61,159,177,47,155,1,114,121,34,41,34,208,0,72,126,135,111,45,
-18,71,50,161,195,208,37,44,204,102,105,2,240,158,207,52,202,42,30,23,136,
-166,13,196,41,198,44,191,54,72,202,249,251,120,227,234,198,196,81,143,68,
-119,143,14,71,23,224,178,245,154,0,153,98,12,185,20,5,199,4,126,70,13,100,
-226,152,91,120,136,171,20,155,223,59,202,253,23,30,224,181,210,137,209,
-62,183,128,195,110,52,234,228,142,231,10,85,230,237,164,25,60,69,199,191,
-91,222,2,173,129,193,113,156,60,52,140,219,22,59,142,215,165,98,183,90,
-64,96,35,136,217,213,247,248,196,193,251,62,166,218,226,49,241,144,57,255,
-18,48,75,22,33,203,239,125,141,187,2,12,0,220,76,7,75,146,212,175,177,0,
-0,0,0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_3 = 673;
-static unsigned char xml_res_file_3[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,
-65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,
-0,0,2,67,73,68,65,84,120,218,148,147,79,72,84,81,20,198,127,247,205,200,
-52,106,163,97,80,72,80,68,96,69,17,49,86,214,162,41,208,44,138,198,69,100,
-80,16,33,22,180,41,137,18,102,83,180,72,237,15,185,170,133,171,192,77,65,
-97,18,65,3,146,8,45,130,105,64,44,26,33,203,178,22,141,36,54,58,218,56,
-243,222,237,220,55,180,48,39,165,3,151,203,61,220,239,59,223,249,238,185,
-234,232,93,200,217,244,84,20,19,182,109,208,44,12,165,224,251,20,88,22,
-120,21,15,159,95,214,39,194,157,10,73,227,53,8,219,33,124,233,200,89,230,
-178,57,156,66,4,102,121,52,142,163,120,253,33,209,120,160,67,53,70,91,181,
-106,16,18,175,185,32,196,140,218,79,200,138,132,66,10,180,73,206,106,44,
-181,156,237,85,59,168,92,181,135,250,14,165,125,69,34,46,44,45,204,166,
-232,247,248,9,217,133,202,75,56,66,176,102,53,108,219,8,129,0,148,251,215,
-241,241,83,25,47,227,131,247,92,5,209,171,52,201,86,206,34,81,125,134,253,
-227,19,220,170,219,43,138,189,163,148,174,20,98,155,38,151,64,84,140,176,
-68,60,109,97,100,247,121,86,12,86,16,9,213,64,169,223,53,220,103,205,235,
-53,111,135,167,16,129,20,153,76,125,163,59,61,35,134,230,36,145,203,187,
-107,253,49,201,244,47,143,96,203,222,167,255,229,67,13,161,18,159,28,50,
-130,205,228,243,150,1,231,4,60,59,135,238,60,217,77,38,43,102,202,60,56,
-78,30,100,118,33,93,38,228,231,202,74,2,247,15,109,221,135,22,240,76,202,
-21,48,167,180,48,212,182,43,125,231,84,23,241,177,102,126,138,180,222,1,
-233,195,51,191,250,206,13,155,168,221,178,139,100,234,177,60,247,20,239,
-198,32,246,150,71,234,224,77,244,181,227,55,24,26,143,184,213,54,87,158,
-198,99,217,238,244,169,188,47,152,34,70,105,114,58,206,228,175,247,76,167,
-225,217,43,120,113,133,181,238,43,164,179,19,168,34,1,8,193,112,234,129,
-91,221,16,252,61,141,89,33,73,124,134,161,132,128,91,169,22,99,191,152,
-124,176,182,141,216,133,134,102,126,88,93,124,77,66,255,64,126,238,23,144,
-200,57,155,38,218,119,157,136,128,223,184,73,243,153,12,73,93,27,186,103,
-248,152,174,111,119,85,7,23,89,235,77,75,102,130,205,114,71,217,32,122,
-91,8,30,190,77,204,206,16,247,21,187,23,231,69,207,69,141,249,60,75,133,
-1,86,241,31,241,91,128,1,0,121,204,231,72,83,203,130,185,0,0,0,0,73,69,
-78,68,174,66,96,130};
-
-static size_t xml_res_size_4 = 605;
-static unsigned char xml_res_file_4[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,2,36,73,68,65,84,120,94,149,146,77,107,19,65,28,198,
-127,179,179,205,38,105,83,171,180,41,245,37,42,244,229,44,189,20,42,168,
-31,64,61,52,185,168,71,253,120,162,224,65,15,189,9,210,90,15,161,133,54,
-104,180,180,144,218,208,68,221,38,155,125,73,102,199,97,9,75,211,22,193,
-7,30,134,25,120,126,252,31,254,35,180,214,8,33,110,3,203,252,159,182,77,
-182,110,147,136,229,32,8,95,71,81,136,16,150,49,198,34,49,198,130,81,217,
-182,205,216,216,216,26,80,183,24,42,12,67,186,158,135,215,235,225,7,65,
-234,192,184,103,222,14,54,222,210,216,122,195,175,227,67,148,82,41,44,5,
-8,75,32,165,52,182,176,44,11,105,108,238,8,224,100,231,3,115,51,147,204,
-206,22,201,185,123,156,182,127,146,78,147,146,132,192,4,71,172,99,197,239,
-175,31,153,155,158,74,170,89,8,50,249,41,90,245,205,75,38,24,2,228,208,
-38,205,159,111,159,184,54,110,19,71,17,194,118,136,85,31,173,66,252,126,
-76,70,74,113,41,192,26,134,221,250,6,87,114,130,216,119,137,3,23,191,125,
-72,63,232,177,127,212,102,97,229,49,145,82,26,192,62,15,208,38,124,186,
-191,73,193,137,209,94,155,65,167,5,104,188,64,97,48,44,60,120,134,147,203,
-95,172,128,16,16,43,92,51,118,65,42,180,239,50,232,182,12,224,24,207,235,
-226,50,193,226,195,231,100,243,19,73,221,11,0,173,6,52,171,239,201,246,
-91,248,238,9,122,16,130,214,132,178,128,43,139,44,61,122,145,132,207,43,
-173,112,248,249,29,197,171,57,68,28,163,123,167,248,126,128,138,76,29,123,
-134,37,51,182,157,201,38,127,66,41,69,38,147,209,23,0,126,212,71,200,73,
-132,21,227,140,23,144,182,205,81,223,97,241,126,37,9,119,58,29,154,205,
-102,242,11,171,213,234,22,176,55,82,97,122,105,149,94,215,195,16,192,178,
-105,116,96,126,181,76,38,155,39,138,34,26,141,6,165,82,137,221,221,221,
-131,74,165,242,10,168,141,0,138,215,111,209,47,222,227,123,163,205,143,
-102,151,249,149,39,73,103,173,53,131,193,32,217,210,250,250,250,65,185,
-92,126,10,236,104,163,145,10,82,74,110,148,238,112,243,246,221,116,173,
-195,19,199,113,116,173,86,251,98,194,47,207,134,207,2,182,109,41,215,248,
-183,246,128,218,48,156,234,47,27,185,3,203,161,34,187,154,0,0,0,0,73,69,
-78,68,174,66,96,130};
-
-static size_t xml_res_size_5 = 391;
-static unsigned char xml_res_file_5[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,
-65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,
-0,0,1,41,73,68,65,84,120,218,98,252,255,255,63,3,50,96,100,100,132,179,
-221,187,24,192,146,59,203,24,224,130,232,234,193,2,200,24,6,156,218,25,
-254,95,126,48,11,140,65,108,156,234,177,25,224,210,193,240,255,244,237,
-190,255,115,119,50,128,49,136,13,18,195,102,0,11,3,26,240,234,97,248,223,
-16,208,196,112,245,105,17,195,63,86,136,216,213,103,69,12,109,33,205,12,
-108,44,181,32,67,24,81,188,140,238,39,143,86,198,179,255,89,25,140,44,85,
-25,24,228,69,33,98,143,94,51,48,28,187,13,84,252,155,225,220,142,234,255,
-198,132,194,64,13,136,141,65,254,62,243,40,235,255,194,147,12,255,93,32,
-97,0,210,168,70,208,11,64,112,11,68,48,1,29,250,231,255,123,6,70,38,32,
-155,9,44,126,22,139,90,6,38,6,28,0,228,209,159,255,63,49,252,103,65,243,
-52,177,6,128,192,159,255,159,25,24,152,25,240,2,188,46,248,197,240,137,
-129,17,100,192,127,114,92,0,212,244,155,17,232,2,22,138,92,64,129,23,64,
-38,252,98,250,68,208,5,56,165,65,209,200,200,250,131,129,21,202,38,217,
-128,191,223,25,246,46,94,204,224,12,99,227,116,40,158,236,172,4,196,130,
-80,246,123,32,190,135,45,59,3,4,24,0,58,206,177,253,3,180,249,115,0,0,0,
-0,73,69,78,68,174,66,96,130};
-
-static size_t xml_res_size_6 = 687;
-static unsigned char xml_res_file_6[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,4,103,65,77,65,0,0,175,200,55,5,138,233,0,0,0,25,
-116,69,88,116,83,111,102,116,119,97,114,101,0,65,100,111,98,101,32,73,109,
-97,103,101,82,101,97,100,121,113,201,101,60,0,0,2,65,73,68,65,84,120,218,
-148,83,77,104,19,65,24,125,59,217,221,36,141,105,66,211,150,218,98,15,34,
-234,161,216,30,68,11,69,17,4,17,20,212,171,120,233,65,81,80,188,245,224,
-65,44,130,138,72,111,226,69,241,231,32,173,23,65,77,91,81,177,30,130,84,
-164,40,212,139,5,139,149,182,9,166,33,155,38,155,77,118,103,198,153,109,
-154,108,34,17,252,150,111,190,101,224,189,239,189,153,249,148,115,143,230,
-57,103,12,110,82,10,198,232,70,117,156,106,101,84,252,203,42,114,98,244,
-132,2,79,168,18,56,118,186,15,156,227,159,161,8,216,240,245,231,127,237,
-171,92,32,5,7,62,36,11,176,44,134,183,159,126,161,153,162,96,91,12,103,
-110,191,227,94,69,170,139,150,29,68,18,2,252,175,34,215,130,140,3,93,33,
-183,78,39,106,138,138,66,81,206,164,200,173,59,200,139,90,178,107,172,35,
-71,186,68,51,42,9,104,61,181,71,145,236,66,26,114,51,164,66,38,172,169,
-140,178,58,124,163,162,198,112,129,34,169,72,121,54,68,33,166,216,160,30,
-2,218,212,183,23,44,251,186,4,122,235,10,150,173,31,53,7,21,69,73,235,39,
-22,242,95,154,130,89,197,2,97,101,21,111,82,227,72,172,189,130,97,103,170,
-10,242,142,129,153,181,103,136,175,62,68,222,54,234,192,155,41,237,170,
-102,186,3,3,209,78,44,148,62,99,118,113,26,29,253,17,76,38,191,195,116,
-214,17,13,182,35,85,90,196,147,165,27,24,138,157,194,206,208,96,13,44,63,
-169,64,44,198,64,228,16,186,125,187,225,112,7,253,219,123,80,32,25,48,189,
-12,157,232,8,105,97,232,154,134,247,233,167,120,153,188,139,116,121,197,
-5,251,20,84,174,145,210,136,188,174,193,182,227,232,9,236,194,227,185,9,
-196,186,51,176,168,137,173,225,109,66,54,133,105,231,161,33,136,222,224,
-30,180,7,162,136,250,21,204,125,91,218,176,32,15,226,236,173,23,149,103,
-201,65,182,236,199,149,161,131,248,106,36,48,155,141,195,166,37,236,104,
-217,135,189,145,147,8,144,48,34,2,188,188,250,27,55,239,197,115,130,224,
-168,58,126,245,88,245,121,24,69,238,191,48,246,218,210,125,126,180,106,
-49,248,149,16,14,119,14,163,55,208,7,135,73,225,64,161,88,70,124,102,94,
-202,191,60,245,224,210,71,133,123,30,125,214,228,228,252,157,73,42,135,
-69,109,201,138,217,40,161,144,10,213,141,118,101,192,70,167,238,95,188,
-38,49,127,4,24,0,108,224,132,69,196,127,233,50,0,0,0,0,73,69,78,68,174,
-66,96,130};
-
-static size_t xml_res_size_7 = 381;
-static unsigned char xml_res_file_7[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,
-65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,
-0,0,1,31,73,68,65,84,120,218,196,147,193,74,195,64,16,134,191,109,173,207,
-161,143,80,162,40,241,222,10,42,22,250,16,162,87,47,62,66,81,122,215,183,
-80,240,160,15,208,130,104,110,30,133,122,209,131,7,49,224,193,164,100,199,
-217,52,74,176,110,148,122,240,135,97,254,204,204,254,252,179,97,141,136,
-80,134,49,38,207,155,125,78,199,25,219,142,55,234,156,157,239,211,113,252,
-235,124,94,40,199,7,90,135,200,227,211,177,220,222,237,72,91,185,111,190,
-134,7,214,194,107,250,76,52,58,65,240,163,86,209,35,201,94,144,57,42,81,
-41,144,74,140,249,147,64,54,17,48,50,131,128,41,28,80,255,175,21,156,131,
-4,189,68,231,96,150,21,220,111,124,179,113,46,144,89,191,192,148,193,173,
-62,131,100,76,184,218,132,56,125,200,157,132,129,94,69,15,153,111,48,212,
-207,181,74,7,86,8,247,58,93,90,205,46,162,93,171,225,248,174,214,92,111,
-106,213,111,222,66,208,238,113,179,178,12,139,11,147,218,232,30,174,174,
-225,242,128,37,157,143,126,18,112,41,88,87,145,176,48,59,28,192,133,30,
-86,26,253,250,49,57,145,141,35,196,133,227,190,121,159,131,79,145,34,71,
-101,129,50,222,5,24,0,185,32,163,186,0,158,3,95,0,0,0,0,73,69,78,68,174,
-66,96,130};
-
-static size_t xml_res_size_8 = 3438;
-static unsigned char xml_res_file_8[] = {
-137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,
-0,31,243,255,97,0,0,10,79,105,67,67,80,80,104,111,116,111,115,104,111,112,
-32,73,67,67,32,112,114,111,102,105,108,101,0,0,120,218,157,83,103,84,83,
-233,22,61,247,222,244,66,75,136,128,148,75,111,82,21,8,32,82,66,139,128,
-20,145,38,42,33,9,16,74,136,33,161,217,21,81,193,17,69,69,4,27,200,160,
-136,3,142,142,128,140,21,81,44,12,138,10,216,7,228,33,162,142,131,163,136,
-138,202,251,225,123,163,107,214,188,247,230,205,254,181,215,62,231,172,
-243,157,179,207,7,192,8,12,150,72,51,81,53,128,12,169,66,30,17,224,131,
-199,196,198,225,228,46,64,129,10,36,112,0,16,8,179,100,33,115,253,35,1,
-0,248,126,60,60,43,34,192,7,190,0,1,120,211,11,8,0,192,77,155,192,48,28,
-135,255,15,234,66,153,92,1,128,132,1,192,116,145,56,75,8,128,20,0,64,122,
-142,66,166,0,64,70,1,128,157,152,38,83,0,160,4,0,96,203,99,98,227,0,80,
-45,0,96,39,127,230,211,0,128,157,248,153,123,1,0,91,148,33,21,1,160,145,
-0,32,19,101,136,68,0,104,59,0,172,207,86,138,69,0,88,48,0,20,102,75,196,
-57,0,216,45,0,48,73,87,102,72,0,176,183,0,192,206,16,11,178,0,8,12,0,48,
-81,136,133,41,0,4,123,0,96,200,35,35,120,0,132,153,0,20,70,242,87,60,241,
-43,174,16,231,42,0,0,120,153,178,60,185,36,57,69,129,91,8,45,113,7,87,87,
-46,30,40,206,73,23,43,20,54,97,2,97,154,64,46,194,121,153,25,50,129,52,
-15,224,243,204,0,0,160,145,21,17,224,131,243,253,120,206,14,174,206,206,
-54,142,182,14,95,45,234,191,6,255,34,98,98,227,254,229,207,171,112,64,0,
-0,225,116,126,209,254,44,47,179,26,128,59,6,128,109,254,162,37,238,4,104,
-94,11,160,117,247,139,102,178,15,64,181,0,160,233,218,87,243,112,248,126,
-60,60,69,161,144,185,217,217,229,228,228,216,74,196,66,91,97,202,87,125,
-254,103,194,95,192,87,253,108,249,126,60,252,247,245,224,190,226,36,129,
-50,93,129,71,4,248,224,194,204,244,76,165,28,207,146,9,132,98,220,230,143,
-71,252,183,11,255,252,29,211,34,196,73,98,185,88,42,20,227,81,18,113,142,
-68,154,140,243,50,165,34,137,66,146,41,197,37,210,255,100,226,223,44,251,
-3,62,223,53,0,176,106,62,1,123,145,45,168,93,99,3,246,75,39,16,88,116,192,
-226,247,0,0,242,187,111,193,212,40,8,3,128,104,131,225,207,119,255,239,
-63,253,71,160,37,0,128,102,73,146,113,0,0,94,68,36,46,84,202,179,63,199,
-8,0,0,68,160,129,42,176,65,27,244,193,24,44,192,6,28,193,5,220,193,11,252,
... 2020 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-05 12:38: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 32c8e2df94fd7bd694868489b5f4b044eb7aeee0 (commit)
from 48fa45c0fa5dc6d6ece8101065a776fcce63560a (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/32c8e2df94fd7bd694868489b5f4b044eb7aeee0
commit 32c8e2df94fd7bd694868489b5f4b044eb7aeee0
Author: Eran <era...@gm...>
Date: Sun Jan 5 14:31:57 2014 +0200
Added CMakePlugin to codelite's main build (Linux)
CMakePlugin: fixed crash on Linux with the latest change (moving help loading code to background thread)
CMakePlugin: added transaction when calling "StoreIntoDatabase"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2549ff..8c0008f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -427,6 +427,7 @@ add_subdirectory(SnipWiz)
add_subdirectory(Subversion2)
add_subdirectory(ZoomNavigator)
add_subdirectory(git)
+add_subdirectory(CMakePlugin)
if (WITH_SFTP)
add_subdirectory(SFTP)
diff --git a/CMakePlugin/CMake.cpp b/CMakePlugin/CMake.cpp
index 193a41c..4a52d03 100644
--- a/CMakePlugin/CMake.cpp
+++ b/CMakePlugin/CMake.cpp
@@ -296,6 +296,10 @@ void CMake::StoreIntoDatabase()
}
try {
+
+ // Wrap everythign within a transcation (it will boost sqite performance by magnitude of X100
+ m_db.Begin();
+
// Commands
{
wxSQLite3Statement stmt = m_db.PrepareStatement("REPLACE INTO commands (name, desc) VALUES(?, ?)");
@@ -342,6 +346,7 @@ void CMake::StoreIntoDatabase()
stmt.Bind(1, m_version);
stmt.ExecuteUpdate();
}
+ m_db.Commit();
} catch (wxSQLite3Exception &e) {
CL_ERROR("An error occured while storing CMake data into database: %s", e.GetMessage());
}
diff --git a/CMakePlugin/cmakehelpthread.cpp b/CMakePlugin/cmakehelpthread.cpp
index 0669509..50a89ad 100644
--- a/CMakePlugin/cmakehelpthread.cpp
+++ b/CMakePlugin/cmakehelpthread.cpp
@@ -2,6 +2,7 @@
#include "CMake.h"
#include "globals.h"
#include "procutils.h"
+#include <wx/ffile.h>
/**
* @brief Loads help of type from command into list.
@@ -25,21 +26,36 @@ static void LoadList(const wxString& command, const wxString& type, CMake::HelpM
// Create temp file name
// This is required because cmake is able export to HTML only into file
wxString tmpFileName = wxFileName::CreateTempFileName("cmake_") + ".html";
- wxString html;
-
+
// Foreach names
- for (wxArrayString::const_iterator it = names.begin(), ite = names.end(); it != ite; ++it) {
+ for (size_t i=0; i<names.GetCount(); ++i) {
// Export help
wxArrayString dummy;
- ProcUtils::SafeExecuteCommand(command + " --help-" + type + " " + *it + " " + tmpFileName, dummy);
+ wxString commandToRun;
+ wxString commandName = names.Item(i);
+ commandName.Trim().Trim(false);
+
+ commandToRun << command
+ << " --help-"
+ << type
+ << " "
+ << commandName
+ << " "
+ << tmpFileName;
+ ProcUtils::SafeExecuteCommand(commandToRun, dummy);
// Read help
- if (! ::ReadFileWithConversion(tmpFileName, html))
- continue;
-
- // Store HTML page
- list[*it] = html;
+ wxFFile fp(tmpFileName, "rb");
+ if ( fp.IsOpened() ) {
+
+ wxString html;
+ fp.ReadAll( &html, wxConvUTF8 );
+ fp.Close();
+
+ // Store HTML page
+ list.insert( std::make_pair(commandName, html) );
+ }
}
}
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 5fe354b..5604af9 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -44,7 +44,7 @@
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/>
@@ -149,7 +149,7 @@
<Project Name="Tweaks" ConfigName="DebugUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="CMake_Debug" Selected="yes">
+ <WorkspaceConfiguration Name="CMake_Debug" Selected="no">
<Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
diff --git a/LiteEditor/clang_cleaner_thread.cpp b/LiteEditor/clang_cleaner_thread.cpp
index 1f31e86..be991fc 100644
--- a/LiteEditor/clang_cleaner_thread.cpp
+++ b/LiteEditor/clang_cleaner_thread.cpp
@@ -19,21 +19,20 @@ ClangCleanerThread::~ClangCleanerThread()
void* ClangCleanerThread::Entry()
{
wxLogNull nl;
+ size_t ticks (0);
while ( !TestDestroy() ) {
- // Clear all temporary files created for clang parsing
- // DeleteTemporaryFiles();
-
- // Clear stale .pch files from %TMP%
- // libclang does not clear properly any stale files under %TMP% (this is at least under Windows)
- DeleteStalePCHFiles();
-
- wxThread::This()->Sleep( 5000 );
+ if ( ticks % 5 == 0 ) {
+ // Clear all temporary files created for clang parsing
+ DeleteStalePCHFiles();
+
+ // Clear stale .pch files from %TMP%
+ // libclang does not clear properly any stale files under %TMP% (this is at least under Windows)
+ DeleteTemporaryFiles();
+ }
+ wxThread::This()->Sleep( 1000 );
+ ++ticks;
}
-
- // Before we exit, try to perform one last cleanup
- DeleteTemporaryFiles();
- DeleteStalePCHFiles();
return NULL;
}
diff --git a/LiteEditor/clang_driver.cpp b/LiteEditor/clang_driver.cpp
index bc7cff1..0204c35 100644
--- a/LiteEditor/clang_driver.cpp
+++ b/LiteEditor/clang_driver.cpp
@@ -56,8 +56,9 @@ ClangDriver::ClangDriver()
m_index = clang_createIndex(0, 0);
m_pchMakerThread.SetSleepInterval(30);
m_pchMakerThread.Start();
+#ifdef __WXMSW__
m_clangCleanerThread.Start();
-
+#endif
EventNotifier::Get()->Connect(wxEVT_CLANG_PCH_CACHE_ENDED, wxCommandEventHandler(ClangDriver::OnPrepareTUEnded), NULL, this);
EventNotifier::Get()->Connect(wxEVT_CLANG_PCH_CACHE_CLEARED, wxCommandEventHandler(ClangDriver::OnCacheCleared), NULL, this);
EventNotifier::Get()->Connect(wxEVT_CLANG_TU_CREATE_ERROR, wxCommandEventHandler(ClangDriver::OnTUCreateError), NULL, this);
@@ -76,7 +77,9 @@ ClangDriver::~ClangDriver()
m_pchMakerThread.Stop();
m_pchMakerThread.ClearCache(); // clear cache and dispose all translation units
+#ifdef __WXMSW__
m_clangCleanerThread.Stop();
+#endif
clang_disposeIndex(m_index);
}
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 1 +
CMakePlugin/CMake.cpp | 5 +++++
CMakePlugin/cmakehelpthread.cpp | 34 +++++++++++++++++++++++++---------
LiteEditor.workspace | 4 ++--
LiteEditor/clang_cleaner_thread.cpp | 23 +++++++++++------------
LiteEditor/clang_driver.cpp | 5 ++++-
6 files changed, 48 insertions(+), 24 deletions(-)
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2014-01-05 11:32:52
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 48fa45c0fa5dc6d6ece8101065a776fcce63560a (commit)
via c38087eca119467bc8af0d02682b682be5850f51 (commit)
via 2e1693964b92eac1ea11d683571fa275f0caf15f (commit)
from 89a134d53fe4ad89df992ff9b05c1c0a1c092df4 (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/48fa45c0fa5dc6d6ece8101065a776fcce63560a
commit 48fa45c0fa5dc6d6ece8101065a776fcce63560a
Author: dghart <da...@4P...>
Date: Sun Jan 5 11:27:11 2014 +0000
GitPlugin: Added an overflow dropdown to the console auitoolbar for those menuitems that don't have tools
Also demoted the less-used tools to the dropdown.
diff --git a/git/GitConsole.cpp b/git/GitConsole.cpp
index 276cee7..7e3a171 100644
--- a/git/GitConsole.cpp
+++ b/git/GitConsole.cpp
@@ -90,6 +90,44 @@ public:
};
// ---------------------------------------------------------------------
+void PopulateAuiToolbarOverflow(wxAuiToolBarItemArray& append_items, const GitImages& images) // Helper function, partly because there's no convenient wxAuiToolBarItem ctor
+{
+ static const char* labels[] = { wxTRANSLATE("Create local branch"), wxTRANSLATE("Switch to local branch"), wxTRANSLATE("Switch to remote branch"), "",
+ wxTRANSLATE("Refresh"), wxTRANSLATE("Apply Patch"), "",
+ wxTRANSLATE("Start gitk"), wxTRANSLATE("Garbage collect"), "",
+ wxTRANSLATE("Plugin settings"), wxTRANSLATE("Set repository path"), wxTRANSLATE("Clone a git repository")
+ };
+ static const char* bitmapnames[] = { "gitNewBranch", "gitSwitchLocalBranch", "", "",
+ "gitRefresh", "gitApply", "",
+ "gitStart", "gitTrash", "",
+ "gitSettings", "gitPath", "gitClone"
+ };
+ static const int IDs[] = { XRCID("git_create_branch"), XRCID("git_switch_branch"), XRCID("git_switch_to_remote_branch"), 0,
+ XRCID("git_refresh"), XRCID("git_apply_patch"), 0,
+ XRCID("git_start_gitk"), XRCID("git_garbage_collection"), 0,
+ XRCID("git_settings"), XRCID("git_set_repository"), XRCID("git_clone")
+ };
+ size_t IDsize = sizeof(IDs)/sizeof(int);
+ wxCHECK_RET(sizeof(labels)/sizeof(char*) == IDsize, "Mismatched arrays");
+ wxCHECK_RET(sizeof(bitmapnames)/sizeof(char*) == IDsize, "Mismatched arrays");
+
+ wxAuiToolBarItem item, separator;
+ item.SetKind(wxITEM_NORMAL);
+ separator.SetKind(wxITEM_SEPARATOR);
+
+ for (size_t n=0; n < IDsize; ++n) {
+ if (IDs[n] != 0) {
+ item.SetId(IDs[n]);
+ item.SetBitmap(images.Bitmap(bitmapnames[n]));
+ item.SetLabel(labels[n]);
+ append_items.Add(item);
+ } else {
+ append_items.Add(separator);
+ }
+ }
+}
+
+// ---------------------------------------------------------------------
GitConsole::GitConsole(wxWindow* parent, GitPlugin* git)
: GitConsoleBase(parent)
@@ -123,7 +161,6 @@ GitConsole::GitConsole(wxWindow* parent, GitPlugin* git)
m_isVerbose = (data.GetFlags() & GitEntry::Git_Verbose_Log);
m_splitter->SetSashPosition(data.GetGitConsoleSashPos());
- m_auibar->AddTool(XRCID("git_refresh"), _("Refresh"), m_images.Bitmap("gitRefresh"), _("Refresh tracked file list"));
m_auibar->AddTool(XRCID("git_reset_repository"), _("Reset"), m_images.Bitmap("gitResetRepo"), _("Reset repository"));
m_auibar->AddSeparator();
@@ -132,11 +169,9 @@ GitConsole::GitConsole(wxWindow* parent, GitPlugin* git)
m_auibar->AddTool(XRCID("git_commit"), _("Commit"), m_images.Bitmap("gitCommitLocal"), _("Commit local changes"));
m_auibar->AddTool(XRCID("git_push"), _("Push"), m_images.Bitmap("gitPush"), _("Push local changes"));
m_auibar->AddSeparator();
+ m_auibar->AddTool(XRCID("git_commit_diff"), _("Diffs"), m_images.Bitmap("gitDiffs"), _("Show current diffs"));
+ m_auibar->AddTool(XRCID("git_browse_commit_list"), _("Log"), m_images.Bitmap("gitCommitedFiles"), _("Browse commit history"));
- m_auibar->AddTool(XRCID("git_create_branch"), _("Create branch"), m_images.Bitmap("gitNewBranch"), _("Create local branch"));
- m_auibar->AddTool(XRCID("git_switch_branch"), _("Local branch"), m_images.Bitmap("gitSwitchLocalBranch"), _("Switch to local branch"));
- //m_auibar->AddTool(XRCID("git_switch_to_remote_branch"), _("Remote branch"), XPM_BITMAP(menuexport), _("Init and switch to remote branch"));
- m_auibar->AddSeparator();
#if 0
//m_auibar->AddTool(XRCID("git_bisect_start"), _("Bisect"), XPM_BITMAP(menu_start_bisect), _("Start bisect"));
//m_auibar->EnableTool(XRCID("git_bisect_start"),false);
@@ -148,9 +183,12 @@ GitConsole::GitConsole(wxWindow* parent, GitPlugin* git)
//m_auibar->EnableTool(XRCID("git_bisect_reset"),false);
//m_auibar->AddSeparator();
#endif
- m_auibar->AddTool(XRCID("git_commit_diff"), _("Diffs"), m_images.Bitmap("gitDiffs"), _("Show current diffs"));
- m_auibar->AddTool(XRCID("git_browse_commit_list"), _("Log"), m_images.Bitmap("gitCommitedFiles"), _("Browse commit history"));
- m_auibar->AddTool(XRCID("git_start_gitk"), _("gitk"), m_images.Bitmap("gitStart"), _("Start gitk"));
+
+ wxAuiToolBarItemArray prepend_items;
+ wxAuiToolBarItemArray append_items;
+ PopulateAuiToolbarOverflow(append_items, m_images);
+ m_auibar->SetCustomOverflowItems(prepend_items, append_items);
+
m_auibar->Realize();
Bind(wxEVT_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEventHandler(GitConsole::OnGitPullDropdown), this, XRCID("git_pull"));
diff --git a/git/gitui.cpp b/git/gitui.cpp
index 7952969..457045f 100644
--- a/git/gitui.cpp
+++ b/git/gitui.cpp
@@ -823,31 +823,17 @@ GitConsoleBase::GitConsoleBase(wxWindow* parent, wxWindowID id, const wxPoint& p
wxBoxSizer* boxSizer36 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer36);
- m_auibar = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_PLAIN_BACKGROUND|wxAUI_TB_DEFAULT_STYLE);
+ m_auibar = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_PLAIN_BACKGROUND|wxAUI_TB_DEFAULT_STYLE|wxAUI_TB_OVERFLOW);
m_auibar->SetToolBitmapSize(wxSize(16,16));
boxSizer36->Add(m_auibar, 0, wxLEFT|wxRIGHT|wxEXPAND, 0);
- m_auibar->AddTool(XRCID("git_settings"), _("git settings"), wxXmlResource::Get()->LoadBitmap(wxT("git-settings")), wxNullBitmap, wxITEM_NORMAL, _("git settings"), _("git settings"), NULL);
-
- m_auibar->AddSeparator();
-
m_auibar->AddTool(XRCID("git_clear_log"), _("Clear Log"), wxXmlResource::Get()->LoadBitmap(wxT("clear")), wxNullBitmap, wxITEM_NORMAL, _("Clear Log"), _("Clear Log"), NULL);
m_auibar->AddTool(wxID_ABORT, _("m_toolKill"), wxXmlResource::Get()->LoadBitmap(wxT("stop")), wxNullBitmap, wxITEM_NORMAL, _("Terminate git process"), _("Terminate git process"), NULL);
m_auibar->AddSeparator();
- m_auibar->AddTool(XRCID("git_set_repository"), _("Set git repository path"), wxXmlResource::Get()->LoadBitmap(wxT("document-open")), wxNullBitmap, wxITEM_NORMAL, _("Set git repository path"), _("Set git repository path"), NULL);
-
- m_auibar->AddTool(XRCID("git_clone"), _("git clone"), wxXmlResource::Get()->LoadBitmap(wxT("git-clone")), wxNullBitmap, wxITEM_NORMAL, _("git clone"), _("git clone"), NULL);
-
- m_auibar->AddSeparator();
-
- m_auibar->AddTool(XRCID("git_apply_patch"), _("Apply Patch..."), wxXmlResource::Get()->LoadBitmap(wxT("apply-patch")), wxNullBitmap, wxITEM_NORMAL, _("Apply Patch..."), _("Apply Patch..."), NULL);
-
- m_auibar->AddSeparator();
-
m_auibar->AddTool(XRCID("git_console_add_file"), _("Add file"), wxXmlResource::Get()->LoadBitmap(wxT("git-add-file")), wxNullBitmap, wxITEM_NORMAL, _("Add file"), _("Add file"), NULL);
m_auibar->AddTool(XRCID("git_console_reset_file"), _("Reset File"), wxXmlResource::Get()->LoadBitmap(wxT("git-reset")), wxNullBitmap, wxITEM_NORMAL, _("Reset File"), _("Reset File"), NULL);
@@ -939,7 +925,6 @@ GitConsoleBase::GitConsoleBase(wxWindow* parent, wxWindowID id, const wxPoint& p
this->Connect(XRCID("git_clear_log"), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(GitConsoleBase::OnClearGitLog), NULL, this);
this->Connect(wxID_ABORT, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(GitConsoleBase::OnStopGitProcess), NULL, this);
this->Connect(wxID_ABORT, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitConsoleBase::OnStopGitProcessUI), NULL, this);
- this->Connect(XRCID("git_apply_patch"), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(GitConsoleBase::OnApplyPatch), NULL, this);
this->Connect(XRCID("git_console_add_file"), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(GitConsoleBase::OnAddFile), NULL, this);
this->Connect(XRCID("git_console_add_file"), wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitConsoleBase::OnItemSelectedUI), NULL, this);
this->Connect(XRCID("git_console_reset_file"), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(GitConsoleBase::OnResetFile), NULL, this);
@@ -955,7 +940,6 @@ GitConsoleBase::~GitConsoleBase()
this->Disconnect(XRCID("git_clear_log"), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(GitConsoleBase::OnClearGitLog), NULL, this);
this->Disconnect(wxID_ABORT, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(GitConsoleBase::OnStopGitProcess), NULL, this);
this->Disconnect(wxID_ABORT, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitConsoleBase::OnStopGitProcessUI), NULL, this);
- this->Disconnect(XRCID("git_apply_patch"), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(GitConsoleBase::OnApplyPatch), NULL, this);
this->Disconnect(XRCID("git_console_add_file"), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(GitConsoleBase::OnAddFile), NULL, this);
this->Disconnect(XRCID("git_console_add_file"), wxEVT_UPDATE_UI, wxUpdateUIEventHandler(GitConsoleBase::OnItemSelectedUI), NULL, this);
this->Disconnect(XRCID("git_console_reset_file"), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(GitConsoleBase::OnResetFile), NULL, this);
diff --git a/git/gitui.h b/git/gitui.h
index 288d40f..c9c4c4d 100644
--- a/git/gitui.h
+++ b/git/gitui.h
@@ -218,7 +218,6 @@ protected:
virtual void OnClearGitLog(wxCommandEvent& event) { event.Skip(); }
virtual void OnStopGitProcess(wxCommandEvent& event) { event.Skip(); }
virtual void OnStopGitProcessUI(wxUpdateUIEvent& event) { event.Skip(); }
- virtual void OnApplyPatch(wxCommandEvent& event) { event.Skip(); }
virtual void OnAddFile(wxCommandEvent& event) { event.Skip(); }
virtual void OnItemSelectedUI(wxUpdateUIEvent& event) { event.Skip(); }
virtual void OnResetFile(wxCommandEvent& event) { event.Skip(); }
diff --git a/git/gitui.wxcp b/git/gitui.wxcp
index 2ffec27..12971cf 100644
--- a/git/gitui.wxcp
+++ b/git/gitui.wxcp
@@ -7632,7 +7632,7 @@
"border": 0,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": ["wxAUI_TB_PLAIN_BACKGROUND", "wxAUI_TB_DEFAULT_STYLE"],
+ "m_styles": ["wxAUI_TB_PLAIN_BACKGROUND", "wxAUI_TB_DEFAULT_STYLE", "wxAUI_TB_OVERFLOW"],
"m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxEXPAND"],
"m_properties": [{
"type": "winid",
@@ -7671,94 +7671,6 @@
"m_properties": [{
"type": "winid",
"m_label": "ID:",
- "m_winid": "XRCID(\"git_settings\")"
- }, {
- "type": "string",
- "m_label": "Name:",
- "m_value": "m_toolbarItem112"
- }, {
- "type": "string",
- "m_label": "Label:",
- "m_value": "git settings"
- }, {
- "type": "multi-string",
- "m_label": "Tooltip:",
- "m_value": "git settings"
- }, {
- "type": "string",
- "m_label": "Help String:",
- "m_value": "git settings"
- }, {
- "type": "bitmapPicker",
- "m_label": "Bitmap File:",
- "m_path": "icons/png/git-settings.png"
- }, {
- "type": "filePicker",
- "m_label": "Disabled-Bitmap File",
- "m_path": ""
- }, {
- "type": "choice",
- "m_label": "Kind:",
- "m_selection": 0,
- "m_options": ["normal", "checkable", "radio", "separator"]
- }],
- "m_events": [],
- "m_children": []
- }, {
- "m_type": 4462,
- "proportion": 0,
- "border": 5,
- "gbSpan": "1,1",
- "gbPosition": "0,0",
- "m_styles": [],
- "m_sizerFlags": [],
- "m_properties": [{
- "type": "winid",
- "m_label": "ID:",
- "m_winid": "wxID_ANY"
- }, {
- "type": "string",
- "m_label": "Name:",
- "m_value": "m_toolbarItem110"
- }, {
- "type": "string",
- "m_label": "Label:",
- "m_value": "Tool Label"
- }, {
- "type": "multi-string",
- "m_label": "Tooltip:",
- "m_value": ""
- }, {
- "type": "string",
- "m_label": "Help String:",
- "m_value": ""
- }, {
- "type": "bitmapPicker",
- "m_label": "Bitmap File:",
- "m_path": ""
- }, {
- "type": "filePicker",
- "m_label": "Disabled-Bitmap File",
- "m_path": ""
- }, {
- "type": "choice",
- "m_label": "Kind:",
- "m_selection": 3,
- "m_options": ["normal", "checkable", "radio", "separator"]
- }],
- "m_events": [],
- "m_children": []
- }, {
- "m_type": 4462,
- "proportion": 0,
- "border": 5,
- "gbSpan": "1,1",
- "gbPosition": "0,0",
- "m_styles": [],
- "m_sizerFlags": [],
- "m_properties": [{
- "type": "winid",
- "m_label": "ID:",
"m_winid": "XRCID(\"git_clear_log\")"
}, {
"type": "string",
@@ -7875,232 +7787,6 @@
}, {
"type": "string",
"m_label": "Name:",
- "m_value": "m_toolbarItem114"
- }, {
- "type": "string",
- "m_label": "Label:",
- "m_value": ""
- }, {
- "type": "multi-string",
- "m_label": "Tooltip:",
- "m_value": ""
- }, {
- "type": "string",
- "m_label": "Help String:",
- "m_value": ""
- }, {
- "type": "bitmapPicker",
- "m_label": "Bitmap File:",
- "m_path": ""
- }, {
- "type": "filePicker",
- "m_label": "Disabled-Bitmap File",
- "m_path": ""
- }, {
- "type": "choice",
- "m_label": "Kind:",
- "m_selection": 3,
- "m_options": ["normal", "checkable", "radio", "separator"]
- }],
- "m_events": [],
- "m_children": []
- }, {
- "m_type": 4462,
- "proportion": 0,
- "border": 5,
- "gbSpan": "1,1",
- "gbPosition": "0,0",
- "m_styles": [],
- "m_sizerFlags": [],
- "m_properties": [{
- "type": "winid",
- "m_label": "ID:",
- "m_winid": "XRCID(\"git_set_repository\")"
- }, {
- "type": "string",
- "m_label": "Name:",
- "m_value": "m_toolbarItem116"
- }, {
- "type": "string",
- "m_label": "Label:",
- "m_value": "Set git repository path"
- }, {
- "type": "multi-string",
- "m_label": "Tooltip:",
- "m_value": "Set git repository path"
- }, {
- "type": "string",
- "m_label": "Help String:",
- "m_value": "Set git repository path"
- }, {
- "type": "bitmapPicker",
- "m_label": "Bitmap File:",
- "m_path": "../codelite-icons-fresh-farm/toolbars/16/standard/document-open.png"
- }, {
- "type": "filePicker",
- "m_label": "Disabled-Bitmap File",
- "m_path": ""
- }, {
- "type": "choice",
- "m_label": "Kind:",
- "m_selection": 0,
- "m_options": ["normal", "checkable", "radio", "separator"]
- }],
- "m_events": [],
- "m_children": []
- }, {
- "m_type": 4462,
- "proportion": 0,
- "border": 5,
- "gbSpan": "1,1",
- "gbPosition": "0,0",
- "m_styles": [],
- "m_sizerFlags": [],
- "m_properties": [{
- "type": "winid",
- "m_label": "ID:",
- "m_winid": "XRCID(\"git_clone\")"
- }, {
- "type": "string",
- "m_label": "Name:",
- "m_value": "m_toolbarItem118"
- }, {
- "type": "string",
- "m_label": "Label:",
- "m_value": "git clone"
- }, {
- "type": "multi-string",
- "m_label": "Tooltip:",
- "m_value": "git clone"
- }, {
- "type": "string",
- "m_label": "Help String:",
- "m_value": "git clone"
- }, {
- "type": "bitmapPicker",
- "m_label": "Bitmap File:",
- "m_path": "icons/png/git-clone.png"
- }, {
- "type": "filePicker",
- "m_label": "Disabled-Bitmap File",
- "m_path": ""
- }, {
- "type": "choice",
- "m_label": "Kind:",
- "m_selection": 0,
- "m_options": ["normal", "checkable", "radio", "separator"]
- }],
- "m_events": [],
- "m_children": []
- }, {
- "m_type": 4462,
- "proportion": 0,
- "border": 5,
- "gbSpan": "1,1",
- "gbPosition": "0,0",
- "m_styles": [],
- "m_sizerFlags": [],
- "m_properties": [{
- "type": "winid",
- "m_label": "ID:",
- "m_winid": "wxID_ANY"
- }, {
- "type": "string",
- "m_label": "Name:",
- "m_value": "m_toolbarItem144"
- }, {
- "type": "string",
- "m_label": "Label:",
- "m_value": "Tool Label"
- }, {
- "type": "multi-string",
- "m_label": "Tooltip:",
- "m_value": ""
- }, {
- "type": "string",
- "m_label": "Help String:",
- "m_value": ""
- }, {
- "type": "bitmapPicker",
- "m_label": "Bitmap File:",
- "m_path": "..\\..\\..\\Users\\PC\\AppData\\Local\\Temp\\placeholder16.png"
- }, {
- "type": "filePicker",
- "m_label": "Disabled-Bitmap File",
- "m_path": ""
- }, {
- "type": "choice",
- "m_label": "Kind:",
- "m_selection": 3,
- "m_options": ["normal", "checkable", "radio", "separator"]
- }],
- "m_events": [],
- "m_children": []
- }, {
- "m_type": 4462,
- "proportion": 0,
- "border": 5,
- "gbSpan": "1,1",
- "gbPosition": "0,0",
- "m_styles": [],
- "m_sizerFlags": [],
- "m_properties": [{
- "type": "winid",
- "m_label": "ID:",
- "m_winid": "XRCID(\"git_apply_patch\")"
- }, {
- "type": "string",
- "m_label": "Name:",
- "m_value": "m_toolbarItemGitPatch"
- }, {
- "type": "string",
- "m_label": "Label:",
- "m_value": "Apply Patch..."
- }, {
- "type": "multi-string",
- "m_label": "Tooltip:",
- "m_value": "Apply Patch..."
- }, {
- "type": "string",
- "m_label": "Help String:",
- "m_value": "Apply Patch..."
- }, {
- "type": "bitmapPicker",
- "m_label": "Bitmap File:",
- "m_path": "icons/png/apply-patch.png"
- }, {
- "type": "filePicker",
- "m_label": "Disabled-Bitmap File",
- "m_path": ""
- }, {
- "type": "choice",
- "m_label": "Kind:",
- "m_selection": 0,
- "m_options": ["normal", "checkable", "radio", "separator"]
- }],
- "m_events": [{
- "m_eventName": "wxEVT_COMMAND_TOOL_CLICKED",
- "m_eventClass": "wxCommandEvent",
- "m_eventHandler": "wxCommandEventHandler",
- "m_functionNameAndSignature": "OnApplyPatch(wxCommandEvent& event)",
- "m_description": "Process a wxEVT_COMMAND_TOOL_CLICKED event (a synonym for wxEVT_COMMAND_MENU_SELECTED). Pass the id of the tool"
- }],
- "m_children": []
- }, {
- "m_type": 4462,
- "proportion": 0,
- "border": 5,
- "gbSpan": "1,1",
... 1706 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-05 06:25:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 89a134d53fe4ad89df992ff9b05c1c0a1c092df4 (commit)
from 600a85773cc75686bc1f24f1f099d7dba807d360 (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/89a134d53fe4ad89df992ff9b05c1c0a1c092df4
commit 89a134d53fe4ad89df992ff9b05c1c0a1c092df4
Author: Eran <era...@gm...>
Date: Sun Jan 5 08:25:09 2014 +0200
CMakePlugin: fixed regression: don't attempt to construct the cmake help content if the database already populated with all the help topics
Moved all static functions to be class members
diff --git a/CMakePlugin/CMake.cpp b/CMakePlugin/CMake.cpp
index 867bfb2..193a41c 100644
--- a/CMakePlugin/CMake.cpp
+++ b/CMakePlugin/CMake.cpp
@@ -39,51 +39,37 @@
#include "workspace.h"
#include "globals.h"
-/* ************************************************************************ */
-/* FUNCTIONS */
-/* ************************************************************************ */
-
-/* ************************************************************************ */
-
-/**
- * @brief Prepare database for CMake.
- *
- * @param db Database
- * @param filename Path where the database is stored.
- *
- * @return If database can be usable
- */
-static bool PrepareDatabase(wxSQLite3Database& db, const wxFileName& filename)
+void CMake::DoPrepareDatabase()
{
try {
- // Try to open database
- db.Open(filename.GetFullPath());
+ m_db.Open(wxFileName(clStandardPaths::Get().GetUserDataDir(), "cmake.db").GetFullPath());
// Not opened
- if (!db.IsOpen())
- return false;
+ if (!m_db.IsOpen()) {
+ m_dbInitialized = false;
+ }
// Create tables
- db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS commands (name TEXT, desc TEXT)");
- db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS modules (name TEXT, desc TEXT)");
- db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS properties (name TEXT, desc TEXT)");
- db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS variables (name TEXT, desc TEXT)");
- db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS strings (name TEXT, desc TEXT)");
+ m_db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS commands (name TEXT, desc TEXT)");
+ m_db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS modules (name TEXT, desc TEXT)");
+ m_db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS properties (name TEXT, desc TEXT)");
+ m_db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS variables (name TEXT, desc TEXT)");
+ m_db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS strings (name TEXT, desc TEXT)");
// Create indices
- db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS commands_idx ON commands(name)");
- db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS modules_idx ON modules(name)");
- db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS properties_idx ON properties(name)");
- db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS variables_idx ON variables(name)");
- db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS strings_idx ON strings(name)");
+ m_db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS commands_idx ON commands(name)");
+ m_db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS modules_idx ON modules(name)");
+ m_db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS properties_idx ON properties(name)");
+ m_db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS variables_idx ON variables(name)");
+ m_db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS strings_idx ON strings(name)");
// Everything is OK
- return true;
+ m_dbInitialized = true;
} catch (const wxSQLite3Exception& e) {
// Unable to use SQLite database
- CL_ERROR("CMake PrepareDatabase error: %s", e.GetMessage());
- return false;
+ CL_ERROR("CMake DoPrepareDatabase error: %s", e.GetMessage());
+ m_dbInitialized = false;
}
}
@@ -98,7 +84,7 @@ CMake::CMake(CMakePlugin* plugin, const wxFileName& path)
, m_helpLoaderThread(NULL)
, m_plugin(plugin)
{
- // Nothing to do
+ DoPrepareDatabase();
}
/* ************************************************************************ */
@@ -159,12 +145,12 @@ CMake::LoadData(bool force)
// Loading data again is not required
if (!m_dirty && !force)
return true;
-
+
if ( m_helpLoaderThread ) {
- // if the helper thread is running, return immediately
+ // if the helper thread is running, return immediately
return false;
}
-
+
// Clear old data
m_helpLoaded = false;
m_version.clear();
@@ -173,21 +159,16 @@ CMake::LoadData(bool force)
m_properties.clear();
m_variables.clear();
- // Create SQLite database
- wxSQLite3Database db;
-
- // Open it
- bool dbOk = PrepareDatabase(db, wxFileName(clStandardPaths::Get().GetUserDataDir(), "cmake.db"));
-
// Load data from database
- if (!force && dbOk && LoadFromDatabase(db))
+ if (!force && m_dbInitialized && LoadFromDatabase()) {
return true;
-
+ }
+
// Unable to use CMake
if (!IsOk()) {
return false;
}
-
+
// Get cmake program path
const wxString program = GetPath().GetFullPath();
@@ -212,10 +193,6 @@ CMake::LoadData(bool force)
return false;
}
- // Database is open so we can store result into database
- if (dbOk)
- StoreIntoDatabase(db);
-
m_dirty = false;
return true;
}
@@ -229,14 +206,14 @@ CMake::LoadFromCMake()
// help is still being loaded
return false;
}
-
+
if ( m_helpLoaded ) {
return true;
}
-
+
// Get cmake program path
const wxString program = GetPath().GetFullPath();
-
+
// Create new help load thread to load the info for us
m_plugin->GetManager()->SetStatusMessage(_("Loading CMake help content..."));
m_helpLoaderThread = new CMakeHelpThread(this, program);
@@ -247,54 +224,59 @@ CMake::LoadFromCMake()
/* ************************************************************************ */
bool
-CMake::LoadFromDatabase(wxSQLite3Database& db)
+CMake::LoadFromDatabase()
{
// Database is closed
- if (!db.IsOpen())
+ if (!m_db.IsOpen())
return false;
- // Strings - Version
- {
- wxSQLite3ResultSet res = db.ExecuteQuery("SELECT desc FROM strings WHERE name = 'version'");
- if (res.NextRow()) {
- m_version = res.GetAsString(0);
+ try {
+ // Strings - Version
+ {
+ wxSQLite3ResultSet res = m_db.ExecuteQuery("SELECT desc FROM strings WHERE name = 'version'");
+ if (res.NextRow()) {
+ m_version = res.GetAsString(0);
+ }
}
- }
- // No data stored
- if (m_version.IsEmpty())
- return false;
+ // No data stored
+ if (m_version.IsEmpty())
+ return false;
- // Commands
- {
- wxSQLite3ResultSet res = db.ExecuteQuery("SELECT name, desc FROM commands");
- while (res.NextRow()) {
- m_commands[res.GetAsString(0)] = res.GetAsString(1);
+ // Commands
+ {
+ wxSQLite3ResultSet res = m_db.ExecuteQuery("SELECT name, desc FROM commands");
+ while (res.NextRow()) {
+ m_commands[res.GetAsString(0)] = res.GetAsString(1);
+ }
}
- }
- // Modules
- {
- wxSQLite3ResultSet res = db.ExecuteQuery("SELECT name, desc FROM modules");
- while (res.NextRow()) {
- m_modules[res.GetAsString(0)] = res.GetAsString(1);
+ // Modules
+ {
+ wxSQLite3ResultSet res = m_db.ExecuteQuery("SELECT name, desc FROM modules");
+ while (res.NextRow()) {
+ m_modules[res.GetAsString(0)] = res.GetAsString(1);
+ }
}
- }
- // Properties
- {
- wxSQLite3ResultSet res = db.ExecuteQuery("SELECT name, desc FROM properties");
- while (res.NextRow()) {
- m_properties[res.GetAsString(0)] = res.GetAsString(1);
+ // Properties
+ {
+ wxSQLite3ResultSet res = m_db.ExecuteQuery("SELECT name, desc FROM properties");
+ while (res.NextRow()) {
+ m_properties[res.GetAsString(0)] = res.GetAsString(1);
+ }
}
- }
- // Variables
- {
- wxSQLite3ResultSet res = db.ExecuteQuery("SELECT name, desc FROM variables");
- while (res.NextRow()) {
- m_variables[res.GetAsString(0)] = res.GetAsString(1);
+ // Variables
+ {
+ wxSQLite3ResultSet res = m_db.ExecuteQuery("SELECT name, desc FROM variables");
+ while (res.NextRow()) {
+ m_variables[res.GetAsString(0)] = res.GetAsString(1);
+ }
}
+ } catch (wxSQLite3Exception &e) {
+ CL_ERROR("Error occured while loading data from CMake database: %s", e.GetMessage());
+ return false;
}
// Data is OK
@@ -306,61 +288,63 @@ CMake::LoadFromDatabase(wxSQLite3Database& db)
/* ************************************************************************ */
-bool
-CMake::StoreIntoDatabase(wxSQLite3Database& db) const
+void CMake::StoreIntoDatabase()
{
- // Database is closed
- if (!db.IsOpen())
- return false;
+ if ( !m_dbInitialized ) {
+ CL_WARNING("CMake: can't store data into database. Database was not initialized properly");
+ return;
+ }
- // Commands
- {
- wxSQLite3Statement stmt = db.PrepareStatement("REPLACE INTO commands (name, desc) VALUES(?, ?)");
- for (HelpMap::const_iterator it = m_commands.begin(), ite = m_commands.end(); it != ite; ++it) {
- stmt.Bind(1, it->first);
- stmt.Bind(2, it->second);
- stmt.ExecuteUpdate();
+ try {
+ // Commands
+ {
+ wxSQLite3Statement stmt = m_db.PrepareStatement("REPLACE INTO commands (name, desc) VALUES(?, ?)");
+ for (HelpMap::const_iterator it = m_commands.begin(), ite = m_commands.end(); it != ite; ++it) {
+ stmt.Bind(1, it->first);
+ stmt.Bind(2, it->second);
+ stmt.ExecuteUpdate();
+ }
}
- }
- // Modules
- {
- wxSQLite3Statement stmt = db.PrepareStatement("REPLACE INTO modules (name, desc) VALUES(?, ?)");
- for (HelpMap::const_iterator it = m_modules.begin(), ite = m_modules.end(); it != ite; ++it) {
- stmt.Bind(1, it->first);
- stmt.Bind(2, it->second);
- stmt.ExecuteUpdate();
+ // Modules
+ {
+ wxSQLite3Statement stmt = m_db.PrepareStatement("REPLACE INTO modules (name, desc) VALUES(?, ?)");
+ for (HelpMap::const_iterator it = m_modules.begin(), ite = m_modules.end(); it != ite; ++it) {
+ stmt.Bind(1, it->first);
+ stmt.Bind(2, it->second);
+ stmt.ExecuteUpdate();
+ }
}
- }
- // Properties
- {
- wxSQLite3Statement stmt = db.PrepareStatement("REPLACE INTO properties (name, desc) VALUES(?, ?)");
- for (HelpMap::const_iterator it = m_properties.begin(), ite = m_properties.end(); it != ite; ++it) {
- stmt.Bind(1, it->first);
- stmt.Bind(2, it->second);
- stmt.ExecuteUpdate();
+ // Properties
+ {
+ wxSQLite3Statement stmt = m_db.PrepareStatement("REPLACE INTO properties (name, desc) VALUES(?, ?)");
+ for (HelpMap::const_iterator it = m_properties.begin(), ite = m_properties.end(); it != ite; ++it) {
+ stmt.Bind(1, it->first);
+ stmt.Bind(2, it->second);
+ stmt.ExecuteUpdate();
+ }
}
- }
- // Variables
- {
- wxSQLite3Statement stmt = db.PrepareStatement("REPLACE INTO variables (name, desc) VALUES(?, ?)");
- for (HelpMap::const_iterator it = m_variables.begin(), ite = m_variables.end(); it != ite; ++it) {
- stmt.Bind(1, it->first);
- stmt.Bind(2, it->second);
- stmt.ExecuteUpdate();
+ // Variables
+ {
+ wxSQLite3Statement stmt = m_db.PrepareStatement("REPLACE INTO variables (name, desc) VALUES(?, ?)");
+ for (HelpMap::const_iterator it = m_variables.begin(), ite = m_variables.end(); it != ite; ++it) {
+ stmt.Bind(1, it->first);
+ stmt.Bind(2, it->second);
+ stmt.ExecuteUpdate();
+ }
}
- }
- // Strings - Version
- {
- wxSQLite3Statement stmt = db.PrepareStatement("REPLACE INTO strings (name, desc) VALUES('version', ?)");
- stmt.Bind(1, m_version);
- stmt.ExecuteUpdate();
+ // Strings - Version
+ {
+ wxSQLite3Statement stmt = m_db.PrepareStatement("REPLACE INTO strings (name, desc) VALUES('version', ?)");
+ stmt.Bind(1, m_version);
+ stmt.ExecuteUpdate();
+ }
+ } catch (wxSQLite3Exception &e) {
+ CL_ERROR("An error occured while storing CMake data into database: %s", e.GetMessage());
}
-
- return true;
}
void CMake::OnCommandsHelpLoaded(CMake::HelpMap* helpMap)
@@ -398,7 +382,10 @@ void CMake::OnHelpLoadCompleted()
m_dirty = false;
m_helpLoaderThread->Stop();
wxDELETE(m_helpLoaderThread);
-
+
+ // Save the info into the database
+ StoreIntoDatabase();
+
m_plugin->GetManager()->SetStatusMessage(_("CMake help content load is completed!"));
}
diff --git a/CMakePlugin/CMake.h b/CMakePlugin/CMake.h
index 2021c4f..9ca4a90 100644
--- a/CMakePlugin/CMake.h
+++ b/CMakePlugin/CMake.h
@@ -34,12 +34,12 @@
#include <wx/filename.h>
#include <wx/arrstr.h>
#include <wx/vector.h>
+#include <wx/wxsqlite3.h>
/* ************************************************************************ */
/* FORWARD DECLARATIONS */
/* ************************************************************************ */
-class wxSQLite3Database;
class CMakeHelpThread;
class CMakePlugin;
@@ -56,12 +56,49 @@ class CMakePlugin;
class CMake : public wxEvtHandler
{
-
// Public Types
public:
/// Lines map.
typedef std::map<wxString, wxString> HelpMap;
+
+// Private Data Members
+private:
+ /// If data is dirty and need to be reloaded.
+ bool m_dirty;
+
+ /// CMake application path.
+ wxFileName m_path;
+
+ /// Cached CMake version.
+ wxString m_version;
+
+ /// List of commands.
+ HelpMap m_commands;
+
+ /// List of modules.
+ HelpMap m_modules;
+
+ /// List of properties.
+ HelpMap m_properties;
+ /// List of variables.
+ HelpMap m_variables;
+
+ /// While loading cmake help data - this marker is set to false
+ bool m_helpLoaded;
+
+ /// Background thread for loading the help content
+ CMakeHelpThread* m_helpLoaderThread;
+
+ /// The cmake plugin
+ CMakePlugin* m_plugin;
+
+ /// A database that contains all cmake help content
+ wxSQLite3Database m_db;
+
+ /// Was the database initialized properly?
+ bool m_dbInitialized;
+
// Public Ctors
public:
@@ -226,7 +263,10 @@ public:
// Private Operations
private:
-
+ /**
+ * @brief initialize the database (create indexes + tables)
+ */
+ void DoPrepareDatabase();
/**
* @brief Reads everything from CMake.
@@ -242,52 +282,13 @@ private:
*
* @return If data is loaded.
*/
- bool LoadFromDatabase(wxSQLite3Database& db);
+ bool LoadFromDatabase();
/**
* @brief Stores data into SQLite3 database.
- *
- * @param db Database.
- *
- * @return If data is stored.
*/
- bool StoreIntoDatabase(wxSQLite3Database& db) const;
-
-
-// Private Data Members
-private:
-
-
- /// If data is dirty and need to be reloaded.
- bool m_dirty;
-
- /// CMake application path.
- wxFileName m_path;
-
- /// Cached CMake version.
- wxString m_version;
-
- /// List of commands.
- HelpMap m_commands;
-
... 42 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-05 05:29:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 600a85773cc75686bc1f24f1f099d7dba807d360 (commit)
from fe5088c831065b479008048055811c11c194f91f (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/600a85773cc75686bc1f24f1f099d7dba807d360
commit 600a85773cc75686bc1f24f1f099d7dba807d360
Author: Eran <era...@gm...>
Date: Sat Jan 4 21:41:42 2014 +0200
New Plugin: CMake Plugin - when enabled in a project, codelite will use CMake generated makefiles instead of using its own makefiles. It also provides a full help content for CMake ( by JiÅÃ Fatka )
diff --git a/CMakePlugin/CMake.cpp b/CMakePlugin/CMake.cpp
new file mode 100644
index 0000000..867bfb2
--- /dev/null
+++ b/CMakePlugin/CMake.cpp
@@ -0,0 +1,413 @@
+/* ************************************************************************ */
+/* */
+/* CMakePlugin for Codelite */
+/* Copyright (C) 2013 JiÅÃ Fatka <nt...@gm...> */
+/* */
+/* This program is free software: you can redistribute it and/or modify */
+/* it under the terms of the GNU General Public License as published by */
+/* the Free Software Foundation, either version 3 of the License, or */
+/* (at your option) any later version. */
+/* */
+/* This program is distributed in the hope that it will be useful, */
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
+/* GNU General Public License for more details. */
+/* */
+/* You should have received a copy of the GNU General Public License */
+/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
+/* */
+/* ************************************************************************ */
+
+/* ************************************************************************ */
+/* INCLUDES */
+/* ************************************************************************ */
+
+// Declaration
+#include "CMake.h"
+#include "CMakePlugin.h"
+#include "cl_standard_paths.h"
+#include "file_logger.h"
+#include "cmakehelpthread.h"
+#include "imanager.h"
+
+// wxWidgets
+#include <wx/regex.h>
+#include <wx/wxsqlite3.h>
+
+// Codelite
+#include "procutils.h"
+#include "workspace.h"
+#include "globals.h"
+
+/* ************************************************************************ */
+/* FUNCTIONS */
+/* ************************************************************************ */
+
+/* ************************************************************************ */
+
+/**
+ * @brief Prepare database for CMake.
+ *
+ * @param db Database
+ * @param filename Path where the database is stored.
+ *
+ * @return If database can be usable
+ */
+static bool PrepareDatabase(wxSQLite3Database& db, const wxFileName& filename)
+{
+ try {
+ // Try to open database
+ db.Open(filename.GetFullPath());
+
+ // Not opened
+ if (!db.IsOpen())
+ return false;
+
+ // Create tables
+ db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS commands (name TEXT, desc TEXT)");
+ db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS modules (name TEXT, desc TEXT)");
+ db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS properties (name TEXT, desc TEXT)");
+ db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS variables (name TEXT, desc TEXT)");
+ db.ExecuteUpdate("CREATE TABLE IF NOT EXISTS strings (name TEXT, desc TEXT)");
+
+ // Create indices
+ db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS commands_idx ON commands(name)");
+ db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS modules_idx ON modules(name)");
+ db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS properties_idx ON properties(name)");
+ db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS variables_idx ON variables(name)");
+ db.ExecuteUpdate("CREATE UNIQUE INDEX IF NOT EXISTS strings_idx ON strings(name)");
+
+ // Everything is OK
+ return true;
+
+ } catch (const wxSQLite3Exception& e) {
+ // Unable to use SQLite database
+ CL_ERROR("CMake PrepareDatabase error: %s", e.GetMessage());
+ return false;
+ }
+}
+
+/* ************************************************************************ */
+/* CLASSES */
+/* ************************************************************************ */
+
+CMake::CMake(CMakePlugin* plugin, const wxFileName& path)
+ : m_dirty(true)
+ , m_path(path)
+ , m_helpLoaded(false)
+ , m_helpLoaderThread(NULL)
+ , m_plugin(plugin)
+{
+ // Nothing to do
+}
+
+/* ************************************************************************ */
+
+wxArrayString
+CMake::GetVersions()
+{
+ static const wxString VERSIONS[] = {
+ "2.8.11",
+ "2.8.10",
+ "2.8.9",
+ "2.8.8",
+ "2.8.7",
+ "2.8.6",
+ "2.8.5",
+ "2.8.4",
+ "2.8.3",
+ "2.8.2",
+ "2.8.1",
+ "2.8.0",
+ "2.6.4",
+ "2.6.3",
+ "2.6.2",
+ "2.6.1",
+ "2.6.0",
+ "2.4.8",
+ "2.4.7",
+ "2.4.6",
+ "2.4.5",
+ "2.4.4",
+ "2.4.3",
+ "2.2.3",
+ "2.0.6",
+ "1.8.3"
+ };
+
+ return wxArrayString(sizeof(VERSIONS) / sizeof(VERSIONS[0]), VERSIONS);
+}
+
+/* ************************************************************************ */
+
+bool
+CMake::IsOk() const
+{
+ wxArrayString output;
+ ProcUtils::SafeExecuteCommand(GetPath().GetFullPath() + " -h", output);
+
+ // SafeExecuteCommand doesn't return status code so the only way
+ // to test the success is the output emptiness.
+ return !output.empty();
+}
+
+/* ************************************************************************ */
+
+bool
+CMake::LoadData(bool force)
+{
+ // Loading data again is not required
+ if (!m_dirty && !force)
+ return true;
+
+ if ( m_helpLoaderThread ) {
+ // if the helper thread is running, return immediately
+ return false;
+ }
+
+ // Clear old data
+ m_helpLoaded = false;
+ m_version.clear();
+ m_commands.clear();
+ m_modules.clear();
+ m_properties.clear();
+ m_variables.clear();
+
+ // Create SQLite database
+ wxSQLite3Database db;
+
+ // Open it
+ bool dbOk = PrepareDatabase(db, wxFileName(clStandardPaths::Get().GetUserDataDir(), "cmake.db"));
+
+ // Load data from database
+ if (!force && dbOk && LoadFromDatabase(db))
+ return true;
+
+ // Unable to use CMake
+ if (!IsOk()) {
+ return false;
+ }
+
+ // Get cmake program path
+ const wxString program = GetPath().GetFullPath();
+
+ // Version
+ {
+ wxArrayString output;
+ ProcUtils::SafeExecuteCommand(program + " --version", output);
+
+ // Unable to find version
+ if (!output.IsEmpty()) {
+ const wxString& versionLine = output[0];
+ wxRegEx expression("cmake version ([0-9\\.]+)");
+
+ if (expression.IsValid() && expression.Matches(versionLine)) {
+ m_version = expression.GetMatch(versionLine, 1);
+ }
+ }
+ }
+
+ // Load data
+ if ( !LoadFromCMake() ) {
+ return false;
+ }
+
+ // Database is open so we can store result into database
+ if (dbOk)
+ StoreIntoDatabase(db);
+
+ m_dirty = false;
+ return true;
+}
+
+/* ************************************************************************ */
+
+bool
+CMake::LoadFromCMake()
+{
+ if ( m_helpLoaderThread ) {
+ // help is still being loaded
+ return false;
+ }
+
+ if ( m_helpLoaded ) {
+ return true;
+ }
+
+ // Get cmake program path
+ const wxString program = GetPath().GetFullPath();
+
+ // Create new help load thread to load the info for us
+ m_plugin->GetManager()->SetStatusMessage(_("Loading CMake help content..."));
+ m_helpLoaderThread = new CMakeHelpThread(this, program);
+ m_helpLoaderThread->Start();
+ return false;
+}
+
+/* ************************************************************************ */
+
+bool
+CMake::LoadFromDatabase(wxSQLite3Database& db)
+{
+ // Database is closed
+ if (!db.IsOpen())
+ return false;
+
+ // Strings - Version
+ {
+ wxSQLite3ResultSet res = db.ExecuteQuery("SELECT desc FROM strings WHERE name = 'version'");
+ if (res.NextRow()) {
+ m_version = res.GetAsString(0);
+ }
+ }
+
+ // No data stored
+ if (m_version.IsEmpty())
+ return false;
+
+ // Commands
+ {
+ wxSQLite3ResultSet res = db.ExecuteQuery("SELECT name, desc FROM commands");
+ while (res.NextRow()) {
+ m_commands[res.GetAsString(0)] = res.GetAsString(1);
+ }
+ }
+
+ // Modules
+ {
+ wxSQLite3ResultSet res = db.ExecuteQuery("SELECT name, desc FROM modules");
+ while (res.NextRow()) {
+ m_modules[res.GetAsString(0)] = res.GetAsString(1);
+ }
+ }
+
+ // Properties
+ {
+ wxSQLite3ResultSet res = db.ExecuteQuery("SELECT name, desc FROM properties");
+ while (res.NextRow()) {
+ m_properties[res.GetAsString(0)] = res.GetAsString(1);
+ }
+ }
+
+ // Variables
+ {
+ wxSQLite3ResultSet res = db.ExecuteQuery("SELECT name, desc FROM variables");
+ while (res.NextRow()) {
+ m_variables[res.GetAsString(0)] = res.GetAsString(1);
+ }
+ }
+
+ // Data is OK
+ m_dirty = false;
+
+ // Everything is loaded
+ return true;
+}
+
+/* ************************************************************************ */
+
+bool
+CMake::StoreIntoDatabase(wxSQLite3Database& db) const
+{
+ // Database is closed
+ if (!db.IsOpen())
+ return false;
+
+ // Commands
+ {
+ wxSQLite3Statement stmt = db.PrepareStatement("REPLACE INTO commands (name, desc) VALUES(?, ?)");
+ for (HelpMap::const_iterator it = m_commands.begin(), ite = m_commands.end(); it != ite; ++it) {
+ stmt.Bind(1, it->first);
+ stmt.Bind(2, it->second);
+ stmt.ExecuteUpdate();
+ }
+ }
+
+ // Modules
+ {
+ wxSQLite3Statement stmt = db.PrepareStatement("REPLACE INTO modules (name, desc) VALUES(?, ?)");
+ for (HelpMap::const_iterator it = m_modules.begin(), ite = m_modules.end(); it != ite; ++it) {
+ stmt.Bind(1, it->first);
+ stmt.Bind(2, it->second);
+ stmt.ExecuteUpdate();
+ }
+ }
+
+ // Properties
+ {
+ wxSQLite3Statement stmt = db.PrepareStatement("REPLACE INTO properties (name, desc) VALUES(?, ?)");
+ for (HelpMap::const_iterator it = m_properties.begin(), ite = m_properties.end(); it != ite; ++it) {
+ stmt.Bind(1, it->first);
+ stmt.Bind(2, it->second);
+ stmt.ExecuteUpdate();
+ }
+ }
+
+ // Variables
+ {
+ wxSQLite3Statement stmt = db.PrepareStatement("REPLACE INTO variables (name, desc) VALUES(?, ?)");
+ for (HelpMap::const_iterator it = m_variables.begin(), ite = m_variables.end(); it != ite; ++it) {
+ stmt.Bind(1, it->first);
+ stmt.Bind(2, it->second);
+ stmt.ExecuteUpdate();
+ }
+ }
+
+ // Strings - Version
+ {
+ wxSQLite3Statement stmt = db.PrepareStatement("REPLACE INTO strings (name, desc) VALUES('version', ?)");
+ stmt.Bind(1, m_version);
+ stmt.ExecuteUpdate();
+ }
+
+ return true;
+}
+
+void CMake::OnCommandsHelpLoaded(CMake::HelpMap* helpMap)
+{
+ m_commands.clear();
+ m_commands.swap( *helpMap );
+ wxDELETE( helpMap );
+}
+
+void CMake::OnModulesHelpLoaded(CMake::HelpMap* helpMap)
+{
+ m_modules.clear();
+ m_modules.swap( *helpMap );
+ wxDELETE(helpMap);
+}
+
+void CMake::OnPropertiesHelpLoaded(CMake::HelpMap* helpMap)
+{
+ m_properties.clear();
+ m_properties.swap( *helpMap );
+ wxDELETE(helpMap);
+}
+
+void CMake::OnVariablesHelpLoaded(CMake::HelpMap* helpMap)
+{
+ m_variables.clear();
+ m_variables.swap( *helpMap );
+ wxDELETE(helpMap);
+}
+
+void CMake::OnHelpLoadCompleted()
+{
+ // Cleanup after our help thread
+ m_helpLoaded = true;
+ m_dirty = false;
+ m_helpLoaderThread->Stop();
+ wxDELETE(m_helpLoaderThread);
+
+ m_plugin->GetManager()->SetStatusMessage(_("CMake help content load is completed!"));
+}
+
+CMake::~CMake()
+{
+ if ( m_helpLoaderThread ) {
+ m_helpLoaderThread->Stop();
+ wxDELETE(m_helpLoaderThread);
+ }
+}
+
+/* ************************************************************************ */
diff --git a/CMakePlugin/CMake.h b/CMakePlugin/CMake.h
new file mode 100644
index 0000000..2021c4f
--- /dev/null
+++ b/CMakePlugin/CMake.h
@@ -0,0 +1,295 @@
+/* ************************************************************************ */
+/* */
+/* CMakePlugin for Codelite */
+/* Copyright (C) 2013 JiÅÃ Fatka <nt...@gm...> */
+/* */
+/* This program is free software: you can redistribute it and/or modify */
+/* it under the terms of the GNU General Public License as published by */
+/* the Free Software Foundation, either version 3 of the License, or */
+/* (at your option) any later version. */
+/* */
+/* This program is distributed in the hope that it will be useful, */
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
+/* GNU General Public License for more details. */
+/* */
+/* You should have received a copy of the GNU General Public License */
+/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
+/* */
+/* ************************************************************************ */
+
+#ifndef CMAKE_HPP_
+#define CMAKE_HPP_
+
+/* ************************************************************************ */
+/* INCLUDES */
+/* ************************************************************************ */
+
+// C++
+#include <map>
+
+// wxWidgets
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/filename.h>
+#include <wx/arrstr.h>
+#include <wx/vector.h>
+
+/* ************************************************************************ */
+/* FORWARD DECLARATIONS */
+/* ************************************************************************ */
+
+class wxSQLite3Database;
+class CMakeHelpThread;
+class CMakePlugin;
+
+/* ************************************************************************ */
+/* CLASSES */
+/* ************************************************************************ */
+
+/**
+ * @brief Class representing the cmake application.
+ *
+ * Class can be used for extracting help data from current installed
+ * version of CMake like supported commands, modules, etc.
+ */
+
+class CMake : public wxEvtHandler
+{
+
... 14297 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2014-01-04 14:28: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 fe5088c831065b479008048055811c11c194f91f (commit)
from 829d145508517660b53387a95908cfbc2ab53b03 (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/fe5088c831065b479008048055811c11c194f91f
commit fe5088c831065b479008048055811c11c194f91f
Author: dghart <da...@4P...>
Date: Sat Jan 4 14:28:35 2014 +0000
Compilation fix for non precompiled-header builds
diff --git a/LiteEditor/clang_cleaner_thread.cpp b/LiteEditor/clang_cleaner_thread.cpp
index fcede29..1f31e86 100644
--- a/LiteEditor/clang_cleaner_thread.cpp
+++ b/LiteEditor/clang_cleaner_thread.cpp
@@ -2,6 +2,9 @@
#include "file_logger.h"
#include <wx/dir.h>
#include <wx/filefn.h>
+#include <wx/log.h>
+#include <wx/filename.h>
+#include <wx/utils.h>
#if HAS_LIBCLANG
ClangCleanerThread::ClangCleanerThread()
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/clang_cleaner_thread.cpp | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-04 09:37:38
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 829d145508517660b53387a95908cfbc2ab53b03 (commit)
from 39151a7bdadd885777ad0fa361f1fd1460d0fae2 (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/829d145508517660b53387a95908cfbc2ab53b03
commit 829d145508517660b53387a95908cfbc2ab53b03
Author: Eran <era...@gm...>
Date: Sat Jan 4 11:37:10 2014 +0200
Really fix the clang issue where it locks the file for writing
diff --git a/Interfaces/plugin.h b/Interfaces/plugin.h
index 625bee6..0a9fc97 100644
--- a/Interfaces/plugin.h
+++ b/Interfaces/plugin.h
@@ -372,6 +372,7 @@ enum MenuType {
// will be left disabled
// to return a true or false reply to codelite, use
// evt.SetAnswer( true / false )
+// The workspace name should also returned in the evt.SetString(..)
#define wxEVT_CMD_IS_WORKSPACE_OPEN 3511
// User has requested a retagging for the workspace
@@ -572,7 +573,8 @@ enum MenuType {
#define wxEVT_DBG_UI_STEP_OUT 3551 // Step out of current frame
#define wxEVT_DBG_UI_NEXT 3552 // Next line
#define wxEVT_DBG_UI_NEXT_INST 3553 // Next instruction
-#define wxEVT_DBG_UI_INTERRUPT 3553 // Interrupt the debugger execution
+#define wxEVT_DBG_UI_INTERRUPT 3554 // Interrupt the debugger execution
+#define wxEVT_DBG_IS_RUNNING 3555 // Use evet.SetAnswer() method to reply
//------------------------------------------------------------------
//each plugin must implement this interface
diff --git a/LiteEditor/app.cpp b/LiteEditor/app.cpp
index 3aefeb3..61e8f4d 100644
--- a/LiteEditor/app.cpp
+++ b/LiteEditor/app.cpp
@@ -340,7 +340,7 @@ bool CodeLiteApp::OnInit()
// this is needed because python complies the files and in most cases the user
// running codelite has no write permissions to /usr/share/codelite/...
DoCopyGdbPrinters();
-
+
#if defined (__WXGTK__)
if (homeDir.IsEmpty()) {
SetAppName(wxT("codelite"));
diff --git a/LiteEditor/cl_editor.cpp b/LiteEditor/cl_editor.cpp
index b50d646..abaa34d 100644
--- a/LiteEditor/cl_editor.cpp
+++ b/LiteEditor/cl_editor.cpp
@@ -67,6 +67,7 @@
#include "localworkspace.h"
#include "findresultstab.h"
#include "bookmark_manager.h"
+#include "clang_code_completion.h"
// fix bug in wxscintilla.h
#ifdef EVT_STC_CALLTIP_CLICK
@@ -1216,6 +1217,19 @@ bool LEditor::SaveToFile(const wxFileName &fileName)
// Make sure we can open the file for writing
wxString tmp_file;
+
+#if HAS_LIBCLANG
+#ifdef __WXMSW__
+ // There is a bug in clang that locks the file
+ wxFFile testFile(fileName.GetFullPath().GetData(), "wb"); // use ab to make sure that the file content is not discarded
+ if ( !testFile.IsOpened() ) {
+ ClangCodeCompletion::Instance()->ClearCache();
+ } else {
+ testFile.Close();
+ }
+#endif
+#endif //HAS_LIBCLANG
+
wxFFile file(fileName.GetFullPath().GetData(), wxT("wb"));
if (file.IsOpened() == false) {
// Nothing to be done
diff --git a/LiteEditor/clang_cleaner_thread.cpp b/LiteEditor/clang_cleaner_thread.cpp
index 048cd45..fcede29 100644
--- a/LiteEditor/clang_cleaner_thread.cpp
+++ b/LiteEditor/clang_cleaner_thread.cpp
@@ -19,13 +19,13 @@ void* ClangCleanerThread::Entry()
while ( !TestDestroy() ) {
// Clear all temporary files created for clang parsing
- DeleteTemporaryFiles();
+ // DeleteTemporaryFiles();
// Clear stale .pch files from %TMP%
// libclang does not clear properly any stale files under %TMP% (this is at least under Windows)
DeleteStalePCHFiles();
- wxThread::This()->Sleep( 2000 );
+ wxThread::This()->Sleep( 5000 );
}
// Before we exit, try to perform one last cleanup
diff --git a/LiteEditor/clang_driver.cpp b/LiteEditor/clang_driver.cpp
index b322ecc..bc7cff1 100644
--- a/LiteEditor/clang_driver.cpp
+++ b/LiteEditor/clang_driver.cpp
@@ -149,13 +149,16 @@ ClangThreadRequest* ClangDriver::DoMakeClangThreadRequest(IEditor* editor, Worki
wxString projectPath;
wxString pchFile;
FileTypeCmpArgs_t compileFlags = DoPrepareCompilationArgs(editor->GetProjectName(), fileName, projectPath, pchFile);
-
+
+#if 0
+ //{
// Prepare a copy of the file but with as special prefix CODELITE_CLANG_FILE_PREFIX
// We do this because on Windows, libclang locks the file so
// the user can not save into the file until it is released by libclang (which may take a while...)
// we overcome this by letting clang compile a copy of the file
// The temporary file that was created for this purpose is later deleted by a special "cleaner" thread
// which removes all kind of libclang leftovers (preamble*.pch files under %TMP% and these files)
+
wxFileName source_file(fileName);
source_file.SetFullName( CODELITE_CLANG_FILE_PREFIX + source_file.GetFullName() );
@@ -163,7 +166,11 @@ ClangThreadRequest* ClangDriver::DoMakeClangThreadRequest(IEditor* editor, Worki
wxLogNull nl;
::wxCopyFile( fileName, source_file.GetFullPath() );
}
-
+ //}
+#else
+ wxFileName source_file(fileName);
+#endif
+
ClangThreadRequest* request = new ClangThreadRequest(m_index,
fileName,
currentBuffer,
@@ -842,6 +849,8 @@ ClangThreadRequest::List_t ClangDriver::DoCreateListOfModifiedBuffers(IEditor* e
void ClangDriver::DoDeleteTempFile(const wxString& fileName)
{
+ wxUnusedVar(fileName);
+ /*
if ( fileName.IsEmpty() ) {
return;
}
@@ -851,7 +860,7 @@ void ClangDriver::DoDeleteTempFile(const wxString& fileName)
{
wxLogNull nl;
m_clangCleanerThread.AddFileName( sourceFile.GetFullPath() );
- }
+ }*/
}
#endif // HAS_LIBCLANG
-----------------------------------------------------------------------
Summary of changes:
Interfaces/plugin.h | 4 +++-
LiteEditor/app.cpp | 2 +-
LiteEditor/cl_editor.cpp | 14 ++++++++++++++
LiteEditor/clang_cleaner_thread.cpp | 4 ++--
LiteEditor/clang_driver.cpp | 15 ++++++++++++---
5 files changed, 32 insertions(+), 7 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-03 22:05: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 39151a7bdadd885777ad0fa361f1fd1460d0fae2 (commit)
from 74fa9d55c2cc0fe89cf4c1c742cb7ab5c07f9a95 (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/39151a7bdadd885777ad0fa361f1fd1460d0fae2
commit 39151a7bdadd885777ad0fa361f1fd1460d0fae2
Author: Eran <era...@gm...>
Date: Sat Jan 4 00:03:45 2014 +0200
Fixed: with the newer version of libclang.dll (especially on Windows) clang seems to lock the current file until the compilation is over a really nasty side effect for this lock is that the user can not save anything to the file while clang is holding the lock. A workaround was to pass a temporary file name to clang for compilation and deleting that file when the TU is prepared
Fixed: another nasty bug with the latest libclang, is that clang does not deletes its temporary preamble PCH files that it creates under %TMP% (again, observed under Windows) - this may use a huge amount of disk ( it can easily go up to 10-15 GB )a workaround was to add a special cleaner thread that will delete both the stale PCH files and the temporary files created for parsing (see previous comment)
Changed debugger event to use special type "clDebugEvent"
diff --git a/CodeLite/cl_command_event.cpp b/CodeLite/cl_command_event.cpp
index 564ad1b..567bbac 100644
--- a/CodeLite/cl_command_event.cpp
+++ b/CodeLite/cl_command_event.cpp
@@ -154,3 +154,27 @@ clBuildEvent& clBuildEvent::operator=(const clBuildEvent& src)
m_projectOnly = src.m_projectOnly;
return *this;
}
+
+// ------------------------------------------------------------------
+// clDebugEvent
+// ------------------------------------------------------------------
+clDebugEvent::clDebugEvent(wxEventType commandType, int winid)
+ : clCommandEvent(commandType, winid)
+{
+}
+
+clDebugEvent::~clDebugEvent()
+{
+}
+
+clDebugEvent::clDebugEvent(const clDebugEvent& event)
+{
+ *this = event;
+}
+
+clDebugEvent& clDebugEvent::operator=(const clDebugEvent& src)
+{
+ m_projectName = src.m_projectName;
+ m_configurationName = src.m_configurationName;
+ return *this;
+}
diff --git a/CodeLite/cl_command_event.h b/CodeLite/cl_command_event.h
index fef71af..24bd966 100644
--- a/CodeLite/cl_command_event.h
+++ b/CodeLite/cl_command_event.h
@@ -244,4 +244,40 @@ typedef void (wxEvtHandler::*clBuildEventFunction)(clBuildEvent&);
#define clBuildEventHandler(func) \
wxEVENT_HANDLER_CAST(clBuildEventFunction, func)
+// -------------------------------------------------------------------------
+// clDebugEvent
+// -------------------------------------------------------------------------
+class WXDLLIMPEXP_CL clDebugEvent : public clCommandEvent
+{
+ wxString m_projectName;
+ wxString m_configurationName;
+
+public:
+ clDebugEvent(wxEventType commandType = wxEVT_NULL, int winid = 0);
+ clDebugEvent(const clDebugEvent& event);
+ clDebugEvent& operator=(const clDebugEvent& src);
+
+ virtual ~clDebugEvent();
+ virtual wxEvent *Clone() const {
+ return new clDebugEvent(*this);
+ };
+
+ void SetConfigurationName(const wxString& configurationName) {
+ this->m_configurationName = configurationName;
+ }
+ void SetProjectName(const wxString& projectName) {
+ this->m_projectName = projectName;
+ }
+ const wxString& GetConfigurationName() const {
+ return m_configurationName;
+ }
+ const wxString& GetProjectName() const {
+ return m_projectName;
+ }
+};
+
+typedef void (wxEvtHandler::*clDebugEventFunction)(clDebugEvent&);
+#define clDebugEventHandler(func) \
+ wxEVENT_HANDLER_CAST(clDebugEventFunction, func)
+
#endif // CLCOMMANDEVENT_H
diff --git a/Debugger/dbgcmd.cpp b/Debugger/dbgcmd.cpp
index 9bd426d..53bac06 100644
--- a/Debugger/dbgcmd.cpp
+++ b/Debugger/dbgcmd.cpp
@@ -1461,7 +1461,7 @@ bool DbgCmdJumpHandler::ProcessOutput(const wxString& line)
bool DbgCmdStopHandler::ProcessOutput(const wxString& line)
{
wxUnusedVar(line);
- wxCommandEvent event(wxEVT_DBG_STOP_DEBUGGER);
+ wxCommandEvent event(wxEVT_GDB_STOP_DEBUGGER);
EventNotifier::Get()->AddPendingEvent(event);
return true;
}
diff --git a/Debugger/debuggergdb.cpp b/Debugger/debuggergdb.cpp
index ad52cbc..847cf4e 100644
--- a/Debugger/debuggergdb.cpp
+++ b/Debugger/debuggergdb.cpp
@@ -70,7 +70,7 @@ static wxFFile gfp(wxT("debugger.log"), wxT("w+"));
# define DBG_LOG 0
#endif
-const wxEventType wxEVT_DBG_STOP_DEBUGGER = wxNewEventType();
+const wxEventType wxEVT_GDB_STOP_DEBUGGER = wxNewEventType();
//Using the running image of child Thread 46912568064384 (LWP 7051).
static wxRegEx reInfoProgram1( wxT( "\\(LWP[ \t]([0-9]+)\\)" ) );
@@ -159,7 +159,7 @@ DbgGdb::DbgGdb()
}
#endif
- EventNotifier::Get()->Connect(wxEVT_DBG_STOP_DEBUGGER, wxCommandEventHandler(DbgGdb::OnKillGDB), NULL, this);
+ EventNotifier::Get()->Connect(wxEVT_GDB_STOP_DEBUGGER, wxCommandEventHandler(DbgGdb::OnKillGDB), NULL, this);
}
DbgGdb::~DbgGdb()
@@ -170,7 +170,7 @@ DbgGdb::~DbgGdb()
Kernel32Dll = NULL;
}
#endif
- EventNotifier::Get()->Disconnect(wxEVT_DBG_STOP_DEBUGGER, wxCommandEventHandler(DbgGdb::OnKillGDB), NULL, this);
+ EventNotifier::Get()->Disconnect(wxEVT_GDB_STOP_DEBUGGER, wxCommandEventHandler(DbgGdb::OnKillGDB), NULL, this);
}
void DbgGdb::RegisterHandler( const wxString &id, DbgCmdHandler *cmd )
@@ -303,7 +303,7 @@ bool DbgGdb::Stop()
}
- wxCommandEvent event(wxEVT_DBG_STOP_DEBUGGER);
+ wxCommandEvent event(wxEVT_GDB_STOP_DEBUGGER);
EventNotifier::Get()->AddPendingEvent(event);
return true;
}
diff --git a/Debugger/debuggergdb.h b/Debugger/debuggergdb.h
index d7104a5..343b892 100644
--- a/Debugger/debuggergdb.h
+++ b/Debugger/debuggergdb.h
@@ -52,7 +52,7 @@ class IProcess;
WX_DECLARE_STRING_HASH_MAP(DbgCmdHandler*, HandlersMap);
-extern const wxEventType wxEVT_DBG_STOP_DEBUGGER;
+extern const wxEventType wxEVT_GDB_STOP_DEBUGGER;
class DbgGdb : public wxEvtHandler, public IDebugger
{
diff --git a/Interfaces/plugin.h b/Interfaces/plugin.h
index cc99b03..625bee6 100644
--- a/Interfaces/plugin.h
+++ b/Interfaces/plugin.h
@@ -469,10 +469,6 @@ enum MenuType {
// use event.GetClientData() to get a pointer to the wxWindow*
#define wxEVT_CMD_PAGE_CHANGED 3527
-// A "Start Debugger" command as been requested (via the menu Debug -> Start / Continue Debugger or via a Hotkey)
-// a plugin can veto this event.
-#define wxEVT_NOTIFY_DEBUGGER_START_CMD 3528
-
// Triggers a workspace view tree rebuild (useful when user has modified the workspace / project structure and he want
// to reflect the changes in the tree view)
#define wxEVT_REBUILD_WORKSPACE_TREE 3529
@@ -564,6 +560,20 @@ enum MenuType {
// Sent by codelite whenever it needs the pen colour for the tab area
#define wxEVT_GET_TAB_BORDER_COLOUR 3546
+// ---------------------------------------------------------------------
+// Debugger events
+// The following events are firing the clDebugEvent class
+// If a plugin wishes to override codelite's default debugger (gdb)
+// it simply needs to connect the event and avoid calling 'event.Skip();
+//----------------------------------------------------------------------
+#define wxEVT_DBG_UI_START_OR_CONT 3547 // Start the debugger or continue
+#define wxEVT_DBG_UI_STOP 3549 // Stop the debugger
+#define wxEVT_DBG_UI_STEP_IN 3550 // Step into function
+#define wxEVT_DBG_UI_STEP_OUT 3551 // Step out of current frame
+#define wxEVT_DBG_UI_NEXT 3552 // Next line
+#define wxEVT_DBG_UI_NEXT_INST 3553 // Next instruction
+#define wxEVT_DBG_UI_INTERRUPT 3553 // Interrupt the debugger execution
+
//------------------------------------------------------------------
//each plugin must implement this interface
//------------------------------------------------------------------
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index 731e4e5..17febe6 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -716,6 +716,8 @@
<File Name="code_completion_box.cpp"/>
<File Name="clang_compilation_db_thread.h"/>
<File Name="clang_compilation_db_thread.cpp"/>
+ <File Name="clang_cleaner_thread.h"/>
+ <File Name="clang_cleaner_thread.cpp"/>
</VirtualDirectory>
<Dependencies Name="WinRelease_29">
<Project Name="wxscintilla"/>
@@ -1364,8 +1366,7 @@ resources.cpp: resources.xrc
wxrc /c /v /o resources.cpp resources.xrc
svninfo.cpp:
- autorev .
-</CustomPreBuild>
+ autorev .</CustomPreBuild>
</AdditionalRules>
<Completion EnableCpp11="yes">
<ClangCmpFlagsC/>
@@ -1386,7 +1387,7 @@ svninfo.cpp:
<IncludePath Value="../sdk/clang/include"/>
<Preprocessor Value="HAS_LIBCLANG"/>
</Compiler>
- <Linker Options="-s;$(shell wx-config --debug=no --unicode=yes --libs std,stc);-Wl,--subsystem,windows -mwindows;-Wl,-M=codelite.map;-O2" Required="yes">
+ <Linker Options="-s;$(shell wx-config --debug=no --unicode=yes --libs std,stc);-Wl,--subsystem,windows -mwindows;-O2" Required="yes">
<LibraryPath Value="."/>
<LibraryPath Value="../lib/gcc_lib"/>
<LibraryPath Value="../sdk/clang/lib"/>
@@ -1423,7 +1424,8 @@ svninfo.cpp:
<CustomPostBuild/>
<CustomPreBuild>resources.cpp
resources.cpp: resources.xrc
- wxrc /c /v /o resources.cpp resources.xrc</CustomPreBuild>
+ wxrc /c /v /o resources.cpp resources.xrc
+</CustomPreBuild>
</AdditionalRules>
<Completion EnableCpp11="yes">
<ClangCmpFlagsC/>
diff --git a/LiteEditor/clang_cleaner_thread.cpp b/LiteEditor/clang_cleaner_thread.cpp
new file mode 100644
index 0000000..048cd45
--- /dev/null
+++ b/LiteEditor/clang_cleaner_thread.cpp
@@ -0,0 +1,93 @@
+#include "clang_cleaner_thread.h"
+#include "file_logger.h"
+#include <wx/dir.h>
+#include <wx/filefn.h>
+#if HAS_LIBCLANG
+
+ClangCleanerThread::ClangCleanerThread()
+ : wxThread(wxTHREAD_JOINABLE)
+{
+}
+
+ClangCleanerThread::~ClangCleanerThread()
+{
+}
+
+void* ClangCleanerThread::Entry()
+{
+ wxLogNull nl;
+ while ( !TestDestroy() ) {
+
+ // Clear all temporary files created for clang parsing
+ DeleteTemporaryFiles();
+
+ // Clear stale .pch files from %TMP%
+ // libclang does not clear properly any stale files under %TMP% (this is at least under Windows)
+ DeleteStalePCHFiles();
+
+ wxThread::This()->Sleep( 2000 );
+ }
+
+ // Before we exit, try to perform one last cleanup
+ DeleteTemporaryFiles();
+ DeleteStalePCHFiles();
+ return NULL;
+}
+
+void ClangCleanerThread::AddFileName(const wxString& filename)
+{
+ wxCriticalSectionLocker locker( m_cs );
+ if ( m_files.count(filename) == 0 ) {
+ m_files.insert( filename );
+ }
+}
+
+void ClangCleanerThread::DeleteTemporaryFiles()
+{
+ wxStringSet_t files;
+ {
+ wxCriticalSectionLocker locker( m_cs );
+ files.swap( m_files );
+ m_files.clear();
+ }
+
+ wxStringSet_t failedSet;
+ wxStringSet_t::const_iterator iter = files.begin();
+ while ( iter != files.end() ) {
+ if ( wxFileName::Exists(*iter) && !::wxRemoveFile( *iter ) ) {
+ failedSet.insert( *iter );
+ CL_DEBUG("Failed to delete file %s", *iter);
+
+ } else {
+ CL_DEBUG("Successfully deleted file %s", *iter);
+ }
+ ++iter;
+ }
+
+ if ( !failedSet.empty() ) {
+ wxCriticalSectionLocker locker( m_cs );
+
+ // add the "failed" files to the set, we will try again later
+ m_files.insert( failedSet.begin(), failedSet.end() );
+ }
+}
+
+void ClangCleanerThread::DeleteStalePCHFiles()
+{
+ wxString tmpdir;
+ if ( ::wxGetEnv("TMP", &tmpdir) ) {
+ wxArrayString files;
+ if ( wxDir::GetAllFiles(tmpdir, &files, "*.pch", wxDIR_FILES) ) {
+ for(size_t i=0; i<files.GetCount(); ++i) {
+ wxFileName fn( files.Item(i) );
+ if ( fn.GetFullName().StartsWith("preamble") ) {
+ if( ::wxRemoveFile( files.Item(i) ) ) {
+ CL_DEBUG("Deleting stale file: %s", files.Item(i) );
+ }
+ }
+ }
+ }
+ }
+}
+
+#endif // HAS_LIBCLANG
diff --git a/LiteEditor/clang_cleaner_thread.h b/LiteEditor/clang_cleaner_thread.h
new file mode 100644
index 0000000..230bf7d
--- /dev/null
+++ b/LiteEditor/clang_cleaner_thread.h
@@ -0,0 +1,50 @@
+#ifndef CLANGCLEANERTHREAD_H
+#define CLANGCLEANERTHREAD_H
+
+#if HAS_LIBCLANG
+#include <wx/thread.h> // Base class: wxThread
+#include "macros.h"
+
+class ClangCleanerThread : public wxThread
+{
+ wxCriticalSection m_cs;
+ wxStringSet_t m_files;
+
+protected:
+ void DeleteTemporaryFiles();
+ void DeleteStalePCHFiles();
+
+public:
+ ClangCleanerThread();
+ virtual ~ClangCleanerThread();
+
+public:
+ virtual void* Entry();
+
+ void Start() {
+ Create();
+ Run();
+ }
+
+ /**
+ * @brief stop the working thread
+ * this function shdould be called from the main thread only
+ */
+ void Stop() {
+ if ( IsAlive() ) {
+ Delete(NULL, wxTHREAD_WAIT_BLOCK);
+
+ } else {
+ Wait(wxTHREAD_WAIT_BLOCK);
+ }
+ }
+
+ /**
+ * @brief add a file name to be cleared from the file system
+ * @param filename
+ */
+ void AddFileName( const wxString &filename );
+};
+
+#endif // HAS_LIBCLANG
+#endif // CLANGCLEANERTHREAD_H
diff --git a/LiteEditor/clang_driver.cpp b/LiteEditor/clang_driver.cpp
index 6ad91b7..b322ecc 100644
--- a/LiteEditor/clang_driver.cpp
+++ b/LiteEditor/clang_driver.cpp
@@ -56,6 +56,8 @@ ClangDriver::ClangDriver()
m_index = clang_createIndex(0, 0);
m_pchMakerThread.SetSleepInterval(30);
m_pchMakerThread.Start();
+ m_clangCleanerThread.Start();
+
EventNotifier::Get()->Connect(wxEVT_CLANG_PCH_CACHE_ENDED, wxCommandEventHandler(ClangDriver::OnPrepareTUEnded), NULL, this);
EventNotifier::Get()->Connect(wxEVT_CLANG_PCH_CACHE_CLEARED, wxCommandEventHandler(ClangDriver::OnCacheCleared), NULL, this);
EventNotifier::Get()->Connect(wxEVT_CLANG_TU_CREATE_ERROR, wxCommandEventHandler(ClangDriver::OnTUCreateError), NULL, this);
@@ -74,6 +76,7 @@ ClangDriver::~ClangDriver()
m_pchMakerThread.Stop();
m_pchMakerThread.ClearCache(); // clear cache and dispose all translation units
+ m_clangCleanerThread.Stop();
clang_disposeIndex(m_index);
}
@@ -146,6 +149,21 @@ ClangThreadRequest* ClangDriver::DoMakeClangThreadRequest(IEditor* editor, Worki
wxString projectPath;
wxString pchFile;
FileTypeCmpArgs_t compileFlags = DoPrepareCompilationArgs(editor->GetProjectName(), fileName, projectPath, pchFile);
+
+ // Prepare a copy of the file but with as special prefix CODELITE_CLANG_FILE_PREFIX
+ // We do this because on Windows, libclang locks the file so
+ // the user can not save into the file until it is released by libclang (which may take a while...)
+ // we overcome this by letting clang compile a copy of the file
+ // The temporary file that was created for this purpose is later deleted by a special "cleaner" thread
+ // which removes all kind of libclang leftovers (preamble*.pch files under %TMP% and these files)
+ wxFileName source_file(fileName);
+ source_file.SetFullName( CODELITE_CLANG_FILE_PREFIX + source_file.GetFullName() );
+
+ {
+ wxLogNull nl;
+ ::wxCopyFile( fileName, source_file.GetFullPath() );
+ }
+
ClangThreadRequest* request = new ClangThreadRequest(m_index,
fileName,
currentBuffer,
@@ -154,7 +172,7 @@ ClangThreadRequest* ClangDriver::DoMakeClangThreadRequest(IEditor* editor, Worki
context,
lineNumber,
column, DoCreateListOfModifiedBuffers(editor));
- request->SetPchFile(pchFile);
+ request->SetFileName( source_file.GetFullPath() );
return request;
}
@@ -463,12 +481,21 @@ void ClangDriver::OnPrepareTUEnded(wxCommandEvent& e)
// Sanity
ClangThreadReply* reply = (ClangThreadReply*) e.GetClientData();
- if(!reply)
+ if( !reply ) {
return;
-
+ }
+
// Make sure we delete the reply at the end...
std::auto_ptr<ClangThreadReply> ap(reply);
-
+
+ // Delete the fake file...
+ DoDeleteTempFile( reply->filename );
+
+ // Just a notification without real info?
+ if ( reply->context == CTX_None ) {
+ return;
+ }
+
if(reply->context == ::CTX_CachePCH || reply->context == ::CTX_ReparseTU) {
return; // Nothing more to be done
}
@@ -482,7 +509,7 @@ void ClangDriver::OnPrepareTUEnded(wxCommandEvent& e)
// Adjust the activeEditor to fit the filename
IEditor *editor = clMainFrame::Get()->GetMainBook()->FindEditor(reply->filename);
- if(!editor) {
+ if ( !editor ) {
CL_DEBUG(wxT("Could not find an editor for file %s"), reply->filename.c_str());
return;
}
@@ -709,6 +736,11 @@ void ClangDriver::DoGotoDefinition(ClangThreadReply* reply)
void ClangDriver::OnTUCreateError(wxCommandEvent& e)
{
e.Skip();
+ ClangThreadReply* reply = reinterpret_cast<ClangThreadReply*>( e.GetClientData() );
+ if ( reply ) {
+ DoDeleteTempFile( reply->filename );
+ wxDELETE(reply);
+ }
DoCleanup();
}
@@ -807,5 +839,19 @@ ClangThreadRequest::List_t ClangDriver::DoCreateListOfModifiedBuffers(IEditor* e
}
return modifiedBuffers;
}
+
+void ClangDriver::DoDeleteTempFile(const wxString& fileName)
... 555 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2014-01-03 10:00:12
|
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 74fa9d55c2cc0fe89cf4c1c742cb7ab5c07f9a95 (commit)
from b653e7db60e73a94afac66c0dde7a150dc8a4e4b (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/74fa9d55c2cc0fe89cf4c1c742cb7ab5c07f9a95
commit 74fa9d55c2cc0fe89cf4c1c742cb7ab5c07f9a95
Author: dghart <da...@4P...>
Date: Thu Jan 2 20:21:17 2014 +0000
Beginning the reworking of the Git plugin
The 'git pull' tool now has a dropdown, with both 'pull' and 'pull --rebase' commands. The associated wiring works, but needs some generalising.
diff --git a/git/GitConsole.cpp b/git/GitConsole.cpp
index 8484122..158f7ec 100644
--- a/git/GitConsole.cpp
+++ b/git/GitConsole.cpp
@@ -13,6 +13,7 @@
#include "lexer_configuration.h"
#include "editor_config.h"
#include "drawingutils.h"
+#include "cl_aui_tool_stickness.h"
#define GIT_MESSAGE(...) AddText(wxString::Format(__VA_ARGS__));
#define GIT_MESSAGE1(...) if ( IsVerbose() ) { AddText(wxString::Format(__VA_ARGS__)); }
@@ -128,6 +129,7 @@ GitConsole::GitConsole(wxWindow* parent, GitPlugin* git)
m_auibar->AddSeparator();
m_auibar->AddTool(XRCID("git_pull"), wxT("Pull"), m_images.Bitmap("gitPull"), wxT("Pull remote changes"));
+ m_auibar->SetToolDropDown(XRCID("git_pull"), true);
m_auibar->AddTool(XRCID("git_commit"), wxT("Commit"), m_images.Bitmap("gitCommitLocal"), wxT("Commit local changes"));
m_auibar->AddTool(XRCID("git_push"), wxT("Push"), m_images.Bitmap("gitPush"), wxT("Push local changes"));
m_auibar->AddSeparator();
@@ -151,6 +153,8 @@ GitConsole::GitConsole(wxWindow* parent, GitPlugin* git)
m_auibar->AddTool(XRCID("git_browse_commit_list"), wxT("Log"), m_images.Bitmap("gitCommitedFiles"), wxT("Browse commit history"));
m_auibar->AddTool(XRCID("git_start_gitk"), wxT("gitk"), m_images.Bitmap("gitStart"), wxT("Start gitk"));
m_auibar->Realize();
+
+ Bind(wxEVT_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEventHandler(GitConsole::OnGitPullDropdown), this, XRCID("git_pull"));
}
GitConsole::~GitConsole()
@@ -480,3 +484,66 @@ void GitConsole::OnEditorThemeChanged(wxCommandEvent& e)
m_stcLog->Refresh();
}
+struct GitCommandData : public wxObject
+{
+ GitCommandData(const wxArrayString a, const wxString n, int i) : arr(a), name(n), id(i) {}
+ wxArrayString arr; // Holds the possible command-strings
+ wxString name; // Holds the name of the command e.g. "git_pull"
+ int id; // Holds the id of the command e.g. XRCID("git_pull")
+};
+
+void GitConsole::OnGitPullDropdown(wxAuiToolBarEvent& e)
+{
+
+ if (!e.IsDropDownClicked()) {
+ e.Skip();
+ return;
+ }
+
+ GitEntry data;
+ {
+ clConfig conf("git.conf");
+ conf.ReadItem(&data);
+ } // Force conf out of scope, else its dtor clobbers the GitConsole::OnDropDownMenuEvent Save()
+ GitCommandsEntries& ce = data.GetGitCommandsEntries("git_pull");
+ vGitLabelCommands_t entries = ce.GetCommands();
+ int lastUsed = ce.GetLastUsedCommandIndex();
+
+ wxArrayString arr;
+ wxMenu menu;
+ for (size_t n=0; n < entries.size(); ++n) {
+ wxMenuItem* item = menu.AppendRadioItem(n, entries.at(n).label);
+ item->Check(n == lastUsed);
+ arr.Add(entries.at(n).command);
+ }
+ menu.Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(GitConsole::OnDropDownMenuEvent),
+ this, 0, arr.GetCount(), new GitCommandData(arr, "git_pull", XRCID("git_pull")));
+
+ wxAuiToolBar* auibar = dynamic_cast<wxAuiToolBar*>(e.GetEventObject());
+ if ( auibar ) {
+ clAuiToolStickness ts(auibar, e.GetToolId());
+ wxRect rect = auibar->GetToolRect(e.GetId());
+ wxPoint pt = auibar->ClientToScreen(rect.GetBottomLeft());
+ pt = ScreenToClient(pt);
+ PopupMenu(&menu, pt);
+ }
+ menu.Unbind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(GitConsole::OnDropDownMenuEvent),
+ this, 0, arr.GetCount(), new GitCommandData(arr, "git_pull", XRCID("git_pull")));
+}
+
+void GitConsole::OnDropDownMenuEvent(wxCommandEvent& event)
+{
+ int id = event.GetId();
+ GitCommandData* userdata = static_cast<GitCommandData*>(event.GetEventUserData());
+ wxCHECK_RET(userdata->arr.GetCount() > event.GetId(), "Out-of-range ID");
+ event.SetString( userdata->arr.Item(id) );
+ event.SetId(userdata->id);
+
+ wxPostEvent(m_git, event); // We've now populated the event object with useful data, so get GitPlugin to process it
+
+ clConfig conf("git.conf"); GitEntry data; conf.ReadItem(&data);
+ GitCommandsEntries& ce = data.GetGitCommandsEntries(userdata->name);
+ ce.SetLastUsedCommandIndex(id);
+ conf.WriteItem(&data);
+ conf.Save();
+}
diff --git a/git/GitConsole.h b/git/GitConsole.h
index 5172915..16f485b 100644
--- a/git/GitConsole.h
+++ b/git/GitConsole.h
@@ -44,5 +44,8 @@ protected:
void OnConfigurationChanged(wxCommandEvent &e);
void OnEditorThemeChanged(wxCommandEvent &e);
+ void OnGitPullDropdown(wxAuiToolBarEvent& e);
+ void OnDropDownMenuEvent(wxCommandEvent& e);
+
};
#endif // GITCONSOLE_H
diff --git a/git/git.cpp b/git/git.cpp
index c8af150..c656dfd 100644
--- a/git/git.cpp
+++ b/git/git.cpp
@@ -580,14 +580,22 @@ void GitPlugin::OnPush(wxCommandEvent &e)
/*******************************************************************************/
void GitPlugin::OnPull(wxCommandEvent &e)
{
- wxUnusedVar(e);
+ wxString commandString = e.GetString(); // This might be user-specified e.g. pull --rebase
+ if (commandString.empty()) {
+ clConfig conf("git.conf");
+ GitEntry data;
+ conf.ReadItem(&data);
+ GitCommandsEntries& ce = data.GetGitCommandsEntries("git_pull");
+ commandString = ce.GetDefaultCommand();
+ }
+
if(wxMessageBox(wxT("Save all changes and pull remote changes?"),
wxT("Pull remote changes"), wxYES_NO, m_topWindow) == wxYES) {
m_mgr->SaveAll();
gitAction ga(gitPull, wxT(""));
m_gitActionQueue.push(ga);
AddDefaultActions();
- ProcessGitActionQueue();
+ ProcessGitActionQueue(commandString);
}
}
/*******************************************************************************/
@@ -795,7 +803,7 @@ void GitPlugin::OnInitDone(wxCommandEvent& e)
m_topWindow = m_mgr->GetTheApp()->GetTopWindow();
}
/*******************************************************************************/
-void GitPlugin::ProcessGitActionQueue()
+void GitPlugin::ProcessGitActionQueue(const wxString& commandString /*= ""*/)
{
if(m_gitActionQueue.size() == 0)
return;
@@ -912,7 +920,13 @@ void GitPlugin::ProcessGitActionQueue()
case gitPull:
GIT_MESSAGE(wxT("Pull remote changes"));
ShowProgress(wxT("Obtaining remote changes"), false);
- command << wxT(" --no-pager pull --log");
+ command << " --no-pager ";
+ if (commandString.empty()) {
+ command << " pull ";
+ } else {
+ command << commandString;
+ }
+ command << " --log";
GIT_MESSAGE(wxT("%s. Repo path: %s"), command.c_str(), m_repositoryDirectory.c_str());
break;
@@ -1516,6 +1530,12 @@ void GitPlugin::InitDefaults()
if(!data.GetGITKExecutablePath().IsEmpty()) {
m_pathGITKExecutable = data.GetGITKExecutablePath();
}
+
+ if (data.GetCommandsMap().empty()) {
+ LoadDefaultGitCommands(data);
+ conf.WriteItem(&data);
+ conf.Save();
+ }
wxString repoPath;
if ( IsWorkspaceOpened() ) {
@@ -1958,4 +1978,17 @@ void GitPlugin::RevertCommit(const wxString& commitId)
gitAction ga(gitRevertCommit, commitId);
m_gitActionQueue.push(ga);
ProcessGitActionQueue();
+}
+
+void GitPlugin::LoadDefaultGitCommands(GitEntry& data)
+{
+ GitCommandsEntries entries("git_pull");
+ vGitLabelCommands_t gitPullEntries;
+ GitLabelCommand entry1("git pull", "pull");
+ gitPullEntries.push_back(entry1);
+ GitLabelCommand entry2("git pull --rebase", "pull --rebase");
+ gitPullEntries.push_back(entry2);
+
+ entries.SetCommands(gitPullEntries);
+ data.AddGitCommandsEntry(entries, "git_pull");
}
diff --git a/git/git.h b/git/git.h
index b9077ba..4568484 100644
--- a/git/git.h
+++ b/git/git.h
@@ -20,6 +20,7 @@
#include <map>
#include "overlaytool.h"
#include "cl_command_event.h"
+#include "gitentry.h"
class gitAction
{
@@ -113,7 +114,8 @@ private:
void DoSetTreeItemImage(wxTreeCtrl* ctrl, const wxTreeItemId& item, OverlayTool::BmpType bmpType ) const;
void InitDefaults();
void AddDefaultActions();
- void ProcessGitActionQueue();
+ void LoadDefaultGitCommands(GitEntry& data);
+ void ProcessGitActionQueue(const wxString& commandString = "");
void ColourFileTree(wxTreeCtrl *tree, const wxStringSet_t& files, OverlayTool::BmpType bmpType) const;
void CreateFilesTreeIDsMap(std::map<wxString, wxTreeItemId>& IDs, bool ifmodified = false) const;
diff --git a/git/gitentry.cpp b/git/gitentry.cpp
index cad2a84..e319570 100644
--- a/git/gitentry.cpp
+++ b/git/gitentry.cpp
@@ -62,6 +62,14 @@ void GitEntry::FromJSON(const JSONElement& json)
if ( !diff.IsEmpty() ) {
m_colourDiffFile = diff;
}
+
+ // read the git commands
+ JSONElement arrCommands = json.namedObject("Commands");
+ for (int i=0; i < arrCommands.arraySize(); ++i) {
+ GitCommandsEntries entry;
+ entry.FromJSON( arrCommands.arrayItem(i) );
+ m_commandsMap.insert(std::make_pair(entry.GetCommandname(), entry));
+ }
}
JSONElement GitEntry::ToJSON() const
@@ -83,6 +91,14 @@ JSONElement GitEntry::ToJSON() const
json.addProperty("m_gitConsoleSashPos", m_gitConsoleSashPos);
json.addProperty("m_gitCommitDlgHSashPos", m_gitCommitDlgHSashPos);
json.addProperty("m_gitCommitDlgVSashPos", m_gitCommitDlgVSashPos);
+
+ // Add the git commands array
+ JSONElement arrCommands = JSONElement::createArray("Commands");
+ json.append(arrCommands);
+ GitCommandsEntriesMap_t::const_iterator iter = m_commandsMap.begin();
+ for (; iter != m_commandsMap.end(); ++iter) {
+ iter->second.ToJSON( arrCommands );
+ }
return json;
}
@@ -149,6 +165,27 @@ GitEntry::GitProperties GitEntry::ReadGitProperties(const wxString& localRepoPat
return props;
}
+GitCommandsEntries& GitEntry::GetGitCommandsEntries(const wxString& entryName)
+{
+ if (!m_commandsMap.count(entryName)) {
+ GitCommandsEntries entries(entryName);
+ m_commandsMap.insert(std::make_pair(entryName, entries));
+ }
+
+ GitCommandsEntriesMap_t::iterator iter = m_commandsMap.find(entryName);
+ wxASSERT(iter != m_commandsMap.end());
+
+ return iter->second;
+}
+
+void GitEntry::AddGitCommandsEntry(GitCommandsEntries& entries, const wxString& entryName)
+{
+ if (!m_commandsMap.count(entryName)) {
+ m_commandsMap.insert(std::make_pair(entryName, entries));
+ }
+ // Possible TODO: Append any novel items to the existing vector
+}
+
void GitEntry::WriteGitProperties(const wxString& localRepoPath, const GitEntry::GitProperties &props)
{
// Read the global name/email
@@ -210,3 +247,37 @@ void GitEntry::WriteGitProperties(const wxString& localRepoPath, const GitEntry:
}
}
}
+
+
+void GitCommandsEntries::FromJSON(const JSONElement& json)
+{
+ m_commands.clear();
+ m_commandName = json.namedObject("m_commandName").toString();
+ m_lastUsed = json.namedObject("m_lastUsed").toInt();
+ JSONElement arrCommandChoices = json.namedObject("m_commands");
+ for (int i=0; i < arrCommandChoices.arraySize(); ++i) {
+ GitLabelCommand item;
+ item.label = arrCommandChoices.arrayItem(i).namedObject("label").toString();
+ item.command = arrCommandChoices.arrayItem(i).namedObject("command").toString();
+ m_commands.push_back(item);
+ }
+}
+
+void GitCommandsEntries::ToJSON(JSONElement &arr) const
+{
+ JSONElement obj = JSONElement::createObject();
+ obj.addProperty("m_commandName", m_commandName);
+ obj.addProperty("m_lastUsed", m_lastUsed);
+
+ JSONElement commandsArr = JSONElement::createArray("m_commands");
+ obj.append(commandsArr);
+
+ vGitLabelCommands_t::const_iterator iter = m_commands.begin();
+ for (; iter != m_commands.end(); ++iter) {
+ JSONElement e = JSONElement::createObject();
+ e.addProperty("label", iter->label);
+ e.addProperty("command", iter->command);
+ commandsArr.arrayAppend(e);
+ }
+ arr.arrayAppend( obj );
+}
diff --git a/git/gitentry.h b/git/gitentry.h
index 5a4a036..8e903d3 100644
--- a/git/gitentry.h
+++ b/git/gitentry.h
@@ -10,8 +10,73 @@
#include <wx/colour.h>
#include <wx/event.h>
+#include <vector>
+#include <map>
#include "cl_config.h"
+struct GitLabelCommand
+{
+ GitLabelCommand() {}
+
+ GitLabelCommand(const wxString& l, const wxString& c) : label(l), command(c) {}
+
+ wxString label; // The menu label
+ wxString command; // The command string, without the initial 'git' or the extras like --no-pager
+};
+
+typedef std::vector<GitLabelCommand> vGitLabelCommands_t;
+class GitCommandsEntries // Holds a command-list for a particular git command e.g. 'git pull' might be that, or 'git pull --rebase'
+{
+protected:
+ vGitLabelCommands_t m_commands;
+ wxString m_commandName;
+ int m_lastUsed;
+
+public:
+ GitCommandsEntries() {}
+ GitCommandsEntries(const wxString& commandName) : m_commandName(commandName), m_lastUsed(-1) {}
+ GitCommandsEntries(const GitCommandsEntries& gce)
+ : m_commands(gce.m_commands)
+ , m_commandName(gce.m_commandName)
+ , m_lastUsed(gce.m_lastUsed)
+ {}
+
+ virtual ~GitCommandsEntries() {}
+ void FromJSON(const JSONElement& json);
+ void ToJSON(JSONElement& arr) const;
+
+ const wxString& GetCommandname() const {
+ return m_commandName;
+ }
+
+ const vGitLabelCommands_t& GetCommands() const {
+ return m_commands;
+ }
+
+ void SetCommands(const vGitLabelCommands_t& commands) {
+ m_commands = commands;
+ }
+
+ const wxString GetDefaultCommand() const {
+ wxString str;
+ if (m_lastUsed >= 0 && m_lastUsed < m_commands.size()) {
+ str = m_commands.at(m_lastUsed).command;
+ }
+ return str;
+ }
+
+ int GetLastUsedCommandIndex() const {
+ return m_lastUsed;
+ }
+
+ void SetLastUsedCommandIndex(int index) {
+ m_lastUsed = index;
+ }
+
+};
+
+typedef std::map<wxString, GitCommandsEntries> GitCommandsEntriesMap_t;
+
extern const wxEventType wxEVT_GIT_CONFIG_CHANGED;
class GitEntry : public clConfigItem
{
@@ -20,6 +85,7 @@ class GitEntry : public clConfigItem
wxString m_pathGIT;
wxString m_pathGITK;
JSONElement::wxStringMap_t m_entries;
+ GitCommandsEntriesMap_t m_commandsMap;
size_t m_flags;
int m_gitDiffDlgSashPos;
int m_gitConsoleSashPos;
@@ -88,6 +154,9 @@ public:
void SetEntry(const wxString& workspace, const wxString& repo) {
this->m_entries[workspace] = repo;
}
+ GitCommandsEntriesMap_t GetCommandsMap() const {
+ return m_commandsMap;
+ }
void SetTrackedFileColour(const wxColour& colour) {
this->m_colourTrackedFile = colour;
}
@@ -117,7 +186,12 @@ public:
int GetGitConsoleSashPos() const {
return m_gitConsoleSashPos;
}
+
+ GitCommandsEntries& GetGitCommandsEntries(const wxString& entryName);
+
+ void AddGitCommandsEntry(GitCommandsEntries& entries, const wxString& entryName);
+
virtual void FromJSON(const JSONElement& json);
virtual JSONElement ToJSON() const;
};
-#endif
+ #endif
-----------------------------------------------------------------------
Summary of changes:
git/GitConsole.cpp | 67 +++++++++++++++++++++++++++++++++++++++++++++
git/GitConsole.h | 3 ++
git/git.cpp | 41 +++++++++++++++++++++++++---
git/git.h | 4 ++-
git/gitentry.cpp | 71 ++++++++++++++++++++++++++++++++++++++++++++++++
git/gitentry.h | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++-
6 files changed, 256 insertions(+), 6 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-03 09:32: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 b653e7db60e73a94afac66c0dde7a150dc8a4e4b (commit)
via b1911643803274ec1346398d9e797e21e91c2695 (commit)
from 4cfc7e9b42bb4c3f7ab0fa6841061917dda4f508 (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/b653e7db60e73a94afac66c0dde7a150dc8a4e4b
commit b653e7db60e73a94afac66c0dde7a150dc8a4e4b
Author: Eran <era...@gm...>
Date: Fri Jan 3 11:32:37 2014 +0200
Fixed: wx-config failed to work right when user defines wxUSE_GUI=0 and wxWidgets has USE_GUI=1 (by stahta01)
diff --git a/sdk/wxconfig/wx-config-win.cpp b/sdk/wxconfig/wx-config-win.cpp
index 8dd311d..7421995 100644
--- a/sdk/wxconfig/wx-config-win.cpp
+++ b/sdk/wxconfig/wx-config-win.cpp
@@ -686,7 +686,7 @@ public:
/// External libs (to wxWidgets)
if (cfg["USE_GUI"] == "1")
- if (sho["wxUSE_STC"])
+ if (cfg["USE_STC"] == "1" )
po["__LIB_WXSCINTILLA_p"] = addLib("wxscintilla" + po["WXDEBUGFLAG"]);
if (cfg["USE_GUI"] == "1")
https://sourceforge.net/p/codelite/codelitegit/ci/b1911643803274ec1346398d9e797e21e91c2695
commit b1911643803274ec1346398d9e797e21e91c2695
Author: Eran <era...@gm...>
Date: Fri Jan 3 11:16:15 2014 +0200
Removed hard coded --wxcfg switch passed to wx-config (by stahta01)
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index eb2b173..731e4e5 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -1310,7 +1310,7 @@ resources.cpp: resources.xrc
</Completion>
</Configuration>
<Configuration Name="WinDebugUnicode" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
- <Compiler Options="-g;-Wall;$(shell wx-config --wxcfg=gcc_dll/mswud --debug=yes --cxxflags --unicode=yes);-Winvalid-pch" C_Options="-Wall" Assembler="" Required="yes" PreCompiledHeader="../PCH/precompiled_header_dbg.h" PCHInCommandLine="yes" UseDifferentPCHFlags="yes" PCHFlags="$(shell wx-config --cxxflags --debug=yes --unicode=yes) -g">
+ <Compiler Options="-g;-Wall;$(shell wx-config --debug=yes --cxxflags --unicode=yes);-Winvalid-pch" C_Options="-Wall" Assembler="" Required="yes" PreCompiledHeader="../PCH/precompiled_header_dbg.h" PCHInCommandLine="yes" UseDifferentPCHFlags="yes" PCHFlags="$(shell wx-config --cxxflags --debug=yes --unicode=yes) -g">
<IncludePath Value="."/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
@@ -1375,7 +1375,7 @@ svninfo.cpp:
</Completion>
</Configuration>
<Configuration Name="WinReleaseUnicode" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
- <Compiler Options="-O2;;$(shell wx-config --wxcfg=gcc_dll/mswu --debug=no --cxxflags --unicode=yes);-Winvalid-pch" C_Options="-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="-O2;;$(shell wx-config --debug=no --cxxflags --unicode=yes);-Winvalid-pch" C_Options="-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="../CodeLite"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/LiteEditor.project | 4 ++--
sdk/wxconfig/wx-config-win.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-02 07:28: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 4cfc7e9b42bb4c3f7ab0fa6841061917dda4f508 (commit)
from 7dce2fb9b7e39dba0985f87ddf3f84908f02bc2b (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/4cfc7e9b42bb4c3f7ab0fa6841061917dda4f508
commit 4cfc7e9b42bb4c3f7ab0fa6841061917dda4f508
Author: Eran <era...@gm...>
Date: Thu Jan 2 09:28:37 2014 +0200
Make the frame title use a pattern
diff --git a/LiteEditor/editor_options_misc.wxcp b/LiteEditor/editor_options_misc.wxcp
index 93b853d..dcdbd33 100644
--- a/LiteEditor/editor_options_misc.wxcp
+++ b/LiteEditor/editor_options_misc.wxcp
@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
- "m_objCounter": 21,
+ "m_objCounter": 51,
"m_includeFiles": [],
"m_bitmapFunction": "wxC38F8InitBitmapResources",
"m_bitmapsFile": "editor_options_misc_liteeditor_bitmaps.cpp",
@@ -1075,8 +1075,8 @@
"m_type": 4415,
"proportion": 0,
"border": 5,
- "gbSpan": ",",
- "gbPosition": ",",
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
@@ -1086,19 +1086,486 @@
}, {
"type": "string",
"m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_checkBoxRestoreSession"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": "When launched, codelite will restore the last opened workspace + all open editors"
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
"m_value": ""
}, {
"type": "string",
+ "m_label": "Label:",
+ "m_value": "Load last session on startup"
+ }, {
+ "type": "bool",
+ "m_label": "Value:",
+ "m_value": false
+ }],
+ "m_events": [],
+ "m_children": []
+ }]
+ }]
+ }]
+ }, {
+ "m_type": 4441,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": ["wxTAB_TRAVERSAL"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_panel23"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Label:",
+ "m_value": "Frame Title"
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File:",
+ "m_path": ""
+ }, {
+ "type": "bool",
+ "m_label": "Selected",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Null Page",
+ "m_value": false
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4401,
+ "proportion": 1,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "boxSizer25"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 0,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4471,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": ["wxBORDER_THEME"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_banner27"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "CaptionText"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Title:",
+ "m_value": "Set CodeLite frame's title"
+ }, {
+ "type": "multi-string",
+ "m_label": "Message:",
+ "m_value": "Set custom title to codelite's main frame"
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 0,
+ "m_options": ["wxTOP", "wxBOTTOM", "wxLEFT", "wxRIGHT"]
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File:",
+ "m_path": ""
+ }, {
+ "type": "colour",
+ "m_label": "Gradient Start",
+ "colour": "ActiveCaption"
+ }, {
+ "type": "colour",
+ "m_label": "Gradient End",
+ "colour": "ActiveCaption"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4405,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_staticText31"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Label:",
+ "m_value": "You can use the following macros to construct your own frame title:"
+ }, {
+ "type": "string",
+ "m_label": "Wrap:",
+ "m_value": "-1"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4403,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_properties": [{
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "flexGridSizer29"
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "# Columns:",
+ "m_value": "2"
+ }, {
+ "type": "string",
+ "m_label": "# Rows:",
+ "m_value": "0"
+ }, {
+ "type": "string",
+ "m_label": "Growable columns:",
+ "m_value": "1"
+ }, {
+ "type": "string",
+ "m_label": "Growable rows:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Horizontal gap:",
+ "m_value": "0"
+ }, {
+ "type": "string",
+ "m_label": "Vertical gap:",
+ "m_value": "0"
+ }],
+ "m_events": [],
+ "m_children": [{
+ "m_type": 4405,
+ "proportion": 0,
+ "border": 5,
+ "gbSpan": "1,1",
+ "gbPosition": "0,0",
+ "m_styles": [],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
+ "m_properties": [{
+ "type": "winid",
+ "m_label": "ID:",
+ "m_winid": "wxID_ANY"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
"m_label": "Minimum Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Name:",
+ "m_value": "m_staticText33"
+ }, {
+ "type": "multi-string",
+ "m_label": "Tooltip:",
+ "m_value": ""
+ }, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": "wxSYS_DEFAULT_GUI_FONT,normal,bold,normal"
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
"m_value": ""
}, {
+ "type": "multi-string",
+ "m_label": "Label:",
+ "m_value": "$user"
+ }, {
+ "type": "string",
+ "m_label": "Wrap:",
+ "m_value": "-1"
+ }],
+ "m_events": [],
+ "m_children": []
+ }, {
+ "m_type": 4405,
+ "proportion": 0,
+ "border": 5,
... 850 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2014-01-02 06:48:06
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 7dce2fb9b7e39dba0985f87ddf3f84908f02bc2b (commit)
from 22259db0c106700f5649f55fcacf0ade848f2d86 (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/7dce2fb9b7e39dba0985f87ddf3f84908f02bc2b
commit 7dce2fb9b7e39dba0985f87ddf3f84908f02bc2b
Author: Eran <era...@gm...>
Date: Thu Jan 2 08:47:46 2014 +0200
fixed: compiler settings: dont add an extra empty line when editing the global compiler include/lib paths using the text-editor dialog
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"/>
diff --git a/LiteEditor/compiler_page.wxcp b/LiteEditor/compiler_page.wxcp
index 118ff26..1d0c05a 100644
--- a/LiteEditor/compiler_page.wxcp
+++ b/LiteEditor/compiler_page.wxcp
@@ -5041,7 +5041,7 @@
}, {
"type": "string",
"m_label": "Label:",
- "m_value": "Use compiler -MT switch to generate source dependencies files (*.o.d)"
+ "m_value": "Generate dependencies files (*.o.d)"
}, {
"type": "bool",
"m_label": "Value:",
@@ -5207,7 +5207,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
- "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
diff --git a/LiteEditor/compiler_pages.cpp b/LiteEditor/compiler_pages.cpp
index 1bbe9cf..5f935c4 100644
--- a/LiteEditor/compiler_pages.cpp
+++ b/LiteEditor/compiler_pages.cpp
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: compiler_page.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -22,10 +23,10 @@ CompilerPatternsBase::CompilerPatternsBase(wxWindow* parent, wxWindowID id, cons
bBitmapLoaded = true;
}
- bSizer14 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer14 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizer14);
- bSizerError = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizerError = new wxBoxSizer(wxVERTICAL);
bSizer14->Add(bSizerError, 1, wxALL|wxEXPAND, 5);
@@ -33,7 +34,7 @@ CompilerPatternsBase::CompilerPatternsBase(wxWindow* parent, wxWindowID id, cons
bSizerError->Add(m_staticText161, 0, wxALL, 5);
- bSizer25 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer25 = new wxBoxSizer(wxHORIZONTAL);
bSizerError->Add(bSizer25, 1, wxEXPAND, 5);
@@ -41,7 +42,7 @@ CompilerPatternsBase::CompilerPatternsBase(wxWindow* parent, wxWindowID id, cons
bSizer25->Add(m_listErrPatterns, 1, wxALL|wxEXPAND, 5);
- bSizer26 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer26 = new wxBoxSizer(wxVERTICAL);
bSizer25->Add(bSizer26, 0, 0, 5);
@@ -64,7 +65,7 @@ CompilerPatternsBase::CompilerPatternsBase(wxWindow* parent, wxWindowID id, cons
bSizer14->Add(m_staticline5, 0, wxALL|wxEXPAND, 5);
- bSizerWarnings = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizerWarnings = new wxBoxSizer(wxVERTICAL);
bSizer14->Add(bSizerWarnings, 1, wxALL|wxEXPAND, 5);
@@ -72,7 +73,7 @@ CompilerPatternsBase::CompilerPatternsBase(wxWindow* parent, wxWindowID id, cons
bSizerWarnings->Add(m_staticText17, 0, wxALL, 5);
- bSizer251 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer251 = new wxBoxSizer(wxHORIZONTAL);
bSizerWarnings->Add(bSizer251, 1, wxEXPAND, 5);
@@ -80,7 +81,7 @@ CompilerPatternsBase::CompilerPatternsBase(wxWindow* parent, wxWindowID id, cons
bSizer251->Add(m_listWarnPatterns, 1, wxALL|wxEXPAND, 5);
- bSizer261 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer261 = new wxBoxSizer(wxVERTICAL);
bSizer251->Add(bSizer261, 0, 0, 5);
@@ -147,10 +148,10 @@ CompilerToolsBase::CompilerToolsBase(wxWindow* parent, wxWindowID id, const wxPo
bBitmapLoaded = true;
}
- boxSizer2 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer2 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer2);
- fgSizer41 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* fgSizer41 = new wxFlexGridSizer( 0, 2, 0, 0);
fgSizer41->SetFlexibleDirection( wxBOTH );
fgSizer41->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer41->AddGrowableCol(1);
@@ -252,7 +253,7 @@ CompilerSwitchesBase::CompilerSwitchesBase(wxWindow* parent, wxWindowID id, cons
bBitmapLoaded = true;
}
- mainSizer = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
this->SetSizer(mainSizer);
m_staticText8 = new wxStaticText(this, wxID_ANY, _("Double click on an entry to modify it:"), wxDefaultPosition, wxSize(-1, -1), 0);
@@ -291,14 +292,14 @@ CompilerFileTypesBase::CompilerFileTypesBase(wxWindow* parent, wxWindowID id, co
bBitmapLoaded = true;
}
- bSizer10 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer10 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizer10);
m_staticText23 = new wxStaticText(this, wxID_ANY, _("Double click on an entry to modify it:"), wxDefaultPosition, wxSize(-1, -1), 0);
bSizer10->Add(m_staticText23, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
- bSizer12 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer12 = new wxBoxSizer(wxHORIZONTAL);
bSizer10->Add(bSizer12, 1, wxALL|wxEXPAND, 5);
@@ -306,7 +307,7 @@ CompilerFileTypesBase::CompilerFileTypesBase(wxWindow* parent, wxWindowID id, co
bSizer12->Add(m_listCtrlFileTypes, 1, wxALL|wxEXPAND, 5);
- bSizer111 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer111 = new wxBoxSizer(wxVERTICAL);
bSizer12->Add(bSizer111, 0, wxEXPAND, 5);
@@ -353,14 +354,14 @@ CompilerAdvanceBase::CompilerAdvanceBase(wxWindow* parent, wxWindowID id, const
bBitmapLoaded = true;
}
- bSizer11 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer11 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizer11);
- bSizer7 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer7 = new wxBoxSizer(wxVERTICAL);
bSizer11->Add(bSizer7, 0, wxALL|wxEXPAND, 5);
- fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0);
+ wxFlexGridSizer* fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0);
fgSizer3->SetFlexibleDirection( wxBOTH );
fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer3->AddGrowableCol(1);
@@ -447,7 +448,7 @@ CompilerAdvanceBase::CompilerAdvanceBase(wxWindow* parent, wxWindowID id, const
fgSizer3->Add(0, 0, 1, wxALL, 5);
- m_checkBoxGenerateDependenciesFiles = new wxCheckBox(this, wxID_ANY, _("Use compiler -MT switch to generate source dependencies files (*.o.d)"), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_checkBoxGenerateDependenciesFiles = new wxCheckBox(this, wxID_ANY, _("Generate dependencies files (*.o.d)"), wxDefaultPosition, wxSize(-1, -1), 0);
m_checkBoxGenerateDependenciesFiles->SetValue(false);
fgSizer3->Add(m_checkBoxGenerateDependenciesFiles, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
@@ -469,7 +470,7 @@ CompilerAdvanceBase::CompilerAdvanceBase(wxWindow* parent, wxWindowID id, const
m_checkBoxReadObjectsFromFile = new wxCheckBox(this, wxID_ANY, _("Pass object list to the linker via file"), wxDefaultPosition, wxSize(-1, -1), 0);
m_checkBoxReadObjectsFromFile->SetValue(false);
- fgSizer3->Add(m_checkBoxReadObjectsFromFile, 0, wxALL|wxEXPAND, 5);
+ fgSizer3->Add(m_checkBoxReadObjectsFromFile, 0, wxALL, 5);
SetSizeHints(-1,-1);
if ( GetSizer() ) {
@@ -499,14 +500,14 @@ CompilerCompilerOptionsBase::CompilerCompilerOptionsBase(wxWindow* parent, wxWin
bBitmapLoaded = true;
}
- bSizer10 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer10 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizer10);
m_staticText23 = new wxStaticText(this, wxID_ANY, _("Double click on an entry to modify it:"), wxDefaultPosition, wxSize(-1, -1), 0);
bSizer10->Add(m_staticText23, 0, wxALL|wxEXPAND, 5);
- bSizer12 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer12 = new wxBoxSizer(wxHORIZONTAL);
bSizer10->Add(bSizer12, 1, wxEXPAND, 5);
@@ -514,7 +515,7 @@ CompilerCompilerOptionsBase::CompilerCompilerOptionsBase(wxWindow* parent, wxWin
bSizer12->Add(m_listCompilerOptions, 1, wxALL|wxEXPAND, 5);
- bSizer111 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer111 = new wxBoxSizer(wxVERTICAL);
bSizer12->Add(bSizer111, 0, wxEXPAND, 5);
@@ -561,14 +562,14 @@ CompilerLinkerOptionsBase::CompilerLinkerOptionsBase(wxWindow* parent, wxWindowI
bBitmapLoaded = true;
}
- bSizer10 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer10 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizer10);
m_staticText23 = new wxStaticText(this, wxID_ANY, _("Double click on an entry to modify it:"), wxDefaultPosition, wxSize(-1, -1), 0);
bSizer10->Add(m_staticText23, 0, wxALL|wxEXPAND, 5);
- bSizer12 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer12 = new wxBoxSizer(wxHORIZONTAL);
bSizer10->Add(bSizer12, 1, wxEXPAND, 5);
@@ -576,7 +577,7 @@ CompilerLinkerOptionsBase::CompilerLinkerOptionsBase(wxWindow* parent, wxWindowI
bSizer12->Add(m_listLinkerOptions, 1, wxALL|wxEXPAND, 5);
- bSizer111 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer111 = new wxBoxSizer(wxVERTICAL);
bSizer12->Add(bSizer111, 0, wxEXPAND, 5);
@@ -623,10 +624,10 @@ CompilerOptionDlgBase::CompilerOptionDlgBase(wxWindow* parent, wxWindowID id, co
bBitmapLoaded = true;
}
- bSizer23 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer23 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizer23);
- fgSizer7 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* fgSizer7 = new wxFlexGridSizer( 0, 2, 0, 0);
fgSizer7->SetFlexibleDirection( wxBOTH );
fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer7->AddGrowableCol(1);
@@ -655,7 +656,7 @@ CompilerOptionDlgBase::CompilerOptionDlgBase(wxWindow* parent, wxWindowID id, co
bSizer23->Add(m_staticline4, 0, wxALL|wxEXPAND, 5);
- bSizer24 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer24 = new wxBoxSizer(wxHORIZONTAL);
bSizer23->Add(bSizer24, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
@@ -689,10 +690,10 @@ CompilerPatternDlgBase::CompilerPatternDlgBase(wxWindow* parent, wxWindowID id,
bBitmapLoaded = true;
}
- bSizerError = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizerError = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizerError);
- fgSizer41 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* fgSizer41 = new wxFlexGridSizer( 0, 2, 0, 0);
fgSizer41->SetFlexibleDirection( wxBOTH );
fgSizer41->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer41->AddGrowableCol(1);
@@ -729,7 +730,7 @@ CompilerPatternDlgBase::CompilerPatternDlgBase(wxWindow* parent, wxWindowID id,
bSizerError->Add(m_staticline5, 0, wxALL|wxEXPAND, 5);
- bSizer24 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer24 = new wxBoxSizer(wxHORIZONTAL);
bSizerError->Add(bSizer24, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
diff --git a/LiteEditor/compiler_pages.h b/LiteEditor/compiler_pages.h
index 2945139..7d06bb1 100644
--- a/LiteEditor/compiler_pages.h
+++ b/LiteEditor/compiler_pages.h
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: compiler_page.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -24,21 +25,14 @@
class CompilerPatternsBase : public wxPanel
{
protected:
- wxBoxSizer* bSizer14;
- wxBoxSizer* bSizerError;
wxStaticText* m_staticText161;
- wxBoxSizer* bSizer25;
wxListCtrl* m_listErrPatterns;
- wxBoxSizer* bSizer26;
wxButton* m_btnAddErrPattern;
wxButton* m_btnDelErrPattern;
wxButton* m_btnUpdateErrPattern;
wxStaticLine* m_staticline5;
- wxBoxSizer* bSizerWarnings;
wxStaticText* m_staticText17;
- wxBoxSizer* bSizer251;
wxListCtrl* m_listWarnPatterns;
- wxBoxSizer* bSizer261;
wxButton* m_btnAddWarnPattern;
wxButton* m_btnDelWarnPattern;
wxButton* m_btnUpdateWarnPattern;
@@ -64,8 +58,6 @@ public:
class CompilerToolsBase : public wxPanel
{
protected:
- wxBoxSizer* boxSizer2;
- wxFlexGridSizer* fgSizer41;
wxStaticText* m_staticText92;
wxTextCtrl* m_textCompilerName;
wxStaticText* m_staticText254;
@@ -96,7 +88,6 @@ public:
class CompilerSwitchesBase : public wxPanel
{
protected:
- wxBoxSizer* mainSizer;
wxStaticText* m_staticText8;
wxListCtrl* m_listSwitches;
@@ -113,11 +104,8 @@ public:
class CompilerFileTypesBase : public wxPanel
{
protected:
- wxBoxSizer* bSizer10;
wxStaticText* m_staticText23;
- wxBoxSizer* bSizer12;
wxListCtrl* m_listCtrlFileTypes;
- wxBoxSizer* bSizer111;
wxButton* m_buttonNewFileType;
wxButton* m_buttonDeleteFileType;
@@ -137,9 +125,6 @@ public:
class CompilerAdvanceBase : public wxPanel
{
protected:
- wxBoxSizer* bSizer11;
- wxBoxSizer* bSizer7;
- wxFlexGridSizer* fgSizer3;
wxStaticText* m_staticText18;
wxStaticText* m_staticText141;
wxTextCtrl* m_textCtrlGlobalIncludePath;
@@ -171,11 +156,8 @@ public:
class CompilerCompilerOptionsBase : public wxPanel
{
protected:
- wxBoxSizer* bSizer10;
wxStaticText* m_staticText23;
- wxBoxSizer* bSizer12;
wxListCtrl* m_listCompilerOptions;
- wxBoxSizer* bSizer111;
wxButton* m_buttonCompilerOption;
wxButton* m_buttonDeleteCompilerOption;
@@ -195,11 +177,8 @@ public:
class CompilerLinkerOptionsBase : public wxPanel
{
protected:
- wxBoxSizer* bSizer10;
wxStaticText* m_staticText23;
- wxBoxSizer* bSizer12;
wxListCtrl* m_listLinkerOptions;
- wxBoxSizer* bSizer111;
wxButton* m_buttonLinkerOption;
wxButton* m_buttonDeleteLinkerOption;
@@ -219,14 +198,11 @@ public:
class CompilerOptionDlgBase : public wxDialog
{
protected:
- wxBoxSizer* bSizer23;
- wxFlexGridSizer* fgSizer7;
wxStaticText* m_staticText26;
wxTextCtrl* m_textCtrl18;
wxStaticText* m_staticText27;
wxTextCtrl* m_textCtrl19;
wxStaticLine* m_staticline4;
- wxBoxSizer* bSizer24;
wxButton* m_buttonOK;
wxButton* m_buttonCancel;
@@ -241,8 +217,6 @@ public:
class CompilerPatternDlgBase : public wxDialog
{
protected:
- wxBoxSizer* bSizerError;
- wxFlexGridSizer* fgSizer41;
wxStaticText* m_staticText5;
wxTextCtrl* m_textPattern;
wxStaticText* m_staticText6;
@@ -250,7 +224,6 @@ protected:
wxStaticText* m_staticText7;
wxTextCtrl* m_textLineNumber;
wxStaticLine* m_staticline5;
- wxBoxSizer* bSizer24;
wxButton* m_buttonOK;
wxButton* m_buttonCancel;
diff --git a/LiteEditor/compileradvancepage.cpp b/LiteEditor/compileradvancepage.cpp
index 8928d59..7486579 100644
--- a/LiteEditor/compileradvancepage.cpp
+++ b/LiteEditor/compileradvancepage.cpp
@@ -36,11 +36,11 @@ void CompilerAdvancePage::Save(CompilerPtr cmp)
void CompilerAdvancePage::OnEditIncludePaths(wxCommandEvent& event)
{
wxString curIncludePath = m_textCtrlGlobalIncludePath->GetValue();
- curIncludePath = wxJoin( ::wxStringTokenize(curIncludePath, ";", wxTOKEN_STRTOK), '\n' );
+ curIncludePath = wxJoin( ::wxStringTokenize(curIncludePath, ";", wxTOKEN_STRTOK), '\n', '\0' );
wxString newIncludePath = ::clGetTextFromUser(curIncludePath, EventNotifier::Get()->TopFrame());
newIncludePath.Trim().Trim(false);
if ( !newIncludePath.IsEmpty() ) {
- newIncludePath = wxJoin( ::wxStringTokenize(newIncludePath, "\n", wxTOKEN_STRTOK), ';' );
+ newIncludePath = wxJoin( ::wxStringTokenize(newIncludePath, "\n\r", wxTOKEN_STRTOK), ';', '\0' );
m_textCtrlGlobalIncludePath->ChangeValue( newIncludePath );
}
}
@@ -48,11 +48,11 @@ void CompilerAdvancePage::OnEditIncludePaths(wxCommandEvent& event)
void CompilerAdvancePage::OnEditLibraryPaths(wxCommandEvent& event)
{
wxString curLibPath = m_textCtrlGlobalLibPath->GetValue();
- curLibPath = wxJoin( ::wxStringTokenize(curLibPath, ";", wxTOKEN_STRTOK), '\n' );
+ curLibPath = wxJoin( ::wxStringTokenize(curLibPath, ";", wxTOKEN_STRTOK), '\n', '\0' );
wxString newLibPath = ::clGetTextFromUser(curLibPath, EventNotifier::Get()->TopFrame());
newLibPath.Trim().Trim(false);
if ( !newLibPath.IsEmpty() ) {
- newLibPath = wxJoin( ::wxStringTokenize(newLibPath, "\n", wxTOKEN_STRTOK), ';' );
+ newLibPath = wxJoin( ::wxStringTokenize(newLibPath, "\n\r", wxTOKEN_STRTOK), ';', '\0' );
m_textCtrlGlobalLibPath->ChangeValue( newLibPath );
}
}
-----------------------------------------------------------------------
Summary of changes:
LiteEditor.workspace | 4 +-
LiteEditor/compiler_page.wxcp | 4 +-
LiteEditor/compiler_pages.cpp | 61 ++++++++++++++++++-----------------
LiteEditor/compiler_pages.h | 29 +----------------
LiteEditor/compileradvancepage.cpp | 8 ++--
5 files changed, 40 insertions(+), 66 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-31 18: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 22259db0c106700f5649f55fcacf0ade848f2d86 (commit)
via afbf13a4f944adddb049bff169a0eb9eb8119e21 (commit)
from 8ec0393db366f2fa83f0fdee9db07f084abd6ad5 (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/22259db0c106700f5649f55fcacf0ade848f2d86
commit 22259db0c106700f5649f55fcacf0ade848f2d86
Author: Eran <era...@gm...>
Date: Tue Dec 31 20:45:34 2013 +0200
Updated active configuration to Release
diff --git a/codelite_utils/codelite_utils.workspace b/codelite_utils/codelite_utils.workspace
index d30a694..baf4ce5 100644
--- a/codelite_utils/codelite_utils.workspace
+++ b/codelite_utils/codelite_utils.workspace
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Workspace Name="codelite_utils" Database="./codelite_utils.tags">
- <Project Name="build_all" Path="build_all.project" Active="No"/>
+ <Project Name="build_all" Path="build_all.project" Active="Yes"/>
<Project Name="codelite_launcher" Path="../codelite_launcher/codelite_launcher.project" Active="No"/>
<Project Name="autorev" Path="../AutoRevision/autorev/autorev.project" Active="No"/>
<Project Name="makedir" Path="../TestDir/makedir.project" Active="No"/>
@@ -10,7 +10,7 @@
<Project Name="wx-config" Path="../sdk/wxconfig/wx-config.project" Active="No"/>
<Project Name="codelite_clang" Path="../codelite_clang/codelite_clang.project" Active="No"/>
<Project Name="codelitegcc" Path="../codelitegcc/codelitegcc.project" Active="No"/>
- <Project Name="codelite_make" Path="../codelite_make/codelite_make.project" Active="Yes"/>
+ <Project Name="codelite_make" Path="../codelite_make/codelite_make.project" Active="No"/>
<Project Name="codelite_terminal" Path="../codelite_terminal/codelite_terminal.project" Active="No"/>
<BuildMatrix>
<WorkspaceConfiguration Name="Debug" Selected="no">
https://sourceforge.net/p/codelite/codelitegit/ci/afbf13a4f944adddb049bff169a0eb9eb8119e21
commit afbf13a4f944adddb049bff169a0eb9eb8119e21
Author: Eran <era...@gm...>
Date: Tue Dec 31 20:45:12 2013 +0200
codelite-make: added new option: '--execute' with this option, codelite-make will execute the build instead of printing the command line
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/Plugin/cl_aui_dock_art.cpp b/Plugin/cl_aui_dock_art.cpp
index 3da1579..343a1aa 100644
--- a/Plugin/cl_aui_dock_art.cpp
+++ b/Plugin/cl_aui_dock_art.cpp
@@ -117,7 +117,7 @@ void clAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window, const wxString& text,
bottomLeft = tmpRect.GetBottomLeft();
bottomRight = tmpRect.GetBottomRight();
bottomRight.x += 1;
- memDc.SetPen( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE) );
+ memDc.SetPen( bgColour );
memDc.DrawLine(bottomLeft, bottomRight);
memDc.SetPen( penColour );
diff --git a/codelite_make/cl_make_generator_app.cpp b/codelite_make/cl_make_generator_app.cpp
index a6418cc..cf32307 100644
--- a/codelite_make/cl_make_generator_app.cpp
+++ b/codelite_make/cl_make_generator_app.cpp
@@ -5,6 +5,7 @@
#include <configuration_mapping.h>
#include <macromanager.h>
#include <wx/crt.h>
+#include <globals.h>
IMPLEMENT_APP_CONSOLE(clMakeGeneratorApp)
@@ -13,12 +14,14 @@ static const wxCmdLineEntryDesc g_cmdDesc[] = {
{ wxCMD_LINE_OPTION, "w", "workspace", "codelite workspace file", wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
{ wxCMD_LINE_OPTION, "c", "config", "configuration name to generate", wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
{ wxCMD_LINE_OPTION, "p", "project", "project to build, if non given codelite will build the active project", wxCMD_LINE_VAL_STRING },
- { wxCMD_LINE_SWITCH, "v", "verbose", "Run in verbose print all log to the stdout/stderr" },
+ { wxCMD_LINE_SWITCH, "v", "verbose", "Run in verbose move and print all log lines to the stdout/stderr" },
+ { wxCMD_LINE_SWITCH, "e", "execute", "Instead of printing the command line, execute it" },
{ wxCMD_LINE_NONE }
};
clMakeGeneratorApp::clMakeGeneratorApp()
: m_verbose(false)
+ , m_executeCommand(false)
{
}
@@ -35,25 +38,25 @@ bool clMakeGeneratorApp::OnInit()
{
wxLog::EnableLogging(false);
wxCmdLineParser parser(wxAppConsole::argc, wxAppConsole::argv);
- if ( !DoParseCommandLine( parser ) )
+ if ( !DoParseCommandLine( parser ) )
return false;
-
+
wxFileName fnWorkspace(m_workspaceFile);
if ( fnWorkspace.IsRelative() ) {
fnWorkspace.MakeAbsolute(m_workingDirectory);
}
-
+
Info(wxString() << "-- Generting makefile for workspace file " << fnWorkspace.GetFullPath());
wxString errmsg;
if ( !WorkspaceST::Get()->OpenWorkspace(fnWorkspace.GetFullPath(), errmsg) ) {
Error(wxString() << "Error while loading workspace: " << fnWorkspace.GetFullPath() << ". " << errmsg);
return false;
}
-
+
if ( m_project.IsEmpty() ) {
m_project = WorkspaceST::Get()->GetActiveProjectName();
}
-
+
// Which makefile should we create?
BuilderGnuMake builder;
ProjectPtr project = WorkspaceST::Get()->FindProjectByName(m_project, errmsg);
@@ -61,41 +64,50 @@ bool clMakeGeneratorApp::OnInit()
Error(wxString() << "Could not find project " << m_project << ". " << errmsg);
return false;
}
-
+
// Load the build configuration
BuildConfigPtr bldConf = WorkspaceST::Get()->GetProjBuildConf(m_project, m_configuration);
if ( !bldConf ) {
Error(wxString() << "Could not find configuration " << m_configuration << " for project " << m_project);
return false;
}
-
+
if ( bldConf->IsCustomBuild() ) {
Notice(wxString() << "Configuration " << m_configuration << " for project " << m_project << " is using a custom build - will not generate makefile");
Notice(wxString() << "Instead, here is the command line to use:");
- Out(wxString() << "cd " << MacroManager::Instance()->Expand(bldConf->GetCustomBuildWorkingDir(), NULL, m_project, m_configuration)
- << " && "
- << MacroManager::Instance()->Expand(bldConf->GetCustomBuildCmd(), NULL, m_project, m_configuration));
+ Out(wxString() << "cd " << MacroManager::Instance()->Expand(bldConf->GetCustomBuildWorkingDir(), NULL, m_project, m_configuration)
+ << " && "
+ << MacroManager::Instance()->Expand(bldConf->GetCustomBuildCmd(), NULL, m_project, m_configuration));
CallAfter( &clMakeGeneratorApp::DoExitApp);
return true;
}
-
+
if ( !builder.Export(m_project, m_configuration, false, true, errmsg) ) {
Error(wxString() << "Error while exporting makefile. " << errmsg);
return false;
}
-
+
wxString commandToRun;
commandToRun = builder.GetBuildCommand(m_project, m_configuration);
-
+
wxString workspace_path = fnWorkspace.GetPath();
if ( workspace_path.Contains(" ") || workspace_path.Contains("\t") ) {
workspace_path.Prepend("\"").Append("\"");
}
-
+
Info("-- Makefile generation completed successfully!");
- Info("-- To use the makefile, run the following commands from a terminal:");\
- Out(wxString() << "cd " << workspace_path << " && " << commandToRun);
- CallAfter( &clMakeGeneratorApp::DoExitApp);
+ Info("-- To use the makefile, run the following commands from a terminal:");
+
+ wxString command;
+ command << "cd " << workspace_path << " && " << commandToRun;
+
+ if ( m_executeCommand ) {
+ CallAfter( &clMakeGeneratorApp::DoExecCommand, command );
+
+ } else {
+ Out( command );
+ CallAfter( &clMakeGeneratorApp::DoExitApp);
+ }
return true;
}
@@ -103,21 +115,25 @@ bool clMakeGeneratorApp::DoParseCommandLine(wxCmdLineParser& parser)
{
parser.SetDesc( g_cmdDesc );
parser.AddUsageText(_("A makefile generator based on codelite's workspace"));
-
+
int res = parser.Parse(false);
if ( res == wxNOT_FOUND )
return false;
-
+
if ( !parser.Found("w", &m_workspaceFile) ) {
parser.Usage();
return false;
}
-
+
if ( !parser.Found("c", &m_configuration) ) {
parser.Usage();
return false;
}
-
+
+ if ( parser.Found("e") ) {
+ m_executeCommand = true;
+ }
+
parser.Found("p", &m_project);
m_verbose = (parser.FoundSwitch("v") == wxCMD_SWITCH_ON);
m_workingDirectory = ::wxGetCwd();
@@ -159,3 +175,11 @@ void clMakeGeneratorApp::Out(const wxString& msg)
{
wxPrintf("%s\n", msg);
}
+
+void clMakeGeneratorApp::DoExecCommand(const wxString& command)
+{
+ wxString cmd = command;
+ WrapInShell( cmd );
+ ::wxExecute( cmd, wxEXEC_SYNC|wxEXEC_NOHIDE|wxEXEC_SHOW_CONSOLE);
+ CallAfter( &clMakeGeneratorApp::DoExitApp );
+}
diff --git a/codelite_make/cl_make_generator_app.h b/codelite_make/cl_make_generator_app.h
index 3a1fbd7..fe54b0a 100644
--- a/codelite_make/cl_make_generator_app.h
+++ b/codelite_make/cl_make_generator_app.h
@@ -3,32 +3,35 @@
#include <wx/app.h>
#include <wx/cmdline.h>
-
+// -----------------------------------------------------------
+// -----------------------------------------------------------
class clMakeGeneratorApp : public wxAppConsole
{
- wxString m_workspaceFile;
- wxString m_project;
- wxString m_workingDirectory;
- wxString m_configuration;
- bool m_verbose;
-
+ wxString m_workspaceFile;
+ wxString m_project;
+ wxString m_workingDirectory;
+ wxString m_configuration;
+ bool m_verbose;
+ bool m_executeCommand;
+
protected:
bool DoParseCommandLine(wxCmdLineParser& parser);
- void DoExitApp();
-
+ void DoExecCommand(const wxString &command);
+
void Notice(const wxString &msg);
void Error(const wxString &msg);
void Info(const wxString &msg);
void Out(const wxString &msg);
-
+
public:
clMakeGeneratorApp();
virtual ~clMakeGeneratorApp();
-
+
+ void DoExitApp();
virtual bool OnInit();
virtual int OnExit();
};
DECLARE_APP(clMakeGeneratorApp)
-#endif // CLMAKEGENERATORAPP_H
+#endif // CLMAKEGENERATORAPP_H
diff --git a/codelite_make/codelite_make.project b/codelite_make/codelite_make.project
index d84ae88..dc31efc 100644
--- a/codelite_make/codelite_make.project
+++ b/codelite_make/codelite_make.project
@@ -6,6 +6,7 @@
<File Name="cl_make_generator_app.h"/>
<File Name="cl_make_generator_app.cpp"/>
</VirtualDirectory>
+ <Dependencies Name="Release"/>
<Settings Type="Executable">
<GlobalSettings>
<Compiler Options="" C_Options="" Assembler="">
@@ -31,7 +32,7 @@
<Library Value="libwxsqlite3ud.dll"/>
</Linker>
<ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/>
- <General OutputFile="$(IntermediateDirectory)/codelite-make" IntermediateDirectory="./Debug" Command="./codelite-make" CommandArguments="-c Debug -w ../codelite_make.workspace" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/>
+ <General OutputFile="$(IntermediateDirectory)/codelite-make" IntermediateDirectory="./Debug" Command="./codelite-make" CommandArguments="-c Debug -w ../codelite_make.workspace -e" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
@@ -56,11 +57,12 @@
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
- <Completion EnableCpp11="no">
+ <Completion EnableCpp11="yes">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
- <SearchPaths/>
+ <SearchPaths>../CodeLite
+../Plugin</SearchPaths>
</Completion>
</Configuration>
<Configuration Name="Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
@@ -78,7 +80,7 @@
<Library Value="libwxsqlite3u.dll"/>
</Linker>
<ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/>
- <General OutputFile="$(IntermediateDirectory)/codelite-make" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/>
+ <General OutputFile="$(IntermediateDirectory)/codelite-make" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
@@ -113,5 +115,4 @@
</Completion>
</Configuration>
</Settings>
- <Dependencies Name="Release"/>
</CodeLite_Project>
diff --git a/codelite_utils/codelite_utils.workspace b/codelite_utils/codelite_utils.workspace
index baf4ce5..d30a694 100644
--- a/codelite_utils/codelite_utils.workspace
+++ b/codelite_utils/codelite_utils.workspace
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Workspace Name="codelite_utils" Database="./codelite_utils.tags">
- <Project Name="build_all" Path="build_all.project" Active="Yes"/>
+ <Project Name="build_all" Path="build_all.project" Active="No"/>
<Project Name="codelite_launcher" Path="../codelite_launcher/codelite_launcher.project" Active="No"/>
<Project Name="autorev" Path="../AutoRevision/autorev/autorev.project" Active="No"/>
<Project Name="makedir" Path="../TestDir/makedir.project" Active="No"/>
@@ -10,7 +10,7 @@
<Project Name="wx-config" Path="../sdk/wxconfig/wx-config.project" Active="No"/>
<Project Name="codelite_clang" Path="../codelite_clang/codelite_clang.project" Active="No"/>
<Project Name="codelitegcc" Path="../codelitegcc/codelitegcc.project" Active="No"/>
- <Project Name="codelite_make" Path="../codelite_make/codelite_make.project" Active="No"/>
+ <Project Name="codelite_make" Path="../codelite_make/codelite_make.project" Active="Yes"/>
<Project Name="codelite_terminal" Path="../codelite_terminal/codelite_terminal.project" Active="No"/>
<BuildMatrix>
<WorkspaceConfiguration Name="Debug" Selected="no">
-----------------------------------------------------------------------
Summary of changes:
LiteEditor.workspace | 4 +-
Plugin/cl_aui_dock_art.cpp | 2 +-
codelite_make/cl_make_generator_app.cpp | 68 +++++++++++++++++++++----------
codelite_make/cl_make_generator_app.h | 27 +++++++-----
codelite_make/codelite_make.project | 11 +++--
5 files changed, 70 insertions(+), 42 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-31 17:59:06
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 8ec0393db366f2fa83f0fdee9db07f084abd6ad5 (commit)
from 3f5e6b178c70bb1746068d0402a4e74b003d22bf (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/8ec0393db366f2fa83f0fdee9db07f084abd6ad5
commit 8ec0393db366f2fa83f0fdee9db07f084abd6ad5
Author: Eran <era...@gm...>
Date: Tue Dec 31 19:58:53 2013 +0200
Draw the bottom line of the docking windows caption
diff --git a/Plugin/cl_aui_dock_art.cpp b/Plugin/cl_aui_dock_art.cpp
index 4800d5e..3da1579 100644
--- a/Plugin/cl_aui_dock_art.cpp
+++ b/Plugin/cl_aui_dock_art.cpp
@@ -112,8 +112,18 @@ 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() );
+
+ wxPoint bottomLeft, bottomRight;
+ bottomLeft = tmpRect.GetBottomLeft();
+ bottomRight = tmpRect.GetBottomRight();
+ bottomRight.x += 1;
+ memDc.SetPen( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE) );
+ memDc.DrawLine(bottomLeft, bottomRight);
+
+ memDc.SetPen( penColour );
+ bottomLeft.y--;
+ bottomRight.y--;
+ memDc.DrawLine(bottomLeft, bottomRight);
int caption_offset = 0;
if ( pane.icon.IsOk() ) {
diff --git a/Plugin/cl_aui_notebook_art.cpp b/Plugin/cl_aui_notebook_art.cpp
index 9c68904..50a5a22 100644
--- a/Plugin/cl_aui_notebook_art.cpp
+++ b/Plugin/cl_aui_notebook_art.cpp
@@ -61,12 +61,6 @@ void clAuiGlossyTabArt::DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& re
// the pen colour
bgColour = DrawingUtils::GetAUIPaneBGColour();
- // Allow the plugins to override the border colour
- // clColourEvent borderColourEvent( wxEVT_GET_TAB_BORDER_COLOUR );
- // if ( EventNotifier::Get()->ProcessEvent( borderColourEvent ) ) {
- // penColour = borderColourEvent.GetBorderColour();
- // }
-
gdc.SetPen(bgColour);
gdc.SetBrush( DrawingUtils::GetStippleBrush() );
gdc.DrawRectangle(rect);
-----------------------------------------------------------------------
Summary of changes:
Plugin/cl_aui_dock_art.cpp | 14 ++++++++++++--
Plugin/cl_aui_notebook_art.cpp | 6 ------
2 files changed, 12 insertions(+), 8 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-31 15:48:03
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 3f5e6b178c70bb1746068d0402a4e74b003d22bf (commit)
from 4ed126d6655efc55623191111f426d0fed1f67cf (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/3f5e6b178c70bb1746068d0402a4e74b003d22bf
commit 3f5e6b178c70bb1746068d0402a4e74b003d22bf
Author: Eran <era...@gm...>
Date: Tue Dec 31 17:47:52 2013 +0200
Debugger: the memory address bar control is now using the style: wxTE_PROCESS_ENTER so that hitting ENTER after changing the memory address it will perform an evaluation of the new memory address
diff --git a/LiteEditor/memoryviewbase.cpp b/LiteEditor/memoryviewbase.cpp
index 575a078..441d369 100644
--- a/LiteEditor/memoryviewbase.cpp
+++ b/LiteEditor/memoryviewbase.cpp
@@ -37,7 +37,7 @@ MemoryViewBase::MemoryViewBase(wxWindow* parent, wxWindowID id, const wxPoint& p
flexGridSizer6->Add(m_staticText2, 0, wxLEFT|wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 5);
- m_textCtrlExpression = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_textCtrlExpression = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), wxTE_PROCESS_ENTER);
m_textCtrlExpression->SetToolTip(_("Address or pointer to watch"));
flexGridSizer6->Add(m_textCtrlExpression, 1, wxALL|wxEXPAND, 5);
diff --git a/LiteEditor/memoryviewbase.wxcp b/LiteEditor/memoryviewbase.wxcp
index 71bac53..79329d6 100644
--- a/LiteEditor/memoryviewbase.wxcp
+++ b/LiteEditor/memoryviewbase.wxcp
@@ -244,7 +244,7 @@
"border": 5,
"gbSpan": ",",
"gbPosition": ",",
- "m_styles": [],
+ "m_styles": ["wxTE_PROCESS_ENTER"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/memoryviewbase.cpp | 2 +-
LiteEditor/memoryviewbase.wxcp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-31 15:35:45
|
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 4ed126d6655efc55623191111f426d0fed1f67cf (commit)
from b6dcf337f13c7d9314c7fcf14ce957a67d9b3efe (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/4ed126d6655efc55623191111f426d0fed1f67cf
commit 4ed126d6655efc55623191111f426d0fed1f67cf
Author: Eran <era...@gm...>
Date: Tue Dec 31 17:35:24 2013 +0200
Fixed parsing of gdb output when a word is ending with a backslash
Debugger: updated the memory view to allow the user to incrase the number of displayed columns + made the memory size a choice control (was free text)
diff --git a/Debugger/dbgcmd.cpp b/Debugger/dbgcmd.cpp
index d9e882b..9bd426d 100644
--- a/Debugger/dbgcmd.cpp
+++ b/Debugger/dbgcmd.cpp
@@ -1080,7 +1080,7 @@ bool DbgCmdListThreads::ProcessOutput(const wxString& line)
bool DbgCmdWatchMemory::ProcessOutput(const wxString& line)
{
DebuggerEventData e;
- int divider (sizeof(unsigned long));
+ int divider ( m_columns );
int factor((int)(m_count/divider));
if (m_count % divider != 0) {
diff --git a/Debugger/dbgcmd.h b/Debugger/dbgcmd.h
index e46166c..b93a312 100644
--- a/Debugger/dbgcmd.h
+++ b/Debugger/dbgcmd.h
@@ -365,11 +365,18 @@ class DbgCmdWatchMemory : public DbgCmdHandler
{
wxString m_address;
size_t m_count;
-
+ size_t m_columns;
public:
- DbgCmdWatchMemory(IDebuggerObserver *observer, const wxString &address, size_t count) : DbgCmdHandler(observer), m_address(address), m_count(count) {}
+ DbgCmdWatchMemory( IDebuggerObserver *observer,
+ const wxString &address,
+ size_t count,
+ size_t columns)
+ : DbgCmdHandler(observer)
+ , m_address(address)
+ , m_count(count)
+ , m_columns(columns)
+ {}
virtual ~DbgCmdWatchMemory() {}
-
virtual bool ProcessOutput(const wxString & line);
};
diff --git a/Debugger/debuggergdb.cpp b/Debugger/debuggergdb.cpp
index 65eb7cf..ad52cbc 100644
--- a/Debugger/debuggergdb.cpp
+++ b/Debugger/debuggergdb.cpp
@@ -909,10 +909,10 @@ bool DbgGdb::ResolveType( const wxString& expression, int userReason )
return WriteCommand( cmd, new DbgCmdResolveTypeHandler( expression, this, userReason ) );
}
-bool DbgGdb::WatchMemory( const wxString& address, size_t count )
+bool DbgGdb::WatchMemory( const wxString& address, size_t count, size_t columns )
{
// make the line per WORD size
- int divider ( sizeof( unsigned long ) );
+ int divider ( columns );
int factor( ( int )( count/divider ) );
if ( count % divider != 0 ) {
factor = ( int )( count / divider ) + 1;
@@ -922,7 +922,7 @@ bool DbgGdb::WatchMemory( const wxString& address, size_t count )
// and the 'divider' is the columns
wxString cmd;
cmd << wxT( "-data-read-memory \"" ) << address << wxT( "\" x 1 " ) << factor << wxT( " " ) << divider << wxT( " ?" );
- return WriteCommand( cmd, new DbgCmdWatchMemory( m_observer, address, count ) );
+ return WriteCommand( cmd, new DbgCmdWatchMemory( m_observer, address, count, columns ) );
}
bool DbgGdb::SetMemory( const wxString& address, size_t count, const wxString& hex_value )
diff --git a/Debugger/debuggergdb.h b/Debugger/debuggergdb.h
index 1f91118..d7104a5 100644
--- a/Debugger/debuggergdb.h
+++ b/Debugger/debuggergdb.h
@@ -146,7 +146,7 @@ public:
virtual void Poke();
virtual bool GetAsciiViewerContent(const wxString &dbgCommand, const wxString &expression);
virtual bool ResolveType(const wxString &expression, int userReason);
- virtual bool WatchMemory(const wxString &address, size_t count);
+ virtual bool WatchMemory(const wxString &address, size_t count, size_t columns);
virtual bool SetMemory(const wxString &address, size_t count, const wxString &hex_value);
virtual void SetDebuggerInformation(const DebuggerInformation &info);
virtual void BreakList();
diff --git a/Debugger/gdb_result.cpp b/Debugger/gdb_result.cpp
index c5abf96..d3ff567 100644
--- a/Debugger/gdb_result.cpp
+++ b/Debugger/gdb_result.cpp
@@ -305,55 +305,55 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
*yy_cp = '\0'; \
yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 77
-#define YY_END_OF_BUFFER 78
-static yyconst short int yy_acclist[404] =
+#define YY_NUM_RULES 78
+#define YY_END_OF_BUFFER 79
+static yyconst short int yy_acclist[405] =
{ 0,
- 78, 57, 77, 1, 57, 77, 3, 77, 2, 57,
- 77, 55, 57, 77, 54, 57, 77, 57, 77, 5,
- 57, 77, 4, 57, 77, 51, 57, 77, 49, 57,
- 77, 49, 57, 77, 49, 57, 77, 57, 77, 50,
- 57, 77, 49, 57, 77, 49, 57, 77, 49, 57,
- 77, 49, 57, 77, 49, 57, 77, 49, 57, 77,
- 49, 57, 77, 49, 57, 77, 49, 57, 77, 49,
- 57, 77, 49, 57, 77, 49, 57, 77, 49, 57,
- 77, 49, 57, 77, 49, 57, 77, 52, 57, 77,
- 53, 57, 77, 67, 77, 77, 66, 67, 77, 67,
-
- 77, 76, 77, 76, 77, 1, 3, 2, 7, 7,
+ 79, 57, 78, 1, 57, 78, 3, 78, 2, 57,
+ 78, 55, 57, 78, 54, 57, 78, 57, 78, 5,
+ 57, 78, 4, 57, 78, 51, 57, 78, 49, 57,
+ 78, 49, 57, 78, 49, 57, 78, 57, 78, 50,
+ 57, 78, 49, 57, 78, 49, 57, 78, 49, 57,
+ 78, 49, 57, 78, 49, 57, 78, 49, 57, 78,
+ 49, 57, 78, 49, 57, 78, 49, 57, 78, 49,
+ 57, 78, 49, 57, 78, 49, 57, 78, 49, 57,
+ 78, 49, 57, 78, 49, 57, 78, 52, 57, 78,
+ 53, 57, 78, 68, 78, 78, 67, 68, 78, 68,
+
+ 78, 77, 78, 77, 78, 1, 3, 2, 7, 7,
5, 5, 5, 4, 4, 4, 49, 49, 55, 56,
49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
- 49, 65, 75, 7, 7, 5, 6, 4, 49, 49,
+ 49, 65, 66, 76, 7, 7, 5, 6, 4, 49,
49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
- 49, 49, 49, 49, 49, 49, 32, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 32, 49, 49,
49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
- 49, 49, 49, 49, 49, 59, 61, 62, 60, 69,
-
- 71, 72, 70, 7, 6, 6, 49, 23, 49, 16,
- 49, 49, 49, 34, 49, 33, 49, 49, 49, 49,
- 22, 49, 49, 8, 49, 49, 12, 49, 49, 49,
- 49, 46, 49, 49, 49, 15, 49, 49, 49, 49,
- 49, 49, 49, 49, 49, 49, 49, 36, 49, 21,
- 49, 49, 49, 58, 63, 64, 73, 74, 6, 49,
- 49, 24, 49, 49, 49, 26, 49, 49, 49, 11,
- 49, 18, 49, 49, 49, 17, 49, 49, 49, 49,
- 49, 49, 49, 49, 49, 49, 49, 49, 49, 14,
- 49, 49, 28, 68, 49, 49, 49, 49, 49, 49,
-
- 49, 49, 49, 19, 49, 49, 49, 49, 49, 49,
- 45, 49, 37, 49, 49, 49, 49, 49, 27, 49,
- 49, 47, 49, 49, 49, 49, 49, 49, 49, 49,
- 49, 49, 31, 49, 30, 49, 49, 9, 49, 49,
- 35, 49, 49, 49, 49, 49, 25, 49, 49, 49,
- 49, 39, 49, 49, 49, 20, 49, 49, 49, 49,
- 48, 49, 49, 10, 49, 49, 44, 49, 49, 49,
- 49, 49, 49, 38, 49, 49, 49, 49, 13, 49,
- 49, 49, 43, 49, 49, 49, 49, 49, 40, 49,
- 49, 49, 49, 49, 41, 49, 49, 49, 29, 49,
-
- 49, 42, 49
+ 49, 49, 49, 49, 49, 49, 59, 61, 62, 60,
+
+ 70, 72, 73, 71, 7, 6, 6, 49, 23, 49,
+ 16, 49, 49, 49, 34, 49, 33, 49, 49, 49,
+ 49, 22, 49, 49, 8, 49, 49, 12, 49, 49,
+ 49, 49, 46, 49, 49, 49, 15, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 36, 49,
+ 21, 49, 49, 49, 58, 63, 64, 74, 75, 6,
+ 49, 49, 24, 49, 49, 49, 26, 49, 49, 49,
+ 11, 49, 18, 49, 49, 49, 17, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 14, 49, 49, 28, 69, 49, 49, 49, 49, 49,
+
+ 49, 49, 49, 49, 19, 49, 49, 49, 49, 49,
+ 49, 45, 49, 37, 49, 49, 49, 49, 49, 27,
+ 49, 49, 47, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 31, 49, 30, 49, 49, 9, 49,
+ 49, 35, 49, 49, 49, 49, 49, 25, 49, 49,
+ 49, 49, 39, 49, 49, 49, 20, 49, 49, 49,
+ 49, 48, 49, 49, 10, 49, 49, 44, 49, 49,
+ 49, 49, 49, 49, 38, 49, 49, 49, 49, 13,
+ 49, 49, 49, 43, 49, 49, 49, 49, 49, 40,
+ 49, 49, 49, 49, 49, 41, 49, 49, 49, 29,
+
+ 49, 49, 42, 49
} ;
static yyconst short int yy_accept[325] =
@@ -369,31 +369,31 @@ static yyconst short int yy_accept[325] =
136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
146, 147, 148, 149, 150, 151, 152, 152, 153, 153,
- 153, 154, 154, 154, 155, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
- 170, 171, 172, 173, 174, 175, 176, 177, 179, 180,
- 181, 182, 183, 184, 185, 186, 187, 188, 189, 190,
- 191, 192, 193, 194, 195, 196, 196, 196, 196, 197,
- 198, 199, 200, 200, 200, 201, 202, 203, 204, 204,
- 205, 206, 207, 208, 210, 212, 213, 214, 216, 218,
- 219, 220, 221, 223, 224, 226, 227, 229, 230, 231,
- 232, 234, 235, 236, 238, 239, 240, 241, 242, 243,
- 244, 245, 246, 247, 248, 250, 252, 253, 254, 254,
-
- 255, 256, 257, 257, 258, 259, 260, 261, 262, 264,
- 265, 266, 268, 269, 270, 272, 274, 275, 276, 278,
- 279, 280, 281, 282, 283, 284, 285, 286, 287, 288,
- 289, 290, 292, 293, 294, 295, 296, 297, 298, 299,
- 300, 301, 302, 303, 304, 306, 307, 308, 309, 310,
- 311, 313, 315, 316, 317, 318, 319, 321, 322, 324,
- 325, 326, 327, 328, 329, 330, 331, 332, 333, 335,
- 337, 338, 340, 341, 343, 344, 345, 346, 347, 349,
- 350, 351, 352, 354, 355, 356, 358, 359, 360, 361,
- 363, 364, 366, 367, 369, 370, 371, 372, 373, 374,
-
- 376, 377, 378, 379, 381, 382, 383, 385, 386, 387,
- 388, 389, 391, 392, 393, 394, 395, 397, 398, 399,
- 401, 402, 404, 404
+ 154, 155, 155, 155, 156, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
+ 171, 172, 173, 174, 175, 176, 177, 178, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 197, 197, 197, 198,
+ 199, 200, 201, 201, 201, 202, 203, 204, 205, 205,
+ 206, 207, 208, 209, 211, 213, 214, 215, 217, 219,
+ 220, 221, 222, 224, 225, 227, 228, 230, 231, 232,
+ 233, 235, 236, 237, 239, 240, 241, 242, 243, 244,
+ 245, 246, 247, 248, 249, 251, 253, 254, 255, 255,
+
+ 256, 257, 258, 258, 259, 260, 261, 262, 263, 265,
+ 266, 267, 269, 270, 271, 273, 275, 276, 277, 279,
+ 280, 281, 282, 283, 284, 285, 286, 287, 288, 289,
+ 290, 291, 293, 294, 295, 296, 297, 298, 299, 300,
+ 301, 302, 303, 304, 305, 307, 308, 309, 310, 311,
+ 312, 314, 316, 317, 318, 319, 320, 322, 323, 325,
+ 326, 327, 328, 329, 330, 331, 332, 333, 334, 336,
+ 338, 339, 341, 342, 344, 345, 346, 347, 348, 350,
+ 351, 352, 353, 355, 356, 357, 359, 360, 361, 362,
+ 364, 365, 367, 368, 370, 371, 372, 373, 374, 375,
+
+ 377, 378, 379, 380, 382, 383, 384, 386, 387, 388,
+ 389, 390, 392, 393, 394, 395, 396, 398, 399, 400,
+ 402, 403, 405, 405
} ;
static yyconst int yy_ec[256] =
@@ -1210,6 +1210,10 @@ YY_RULE_SETUP
YY_BREAK
case 66:
YY_RULE_SETUP
+{ gs_string += "\\";}
+ YY_BREAK
+case 67:
+YY_RULE_SETUP
{
gs_string += "\"";
gdb_result_string = gs_string;
@@ -1219,11 +1223,11 @@ YY_RULE_SETUP
return GDB_STRING;
}
YY_BREAK
-case 67:
+case 68:
YY_RULE_SETUP
{ gs_string += yytext; }
YY_BREAK
-case 68:
+case 69:
YY_RULE_SETUP
{
if(gs_ascii) {
@@ -1240,31 +1244,31 @@ YY_RULE_SETUP
}
}
YY_BREAK
-case 69:
+case 70:
YY_RULE_SETUP
{ gs_string += "\\n"; }
YY_BREAK
-case 70:
+case 71:
YY_RULE_SETUP
{ gs_string += "\\v"; }
YY_BREAK
-case 71:
+case 72:
YY_RULE_SETUP
{ gs_string += "\\r"; }
YY_BREAK
-case 72:
+case 73:
YY_RULE_SETUP
{ gs_string += "\\t"; }
YY_BREAK
-case 73:
+case 74:
YY_RULE_SETUP
{ gs_string += "\\\""; }
YY_BREAK
-case 74:
+case 75:
YY_RULE_SETUP
{ gs_string += "\\"; }
YY_BREAK
-case 75:
+case 76:
YY_RULE_SETUP
{
gs_string += "\"";
@@ -1275,11 +1279,11 @@ YY_RULE_SETUP
return GDB_ESCAPED_STRING;
}
YY_BREAK
-case 76:
+case 77:
YY_RULE_SETUP
{ gs_string += yytext; }
YY_BREAK
-case 77:
+case 78:
YY_RULE_SETUP
ECHO;
YY_BREAK
diff --git a/Interfaces/debugger.h b/Interfaces/debugger.h
index af4fbf5..ebc67f4 100644
--- a/Interfaces/debugger.h
+++ b/Interfaces/debugger.h
@@ -794,7 +794,7 @@ public:
* \param count address range
* \return true on success, false otherwise
*/
- virtual bool WatchMemory(const wxString &address, size_t count) = 0;
+ virtual bool WatchMemory(const wxString &address, size_t count, size_t columns) = 0;
/**
* \brief set memory at given address and of size count. the value to set must be a space delimited
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index b57dd32..eb2b173 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -639,6 +639,7 @@
<File Name="DebuggerSettings.wxcp"/>
<File Name="DebuggerDisassemblyTab.h"/>
<File Name="DebuggerDisassemblyTab.cpp"/>
+ <File Name="memoryviewbase.wxcp"/>
</VirtualDirectory>
<Options/>
<Dependencies Name="UnixCodeLite">
@@ -806,6 +807,7 @@
<File Name="editor_options_misc_liteeditor_bitmaps.cpp"/>
<File Name="editor_options_caret_liteeditor_bitmaps.cpp"/>
<File Name="plugindlgbase_liteeditor_bitmaps.cpp"/>
+ <File Name="memoryviewbase_liteeditor_bitmaps.cpp"/>
</VirtualDirectory>
<File Name="../formbuilder/editorsettingslocalbase.wxcp"/>
<File Name="../formbuilder/findinfiles_dlg.wxcp"/>
@@ -1328,7 +1330,7 @@ resources.cpp: resources.xrc
<Library Value="liblibclang.dll"/>
</Linker>
<ResourceCompiler Options="$(shell wx-config --rcflags)" Required="yes"/>
- <General OutputFile="$(IntermediateDirectory)/codelite-dbg.exe" IntermediateDirectory="./Debug" Command="./codelite-dbg.exe" CommandArguments="-b . " UseSeparateDebugArgs="no" DebugArguments="-b . --no-plugins" WorkingDirectory="../Runtime " PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
+ <General OutputFile="$(IntermediateDirectory)/codelite-dbg.exe" IntermediateDirectory="./Debug" Command="./codelite-dbg.exe" CommandArguments="-b . " UseSeparateDebugArgs="yes" DebugArguments="-b . --no-plugins" WorkingDirectory="../Runtime " PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="Default" DbgSetName="">
<![CDATA[PATH=../sdk/clang/lib;$(WXWIN)\lib\gcc_dll;$(PATH)]]>
</Environment>
diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp
index 51b88ec..6fb2aa3 100644
--- a/LiteEditor/manager.cpp
+++ b/LiteEditor/manager.cpp
@@ -2068,7 +2068,7 @@ void Manager::DoUpdateDebuggerTabControl(wxWindow* curpage)
if ( memView->GetExpression().IsEmpty() == false ) {
wxString output;
- dbgr->WatchMemory ( memView->GetExpression(), memView->GetSize() );
+ dbgr->WatchMemory ( memView->GetExpression(), memView->GetSize(), memView->GetColumns() );
}
}
}
diff --git a/LiteEditor/memoryview.cpp b/LiteEditor/memoryview.cpp
index 052fb68..04a998b 100644
--- a/LiteEditor/memoryview.cpp
+++ b/LiteEditor/memoryview.cpp
@@ -1,25 +1,25 @@
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
//
-// copyright : (C) 2008 by Eran Ifrah
-// file name : memoryview.cpp
-//
+// copyright : (C) 2008 by Eran Ifrah
+// file name : memoryview.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.
+//
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -30,151 +30,174 @@
#include "frame.h"
MemoryView::MemoryView( wxWindow* parent )
- : MemoryViewBase( parent )
+ : MemoryViewBase( parent )
{
- m_buttonUpdate->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( MemoryView::OnUpdateUI ), NULL, this );
- m_textCtrlExpression->Connect( wxEVT_COMMAND_TEXT_ENTER, wxTextEventHandler( MemoryView::OnEvaluate ), NULL, this );
+ m_buttonUpdate->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( MemoryView::OnUpdateUI ), NULL, this );
+ m_textCtrlExpression->Connect( wxEVT_COMMAND_TEXT_ENTER, wxTextEventHandler( MemoryView::OnEvaluate ), NULL, this );
}
void MemoryView::OnEvaluate( wxCommandEvent& event )
{
- wxUnusedVar(event);
- ManagerST::Get()->UpdateDebuggerPane();
+ wxUnusedVar(event);
+ ManagerST::Get()->UpdateDebuggerPane();
}
void MemoryView::OnEvaluateUI( wxUpdateUIEvent& event )
{
- event.Enable(m_textCtrlExpression->GetValue().IsEmpty() == false);
+ event.Enable(m_textCtrlExpression->GetValue().IsEmpty() == false);
}
void MemoryView::Clear()
{
- m_textCtrlExpression->Clear();
- m_textCtrlMemory->Clear();
+ m_textCtrlExpression->Clear();
+ m_textCtrlMemory->Clear();
+}
+
+size_t MemoryView::GetColumns() const
+{
+ long value(8);
+ m_choiceCols->GetStringSelection().ToLong(&value);
+ return value;
}
size_t MemoryView::GetSize() const
{
- long value(0);
- m_textCtrlSize->GetValue().ToLong(&value);
-
- // set default memory size to 32 bytes
- if (!value) {
- value = 32;
- }
- return value;
+ long value(32);
+ m_choiceSize->GetStringSelection().ToLong(&value);
+ return value;
}
void MemoryView::SetViewString(const wxString& text)
{
- m_textCtrlMemory->Freeze();
- // get old value
- wxString oldValue = m_textCtrlMemory->GetValue();
-
- m_textCtrlMemory->Clear();
- // first check that we are trying to view the same addresses
... 2057 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-31 13:32:35
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via b6dcf337f13c7d9314c7fcf14ce957a67d9b3efe (commit)
from 6780027d05ef90719f3b5d657f48b341e05a0a0c (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/b6dcf337f13c7d9314c7fcf14ce957a67d9b3efe
commit b6dcf337f13c7d9314c7fcf14ce957a67d9b3efe
Author: Eran <era...@gm...>
Date: Tue Dec 31 15:32:23 2013 +0200
wx-config: applied patch for better support of monolithic built if wxWidgets + added support for mor libraries (like richtext, webview etc)
diff --git a/sdk/wxconfig/wx-config-win.cpp b/sdk/wxconfig/wx-config-win.cpp
index 892d221..8dd311d 100644
--- a/sdk/wxconfig/wx-config-win.cpp
+++ b/sdk/wxconfig/wx-config-win.cpp
@@ -592,7 +592,7 @@ public:
if (cfg["MONOLITHIC"] == "0")
if (cfg["USE_GUI"] == "1")
po["__WXLIB_ADV_p"] = addLib(po["LIB_BASENAME_MSW"] + "_adv");
- } else if (lib == "rich") {
+ } else if (lib == "rich" || lib == "richtext") {
if (cfg["MONOLITHIC"] == "0")
if (cfg["USE_GUI"] == "1")
po["__WXLIB_RICH_p"] = addLib(po["LIB_BASENAME_MSW"] + "_richtext");
@@ -641,6 +641,30 @@ public:
}
}
}
+ } else if (lib == "webview") {
+ if (cfg["MONOLITHIC"] == "0")
+ if (cfg["USE_GUI"] == "1")
+ if (cfg["USE_WEBVIEW"] == "1") {
+ po["__WXLIB_WEBVIEW_p"] = addLib(po["LIB_BASENAME_MSW"] + "_webview");
+ }
+ } else if (lib == "stc") {
+ if (cfg["MONOLITHIC"] == "0")
+ if (cfg["USE_GUI"] == "1")
+ if (cfg["USE_STC"] == "1") {
+ po["__WXLIB_STC_p"] = addLib(po["LIB_BASENAME_MSW"] + "_stc");
+ }
+ } else if (lib == "propgrid") {
+ if (cfg["MONOLITHIC"] == "0")
+ if (cfg["USE_GUI"] == "1")
+ if (cfg["USE_PROPGRID"] == "1") {
+ po["__WXLIB_PROPGRID_p"] = addLib(po["LIB_BASENAME_MSW"] + "_propgrid");
+ }
+ } else if (lib == "ribbon") {
+ if (cfg["MONOLITHIC"] == "0")
+ if (cfg["USE_GUI"] == "1")
+ if (cfg["USE_RIBBON"] == "1") {
+ po["__WXLIB_RIBBON_p"] = addLib(po["LIB_BASENAME_MSW"] + "_ribbon");
+ }
} else if (lib == "opengl" || lib == "gl") {
if (cfg["USE_OPENGL"] == "1")
if (cfg["USE_GUI"] == "1")
@@ -662,6 +686,10 @@ public:
/// External libs (to wxWidgets)
if (cfg["USE_GUI"] == "1")
+ if (sho["wxUSE_STC"])
+ po["__LIB_WXSCINTILLA_p"] = addLib("wxscintilla" + po["WXDEBUGFLAG"]);
+
+ if (cfg["USE_GUI"] == "1")
if (sho["wxUSE_LIBTIFF"])
po["__LIB_TIFF_p"] = addLib("wxtiff" + po["WXDEBUGFLAG"]);
@@ -767,11 +795,14 @@ public:
std::string getAllLibs(Options& po) {
std::string libs;
libs += po["__WXLIB_ARGS_p"] + po["__WXLIB_OPENGL_p"] + po["__WXLIB_MEDIA_p"];
+ libs += po["__WXLIB_STC_p"] + po["__WXLIB_WEBVIEW_p"];
+ libs += po["__WXLIB_PROPGRID_p"] + po["__WXLIB_RIBBON_p"];
+ libs += po["__WXLIB_RICH_p"];
libs += po["__WXLIB_DBGRID_p"] + po["__WXLIB_ODBC_p"] + po["__WXLIB_XRC_p"];
libs += po["__WXLIB_QA_p"] + po["__WXLIB_AUI_p"] + po["__WXLIB_HTML_p"] + po["__WXLIB_ADV_p"];
libs += po["__WXLIB_CORE_p"] + po["__WXLIB_XML_p"] + po["__WXLIB_NET_p"];
- libs += po["__WXLIB_RICH_p"];
libs += po["__WXLIB_BASE_p"] + po["__WXLIB_MONO_p"];
+ libs += po["__LIB_WXSCINTILLA_p"];
libs += po["__LIB_TIFF_p"] + po["__LIB_JPEG_p"] + po["__LIB_PNG_p"];
libs += po["__LIB_ZLIB_p"] + po["__LIB_REGEX_p"] + po["__LIB_EXPAT_p"];
libs += po["EXTRALIBS_FOR_BASE"] + po["__UNICOWS_LIB_p"] + po["__GDIPLUS_LIB_p"];
-----------------------------------------------------------------------
Summary of changes:
sdk/wxconfig/wx-config-win.cpp | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2013-12-30 19:22: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 6780027d05ef90719f3b5d657f48b341e05a0a0c (commit)
from 3316494920d31f0299acec6d521a28a7b1e2d1ee (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/6780027d05ef90719f3b5d657f48b341e05a0a0c
commit 6780027d05ef90719f3b5d657f48b341e05a0a0c
Author: dghart <da...@4P...>
Date: Mon Dec 30 14:26:48 2013 +0000
Typo fix
(Though this was just a single-letter substitution, lots of minor wxCrafter changes came too.)
diff --git a/git/gitui.cpp b/git/gitui.cpp
index 59c645c..f0224df 100644
--- a/git/gitui.cpp
+++ b/git/gitui.cpp
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: gitui.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -22,7 +23,7 @@ GitSettingsDlgBase::GitSettingsDlgBase(wxWindow* parent, wxWindowID id, const wx
bBitmapLoaded = true;
}
- mainSizer = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
this->SetSizer(mainSizer);
m_treebook230 = new wxTreebook(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBK_DEFAULT);
@@ -32,10 +33,10 @@ GitSettingsDlgBase::GitSettingsDlgBase(wxWindow* parent, wxWindowID id, const wx
m_panel232 = new wxPanel(m_treebook230, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_treebook230->AddPage(m_panel232, _("Tools"), true, wxNOT_FOUND);
- boxSizer240 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer240 = new wxBoxSizer(wxVERTICAL);
m_panel232->SetSizer(boxSizer240);
- fgSizer11 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* fgSizer11 = new wxFlexGridSizer( 0, 2, 0, 0);
fgSizer11->SetFlexibleDirection( wxBOTH );
fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer11->AddGrowableCol(1);
@@ -61,10 +62,10 @@ GitSettingsDlgBase::GitSettingsDlgBase(wxWindow* parent, wxWindowID id, const wx
m_panel234 = new wxPanel(m_treebook230, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_treebook230->AddPage(m_panel234, _("Configuration"), false, wxNOT_FOUND);
- boxSizer242 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer242 = new wxBoxSizer(wxVERTICAL);
m_panel234->SetSizer(boxSizer242);
- flexGridSizer244 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer244 = new wxFlexGridSizer( 0, 2, 0, 0);
flexGridSizer244->SetFlexibleDirection( wxBOTH );
flexGridSizer244->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer244->AddGrowableCol(1);
@@ -110,7 +111,7 @@ GitSettingsDlgBase::GitSettingsDlgBase(wxWindow* parent, wxWindowID id, const wx
m_panel236 = new wxPanel(m_treebook230, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_treebook230->AddPage(m_panel236, _("Misc"), false, wxNOT_FOUND);
- boxSizer766 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer766 = new wxBoxSizer(wxVERTICAL);
m_panel236->SetSizer(boxSizer766);
m_checkBoxTerminal = new wxCheckBox(m_panel236, wxID_ANY, _("Show Terminal"), wxDefaultPosition, wxSize(-1,-1), 0);
@@ -131,7 +132,7 @@ GitSettingsDlgBase::GitSettingsDlgBase(wxWindow* parent, wxWindowID id, const wx
boxSizer766->Add(m_checkBoxTrackTree, 0, wxALL, 5);
- bSizer3 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer3 = new wxBoxSizer(wxHORIZONTAL);
mainSizer->Add(bSizer3, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
@@ -182,7 +183,7 @@ GitCommitDlgBase::GitCommitDlgBase(wxWindow* parent, wxWindowID id, const wxStri
bBitmapLoaded = true;
}
- bSizer4 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer4 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizer4);
m_splitterMain = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME|wxSP_3DSASH);
@@ -193,7 +194,7 @@ GitCommitDlgBase::GitCommitDlgBase(wxWindow* parent, wxWindowID id, const wxStri
m_panel3 = new wxPanel(m_splitterMain, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL);
- bSizer12 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer12 = new wxBoxSizer(wxVERTICAL);
m_panel3->SetSizer(bSizer12);
m_splitterInner = new wxSplitterWindow(m_panel3, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME|wxSP_3DSASH);
@@ -204,7 +205,7 @@ GitCommitDlgBase::GitCommitDlgBase(wxWindow* parent, wxWindowID id, const wxStri
m_panel1 = new wxPanel(m_splitterInner, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL);
- bSizer11 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer11 = new wxBoxSizer(wxVERTICAL);
m_panel1->SetSizer(bSizer11);
m_staticText6 = new wxStaticText(m_panel1, wxID_ANY, _("Modified paths:"), wxDefaultPosition, wxSize(-1, -1), 0);
@@ -219,7 +220,7 @@ GitCommitDlgBase::GitCommitDlgBase(wxWindow* parent, wxWindowID id, const wxStri
m_panel2 = new wxPanel(m_splitterInner, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL);
m_splitterInner->SplitVertically(m_panel1, m_panel2, 0);
- bSizer9 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer9 = new wxBoxSizer(wxVERTICAL);
m_panel2->SetSizer(bSizer9);
m_staticText7 = new wxStaticText(m_panel2, wxID_ANY, _("Diff:"), wxDefaultPosition, wxSize(-1, -1), 0);
@@ -232,7 +233,7 @@ GitCommitDlgBase::GitCommitDlgBase(wxWindow* parent, wxWindowID id, const wxStri
m_panel4 = new wxPanel(m_splitterMain, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL);
m_splitterMain->SplitHorizontally(m_panel3, m_panel4, 0);
- bSizer13 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer13 = new wxBoxSizer(wxVERTICAL);
m_panel4->SetSizer(bSizer13);
m_staticText8 = new wxStaticText(m_panel4, wxID_ANY, _("Commit message:"), wxDefaultPosition, wxSize(-1, -1), 0);
@@ -245,7 +246,7 @@ GitCommitDlgBase::GitCommitDlgBase(wxWindow* parent, wxWindowID id, const wxStri
bSizer13->Add(m_commitMessage, 1, wxALL|wxEXPAND, 5);
- bSizer5 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer5 = new wxBoxSizer(wxHORIZONTAL);
bSizer4->Add(bSizer5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
@@ -286,7 +287,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
bBitmapLoaded = true;
}
- bSizer17 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer17 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizer17);
m_splitter174 = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME|wxSP_3DSASH);
@@ -297,7 +298,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
m_splitterPage178 = new wxPanel(m_splitter174, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
- boxSizer205 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer205 = new wxBoxSizer(wxVERTICAL);
m_splitterPage178->SetSizer(boxSizer205);
m_staticText207 = new wxStaticText(m_splitterPage178, wxID_ANY, _("Commit list:"), wxDefaultPosition, wxSize(-1,-1), 0);
@@ -315,7 +316,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
m_splitterPage182 = new wxPanel(m_splitter174, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_splitter174->SplitHorizontally(m_splitterPage178, m_splitterPage182, 150);
- boxSizer184 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer184 = new wxBoxSizer(wxVERTICAL);
m_splitterPage182->SetSizer(boxSizer184);
m_splitter186 = new wxSplitterWindow(m_splitterPage182, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME|wxSP_3DSASH);
@@ -326,7 +327,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
m_splitterPage190 = new wxPanel(m_splitter186, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
- bSizer18 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* bSizer18 = new wxBoxSizer(wxHORIZONTAL);
m_splitterPage190->SetSizer(bSizer18);
m_splitter196 = new wxSplitterWindow(m_splitterPage190, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME|wxSP_3DSASH);
@@ -337,7 +338,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
m_splitterPage200 = new wxPanel(m_splitter196, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
- boxSizer208 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer208 = new wxBoxSizer(wxVERTICAL);
m_splitterPage200->SetSizer(boxSizer208);
m_staticText210 = new wxStaticText(m_splitterPage200, wxID_ANY, _("Modified files:"), wxDefaultPosition, wxSize(-1,-1), 0);
@@ -352,7 +353,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
m_splitterPage204 = new wxPanel(m_splitter196, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_splitter196->SplitVertically(m_splitterPage200, m_splitterPage204, 0);
- boxSizer215 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer215 = new wxBoxSizer(wxVERTICAL);
m_splitterPage204->SetSizer(boxSizer215);
m_staticText217 = new wxStaticText(m_splitterPage204, wxID_ANY, _("Diff:"), wxDefaultPosition, wxSize(-1,-1), 0);
@@ -400,7 +401,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
m_splitterPage194 = new wxPanel(m_splitter186, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_splitter186->SplitHorizontally(m_splitterPage190, m_splitterPage194, 100);
- boxSizer218 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer218 = new wxBoxSizer(wxVERTICAL);
m_splitterPage194->SetSizer(boxSizer218);
m_staticText220 = new wxStaticText(m_splitterPage194, wxID_ANY, _("Commit message:"), wxDefaultPosition, wxSize(-1,-1), 0);
@@ -411,7 +412,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
boxSizer218->Add(m_commitMessage, 1, wxALL|wxEXPAND, 5);
- boxSizer224 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* boxSizer224 = new wxBoxSizer(wxHORIZONTAL);
bSizer17->Add(boxSizer224, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
@@ -454,7 +455,7 @@ GitDiffDlgBase::GitDiffDlgBase(wxWindow* parent, wxWindowID id, const wxString&
bBitmapLoaded = true;
}
- bSizer17 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* bSizer17 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizer17);
m_splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME|wxSP_3DSASH);
@@ -465,7 +466,7 @@ GitDiffDlgBase::GitDiffDlgBase(wxWindow* parent, wxWindowID id, const wxString&
m_splitterPageFiles = new wxPanel(m_splitter, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
- boxSizer62 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer62 = new wxBoxSizer(wxVERTICAL);
m_splitterPageFiles->SetSizer(boxSizer62);
m_staticText68 = new wxStaticText(m_splitterPageFiles, wxID_ANY, _("Modified files:"), wxDefaultPosition, wxSize(-1,-1), 0);
@@ -480,7 +481,7 @@ GitDiffDlgBase::GitDiffDlgBase(wxWindow* parent, wxWindowID id, const wxString&
m_splitterPageDiff = new wxPanel(m_splitter, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_splitter->SplitVertically(m_splitterPageFiles, m_splitterPageDiff, 0);
- boxSizer64 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer64 = new wxBoxSizer(wxVERTICAL);
m_splitterPageDiff->SetSizer(boxSizer64);
m_staticText66 = new wxStaticText(m_splitterPageDiff, wxID_ANY, _("Diff:"), wxDefaultPosition, wxSize(-1,-1), 0);
@@ -712,10 +713,10 @@ gitCloneDlgBaseClass::gitCloneDlgBaseClass(wxWindow* parent, wxWindowID id, cons
bBitmapLoaded = true;
}
- boxSizer17 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer17 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer17);
- flexGridSizer21 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer21 = new wxFlexGridSizer( 0, 2, 0, 0);
flexGridSizer21->SetFlexibleDirection( wxBOTH );
flexGridSizer21->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer21->AddGrowableCol(1);
@@ -763,7 +764,7 @@ gitCloneDlgBaseClass::gitCloneDlgBaseClass(wxWindow* parent, wxWindowID id, cons
flexGridSizer21->Add(m_textCtrlPassword, 0, wxALL|wxEXPAND, 5);
- boxSizer18 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* boxSizer18 = new wxBoxSizer(wxHORIZONTAL);
boxSizer17->Add(boxSizer18, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
@@ -810,7 +811,7 @@ GitConsoleBase::GitConsoleBase(wxWindow* parent, wxWindowID id, const wxPoint& p
bBitmapLoaded = true;
}
- boxSizer36 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer36 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer36);
m_auibar = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_PLAIN_BACKGROUND|wxAUI_TB_DEFAULT_STYLE);
@@ -818,7 +819,7 @@ GitConsoleBase::GitConsoleBase(wxWindow* parent, wxWindowID id, const wxPoint& p
boxSizer36->Add(m_auibar, 0, wxLEFT|wxRIGHT|wxEXPAND, 0);
- m_auibar->AddTool(XRCID("git_settings"), _("git gettings"), wxXmlResource::Get()->LoadBitmap(wxT("git-settings")), wxNullBitmap, wxITEM_NORMAL, wxT(""), _("git gettings"), NULL);
+ m_auibar->AddTool(XRCID("git_settings"), _("git settings"), wxXmlResource::Get()->LoadBitmap(wxT("git-settings")), wxNullBitmap, wxITEM_NORMAL, _("git settings"), _("git settings"), NULL);
m_auibar->AddSeparator();
@@ -851,7 +852,7 @@ GitConsoleBase::GitConsoleBase(wxWindow* parent, wxWindowID id, const wxPoint& p
m_splitterPage100 = new wxPanel(m_splitter, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
- boxSizer94 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer94 = new wxBoxSizer(wxVERTICAL);
m_splitterPage100->SetSizer(boxSizer94);
m_dvFiles = new wxDataViewCtrl(m_splitterPage100, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxDV_NO_HEADER|wxDV_MULTIPLE|wxBORDER_THEME);
@@ -866,7 +867,7 @@ GitConsoleBase::GitConsoleBase(wxWindow* parent, wxWindowID id, const wxPoint& p
m_splitterPage96 = new wxPanel(m_splitter, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_splitter->SplitVertically(m_splitterPage100, m_splitterPage96, 0);
- boxSizer92 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer92 = new wxBoxSizer(wxVERTICAL);
m_splitterPage96->SetSizer(boxSizer92);
m_stcLog = new wxStyledTextCtrl(m_splitterPage96, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME);
@@ -965,7 +966,7 @@ GitFileDiffDlgBase::GitFileDiffDlgBase(wxWindow* parent, wxWindowID id, const wx
bBitmapLoaded = true;
}
- boxSizer124 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer124 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer124);
m_auibar132 = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_DEFAULT_STYLE);
@@ -1014,7 +1015,7 @@ GitFileDiffDlgBase::GitFileDiffDlgBase(wxWindow* parent, wxWindowID id, const wx
boxSizer124->Add(m_editor, 1, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, 5);
- boxSizer126 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* boxSizer126 = new wxBoxSizer(wxHORIZONTAL);
boxSizer124->Add(boxSizer126, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
@@ -1049,10 +1050,10 @@ GitApplyPatchDlgBase::GitApplyPatchDlgBase(wxWindow* parent, wxWindowID id, cons
bBitmapLoaded = true;
}
- boxSizer154 = new wxBoxSizer(wxVERTICAL);
+ wxBoxSizer* boxSizer154 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer154);
- flexGridSizer162 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer162 = new wxFlexGridSizer( 0, 2, 0, 0);
flexGridSizer162->SetFlexibleDirection( wxBOTH );
flexGridSizer162->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer162->AddGrowableCol(1);
@@ -1078,7 +1079,7 @@ GitApplyPatchDlgBase::GitApplyPatchDlgBase(wxWindow* parent, wxWindowID id, cons
flexGridSizer162->Add(m_textCtrlExtraFlags, 0, wxALL|wxEXPAND, 5);
- boxSizer156 = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* boxSizer156 = new wxBoxSizer(wxHORIZONTAL);
boxSizer154->Add(boxSizer156, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
diff --git a/git/gitui.h b/git/gitui.h
index f9bc3dd..288d40f 100644
--- a/git/gitui.h
+++ b/git/gitui.h
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: gitui.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -38,18 +39,13 @@
class GitSettingsDlgBase : public wxDialog
{
protected:
- wxBoxSizer* mainSizer;
wxTreebook* m_treebook230;
wxPanel* m_panel232;
- wxBoxSizer* boxSizer240;
- wxFlexGridSizer* fgSizer11;
wxStaticText* m_staticText42;
wxFilePickerCtrl* m_pathGIT;
wxStaticText* m_staticText54;
wxFilePickerCtrl* m_pathGITK;
wxPanel* m_panel234;
- wxBoxSizer* boxSizer242;
- wxFlexGridSizer* flexGridSizer244;
wxStaticText* m_staticText246;
wxTextCtrl* m_textCtrlGlobalName;
wxStaticText* m_staticText250;
@@ -59,11 +55,9 @@ protected:
wxStaticText* m_staticText258;
wxTextCtrl* m_textCtrlLocalEmail;
wxPanel* m_panel236;
- wxBoxSizer* boxSizer766;
wxCheckBox* m_checkBoxTerminal;
wxCheckBox* m_checkBoxLog;
wxCheckBox* m_checkBoxTrackTree;
- wxBoxSizer* bSizer3;
wxButton* m_buttonOk;
wxButton* m_buttonCancel;
@@ -80,24 +74,18 @@ public:
class GitCommitDlgBase : public wxDialog
{
protected:
- wxBoxSizer* bSizer4;
wxSplitterWindow* m_splitterMain;
wxPanel* m_panel3;
- wxBoxSizer* bSizer12;
wxSplitterWindow* m_splitterInner;
wxPanel* m_panel1;
- wxBoxSizer* bSizer11;
wxStaticText* m_staticText6;
wxCheckListBox* m_listBox;
wxPanel* m_panel2;
- wxBoxSizer* bSizer9;
wxStaticText* m_staticText7;
GitCommitEditor* m_editor;
wxPanel* m_panel4;
- wxBoxSizer* bSizer13;
wxStaticText* m_staticText8;
wxTextCtrl* m_commitMessage;
- wxBoxSizer* bSizer5;
wxButton* m_button5;
wxButton* m_button6;
@@ -114,31 +102,23 @@ public:
class GitCommitListDlgBase : public wxDialog
{
protected:
- wxBoxSizer* bSizer17;
wxSplitterWindow* m_splitter174;
wxPanel* m_splitterPage178;
- wxBoxSizer* boxSizer205;
wxStaticText* m_staticText207;
wxDataViewListCtrl* m_dvListCtrlCommitList;
wxPanel* m_splitterPage182;
- wxBoxSizer* boxSizer184;
wxSplitterWindow* m_splitter186;
wxPanel* m_splitterPage190;
- wxBoxSizer* bSizer18;
wxSplitterWindow* m_splitter196;
wxPanel* m_splitterPage200;
- wxBoxSizer* boxSizer208;
wxStaticText* m_staticText210;
wxListBox* m_fileListBox;
wxPanel* m_splitterPage204;
- wxBoxSizer* boxSizer215;
wxStaticText* m_staticText217;
wxStyledTextCtrl* m_stcDiff;
wxPanel* m_splitterPage194;
- wxBoxSizer* boxSizer218;
wxStaticText* m_staticText220;
wxTextCtrl* m_commitMessage;
- wxBoxSizer* boxSizer224;
wxButton* m_button226;
protected:
@@ -157,14 +137,11 @@ public:
class GitDiffDlgBase : public wxDialog
{
protected:
- wxBoxSizer* bSizer17;
wxSplitterWindow* m_splitter;
wxPanel* m_splitterPageFiles;
- wxBoxSizer* boxSizer62;
wxStaticText* m_staticText68;
wxListBox* m_fileListBox;
wxPanel* m_splitterPageDiff;
- wxBoxSizer* boxSizer64;
wxStaticText* m_staticText66;
GitCommitEditor* m_editor;
wxStdDialogButtonSizer* m_sdbSizer1;
@@ -202,8 +179,6 @@ public:
class gitCloneDlgBaseClass : public wxDialog
{
protected:
- wxBoxSizer* boxSizer17;
- wxFlexGridSizer* flexGridSizer21;
wxStaticText* m_staticText22;
wxTextCtrl* m_textCtrlURL;
wxStaticText* m_staticText24;
@@ -213,7 +188,6 @@ protected:
wxTextCtrl* m_textCtrlUsername;
wxStaticText* m_staticText30;
wxTextCtrl* m_textCtrlPassword;
- wxBoxSizer* boxSizer18;
wxButton* m_buttonOK;
wxButton* m_button20;
@@ -230,16 +204,13 @@ public:
class GitConsoleBase : public wxPanel
{
protected:
- wxBoxSizer* boxSizer36;
wxAuiToolBar* m_auibar;
wxSplitterWindow* m_splitter;
wxPanel* m_splitterPage100;
- wxBoxSizer* boxSizer94;
wxDataViewCtrl* m_dvFiles;
wxObjectDataPtr<DataViewFilesModel> m_dvFilesModel;
wxPanel* m_splitterPage96;
- wxBoxSizer* boxSizer92;
wxStyledTextCtrl* m_stcLog;
protected:
@@ -263,10 +234,8 @@ public:
class GitFileDiffDlgBase : public wxDialog
{
protected:
- wxBoxSizer* boxSizer124;
wxAuiToolBar* m_auibar132;
GitCommitEditor* m_editor;
- wxBoxSizer* boxSizer126;
wxButton* m_button128;
protected:
@@ -281,13 +250,10 @@ public:
class GitApplyPatchDlgBase : public wxDialog
{
protected:
- wxBoxSizer* boxSizer154;
- wxFlexGridSizer* flexGridSizer162;
wxStaticText* m_staticText164;
wxFilePickerCtrl* m_filePickerPatchFile;
... 2455 lines suppressed ...
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2013-12-29 20:29:54
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 3316494920d31f0299acec6d521a28a7b1e2d1ee (commit)
from 4d91fb8065f3c1e915df17ed16bd07ab4aa2ad62 (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/3316494920d31f0299acec6d521a28a7b1e2d1ee
commit 3316494920d31f0299acec6d521a28a7b1e2d1ee
Author: dghart <da...@4P...>
Date: Sun Dec 29 20:29:41 2013 +0000
Typo fix
diff --git a/git/gitui.cpp b/git/gitui.cpp
index b8f4d9e..59c645c 100644
--- a/git/gitui.cpp
+++ b/git/gitui.cpp
@@ -309,7 +309,7 @@ GitCommitListDlgBase::GitCommitListDlgBase(wxWindow* parent, wxWindowID id, cons
boxSizer205->Add(m_dvListCtrlCommitList, 1, wxALL|wxEXPAND, 5);
m_dvListCtrlCommitList->AppendTextColumn(_("Commit"), wxDATAVIEW_CELL_INERT, 150, wxALIGN_LEFT);
- m_dvListCtrlCommitList->AppendTextColumn(_("Atuthor"), wxDATAVIEW_CELL_INERT, 100, wxALIGN_LEFT);
+ m_dvListCtrlCommitList->AppendTextColumn(_("Author"), wxDATAVIEW_CELL_INERT, 100, wxALIGN_LEFT);
m_dvListCtrlCommitList->AppendTextColumn(_("Date"), wxDATAVIEW_CELL_INERT, 100, wxALIGN_LEFT);
m_dvListCtrlCommitList->AppendTextColumn(_("Subject"), wxDATAVIEW_CELL_INERT, 600, wxALIGN_LEFT);
m_splitterPage182 = new wxPanel(m_splitter174, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
diff --git a/git/gitui.wxcp b/git/gitui.wxcp
index 547a65f..c0316fb 100644
--- a/git/gitui.wxcp
+++ b/git/gitui.wxcp
@@ -3843,7 +3843,7 @@
"m_properties": [{
"type": "string",
"m_label": "Name:",
- "m_value": "Atuthor"
+ "m_value": "Author"
}, {
"type": "string",
"m_label": "Width:",
@@ -9863,4 +9863,4 @@
}]
}]
}]
-}
\ No newline at end of file
+}
-----------------------------------------------------------------------
Summary of changes:
git/gitui.cpp | 2 +-
git/gitui.wxcp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
codelite
|
|
From: David H. <no...@so...> - 2013-12-29 20:19:27
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 4d91fb8065f3c1e915df17ed16bd07ab4aa2ad62 (commit)
via 4659291e50773317a40b1b9c7c15ac62c555cdb7 (commit)
via 65c8ffa78930ccb6de4295cc1c1e9319e56fc091 (commit)
from edb8bfb03cbc147567105d5746c1d1daded7293f (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/4d91fb8065f3c1e915df17ed16bd07ab4aa2ad62
commit 4d91fb8065f3c1e915df17ed16bd07ab4aa2ad62
Author: dghart <da...@4P...>
Date: Sun Dec 29 20:15:05 2013 +0000
Show in the statusbar the currently-active Bookmark type
diff --git a/LiteEditor/cl_editor.cpp b/LiteEditor/cl_editor.cpp
index abb73b2..b50d646 100644
--- a/LiteEditor/cl_editor.cpp
+++ b/LiteEditor/cl_editor.cpp
@@ -1906,10 +1906,13 @@ void LEditor::OnFindDialog(wxCommandEvent& event)
ReplaceAll();
} else if (type == wxEVT_FRD_BOOKMARKALL) {
+ SetFindBookmarksActive(true);
MarkAllFinds();
} else if (type == wxEVT_FRD_CLEARBOOKMARKS) {
DelAllMarkers(smt_find_bookmark);
+ SetFindBookmarksActive(false);
+ clMainFrame::Get()->SelectBestEnvSet();
}
}
@@ -2544,6 +2547,7 @@ bool LEditor::MarkAllFinds()
// Restore the caret
SetCurrentPos(savedPos);
EnsureCaretVisible();
+ clMainFrame::Get()->SelectBestEnvSet(); // Updates the statusbar display
return true;
}
@@ -2585,6 +2589,8 @@ void LEditor::OnChangeActiveBookmarkType(wxCommandEvent& event)
if ((requested + smt_FIRST_BMK_TYPE -1) != smt_find_bookmark) {
SetFindBookmarksActive(false);
}
+
+ clMainFrame::Get()->SelectBestEnvSet(); // Updates the statusbar display
}
wxString LEditor::GetBookmarkTooltip(const int lineno)
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
index 1e1e8c9..a2ef233 100644
--- a/LiteEditor/frame.cpp
+++ b/LiteEditor/frame.cpp
@@ -686,6 +686,7 @@ clMainFrame::clMainFrame(wxWindow *pParent, wxWindowID id, const wxString& title
EventNotifier::Get()->Connect(wxEVT_WORKSPACE_CLOSED, wxCommandEventHandler(clMainFrame::OnWorkspaceClosed), NULL, this);
EventNotifier::Get()->Connect(wxEVT_REFACTORING_ENGINE_CACHE_INITIALIZING, wxCommandEventHandler(clMainFrame::OnRefactoringCacheStatus), NULL, this);
EventNotifier::Get()->Connect(wxEVT_CL_THEME_CHANGED, wxCommandEventHandler(clMainFrame::OnThemeChanged), NULL, this);
+ EventNotifier::Get()->Connect(wxEVT_ACTIVE_EDITOR_CHANGED, wxCommandEventHandler(clMainFrame::OnActiveEditorChanged), NULL, this);
}
@@ -721,6 +722,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);
+ EventNotifier::Get()->Disconnect(wxEVT_ACTIVE_EDITOR_CHANGED, wxCommandEventHandler(clMainFrame::OnActiveEditorChanged), NULL, this);
wxDELETE(m_timer);
wxDELETE(m_statusbarTimer);
@@ -4607,9 +4609,25 @@ void clMainFrame::SelectBestEnvSet()
preDefTypeMap.SetActive(dbgSetName);
DebuggerConfigTool::Get()->WriteObject(wxT("DebuggerCommands"), &preDefTypeMap);
- SetStatusMessage(wxString::Format(wxT("Env: %s, Dbg: %s"),
+ wxString bookmarkString;
+ LEditor* editor = GetMainBook()->GetActiveEditor();
+ if (editor) {
+ sci_marker_types activeBMtype = (sci_marker_types)editor->GetActiveBookmarkType();
+ bookmarkString = editor->GetBookmarkLabel(activeBMtype);
+ }
+
+ wxString displayString = wxString::Format(wxT("Env: %s, Dbg: %s"),
activeSetName.c_str(),
- preDefTypeMap.GetActiveSet().GetName().c_str()), 2);
+ preDefTypeMap.GetActiveSet().GetName().c_str());
+ if (editor) {
+ displayString << ", ";
+ if (!bookmarkString.Lower().Contains("type")) {
+ displayString << _("Bookmark type") << ": ";
+ }
+ displayString << bookmarkString;
+ }
+
+ SetStatusMessage(displayString, 2);
}
void clMainFrame::OnClearTagsCache(wxCommandEvent& e)
@@ -5121,6 +5139,12 @@ void clMainFrame::OnActivateEditor(wxCommandEvent& e)
if (editor) editor->SetActive();
}
+void clMainFrame::OnActiveEditorChanged(wxCommandEvent& e)
+{
+ e.Skip();
+ SelectBestEnvSet(); // Updates the statusbar bookmark display
+}
+
void clMainFrame::OnLoadSession(wxCommandEvent& e)
{
wxUnusedVar(e);
diff --git a/LiteEditor/frame.h b/LiteEditor/frame.h
index 8a7eb8d..fae5b8e 100644
--- a/LiteEditor/frame.h
+++ b/LiteEditor/frame.h
@@ -552,6 +552,7 @@ protected:
// Misc
void OnActivateEditor (wxCommandEvent &e);
+ void OnActiveEditorChanged(wxCommandEvent& e);
void OnUpdateCustomTargetsDropDownMenu(wxCommandEvent &e);
void OnRefactoringCacheStatus(wxCommandEvent &e);
void OnWorkspaceClosed(wxCommandEvent &e);
diff --git a/LiteEditor/quickfindbar.cpp b/LiteEditor/quickfindbar.cpp
index 5ba30fc..956d232 100644
--- a/LiteEditor/quickfindbar.cpp
+++ b/LiteEditor/quickfindbar.cpp
@@ -632,6 +632,8 @@ void QuickFindBar::OnHighlightMatches(wxCommandEvent& event)
editor->SetFindBookmarksActive(false);
}
}
+
+ clMainFrame::Get()->SelectBestEnvSet(); // Updates the statusbar display
}
void QuickFindBar::OnHighlightMatchesUI(wxUpdateUIEvent& event)
https://sourceforge.net/p/codelite/codelitegit/ci/4659291e50773317a40b1b9c7c15ac62c555cdb7
commit 4659291e50773317a40b1b9c7c15ac62c555cdb7
Author: dghart <da...@4P...>
Date: Sun Dec 29 18:09:55 2013 +0000
Tabgroups: When the workspace is changed, properly clear the old tabgroup data
Previously the tabgroup manager wasn't reset, so the tabgroup's path wasn't updated to that of the new workspace.
diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp
index f8b270c..51b88ec 100644
--- a/LiteEditor/manager.cpp
+++ b/LiteEditor/manager.cpp
@@ -383,6 +383,7 @@ void Manager::CloseWorkspace()
GetBreakpointsMgr()->DelAllBreakpoints();
clMainFrame::Get()->GetWorkspacePane()->GetTabgroupsTab()->ClearTabgroups();
+ TabGroupsManager::Get()->ClearTabgroups();
// since we closed the workspace, we also need to set the 'LastActiveWorkspaceName' to be
// default
diff --git a/LiteEditor/tabgroupmanager.h b/LiteEditor/tabgroupmanager.h
index c44425f..d557673 100644
--- a/LiteEditor/tabgroupmanager.h
+++ b/LiteEditor/tabgroupmanager.h
@@ -47,6 +47,10 @@ public:
wxString GetTabgroupDirectory();
vTabGrps& GetTabgroups();
+ void ClearTabgroups() {
+ m_tabgroups.clear();
+ m_tabgroupdir.Clear();
+ }
/*!
* \brief Finds the spTabGrp that matches tabgroupname, returning its TabgroupItems in items
https://sourceforge.net/p/codelite/codelitegit/ci/65c8ffa78930ccb6de4295cc1c1e9319e56fc091
commit 65c8ffa78930ccb6de4295cc1c1e9319e56fc091
Author: dghart <da...@4P...>
Date: Sun Dec 29 16:10:09 2013 +0000
Tabgroups: Some defensive programming, following a segfault
diff --git a/LiteEditor/tabgroupspane.cpp b/LiteEditor/tabgroupspane.cpp
index 403935b..176f916 100644
--- a/LiteEditor/tabgroupspane.cpp
+++ b/LiteEditor/tabgroupspane.cpp
@@ -231,6 +231,9 @@ void TabgroupsPane::OnItemActivated(wxTreeEvent& event)
return;
}
TabGrpTreeItemData* data = (TabGrpTreeItemData*)m_tree->GetItemData(item);
+ if (!data) {
+ return;
+ }
wxString filepath = data->GetFilepath();
wxFileName fn(filepath);
@@ -297,6 +300,9 @@ void TabgroupsPane::OnItemRtClick(wxTreeEvent& event)
return;
}
TabGrpTreeItemData* data = (TabGrpTreeItemData*)m_tree->GetItemData(item);
+ if (!data) {
+ return;
+ }
wxMenu menu; // Tabgroup Menu
if (data->GetType() == TGT_group) {
@@ -351,6 +357,9 @@ void TabgroupsPane::OnDelete(wxCommandEvent& WXUNUSED(event)) // From a keypre
wxTreeItemId item = m_tree->GetSelection();
if (item.IsOk()) {
TabGrpTreeItemData* data = (TabGrpTreeItemData*)m_tree->GetItemData(item);
+ if (!data) {
+ return;
+ }
if (data->GetType() == TGT_group) {
DeleteTabgroup();
} else {
@@ -364,7 +373,7 @@ void TabgroupsPane::OnBeginLabelEdit(wxTreeEvent& event)
wxTreeItemId item = event.GetItem();
if (item.IsOk()) {
TabGrpTreeItemData* data = (TabGrpTreeItemData*)m_tree->GetItemData(item);
- if (data->GetType() == TGT_group) {
+ if (!data || data->GetType() == TGT_group) {
// Only allow renaming of a group; renaming an item makes little sense: the name is the filename
return;
}
@@ -382,6 +391,9 @@ void TabgroupsPane::OnEndLabelEdit(wxTreeEvent& event)
}
TabGrpTreeItemData* data = (TabGrpTreeItemData*)m_tree->GetItemData(item);
+ if (!data) {
+ return;
+ }
wxFileName oldfilepath(data->GetFilepath());
wxString newfilename = event.GetLabel();
@@ -411,7 +423,7 @@ void TabgroupsPane::OnBeginDrag(wxTreeEvent& event)
wxTreeItemId item = event.GetItem();
if (item.IsOk()) {
TabGrpTreeItemData* data = (TabGrpTreeItemData*)m_tree->GetItemData(item);
- if (data->GetType() == TGT_item) {
+ if (data && data->GetType() == TGT_item) {
// Only allow dragging of an item, not a group
m_draggedItem = item;
event.Allow(); // need explicitly to allow drag
@@ -516,6 +528,9 @@ void TabgroupsPane::PasteTabgroupItem(wxTreeItemId itemtopaste /*= wxTreeItemId(
wxTreeItemId ItemId(GroupId);
TabGrpTreeItemData* groupdata = (TabGrpTreeItemData*)m_tree->GetItemData(GroupId);
+ if (!groupdata) {
+ return;
+ }
if (groupdata->GetType() == TGT_item) {
GroupId = m_tree->GetItemParent(ItemId);
wxCHECK_RET(GroupId.IsOk(), wxT("Trying to paste on something that isn't a tabgroup"));
@@ -524,6 +539,9 @@ void TabgroupsPane::PasteTabgroupItem(wxTreeItemId itemtopaste /*= wxTreeItemId(
// The paste *was* on the group, so null ItemId: we use ItemId.IsOk() later as a flag
ItemId = wxTreeItemId();
}
+ if (!groupdata) {
+ return;
+ }
wxCHECK_RET(groupdata->GetType() == TGT_group, wxT("Trying to paste on something that isn't a tabgroup"));
wxString filepath = groupdata->GetFilepath();
@@ -585,6 +603,9 @@ void TabgroupsPane::DeleteTabgroup()
return;
}
TabGrpTreeItemData* data = (TabGrpTreeItemData*)m_tree->GetItemData(item);
+ if (!data) {
+ return;
+ }
wxCHECK_RET(data->GetType()==TGT_group, wxT("The selection wasn't a tabgroup"));
wxString filepath = data->GetFilepath();
@@ -620,6 +641,10 @@ void TabgroupsPane::DuplicateTabgroup()
return;
}
TabGrpTreeItemData* data = (TabGrpTreeItemData*)m_tree->GetItemData(selection);
+ if (!data) {
+ return;
+ }
+
wxCHECK_RET(data->GetType()==TGT_group, wxT("The selection wasn't a tabgroup"));
wxFileName oldfilepath(data->GetFilepath());
@@ -673,12 +698,18 @@ void TabgroupsPane::CopyTabgroupItem(wxTreeItemId itemtocopy /*= wxTreeItemId()*
}
TabGrpTreeItemData* data = (TabGrpTreeItemData*)m_tree->GetItemData(item);
+ if (!data) {
+ return;
+ }
if (data->GetType() != TGT_item) {
return; // I can't think of any reason to copy a whole group
}
wxTreeItemId GroupId = m_tree->GetItemParent(item);
TabGrpTreeItemData* groupdata = (TabGrpTreeItemData*)m_tree->GetItemData(GroupId);
+ if (!groupdata) {
+ return;
+ }
wxString filepath = groupdata->GetFilepath();
wxXmlDocument doc(filepath);
@@ -707,10 +738,16 @@ void TabgroupsPane::DeleteTabgroupItem(bool DoCut /*=false*/, wxTreeItemId itemt
return;
}
TabGrpTreeItemData* data = (TabGrpTreeItemData*)m_tree->GetItemData(item);
+ if (!data) {
+ return;
+ }
wxCHECK_RET(data->GetType()==TGT_item, wxT("The selection was a tabgroup, not a tabgroup item"));
wxString itemfilepath = data->GetFilepath(); // Need to do this here, before the item is deleted!
wxTreeItemId parent = m_tree->GetItemParent(item);
TabGrpTreeItemData* tabgrpdata = (TabGrpTreeItemData*)m_tree->GetItemData(parent);
+ if (!tabgrpdata) {
+ return;
+ }
wxString filepath = tabgrpdata->GetFilepath();
if (!wxFileName::FileExists(filepath)) {
return;
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/cl_editor.cpp | 6 ++++++
LiteEditor/frame.cpp | 28 ++++++++++++++++++++++++++--
LiteEditor/frame.h | 1 +
LiteEditor/manager.cpp | 1 +
LiteEditor/quickfindbar.cpp | 2 ++
LiteEditor/tabgroupmanager.h | 4 ++++
LiteEditor/tabgroupspane.cpp | 41 +++++++++++++++++++++++++++++++++++++++--
7 files changed, 79 insertions(+), 4 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-29 20:01:00
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via edb8bfb03cbc147567105d5746c1d1daded7293f (commit)
from 4f3e376cf9510d44e38261f99206812a8ce7c4bb (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/edb8bfb03cbc147567105d5746c1d1daded7293f
commit edb8bfb03cbc147567105d5746c1d1daded7293f
Author: Eran <era...@gm...>
Date: Sun Dec 29 21:55:56 2013 +0200
git: fixed a rare crash that might occur on Linux while showing a message box dialog from the 'OnProcessOutput' event handler
diff --git a/git/git.cpp b/git/git.cpp
index 47b703a..c8af150 100644
--- a/git/git.cpp
+++ b/git/git.cpp
@@ -1426,13 +1426,14 @@ void GitPlugin::OnProcessOutput(wxCommandEvent &event)
{
ProcessEventData *ped = (ProcessEventData*)event.GetClientData();
if( ped ) {
+ wxString output = ped->GetData();
+ wxDELETE(ped);
gitAction ga;
if ( !m_gitActionQueue.empty() ) {
ga = m_gitActionQueue.front();
}
- wxString output = ped->GetData();
if ( m_console->IsVerbose() || ga.action == gitPush || ga.action == gitPull )
m_console->AddRawText(output);
m_commandOutput.Append(output);
@@ -1449,9 +1450,9 @@ void GitPlugin::OnProcessOutput(wxCommandEvent &event)
{
if ( tmpOutput.Contains("*** please tell me who you are") ) {
- ::wxMessageBox(output, "git", wxICON_ERROR|wxCENTER|wxOK, EventNotifier::Get()->TopFrame());
m_process->Terminate();
-
+ ::wxMessageBox(output, "git", wxICON_ERROR|wxCENTER|wxOK, EventNotifier::Get()->TopFrame());
+
} else if ( tmpOutput.EndsWith("password:") || tmpOutput.Contains("password for") ) {
// Password is required
@@ -1460,7 +1461,7 @@ void GitPlugin::OnProcessOutput(wxCommandEvent &event)
// No point on continuing
m_process->Terminate();
-
+
} else {
// write the password
@@ -1492,7 +1493,6 @@ void GitPlugin::OnProcessOutput(wxCommandEvent &event)
}
}
}
- wxDELETE(ped);
}
}
-----------------------------------------------------------------------
Summary of changes:
git/git.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
codelite
|
|
From: Eran I. <no...@so...> - 2013-12-29 15:26:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 4f3e376cf9510d44e38261f99206812a8ce7c4bb (commit)
from fc9e342adaadac19b5549c89e8bfbc4456790a5f (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/4f3e376cf9510d44e38261f99206812a8ce7c4bb
commit 4f3e376cf9510d44e38261f99206812a8ce7c4bb
Author: Eran <era...@gm...>
Date: Sun Dec 29 17:25:48 2013 +0200
Don't search for the string '*** please tell me who you are' while showing the gitCommitList action
diff --git a/git/git.cpp b/git/git.cpp
index d9518c3..47b703a 100644
--- a/git/git.cpp
+++ b/git/git.cpp
@@ -286,7 +286,7 @@ void GitPlugin::UnPlug()
EventNotifier::Get()->Disconnect( wxEVT_WORKSPACE_LOADED, wxCommandEventHandler(GitPlugin::OnWorkspaceLoaded), NULL, this);
EventNotifier::Get()->Disconnect( wxEVT_PROJ_FILE_ADDED, clCommandEventHandler(GitPlugin::OnFilesAddedToProject), NULL, this);
EventNotifier::Get()->Disconnect(wxEVT_WORKSPACE_CONFIG_CHANGED, wxCommandEventHandler(GitPlugin::OnWorkspaceConfigurationChanged), NULL, this);
-
+
/*Context Menu*/
m_eventHandler->Disconnect( XRCID("git_add_file"), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GitPlugin::OnFileAddSelected), NULL, this );
//m_eventHandler->Disconnect( ID_DELETE_FILE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GitPlugin::OnFileDeleteSelected), NULL, this );
@@ -297,9 +297,9 @@ void GitPlugin::UnPlug()
void GitPlugin::OnSetGitRepoPath(wxCommandEvent& e)
{
wxUnusedVar(e);
-
+
wxString workspaceName = GetWorkspaceName();
-
+
// use the current repository as the starting path
// if current repository is empty, use the current workspace path
wxString startPath = m_repositoryDirectory;
@@ -316,7 +316,7 @@ void GitPlugin::OnSetGitRepoPath(wxCommandEvent& e)
if(wxFileName::DirExists(dir + wxFileName::GetPathSeparator() + wxT(".git"))) {
if (m_repositoryDirectory != dir ) {
m_repositoryDirectory = dir;
-
+
if ( !workspaceName.IsEmpty() ) {
clConfig conf("git.conf");
GitEntry data;
@@ -324,7 +324,7 @@ void GitPlugin::OnSetGitRepoPath(wxCommandEvent& e)
data.SetEntry(workspaceName, dir);
conf.WriteItem(&data);
}
-
+
if(!dir.IsEmpty()) {
#if 0
m_pluginToolbar->EnableTool(XRCID("git_bisect_start"),true);
@@ -356,15 +356,15 @@ void GitPlugin::OnSettings(wxCommandEvent &e)
{
GitSettingsDlg dlg(m_topWindow, m_repositoryDirectory);
if ( dlg.ShowModal() == wxID_OK ) {
-
+
// update the paths
clConfig conf("git.conf");
GitEntry data;
conf.ReadItem( &data );
-
+
m_pathGITExecutable = data.GetGITExecutablePath();
m_pathGITKExecutable = data.GetGITKExecutablePath();
-
+
GIT_MESSAGE("git executable is now set to: %s", m_pathGITExecutable.c_str());
GIT_MESSAGE("gitk executable is now set to: %s", m_pathGITKExecutable.c_str());
AddDefaultActions();
@@ -376,7 +376,7 @@ void GitPlugin::OnSettings(wxCommandEvent &e)
void GitPlugin::OnFileAddSelected(wxCommandEvent &e)
{
wxUnusedVar(e);
-
+
wxArrayString files;
DoGetFileViewSelectedFiles( files, true );
@@ -412,7 +412,7 @@ void GitPlugin::OnFileDeleteSelected(wxCommandEvent &e)
void GitPlugin::OnFileDiffSelected(wxCommandEvent &e)
{
wxUnusedVar(e);
-
+
// fetch the list of files
wxArrayString files;
DoGetFileViewSelectedFiles( files, true );
@@ -426,16 +426,16 @@ void GitPlugin::OnFileResetSelected(wxCommandEvent &e)
// fetch the list of files
wxArrayString files;
DoGetFileViewSelectedFiles( files, true );
-
+
// prepare a space delimited list
wxString filelist;
for(size_t i=0; i<files.GetCount(); ++i) {
filelist << files.Item(i) << " ";
}
-
+
gitAction ga(gitResetFile, filelist);
m_gitActionQueue.push(ga);
-
+
ProcessGitActionQueue();
RefreshFileListView();
}
@@ -607,7 +607,7 @@ void GitPlugin::OnStartGitk(wxCommandEvent& e)
{
wxUnusedVar(e);
DirSaver ds;
-
+
::wxSetWorkingDirectory(m_repositoryDirectory);
::wxExecute(m_pathGITKExecutable);
}
@@ -740,7 +740,7 @@ void GitPlugin::OnFilesRemovedFromProject(wxCommandEvent& e)
{
e.Skip();
RefreshFileListView(); // in git world, deleting a file is enough
-
+
//wxArrayString *files = (wxArrayString*)e.GetClientData();
//if(files && !files->IsEmpty() && !m_repositoryDirectory.IsEmpty()) {
// // Build the message:
@@ -819,12 +819,12 @@ void GitPlugin::ProcessGitActionQueue()
command << " revert --no-commit " << ga.arguments;
GIT_MESSAGE("%s", command.c_str());
break;
-
+
case gitApplyPatch:
command << " apply --whitespace=nowarn --ignore-whitespace " << ga.arguments;
GIT_MESSAGE("%s", command.c_str());
break;
-
+
case gitRmFiles:
command << " --no-pager rm --force " << ga.arguments;
GIT_MESSAGE("%s", command.c_str());
@@ -853,7 +853,7 @@ void GitPlugin::ProcessGitActionQueue()
command << wxT(" --no-pager ls-files -m");
GIT_MESSAGE1(wxT("%s. Repo path: %s"), command.c_str(), m_repositoryDirectory.c_str());
break;
-
+
case gitUpdateRemotes:
GIT_MESSAGE1(wxT("Updating remotes"));
command << wxT(" --no-pager remote update");
@@ -1018,20 +1018,20 @@ void GitPlugin::ProcessGitActionQueue()
#else
createFlags = IProcessCreateWithHiddenConsole;
#endif
-
+
// Set locale to english
wxStringMap_t om;
om.insert( std::make_pair( "LC_ALL", "C" ) );
om.insert( std::make_pair( "GIT_MERGE_AUTOEDIT", "no" ) );
-
-#ifdef __WXMSW__
+
+#ifdef __WXMSW__
wxString homeDir;
if ( wxGetEnv("USERPROFILE", &homeDir) ) {
om.insert( std::make_pair( "HOME", homeDir ) );
}
#endif
EnvSetter es( &om );
-
+
m_process = ::CreateAsyncProcess(this,
command,
createFlags,
@@ -1145,7 +1145,7 @@ void GitPlugin::UpdateFileTree()
if ( !m_mgr->GetWorkspace()->IsOpen() ) {
return;
}
-
+
if(wxMessageBox(wxT("Do you want to start importing new / updating changed files?"),
wxT("Import files"), wxYES_NO, m_topWindow) == wxNO) {
return;
@@ -1304,16 +1304,16 @@ void GitPlugin::OnProcessTerminated(wxCommandEvent &event)
} else if(ga.action == gitStatus) {
m_console->UpdateTreeView(m_commandOutput);
FinishGitListAction(ga);
-
+
} else if(ga.action == gitListRemotes ) {
wxArrayString gitList = wxStringTokenize(m_commandOutput, wxT("\n"));
m_remotes = gitList;
-
+
} else if(ga.action == gitDiffFile ) {
GitFileDiffDlg dlg(m_topWindow);
dlg.SetDiff(m_commandOutput);
dlg.ShowModal();
-
+
} else if(ga.action == gitDiffRepoCommit ) {
GitCommitDlg dlg(m_topWindow, m_repositoryDirectory);
dlg.AppendDiff(m_commandOutput);
@@ -1331,17 +1331,17 @@ void GitPlugin::OnProcessTerminated(wxCommandEvent &event)
gitAction ga(gitCommit,arg);
m_gitActionQueue.push(ga);
AddDefaultActions();
-
+
} else {
wxMessageBox(wxT("No commit message given, aborting..."), wxT("CodeLite"), wxICON_ERROR | wxOK, m_topWindow);
}
}
-
+
} else if(ga.action == gitDiffRepoShow ) {
GitDiffDlg dlg(m_topWindow, m_repositoryDirectory);
dlg.SetDiff(m_commandOutput);
dlg.ShowModal();
-
+
} else if( ga.action == gitResetFile || ga.action == gitApplyPatch ) {
wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, wxEVT_CMD_RELOAD_EXTERNALLY_MODIFIED_NOPROMPT);
EventNotifier::Get()->TopFrame()->GetEventHandler()->AddPendingEvent(e);
@@ -1349,13 +1349,13 @@ void GitPlugin::OnProcessTerminated(wxCommandEvent &event)
gitAction newAction;
newAction.action = gitListModified;
m_gitActionQueue.push(newAction);
-
+
} else if(ga.action == gitBranchCurrent ) {
GetCurrentBranchAction(ga);
-
+
} else if(ga.action == gitBranchList || ga.action == gitBranchListRemote ) {
ListBranchAction(ga);
-
+
} else if(ga.action == gitBranchSwitch
|| ga.action == gitBranchSwitchRemote
|| ga.action == gitPull
@@ -1404,13 +1404,13 @@ void GitPlugin::OnProcessTerminated(wxCommandEvent &event)
m_gitActionQueue.push(ga);
ga.action = gitListModified;
m_gitActionQueue.push(ga);
-
+
}
} else if(ga.action == gitCommitList) {
GitCommitListDlg *dlg = new GitCommitListDlg(m_topWindow, m_repositoryDirectory, this);
dlg->SetCommitList(m_commandOutput);
dlg->Show();
-
+
} else if ( ga.action == gitRevertCommit ) {
AddDefaultActions();
}
@@ -1426,7 +1426,7 @@ void GitPlugin::OnProcessOutput(wxCommandEvent &event)
{
ProcessEventData *ped = (ProcessEventData*)event.GetClientData();
if( ped ) {
-
+
gitAction ga;
if ( !m_gitActionQueue.empty() ) {
ga = m_gitActionQueue.front();
@@ -1441,16 +1441,17 @@ void GitPlugin::OnProcessOutput(wxCommandEvent &event)
wxString tmpOutput = output;
tmpOutput.Trim().Trim(false);
tmpOutput.MakeLower();
-
- if ( ga.action != gitDiffRepoCommit &&
+
+ if ( ga.action != gitDiffRepoCommit &&
ga.action != gitDiffFile &&
+ ga.action != gitCommitList &&
ga.action != gitDiffRepoShow )
-
+
{
if ( tmpOutput.Contains("*** please tell me who you are") ) {
::wxMessageBox(output, "git", wxICON_ERROR|wxCENTER|wxOK, EventNotifier::Get()->TopFrame());
m_process->Terminate();
-
+
} else if ( tmpOutput.EndsWith("password:") || tmpOutput.Contains("password for") ) {
// Password is required
@@ -1475,7 +1476,7 @@ void GitPlugin::OnProcessOutput(wxCommandEvent &event)
}
}
}
-
+
if(m_progressDialog && m_progressDialog->IsShown()) {
wxString message = output.Left(output.Find(':'));
int percent = output.Find('%',true);
@@ -1515,7 +1516,7 @@ void GitPlugin::InitDefaults()
if(!data.GetGITKExecutablePath().IsEmpty()) {
m_pathGITKExecutable = data.GetGITKExecutablePath();
}
-
+
wxString repoPath;
if ( IsWorkspaceOpened() ) {
repoPath = data.GetPath( GetWorkspaceName() );
@@ -1556,7 +1557,7 @@ void GitPlugin::AddDefaultActions()
ga.action = gitListModified;
m_gitActionQueue.push(ga);
-
+
//ga.action = gitUpdateRemotes;
//m_gitActionQueue.push(ga);
@@ -1578,11 +1579,11 @@ void GitPlugin::ColourFileTree(wxTreeCtrl* tree, const wxStringSet_t& files, Ove
{
clConfig conf("git.conf");
GitEntry data;
- conf.ReadItem(&data);
-
- if ( !(data.GetFlags() & GitEntry::Git_Colour_Tree_View) )
+ conf.ReadItem(&data);
+
+ if ( !(data.GetFlags() & GitEntry::Git_Colour_Tree_View) )
return;
-
+
std::stack<wxTreeItemId> items;
if (tree->GetRootItem().IsOk())
items.push(tree->GetRootItem());
@@ -1771,10 +1772,10 @@ void GitPlugin::DoSetTreeItemImage(wxTreeCtrl* ctrl, const wxTreeItemId& item, O
clConfig conf("git.conf");
GitEntry data;
conf.ReadItem(&data);
-
- if ( !(data.GetFlags() & GitEntry::Git_Colour_Tree_View) )
+
+ if ( !(data.GetFlags() & GitEntry::Git_Colour_Tree_View) )
return;
-
+
// get the base image first
int curImgIdx = ctrl->GetItemImage(item);
if ( m_treeImageMapping.count( curImgIdx ) ) {
@@ -1886,7 +1887,7 @@ void GitPlugin::DoGetFileViewSelectedFiles(wxArrayString& files, bool relativeTo
if ( relativeToRepo && fn.IsAbsolute()) {
fn.MakeRelativeTo( m_repositoryDirectory );
}
-
+
wxString filename = fn.GetFullPath();
if ( filename.Contains(" ") ) {
filename.Prepend("\"").Append("\"");
@@ -1903,7 +1904,7 @@ void GitPlugin::DoShowDiffsForFiles(const wxArrayString& files)
for(size_t i=0; i<files.GetCount(); ++i) {
filelist << files.Item(i) << " ";
}
-
+
// and finally, perform the action
gitAction ga(gitDiffFile, filelist);
m_gitActionQueue.push(ga);
@@ -1919,18 +1920,18 @@ void GitPlugin::ApplyPatch(const wxString& filename, const wxString& extraFlags)
{
gitAction ga(gitApplyPatch, wxString() << extraFlags << " \"" << filename << "\" ");
m_gitActionQueue.push(ga);
-
+
// Trigger a refresh
gitAction gaStatus(gitStatus, "");
m_gitActionQueue.push(gaStatus);
-
+
ProcessGitActionQueue();
}
void GitPlugin::OnWorkspaceConfigurationChanged(wxCommandEvent& e)
{
e.Skip();
-
+
// Trigger a refresh
gitAction gaStatus(gitStatus, "");
m_gitActionQueue.push(gaStatus);
-----------------------------------------------------------------------
Summary of changes:
git/git.cpp | 109 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 55 insertions(+), 54 deletions(-)
hooks/post-receive
--
codelite
|
