CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_DM_STD

Browse Source
This commit is contained in:
Rainer Kottenhoff 2021-07-09 15:17:26 +02:00
commit 5fb35f546e
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Build/Changes.txt
View File

@ -33,13 +33,14 @@ UCD - (UCD)ARDET is an Encoding Detector Library
========================================================
Current BETA/RC Version 5.21.707.(build_#) (2021-07-07)
Current BETA/RC Version 5.21.709.(build_#) (2021-07-09)
========================================================
--------------------------------------------------------
NEW:
--------------------------------------------------------
[.###.#]- .
[.709.1]- Integrating style theme "Sombra" as factory default Dark-Mode theme.
[.525.1]- Add "Julia" lexer (new in Lexilla) (LEX).
[.506.1]- Base64 Encoding/Decoding.
[.428.1]- Custom ChooseColor resource definition.

3
Build/notepad3_setup.iss
View File

@ -81,7 +81,6 @@ Name: en; MessagesFile: compiler:Default.isl
[Messages]
;BeveledLabel ={#app_name} {#app_version} - Compiled with VC2015
SetupAppTitle =Setup - {#app_name}
SetupWindowTitle =Setup - {#app_name}
@ -136,7 +135,6 @@ Source: Notepad3.ini; DestDir: {us
Source: minipath.ini; DestDir: {userappdata}\Rizonesoft\Notepad3; Flags: onlyifdoesntexist uninsneveruninstall
Source: themes\Dark.ini; DestDir: {userappdata}\Rizonesoft\Notepad3\themes; Flags: onlyifdoesntexist uninsneveruninstall
Source: themes\Obsidian.ini; DestDir: {userappdata}\Rizonesoft\Notepad3\themes; Flags: onlyifdoesntexist uninsneveruninstall
Source: themes\Sombra.ini; DestDir: {userappdata}\Rizonesoft\Notepad3\themes; Flags: onlyifdoesntexist uninsneveruninstall
Source: {#bindir}\Release_x64_v142\lng\mplng.dll; DestDir: {app}\lng; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\np3lng.dll; DestDir: {app}\lng; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\af-ZA\mplng.dll.mui; DestDir: {app}\lng\af-ZA; Flags: ignoreversion; Check: Is64BitInstallMode()
@ -275,6 +273,7 @@ Type: files; Name: {userdesktop}\{#app_name}.lnk; Check: not WizardIsTask
Type: files; Name: {commondesktop}\{#app_name}.lnk; Check: not WizardIsTaskSelected('desktopicon\common') and IsUpgrade()
Type: files; Name: {userstartmenu}\{#app_name}.lnk; Check: not WizardIsTaskSelected('startup_icon') and IsUpgrade()
Type: files; Name: {#quick_launch}\{#app_name}.lnk; Check: not WizardIsTaskSelected('quicklaunchicon') and IsUpgrade(); OnlyBelowVersion: 6.01
Type: files; Name: {userappdata}\Rizonesoft\Notepad3\themes\Sombra.ini
Type: files; Name: {app}\Notepad3.ini
Type: files; Name: {app}\Readme.txt
Type: files; Name: {app}\minipath.ini

3
Build/notepad3_x86_setup.iss
View File

@ -73,7 +73,6 @@ Name: en; MessagesFile: compiler:Default.isl
[Messages]
;BeveledLabel ={#app_name} {#app_version} - Compiled with VC2015
SetupAppTitle =Setup - {#app_name}
SetupWindowTitle =Setup - {#app_name}
@ -124,7 +123,6 @@ Source: Notepad3.ini; DestDir: {us
Source: minipath.ini; DestDir: {userappdata}\Rizonesoft\Notepad3; Flags: onlyifdoesntexist uninsneveruninstall
Source: themes\Dark.ini; DestDir: {userappdata}\Rizonesoft\Notepad3\themes; Flags: onlyifdoesntexist uninsneveruninstall
Source: themes\Obsidian.ini; DestDir: {userappdata}\Rizonesoft\Notepad3\themes; Flags: onlyifdoesntexist uninsneveruninstall
Source: themes\Sombra.ini; DestDir: {userappdata}\Rizonesoft\Notepad3\themes; Flags: onlyifdoesntexist uninsneveruninstall
Source: {#bindir}\Release_x86_v142\lng\mplng.dll; DestDir: {app}\lng; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\np3lng.dll; DestDir: {app}\lng; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\af-ZA\mplng.dll.mui; DestDir: {app}\lng\af-ZA; Flags: ignoreversion
@ -211,6 +209,7 @@ Type: files; Name: {userdesktop}\{#app_name}.lnk; Check: not WizardIsTask
Type: files; Name: {commondesktop}\{#app_name}.lnk; Check: not WizardIsTaskSelected('desktopicon\common') and IsUpgrade()
Type: files; Name: {userstartmenu}\{#app_name}.lnk; Check: not WizardIsTaskSelected('startup_icon') and IsUpgrade()
Type: files; Name: {#quick_launch}\{#app_name}.lnk; Check: not WizardIsTaskSelected('quicklaunchicon') and IsUpgrade(); OnlyBelowVersion: 6.01
Type: files; Name: {userappdata}\Rizonesoft\Notepad3\themes\Sombra.ini
Type: files; Name: {app}\Notepad3.ini
Type: files; Name: {app}\Readme.txt
Type: files; Name: {app}\minipath.ini

2
Versions/day.txt
View File

@ -1 +1 @@
707
709

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Rizonesoft.Notepad3"
processorArchitecture="*"
version="5.21.707.1"
version="5.21.709.1"
type="win32"
/>
<description>Notepad3 beta</description>

2
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 21
#define VERSION_REV 707
#define VERSION_REV 709
#define VERSION_BUILD 1
#define SCINTILLA_VER 510
#define LEXILLA_VER 510