From a11f8fa19e105a003536d668359cd6c871a1235e Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Wed, 8 Apr 2020 17:39:44 +0200 Subject: [PATCH 1/2] + upd: Maintenance of the acknowledgments list. --- Version_PAPPS.cmd | 6 ------ Versions/build.txt | 2 +- language/common_res.rc | 1 - language/np3_ko_kr/strings_ko_kr.rc | 2 +- language/np3_pt_br/strings_pt_br.rc | 2 +- language/np3_sk_sk/strings_sk_sk.rc | 2 +- language/np3_tr_tr/strings_tr_tr.rc | 2 +- minipath/language/mp_ko_kr/strings_ko_kr.rc | 2 +- minipath/language/mp_pt_br/strings_pt_br.rc | 2 +- minipath/language/mp_sk_sk/strings_sk_sk.rc | 2 +- minipath/language/mp_tr_tr/strings_tr_tr.rc | 2 +- np3portableapp/_buildname.txt | 2 +- res/Notepad3.exe.manifest.conf | 4 ++-- src/VersionEx.h | 4 ++-- 14 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 Version_PAPPS.cmd diff --git a/Version_PAPPS.cmd b/Version_PAPPS.cmd deleted file mode 100644 index 12986ccd5..000000000 --- a/Version_PAPPS.cmd +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -setlocal -set _VERPATCH_=Dev_Test_2 -echo "%_VERPATCH_%">.\np3portableapp\_buildname.txt -Version -VerPatch "%_VERPATCH_%" -endlocal diff --git a/Versions/build.txt b/Versions/build.txt index 00750edc0..b8626c4cf 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -3 +4 diff --git a/language/common_res.rc b/language/common_res.rc index d76a48502..858a234da 100644 --- a/language/common_res.rc +++ b/language/common_res.rc @@ -118,7 +118,6 @@ IDS_MUI_ABOUT_ACKNOWLEDGES "\ \\cf0 lhmouse\\tab https://github.com/lhmouse\\par\ \\cf0 ltGuillaume\\tab https://github.com/ltGuillaume\\par\ \\cf0 maboroshin\\tab https://github.com/maboroshin\\par\ -\\cf0 marciliocn\\tab https://github.com/marciliocn\\par\ \\cf0 RaffaeleBianc0\\tab https://github.com/RaffaeleBianc0\\par\ \\cf0 rizonesoft\\tab https://github.com/rizonesoft\\par\ \\cf0 ThreeLightsBeyond\\tab https://github.com/ThreeLightsBeyond\\par\ diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index e97eb99e4..26c5662d2 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -227,7 +227,7 @@ END STRINGTABLE BEGIN - IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 번역 testinsovr" + IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 번역 ghost" IDS_MUI_TITLE_FIXBASE " BASE (%s)" IDS_MUI_TITLE_RELCUR " +++ %s: %s - 스타일 +++" IDS_MUI_TITLE_FIXCUR " %s: %s - 스타일" diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index fc1e3ee4b..44d78beae 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -227,7 +227,7 @@ END STRINGTABLE BEGIN - IDS_MUI_TRANSL_AUTHOR "(pt-BR) Tradução em português brasileiro por marciliocn" + IDS_MUI_TRANSL_AUTHOR "(pt-BR) Tradução em português brasileiro por ghost" IDS_MUI_TITLE_FIXBASE " BASE (%s)" IDS_MUI_TITLE_RELCUR " +++ %s: %s Style +++" IDS_MUI_TITLE_FIXCUR " %s: %s Style" diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc index f91f50539..14196f18d 100644 --- a/language/np3_sk_sk/strings_sk_sk.rc +++ b/language/np3_sk_sk/strings_sk_sk.rc @@ -227,7 +227,7 @@ END STRINGTABLE BEGIN - IDS_MUI_TRANSL_AUTHOR "(sk-SK) Slovenský preklad od Dylino" + IDS_MUI_TRANSL_AUTHOR "(sk-SK) Slovenský preklad od ghost" IDS_MUI_TITLE_FIXBASE " BASE (%s)" IDS_MUI_TITLE_RELCUR " +++ %s: %s Style +++" IDS_MUI_TITLE_FIXCUR " %s: %s Style" diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc index cafd6b72a..85aad205f 100644 --- a/language/np3_tr_tr/strings_tr_tr.rc +++ b/language/np3_tr_tr/strings_tr_tr.rc @@ -227,7 +227,7 @@ END STRINGTABLE BEGIN - IDS_MUI_TRANSL_AUTHOR "(tr-TR) okans tarafından Türkçe çeviri" + IDS_MUI_TRANSL_AUTHOR "(tr-TR) ghost tarafından Türkçe çeviri" IDS_MUI_TITLE_FIXBASE " BASE (%s)" IDS_MUI_TITLE_RELCUR " +++ %s: %s Style +++" IDS_MUI_TITLE_FIXCUR " %s: %s Style" diff --git a/minipath/language/mp_ko_kr/strings_ko_kr.rc b/minipath/language/mp_ko_kr/strings_ko_kr.rc index a6b17fac0..a3155e260 100644 --- a/minipath/language/mp_ko_kr/strings_ko_kr.rc +++ b/minipath/language/mp_ko_kr/strings_ko_kr.rc @@ -132,7 +132,7 @@ BEGIN IDS_COPYMOVE "지정 프로그램 디렉토리 선택." IDS_CREATELINK "새로 만들 링크의 디렉토리를 선택하세요." IDS_SAVESETTINGS "설정 저장\n현재의 프로그램 설정이 저장 되었습니다." - IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 번역 testinsovr" + IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 번역 ghost" END diff --git a/minipath/language/mp_pt_br/strings_pt_br.rc b/minipath/language/mp_pt_br/strings_pt_br.rc index 9fb436dc5..569d8c620 100644 --- a/minipath/language/mp_pt_br/strings_pt_br.rc +++ b/minipath/language/mp_pt_br/strings_pt_br.rc @@ -132,7 +132,7 @@ BEGIN IDS_COPYMOVE "Select a destination directory." IDS_CREATELINK "Select a destination directory for the new link." IDS_SAVESETTINGS "Save Settings\nThe current program settings have been saved." - IDS_MUI_TRANSL_AUTHOR "(pt-BR) Tradução em português brasileiro por marciliocn" + IDS_MUI_TRANSL_AUTHOR "(pt-BR) Tradução em português brasileiro por ghost" END diff --git a/minipath/language/mp_sk_sk/strings_sk_sk.rc b/minipath/language/mp_sk_sk/strings_sk_sk.rc index b9857deb3..d88d8f968 100644 --- a/minipath/language/mp_sk_sk/strings_sk_sk.rc +++ b/minipath/language/mp_sk_sk/strings_sk_sk.rc @@ -132,7 +132,7 @@ BEGIN IDS_COPYMOVE "Select a destination directory." IDS_CREATELINK "Select a destination directory for the new link." IDS_SAVESETTINGS "Save Settings\nThe current program settings have been saved." - IDS_MUI_TRANSL_AUTHOR "Slovenský preklad od Dylino" + IDS_MUI_TRANSL_AUTHOR "Slovenský preklad od ghost" END diff --git a/minipath/language/mp_tr_tr/strings_tr_tr.rc b/minipath/language/mp_tr_tr/strings_tr_tr.rc index 7c0a2531c..723a6fcb1 100644 --- a/minipath/language/mp_tr_tr/strings_tr_tr.rc +++ b/minipath/language/mp_tr_tr/strings_tr_tr.rc @@ -132,7 +132,7 @@ BEGIN IDS_COPYMOVE "Select a destination directory." IDS_CREATELINK "Select a destination directory for the new link." IDS_SAVESETTINGS "Save Settings\nThe current program settings have been saved." - IDS_MUI_TRANSL_AUTHOR "(tr-TR) okans tarafından Türkçe çeviri" + IDS_MUI_TRANSL_AUTHOR "(tr-TR) ghost tarafından Türkçe çeviri" END diff --git a/np3portableapp/_buildname.txt b/np3portableapp/_buildname.txt index 847557314..dffc957ee 100644 --- a/np3portableapp/_buildname.txt +++ b/np3portableapp/_buildname.txt @@ -1 +1 @@ -"RC3" +BETA diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index ede1b6b68..4c16dda2a 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,8 +3,8 @@ - Notepad3 RC3 + Notepad3 BETA diff --git a/src/VersionEx.h b/src/VersionEx.h index 06a24177f..ed98be460 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,11 +9,11 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 408 -#define VERSION_BUILD 1 +#define VERSION_BUILD 4 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 -#define VERSION_PATCH RC3 +#define VERSION_PATCH BETA #define VERSION_COMMIT_ID dkt1-amr From 8d98e589dc71b2406422de6d5f9fb5237f9f13c6 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Fri, 10 Apr 2020 10:05:29 +0200 Subject: [PATCH 2/2] + chg: change default settings for word/long-line wrapping --- Versions/build.txt | 2 +- Versions/day.txt | 2 +- np3portableapp/_buildname.txt | 2 +- res/Notepad3.exe.manifest.conf | 4 ++-- src/Config/Config.cpp | 4 ++-- src/VersionEx.h | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Versions/build.txt b/Versions/build.txt index b8626c4cf..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -4 +1 diff --git a/Versions/day.txt b/Versions/day.txt index 92c732d00..17e344e7c 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -408 +410 diff --git a/np3portableapp/_buildname.txt b/np3portableapp/_buildname.txt index dffc957ee..847557314 100644 --- a/np3portableapp/_buildname.txt +++ b/np3portableapp/_buildname.txt @@ -1 +1 @@ -BETA +"RC3" diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 4c16dda2a..a7cba0c0d 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,8 +3,8 @@ - Notepad3 BETA + Notepad3 RC3 diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp index c649bb5e8..5b858cd28 100644 --- a/src/Config/Config.cpp +++ b/src/Config/Config.cpp @@ -1258,7 +1258,7 @@ void LoadSettings() GET_INT_VALUE_FROM_INISECTION(PathNameFormat, 1, 0, 2); GET_INT_VALUE_FROM_INISECTION(WordWrapMode, 0, 0, 1); - GET_INT_VALUE_FROM_INISECTION(WordWrapIndent, 2, 0, 6); + GET_INT_VALUE_FROM_INISECTION(WordWrapIndent, 0, 0, 6); GET_BOOL_VALUE_FROM_INISECTION(WordWrap, false); Globals.fvBackup.bWordWrap = Settings.WordWrap; GET_BOOL_VALUE_FROM_INISECTION(TabsAsSpaces, false); Globals.fvBackup.bTabsAsSpaces = Settings.TabsAsSpaces; @@ -1272,7 +1272,7 @@ void LoadSettings() int const iWS = IniSectionGetInt(IniSecSettings, L"WordWrapSymbols", Defaults.WordWrapSymbols); Settings.WordWrapSymbols = clampi(iWS % 10, 0, 2) + clampi((iWS % 100 - iWS % 10) / 10, 0, 2) * 10; - GET_BOOL_VALUE_FROM_INISECTION(ShowWordWrapSymbols, true); + GET_BOOL_VALUE_FROM_INISECTION(ShowWordWrapSymbols, false); GET_BOOL_VALUE_FROM_INISECTION(MatchBraces, true); GET_BOOL_VALUE_FROM_INISECTION(AutoCloseTags, false); GET_INT_VALUE_FROM_INISECTION(HighlightCurrentLine, 1, 0, 2); diff --git a/src/VersionEx.h b/src/VersionEx.h index ed98be460..f09d7a6f7 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,12 +8,12 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 408 -#define VERSION_BUILD 4 +#define VERSION_REV 410 +#define VERSION_BUILD 1 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 -#define VERSION_PATCH BETA -#define VERSION_COMMIT_ID dkt1-amr +#define VERSION_PATCH RC3 +#define VERSION_COMMIT_ID nebukadn