From fd7b3614d1614a27e9ae3a7038efb69b6e26c375 Mon Sep 17 00:00:00 2001 From: donho Date: Fri, 6 Jun 2008 23:26:18 +0000 Subject: [PATCH] [NEW_FEATURE] Caret width and blink rate are customizable. (in progress) git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@216 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/src/Notepad_plus.cpp | 10 +- PowerEditor/src/Parameters.h | 10 +- .../src/WinControls/Preference/preference.rc | 96 ++++++++++--------- .../WinControls/Preference/preferenceDlg.cpp | 77 ++++++++++----- .../WinControls/Preference/preferenceDlg.h | 4 +- .../WinControls/Preference/preference_rc.h | 8 ++ PowerEditor/src/lastRecentFileList.cpp | 2 +- PowerEditor/src/resource.h | 3 + PowerEditor/visual.net/notepadPlus.vcproj | 12 ++- 9 files changed, 143 insertions(+), 79 deletions(-) diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 5ed1bad6..9776f843 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -6774,13 +6774,19 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa return TRUE; } - case NPPM_INTERNAL_SCINTILLAKEYMODIFIED : + case NPPM_INTERNAL_SETCARETWIDTH ://NPPM_INTERNAL_SCINTILLAKEYMODIFIED : { + NppGUI & nppGUI = (NppGUI &)pNppParam->getNppGUI(); + _mainEditView.execute(SCI_SETCARETWIDTH, nppGUI._caretWidth); + _subEditView.execute(SCI_SETCARETWIDTH, nppGUI._caretWidth); return TRUE; } - case NPPM_INTERNAL_PLUGINCMDLIST_MODIFIED : + case NPPM_INTERNAL_SETCARETBLINKRATE ://NPPM_INTERNAL_PLUGINCMDLIST_MODIFIED : { + NppGUI & nppGUI = (NppGUI &)pNppParam->getNppGUI(); + _mainEditView.execute(SCI_SETCARETPERIOD, nppGUI._caretBlinkRate); + _subEditView.execute(SCI_SETCARETPERIOD, nppGUI._caretBlinkRate); return TRUE; } diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h index 71443c96..7208a2ee 100644 --- a/PowerEditor/src/Parameters.h +++ b/PowerEditor/src/Parameters.h @@ -533,8 +533,9 @@ struct NppGUI _splitterPos(POS_HORIZOTAL), _userDefineDlgStatus(UDD_DOCKED), _tabSize(8),\ _tabReplacedBySpace(false), _fileAutoDetection(cdEnabled), _checkHistoryFiles(true) ,_enableSmartHilite(true),\ _isMaximized(false), _isMinimizedToTray(false), _rememberLastSession(true), _backup(bak_none), _useDir(false),\ - _doTaskList(true), _maitainIndent(true), _saveOpenKeepInSameDir(false), _styleMRU(true), _styleURL(0), - _autocStatus(autoc_none), _autocFromLen(1), _funcParams(false), _definedSessionExt(""), _neverUpdate(false), _doesExistUpdater(false){ + _doTaskList(true), _maitainIndent(true), _saveOpenKeepInSameDir(false), _styleMRU(true), _styleURL(0),\ + _autocStatus(autoc_none), _autocFromLen(1), _funcParams(false), _definedSessionExt(""), _neverUpdate(false),\ + _doesExistUpdater(false), _caretBlinkRate(250), _caretWidth(1){ _appPos.left = 0; _appPos.top = 0; _appPos.right = 700; @@ -600,6 +601,8 @@ struct NppGUI string _definedSessionExt; bool _neverUpdate; bool _doesExistUpdater; + int _caretBlinkRate; + int _caretWidth; }; struct ScintillaViewParams @@ -607,7 +610,7 @@ struct ScintillaViewParams ScintillaViewParams() : _lineNumberMarginShow(true), _bookMarkMarginShow(true), \ _folderStyle(FOLDER_STYLE_BOX), _indentGuideLineShow(true),\ _currentLineHilitingShow(true), _wrapSymbolShow(false), _doWrap(false),\ - _zoom(0), _whiteSpaceShow(false), _eolShow(false){}; + _zoom(0), _whiteSpaceShow(false), _eolShow(false){}; bool _lineNumberMarginShow; bool _bookMarkMarginShow; folderStyle _folderStyle; //"simple", "arrow", "circle" and "box" @@ -620,6 +623,7 @@ struct ScintillaViewParams int _zoom; bool _whiteSpaceShow; bool _eolShow; + }; const int NB_LIST = 20; diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index e1305840..2992803d 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -58,66 +58,74 @@ BEGIN CONTROL "Hide (Use Alt or F10 key to toggle it)",IDC_CHECK_HIDEMENUBAR,"Button",BS_AUTOCHECKBOX | BS_MULTILINE,24,87,135,26 END -IDD_PREFERENCE_MARGEIN_BOX DIALOGEX 0, 0, 370, 180 +IDD_PREFERENCE_MARGEIN_BOX DIALOGEX 0, 0, 392, 185 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Folder margin style",IDC_FMS_GB_STATIC,53,27,105,77,BS_CENTER - CONTROL "Simple",IDC_RADIO_SIMPLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,62,39,59,10 - CONTROL "Arrow",IDC_RADIO_ARROW,"Button",BS_AUTORADIOBUTTON,62,55,60,10 - CONTROL "Circle tree",IDC_RADIO_CIRCLE,"Button",BS_AUTORADIOBUTTON,62,71,62,10 - CONTROL "Box tree",IDC_RADIO_BOX,"Button",BS_AUTORADIOBUTTON,62,87,61,10 + GROUPBOX "Folder margin style",IDC_FMS_GB_STATIC,32,75,149,42,BS_CENTER + CONTROL "Simple",IDC_RADIO_SIMPLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,41,88,59,10 + CONTROL "Arrow",IDC_RADIO_ARROW,"Button",BS_AUTORADIOBUTTON,41,102,60,10 + CONTROL "Circle tree",IDC_RADIO_CIRCLE,"Button",BS_AUTORADIOBUTTON,114,88,62,10 + CONTROL "Box tree",IDC_RADIO_BOX,"Button",BS_AUTORADIOBUTTON,114,102,61,10 CONTROL "Display line number margin",IDC_CHECK_LINENUMBERMARGE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,113,141,10 - CONTROL "Display bookmark margin",IDC_CHECK_BOOKMARKMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,128,150,10 - CONTROL "Show vertical edge",IDC_CHECK_SHOWVERTICALEDGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,184,39,122,10 - RTEXT "Number of columns :",IDC_NBCOLONE_STATIC,179,87,83,8 - LTEXT "0",IDC_COLONENUMBER_STATIC,270,87,18,8 - GROUPBOX "Vertical Edge Setting",IDC_VES_GB_STATIC,173,27,148,77,BS_CENTER - CONTROL "Line mode",IDC_RADIO_LNMODE,"Button",BS_AUTORADIOBUTTON,187,55,91,10 - CONTROL "Background mode",IDC_RADIO_BGMODE,"Button",BS_AUTORADIOBUTTON,187,70,91,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,33,123,141,10 + CONTROL "Display bookmark margin",IDC_CHECK_BOOKMARKMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,33,135,150,10 + CONTROL "Show vertical edge",IDC_CHECK_SHOWVERTICALEDGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,87,122,10 + RTEXT "Number of columns :",IDC_NBCOLONE_STATIC,207,135,83,8 + LTEXT "0",IDC_COLONENUMBER_STATIC,297,134,18,8 + GROUPBOX "Vertical Edge Setting",IDC_VES_GB_STATIC,201,75,148,77,BS_CENTER + CONTROL "Line mode",IDC_RADIO_LNMODE,"Button",BS_AUTORADIOBUTTON,215,103,91,10 + CONTROL "Background mode",IDC_RADIO_BGMODE,"Button",BS_AUTORADIOBUTTON,215,117,91,10 CONTROL "Active current line highlight",IDC_CHECK_CURRENTLINEHILITE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,113,129,10 - GROUPBOX "",IDC_STATIC,41,12,293,136 - COMBOBOX IDC_COMBO_SCINTILLAVIEWCHOIX,133,9,96,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,33,148,129,10 + GROUPBOX "",IDC_STATIC,20,60,350,104,0,WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE + COMBOBOX IDC_COMBO_SCINTILLAVIEWCHOIX,139,57,96,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Caret settings",IDC_CARETSETTING_STATIC,23,5,199,40,BS_CENTER + LTEXT "Width :",IDC_WIDTH_STATIC,27,24,37,8,0,WS_EX_RIGHT + COMBOBOX IDC_WIDTH_COMBO,66,22,22,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Blink Rate :",IDC_BLINKRATE_STATIC,138,17,50,8 + CONTROL "",IDC_CARETBLINKRATE_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,133,29,67,13 + GROUPBOX "Tab Setting",IDC_TABSETTING_GB_STATIC,238,4,130,40,BS_CENTER + CONTROL "Replace by space",IDC_CHECK_REPLACEBYSPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,256,27,100,10 + RTEXT "Tab size : ",IDC_TABSIZE_STATIC,251,14,58,8 + LTEXT "0",IDC_TABSIZEVAL_STATIC,311,14,18,8 + LTEXT "S",IDC_CARETBLINKRATE_S_STATIC,202,29,12,8 + LTEXT "F",IDC_CARETBLINKRATE_F_STATIC,121,29,12,8,0,WS_EX_RIGHT END IDD_PREFERENCE_SETTING_BOX DIALOGEX 0, 0, 370, 180 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Tab Setting",IDC_TABSETTING_GB_STATIC,16,4,150,39,BS_CENTER - CONTROL "Replace by space",IDC_CHECK_REPLACEBYSPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,27,100,10 - RTEXT "Tab size : ",IDC_TABSIZE_STATIC,18,14,58,8 - LTEXT "0",IDC_TABSIZEVAL_STATIC,78,14,18,8 - GROUPBOX "History File Setting",IDC_HISTORY_GB_STATIC,193,4,150,39,BS_CENTER - CONTROL "Don't check at launch time",IDC_CHECK_DONTCHECKHISTORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,27,133,10 - RTEXT "Max number history file :",IDC_MAXNBFILE_STATIC,196,14,112,8 - LTEXT "0",IDC_MAXNBFILEVAL_STATIC,315,14,15,8 - CONTROL "Enable",IDC_CHECK_CLICKABLELINK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,58,98,10 - GROUPBOX "Clickable link setting",IDC_CLICKABLELINK_STATIC,193,47,150,39,BS_CENTER - CONTROL "Don't draw underline",IDC_CHECK_CLICKABLELINK_NOUNDERLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,71,119,10 + GROUPBOX "History File Setting",IDC_HISTORY_GB_STATIC,15,4,150,39,BS_CENTER + CONTROL "Don't check at launch time",IDC_CHECK_DONTCHECKHISTORY, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,27,133,10 + RTEXT "Max number history file :",IDC_MAXNBFILE_STATIC,18,14,112,8 + LTEXT "0",IDC_MAXNBFILEVAL_STATIC,137,14,15,8 + CONTROL "Enable",IDC_CHECK_CLICKABLELINK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,15,98,10 + GROUPBOX "Clickable link setting",IDC_CLICKABLELINK_STATIC,193,4,150,39,BS_CENTER + CONTROL "Don't draw underline",IDC_CHECK_CLICKABLELINK_NOUNDERLINE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,28,119,10 EDITTEXT IDC_EDIT_SESSIONFILEEXT,298,162,67,14,ES_AUTOHSCROLL LTEXT "Session file ext:",IDC_SESSIONFILEEXT_STATIC,300,150,66,8 CONTROL "Enable",IDC_CHECK_ENABLEDOCSWITCHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,59,69,10 CONTROL "Enable MRU behaviour",IDC_CHECK_STYLEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,72,134,10 GROUPBOX "Document switcher (Ctrl+TAB)",IDC_DOCUMENTSWITCHER_STATIC,15,48,150,39,BS_CENTER - CONTROL "Enable",IDC_CHECK_FILEAUTODETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,100,98,10 - GROUPBOX "File Status Auto-detection",IDC_FILEAUTODETECTION_STATIC,193,90,150,50,BS_CENTER - CONTROL "Update silently",IDC_CHECK_UPDATESILENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,112,103,10 - CONTROL "Scroll to the last line after update",IDC_CHECK_UPDATEGOTOEOF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,124,141,10 - CONTROL "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP, - 16,95,150,10 - CONTROL "Enable smart highlighting",IDC_CHECK_ENABLSMARTHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP, - 16,109,150,10 - CONTROL "Auto-indent",IDC_CHECK_MAINTAININDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 16,123,130,10 - CONTROL "Minimize to sys tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 16,137,130,10 - CONTROL "Remember the last operation directory",IDC_CHECK_KEEPINSAMEDIR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 16,151,210,10 - CONTROL "Remember the current session for next launch",IDC_CHECK_REMEMBERSESSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 16,165,217,10 + CONTROL "Enable",IDC_CHECK_FILEAUTODETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,57,98,10 + GROUPBOX "File Status Auto-detection",IDC_FILEAUTODETECTION_STATIC,193,47,150,50,BS_CENTER + CONTROL "Update silently",IDC_CHECK_UPDATESILENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,69,103,10 + CONTROL "Scroll to the last line after update",IDC_CHECK_UPDATEGOTOEOF, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,81,141,10 + CONTROL "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE, + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,95,150,10 + CONTROL "Enable smart highlighting",IDC_CHECK_ENABLSMARTHILITE, + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,109,150,10 + CONTROL "Auto-indent",IDC_CHECK_MAINTAININDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,123,130,10 + CONTROL "Minimize to sys tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,137,130,10 + CONTROL "Remember the last operation directory",IDC_CHECK_KEEPINSAMEDIR, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,151,210,10 + CONTROL "Remember the current session for next launch",IDC_CHECK_REMEMBERSESSION, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,165,217,10 END IDD_PREFERENCE_NEWDOCSETTING_BOX DIALOGEX 0, 0, 370, 180 diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index 723cf00e..d057ad72 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -294,34 +294,78 @@ void MarginsDlg::changePanelTo(int index) BOOL CALLBACK MarginsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam) { + NppParameters *pNppParam = NppParameters::getInstance(); + NppGUI & nppGUI = (NppGUI &)pNppParam->getNppGUI(); switch (Message) { case WM_INITDIALOG : { + char nbStr[10]; + itoa(nppGUI._tabSize, nbStr, 10); + HWND hTabSize_val = ::GetDlgItem(_hSelf, IDC_TABSIZEVAL_STATIC); + ::SetWindowText(hTabSize_val, nbStr); + + _tabSizeVal.init(_hInst, _hSelf); + _tabSizeVal.create(hTabSize_val, IDM_SETTING_TAB_SIZE); + _verticalEdgeLineNbColVal.init(_hInst, _hSelf); _verticalEdgeLineNbColVal.create(::GetDlgItem(_hSelf, IDC_COLONENUMBER_STATIC), IDM_SETTING_EDGE_SIZE); + ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, (LPARAM)"0"); + ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, (LPARAM)"1"); + ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, (LPARAM)"2"); + ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_ADDSTRING, 0, (LPARAM)"3"); + + ::SendMessage(::GetDlgItem(_hSelf, IDC_WIDTH_COMBO), CB_SETCURSEL, nppGUI._caretWidth, 0); + + ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_SETRANGEMIN, TRUE, 1); + ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_SETRANGEMAX, TRUE, 2500); + ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_SETPAGESIZE, 0, 50); + ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_SETPOS, TRUE, nppGUI._caretBlinkRate); + + ::SendDlgItemMessage(_hSelf, IDC_COMBO_SCINTILLAVIEWCHOIX, CB_ADDSTRING, 0, (LPARAM)"Primary View"); ::SendDlgItemMessage(_hSelf, IDC_COMBO_SCINTILLAVIEWCHOIX, CB_ADDSTRING, 0, (LPARAM)"Second View"); ::SendDlgItemMessage(_hSelf, IDC_COMBO_SCINTILLAVIEWCHOIX, CB_SETCURSEL, 0, 0); changePanelTo(SCIV_PRIMARY); - NppParameters *pNppParam = NppParameters::getInstance(); ETDTProc enableDlgTheme = (ETDTProc)pNppParam->getEnableThemeDlgTexture(); if (enableDlgTheme) enableDlgTheme(_hSelf, ETDT_ENABLETAB); return TRUE; } - case WM_COMMAND : + + case WM_HSCROLL: { - NppParameters *pNppParam = NppParameters::getInstance(); - + //case IDC_CARETBLINKRATE_SLIDER: + NppGUI & nppGUI = (NppGUI &)NppParameters::getInstance()->getNppGUI(); + nppGUI._caretBlinkRate = ::SendMessage(::GetDlgItem(_hSelf, IDC_CARETBLINKRATE_SLIDER),TBM_GETPOS, 0, 0); + ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SETCARETBLINKRATE, 0, 0); + return TRUE; + + } + + case WM_COMMAND : + { int i = ::SendDlgItemMessage(_hSelf, IDC_COMBO_SCINTILLAVIEWCHOIX, CB_GETCURSEL, 0, 0); ScintillaViewParams & svp = (ScintillaViewParams &)pNppParam->getSVP(i?SCIV_SECOND:SCIV_PRIMARY); int iView = i + 1; switch (wParam) { + case IDM_SETTING_TAB_SIZE: + { + ::SendMessage(_hParent, WM_COMMAND, IDM_SETTING_TAB_SIZE, 0); + char nbStr[10]; + itoa(nppGUI._tabSize, nbStr, 10); + ::SetWindowText(::GetDlgItem(_hSelf, IDC_TABSIZEVAL_STATIC), nbStr); + return TRUE; + } + + case IDC_CHECK_REPLACEBYSPACE: + ::SendMessage(_hParent, WM_COMMAND, IDM_SETTING_TAB_REPLCESPACE, 0); + return TRUE; + case IDC_CHECK_LINENUMBERMARGE: svp._lineNumberMarginShow = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_LINENUMBERMARGE, BM_GETCHECK, 0, 0)); ::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_LINENUMBER, iView); @@ -411,6 +455,12 @@ BOOL CALLBACK MarginsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam changePanelTo(i); return TRUE; } + case IDC_WIDTH_COMBO: + { + nppGUI._caretWidth = ::SendDlgItemMessage(_hSelf, IDC_WIDTH_COMBO, CB_GETCURSEL, 0, 0); + ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SETCARETWIDTH, 0, 0); + return TRUE; + } default: break; } @@ -431,12 +481,6 @@ BOOL CALLBACK SettingsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPara case WM_INITDIALOG : { char nbStr[10]; - itoa(nppGUI._tabSize, nbStr, 10); - HWND hTabSize_val = ::GetDlgItem(_hSelf, IDC_TABSIZEVAL_STATIC); - ::SetWindowText(hTabSize_val, nbStr); - - _tabSizeVal.init(_hInst, _hSelf); - _tabSizeVal.create(hTabSize_val, IDM_SETTING_TAB_SIZE); itoa(pNppParam->getNbMaxFile(), nbStr, 10); ::SetWindowText(::GetDlgItem(_hSelf, IDC_MAXNBFILEVAL_STATIC), nbStr); @@ -538,10 +582,6 @@ BOOL CALLBACK SettingsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPara switch (wParam) { - case IDC_CHECK_REPLACEBYSPACE: - ::SendMessage(_hParent, WM_COMMAND, IDM_SETTING_TAB_REPLCESPACE, 0); - return TRUE; - case IDC_CHECK_DONTCHECKHISTORY: nppGUI._checkHistoryFiles = isCheckedOrNot(IDC_CHECK_DONTCHECKHISTORY); //::SendMessage(_hParent, WM_COMMAND, IDM_SETTING_HISTORY_DONT_CHECK, 0); @@ -615,15 +655,6 @@ BOOL CALLBACK SettingsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPara nppGUI._rememberLastSession = isCheckedOrNot(wParam); return TRUE; - case IDM_SETTING_TAB_SIZE: - { - ::SendMessage(_hParent, WM_COMMAND, IDM_SETTING_TAB_SIZE, 0); - char nbStr[10]; - itoa(nppGUI._tabSize, nbStr, 10); - ::SetWindowText(::GetDlgItem(_hSelf, IDC_TABSIZEVAL_STATIC), nbStr); - return TRUE; - } - case IDM_SETTING_HISTORY_SIZE: { ::SendMessage(_hParent, WM_COMMAND, IDM_SETTING_HISTORY_SIZE, 0); diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.h b/PowerEditor/src/WinControls/Preference/preferenceDlg.h index c958510e..f51d4920 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.h +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.h @@ -34,11 +34,9 @@ class SettingsDlg : public StaticDialog public : SettingsDlg() {}; virtual void destroy() { - _tabSizeVal.destroy(); _nbHistoryVal.destroy(); }; private : - URLCtrl _tabSizeVal; URLCtrl _nbHistoryVal; bool isCheckedOrNot(int checkControlID) const { return (BST_CHECKED == ::SendMessage(::GetDlgItem(_hSelf, checkControlID), BM_GETCHECK, 0, 0)); @@ -59,10 +57,12 @@ class MarginsDlg : public StaticDialog public : MarginsDlg() {}; virtual void destroy() { + _tabSizeVal.destroy(); _verticalEdgeLineNbColVal.destroy(); }; private : + URLCtrl _tabSizeVal; URLCtrl _verticalEdgeLineNbColVal; BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); void changePanelTo(int index); diff --git a/PowerEditor/src/WinControls/Preference/preference_rc.h b/PowerEditor/src/WinControls/Preference/preference_rc.h index f48cae21..60ee55b3 100644 --- a/PowerEditor/src/WinControls/Preference/preference_rc.h +++ b/PowerEditor/src/WinControls/Preference/preference_rc.h @@ -65,6 +65,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #define IDC_RADIO_BGMODE (IDD_PREFERENCE_MARGEIN_BOX + 13) #define IDC_CHECK_CURRENTLINEHILITE (IDD_PREFERENCE_MARGEIN_BOX + 14) #define IDC_COMBO_SCINTILLAVIEWCHOIX (IDD_PREFERENCE_MARGEIN_BOX + 15) + + #define IDC_CARETSETTING_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 16) + #define IDC_WIDTH_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 17) + #define IDC_WIDTH_COMBO (IDD_PREFERENCE_MARGEIN_BOX + 18) + #define IDC_BLINKRATE_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 19) + #define IDC_CARETBLINKRATE_SLIDER (IDD_PREFERENCE_MARGEIN_BOX + 20) + #define IDC_CARETBLINKRATE_F_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 21) + #define IDC_CARETBLINKRATE_S_STATIC (IDD_PREFERENCE_MARGEIN_BOX + 22) #define IDD_PREFERENCE_SETTING_BOX 6300 //(IDD_PREFERENCE_BOX + 300) #define IDC_TABSETTING_GB_STATIC (IDD_PREFERENCE_SETTING_BOX + 1) diff --git a/PowerEditor/src/lastRecentFileList.cpp b/PowerEditor/src/lastRecentFileList.cpp index 78390328..dabee252 100644 --- a/PowerEditor/src/lastRecentFileList.cpp +++ b/PowerEditor/src/lastRecentFileList.cpp @@ -66,7 +66,7 @@ void LastRecentFileList::updateMenu() { menuString += " "; menuString += _lrfl.at(j)._name; ::InsertMenu(_hMenu, _posBase + j, MF_BYPOSITION, _lrfl.at(j)._id, menuString.c_str()); - i++; + //i++; } } diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 016f4f55..5a2fffb5 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -287,6 +287,9 @@ #define NPPM_INTERNAL_CLEARINDICATOR (NOTEPADPLUS_USER_INTERNAL + 15) #define NPPM_INTERNAL_SCINTILLAFINFERCOPY (NOTEPADPLUS_USER_INTERNAL + 16) #define NPPM_INTERNAL_SCINTILLAFINFERSELECTALL (NOTEPADPLUS_USER_INTERNAL + 17) + #define NPPM_INTERNAL_SETCARETWIDTH (NOTEPADPLUS_USER_INTERNAL + 18) + #define NPPM_INTERNAL_SETCARETBLINKRATE (NOTEPADPLUS_USER_INTERNAL + 19) + // See Notepad_plus_msgs.h //#define NOTEPADPLUS_USER (WM_USER + 1000) #define SCINTILLA_USER (WM_USER + 2000) diff --git a/PowerEditor/visual.net/notepadPlus.vcproj b/PowerEditor/visual.net/notepadPlus.vcproj index 0f49263e..26b066ab 100644 --- a/PowerEditor/visual.net/notepadPlus.vcproj +++ b/PowerEditor/visual.net/notepadPlus.vcproj @@ -285,6 +285,10 @@ RelativePath="..\src\WinControls\ImageListSet\ImageListSet.cpp" > + + @@ -598,10 +602,6 @@ RelativePath="..\src\MISC\RegExt\regExtDlgRc.h" > - - @@ -610,6 +610,10 @@ RelativePath="..\src\resource.h" > + +