diff --git a/Versions/build.txt b/Versions/build.txt index 6f2c618b8..97dc46849 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1335 +1339 diff --git a/language/common_res.h b/language/common_res.h index f13b6b0c8..c0f062022 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -337,8 +337,9 @@ #define CMD_FULLSCRWINPOS 20050 #define CMD_DEFAULTWINPOS 20051 #define CMD_SAVEASDEFWINPOS 20052 -//#define CMD_LEFT 20053 -//#define CMD_RIGHT 20054 +#define CMD_CLEARSAVEDWINPOS 20053 +//#define CMD_LEFT 20054 +//#define CMD_RIGHT 20055 #define IDM_FILE_NEW 40000 #define IDM_FILE_OPEN 40001 diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index c5c473a57..985aa4035 100644 Binary files a/language/np3_af_za/menu_af_za.rc and b/language/np3_af_za/menu_af_za.rc differ diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index 1198ca253..0a095f2b1 100644 Binary files a/language/np3_be_by/menu_be_by.rc and b/language/np3_be_by/menu_be_by.rc differ diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 4728c3225..c2b9a3edc 100644 Binary files a/language/np3_de_de/menu_de_de.rc and b/language/np3_de_de/menu_de_de.rc differ diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index f76f1518e..dfde6a734 100644 Binary files a/language/np3_en_gb/menu_en_gb.rc and b/language/np3_en_gb/menu_en_gb.rc differ diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index dce506416..a93fe0620 100644 Binary files a/language/np3_en_us/menu_en_us.rc and b/language/np3_en_us/menu_en_us.rc differ diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index 4d4a85658..565813080 100644 Binary files a/language/np3_fr_fr/menu_fr_fr.rc and b/language/np3_fr_fr/menu_fr_fr.rc differ diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 1a9da2425..f5ad58ce2 100644 Binary files a/language/np3_ja_jp/menu_ja_jp.rc and b/language/np3_ja_jp/menu_ja_jp.rc differ diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index 6eb14d834..ffb30cf38 100644 Binary files a/language/np3_nl_nl/menu_nl_nl.rc and b/language/np3_nl_nl/menu_nl_nl.rc differ diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 9df1c2730..399aa92ae 100644 Binary files a/language/np3_ru_ru/menu_ru_ru.rc and b/language/np3_ru_ru/menu_ru_ru.rc differ diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 73838a5cb..37036c9c2 100644 Binary files a/language/np3_zh_cn/menu_zh_cn.rc and b/language/np3_zh_cn/menu_zh_cn.rc differ diff --git a/np3portableapp/_buildname.txt b/np3portableapp/_buildname.txt index 4c35976dc..7f444cc8a 100644 --- a/np3portableapp/_buildname.txt +++ b/np3portableapp/_buildname.txt @@ -1 +1 @@ -RC +RC_NewMenu diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index d97af7675..adf761697 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 RC_NewMenu diff --git a/src/Notepad3.c b/src/Notepad3.c index 40182dbe8..0e5ab1b2c 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -5560,6 +5560,11 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) } break; + case CMD_CLEARSAVEDWINPOS: + s_DefWinInfo = _InitDefaultWndPos(2); + IniSetString(L"Settings2", L"DefaultWindowPosition", NULL); + break; + case CMD_OPENINIFILE: if (StringCchLenW(Globals.IniFile,COUNTOF(Globals.IniFile))) { SaveSettings(false); diff --git a/src/VersionEx.h b/src/VersionEx.h index f4681f197..7836e2e70 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -6,8 +6,8 @@ #define APPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 18 -#define VERSION_REV 1030 -#define VERSION_BUILD 1334 +#define VERSION_REV 1103 +#define VERSION_BUILD 1339 #define SCINTILLA_VER 412 #define ONIGMO_REGEX_VER 6.1.3 #define VERSION_PATCH " RC_NewMenu"