#define IDR_POPUP_NEW 117\r
#define IDR_POPUP_OPEN 118\r
#define IDR_POPUP_COMPARE 119\r
+#define IDR_POPUP_SAVE 120\r
#define IDD_ABOUTBOX 200\r
#define IDD_OPEN 202\r
#define IDD_SAVECLOSING 203\r
#define IDD_LOAD_SAVE_CODEPAGE 231\r
#define IDD_CONFIRM_COPY 236\r
#define IDD_PLUGINS_LIST 237\r
-#define IDD_PLUGINS_SELECTUNPACKER 238\r
+#define IDD_PLUGINS_SELECTPLUGIN 238\r
#define IDD_DIR_FILTER 240\r
#define IDD_ENCODINGERROR 241\r
#define IDD_SELECT_FILES_OR_FOLDERS 247\r
#define IDC_FILES_DIRS_GROUP2 1084\r
#define IDC_FILES_DIRS_GROUP3 1085\r
#define IDC_FILES_DIRS_GROUP4 1086\r
-#define IDC_UNPACKER_NAME 1089\r
-#define IDC_UNPACKER_ALLOW_ALL 1090\r
-#define IDC_UNPACKER_SUPPORTED_EXTENSIONS 1091\r
-#define IDC_UNPACKER_DESCRIPTION 1092\r
-#define IDC_UNPACKER_EDIT 1093\r
-#define IDC_SELECT_UNPACKER 1094\r
-#define IDC_EXT_EDITOR_BROWSE 1095\r
-#define IDC_EXT_EDITOR_PATH 1096\r
-#define IDC_DIFF_SWAPFILES 1097\r
-#define IDC_DIFF_OPENTOEDITOR 1098\r
-#define IDC_FILES_DIRS_GROUP3X 1100\r
-#define IDC_FILES_DIRS_GROUP4X 1101\r
+#define IDC_PLUGIN_NAME 1087\r
+#define IDC_PLUGIN_ALLOW_ALL 1088\r
+#define IDC_PLUGIN_SUPPORTED_EXTENSIONS 1089\r
+#define IDC_PLUGIN_DESCRIPTION 1090\r
+#define IDC_PLUGIN_ARGUMENTS 1091\r
+#define IDC_PLUGIN_COMBO 1092\r
+#define IDC_PLUGIN_PIPELINE 1093\r
+#define IDC_PLUGIN_ADDPIPE 1094\r
+#define IDC_UNPACKER_COMBO 1095\r
+#define IDC_SELECT_UNPACKER 1096\r
+#define IDC_EXT_EDITOR_BROWSE 1097\r
+#define IDC_EXT_EDITOR_PATH 1098\r
+#define IDC_DIFF_SWAPFILES 1099\r
+#define IDC_DIFF_OPENTOEDITOR 1100\r
+#define IDC_FILES_DIRS_GROUP3X 1101\r
+#define IDC_FILES_DIRS_GROUP4X 1102\r
#define IDC_COMPARISON_STOP 1105\r
#define IDC_COMPARISON_PAUSE 1106\r
#define IDC_COMPARISON_CONTINUE 1107\r
#define IDC_DIR_ITEM_EQUAL_TEXT_COLOR 1363\r
#define IDC_USE_DIR_COMPARE_COLORS 1364\r
#define IDC_PLUGIN_FILEFILTERS 1365\r
-#define IDC_PLUGIN_FILEFILTERS_DEFAULTS 1366\r
-#define IDC_RENDERING_MODE 1367\r
+#define IDC_PLUGIN_DEFAULTS 1366\r
+#define IDC_PLUGIN_AUTOMATIC 1367\r
+#define IDC_RENDERING_MODE 1368\r
#define IDC_DIFF_IGNORECP 1377\r
#define IDC_RESET 1378\r
#define IDC_LEFT1 1379\r
#define IDC_EDIT_MARKER_NEW 8822\r
#define IDC_EDIT_MARKER_DELETE 8823\r
// COMMANDS\r
-#define ID_COMPMETHOD_FULL_CONTENTS 16432\r
-#define ID_COMPMETHOD_QUICK_CONTENTS 16433\r
-#define ID_COMPMETHOD_BINARY_CONTENTS 16434\r
-#define ID_COMPMETHOD_MODDATE 16435\r
-#define ID_COMPMETHOD_DATESIZE 16436\r
-#define ID_COMPMETHOD_SIZE 16437\r
+#define ID_DIFF_OPTIONS_WHITESPACE_COMPARE 16423\r
+#define ID_DIFF_OPTIONS_WHITESPACE_IGNORE 16424\r
+#define ID_DIFF_OPTIONS_WHITESPACE_IGNOREALL 16425\r
+#define ID_DIFF_OPTIONS_IGNORE_BLANKLINES 16426\r
+#define ID_DIFF_OPTIONS_IGNORE_CASE 16427\r
+#define ID_DIFF_OPTIONS_IGNORE_EOL 16428\r
+#define ID_DIFF_OPTIONS_IGNORE_CODEPAGE 16429\r
+#define ID_DIFF_OPTIONS_IGNORE_COMMENTS 16430\r
+#define ID_DIFF_OPTIONS_INCLUDE_SUBFOLDERS 16431\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_FULL_CONTENTS 16432\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_QUICK_CONTENTS 16433\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_BINARY_CONTENTS 16434\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_MODDATE 16435\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_DATESIZE 16436\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_SIZE 16437\r
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600\r
#define ID_DIR_COPY_LEFT_TO_MIDDLE 17601\r
#define ID_DIR_COPY_LEFT_TO_BROWSE 17602\r
#define ID_MERGE_COMPARE_TABLE 32871\r
#define ID_MERGE_COMPARE_HEX 32872\r
#define ID_MERGE_COMPARE_IMAGE 32873\r
-#define ID_MERGE_COMPARE_XML 32874\r
#define ID_MERGE_COMPARE_LEFT1_LEFT2 32875\r
#define ID_MERGE_COMPARE_RIGHT1_RIGHT2 32876\r
#define ID_MERGE_COMPARE_LEFT1_RIGHT2 32877\r
#define ID_MERGE_COMPARE_LEFT2_RIGHT1 32878\r
#define ID_UNPACK_MANUAL 32880\r
#define ID_UNPACK_AUTO 32881\r
-#define ID_POPUP_OPEN_WITH_UNPACKER 32882\r
+#define ID_OPEN_WITH_UNPACKER 32882\r
#define ID_NO_PREDIFFER 32883\r
#define ID_SUGGESTED_PLUGINS 32884\r
#define ID_NOT_SUGGESTED_PLUGINS 32885\r
#define ID_RELOAD_PLUGINS 32886\r
+#define ID_NO_UNPACKER 32887\r
+#define ID_APPLY_PREDIFFER 32888\r
#define ID_WINDOW_CHANGE_PANE 32896\r
#define ID_WINDOW_CLOSEALL 32897\r
+#define ID_SELECT_PREDIFFER 32898\r
+#define ID_SELECT_UNPACKER 32899\r
#define ID_HELP_CONTENTS 32912\r
#define ID_HELP_GETCONFIG 32913\r
#define ID_HELP_GNULICENSE 32914\r
-#define ID_PREDIFF_MANUAL 32929\r
-#define ID_PREDIFF_AUTO 32930\r
+#define ID_PREDIFFER_SETTINGS_NONE 32920\r
+#define ID_PREDIFFER_SETTINGS_AUTO 32921\r
+#define ID_PREDIFFER_SETTINGS_SELECT 32922\r
+#define ID_UNPACKER_SETTINGS_NONE 32923\r
+#define ID_UNPACKER_SETTINGS_AUTO 32924\r
+#define ID_UNPACKER_SETTINGS_SELECT 32925\r
#define ID_NO_EDIT_SCRIPTS 32931\r
#define ID_NO_SCT_SCRIPTS 32932\r
#define ID_FILE_OPEN_REGISTERED 32944\r
#define ID_FILE_OPEN_WITHEDITOR 32945\r
#define ID_FILE_OPEN_WITH 32946\r
+#define ID_FILE_OPEN_PARENT_FOLDER 32947\r
#define ID_STATUS_MERGINGMODE 32960\r
#define ID_STATUS_DIFFNUM 32961\r
#define ID_STATUS_RIGHTDIR_RO 32962\r
#define ID_DIR_SHELL_CONTEXT_MENU_LEFT 33002\r
#define ID_DIR_SHELL_CONTEXT_MENU_MIDDLE 33003\r
#define ID_DIR_SHELL_CONTEXT_MENU_RIGHT 33004\r
-#define ID_SCRIPT_FIRST 33012\r
-#define ID_SCRIPT_LAST 33059\r
-#define ID_PREDIFFERS_FIRST 33060\r
-#define ID_PREDIFFERS_LAST 33107\r
+#define ID_SCRIPT_FIRST 33010\r
+#define ID_SCRIPT_LAST 33039\r
+#define ID_PREDIFFERS_FIRST 33040\r
+#define ID_PREDIFFERS_LAST 33069\r
+#define ID_UNPACKERS_FIRST 33070\r
+#define ID_UNPACKERS_LAST 33110\r
#define ID_DISPLAY_MOVED_NONE 33111\r
#define ID_DISPLAY_MOVED_ALL 33112\r
#define ID_LOCBAR_GOTODIFF 33114\r
#define IDS_COLORSCHEME_SGML 33183\r
#define IDS_COLORSCHEME_SH 33184\r
#define IDS_COLORSCHEME_SIOD 33185\r
-#define IDS_COLORSCHEME_SQL 33186\r
-#define IDS_COLORSCHEME_TCL 33187\r
-#define IDS_COLORSCHEME_TEX 33188\r
-#define IDS_COLORSCHEME_VERILOG 33189\r
-#define IDS_COLORSCHEME_VHDL 33190\r
-#define IDS_COLORSCHEME_XML 33191\r
-#define ID_COLORSCHEME_LAST 33191 // = IDS_COLORSCHEME_XML\r
+#define IDS_COLORSCHEME_SMARTY 33186\r
+#define IDS_COLORSCHEME_SQL 33187\r
+#define IDS_COLORSCHEME_TCL 33188\r
+#define IDS_COLORSCHEME_TEX 33189\r
+#define IDS_COLORSCHEME_VERILOG 33190\r
+#define IDS_COLORSCHEME_VHDL 33191\r
+#define IDS_COLORSCHEME_XML 33192\r
+#define ID_COLORSCHEME_LAST 33192 // = IDS_COLORSCHEME_XML\r
#define ID_TOOLBAR_NONE 33194\r
#define ID_TOOLBAR_SMALL 33195\r
#define ID_TOOLBAR_BIG 33196\r
#define IDS_CONFLICT_THEIRS_FILE 40806\r
#define IDS_CONFLICT_MINE_FILE 40807\r
#define IDS_SELFCOMPARE_ORIGINAL_FILE 40808\r
+#define IDS_LINE_STATUS_INFO_SEL 40831\r
#define IDS_LINE_STATUS_INFO_EOL 40832\r
#define IDS_EMPTY_LINE_STATUS_INFO 40833\r
#define IDS_LINE_STATUS_INFO 40834\r
#define IDS_COLHDR_NIDIFFS 41814\r
#define IDS_COLHDR_NSDIFFS 41815\r
#define IDS_COLHDR_BINARY 41816\r
+#define IDS_COLHDR_UNPACKER 41817\r
+#define IDS_COLHDR_PREDIFFER 41818\r
#define IDS_CANT_COMPARE_FILES 41831\r
#define IDS_ABORTED_ITEM 41832\r
#define IDS_FILE_SKIPPED 41833\r
#define IDS_COLDESC_NIDIFFS 41944\r
#define IDS_COLDESC_NSDIFFS 41945\r
#define IDS_COLDESC_BINARY 41946\r
+#define IDS_COLDESC_UNPACKER 41947\r
+#define IDS_COLDESC_PREDIFFER 41948\r
#define IDS_DIRECTORY_REPORT_TITLE 41962\r
#define IDS_REPORT_COMMALIST 41963\r
#define IDS_REPORT_TABLIST 41964\r
#define IDS_MOVE_TO_PREVFILE 42112\r
#define IDS_MOVE_TO_NEXTPAGE 42113\r
#define IDS_MOVE_TO_PREVPAGE 42114\r
+#define IDS_MOVE_TO_FIRSTFILE 42115\r
+#define IDS_MOVE_TO_LASTFILE 42116\r
#define IDS_SUGGEST_IGNORECODEPAGE 42131\r
#define IDS_LOSSY_TRANSCODING_FIRST 42132\r
#define IDS_LOSSY_TRANSCODING_SECOND 42133\r
#define IDS_IGNSUB_STR5 44178\r
#define IDS_SINGLEINSTANCE_STR1 44179\r
#define IDS_SINGLEINSTANCE_STR2 44180\r
+#define IDS_PLUGIN_ALL 44200\r
+#define IDS_PLUGIN_PROCESS_TYPE1 44201\r
+#define IDS_PLUGIN_PROCESS_TYPE2 44202\r
+#define IDS_PLUGIN_PROCESS_TYPE3 44203\r
+#define IDS_PLUGIN_PROCESS_TYPE4 44204\r
+#define IDS_PLUGIN_PROCESS_TYPE5 44205\r
+#define IDS_PLUGIN_PROCESS_TYPE6 44206\r
+#define IDS_PLUGIN_PROCESS_TYPE7 44207\r
+#define IDS_PLUGIN_PROCESS_TYPE8 44208\r
+#define IDS_PLUGIN_PROCESS_TYPE9 44209\r
+#define IDS_PLUGIN_MENU_CAPTION1 44211\r
+#define IDS_PLUGIN_MENU_CAPTION2 44212\r
+#define IDS_PLUGIN_MENU_CAPTION3 44213\r
+#define IDS_PLUGIN_MENU_CAPTION4 44214\r
+#define IDS_PLUGIN_MENU_CAPTION5 44215\r
+#define IDS_PLUGIN_MENU_CAPTION6 44216\r
+#define IDS_PLUGIN_MENU_CAPTION7 44217\r
+#define IDS_PLUGIN_MENU_CAPTION8 44218\r
+#define IDS_PLUGIN_MENU_CAPTION9 44219\r
+#define IDS_PLUGIN_MENU_CAPTION10 44220\r
+#define IDS_PLUGIN_MENU_CAPTION11 44221\r
+#define IDS_PLUGIN_MENU_CAPTION12 44222\r
+#define IDS_PLUGIN_MENU_CAPTION13 44223\r
+#define IDS_PLUGIN_MENU_CAPTION14 44224\r
+#define IDS_PLUGIN_MENU_CAPTION15 44225\r
+#define IDS_PLUGIN_MENU_CAPTION16 44226\r
+#define IDS_PLUGIN_MENU_CAPTION17 44227\r
+#define IDS_PLUGIN_MENU_CAPTION18 44228\r
+#define IDS_PLUGIN_MENU_CAPTION19 44229\r
+#define IDS_PLUGIN_MENU_CAPTION20 44230\r
+#define IDS_PLUGIN_MENU_CAPTION21 44231\r
+#define IDS_PLUGIN_MENU_CAPTION22 44232\r
+#define IDS_PLUGIN_MENU_CAPTION23 44233\r
+#define IDS_PLUGIN_MENU_CAPTION24 44234\r
+#define IDS_PLUGIN_MENU_CAPTION25 44235\r
+#define IDS_PLUGIN_MENU_CAPTION26 44236\r
+#define IDS_PLUGIN_MENU_CAPTION27 44237\r
+#define IDS_PLUGIN_MENU_CAPTION28 44238\r
+#define IDS_PLUGIN_MENU_CAPTION29 44239\r
+#define IDS_PLUGIN_MENU_CAPTION30 44240\r
+#define IDS_PLUGIN_MISSING_PLUGIN_NAME 44241\r
+#define IDS_PLUGIN_MISSING_QUOTATION_MARK 44242\r
+#define IDS_PLUGIN_TITLE1 44243\r
\r
// Next default values for new objects\r
// \r
OSDN Git Service
