From aa65cbd2f5fc379d3a3583cbd4e89fc85171b317 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Sat, 3 Nov 2018 00:09:07 +0100
Subject: [PATCH] + add: menu to clear saved default position

---
 Versions/build.txt               |   2 +-
 language/common_res.h            |   5 +++--
 language/np3_af_za/menu_af_za.rc | Bin 49740 -> 49912 bytes
 language/np3_be_by/menu_be_by.rc | Bin 47084 -> 47400 bytes
 language/np3_de_de/menu_de_de.rc | Bin 49692 -> 49864 bytes
 language/np3_en_gb/menu_en_gb.rc | Bin 49746 -> 49918 bytes
 language/np3_en_us/menu_en_us.rc | Bin 49738 -> 49910 bytes
 language/np3_fr_fr/menu_fr_fr.rc | Bin 52264 -> 52452 bytes
 language/np3_ja_jp/menu_ja_jp.rc | Bin 48326 -> 48538 bytes
 language/np3_nl_nl/menu_nl_nl.rc | Bin 51666 -> 51854 bytes
 language/np3_ru_ru/menu_ru_ru.rc | Bin 47062 -> 47378 bytes
 language/np3_zh_cn/menu_zh_cn.rc | Bin 48172 -> 48338 bytes
 np3portableapp/_buildname.txt    |   2 +-
 res/Notepad3.exe.manifest.conf   |   2 +-
 src/Notepad3.c                   |   5 +++++
 src/VersionEx.h                  |   4 ++--
 16 files changed, 13 insertions(+), 7 deletions(-)

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 c5c473a5791f0d92a410b31cb195f3379b258b27..985aa40356781f29914b34f89a2d78c0222fc6c4 100644
GIT binary patch
delta 66
zcmX@p!u+F^d4tx($rJQg_){4Y8HyMb7>a>(8AIx1{Zi4%3nu7HJ|M&)?9AZ9;L700
T5X2A+B*TDgm(6b{#2W$tsf-f;

delta 18
acmey-%6z7Ud4tx($+!9iHb0vvWC#FO^$55C

diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc
index 1198ca2539bd69a35a1fef205932e668f3711c38..0a095f2b1ad5c06f4ee876baa9f705b4b1c98075 100644
GIT binary patch
delta 173
zcmaF!o@vD=rVYzFCQot{+PtnKfN}DPHByu3IC4y8>+&;oX2@YkWk_TwVo+cx2GV6f
zUJ8)y0;JP`{8FHN36LMakPnp41hO+3@+S)}l$@-vMr?8cKO4v-VP^&(23H10h9HJu
zAQ=W^yG*{=6+AhsD`@hrt|^mu$SO^qAj|=_HLSa9a@Qmtuzrx(0|Ac74HLLFf9n3F
F4FGW#I9&h$

delta 39
xcmV+?0NDSi@&fGd0<fltv#^L*0h1z%R+Bo5Xp^Lil9OPJl9MQX60<Ii`YV#y6Egq+

diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index 4728c322543d7cc81c3072734e410bd2882a7574..c2b9a3edc827eddaa88a04327a26dc3b93ecd9ac 100644
GIT binary patch
delta 82
zcmbQ!!hE8Yd4tQO$!je6#M2p48HyPSfMg~^GD8NCE@CKQNS!QLCOY}VM5)O#QXIn0
h3_c9542}#z48cG$49Iqw%s54HvVyhDW|v7f^a0EL7G(ec

delta 14
WcmX@n$~>oqd4tQO%^xP+&<6lBb_X^9

diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc
index f76f1518eb02b18d56e3fd47b244e9c004d8ca40..dfde6a734d9ba6bd5d1fe3064dfe98126fa1166d 100644
GIT binary patch
delta 70
zcmccA!u+q5d4s`3QD=r6hE#?`h9U+9hGHOH2IQqoe%r4+dDSGD$qNj*1brA>85|jc
V7=nRh7?ABU*?yA!W}}G;h5+&y6deEn

delta 18
acmey@%6zGXd4s{k$q)JkHouuDWC#FQMF`da

diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc
index dce5064166e7c1e00b6ddca9f948824d4d79af7b..a93fe062089ff3be8769da60df8655fcbac46577 100644
GIT binary patch
delta 66
zcmX@r!u+k3d4tx($rJQg_){4Y8HyMb7>a>(8AIx1{Zi4%3nu7HJ|M&)?9AZ9;L700
T5X2A+B*TDgm(6b{#2NwssD={x

delta 18
acmey?%6zJYd4tx($+!9iHb0vvU<d$KuL!aL

diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index 4d4a8565846822b48f77fb09cb66c0aab6403a4c..565813080ea544708a4b275cbd1718bf66ca164d 100644
GIT binary patch
delta 82
zcmZ26gZar!<_)uEs5&#`Fr+dhG88c=FcbsnG9WJn$aVqJX+VA{P`+d`;|$@+PGUNf
c4;XR@`Y^aMI5Gq=1Ov%1Alqeg?2OaK0F68p`~Uy|

delta 26
icmaDdlX=Aq<_)uEOfHaOnOrbcV6xqGvCR!LQ;Y$j1Pf3A

diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index 1a9da242549471e6757e9352426506fcb156c668..f5ad58ce290905e910f884cb3e21a74e557e534e 100644
GIT binary patch
delta 162
zcmX^1lWEp(rVanPC;#c5F}Z=0WAX(jAWmkPyr8EK$Y%rcxh7lm`j|U2<S?W%Br+5+
zC@>TQ=`tWM1;};*(rG|`DNw!y$PZx12g+vx*_l9A-sFYJ`ohi(J`Ao5jtoHz!9X$$
s$aa~`+haSqrPm8;2gl@Vy^|*8^KCBb>tmg4V9zr-VY0|(nJKF@09(#8-v9sr

delta 62
zcmbRBo9Wn3rVanPC-qF5e8Guh@`YrU$*X$$fNZYG9=$%3z52Ys;*0twf#}T+{S#Ox
NH%yh;{9(!}4FK(>9=`wp

diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index 6eb14d834f250287f4d4d5724ee6c755df692cdc..ffb30cf3875ad001866fd8155c56515fa05625b7 100644
GIT binary patch
delta 94
zcmcaKnYnK&^M*UqOr05W7*ZJ$8HyMb7>a>(8IYF(WV-<AG$6keC|?5P2QcIV<uifo
kOosf)3tjXlD@^4Q^kHyiaAXK#2nLd2K(@=~`O}Pz0d}hv+W-In

delta 18
acmeC1%6w@u^M*UqCg)6**}P@?Eh7L|atUhy

diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc
index 9df1c273024b564d9101d8ca1af8a95ef442eb37..399aa92aea00daea12a6dad16722c660c1ee891e 100644
GIT binary patch
delta 169
zcmccio@vr2rVTSXCbu{WZC=n3z&LrEu+-!}M~=xqI{nO@8FCm>84?+a7!(+afpi&=
zmjYzF0O>R!zZ5860^|oU<OAh1f$U5mD{r!)oc3e^Cjnt+1|J4j21kY<hF~BW24uTT
ze&4M)IYB~ZQn%RTn69A7Yr3XPwvbbqJb{l5Y^_Ik*JP_HB9jHyh)v?+m^@(;&*o>{
GAG87VU^H9+

delta 39
xcmV+?0NDSM@&eZH0<f5fv!aMt0h1JpR+B7?Xp@$Ul9N)5l9Nc160;zU@+*dG64C$w

diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index 73838a5cbf3a43ac98bec6e15cc09bc6c365ed81..37036c9c2ad1b5f3cd5759f119405cec35d8908a 100644
GIT binary patch
delta 106
zcmZ4UgXz*wrVTfG%$*r>7*ZJ$8HyMb7>a>(8IYF(WV-<AG$6keC|?5P2QcIV<uifo
vOdu<7av-<(<O4z+!p;mn46Y203_%RRKr#%-cA31t*LL!TZm!Lbdc5=j<4PPM

delta 18
acmccglWENlrVTfGCU5BG+T79Wr4ImP`U#-`

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 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.18.1030.1334"
+    version="5.18.1103.1339"
     type="win32"
   />
   <description>Notepad3  RC_NewMenu</description>
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"