Skip to content

Commit 5799a68

Browse files
EkopalypseEkopalypse
committed
MENUCOMMAND enum related cleanups and docu updates
1 parent 064bde8 commit 5799a68

File tree

3 files changed

+262
-56
lines changed

3 files changed

+262
-56
lines changed

‎PythonScript/src/NotepadPlusWrapper.h‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ enum MessageBoxFlags
122122

123123
enum MenuCommands
124124
{
125-
NPPIDM_FILE = IDM_FILE,
126125
NPPIDM_FILE_NEW = IDM_FILE_NEW,
127126
NPPIDM_FILE_OPEN = IDM_FILE_OPEN,
128127
NPPIDM_FILE_CLOSE = IDM_FILE_CLOSE,
@@ -149,9 +148,8 @@ enum MenuCommands
149148
NPPIDM_FILE_OPEN_DEFAULT_VIEWER = IDM_FILE_OPEN_DEFAULT_VIEWER,
150149
NPPIDM_FILE_CLOSEALL_UNCHANGED = IDM_FILE_CLOSEALL_UNCHANGED,
151150
NPPIDM_FILE_CONTAININGFOLDERASWORKSPACE = IDM_FILE_CONTAININGFOLDERASWORKSPACE,
152-
NPPIDM_FILEMENU_LASTONE = IDM_FILEMENU_LASTONE,
153151
NPPIDM_FILEMENU_EXISTCMDPOSITION = IDM_FILEMENU_EXISTCMDPOSITION,
154-
NPPIDM_EDIT = IDM_EDIT,
152+
155153
NPPIDM_EDIT_CUT = IDM_EDIT_CUT,
156154
NPPIDM_EDIT_COPY = IDM_EDIT_COPY,
157155
NPPIDM_EDIT_UNDO = IDM_EDIT_UNDO,
@@ -257,7 +255,7 @@ enum MenuCommands
257255
NPPIDM_EDIT_AUTOCOMPLETE_PATH = IDM_EDIT_AUTOCOMPLETE_PATH,
258256
NPPIDM_EDIT_FUNCCALLTIP_PREVIOUS = IDM_EDIT_FUNCCALLTIP_PREVIOUS,
259257
NPPIDM_EDIT_FUNCCALLTIP_NEXT = IDM_EDIT_FUNCCALLTIP_NEXT,
260-
NPPIDM_SEARCH = IDM_SEARCH,
258+
261259
NPPIDM_SEARCH_FIND = IDM_SEARCH_FIND,
262260
NPPIDM_SEARCH_FINDNEXT = IDM_SEARCH_FINDNEXT,
263261
NPPIDM_SEARCH_REPLACE = IDM_SEARCH_REPLACE,
@@ -324,12 +322,12 @@ enum MenuCommands
324322
NPPIDM_SEARCH_CHANGED_NEXT = IDM_SEARCH_CHANGED_NEXT,
325323
NPPIDM_SEARCH_CHANGED_PREV = IDM_SEARCH_CHANGED_PREV,
326324
NPPIDM_SEARCH_CLEAR_CHANGE_HISTORY = IDM_SEARCH_CLEAR_CHANGE_HISTORY,
327-
NPPIDM_MISC = IDM_MISC,
325+
328326
NPPIDM_DOCLIST_FILESCLOSE = IDM_DOCLIST_FILESCLOSE,
329327
NPPIDM_DOCLIST_FILESCLOSEOTHERS = IDM_DOCLIST_FILESCLOSEOTHERS,
330328
NPPIDM_DOCLIST_COPYNAMES = IDM_DOCLIST_COPYNAMES,
331329
NPPIDM_DOCLIST_COPYPATHS = IDM_DOCLIST_COPYPATHS,
332-
NPPIDM_VIEW = IDM_VIEW,
330+
333331
NPPIDM_VIEW_TOOLBAR_REDUCE = IDM_VIEW_TOOLBAR_REDUCE,
334332
NPPIDM_VIEW_TOOLBAR_ENLARGE = IDM_VIEW_TOOLBAR_ENLARGE,
335333
NPPIDM_VIEW_TOOLBAR_STANDARD = IDM_VIEW_TOOLBAR_STANDARD,
@@ -443,7 +441,7 @@ enum MenuCommands
443441
NPPIDM_VIEW_LOAD_IN_NEW_INSTANCE = IDM_VIEW_LOAD_IN_NEW_INSTANCE,
444442
NPPIDM_VIEW_GOTO_START = IDM_VIEW_GOTO_START,
445443
NPPIDM_VIEW_GOTO_END = IDM_VIEW_GOTO_END,
446-
NPPIDM_FORMAT = IDM_FORMAT,
444+
447445
NPPIDM_FORMAT_TODOS = IDM_FORMAT_TODOS,
448446
NPPIDM_FORMAT_TOUNIX = IDM_FORMAT_TOUNIX,
449447
NPPIDM_FORMAT_TOMAC = IDM_FORMAT_TOMAC,
@@ -504,8 +502,7 @@ enum MenuCommands
504502
NPPIDM_FORMAT_MAC_CYRILLIC = IDM_FORMAT_MAC_CYRILLIC,
505503
NPPIDM_FORMAT_KOI8U_CYRILLIC = IDM_FORMAT_KOI8U_CYRILLIC,
506504
NPPIDM_FORMAT_KOI8R_CYRILLIC = IDM_FORMAT_KOI8R_CYRILLIC,
507-
NPPIDM_FORMAT_ENCODE_END = IDM_FORMAT_ENCODE_END,
508-
NPPIDM_LANG = IDM_LANG,
505+
509506
NPPIDM_LANGSTYLE_CONFIG_DLG = IDM_LANGSTYLE_CONFIG_DLG,
510507
NPPIDM_LANG_C = IDM_LANG_C,
511508
NPPIDM_LANG_CPP = IDM_LANG_CPP,
@@ -604,6 +601,7 @@ enum MenuCommands
604601
NPPIDM_LANG_USER_DLG = IDM_LANG_USER_DLG,
605602
NPPIDM_LANG_OPENUDLDIR = IDM_LANG_OPENUDLDIR,
606603
NPPIDM_LANG_UDLCOLLECTION_PROJECT_SITE = IDM_LANG_UDLCOLLECTION_PROJECT_SITE,
604+
607605
NPPIDM_ABOUT = IDM_ABOUT,
608606
NPPIDM_HOMESWEETHOME = IDM_HOMESWEETHOME,
609607
NPPIDM_PROJECTPAGE = IDM_PROJECTPAGE,
@@ -614,7 +612,7 @@ enum MenuCommands
614612
NPPIDM_CONFUPDATERPROXY = IDM_CONFUPDATERPROXY,
615613
NPPIDM_CMDLINEARGUMENTS = IDM_CMDLINEARGUMENTS,
616614
NPPIDM_DEBUGINFO = IDM_DEBUGINFO,
617-
NPPIDM_SETTING = IDM_SETTING,
615+
618616
NPPIDM_SETTING_IMPORTPLUGIN = IDM_SETTING_IMPORTPLUGIN,
619617
NPPIDM_SETTING_IMPORTSTYLETHEMES = IDM_SETTING_IMPORTSTYLETHEMES,
620618
NPPIDM_SETTING_TRAYICON = IDM_SETTING_TRAYICON,
@@ -626,7 +624,7 @@ enum MenuCommands
626624
NPPIDM_SETTING_SHORTCUT_MAPPER_MACRO = IDM_SETTING_SHORTCUT_MAPPER_MACRO,
627625
NPPIDM_SETTING_SHORTCUT_MAPPER_RUN = IDM_SETTING_SHORTCUT_MAPPER_RUN,
628626
NPPIDM_SETTING_EDITCONTEXTMENU = IDM_SETTING_EDITCONTEXTMENU,
629-
NPPIDM_TOOL = IDM_TOOL,
627+
630628
NPPIDM_TOOL_MD5_GENERATE = IDM_TOOL_MD5_GENERATE,
631629
NPPIDM_TOOL_MD5_GENERATEFROMFILE = IDM_TOOL_MD5_GENERATEFROMFILE,
632630
NPPIDM_TOOL_MD5_GENERATEINTOCLIPBOARD = IDM_TOOL_MD5_GENERATEINTOCLIPBOARD,
@@ -639,13 +637,15 @@ enum MenuCommands
639637
NPPIDM_TOOL_SHA512_GENERATE = IDM_TOOL_SHA512_GENERATE,
640638
NPPIDM_TOOL_SHA512_GENERATEFROMFILE = IDM_TOOL_SHA512_GENERATEFROMFILE,
641639
NPPIDM_TOOL_SHA512_GENERATEINTOCLIPBOARD = IDM_TOOL_SHA512_GENERATEINTOCLIPBOARD,
640+
642641
NPPIDM_EXECUTE = IDM_EXECUTE,
643-
NPPIDM_SYSTRAYPOPUP = IDM_SYSTRAYPOPUP,
642+
644643
NPPIDM_SYSTRAYPOPUP_ACTIVATE = IDM_SYSTRAYPOPUP_ACTIVATE,
645644
NPPIDM_SYSTRAYPOPUP_NEWDOC = IDM_SYSTRAYPOPUP_NEWDOC,
646645
NPPIDM_SYSTRAYPOPUP_NEW_AND_PASTE = IDM_SYSTRAYPOPUP_NEW_AND_PASTE,
647646
NPPIDM_SYSTRAYPOPUP_OPENFILE = IDM_SYSTRAYPOPUP_OPENFILE,
648647
NPPIDM_SYSTRAYPOPUP_CLOSE = IDM_SYSTRAYPOPUP_CLOSE,
648+
649649
NPPIDM_WINDOW_WINDOWS = IDM_WINDOW_WINDOWS,
650650
NPPIDM_WINDOW_SORT_FN_ASC = IDM_WINDOW_SORT_FN_ASC,
651651
NPPIDM_WINDOW_SORT_FN_DSC = IDM_WINDOW_SORT_FN_DSC,
@@ -659,6 +659,7 @@ enum MenuCommands
659659
NPPIDM_WINDOW_MRU_LIMIT = IDM_WINDOW_MRU_LIMIT,
660660
NPPIDM_WINDOW_COPY_NAME = IDM_WINDOW_COPY_NAME,
661661
NPPIDM_WINDOW_COPY_PATH = IDM_WINDOW_COPY_PATH,
662+
662663
NPPIDM_DROPLIST_LIST = IDM_DROPLIST_LIST,
663664
NPPIDM_DROPLIST_MRU_FIRST = IDM_DROPLIST_MRU_FIRST
664665
};

‎PythonScript/src/NotepadPython.cpp‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ void export_notepad()
341341

342342

343343
boost::python::enum_<MenuCommands>("MENUCOMMAND")
344-
.value("FILE", NPPIDM_FILE)
345344
.value("FILE_NEW", NPPIDM_FILE_NEW)
346345
.value("FILE_OPEN", NPPIDM_FILE_OPEN)
347346
.value("FILE_CLOSE", NPPIDM_FILE_CLOSE)
@@ -368,9 +367,8 @@ void export_notepad()
368367
.value("FILE_OPEN_DEFAULT_VIEWER", NPPIDM_FILE_OPEN_DEFAULT_VIEWER)
369368
.value("FILE_CLOSEALL_UNCHANGED", NPPIDM_FILE_CLOSEALL_UNCHANGED)
370369
.value("FILE_CONTAININGFOLDERASWORKSPACE", NPPIDM_FILE_CONTAININGFOLDERASWORKSPACE)
371-
.value("FILEMENU_LASTONE", NPPIDM_FILEMENU_LASTONE)
372370
.value("FILEMENU_EXISTCMDPOSITION", NPPIDM_FILEMENU_EXISTCMDPOSITION)
373-
.value("EDIT", NPPIDM_EDIT)
371+
374372
.value("EDIT_CUT", NPPIDM_EDIT_CUT)
375373
.value("EDIT_COPY", NPPIDM_EDIT_COPY)
376374
.value("EDIT_UNDO", NPPIDM_EDIT_UNDO)
@@ -476,7 +474,7 @@ void export_notepad()
476474
.value("EDIT_AUTOCOMPLETE_PATH", NPPIDM_EDIT_AUTOCOMPLETE_PATH)
477475
.value("EDIT_FUNCCALLTIP_PREVIOUS", NPPIDM_EDIT_FUNCCALLTIP_PREVIOUS)
478476
.value("EDIT_FUNCCALLTIP_NEXT", NPPIDM_EDIT_FUNCCALLTIP_NEXT)
479-
.value("SEARCH", NPPIDM_SEARCH)
477+
480478
.value("SEARCH_FIND", NPPIDM_SEARCH_FIND)
481479
.value("SEARCH_FINDNEXT", NPPIDM_SEARCH_FINDNEXT)
482480
.value("SEARCH_REPLACE", NPPIDM_SEARCH_REPLACE)
@@ -543,12 +541,12 @@ void export_notepad()
543541
.value("SEARCH_CHANGED_NEXT", NPPIDM_SEARCH_CHANGED_NEXT)
544542
.value("SEARCH_CHANGED_PREV", NPPIDM_SEARCH_CHANGED_PREV)
545543
.value("SEARCH_CLEAR_CHANGE_HISTORY", NPPIDM_SEARCH_CLEAR_CHANGE_HISTORY)
546-
.value("MISC", NPPIDM_MISC)
544+
547545
.value("DOCLIST_FILESCLOSE", NPPIDM_DOCLIST_FILESCLOSE)
548546
.value("DOCLIST_FILESCLOSEOTHERS", NPPIDM_DOCLIST_FILESCLOSEOTHERS)
549547
.value("DOCLIST_COPYNAMES", NPPIDM_DOCLIST_COPYNAMES)
550548
.value("DOCLIST_COPYPATHS", NPPIDM_DOCLIST_COPYPATHS)
551-
.value("VIEW", NPPIDM_VIEW)
549+
552550
.value("VIEW_TOOLBAR_REDUCE", NPPIDM_VIEW_TOOLBAR_REDUCE)
553551
.value("VIEW_TOOLBAR_ENLARGE", NPPIDM_VIEW_TOOLBAR_ENLARGE)
554552
.value("VIEW_TOOLBAR_STANDARD", NPPIDM_VIEW_TOOLBAR_STANDARD)
@@ -662,7 +660,7 @@ void export_notepad()
662660
.value("VIEW_LOAD_IN_NEW_INSTANCE", NPPIDM_VIEW_LOAD_IN_NEW_INSTANCE)
663661
.value("VIEW_GOTO_START", NPPIDM_VIEW_GOTO_START)
664662
.value("VIEW_GOTO_END", NPPIDM_VIEW_GOTO_END)
665-
.value("FORMAT", NPPIDM_FORMAT)
663+
666664
.value("FORMAT_TODOS", NPPIDM_FORMAT_TODOS)
667665
.value("FORMAT_TOUNIX", NPPIDM_FORMAT_TOUNIX)
668666
.value("FORMAT_TOMAC", NPPIDM_FORMAT_TOMAC)
@@ -723,8 +721,7 @@ void export_notepad()
723721
.value("FORMAT_MAC_CYRILLIC", NPPIDM_FORMAT_MAC_CYRILLIC)
724722
.value("FORMAT_KOI8U_CYRILLIC", NPPIDM_FORMAT_KOI8U_CYRILLIC)
725723
.value("FORMAT_KOI8R_CYRILLIC", NPPIDM_FORMAT_KOI8R_CYRILLIC)
726-
.value("FORMAT_ENCODE_END", NPPIDM_FORMAT_ENCODE_END)
727-
.value("LANG", NPPIDM_LANG)
724+
728725
.value("LANGSTYLE_CONFIG_DLG", NPPIDM_LANGSTYLE_CONFIG_DLG)
729726
.value("LANG_C", NPPIDM_LANG_C)
730727
.value("LANG_CPP", NPPIDM_LANG_CPP)
@@ -823,6 +820,7 @@ void export_notepad()
823820
.value("LANG_USER_DLG", NPPIDM_LANG_USER_DLG)
824821
.value("LANG_OPENUDLDIR", NPPIDM_LANG_OPENUDLDIR)
825822
.value("LANG_UDLCOLLECTION_PROJECT_SITE", NPPIDM_LANG_UDLCOLLECTION_PROJECT_SITE)
823+
826824
.value("ABOUT", NPPIDM_ABOUT)
827825
.value("HOMESWEETHOME", NPPIDM_HOMESWEETHOME)
828826
.value("PROJECTPAGE", NPPIDM_PROJECTPAGE)
@@ -833,7 +831,7 @@ void export_notepad()
833831
.value("CONFUPDATERPROXY", NPPIDM_CONFUPDATERPROXY)
834832
.value("CMDLINEARGUMENTS", NPPIDM_CMDLINEARGUMENTS)
835833
.value("DEBUGINFO", NPPIDM_DEBUGINFO)
836-
.value("SETTING", NPPIDM_SETTING)
834+
837835
.value("SETTING_IMPORTPLUGIN", NPPIDM_SETTING_IMPORTPLUGIN)
838836
.value("SETTING_IMPORTSTYLETHEMES", NPPIDM_SETTING_IMPORTSTYLETHEMES)
839837
.value("SETTING_TRAYICON", NPPIDM_SETTING_TRAYICON)
@@ -845,7 +843,7 @@ void export_notepad()
845843
.value("SETTING_SHORTCUT_MAPPER_MACRO", NPPIDM_SETTING_SHORTCUT_MAPPER_MACRO)
846844
.value("SETTING_SHORTCUT_MAPPER_RUN", NPPIDM_SETTING_SHORTCUT_MAPPER_RUN)
847845
.value("SETTING_EDITCONTEXTMENU", NPPIDM_SETTING_EDITCONTEXTMENU)
848-
.value("TOOL", NPPIDM_TOOL)
846+
849847
.value("TOOL_MD5_GENERATE", NPPIDM_TOOL_MD5_GENERATE)
850848
.value("TOOL_MD5_GENERATEFROMFILE", NPPIDM_TOOL_MD5_GENERATEFROMFILE)
851849
.value("TOOL_MD5_GENERATEINTOCLIPBOARD", NPPIDM_TOOL_MD5_GENERATEINTOCLIPBOARD)
@@ -858,13 +856,15 @@ void export_notepad()
858856
.value("TOOL_SHA512_GENERATE", NPPIDM_TOOL_SHA512_GENERATE)
859857
.value("TOOL_SHA512_GENERATEFROMFILE", NPPIDM_TOOL_SHA512_GENERATEFROMFILE)
860858
.value("TOOL_SHA512_GENERATEINTOCLIPBOARD", NPPIDM_TOOL_SHA512_GENERATEINTOCLIPBOARD)
859+
861860
.value("EXECUTE", NPPIDM_EXECUTE)
862-
.value("SYSTRAYPOPUP", NPPIDM_SYSTRAYPOPUP)
861+
863862
.value("SYSTRAYPOPUP_ACTIVATE", NPPIDM_SYSTRAYPOPUP_ACTIVATE)
864863
.value("SYSTRAYPOPUP_NEWDOC", NPPIDM_SYSTRAYPOPUP_NEWDOC)
865864
.value("SYSTRAYPOPUP_NEW_AND_PASTE", NPPIDM_SYSTRAYPOPUP_NEW_AND_PASTE)
866865
.value("SYSTRAYPOPUP_OPENFILE", NPPIDM_SYSTRAYPOPUP_OPENFILE)
867866
.value("SYSTRAYPOPUP_CLOSE", NPPIDM_SYSTRAYPOPUP_CLOSE)
867+
868868
.value("WINDOW_WINDOWS", NPPIDM_WINDOW_WINDOWS)
869869
.value("WINDOW_SORT_FN_ASC", NPPIDM_WINDOW_SORT_FN_ASC)
870870
.value("WINDOW_SORT_FN_DSC", NPPIDM_WINDOW_SORT_FN_DSC)
@@ -878,6 +878,7 @@ void export_notepad()
878878
.value("WINDOW_MRU_LIMIT", NPPIDM_WINDOW_MRU_LIMIT)
879879
.value("WINDOW_COPY_NAME", NPPIDM_WINDOW_COPY_NAME)
880880
.value("WINDOW_COPY_PATH", NPPIDM_WINDOW_COPY_PATH)
881+
881882
.value("DROPLIST_LIST", NPPIDM_DROPLIST_LIST)
882883
.value("DROPLIST_MRU_FIRST", NPPIDM_DROPLIST_MRU_FIRST);
883884

0 commit comments

Comments
 (0)