Menu
▾
▴
[Codelite-git] codelite git: codelite branch master updated. 524f5ffaeddd69ca05e8b2a289109d06f8a2acff
|
From: Eran I. <no...@so...> - 2014-01-11 06:12:54
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 524f5ffaeddd69ca05e8b2a289109d06f8a2acff (commit)
from dc02d280645d63f4bc52b84aad2cf8c547dbad4c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sourceforge.net/p/codelite/codelitegit/ci/524f5ffaeddd69ca05e8b2a289109d06f8a2acff
commit 524f5ffaeddd69ca05e8b2a289109d06f8a2acff
Author: Eran <era...@gm...>
Date: Sat Jan 11 08:12:30 2014 +0200
When detaching a pane from the workspace view with a valid bitmap, make sure we restore once its redocked back to the notebook
diff --git a/LiteEditor/editorsettingslocalbase.cpp b/LiteEditor/editorsettingslocalbase.cpp
index 8644ffe..03259ea 100644
--- a/LiteEditor/editorsettingslocalbase.cpp
+++ b/LiteEditor/editorsettingslocalbase.cpp
@@ -1,5 +1,6 @@
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: editorsettingslocalbase.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -25,7 +26,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
this->SetSizer(mainSizer);
- m_staticText = new wxStaticText(this, wxID_ANY, _("Untick one or more checkboxes to set any local preferences, "), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_staticText = new wxStaticText(this, wxID_ANY, _("Untick one or more checkboxes to set any local preferences,"), wxDefaultPosition, wxSize(-1, -1), 0);
wxFont m_staticTextFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
m_staticTextFont.SetWeight(wxFONTWEIGHT_BOLD);
m_staticText->SetFont(m_staticTextFont);
@@ -46,7 +47,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
wxBoxSizer* boxSizer3 = new wxBoxSizer(wxVERTICAL);
m_panel2->SetSizer(boxSizer3);
- wxFlexGridSizer* fgSizer31 = new wxFlexGridSizer( 0, 2, 0, 20);
+ wxFlexGridSizer* fgSizer31 = new wxFlexGridSizer(0, 2, 0, 20);
fgSizer31->SetFlexibleDirection( wxBOTH );
fgSizer31->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer31->AddGrowableCol(1);
@@ -81,6 +82,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
m_tabWidth = new wxSpinCtrl(m_panel2, wxID_ANY, wxT("4"), wxDefaultPosition, wxSize(-1, -1), wxSP_ARROW_KEYS);
m_tabWidth->SetRange(1, 20);
+ m_tabWidth->SetValue(4);
bSizer7->Add(m_tabWidth, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
@@ -101,6 +103,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
m_indentWidth = new wxSpinCtrl(m_panel2, wxID_ANY, wxT("4"), wxDefaultPosition, wxSize(-1, -1), wxSP_ARROW_KEYS);
m_indentWidth->SetRange(1, 20);
+ m_indentWidth->SetValue(4);
bSizer6->Add(m_indentWidth, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
@@ -112,7 +115,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
wxBoxSizer* boxSizer2 = new wxBoxSizer(wxVERTICAL);
m_panel3->SetSizer(boxSizer2);
- wxFlexGridSizer* fgSizer21 = new wxFlexGridSizer( 0, 2, 0, 20);
+ wxFlexGridSizer* fgSizer21 = new wxFlexGridSizer(0, 2, 0, 20);
fgSizer21->SetFlexibleDirection( wxBOTH );
fgSizer21->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer21->AddGrowableCol(1);
@@ -170,7 +173,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
wxBoxSizer* boxSizer5 = new wxBoxSizer(wxVERTICAL);
m_panel4->SetSizer(boxSizer5);
- wxFlexGridSizer* fgSizer2 = new wxFlexGridSizer( 0, 2, 0, 20);
+ wxFlexGridSizer* fgSizer2 = new wxFlexGridSizer(0, 2, 0, 20);
fgSizer2->SetFlexibleDirection( wxBOTH );
fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
fgSizer2->AddGrowableCol(1);
@@ -220,7 +223,7 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
fgSizer2->Add(m_checkBoxAppendLF, 0, wxALL, 5);
- wxFlexGridSizer* flexGridSizer15 = new wxFlexGridSizer( 0, 3, 0, 0);
+ wxFlexGridSizer* flexGridSizer15 = new wxFlexGridSizer(0, 3, 0, 0);
flexGridSizer15->SetFlexibleDirection( wxBOTH );
flexGridSizer15->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer15->AddGrowableCol(2);
@@ -274,15 +277,17 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
mainSizer->Add(bSizer4, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
- m_button1 = new wxButton(this, wxID_OK, _("&Ok"), wxDefaultPosition, wxSize(-1, -1), 0);
- m_button1->SetDefault();
+ m_stdBtnSizer17 = new wxStdDialogButtonSizer();
- bSizer4->Add(m_button1, 0, wxALL, 5);
+ bSizer4->Add(m_stdBtnSizer17, 0, wxALL, 5);
- m_button2 = new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize(-1, -1), 0);
-
- bSizer4->Add(m_button2, 0, wxALL, 5);
+ m_button19 = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_button19->SetDefault();
+ m_stdBtnSizer17->AddButton(m_button19);
+ m_button21 = new wxButton(this, wxID_CANCEL, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_stdBtnSizer17->AddButton(m_button21);
+ m_stdBtnSizer17->Realize();
m_treebook1->ExpandNode( 0, true );
m_treebook1->ExpandNode( 1, true );
@@ -308,7 +313,6 @@ LocalEditorSettingsbase::LocalEditorSettingsbase(wxWindow* parent, wxWindowID id
m_whitespaceStyleEnable->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::whitespaceStyleUpdateUI), NULL, this);
m_choiceEOLEnable->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::choiceEOLUpdateUI), NULL, this);
m_fileEncodingEnable->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::fileEncodingUpdateUI), NULL, this);
- m_button1->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LocalEditorSettingsbase::OnOK), NULL, this);
}
@@ -328,6 +332,5 @@ LocalEditorSettingsbase::~LocalEditorSettingsbase()
m_whitespaceStyleEnable->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::whitespaceStyleUpdateUI), NULL, this);
m_choiceEOLEnable->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::choiceEOLUpdateUI), NULL, this);
m_fileEncodingEnable->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(LocalEditorSettingsbase::fileEncodingUpdateUI), NULL, this);
- m_button1->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LocalEditorSettingsbase::OnOK), NULL, this);
}
diff --git a/LiteEditor/editorsettingslocalbase.h b/LiteEditor/editorsettingslocalbase.h
index b6de546..997fd32 100644
--- a/LiteEditor/editorsettingslocalbase.h
+++ b/LiteEditor/editorsettingslocalbase.h
@@ -1,30 +1,6 @@
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-//
-// copyright : (C) 2013 by Eran Ifrah
-// file name : editorsettingslocalbase.h
-//
-// -------------------------------------------------------------------------
-// A
-// _____ _ _ _ _
-// / __ \ | | | | (_) |
-// | / \/ ___ __| | ___| | _| |_ ___
-// | | / _ \ / _ |/ _ \ | | | __/ _ )
-// | \__/\ (_) | (_| | __/ |___| | || __/
-// \____/\___/ \__,_|\___\_____/_|\__\___|
-//
-// F i l e
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
+// wxCrafter project file: editorsettingslocalbase.wxcp
// Do not modify this file by hand!
//////////////////////////////////////////////////////////////////////
@@ -35,6 +11,8 @@
#include <wx/xrc/xmlres.h>
#include <wx/xrc/xh_bmp.h>
#include <wx/dialog.h>
+#include <wx/iconbndl.h>
+#include <wx/artprov.h>
#include <wx/sizer.h>
#include <wx/stattext.h>
#include <wx/treebook.h>
@@ -87,8 +65,9 @@ protected:
wxCheckBox* m_fileEncodingEnable;
wxStaticText* m_staticTextfileEncoding;
wxChoice* m_fileEncoding;
- wxButton* m_button1;
- wxButton* m_button2;
+ wxStdDialogButtonSizer* m_stdBtnSizer17;
+ wxButton* m_button19;
+ wxButton* m_button21;
protected:
virtual void indentsUsesTabsUpdateUI(wxUpdateUIEvent& event) { event.Skip(); }
@@ -105,7 +84,6 @@ protected:
virtual void whitespaceStyleUpdateUI(wxUpdateUIEvent& event) { event.Skip(); }
virtual void choiceEOLUpdateUI(wxUpdateUIEvent& event) { event.Skip(); }
virtual void fileEncodingUpdateUI(wxUpdateUIEvent& event) { event.Skip(); }
- virtual void OnOK(wxCommandEvent& event) { event.Skip(); }
public:
LocalEditorSettingsbase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Local Preferences"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1, -1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
diff --git a/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp b/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp
index b77704b..63d7857 100644
--- a/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp
+++ b/LiteEditor/editorsettingslocalbase_formbuilder_bitmaps.cpp
@@ -293,6 +293,6 @@ void wxC2ED4InitBitmapResources()
XRC_ADD_FILE(wxT("XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$.._icons_indent.png"), xml_res_file_0, xml_res_size_0, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$.._icons_margins.png"), xml_res_file_1, xml_res_size_1, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$.._icons_misc.png"), xml_res_file_2, xml_res_size_2, wxT("image/png"));
- XRC_ADD_FILE(wxT("XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$._editorsettingslocalbase_formbuilder_bitmaps.xrc"), xml_res_file_3, xml_res_size_3, wxT("text/xml"));
- wxXmlResource::Get()->Load(wxT("memory:XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$._editorsettingslocalbase_formbuilder_bitmaps.xrc"));
+ XRC_ADD_FILE(wxT("XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$C__src_codelitegit_formbuilder_editorsettingslocalbase_formbuilder_bitmaps.xrc"), xml_res_file_3, xml_res_size_3, wxT("text/xml"));
+ wxXmlResource::Get()->Load(wxT("memory:XRC_resource/editorsettingslocalbase_formbuilder_bitmaps.cpp$C__src_codelitegit_formbuilder_editorsettingslocalbase_formbuilder_bitmaps.xrc"));
}
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
index 8a38258..3823fc9 100644
--- a/LiteEditor/frame.cpp
+++ b/LiteEditor/frame.cpp
@@ -3691,7 +3691,7 @@ void clMainFrame::OnDetachWorkspaceViewTab(wxCommandEvent& e)
size_t sel = GetWorkspacePane()->GetNotebook()->GetSelection();
wxWindow *page = GetWorkspacePane()->GetNotebook()->GetCurrentPage();
wxString text = GetWorkspacePane()->GetNotebook()->GetPageText(sel);
- wxBitmap bmp;
+ wxBitmap bmp = GetWorkspacePane()->GetNotebook()->GetPageBitmap(sel); // We might have a bitmap on the tab, make sure we restore it
#if !CL_USE_NATIVEBOOK
DockablePane *pane = new DockablePane(this, GetWorkspacePane()->GetNotebook(), text, bmp, wxSize(200, 200));
diff --git a/formbuilder/editorsettingslocalbase.wxcp b/formbuilder/editorsettingslocalbase.wxcp
index caf07aa..d48189c 100644
--- a/formbuilder/editorsettingslocalbase.wxcp
+++ b/formbuilder/editorsettingslocalbase.wxcp
@@ -1,12 +1,14 @@
{
"metadata": {
"m_generatedFilesDir": "../LiteEditor/",
- "m_objCounter": 15,
+ "m_objCounter": 21,
"m_includeFiles": [],
"m_bitmapFunction": "wxC2ED4InitBitmapResources",
"m_bitmapsFile": "editorsettingslocalbase_formbuilder_bitmaps.cpp",
"m_GenerateCodeTypes": 5,
"m_outputFileName": "editorsettingslocalbase",
+ "m_firstWindowId": 1000,
+ "m_useEnum": false,
"m_templateClasses": []
},
"windows": [{
@@ -46,6 +48,18 @@
"m_label": "Font:",
"m_value": ""
}, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
@@ -55,6 +69,10 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Title:",
"m_value": "Local Preferences"
}, {
@@ -78,6 +96,26 @@
"type": "string",
"m_label": "Class Decorator",
"m_value": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (16x16) :",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (32x32) :",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (64x64) :",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (128x128):",
+ "m_path": ""
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File (256x256):",
+ "m_path": ""
}],
"m_events": [],
"m_children": [{
@@ -93,6 +131,10 @@
"m_label": "Name:",
"m_value": "mainSizer"
}, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
"type": "choice",
"m_label": "Orientation:",
"m_selection": 0,
@@ -140,6 +182,18 @@
"m_label": "Font:",
"m_value": "wxSYS_DEFAULT_GUI_FONT,normal,bold,normal"
}, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
@@ -148,6 +202,10 @@
"m_label": "Include File:",
"m_value": ""
}, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
"type": "multi-string",
"m_label": "Label:",
"m_value": "Untick one or more checkboxes to set any local preferences, "
@@ -199,6 +257,18 @@
"m_label": "Font:",
"m_value": ""
}, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
@@ -206,6 +276,10 @@
"type": "string",
"m_label": "Include File:",
"m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
}],
"m_events": [],
"m_children": [{
@@ -249,6 +323,18 @@
"m_label": "Font:",
"m_value": ""
}, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
@@ -258,10 +344,14 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Label:",
"m_value": "Indentation"
}, {
- "type": "filePicker",
+ "type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../icons/indent.png"
}, {
@@ -270,6 +360,10 @@
"m_value": true
}, {
"type": "bool",
+ "m_label": "Null Page",
+ "m_value": false
+ }, {
+ "type": "bool",
"m_label": "Expand Node",
"m_value": true
}],
@@ -287,6 +381,10 @@
"m_label": "Name:",
"m_value": "boxSizer3"
}, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
"type": "choice",
"m_label": "Orientation:",
"m_selection": 0,
@@ -307,6 +405,10 @@
"m_value": "fgSizer31"
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "# Columns:",
"m_value": "2"
}, {
@@ -372,6 +474,18 @@
"m_label": "Font:",
"m_value": ""
}, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
@@ -381,6 +495,10 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Label:",
"m_value": "Use global setting"
}, {
@@ -437,6 +555,18 @@
"m_label": "Font:",
"m_value": ""
}, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
@@ -446,6 +576,10 @@
"m_value": ""
}, {
"type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
"m_label": "Label:",
"m_value": "Use tabs in indentation"
}, {
@@ -496,6 +630,18 @@
"m_label": "Font:",
"m_value": ""
}, {
+ "type": "bool",
+ "m_label": "Hidden",
... 1321 lines suppressed ...
hooks/post-receive
--
codelite
|
