tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix menu items' state is not maintained due to save macro command 

Fixes #4112, fixes #4114, closes #4115
This commit is contained in:
SinghRajenM 2018-01-23 19:54:28 +05:30 committed by Don HO
parent 2a15c216a8
commit 926a5f5300
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/Notepad_plus.cpp
View File

@ -1970,7 +1970,7 @@ void Notepad_plus::checkMacroState()
enableCommand(IDM_MACRO_STARTRECORDINGMACRO, !_recordingMacro, MENU | TOOLBAR); enableCommand(IDM_MACRO_STARTRECORDINGMACRO, !_recordingMacro, MENU | TOOLBAR);
enableCommand(IDM_MACRO_STOPRECORDINGMACRO, _recordingMacro, MENU | TOOLBAR); enableCommand(IDM_MACRO_STOPRECORDINGMACRO, _recordingMacro, MENU | TOOLBAR);
enableCommand(IDM_MACRO_PLAYBACKRECORDEDMACRO, !_macro.empty() && !_recordingMacro, MENU | TOOLBAR); enableCommand(IDM_MACRO_PLAYBACKRECORDEDMACRO, !_macro.empty() && !_recordingMacro, MENU | TOOLBAR);
enableCommand(IDM_MACRO_SAVECURRENTMACRO, !_macro.empty() && !_recordingMacro, MENU | TOOLBAR); enableCommand(IDM_MACRO_SAVECURRENTMACRO, !_macro.empty() && !_recordingMacro && !_recordingSaved, MENU | TOOLBAR);
enableCommand(IDM_MACRO_RUNMULTIMACRODLG, (!_macro.empty() && !_recordingMacro) || !((NppParameters::getInstance())->getMacroList()).empty(), MENU | TOOLBAR); enableCommand(IDM_MACRO_RUNMULTIMACRODLG, (!_macro.empty() && !_recordingMacro) || !((NppParameters::getInstance())->getMacroList()).empty(), MENU | TOOLBAR);
} }

1
PowerEditor/src/Notepad_plus.h
View File

@ -309,6 +309,7 @@ private:
Macro _macro; Macro _macro;
bool _recordingMacro = false; bool _recordingMacro = false;
bool _playingBackMacro = false; bool _playingBackMacro = false;
bool _recordingSaved = false;
RunMacroDlg _runMacroDlg; RunMacroDlg _runMacroDlg;
// For conflict detection when saving Macros or RunCommands // For conflict detection when saving Macros or RunCommands

5
PowerEditor/src/NppCommands.cpp
View File

@ -897,6 +897,7 @@ void Notepad_plus::command(int id)
_subEditView.execute(SCI_STARTRECORD); _subEditView.execute(SCI_STARTRECORD);
_recordingMacro = true; _recordingMacro = true;
} }
_recordingSaved = false;
checkMacroState(); checkMacroState();
break; break;
} }
@ -928,7 +929,11 @@ void Notepad_plus::command(int id)
case IDM_MACRO_SAVECURRENTMACRO : case IDM_MACRO_SAVECURRENTMACRO :
{ {
if (addCurrentMacro()) if (addCurrentMacro())
{
_recordingSaved = true;
_runMacroDlg.initMacroList(); _runMacroDlg.initMacroList();
checkMacroState();
}
break; break;
} }
case IDM_EDIT_FULLPATHTOCLIP : case IDM_EDIT_FULLPATHTOCLIP :

3
PowerEditor/src/WinControls/shortcut/shortcut.cpp
View File

@ -613,8 +613,9 @@ void Accelerator::updateMenuItemByCommand(CommandShortcut csc)
int cmdID = csc.getID(); int cmdID = csc.getID();
// Ensure that the menu item checks set prior to this update remain in affect. // Ensure that the menu item checks set prior to this update remain in affect.
// Ensure that the menu item state is also maintained
UINT cmdFlags = GetMenuState(_hAccelMenu, cmdID, MF_BYCOMMAND ); UINT cmdFlags = GetMenuState(_hAccelMenu, cmdID, MF_BYCOMMAND );
cmdFlags = MF_BYCOMMAND | ((cmdFlags&MF_CHECKED) ? MF_CHECKED : MF_UNCHECKED); cmdFlags = MF_BYCOMMAND | ((cmdFlags&MF_CHECKED) ? MF_CHECKED : MF_UNCHECKED) | ((cmdFlags&MF_DISABLED) ? MF_DISABLED : MF_ENABLED);
::ModifyMenu(_hAccelMenu, cmdID, cmdFlags, cmdID, csc.toMenuItemString().c_str()); ::ModifyMenu(_hAccelMenu, cmdID, cmdFlags, cmdID, csc.toMenuItemString().c_str());
} }