From: Eran I. <no...@so...> - 2014-01-06 18:55:38
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "codelite". The branch, master has been updated via 8c14e6d9be6d3cb0602fc87c27b205e91a26d1c2 (commit) via ca04172bd7c0a3824784d8655633f93babf7b85f (commit) from 421d9db81311cff374166305ceff24f0902479b0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://sourceforge.net/p/codelite/codelitegit/ci/8c14e6d9be6d3cb0602fc87c27b205e91a26d1c2 commit 8c14e6d9be6d3cb0602fc87c27b205e91a26d1c2 Author: Eran <era...@gm...> Date: Mon Jan 6 20:55:22 2014 +0200 Fixed wrong colors used in tags-settings dialog diff --git a/LiteEditor/tags_options_base_dlg.cpp b/LiteEditor/tags_options_base_dlg.cpp index cd71675..e77783c 100644 --- a/LiteEditor/tags_options_base_dlg.cpp +++ b/LiteEditor/tags_options_base_dlg.cpp @@ -1,5 +1,6 @@ ////////////////////////////////////////////////////////////////////// // This file was auto-generated by codelite's wxCrafter Plugin +// wxCrafter project file: tags_options_base_dlg.wxcp // Do not modify this file by hand! ////////////////////////////////////////////////////////////////////// @@ -22,7 +23,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx bBitmapLoaded = true; } - mainSizer = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); this->SetSizer(mainSizer); m_treebook2 = new wxTreebook(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBK_DEFAULT); @@ -32,14 +33,14 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx m_paneDisplayAndBehavior = new wxPanel(m_treebook2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL); m_treebook2->AddPage(m_paneDisplayAndBehavior, _("Display and Behavior"), false, wxNOT_FOUND); - bSizer19 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer19 = new wxBoxSizer(wxVERTICAL); m_paneDisplayAndBehavior->SetSizer(bSizer19); - sbSizer2 = new wxStaticBoxSizer( new wxStaticBox(m_paneDisplayAndBehavior, wxID_ANY, _("Display:")), wxVERTICAL); + wxStaticBoxSizer* sbSizer2 = new wxStaticBoxSizer( new wxStaticBox(m_paneDisplayAndBehavior, wxID_ANY, _("Display:")), wxVERTICAL); bSizer19->Add(sbSizer2, 0, wxALL|wxEXPAND, 5); - flexGridSizer12 = new wxFlexGridSizer( 0, 2, 0, 0); + wxFlexGridSizer* flexGridSizer12 = new wxFlexGridSizer( 0, 2, 0, 0); flexGridSizer12->SetFlexibleDirection( wxBOTH ); flexGridSizer12->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); flexGridSizer12->AddGrowableCol(1); @@ -83,11 +84,11 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx flexGridSizer12->Add(m_checkBoxKeepFunctionSignature, 0, wxALL|wxEXPAND, 5); - sbSizer15 = new wxStaticBoxSizer( new wxStaticBox(m_paneDisplayAndBehavior, wxID_ANY, _("Behavior:")), wxVERTICAL); + wxStaticBoxSizer* sbSizer15 = new wxStaticBoxSizer( new wxStaticBox(m_paneDisplayAndBehavior, wxID_ANY, _("Behavior:")), wxVERTICAL); bSizer19->Add(sbSizer15, 0, wxALL|wxEXPAND, 5); - gSizer2 = new wxGridSizer( 3, 1, 0, 0); + wxGridSizer* gSizer2 = new wxGridSizer( 3, 1, 0, 0); sbSizer15->Add(gSizer2, 1, wxEXPAND, 5); @@ -112,14 +113,14 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx m_paneColouring = new wxPanel(m_treebook2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL); m_treebook2->AddPage(m_paneColouring, _("Colouring"), false, wxNOT_FOUND); - bSizer16 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer16 = new wxBoxSizer(wxVERTICAL); m_paneColouring->SetSizer(bSizer16); - sbSizer4 = new wxStaticBoxSizer( new wxStaticBox(m_paneColouring, wxID_ANY, wxT("")), wxVERTICAL); + wxStaticBoxSizer* sbSizer4 = new wxStaticBoxSizer( new wxStaticBox(m_paneColouring, wxID_ANY, wxT("")), wxVERTICAL); bSizer16->Add(sbSizer4, 0, wxALL|wxEXPAND, 5); - bSizer11 = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* bSizer11 = new wxBoxSizer(wxHORIZONTAL); sbSizer4->Add(bSizer11, 0, wxEXPAND, 5); @@ -146,7 +147,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx sbSizer4->Add(m_checkColourProjTags, 0, wxALL|wxEXPAND, 5); - fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0); + wxFlexGridSizer* fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0); fgSizer3->SetFlexibleDirection( wxBOTH ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -215,14 +216,14 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx m_paneTriggering = new wxPanel(m_treebook2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL); m_treebook2->AddPage(m_paneTriggering, _("Triggering"), false, wxNOT_FOUND); - bSizer17 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer17 = new wxBoxSizer(wxVERTICAL); m_paneTriggering->SetSizer(bSizer17); - sbSizer7 = new wxStaticBoxSizer( new wxStaticBox(m_paneTriggering, wxID_ANY, _("Automatic Word Completion:")), wxVERTICAL); + wxStaticBoxSizer* sbSizer7 = new wxStaticBoxSizer( new wxStaticBox(m_paneTriggering, wxID_ANY, _("Automatic Word Completion:")), wxVERTICAL); bSizer17->Add(sbSizer7, 0, wxALL|wxEXPAND, 5); - fgSizer4 = new wxFlexGridSizer( 0, 2, 0, 0); + wxFlexGridSizer* fgSizer4 = new wxFlexGridSizer( 0, 2, 0, 0); fgSizer4->SetFlexibleDirection( wxBOTH ); fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizer4->AddGrowableCol(1); @@ -258,7 +259,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx m_panelCtagsSearchPaths = new wxPanel(m_treebook2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL); m_treebook2->InsertSubPage(3, m_panelCtagsSearchPaths, _("Search paths"), false, wxNOT_FOUND); - bSizer7 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer7 = new wxBoxSizer(wxVERTICAL); m_panelCtagsSearchPaths->SetSizer(bSizer7); m_notebook36 = new wxNotebook(m_panelCtagsSearchPaths, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBK_DEFAULT); @@ -268,18 +269,18 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx m_panel38 = new wxPanel(m_notebook36, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL); m_notebook36->AddPage(m_panel38, _("Search Paths"), true); - boxSizer30 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* boxSizer30 = new wxBoxSizer(wxVERTICAL); m_panel38->SetSizer(boxSizer30); m_banner34 = new wxBannerWindow(m_panel38, wxID_ANY, wxTOP, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME); m_banner34->SetBitmap(wxNullBitmap); m_banner34->SetText(_("Search paths"), _("codelite will search for include files in these locations")); - m_banner34->SetGradient(wxColour(wxT("rgb(48,48,48)")), wxColour(wxT("rgb(48,48,48)"))); - m_banner34->SetForegroundColour(wxColour(wxT("rgb(255,255,255)"))); + m_banner34->SetGradient(wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION), wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION)); + m_banner34->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT)); boxSizer30->Add(m_banner34, 0, wxALL|wxEXPAND, 5); - bSizer9 = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* bSizer9 = new wxBoxSizer(wxHORIZONTAL); boxSizer30->Add(bSizer9, 1, wxEXPAND, 5); @@ -296,7 +297,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx bSizer9->Add(m_textCtrlCtagsSearchPaths, 1, wxALL|wxEXPAND, 5); - bSizer8 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer8 = new wxBoxSizer(wxVERTICAL); bSizer9->Add(bSizer8, 0, wxEXPAND, 5); @@ -307,18 +308,18 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx m_panel40 = new wxPanel(m_notebook36, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL); m_notebook36->AddPage(m_panel40, _("Exclude Paths"), false); - boxSizer42 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* boxSizer42 = new wxBoxSizer(wxVERTICAL); m_panel40->SetSizer(boxSizer42); m_banner44 = new wxBannerWindow(m_panel40, wxID_ANY, wxTOP, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME); m_banner44->SetBitmap(wxNullBitmap); m_banner44->SetText(_("Exclude paths"), _("codelite code completion will ignore any files found in one of the paths below")); - m_banner44->SetGradient(wxColour(wxT("rgb(48,48,48)")), wxColour(wxT("rgb(48,48,48)"))); - m_banner44->SetForegroundColour(wxColour(wxT("rgb(255,255,255)"))); + m_banner44->SetGradient(wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION), wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION)); + m_banner44->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT)); boxSizer42->Add(m_banner44, 0, wxALL|wxEXPAND, 5); - bSizer91 = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* bSizer91 = new wxBoxSizer(wxHORIZONTAL); boxSizer42->Add(bSizer91, 1, wxEXPAND, 5); @@ -335,7 +336,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx bSizer91->Add(m_textCtrlCtagsExcludePaths, 1, wxALL|wxEXPAND, 5); - bSizer81 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer81 = new wxBoxSizer(wxVERTICAL); bSizer91->Add(bSizer81, 0, wxEXPAND, 5); @@ -346,10 +347,10 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx m_panelCtagsAdvanced = new wxPanel(m_treebook2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL); m_treebook2->InsertSubPage(3, m_panelCtagsAdvanced, _("Advanced"), false, wxNOT_FOUND); - bSizer6 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer6 = new wxBoxSizer(wxVERTICAL); m_panelCtagsAdvanced->SetSizer(bSizer6); - fgSizer2 = new wxFlexGridSizer( 0, 2, 0, 0); + wxFlexGridSizer* fgSizer2 = new wxFlexGridSizer( 0, 2, 0, 0); fgSizer2->SetFlexibleDirection( wxBOTH ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizer2->AddGrowableCol(1); @@ -364,7 +365,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx fgSizer2->Add(m_textFileSpec, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5); - bSizer14 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer14 = new wxBoxSizer(wxVERTICAL); bSizer6->Add(bSizer14, 0, wxEXPAND, 5); @@ -372,7 +373,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx bSizer14->Add(m_staticText92, 0, wxALL|wxEXPAND, 5); - bSizer15 = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* bSizer15 = new wxBoxSizer(wxHORIZONTAL); bSizer14->Add(bSizer15, 1, wxEXPAND, 5); @@ -392,7 +393,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx m_panelClangGeneral->SetToolTip(_("List here list of tokens to be pre-processed by codelite-indexer. \nUsually, you would like to add here macros which confuse the parser\nClick the below link to read more about this feature and the syntax supported.\n")); m_notebook2->AddPage(m_panelClangGeneral, _("Tokens"), false); - bSizer5 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer5 = new wxBoxSizer(wxVERTICAL); m_panelClangGeneral->SetSizer(bSizer5); m_textPrep = new wxTextCtrl(m_panelClangGeneral, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), wxTE_RICH2|wxTE_PROCESS_TAB|wxTE_PROCESS_ENTER|wxTE_MULTILINE|wxTE_DONTWRAP); @@ -408,7 +409,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx bSizer5->Add(m_textPrep, 1, wxEXPAND, 5); - sbSizer52 = new wxStaticBoxSizer( new wxStaticBox(m_panelClangGeneral, wxID_ANY, wxT("")), wxVERTICAL); + wxStaticBoxSizer* sbSizer52 = new wxStaticBoxSizer( new wxStaticBox(m_panelClangGeneral, wxID_ANY, wxT("")), wxVERTICAL); bSizer5->Add(sbSizer52, 0, wxALL|wxEXPAND, 5); @@ -421,17 +422,17 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx sbSizer52->Add(m_hyperlink1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5); - bSizer131 = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* bSizer131 = new wxBoxSizer(wxHORIZONTAL); bSizer5->Add(bSizer131, 0, wxEXPAND, 5); m_panel5 = new wxPanel(m_notebook2, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL); m_notebook2->AddPage(m_panel5, _("Types"), false); - bSizer13 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer13 = new wxBoxSizer(wxVERTICAL); m_panel5->SetSizer(bSizer13); - sbSizer521 = new wxStaticBoxSizer( new wxStaticBox(m_panel5, wxID_ANY, wxT("")), wxVERTICAL); + wxStaticBoxSizer* sbSizer521 = new wxStaticBoxSizer( new wxStaticBox(m_panel5, wxID_ANY, wxT("")), wxVERTICAL); bSizer13->Add(sbSizer521, 0, wxALL|wxEXPAND, 5); @@ -455,7 +456,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx m_panelClang = new wxPanel(m_treebook2, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL); m_treebook2->AddPage(m_panelClang, _("Clang"), false, wxNOT_FOUND); - bSizer18 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer18 = new wxBoxSizer(wxVERTICAL); m_panelClang->SetSizer(bSizer18); m_checkBoxEnableClangCC = new wxCheckBox(m_panelClang, wxID_ANY, _("Enable clang code completion"), wxDefaultPosition, wxSize(-1, -1), 0); @@ -470,10 +471,10 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx m_panel3 = new wxPanel(m_notebookClang, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL); m_notebookClang->AddPage(m_panel3, _("General"), false); - bSizer20 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer20 = new wxBoxSizer(wxVERTICAL); m_panel3->SetSizer(bSizer20); - fgSizer5 = new wxFlexGridSizer( 0, 1, 0, 0); + wxFlexGridSizer* fgSizer5 = new wxFlexGridSizer( 0, 1, 0, 0); fgSizer5->SetFlexibleDirection( wxBOTH ); fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizer5->AddGrowableCol(0); @@ -494,7 +495,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx bSizer20->Add(m_panel8, 1, wxALL|wxEXPAND, 5); - bSizer24 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer24 = new wxBoxSizer(wxVERTICAL); m_panel8->SetSizer(bSizer24); m_textCtrlClangSearchPaths = new wxTextCtrl(m_panel8, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), wxTE_RICH2|wxTE_PROCESS_TAB|wxTE_PROCESS_ENTER|wxTE_MULTILINE); @@ -518,10 +519,10 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx m_panel4 = new wxPanel(m_notebookClang, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL); m_notebookClang->AddPage(m_panel4, _("Cache"), false); - bSizer21 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* bSizer21 = new wxBoxSizer(wxVERTICAL); m_panel4->SetSizer(bSizer21); - fgSizerClangCache = new wxFlexGridSizer( 0, 2, 0, 0); + wxFlexGridSizer* fgSizerClangCache = new wxFlexGridSizer( 0, 2, 0, 0); fgSizerClangCache->SetFlexibleDirection( wxBOTH ); fgSizerClangCache->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizerClangCache->AddGrowableCol(1); @@ -549,7 +550,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx fgSizerClangCache->Add(m_choiceCachePolicy, 0, wxALL|wxEXPAND|wxALIGN_RIGHT, 5); - bSizer3 = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* bSizer3 = new wxBoxSizer(wxHORIZONTAL); mainSizer->Add(bSizer3, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5); diff --git a/LiteEditor/tags_options_base_dlg.h b/LiteEditor/tags_options_base_dlg.h index 8cce056..c5539d8 100644 --- a/LiteEditor/tags_options_base_dlg.h +++ b/LiteEditor/tags_options_base_dlg.h @@ -1,5 +1,6 @@ ////////////////////////////////////////////////////////////////////// // This file was auto-generated by codelite's wxCrafter Plugin +// wxCrafter project file: tags_options_base_dlg.wxcp // Do not modify this file by hand! ////////////////////////////////////////////////////////////////////// @@ -31,12 +32,8 @@ class TagsOptionsBaseDlg : public wxDialog { protected: - wxBoxSizer* mainSizer; wxTreebook* m_treebook2; wxPanel* m_paneDisplayAndBehavior; - wxBoxSizer* bSizer19; - wxStaticBoxSizer* sbSizer2; - wxFlexGridSizer* flexGridSizer12; wxStaticText* m_staticText14; wxTextCtrl* m_spinCtrlNumberOfCCItems; wxCheckBox* m_checkBoxEnableCaseSensitiveCompletion; @@ -44,21 +41,15 @@ protected: wxCheckBox* m_checkDisplayFunctionTip; wxCheckBox* m_checkCppKeywordAssist; wxCheckBox* m_checkBoxKeepFunctionSignature; - wxStaticBoxSizer* sbSizer15; - wxGridSizer* gSizer2; wxCheckBox* m_checkBoxretagWorkspaceOnStartup; wxCheckBox* m_checkDisableParseOnSave; wxCheckBox* m_checkBoxDeepUsingNamespaceResolving; wxPanel* m_paneColouring; - wxBoxSizer* bSizer16; - wxStaticBoxSizer* sbSizer4; - wxBoxSizer* bSizer11; wxStaticText* m_staticText72; wxTextCtrl* m_spinCtrlMaxItemToColour; wxCheckBox* m_checkColourLocalVars; wxCheckBox* m_checkBoxColourMacroBlocks; wxCheckBox* m_checkColourProjTags; - wxFlexGridSizer* fgSizer3; wxCheckBox* m_checkBoxClass; wxCheckBox* m_checkBoxStruct; wxCheckBox* m_checkBoxFunction; @@ -72,75 +63,49 @@ protected: wxCheckBox* m_checkBoxMember; wxCheckBox* m_checkBoxVariable; wxPanel* m_paneTriggering; - wxBoxSizer* bSizer17; - wxStaticBoxSizer* sbSizer7; - wxFlexGridSizer* fgSizer4; wxCheckBox* m_checkWordAssist; wxStaticText* m_staticTextMinWordLen; wxSlider* m_sliderMinWordLen; wxCheckBox* m_checkAutoInsertSingleChoice; wxPanel* m_panelCtags; wxPanel* m_panelCtagsSearchPaths; - wxBoxSizer* bSizer7; wxNotebook* m_notebook36; wxPanel* m_panel38; - wxBoxSizer* boxSizer30; wxBannerWindow* m_banner34; - wxBoxSizer* bSizer9; wxTextCtrl* m_textCtrlCtagsSearchPaths; - wxBoxSizer* bSizer8; wxButton* m_buttonAddSearchPath; wxPanel* m_panel40; - wxBoxSizer* boxSizer42; wxBannerWindow* m_banner44; - wxBoxSizer* bSizer91; wxTextCtrl* m_textCtrlCtagsExcludePaths; - wxBoxSizer* bSizer81; wxButton* m_buttonAddExcludePath; wxPanel* m_panelCtagsAdvanced; - wxBoxSizer* bSizer6; - wxFlexGridSizer* fgSizer2; wxStaticText* m_staticText3; wxTextCtrl* m_textFileSpec; - wxBoxSizer* bSizer14; wxStaticText* m_staticText92; - wxBoxSizer* bSizer15; wxTextCtrl* m_textCtrlFilesList; wxButton* m_buttonParse; wxNotebook* m_notebook2; wxPanel* m_panelClangGeneral; - wxBoxSizer* bSizer5; wxTextCtrl* m_textPrep; - wxStaticBoxSizer* sbSizer52; wxStaticText* m_staticText9; wxHyperlinkCtrl* m_hyperlink1; - wxBoxSizer* bSizer131; wxPanel* m_panel5; - wxBoxSizer* bSizer13; - wxStaticBoxSizer* sbSizer521; wxStaticText* m_staticText91; wxTextCtrl* m_textTypes; wxPanel* m_panelClang; - wxBoxSizer* bSizer18; wxCheckBox* m_checkBoxEnableClangCC; wxNotebook* m_notebookClang; wxPanel* m_panel3; - wxBoxSizer* bSizer20; - wxFlexGridSizer* fgSizer5; wxCheckBox* m_checkBoxClangFirst; wxStaticText* m_staticText13; wxPanel* m_panel8; - wxBoxSizer* bSizer24; wxTextCtrl* m_textCtrlClangSearchPaths; wxButton* m_buttonSuggest; wxPanel* m_panel4; - wxBoxSizer* bSizer21; - wxFlexGridSizer* fgSizerClangCache; wxStaticText* m_staticText101; wxButton* m_buttonClearCache; wxStaticText* m_staticText12; wxChoice* m_choiceCachePolicy; - wxBoxSizer* bSizer3; wxButton* m_buttonOK; wxButton* m_buttonCancel; diff --git a/formbuilder/tags_options_base_dlg.wxcp b/formbuilder/tags_options_base_dlg.wxcp index 1d54b8d..8fa8b0a 100644 --- a/formbuilder/tags_options_base_dlg.wxcp +++ b/formbuilder/tags_options_base_dlg.wxcp @@ -3689,7 +3689,7 @@ }, { "type": "colour", "m_label": "Fg Colour:", - "colour": "(255,255,255)" + "colour": "CaptionText" }, { "type": "font", "m_label": "Font:", @@ -3738,11 +3738,11 @@ }, { "type": "colour", "m_label": "Gradient Start", - "colour": "(48,48,48)" + "colour": "ActiveCaption" }, { "type": "colour", "m_label": "Gradient End", - "colour": "(48,48,48)" + "colour": "ActiveCaption" }], "m_events": [], "m_children": [] @@ -4108,7 +4108,7 @@ }, { "type": "colour", "m_label": "Fg Colour:", - "colour": "(255,255,255)" + "colour": "CaptionText" }, { "type": "font", "m_label": "Font:", @@ -4157,11 +4157,11 @@ }, { "type": "colour", "m_label": "Gradient Start", - "colour": "(48,48,48)" + "colour": "ActiveCaption" }, { "type": "colour", "m_label": "Gradient End", - "colour": "(48,48,48)" + "colour": "ActiveCaption" }], "m_events": [], "m_children": [] https://sourceforge.net/p/codelite/codelitegit/ci/ca04172bd7c0a3824784d8655633f93babf7b85f commit ca04172bd7c0a3824784d8655633f93babf7b85f Author: Eran <era...@gm...> Date: Mon Jan 6 20:52:20 2014 +0200 Updated codelite's frame title default value diff --git a/LiteEditor/editor_options_misc.wxcp b/LiteEditor/editor_options_misc.wxcp index dcdbd33..ea64c2a 100644 --- a/LiteEditor/editor_options_misc.wxcp +++ b/LiteEditor/editor_options_misc.wxcp @@ -1605,7 +1605,7 @@ }, { "type": "multi-string", "m_label": "Label:", - "m_value": "the current user name" ... 263 lines suppressed ... hooks/post-receive -- codelite |