[BUG_FIXED] Fix the menu items settings non-memorized regression.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@659 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2010-09-01 20:36:47 +00:00
parent 2c05fa7f37
commit 315a6d7a2f

View File

@ -853,6 +853,10 @@ void Notepad_plus::command(int id)
_mainEditView.showWSAndTab(isChecked); _mainEditView.showWSAndTab(isChecked);
_subEditView.showEOL(false); _subEditView.showEOL(false);
_subEditView.showWSAndTab(isChecked); _subEditView.showWSAndTab(isChecked);
ScintillaViewParams & svp1 = (ScintillaViewParams &)(NppParameters::getInstance())->getSVP();
svp1._whiteSpaceShow = isChecked;
svp1._eolShow = false;
break; break;
} }
case IDM_VIEW_EOL: case IDM_VIEW_EOL:
@ -866,6 +870,10 @@ void Notepad_plus::command(int id)
_subEditView.showEOL(isChecked); _subEditView.showEOL(isChecked);
_mainEditView.showWSAndTab(false); _mainEditView.showWSAndTab(false);
_subEditView.showWSAndTab(false); _subEditView.showWSAndTab(false);
ScintillaViewParams & svp1 = (ScintillaViewParams &)(NppParameters::getInstance())->getSVP();
svp1._whiteSpaceShow = false;
svp1._eolShow = isChecked;
break; break;
} }
case IDM_VIEW_ALL_CHARACTERS: case IDM_VIEW_ALL_CHARACTERS:
@ -877,6 +885,10 @@ void Notepad_plus::command(int id)
_mainEditView.showInvisibleChars(isChecked); _mainEditView.showInvisibleChars(isChecked);
_subEditView.showInvisibleChars(isChecked); _subEditView.showInvisibleChars(isChecked);
_toolBar.setCheck(IDM_VIEW_ALL_CHARACTERS, isChecked); _toolBar.setCheck(IDM_VIEW_ALL_CHARACTERS, isChecked);
ScintillaViewParams & svp1 = (ScintillaViewParams &)(NppParameters::getInstance())->getSVP();
svp1._whiteSpaceShow = isChecked;
svp1._eolShow = isChecked;
break; break;
} }
@ -886,6 +898,9 @@ void Notepad_plus::command(int id)
_subEditView.showIndentGuideLine(!_pEditView->isShownIndentGuide()); _subEditView.showIndentGuideLine(!_pEditView->isShownIndentGuide());
_toolBar.setCheck(IDM_VIEW_INDENT_GUIDE, _pEditView->isShownIndentGuide()); _toolBar.setCheck(IDM_VIEW_INDENT_GUIDE, _pEditView->isShownIndentGuide());
checkMenuItem(IDM_VIEW_INDENT_GUIDE, _pEditView->isShownIndentGuide()); checkMenuItem(IDM_VIEW_INDENT_GUIDE, _pEditView->isShownIndentGuide());
ScintillaViewParams & svp1 = (ScintillaViewParams &)(NppParameters::getInstance())->getSVP();
svp1._indentGuideLineShow = _pEditView->isShownIndentGuide();
break; break;
} }
@ -896,6 +911,9 @@ void Notepad_plus::command(int id)
_subEditView.wrap(isWraped); _subEditView.wrap(isWraped);
_toolBar.setCheck(IDM_VIEW_WRAP, isWraped); _toolBar.setCheck(IDM_VIEW_WRAP, isWraped);
checkMenuItem(IDM_VIEW_WRAP, isWraped); checkMenuItem(IDM_VIEW_WRAP, isWraped);
ScintillaViewParams & svp1 = (ScintillaViewParams &)(NppParameters::getInstance())->getSVP();
svp1._doWrap = isWraped;
break; break;
} }
case IDM_VIEW_WRAP_SYMBOL: case IDM_VIEW_WRAP_SYMBOL:
@ -903,6 +921,9 @@ void Notepad_plus::command(int id)
_mainEditView.showWrapSymbol(!_pEditView->isWrapSymbolVisible()); _mainEditView.showWrapSymbol(!_pEditView->isWrapSymbolVisible());
_subEditView.showWrapSymbol(!_pEditView->isWrapSymbolVisible()); _subEditView.showWrapSymbol(!_pEditView->isWrapSymbolVisible());
checkMenuItem(IDM_VIEW_WRAP_SYMBOL, _pEditView->isWrapSymbolVisible()); checkMenuItem(IDM_VIEW_WRAP_SYMBOL, _pEditView->isWrapSymbolVisible());
ScintillaViewParams & svp1 = (ScintillaViewParams &)(NppParameters::getInstance())->getSVP();
svp1._wrapSymbolShow = _pEditView->isWrapSymbolVisible();
break; break;
} }