diff --git a/Build/Changes.txt b/Build/Changes.txt index 30c1aee61..b45e8f6ce 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -32,13 +32,14 @@ GRE - (GRE)pWinNP3 Search in Files Tool ===================================================== -Current BETA Version 5.20.528.(build_#) (2020-05-28) +Current BETA Version 5.20.601.(build_#) (2020-06-01) ===================================================== ----------------------------------------------------- NEW: ----------------------------------------------------- - +- Add Install/Remove "Open with Notepad3" to Notepad3 Install version. - Add another Dark Theme "Sombra". - Strip first char: allow multi-selection. - Open default browser while clicking hyperlink tooltip. @@ -126,10 +127,11 @@ TRANSLATIONS (MUI): ----------------------------------------------------- - - Chinese Traditional (zh-TW) in progress... +- Hindi (hi-IN) in progress... - Indonesian (id-ID) in progress... - Portuguese Brazilian (pt-BR) in progress... - Vietnamese (vi-VN) in progress... -- Korean (ko-KR) to resume... +- Korean (ko-KR)in progress... - Turkish (tr-TR) in progress... - Portuguese (pt-PT). - Slovak (sk-SK). diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss index 1825754cd..f16091f92 100644 --- a/Build/notepad3_setup.iss +++ b/Build/notepad3_setup.iss @@ -34,6 +34,7 @@ #define app_copyright "(c) Rizonesoft 2008-2020" #define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch" + [Setup] AppId={#app_name} AppName={#app_name} @@ -74,7 +75,6 @@ CloseApplications=true SetupMutex='{#app_name}' + '_setup_mutex' - [Languages] Name: en; MessagesFile: compiler:Default.isl @@ -98,13 +98,12 @@ en.tsk_AllUsers =For all users en.tsk_CurrentUser =For the current user only en.tsk_Other =Other tasks: en.tsk_ResetSettings =Reset {#app_name}'s settings -en.tsk_RemoveDefault =Restore Windows notepad -en.tsk_SetDefault =Replace Windows notepad with {#app_name} +en.tsk_RemoveDefault =Restore Windows Notepad +en.tsk_SetDefault =Replace Windows Notepad with {#app_name} en.tsk_StartMenuIcon =Create a Start Menu shortcut en.tsk_LaunchWelcomePage =Important Release Information! - -en.tsk_RemoveOpenWith =Remove Open With {#app_name} -en.tsk_SetOpenWith =Install Open With {#app_name} +en.tsk_RemoveOpenWith =Remove "Open with {#app_name}" to Context Menu +en.tsk_SetOpenWith =Install "Open with {#app_name}" to Context Menu [Tasks] @@ -116,7 +115,6 @@ Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescript Name: reset_settings; Description: {cm:tsk_ResetSettings}; GroupDescription: {cm:tsk_Other}; Flags: checkedonce unchecked; Check: SettingsExistCheck() Name: set_default; Description: {cm:tsk_SetDefault}; GroupDescription: {cm:tsk_Other}; Check: not DefaulNotepadCheck() Name: remove_default; Description: {cm:tsk_RemoveDefault}; GroupDescription: {cm:tsk_Other}; Flags: checkedonce unchecked; Check: DefaulNotepadCheck() - Name: set_openwith; Description: {cm:tsk_SetOpenWith}; GroupDescription: {cm:tsk_Other}; Check: not OpenWithCheck() Name: remove_openwith; Description: {cm:tsk_RemoveOpenWith}; GroupDescription: {cm:tsk_Other}; Flags: checkedonce unchecked; Check: OpenWithCheck() @@ -170,10 +168,10 @@ Source: {#bindir}\Release_x64_v142\lng\hu-HU\mplng.dll.mui; DestDir: {ap Source: {#bindir}\Release_x86_v142\lng\hu-HU\mplng.dll.mui; DestDir: {app}\lng\hu-HU; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\hu-HU\np3lng.dll.mui; DestDir: {app}\lng\hu-HU; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\hu-HU\np3lng.dll.mui; DestDir: {app}\lng\hu-HU; Flags: ignoreversion; Check: not Is64BitInstallMode() -Source: {#bindir}\Release_x64_v142\lng\id-ID\mplng.dll.mui; DestDir: {app}\lng\hu-HU; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v142\lng\id-ID\mplng.dll.mui; DestDir: {app}\lng\hu-HU; Flags: ignoreversion; Check: not Is64BitInstallMode() -Source: {#bindir}\Release_x64_v142\lng\id-ID\np3lng.dll.mui; DestDir: {app}\lng\hu-HU; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v142\lng\id-ID\np3lng.dll.mui; DestDir: {app}\lng\hu-HU; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\id-ID\mplng.dll.mui; DestDir: {app}\lng\id-ID; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: {#bindir}\Release_x86_v142\lng\id-ID\mplng.dll.mui; DestDir: {app}\lng\id-ID; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\id-ID\np3lng.dll.mui; DestDir: {app}\lng\id-ID; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: {#bindir}\Release_x86_v142\lng\id-ID\np3lng.dll.mui; DestDir: {app}\lng\id-ID; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\it-IT\mplng.dll.mui; DestDir: {app}\lng\it-IT; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\it-IT\mplng.dll.mui; DestDir: {app}\lng\it-IT; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\it-IT\np3lng.dll.mui; DestDir: {app}\lng\it-IT; Flags: ignoreversion; Check: Is64BitInstallMode() @@ -198,10 +196,10 @@ Source: {#bindir}\Release_x64_v142\lng\pt-BR\mplng.dll.mui; DestDir: {ap Source: {#bindir}\Release_x86_v142\lng\pt-BR\mplng.dll.mui; DestDir: {app}\lng\pt-BR; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\pt-BR\np3lng.dll.mui; DestDir: {app}\lng\pt-BR; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\pt-BR\np3lng.dll.mui; DestDir: {app}\lng\pt-BR; Flags: ignoreversion; Check: not Is64BitInstallMode() -Source: {#bindir}\Release_x64_v142\lng\pt-PT\mplng.dll.mui; DestDir: {app}\lng\pt-BR; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v142\lng\pt-PT\mplng.dll.mui; DestDir: {app}\lng\pt-BR; Flags: ignoreversion; Check: not Is64BitInstallMode() -Source: {#bindir}\Release_x64_v142\lng\pt-PT\np3lng.dll.mui; DestDir: {app}\lng\pt-BR; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v142\lng\pt-PT\np3lng.dll.mui; DestDir: {app}\lng\pt-BR; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\pt-PT\mplng.dll.mui; DestDir: {app}\lng\pt-PT; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: {#bindir}\Release_x86_v142\lng\pt-PT\mplng.dll.mui; DestDir: {app}\lng\pt-PT; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\pt-PT\np3lng.dll.mui; DestDir: {app}\lng\pt-PT; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: {#bindir}\Release_x86_v142\lng\pt-PT\np3lng.dll.mui; DestDir: {app}\lng\pt-PT; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\ru-RU\mplng.dll.mui; DestDir: {app}\lng\ru-RU; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\ru-RU\mplng.dll.mui; DestDir: {app}\lng\ru-RU; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\ru-RU\np3lng.dll.mui; DestDir: {app}\lng\ru-RU; Flags: ignoreversion; Check: Is64BitInstallMode() @@ -218,18 +216,18 @@ Source: {#bindir}\Release_x64_v142\lng\tr-TR\mplng.dll.mui; DestDir: {ap Source: {#bindir}\Release_x86_v142\lng\tr-TR\mplng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\tr-TR\np3lng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\tr-TR\np3lng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion; Check: not Is64BitInstallMode() -Source: {#bindir}\Release_x64_v142\lng\vi-VN\mplng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v142\lng\vi-VN\mplng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion; Check: not Is64BitInstallMode() -Source: {#bindir}\Release_x64_v142\lng\vi-VN\np3lng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v142\lng\vi-VN\np3lng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\vi-VN\mplng.dll.mui; DestDir: {app}\lng\vi-VN; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: {#bindir}\Release_x86_v142\lng\vi-VN\mplng.dll.mui; DestDir: {app}\lng\vi-VN; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\vi-VN\np3lng.dll.mui; DestDir: {app}\lng\vi-VN; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: {#bindir}\Release_x86_v142\lng\vi-VN\np3lng.dll.mui; DestDir: {app}\lng\vi-VN; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\zh-CN\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\zh-CN\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: not Is64BitInstallMode() -Source: {#bindir}\Release_x64_v142\lng\zh-TW\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v142\lng\zh-TW\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: not Is64BitInstallMode() -Source: {#bindir}\Release_x64_v142\lng\zh-TW\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v142\lng\zh-TW\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\zh-TW\mplng.dll.mui; DestDir: {app}\lng\zh-TW; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: {#bindir}\Release_x86_v142\lng\zh-TW\mplng.dll.mui; DestDir: {app}\lng\zh-TW; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\zh-TW\np3lng.dll.mui; DestDir: {app}\lng\zh-TW; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: {#bindir}\Release_x86_v142\lng\zh-TW\np3lng.dll.mui; DestDir: {app}\lng\zh-TW; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: Changes.txt; DestDir: {app}\Docs; Flags: ignoreversion Source: Docs\KeyboardShortcuts.txt; DestDir: {app}\Docs; Flags: ignoreversion Source: Docs\Oniguruma_RE.txt; DestDir: {app}\Docs; Flags: ignoreversion @@ -257,6 +255,7 @@ Source: Docs\uthash\utstring.txt; DestDir: {ap Name: "{userappdata}\Rizonesoft\Notepad3\Favorites" Name: "{userappdata}\Rizonesoft\Notepad3\themes" + [Icons] Name: {commondesktop}\{#app_name}; Filename: {app}\Notepad3.exe; Tasks: desktopicon\common; Comment: {#app_name} {#app_version}; WorkingDir: {app}; AppUserModelID: {#app_publisher}.{#app_name}; IconFilename: {app}\Notepad3.exe; IconIndex: 0 Name: {userdesktop}\{#app_name}; Filename: {app}\Notepad3.exe; Tasks: desktopicon\user; Comment: {#app_name} {#app_version}; WorkingDir: {app}; AppUserModelID: {#app_publisher}.{#app_name}; IconFilename: {app}\Notepad3.exe; IconIndex: 0 @@ -333,7 +332,7 @@ begin end; -// Check if Open With Notepad3 is installed. +// Check if "Open with Notepad3" is installed. function OpenWithCheck(): Boolean; var sOpenWith: String; @@ -509,7 +508,7 @@ begin RegWriteStringValue(HKCR, '*\shell\Open with Notepad3', 'Icon', ExpandConstant('{app}\Notepad3.exe,0')); RegWriteStringValue(HKCR, '*\shell\Open with Notepad3\command', '', ExpandConstant('"{app}\Notepad3.exe" "%1"')); if IsTaskSelected('remove_openwith') then begin - RegDeleteKeyIncludingSubkeys(HKCR, '*\shell\Open with Notepad3'); + RegDeleteKeyIncludingSubkeys(HKCR, '*\shell\Open with Notepad3'); end; // Always add Notepad3's AppUserModelID and the rest registry values AddReg(); diff --git a/Build/notepad3_x86_setup.iss b/Build/notepad3_x86_setup.iss index 38e82ad10..27aef58ae 100644 --- a/Build/notepad3_x86_setup.iss +++ b/Build/notepad3_x86_setup.iss @@ -26,6 +26,7 @@ #define app_copyright "(c) Rizonesoft 2008-2020" #define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch" + [Setup] AppId={#app_name} AppName={#app_name} @@ -66,7 +67,6 @@ CloseApplications=true SetupMutex='{#app_name}' + '_setup_mutex' - [Languages] Name: en; MessagesFile: compiler:Default.isl @@ -90,10 +90,12 @@ en.tsk_AllUsers =For all users en.tsk_CurrentUser =For the current user only en.tsk_Other =Other tasks: en.tsk_ResetSettings =Reset {#app_name}'s settings -en.tsk_RemoveDefault =Restore Windows notepad -en.tsk_SetDefault =Replace Windows notepad with {#app_name} +en.tsk_RemoveDefault =Restore Windows Notepad +en.tsk_SetDefault =Replace Windows Notepad with {#app_name} en.tsk_StartMenuIcon =Create a Start Menu shortcut en.tsk_LaunchWelcomePage =Important Release Information! +en.tsk_RemoveOpenWith =Remove "Open with {#app_name}" to Context Menu +en.tsk_SetOpenWith =Install "Open with {#app_name}" to Context Menu [Tasks] @@ -105,6 +107,8 @@ Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescript Name: reset_settings; Description: {cm:tsk_ResetSettings}; GroupDescription: {cm:tsk_Other}; Flags: checkedonce unchecked; Check: SettingsExistCheck() Name: set_default; Description: {cm:tsk_SetDefault}; GroupDescription: {cm:tsk_Other}; Check: not DefaulNotepadCheck() Name: remove_default; Description: {cm:tsk_RemoveDefault}; GroupDescription: {cm:tsk_Other}; Flags: checkedonce unchecked; Check: DefaulNotepadCheck() +Name: set_openwith; Description: {cm:tsk_SetOpenWith}; GroupDescription: {cm:tsk_Other}; Check: not OpenWithCheck() +Name: remove_openwith; Description: {cm:tsk_RemoveOpenWith}; GroupDescription: {cm:tsk_Other}; Flags: checkedonce unchecked; Check: OpenWithCheck() [Files] @@ -136,8 +140,8 @@ Source: {#bindir}\Release_x86_v142\lng\fr-FR\mplng.dll.mui; DestDir: {ap Source: {#bindir}\Release_x86_v142\lng\fr-FR\np3lng.dll.mui; DestDir: {app}\lng\fr-FR; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\hu-HU\mplng.dll.mui; DestDir: {app}\lng\hu-HU; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\hu-HU\np3lng.dll.mui; DestDir: {app}\lng\hu-HU; Flags: ignoreversion -Source: {#bindir}\Release_x86_v142\lng\id-ID\mplng.dll.mui; DestDir: {app}\lng\hu-HU; Flags: ignoreversion -Source: {#bindir}\Release_x86_v142\lng\id-ID\np3lng.dll.mui; DestDir: {app}\lng\hu-HU; Flags: ignoreversion +Source: {#bindir}\Release_x86_v142\lng\id-ID\mplng.dll.mui; DestDir: {app}\lng\id-ID; Flags: ignoreversion +Source: {#bindir}\Release_x86_v142\lng\id-ID\np3lng.dll.mui; DestDir: {app}\lng\id-ID; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\it-IT\mplng.dll.mui; DestDir: {app}\lng\it-IT; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\it-IT\np3lng.dll.mui; DestDir: {app}\lng\it-IT; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\ja-JP\mplng.dll.mui; DestDir: {app}\lng\ja-JP; Flags: ignoreversion @@ -150,8 +154,8 @@ Source: {#bindir}\Release_x86_v142\lng\pl-PL\mplng.dll.mui; DestDir: {ap Source: {#bindir}\Release_x86_v142\lng\pl-PL\np3lng.dll.mui; DestDir: {app}\lng\pl-PL; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\pt-BR\mplng.dll.mui; DestDir: {app}\lng\pt-BR; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\pt-BR\np3lng.dll.mui; DestDir: {app}\lng\pt-BR; Flags: ignoreversion -Source: {#bindir}\Release_x86_v142\lng\pt-PT\mplng.dll.mui; DestDir: {app}\lng\pt-BR; Flags: ignoreversion -Source: {#bindir}\Release_x86_v142\lng\pt-PT\np3lng.dll.mui; DestDir: {app}\lng\pt-BR; Flags: ignoreversion +Source: {#bindir}\Release_x86_v142\lng\pt-PT\mplng.dll.mui; DestDir: {app}\lng\pt-PT; Flags: ignoreversion +Source: {#bindir}\Release_x86_v142\lng\pt-PT\np3lng.dll.mui; DestDir: {app}\lng\pt-PT; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\ru-RU\mplng.dll.mui; DestDir: {app}\lng\ru-RU; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\ru-RU\np3lng.dll.mui; DestDir: {app}\lng\ru-RU; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\sk-SK\mplng.dll.mui; DestDir: {app}\lng\sk-SK; Flags: ignoreversion @@ -160,12 +164,12 @@ Source: {#bindir}\Release_x86_v142\lng\sv-SE\mplng.dll.mui; DestDir: {ap Source: {#bindir}\Release_x86_v142\lng\sv-SE\np3lng.dll.mui; DestDir: {app}\lng\sv-SE; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\tr-TR\mplng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\tr-TR\np3lng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion -Source: {#bindir}\Release_x86_v142\lng\vi-VN\mplng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion -Source: {#bindir}\Release_x86_v142\lng\vi-VN\np3lng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion +Source: {#bindir}\Release_x86_v142\lng\vi-VN\mplng.dll.mui; DestDir: {app}\lng\vi-VN; Flags: ignoreversion +Source: {#bindir}\Release_x86_v142\lng\vi-VN\np3lng.dll.mui; DestDir: {app}\lng\vi-VN; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\zh-CN\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion Source: {#bindir}\Release_x86_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion -Source: {#bindir}\Release_x86_v142\lng\zh-TW\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion -Source: {#bindir}\Release_x86_v142\lng\zh-TW\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion +Source: {#bindir}\Release_x86_v142\lng\zh-TW\mplng.dll.mui; DestDir: {app}\lng\zh-TW; Flags: ignoreversion +Source: {#bindir}\Release_x86_v142\lng\zh-TW\np3lng.dll.mui; DestDir: {app}\lng\zh-TW; Flags: ignoreversion Source: Changes.txt; DestDir: {app}\Docs; Flags: ignoreversion Source: Docs\KeyboardShortcuts.txt; DestDir: {app}\Docs; Flags: ignoreversion Source: Docs\Oniguruma_RE.txt; DestDir: {app}\Docs; Flags: ignoreversion @@ -193,6 +197,7 @@ Source: Docs\uthash\utstring.txt; DestDir: {ap Name: "{userappdata}\Rizonesoft\Notepad3\Favorites" Name: "{userappdata}\Rizonesoft\Notepad3\themes" + [Icons] Name: {commondesktop}\{#app_name}; Filename: {app}\Notepad3.exe; Tasks: desktopicon\common; Comment: {#app_name} {#app_version}; WorkingDir: {app}; AppUserModelID: {#app_publisher}.{#app_name}; IconFilename: {app}\Notepad3.exe; IconIndex: 0 Name: {userdesktop}\{#app_name}; Filename: {app}\Notepad3.exe; Tasks: desktopicon\user; Comment: {#app_name} {#app_version}; WorkingDir: {app}; AppUserModelID: {#app_publisher}.{#app_name}; IconFilename: {app}\Notepad3.exe; IconIndex: 0 @@ -208,7 +213,7 @@ Filename: {userappdata}\Rizonesoft\Notepad3\Notepad3.ini; Section: Settings; Key [Run] Filename: {app}\Notepad3.exe; Description: {cm:LaunchProgram,{#app_name}}; WorkingDir: {app}; Flags: nowait postinstall skipifsilent unchecked -Filename: https://rizone.tech/2Ho5UVQ; Description: {cm:tsk_LaunchWelcomePage}; Flags: nowait postinstall shellexec skipifsilent unchecked +Filename: https://www.rizonesoft.com/downloads/notepad3/update/; Description: {cm:tsk_LaunchWelcomePage}; Flags: nowait postinstall shellexec skipifsilent unchecked [InstallDelete] @@ -268,6 +273,24 @@ begin end; end; + +// Check if "Open with Notepad3" is installed. +function OpenWithCheck(): Boolean; +var + sOpenWith: String; +begin + if RegQueryStringValue(HKEY_CLASSES_ROOT, '*\shell\Open with Notepad3', 'Icon', sOpenWith) and + (sOpenWith = (ExpandConstant('{app}\Notepad3.exe,0'))) then begin + Log('Custom Code: {#app_name} Open with Notepad3 is set.'); + Result := True; + end + else begin + Log('Custom Code: {#app_name} Open with Notepad3 is not set.'); + Result := False; + end; +end; + + #if defined(sse_required) || defined(sse2_required) function IsProcessorFeaturePresent(Feature: Integer): Boolean; external 'IsProcessorFeaturePresent@kernel32.dll stdcall'; @@ -358,9 +381,6 @@ begin RegWriteStringValue(HKCR, 'Applications\notepad3.exe', 'AppUserModelID', 'Rizonesoft.Notepad3'); RegWriteStringValue(HKCR, 'Applications\notepad3.exe\shell\open\command', '', ExpandConstant('"{app}\Notepad3.exe" "%1"')); RegWriteStringValue(HKCR, '*\OpenWithList\notepad3.exe', '', ''); - - RegWriteStringValue(HKCR, '*\shell\Open with Notepad3', 'Icon', ExpandConstant('{app}\Notepad3.exe,0')); - RegWriteStringValue(HKCR, '*\shell\Open with Notepad3\command', '', ExpandConstant('"{app}\Notepad3.exe" "%1"')); end; @@ -377,7 +397,6 @@ procedure RemoveReg(); begin RegDeleteKeyIncludingSubkeys(HKCR, 'Applications\notepad3.exe'); RegDeleteKeyIncludingSubkeys(HKCR, '*\OpenWithList\notepad3.exe'); - RegDeleteKeyIncludingSubkeys(HKCR, '*\shell\Open with Notepad3'); end; @@ -418,21 +437,24 @@ begin // and the set_default task isn't selected if not IsTaskSelected('remove_default') then RegWriteStringValue(HKLM, IFEO, 'Debugger', ExpandConstant('"{app}\Notepad3.exe" /z')); - end; end; if CurStep = ssPostInstall then begin if IsTaskSelected('set_default') then RegWriteStringValue(HKLM, IFEO, 'Debugger', ExpandConstant('"{app}\Notepad3.exe" /z')); - if IsTaskSelected('remove_default') then begin + if IsTaskSelected('remove_default') then RegDeleteValue(HKLM, IFEO, 'Debugger'); RegDeleteKeyIfEmpty(HKLM, IFEO); + if IsTaskSelected('set_openwith') then + RegWriteStringValue(HKCR, '*\shell\Open with Notepad3', 'Icon', ExpandConstant('{app}\Notepad3.exe,0')); + RegWriteStringValue(HKCR, '*\shell\Open with Notepad3\command', '', ExpandConstant('"{app}\Notepad3.exe" "%1"')); + if IsTaskSelected('remove_openwith') then begin + RegDeleteKeyIncludingSubkeys(HKCR, '*\shell\Open with Notepad3'); end; // Always add Notepad3's AppUserModelID and the rest registry values AddReg(); end; - end; diff --git a/Versions/day.txt b/Versions/day.txt index 9dbddfafa..75a2e0d5b 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -528 +601 diff --git a/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang b/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang new file mode 100644 index 000000000..a2544d4dd --- /dev/null +++ b/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang @@ -0,0 +1,538 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +# +# encoding: UTF-8 +# Language: Hindi (India) resources +# Last-Translator: (hi-IN) हिंदी अनुवाद Purvottar द्वारा +# + +#, fuzzy +msgid "" +msgstr "" + +# msgid/msgstr fields for Accelerator keys +# Format is: "ID:xxxxxx:VACS+X" where: +# ID:xxxxx = the menu ID corresponding to the accelerator +# V = Virtual key (or blank if not used) - nearly always set! +# A = Alt key (or blank if not used) +# C = Ctrl key (or blank if not used) +# S = Shift key (or blank if not used) +# X = upper case character +# e.g. "V CS+Q" == Ctrl + Shift + 'Q' + +# ONLY Accelerator Keys with corresponding alphanumeric characters can be +# updated i.e. function keys (F2), special keys (Delete, Home) etc. will not. + +# ONLY change the msgstr field. Do NOT change any other. +# If you do not want to change an Accelerator Key, copy msgid to msgstr + +#. Resource IDs: (149) +#, c-format +msgid "%ld more matches" +msgstr "" + +#. Resource IDs: (160) +msgid "Path does not exist or is not accessible!" +msgstr "" + +#. Resource IDs: (1069) +msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string." +msgstr "" + +#. Resource IDs: (119) +msgid "&About grepWinNP3..." +msgstr "" + +#. Resource IDs: (1049) +msgid "&Replace" +msgstr "" + +#. Resource IDs: (123) +msgid "&Search" +msgstr "" + +#. Resource IDs: (1013) +msgid "..." +msgstr "" + +#. Resource IDs: (1061, 1063, 1064, 1066, 1067) +msgid "/" +msgstr "" + +#. Resource IDs: (1052, 135) +msgid "About grepWinNP3" +msgstr "" + +#. Resource IDs: (1021) +msgid "Add to Presets" +msgstr "" + +#. Resource IDs: (155) +msgid "All Files" +msgstr "" + +#. Resource IDs: (1078) +msgid "All dates" +msgstr "" + +#. Resource IDs: (1005) +msgid "All sizes" +msgstr "" + +#. Resource IDs: (124) +#, c-format +msgid "Are you sure you want to replace\n%s\nwith\n%s\nwithout creating backups?" +msgstr "" + +#. Resource IDs: (1081) +msgid "Between" +msgstr "" + +#. Resource IDs: (2) +msgid "Cancel" +msgstr "" + +#. Resource IDs: (1068) +msgid "Command line to start an editor at a specific line:" +msgstr "" + +#. Resource IDs: (1060) +msgid "Content" +msgstr "" + +#. Resource IDs: (145) +msgid "Copy filename to clipboard" +msgstr "" + +#. Resource IDs: (146) +msgid "Copy filenames to clipboard" +msgstr "" + +#. Resource IDs: (143) +msgid "Copy path to clipboard" +msgstr "" + +#. Resource IDs: (144) +msgid "Copy paths to clipboard" +msgstr "" + +#. Resource IDs: (147) +msgid "Copy text result to clipboard" +msgstr "" + +#. Resource IDs: (148) +msgid "Copy text results to clipboard" +msgstr "" + +#. Resource IDs: (1029) +msgid "Create backup files" +msgstr "" + +#. Resource IDs: (1077) +msgid "Create backup files in a separate folder" +msgstr "" + +#. Resource IDs: (1064) +msgid "Dark mode" +msgstr "" + +#. Resource IDs: (159) +msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings." +msgstr "" + +#. Resource IDs: (139) +msgid "Date modified" +msgstr "" + +#. Resource IDs: (137) +msgid "Dialog" +msgstr "" + +#. Resource IDs: (1051) +msgid "Dot matches newline" +msgstr "" + +#. Resource IDs: (1056) +msgid "Double-Click to select a preset" +msgstr "" + +#. Resource IDs: (65535 - PopupMenu) +msgid "Dummy" +msgstr "" + +#. Resource IDs: (1067) +msgid "Editor" +msgstr "" + +#. Resource IDs: (138) +msgid "Encoding" +msgstr "" + +#. Resource IDs: (1056) +msgid "Enter a name for the regex:" +msgstr "" + +#. Resource IDs: (1062) +msgid "Escape key closes grepWinNP3" +msgstr "" + +#. Resource IDs: (1041) +msgid "Exclude dirs (Regex):" +msgstr "" + +#. Resource IDs: (158) +msgid "Ext" +msgstr "" + +#. Resource IDs: (1039) +msgid "File Names match:\nuse '|' to separate multiple text match patterns, prepen&d '-' to exclude" +msgstr "" + +#. Resource IDs: (1059) +msgid "Files" +msgstr "" + +#. Resource IDs: (109) +msgid "GREPWINNP3" +msgstr "" + +#. Resource IDs: (156) +msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder" +msgstr "" + +#. Resource IDs: (1050) +msgid "Include binary files" +msgstr "" + +#. Resource IDs: (1010) +msgid "Include hidden items" +msgstr "" + +#. Resource IDs: (1011) +msgid "Include subfolders" +msgstr "" + +#. Resource IDs: (1009) +msgid "Include system items" +msgstr "" + +#. Resource IDs: (153) +msgid "Invalid path!" +msgstr "" + +#. Resource IDs: (1019) +msgid "KB" +msgstr "" + +#. Resource IDs: (1075) +msgid "Language:" +msgstr "" + +#. Resource IDs: (1017) +msgid "Limit search" +msgstr "" + +#. Resource IDs: (134) +msgid "Line" +msgstr "" + +#. Resource IDs: (150) +#, c-format +msgid "Line %5ld : %30s\n" +msgstr "" + +#. Resource IDs: (135) +msgid "Matches" +msgstr "" + +#. Resource IDs: (104) +msgid "Name" +msgstr "" + +#. Resource IDs: (1079) +msgid "Newer than" +msgstr "" + +#. Resource IDs: (115) +msgid "Newline is matched by '.'" +msgstr "" + +#. Resource IDs: (1) +msgid "OK" +msgstr "" + +#. Resource IDs: (1080) +msgid "Older than" +msgstr "" + +#. Resource IDs: (1090) +msgid "Don't warn when replacing without creating backups" +msgstr "" + +#. Resource IDs: (1063) +msgid "Only one instance" +msgstr "" + +#. Resource IDs: (142) +msgid "Open containing folder" +msgstr "" + +#. Resource IDs: (141) +msgid "Open with Editor" +msgstr "" + +#. Resource IDs: (1056) +msgid "Paste text to test the regex with:" +msgstr "" + +#. Resource IDs: (137) +msgid "Path" +msgstr "" + +#. Resource IDs: (131) +msgid "Preset name" +msgstr "" + +#. Resource IDs: (1022, 132) +msgid "Presets" +msgstr "" + +#. Resource IDs: (1065) +msgid "Press F1 for help" +msgstr "" + +#. Resource IDs: (154) +msgid "Programs" +msgstr "" + +#. Resource IDs: (32775 - Menu) +msgid "Re&name Preset" +msgstr "" + +#. Resource IDs: (130) +msgid "Regex Test" +msgstr "" + +#. Resource IDs: (1046) +msgid "Regex match" +msgstr "" + +#. Resource IDs: (65535) +msgid "Regex replace string:" +msgstr "" + +#. Resource IDs: (1001) +msgid "Regex search" +msgstr "" + +#. Resource IDs: (65535) +msgid "Regex search string:" +msgstr "" + +#. Resource IDs: (152) +msgid "Relative paths are not allowed. Please enter an absolute path!" +msgstr "" + +#. Resource IDs: (32771 - Menu) +msgid "Remo&ve Preset" +msgstr "" + +#. Resource IDs: (106) +msgid "Replace string" +msgstr "" + +#. Resource IDs: (1027) +msgid "Replace with:" +msgstr "" + +#. Resource IDs: (126) +msgid "S&top" +msgstr "" + +#. Resource IDs: (1, 1016) +msgid "Search" +msgstr "" + +#. Resource IDs: (1026) +msgid "Search &for:" +msgstr "" + +#. Resource IDs: (1042) +msgid "Search case-sensitive" +msgstr "" + +#. Resource IDs: (1015) +msgid "Search in" +msgstr "" + +#. Resource IDs: (1018) +msgid "Search results" +msgstr "" + +#. Resource IDs: (105) +msgid "Search string" +msgstr "" + +#. Resource IDs: (128) +#, c-format +msgid "Searched %ld files, skipped %ld files. Found %ld matches in %ld files." +msgstr "" + +#. Resource IDs: (140) +msgid "Select Editor Application..." +msgstr "" + +#. Resource IDs: (127) +msgid "Select path to search" +msgstr "" + +#. Resource IDs: (1071) +msgid "Settings" +msgstr "" + +#. Resource IDs: (133) +msgid "Size" +msgstr "" + +#. Resource IDs: (1006) +msgid "Size is" +msgstr "" + +#. Resource IDs: (1028) +msgid "Test regex" +msgstr "" + +#. Resource IDs: (136) +msgid "Text" +msgstr "" + +#. Resource IDs: (1048) +msgid "Text match" +msgstr "" + +#. Resource IDs: (1002) +msgid "Text search" +msgstr "" + +#. Resource IDs: (65535) +msgid "The regex search string matches:" +msgstr "" + +#. Resource IDs: (65535) +msgid "The resulting text after replacing:" +msgstr "" + +#. Resource IDs: (1074) +msgid "This adds a new entry to the context menu named 'Open with Editor'" +msgstr "" + +#. Resource IDs: (1053) +msgid "Treat files as UTF-8" +msgstr "" + +#. Resource IDs: (1045) +msgid "Visit our website" +msgstr "" + +#. Resource IDs: (116) +msgid "a regular expression used for searching. Press F1 for more info." +msgstr "" + +#. Resource IDs: (125) +msgid "an empty string" +msgstr "" + +#. Resource IDs: (130) +msgid "binary" +msgstr "" + +#. Resource IDs: (118) +msgid "click to edit the text as a multiline text" +msgstr "" + +#. Resource IDs: (121) +msgid "equal to" +msgstr "" + +#. Resource IDs: (122) +msgid "greater than" +msgstr "" + +#. Resource IDs: (103, 129) +msgid "grepWinNP3" +msgstr "" + +#. Resource IDs: (138) +msgid "grepWinNP3 Settings" +msgstr "" + +#. Resource IDs: (157) +msgid "hold down the shift key to find files that DO NOT contain the search string" +msgstr "" + +#. Resource IDs: (132) +msgid "invalid regex!" +msgstr "" + +#. Resource IDs: (120) +msgid "less than" +msgstr "" + +#. Resource IDs: (111) +msgid "no match" +msgstr "" + +#. Resource IDs: (110) +msgid "no text to replace with" +msgstr "" + +#. Resource IDs: (107) +msgid "no text to test with available" +msgstr "" + +#. Resource IDs: (112) +msgid "only files that match this pattern are searched.\nUse '|' as the delimiter.\nExample: *.cpp|*.h" +msgstr "" + +#. Resource IDs: (129) +msgid "read error" +msgstr "" + +#. Resource IDs: (131) +msgid "regex ok" +msgstr "" + +#. Resource IDs: (117) +msgid "reuse grepWinNP3 instances." +msgstr "" + +#. Resource IDs: (151) +#, c-format +msgid "scanning file '%s'" +msgstr "" + +#. Resource IDs: (108) +msgid "search string is empty" +msgstr "" + +#. Resource IDs: (114) +msgid "the path(s) which is searched recursively.\nSeparate paths with the '|' symbol.\nExample: c:\\temp|d:\\logs" +msgstr "" + +#. Resource IDs: (113) +msgid "you can exclude directories, e.g. CVS and images.\nExample: ^(CVS|images)$\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned." +msgstr "" + +#. Resource IDs: (1061) +msgid "Reset" +msgstr "" + +#. Resource IDs: (1088) +msgid "Max # of concurrent worker" +msgstr "" diff --git a/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang b/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang index d945e3df6..55bce84c6 100644 --- a/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang +++ b/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang @@ -9,7 +9,7 @@ # # encoding: UTF-8 # Language: Korean (Korea) resources -# Last-Translator: (ko-KR) 한국어 번역 ghost +# Last-Translator: (ko-KR) 한국어 번역 ohgree # #, fuzzy diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index 9bf46de3b..67dcf4ea4 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -229,7 +229,7 @@ END STRINGTABLE BEGIN - IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 번역 ghost" + IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 번역 ohgree" IDS_MUI_TITLE_FIXBASE " BASE (%s)" IDS_MUI_TITLE_RELCUR " +++ %s: %s - 스타일 +++" IDS_MUI_TITLE_FIXCUR " %s: %s - 스타일" diff --git a/minipath/language/mp_ko_kr/strings_ko_kr.rc b/minipath/language/mp_ko_kr/strings_ko_kr.rc index a3155e260..a09cbd633 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) 한국어 번역 ghost" + IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 번역 ohgree" END diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 728fa27b8..10cbf4c8a 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 BETA diff --git a/src/VersionEx.h b/src/VersionEx.h index fd2453ea4..5ce542a60 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,7 +8,7 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 528 +#define VERSION_REV 601 #define VERSION_BUILD 1 #define SCINTILLA_VER 433 #define ONIGURUMA_REGEX_VER 6.9.5