From de9aa761f95d33e87fb9928cae595ff7720a21d8 Mon Sep 17 00:00:00 2001 From: donho Date: Mon, 27 Aug 2007 18:59:34 +0000 Subject: [PATCH] [NEW_FEATURE] Global override style : to be continued. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@15 f5eea248-9336-0410-98b8-ebc06183d4e3 --- .../WinControls/ColourPicker/WordStyleDlg.cpp | 26 +++++++++++++------ PowerEditor/src/stylers.xml | 2 +- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp index 815c947eb..508f0ff95 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp @@ -243,38 +243,48 @@ BOOL CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPar case IDC_GLOBAL_FG_CHECK : { - + + GlobalOverride & glo = (NppParameters::getInstance())->getGlobalOverrideStyle(); + glo.enableFg = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, wParam, BM_GETCHECK, 0, 0)); return TRUE; } - case IDC_GLOBAL_BG_CHECK : - printStr("touched!"); + case IDC_GLOBAL_BG_CHECK: + { + GlobalOverride & glo = (NppParameters::getInstance())->getGlobalOverrideStyle(); + glo.enableBg = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, wParam, BM_GETCHECK, 0, 0)); return TRUE; + } case IDC_GLOBAL_FONT_CHECK : { - + GlobalOverride & glo = (NppParameters::getInstance())->getGlobalOverrideStyle(); + glo.enableFont = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, wParam, BM_GETCHECK, 0, 0)); return TRUE; } case IDC_GLOBAL_FONTSIZE_CHECK : { - + GlobalOverride & glo = (NppParameters::getInstance())->getGlobalOverrideStyle(); + glo.enableFontSize = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, wParam, BM_GETCHECK, 0, 0)); return TRUE; } case IDC_GLOBAL_BOLD_CHECK : { - + GlobalOverride & glo = (NppParameters::getInstance())->getGlobalOverrideStyle(); + glo.enableBold = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, wParam, BM_GETCHECK, 0, 0)); return TRUE; } case IDC_GLOBAL_ITALIC_CHECK : { - + GlobalOverride & glo = (NppParameters::getInstance())->getGlobalOverrideStyle(); + glo.enableItalic = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, wParam, BM_GETCHECK, 0, 0)); return TRUE; } case IDC_GLOBAL_UNDERLINE_CHECK : { - + GlobalOverride & glo = (NppParameters::getInstance())->getGlobalOverrideStyle(); + glo.enableUnderLine = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, wParam, BM_GETCHECK, 0, 0)); return TRUE; } diff --git a/PowerEditor/src/stylers.xml b/PowerEditor/src/stylers.xml index 3d0f9f45d..8daa0fcc2 100644 --- a/PowerEditor/src/stylers.xml +++ b/PowerEditor/src/stylers.xml @@ -691,7 +691,7 @@ - +