From 3b0f2ed6160dff251c31263eb855fcc371c89b58 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sat, 8 Jul 2017 23:41:55 +0900 Subject: [PATCH] Format resource file --- Src/Merge.rc | 25 ++++++++++++------------- Src/resource.h | 8 ++++---- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Src/Merge.rc b/Src/Merge.rc index fcb54c3f1..79fe61247 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -83,7 +83,7 @@ BEGIN POPUP "Op&en" BEGIN MENUITEM "with &Registered Application", ID_FILE_OPEN_REGISTERED - MENUITEM "with &External Editor\tCtrl+Alt+E", ID_FILE_OPEN_WITHEDITOR + MENUITEM "with &External Editor\tCtrl+Alt+E", ID_FILE_OPEN_WITHEDITOR MENUITEM "&with...", ID_FILE_OPEN_WITH END END @@ -464,13 +464,13 @@ BEGIN MENUITEM SEPARATOR POPUP "&Diff Context" BEGIN - MENUITEM "&All Lines", ID_VIEW_DIFFCONTEXT_ALL - MENUITEM "&0 Lines", ID_VIEW_DIFFCONTEXT_0 - MENUITEM "&1 Line", ID_VIEW_DIFFCONTEXT_1 - MENUITEM "&3 Lines", ID_VIEW_DIFFCONTEXT_3 - MENUITEM "&5 Lines", ID_VIEW_DIFFCONTEXT_5 - MENUITEM "&7 Lines", ID_VIEW_DIFFCONTEXT_7 - MENUITEM "&9 Lines", ID_VIEW_DIFFCONTEXT_9 + MENUITEM "&All Lines", ID_VIEW_DIFFCONTEXT_ALL + MENUITEM "&0 Lines", ID_VIEW_DIFFCONTEXT_0 + MENUITEM "&1 Line", ID_VIEW_DIFFCONTEXT_1 + MENUITEM "&3 Lines", ID_VIEW_DIFFCONTEXT_3 + MENUITEM "&5 Lines", ID_VIEW_DIFFCONTEXT_5 + MENUITEM "&7 Lines", ID_VIEW_DIFFCONTEXT_7 + MENUITEM "&9 Lines", ID_VIEW_DIFFCONTEXT_9 MENUITEM "&Toggle All and 0-9 Lines\tCtrl+D", ID_VIEW_DIFFCONTEXT_TOGGLE END MENUITEM SEPARATOR @@ -791,7 +791,7 @@ BEGIN "A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT "D", ID_VIEW_DIFFCONTEXT_TOGGLE, VIRTKEY, CONTROL, NOINVERT - "E", ID_FILE_OPEN_WITHEDITOR, VIRTKEY, ALT, CONTROL, NOINVERT + "E", ID_FILE_OPEN_WITHEDITOR, VIRTKEY, CONTROL, ALT, NOINVERT "C", ID_EDIT_COPY_LINENUMBERS, VIRTKEY, SHIFT, CONTROL, NOINVERT "F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT "G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT @@ -1682,16 +1682,15 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,36,222,10 CONTROL "&Include unique subfolders contents",IDC_COMPARE_WALKSUBDIRS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,202,10 - CONTROL "&Include Subfolders",IDC_RECURS_CHECK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,202,10 + CONTROL "&Include Subfolders",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,202,10 CONTROL "&Automatically expand all subfolders",IDC_EXPAND_SUBDIRS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,202,10 CONTROL "Ignore &Reparse Points",IDC_IGNORE_REPARSEPOINTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,84,202,10 LTEXT "&Quick compare limit (MB):",IDC_STATIC,7,96,200,10 - EDITTEXT IDC_COMPARE_QUICKC_LIMIT,7,108,30,14,ES_AUTOHSCROLL, + EDITTEXT IDC_COMPARE_QUICKC_LIMIT,7,108,30,14,ES_AUTOHSCROLL PUSHBUTTON "Defaults",IDC_COMPAREFOLDER_DEFAULTS,7,198,70,14 LTEXT "&Number of compare threads (a negative value implies addition of the number of available CPU cores):",IDC_STATIC,7,124,200,30 - EDITTEXT IDC_COMPARE_THREAD_COUNT,7,156,30,14,ES_AUTOHSCROLL, + EDITTEXT IDC_COMPARE_THREAD_COUNT,7,156,30,14,ES_AUTOHSCROLL END IDD_PROPPAGE_COMPARE_BINARY DIALOGEX 0, 0, 235, 205 diff --git a/Src/resource.h b/Src/resource.h index 37de78b81..912f14b59 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -1209,16 +1209,16 @@ #define IDC_COMPAREBINARY_CHARACTERSET 33391 #define IDC_COMPAREBINARY_DEFAULTS 33392 #define ID_HELP_CHECKFORUPDATES 33393 -#define IDS_UNPACK_AUTO 33394 -#define IDS_NO_PREDIFFER 33395 -#define IDS_SUGGESTED_PLUGINS 33396 -#define IDS_NOT_SUGGESTED_PLUGINS 33397 #define IDS_COMPMETHOD_FULL_CONTENTS 33398 #define IDS_COMPMETHOD_QUICK_CONTENTS 33399 #define IDS_COMPMETHOD_BINARY_CONTENTS 33400 #define IDS_COMPMETHOD_MODDATE 33401 #define IDS_COMPMETHOD_DATESIZE 33402 #define IDS_COMPMETHOD_SIZE 33403 +#define IDS_UNPACK_AUTO 33494 +#define IDS_NO_PREDIFFER 33495 +#define IDS_SUGGESTED_PLUGINS 33496 +#define IDS_NOT_SUGGESTED_PLUGINS 33497 #define IDS_PRIVATEBUILD_FMT 33501 #define IDS_CHECKFORUPDATES_UPTODATE 33502 #define IDS_CHECKFORUPDATES_NEWVERSION 33503 -- 2.11.0