Menu
▾
▴
[Codelite-svn] codelite git: codelite branch master updated. dfd88ee6cdcd9ae72c8fc2d375aabaaba456c66a
|
From: Eran I. <no...@so...> - 2014-01-15 19:11:05
|
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 dfd88ee6cdcd9ae72c8fc2d375aabaaba456c66a (commit)
from 19cdd1b4f1645ec1855b0d13af50e5fa51aaa10c (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/dfd88ee6cdcd9ae72c8fc2d375aabaaba456c66a
commit dfd88ee6cdcd9ae72c8fc2d375aabaaba456c66a
Author: Eran <era...@gm...>
Date: Wed Jan 15 21:10:50 2014 +0200
Updated Svn commit dialog
diff --git a/Subversion2/SvnCommitDialog.cpp b/Subversion2/SvnCommitDialog.cpp
index 5e2b131..8ed9f0a 100644
--- a/Subversion2/SvnCommitDialog.cpp
+++ b/Subversion2/SvnCommitDialog.cpp
@@ -52,13 +52,17 @@ SvnCommitDialog::SvnCommitDialog(wxWindow* parent, Subversion2* plugin)
m_choiceMessages->Append(previews.Item(i), new CommitMessageStringData(lastMessages.Item(i)));
}
- m_textCtrlMessage->SetFocus();
WindowAttrManager::Load(this, wxT("SvnCommitDialog"), m_plugin->GetManager()->GetConfigTool());
-
int sashPos = m_plugin->GetSettings().GetCommitDlgSashPos();
if ( sashPos != wxNOT_FOUND ) {
m_splitterH->SetSashPosition(sashPos);
}
+
+ LexerConfPtr textLexer = EditorConfigST::Get()->GetLexer("text");
+ if ( textLexer ) {
+ textLexer->Apply( m_stcMessage );
+ }
+
}
SvnCommitDialog::SvnCommitDialog(wxWindow* parent, const wxArrayString &paths, const wxString &url, Subversion2 *plugin, const wxString &repoPath)
@@ -90,7 +94,6 @@ SvnCommitDialog::SvnCommitDialog(wxWindow* parent, const wxArrayString &paths, c
DoShowDiff(0);
}
- m_textCtrlMessage->SetFocus();
WindowAttrManager::Load(this, wxT("SvnCommitDialog"), m_plugin->GetManager()->GetConfigTool());
int sashPos = m_plugin->GetSettings().GetCommitDlgSashPos();
if ( sashPos != wxNOT_FOUND ) {
@@ -107,13 +110,18 @@ SvnCommitDialog::SvnCommitDialog(wxWindow* parent, const wxArrayString &paths, c
m_stcDiff->SetLexer(wxSTC_LEX_DIFF);
diffLexer->Apply( m_stcDiff );
}
+
+ LexerConfPtr textLexer = EditorConfigST::Get()->GetLexer("text");
+ if ( textLexer ) {
+ textLexer->Apply( m_stcMessage );
+ }
}
SvnCommitDialog::~SvnCommitDialog()
{
wxDELETE( m_process );
- wxString message = m_textCtrlMessage->GetValue();
+ wxString message = m_stcMessage->GetText();
m_plugin->GetCommitMessagesCache().AddMessage(message);
int sashPos = m_splitterH->GetSashPosition();
@@ -128,7 +136,7 @@ SvnCommitDialog::~SvnCommitDialog()
wxString SvnCommitDialog::GetMesasge()
{
SubversionLocalProperties props(m_url);
- wxString msg = NormalizeMessage(m_textCtrlMessage->GetValue());
+ wxString msg = NormalizeMessage(m_stcMessage->GetText());
msg << wxT("\n");
// Append any bug URLs to the commit message
@@ -230,7 +238,7 @@ void SvnCommitDialog::OnChoiceMessage(wxCommandEvent& e)
CommitMessageStringData* data = (CommitMessageStringData*)m_choiceMessages->GetClientObject(idx);
if(data) {
- m_textCtrlMessage->SetValue(data->GetData());
+ m_stcMessage->SetText( data->GetData() );
}
}
diff --git a/Subversion2/wxcrafter.cpp b/Subversion2/wxcrafter.cpp
index 2636b18..3381279 100644
--- a/Subversion2/wxcrafter.cpp
+++ b/Subversion2/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!
//////////////////////////////////////////////////////////////////////
@@ -25,7 +26,7 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
wxBoxSizer* boxSizer1 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(boxSizer1);
- wxFlexGridSizer* flexGridSizer5 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer5 = new wxFlexGridSizer(0, 2, 0, 0);
flexGridSizer5->SetFlexibleDirection( wxBOTH );
flexGridSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer5->AddGrowableCol(1);
@@ -48,7 +49,7 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
flexGridSizer5->Add(m_textCtrlBugID, 0, wxALL|wxEXPAND, 5);
- m_splitterV = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxSP_LIVE_UPDATE);
+ m_splitterV = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME|wxSP_3DSASH);
m_splitterV->SetSashGravity(0.5);
m_splitterV->SetMinimumPaneSize(10);
@@ -63,7 +64,7 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
m_splitterH->SetSashGravity(0.5);
m_splitterH->SetMinimumPaneSize(10);
- boxSizer58->Add(m_splitterH, 1, wxALL|wxEXPAND, 5);
+ boxSizer58->Add(m_splitterH, 1, wxEXPAND, 5);
m_panel1 = new wxPanel(m_splitterH, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
@@ -77,7 +78,7 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
wxArrayString m_checkListFilesArr;
m_checkListFiles = new wxCheckListBox(m_panel1, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), m_checkListFilesArr, wxLB_SINGLE);
- boxSizer15->Add(m_checkListFiles, 1, wxEXPAND, 5);
+ boxSizer15->Add(m_checkListFiles, 1, wxALL|wxEXPAND, 2);
m_splitterPage14 = new wxPanel(m_splitterH, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_splitterH->SplitVertically(m_panel1, m_splitterPage14, 0);
@@ -106,14 +107,13 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
m_stcDiff->SetMarginSensitive(2, true);
// Configure the line numbers margin
- int m_stcDiff_PixelWidth = 4 + 5 *m_stcDiff->TextWidth(wxSTC_STYLE_LINENUMBER, wxT("9"));
m_stcDiff->SetMarginType(0, wxSTC_MARGIN_NUMBER);
- m_stcDiff->SetMarginWidth(0,m_stcDiff_PixelWidth);
+ m_stcDiff->SetMarginWidth(0,0);
// Configure the line symbol margin
m_stcDiff->SetMarginType(3, wxSTC_MARGIN_FORE);
m_stcDiff->SetMarginMask(3, 0);
- m_stcDiff->SetMarginWidth(3,1);
+ m_stcDiff->SetMarginWidth(3,0);
// Select the lexer
m_stcDiff->SetLexer(wxSTC_LEX_NULL);
// Set default font / styles
@@ -126,7 +126,7 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
m_stcDiff->SetKeyWords(3, wxT(""));
m_stcDiff->SetKeyWords(4, wxT(""));
- boxSizer16->Add(m_stcDiff, 1, wxEXPAND, 5);
+ boxSizer16->Add(m_stcDiff, 1, wxALL|wxEXPAND, 2);
m_splitterPage56 = new wxPanel(m_splitterV, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
m_splitterV->SplitHorizontally(m_splitterPage52, m_splitterPage56, 0);
@@ -138,40 +138,65 @@ SvnCommitDialogBaseClass::SvnCommitDialogBaseClass(wxWindow* parent, wxWindowID
boxSizer60->Add(m_staticText62, 0, wxALL, 5);
- m_textCtrlMessage = new wxTextCtrl(m_splitterPage56, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), wxTE_RICH2|wxTE_PROCESS_ENTER|wxTE_MULTILINE);
- #ifdef __WXMSW__
- // To get the newer version of the font on MSW, we use font wxSYS_DEFAULT_GUI_FONT with family set to wxFONTFAMILY_TELETYPE
- wxFont m_textCtrlMessageFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
- m_textCtrlMessageFont.SetFamily(wxFONTFAMILY_TELETYPE);
- #else
- wxFont m_textCtrlMessageFont = wxSystemSettings::GetFont(wxSYS_ANSI_FIXED_FONT);
- #endif
- m_textCtrlMessage->SetFont(m_textCtrlMessageFont);
+ m_stcMessage = new wxStyledTextCtrl(m_splitterPage56, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBORDER_THEME);
+ m_stcMessage->SetFocus();
+ // Configure the fold margin
+ m_stcMessage->SetMarginType (4, wxSTC_MARGIN_SYMBOL);
+ m_stcMessage->SetMarginMask (4, wxSTC_MASK_FOLDERS);
+ m_stcMessage->SetMarginSensitive(4, true);
+ m_stcMessage->SetMarginWidth (4, 0);
+
+ // Configure the tracker margin
+ m_stcMessage->SetMarginWidth(1, 0);
- boxSizer60->Add(m_textCtrlMessage, 1, wxALL|wxEXPAND, 5);
+ // Configure the symbol margin
+ m_stcMessage->SetMarginType (2, wxSTC_MARGIN_SYMBOL);
+ m_stcMessage->SetMarginMask (2, ~(wxSTC_MASK_FOLDERS));
+ m_stcMessage->SetMarginWidth(2, 0);
+ m_stcMessage->SetMarginSensitive(2, true);
+
+ // Configure the line numbers margin
+ m_stcMessage->SetMarginType(0, wxSTC_MARGIN_NUMBER);
+ m_stcMessage->SetMarginWidth(0,0);
+
+ // Configure the line symbol margin
+ m_stcMessage->SetMarginType(3, wxSTC_MARGIN_FORE);
+ m_stcMessage->SetMarginMask(3, 0);
+ m_stcMessage->SetMarginWidth(3,0);
+ // Select the lexer
+ m_stcMessage->SetLexer(wxSTC_LEX_NULL);
+ // Set default font / styles
+ m_stcMessage->StyleClearAll();
+ m_stcMessage->SetWrapMode(0);
+ m_stcMessage->SetIndentationGuides(0);
+ m_stcMessage->SetKeyWords(0, wxT(""));
+ m_stcMessage->SetKeyWords(1, wxT(""));
+ m_stcMessage->SetKeyWords(2, wxT(""));
+ m_stcMessage->SetKeyWords(3, wxT(""));
+ m_stcMessage->SetKeyWords(4, wxT(""));
+
+ boxSizer60->Add(m_stcMessage, 1, wxALL|wxEXPAND, 2);
wxStaticBoxSizer* statixBoxSizer24 = new wxStaticBoxSizer( new wxStaticBox(this, wxID_ANY, _("Recent commit messages:")), wxVERTICAL);
- boxSizer1->Add(statixBoxSizer24, 0, wxEXPAND|wxALL, 5);
+ boxSizer1->Add(statixBoxSizer24, 0, wxALL|wxEXPAND, 5);
wxArrayString m_choiceMessagesArr;
m_choiceMessages = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), m_choiceMessagesArr, 0);
- statixBoxSizer24->Add(m_choiceMessages, 0, wxEXPAND|wxALL, 5);
-
- wxBoxSizer* boxSizer2 = new wxBoxSizer(wxHORIZONTAL);
-
- boxSizer1->Add(boxSizer2, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+ statixBoxSizer24->Add(m_choiceMessages, 0, wxALL|wxEXPAND, 5);
- m_button3 = new wxButton(this, wxID_OK, _("C&ommit"), wxDefaultPosition, wxSize(-1,-1), 0);
- m_button3->SetDefault();
- m_button3->SetToolTip(_("Commit"));
+ m_stdBtnSizer66 = new wxStdDialogButtonSizer();
- boxSizer2->Add(m_button3, 0, wxALL, 5);
+ boxSizer1->Add(m_stdBtnSizer66, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
- m_button4 = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize(-1,-1), 0);
+ m_buttonCancel = new wxButton(this, wxID_CANCEL, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_stdBtnSizer66->AddButton(m_buttonCancel);
- boxSizer2->Add(m_button4, 0, wxALL, 5);
+ m_buttonOK = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_buttonOK->SetDefault();
+ m_stdBtnSizer66->AddButton(m_buttonOK);
+ m_stdBtnSizer66->Realize();
SetSizeHints(-1,-1);
if ( GetSizer() ) {
@@ -219,7 +244,7 @@ SvnSyncDialogBaseClass::SvnSyncDialogBaseClass(wxWindow* parent, wxWindowID id,
boxSizer32->Add(m_staticTextSvnInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
- wxFlexGridSizer* flexGridSizer37 = new wxFlexGridSizer( 0, 2, 0, 0);
+ wxFlexGridSizer* flexGridSizer37 = new wxFlexGridSizer(0, 2, 0, 0);
flexGridSizer37->SetFlexibleDirection( wxBOTH );
flexGridSizer37->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer37->AddGrowableCol(1);
diff --git a/Subversion2/wxcrafter.h b/Subversion2/wxcrafter.h
index 8dec9c0..30c43a5 100644
--- a/Subversion2/wxcrafter.h
+++ b/Subversion2/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!
//////////////////////////////////////////////////////////////////////
@@ -11,6 +12,7 @@
#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/textctrl.h>
@@ -43,10 +45,11 @@ protected:
wxStyledTextCtrl* m_stcDiff;
wxPanel* m_splitterPage56;
wxStaticText* m_staticText62;
- wxTextCtrl* m_textCtrlMessage;
+ wxStyledTextCtrl* m_stcMessage;
wxChoice* m_choiceMessages;
- wxButton* m_button3;
- wxButton* m_button4;
+ wxStdDialogButtonSizer* m_stdBtnSizer66;
+ wxButton* m_buttonCancel;
+ wxButton* m_buttonOK;
protected:
virtual void OnFileSelected(wxCommandEvent& event) { event.Skip(); }
diff --git a/Subversion2/wxcrafter.wxcp b/Subversion2/wxcrafter.wxcp
index eff796c..a4fa5dd 100644
--- a/Subversion2/wxcrafter.wxcp
+++ b/Subversion2/wxcrafter.wxcp
@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
- "m_objCounter": 62,
+ "m_objCounter": 70,
"m_includeFiles": [],
"m_bitmapFunction": "wxC38D8InitBitmapResources",
"m_bitmapsFile": "wxcrafter_subversion2_bitmaps.cpp",
@@ -506,7 +506,7 @@
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": ["wxSP_LIVE_UPDATE"],
+ "m_styles": ["wxSP_LIVE_UPDATE", "wxSP_NO_XP_THEME", "wxSP_3DSASH"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
@@ -679,7 +679,7 @@
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxSP_LIVE_UPDATE", "wxSP_3DSASH"],
- "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_sizerFlags": ["wxEXPAND"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -922,11 +922,11 @@
}, {
"m_type": 4425,
"proportion": 1,
- "border": 5,
+ "border": 2,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxLB_SINGLE"],
- "m_sizerFlags": ["wxEXPAND"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -1165,11 +1165,11 @@
}, {
"m_type": 4466,
"proportion": 1,
- "border": 5,
+ "border": 2,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
- "m_sizerFlags": ["wxEXPAND"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -1221,11 +1221,11 @@
}, {
"type": "bool",
"m_label": "Line Number Margin",
- "m_value": true
+ "m_value": false
}, {
"type": "bool",
"m_label": "Separator Margin",
- "m_value": true
+ "m_value": false
}, {
"type": "bool",
"m_label": "Symbol Margin",
@@ -1451,12 +1451,12 @@
"m_events": [],
"m_children": []
}, {
- "m_type": 4406,
+ "m_type": 4466,
"proportion": 1,
- "border": 5,
+ "border": 2,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": ["wxTE_RICH2", "wxTE_PROCESS_ENTER", "wxTE_MULTILINE"],
+ "m_styles": ["wxBORDER_THEME"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
@@ -1473,24 +1473,12 @@
}, {
"type": "string",
"m_label": "Name:",
- "m_value": "m_textCtrlMessage"
+ "m_value": "m_stcMessage"
}, {
"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_ANSI_FIXED_FONT,normal,normal,normal"
- }, {
"type": "bool",
"m_label": "Hidden",
"m_value": false
@@ -1501,7 +1489,7 @@
}, {
"type": "bool",
"m_label": "Focused",
- "m_value": false
+ "m_value": true
}, {
"type": "string",
"m_label": "Class Name:",
@@ -1515,21 +1503,69 @@
"m_label": "Style:",
"m_value": ""
}, {
- "type": "string",
- "m_label": "Value:",
- "m_value": ""
+ "type": "bool",
+ "m_label": "Fold Margin",
+ "m_value": false
}, {
- "type": "string",
- "m_label": "Max Length:",
- "m_value": "0"
+ "type": "bool",
+ "m_label": "Line Number Margin",
+ "m_value": false
}, {
"type": "bool",
- "m_label": "Auto Complete Directories:",
+ "m_label": "Separator Margin",
"m_value": false
}, {
"type": "bool",
- "m_label": "Auto Complete Files:",
+ "m_label": "Symbol Margin",
+ "m_value": false
+ }, {
+ "type": "choice",
+ "m_label": "Wrap Text",
+ "m_selection": 0,
+ "m_options": ["None", "Word", "Char"]
+ }, {
+ "type": "choice",
+ "m_label": "Indentation Guides",
+ "m_selection": 0,
+ "m_options": ["None", "Real", "Look Forward", "Look Both"]
+ }, {
+ "type": "choice",
+ "m_label": "EOL Mode",
+ "m_selection": 3,
+ "m_options": ["CRLF", "CR", "LF", "Default"]
+ }, {
+ "type": "bool",
+ "m_label": "Display EOL Markers",
"m_value": false
+ }, {
+ "type": "choice",
+ "m_label": "Lexer",
+ "m_selection": 58,
+ "m_options": ["wxSTC_LEX_ABAQUS", "wxSTC_LEX_ADA", "wxSTC_LEX_APDL", "wxSTC_LEX_ASM", "wxSTC_LEX_ASN1", "wxSTC_LEX_ASYMPTOTE", "wxSTC_LEX_AUTOMATIC", "wxSTC_LEX_AVE", "wxSTC_LEX_BAAN", "wxSTC_LEX_BASH", "wxSTC_LEX_BATCH", "wxSTC_LEX_BLITZBASIC", "wxSTC_LEX_BULLANT", "wxSTC_LEX_CAML", "wxSTC_LEX_CLW", "wxSTC_LEX_CLWNOCASE", "wxSTC_LEX_CMAKE", "wxSTC_LEX_COBOL", "wxSTC_LEX_CONF", "wxSTC_LEX_CONTAINER", "wxSTC_LEX_CPP", "wxSTC_LEX_CPPNOCASE", "wxSTC_LEX_CSOUND", "wxSTC_LEX_CSS", "wxSTC_LEX_D", "wxSTC_LEX_DIFF", "wxSTC_LEX_EIFFEL", "wxSTC_LEX_EIFFELKW", "wxSTC_LEX_ERLANG", "wxSTC_LEX_ERRORLIST", "wxSTC_LEX_ESCRIPT", "wxSTC_LEX_F77", "wxSTC_LEX_FLAGSHIP", "wxSTC_LEX_FORTH", "wxSTC_LEX_FORTRAN", "wxSTC_LEX_FREEBASIC", "wxSTC_LEX_GAP", "wxSTC_LEX_GUI4CLI", "wxSTC_LEX_HASKELL", "wxSTC_LEX_HTML", "wxSTC_LEX_INNOSETUP", "wxSTC_LEX_KIX", "wxSTC_LEX_LATEX", "wxSTC_LEX_LISP", "wxSTC_LEX_LOT", "wxSTC_LEX_LOUT", "wxSTC_LEX_LUA", "wxSTC_LEX_MAGIK", "wxSTC_LEX_MAKEFILE", "wxSTC_LEX_MARKDOWN", "wxSTC_LEX_MATLAB", "wxSTC_LEX_METAPOST", "wxSTC_LEX_MMIXAL", "wxSTC_LEX_MSSQL", "wxSTC_LEX_MYSQL", "wxSTC_LEX_NIMROD", "wxSTC_LEX_NNCRONTAB", "wxSTC_LEX_NSIS", "wxSTC_LEX_NULL", "wxSTC_LEX_OCTAVE", "wxSTC_LEX_OPAL", "wxSTC_LEX_PASCAL", "wxSTC_LEX_PERL", "wxSTC_LEX_PHPSCRIPT", "wxSTC_LEX_PLM", "wxSTC_LEX_PO", "wxSTC_LEX_POV", "wxSTC_LEX_POWERBASIC", "wxSTC_LEX_POWERPRO", "wxSTC_LEX_POWERSHELL", "wxSTC_LEX_PROGRESS", "wxSTC_LEX_PROPERTIES", "wxSTC_LEX_PS", "wxSTC_LEX_PUREBASIC", "wxSTC_LEX_PYTHON", "wxSTC_LEX_R", "wxSTC_LEX_REBOL", "wxSTC_LEX_RUBY", "wxSTC_LEX_SCRIPTOL", "wxSTC_LEX_SMALLTALK", "wxSTC_LEX_SML", "wxSTC_LEX_SORCUS", "wxSTC_LEX_SPECMAN", "wxSTC_LEX_SPICE", "wxSTC_LEX_SQL", "wxSTC_LEX_TACL", "wxSTC_LEX_TADS3", "wxSTC_LEX_TAL", "wxSTC_LEX_TCL", "wxSTC_LEX_TEX", "wxSTC_LEX_VB", "wxSTC_LEX_VBSCRIPT", "wxSTC_LEX_VERILOG", "wxSTC_LEX_VHDL", "wxSTC_LEX_XCODE", "wxSTC_LEX_XML", "wxSTC_LEX_YAML"]
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Keywords Set 1",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Keywords Set 2",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Keywords Set 3",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Keywords Set 4",
+ "m_value": ""
+ }, {
+ "type": "multi-string",
+ "m_label": "Keywords Set 5",
+ "m_value": ""
}],
"m_events": [],
"m_children": []
@@ -1543,7 +1579,7 @@
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
- "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "string",
... 276 lines suppressed ...
hooks/post-receive
--
codelite
|
