neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Feature #171 Fold element does not fold following whitespace

This commit is contained in:
Zane U. Ji 2014-10-26 20:07:34 +08:00
parent 0a5c83adfd
commit 5c4f02b84c
6 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
1.2.1.4
+ Feature #171 Fold element does not fold following whitespace
+ Feature #170 I did a small patch that allows SPACE to trigger autocompletion on any space (Thanassis Tsiodras)
1.2.1.3 2014/09/06
* Fixed problems with new documents
* Bug #212 XSLT insert elements

5
src/mypropertysheet.cpp
View File

@ -77,6 +77,9 @@ MyPropertySheet::MyPropertySheet (
foldBox =
new wxCheckBox ( editorPanel, wxID_ANY, _ ( "&Folding" ) );
foldBox->SetValue ( properties.fold );
foldCompactBox =
new wxCheckBox ( editorPanel, wxID_ANY, _ ( "Fol&d blank lines" ) );
foldCompactBox->SetValue ( properties.foldCompact );
currentLineBox =
new wxCheckBox ( editorPanel, wxID_ANY, _ ( "&Highlight current line" ) );
currentLineBox->SetValue ( properties.currentLine );
@ -126,6 +129,7 @@ MyPropertySheet::MyPropertySheet (
col1sizer->Add ( insertCloseTagBox, 0, wxALL | wxALIGN_LEFT, 5 );
col1sizer->Add ( foldBox, 0, wxALL | wxALIGN_LEFT, 5 );
col1sizer->Add ( foldCompactBox, 0, wxALL | wxALIGN_LEFT, 5 );
col1sizer->Add ( currentLineBox, 0, wxALL | wxALIGN_LEFT, 5 );
col1sizer->Add ( highlightSyntaxBox, 0, wxALL | wxALIGN_LEFT, 5 );
col1sizer->Add ( indentLinesBox, 0, wxALL | wxALIGN_LEFT, 5 );
@ -262,6 +266,7 @@ void MyPropertySheet::OnOk ( wxCommandEvent& e )
properties.completion = completionBox->GetValue();
properties.fold = foldBox->GetValue();
properties.foldCompact = foldCompactBox->GetValue();
properties.number = numberBox->GetValue();
properties.currentLine = currentLineBox->GetValue();
properties.whitespaceVisible = whitespaceVisibleBox->GetValue();

1
src/mypropertysheet.h
View File

@ -62,6 +62,7 @@ class MyPropertySheet : public wxPropertySheetDialog
wxCheckBox *completionBox,
*currentLineBox,
*foldBox,
*foldCompactBox,
*numberBox,
*whitespaceVisibleBox,
*indentLinesBox,

4
src/xmlcopyeditor.cpp
View File

@ -688,6 +688,8 @@ MyFrame::MyFrame (
config->Read ( _T ( "number" ), true );
properties.fold =
config->Read ( _T ( "fold" ), true );
properties.foldCompact =
config->Read ( _T ( "foldCompact" ), true );
properties.currentLine =
config->Read ( _T ( "currentLine" ), true );
properties.highlightSyntax =
@ -854,6 +856,7 @@ MyFrame::MyFrame (
largeFileProperties.completion = false;
largeFileProperties.fold = false;
largeFileProperties.foldCompact = false;
largeFileProperties.whitespaceVisible = false;
largeFileProperties.wrap = false;
largeFileProperties.indentLines = false;
@ -1082,6 +1085,7 @@ MyFrame::~MyFrame()
config->Write ( _T ( "completion" ), properties.completion );
config->Write ( _T ( "number" ), properties.number );
config->Write ( _T ( "fold" ), properties.fold );
config->Write ( _T ( "foldCompact" ), properties.foldCompact );
config->Write ( _T ( "currentLine" ), properties.currentLine );
config->Write ( _T ( "whitespaceVisible" ), properties.whitespaceVisible );
config->Write ( _T ( "wrap" ), properties.wrap );

3
src/xmlctrl.cpp
View File

@ -1233,8 +1233,9 @@ void XmlCtrl::applyProperties (
wxString value = ( properties.fold && type != FILE_TYPE_BINARY ) ? _T ( "1" ) : _T ( "0" );
SetProperty ( _T ( "fold" ), value );
SetProperty ( _T ( "fold.compact" ), value );
SetProperty ( _T ( "fold.html" ), value );
value = properties.foldCompact ? value : _T("0");
SetProperty ( _T ( "fold.compact" ), value );
}
void XmlCtrl::OnMarginClick ( wxStyledTextEvent& event )

1
src/xmlctrl.h
View File

@ -36,6 +36,7 @@ struct XmlCtrlProperties
{
bool completion;
bool fold;
bool foldCompact;
bool number;
bool currentLine;
bool whitespaceVisible;