Changeset [379c6527a54c93ba2a6b15a805f02de9f25449e1] by Jocelyn Legault
Revision 379c6527a54c93ba2a6b15a805f02de9f25449e1,
committed by Jocelyn Legault
· October 8th, 2010 @ 05:51 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[NEW_FEATURE] Add 2 menu commands : "Modify Shortcut/Delete Macro" and "Modify Shortcut/Delete Command".
[NEW] Add "Modify" and "Delete" buttons on Shortcut mapper dialog. [BUG_FIXED] Fix Shortcut Mapper inconsistence issue after deleting a macro or an user command. [NEW] Add NPPM_GETCURRENTNATIVELANGENCODING message (to get the current native language enconding). [UPDATE] Update native languages files: english.xml, french.xml and chinese.xml . [BUG_FIXED] Remove characters count feature from the status bar due to its performance issue with UTF8 file.
Conflicts:
PowerEditor/src/NppBigSwitch.cpp
PowerEditor/src/NppCommands.cpp
PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp
PowerEditor/src/WinControls/Grid/ShortcutMapper.h
PowerEditor/src/menuCmdID.h
[#45]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/379c6527a54c93ba2a6b15a...
14 changed files
-
M
PowerEditor/installer/nativeLang/chinese.xml -
M
PowerEditor/installer/nativeLang/english.xml -
M
PowerEditor/installer/nativeLang/french.xml -
M
PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h -
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.h -
M
PowerEditor/src/NppBigSwitch.cpp -
M
PowerEditor/src/NppCommands.cpp -
M
PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp -
M
PowerEditor/src/WinControls/Grid/ShortcutMapper.h -
M
PowerEditor/src/WinControls/Grid/ShortcutMapper.rc -
M
PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp -
M
PowerEditor/src/menuCmdID.h -
M
PowerEditor/src/resource.h