From 46b2da3d291823509b818785730122e8977dfd1b Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Tue, 28 May 2019 10:37:20 +0200 Subject: [PATCH 1/6] Update notepad3_setup.iss --- Build/notepad3_setup.iss | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss index f7daf362e..1119057d4 100644 --- a/Build/notepad3_setup.iss +++ b/Build/notepad3_setup.iss @@ -162,14 +162,34 @@ Source: {#bindir}\Release_x64_v142\lng\fr-FR\mplng.dll.mui; DestDir: {ap Source: {#bindir}\Release_x86_v142\lng\fr-FR\mplng.dll.mui; DestDir: {app}\lng\fr-FR; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\fr-FR\np3lng.dll.mui; DestDir: {app}\lng\fr-FR; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\fr-FR\np3lng.dll.mui; DestDir: {app}\lng\fr-FR; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\hu-HU\mplng.dll.mui; DestDir: {app}\lng\hu-HU; Flags: ignoreversion; Check: Is64BitInstallMode() +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\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() +Source: {#bindir}\Release_x86_v142\lng\it-IT\np3lng.dll.mui; DestDir: {app}\lng\it-IT; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\ja-JP\mplng.dll.mui; DestDir: {app}\lng\ja-JP; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\ja-JP\mplng.dll.mui; DestDir: {app}\lng\ja-JP; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\ja-JP\np3lng.dll.mui; DestDir: {app}\lng\ja-JP; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\ja-JP\np3lng.dll.mui; DestDir: {app}\lng\ja-JP; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\ko-KR\mplng.dll.mui; DestDir: {app}\lng\ko-KR; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: {#bindir}\Release_x86_v142\lng\ko-KR\mplng.dll.mui; DestDir: {app}\lng\ko-KR; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\ko-KR\np3lng.dll.mui; DestDir: {app}\lng\ko-KR; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: {#bindir}\Release_x86_v142\lng\ko-KR\np3lng.dll.mui; DestDir: {app}\lng\ko-KR; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\nl-NL\mplng.dll.mui; DestDir: {app}\lng\nl-NL; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\nl-NL\mplng.dll.mui; DestDir: {app}\lng\nl-NL; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: {#bindir}\Release_x64_v142\lng\nl-NL\np3lng.dll.mui; DestDir: {app}\lng\nl-NL; Flags: ignoreversion; Check: Is64BitInstallMode() Source: {#bindir}\Release_x86_v142\lng\nl-NL\np3lng.dll.mui; DestDir: {app}\lng\nl-NL; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\pl-PL\mplng.dll.mui; DestDir: {app}\lng\pl-PL; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: {#bindir}\Release_x86_v142\lng\pl-PL\mplng.dll.mui; DestDir: {app}\lng\pl-PL; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\pl-PL\np3lng.dll.mui; DestDir: {app}\lng\pl-PL; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: {#bindir}\Release_x86_v142\lng\pl-PL\np3lng.dll.mui; DestDir: {app}\lng\pl-PL; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: {#bindir}\Release_x64_v142\lng\pt-BR\mplng.dll.mui; DestDir: {app}\lng\pt-BR; Flags: ignoreversion; Check: Is64BitInstallMode() +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\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() From 8af2caac48206a61e5c4980e8b7c7bd5874fdd49 Mon Sep 17 00:00:00 2001 From: josemaria_cr Date: Tue, 28 May 2019 11:33:40 +0200 Subject: [PATCH 2/6] Translate_corrections --- language/np3_es_es/menu_es_es.rc | 16 ++++++++-------- language/np3_es_es/strings_es_es.rc | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index a65e7d20d..817a7a176 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -71,7 +71,7 @@ BEGIN MENUITEM "&Nueva ventana\tAlt+N", IDM_FILE_NEWWINDOW MENUITEM "V&entana vacía\tAlt+Shift+N", IDM_FILE_NEWWINDOW2 MENUITEM SEPARATOR - MENUITEM "&Relanzar con altos derechos", IDM_FILE_LAUNCH_ELEVATED + MENUITEM "&Relanzar con privilegios elevados", IDM_FILE_LAUNCH_ELEVATED MENUITEM SEPARATOR MENUITEM "Ejecutar &documento\tCtrl+L", IDM_FILE_LAUNCH MENUITEM "&Abrir con...\tAlt+L", IDM_FILE_OPENWITH @@ -188,8 +188,8 @@ BEGIN MENUITEM SEPARATOR POPUP "&Incluir selección" BEGIN - MENUITEM "Simple comillas\tCtrl+1", CMD_STRINGIFY - MENUITEM "&Doble comillas\tCtrl+2", CMD_STRINGIFY2 + MENUITEM "Comillas simples\tCtrl+1", CMD_STRINGIFY + MENUITEM "Comillas &dobles\tCtrl+2", CMD_STRINGIFY2 MENUITEM SEPARATOR MENUITEM "( )\tCtrl+3", CMD_EMBRACE MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2 @@ -326,7 +326,7 @@ BEGIN MENUITEM "Coincidir &sensible a mayúsculas", IDM_VIEW_MARKOCCUR_CASE POPUP "Coincidir &palabra completa solo" BEGIN - MENUITEM "&OFF", IDM_VIEW_MARKOCCUR_WNONE + MENUITEM "&OFF", IDM_VIEW_MARKOCCUR_WNONE MENUITEM "Coincidir palabra &seleccionada", IDM_VIEW_MARKOCCUR_WORD MENUITEM "Coincidir palabra &actual", IDM_VIEW_MARKOCCUR_CURRENT END @@ -383,7 +383,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Ins&tancia de archivo único", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM "N&otificación de cambios en archivo...\tAlt+F5", IDM_VIEW_CHANGENOTIFY - MENUITEM "Mudo Mensaje &Pitidos", IDM_VIEW_MUTE_MESSAGEBEEP + MENUITEM "Silenciar sonidos de aviso", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "&Función de la tecla 'Esc'" BEGIN MENUITEM "&Ninguna", IDM_VIEW_NOESCFUNC @@ -394,8 +394,8 @@ BEGIN MENUITEM SEPARATOR POPUP "&Recordar" BEGIN - MENUITEM "&Recordar archivos recientes", IDM_VIEW_NOSAVERECENT - MENUITEM "&Preservar la posición de Caret", IDM_VIEW_NOPRESERVECARET + MENUITEM "&Recordar archivos recientes", IDM_VIEW_NOSAVERECENT + MENUITEM "&Preservar la posición del cursor", IDM_VIEW_NOPRESERVECARET MENUITEM "Recordar los &argumentos de búsqueda", IDM_VIEW_NOSAVEFINDREPL END POPUP "&Ventana" @@ -476,7 +476,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Abrir Notepad3", IDM_TRAY_RESTORE - MENUITEM "Salir Notepad3", IDM_TRAY_EXIT + MENUITEM "Salir de Notepad3", IDM_TRAY_EXIT END END diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index 58012990e..eec767f28 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -134,7 +134,7 @@ BEGIN IDS_MUI_ERR_UNICODE "Error al convertir este archivo Unicode.\n¡Los datos se perderán si se guarda el archivo!" IDS_MUI_ERR_BITMAP "Error cargando bitmap ""%s"".\nDimensiones necesarias: %i x %i (ancho >= %i x alto)." IDS_MUI_ERR_ELEVATED_RIGHTS - "¡Error al elevar los derechos de usuario!" + "¡Error al elevar los privilegios de usuario!" END STRINGTABLE @@ -145,7 +145,7 @@ BEGIN "El archivo ""%s"" no se puede guardar y puede estar protegido.\n\n¿Quiere lanzar Notepad3 como administrador?" IDS_MUI_ERR_ADMINEXE "No se ha encontrado administración ejecutable .\n¿Consultar website https://rizonesoft.com ?" IDS_MUI_WARN_LOAD_BIG_FILE - "¿¿Seguro que quiere abrir este archivo grande??" + "¿¿Seguro que quiere abrir este archivo tan grande??" IDS_MUI_WARN_UNKNOWN_EXT "¡Extensión de nombre de archivo desconocido (%s)!\n¿Cargar de todos modos?" IDS_MUI_INDENT_CONSISTENT "¡El archivo tiene una sangría consistente!" @@ -158,8 +158,8 @@ STRINGTABLE BEGIN IDS_MUI_SELRECT "Esta operación no se puede realizar en una selección rectangular." IDS_MUI_BUFFERTOOSMALL "Esta operación no se puede realizar (líneas demasiado largas)." - IDS_MUI_FIND_WRAPFW "Se llega al final del documento, reinicie la búsqueda al principio." - IDS_MUI_FIND_WRAPRE "Se llega al principio del documento, reinicie la búsqueda al final." + IDS_MUI_FIND_WRAPFW "Se llegó al final del documento, reiniciando la búsqueda desde el principio." + IDS_MUI_FIND_WRAPRE "Se llegó al principio del documento, reiniciando la búsqueda desde el final." IDS_MUI_NOTFOUND "El texto especificado no fue encontrado." IDS_MUI_REPLCOUNT "%i ocurrencias del texto especificado se han reemplazado." IDS_MUI_ASK_ENCODING "Cambiar la codificación del archivo de una codificación a otra puede reemplazar el texto no compatible con caracteres predeterminados, y el historial de deshacer se borrará. ¿Continuar?" From bf3bbe6066c3fbfa90be7cc30b10f2e63820b4f2 Mon Sep 17 00:00:00 2001 From: josemaria_cr Date: Tue, 28 May 2019 12:36:39 +0200 Subject: [PATCH 3/6] Minor_corrections --- language/np3_es_es/menu_es_es.rc | 4 ++-- language/np3_es_es/strings_es_es.rc | 4 ++-- minipath/language/mp_es_es/dialogs_es_es.rc | 8 ++++---- minipath/language/mp_es_es/menu_es_es.rc | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index 817a7a176..e364aebd6 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -302,7 +302,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "&Ajuste automático de línea\tCtrl+W", IDM_VIEW_WORDWRAP - MENUITEM "&Marcador de larga línea\tCtrl+Shift+L", IDM_VIEW_LONGLINEMARKER + MENUITEM "&Marcador de línea larga\tCtrl+Shift+L", IDM_VIEW_LONGLINEMARKER MENUITEM "&Guías de Sangría\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES MENUITEM SEPARATOR MENUITEM "Mostrar &símbolos de ajuste\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS @@ -476,7 +476,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Abrir Notepad3", IDM_TRAY_RESTORE - MENUITEM "Salir de Notepad3", IDM_TRAY_EXIT + MENUITEM "Cerrar Notepad3", IDM_TRAY_EXIT END END diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index eec767f28..3adda2118 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -236,7 +236,7 @@ BEGIN IDS_MUI_MENU_LANGUAGE "&Idioma" IDS_MUI_MENU_THEMES "&Temas" IDM_THEMES_DEFAULT "Defecto de fábrica" - IDM_THEMES_FILE_ITEM "Ajustes estandar" + IDM_THEMES_FILE_ITEM "Ajustes estándar" END STRINGTABLE @@ -274,7 +274,7 @@ Opciones:\r\n\ /u\tLanzar con privilegios elevados.\r\n\ /v\tImprimir el archivo inmediatamente y salir.\r\n\ /vd\tImprimir archivo (abrir el cuadro de diálogo de la impresora).\r\n\ -/y\tEntorno de búsqueda CAMINO en caso de nombre de archivo relativo..\r\n\ +/y\tEntorno de búsqueda PATH en caso de nombre de archivo relativo..\r\n\ /z\tIr a la siguiente (usar para reemplazar el Notepad basado\r\n\ten el registro).\r\n\r\n\ Ejemplos:\r\n\ Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\ diff --git a/minipath/language/mp_es_es/dialogs_es_es.rc b/minipath/language/mp_es_es/dialogs_es_es.rc index 2e2b58e7b..f10c70f03 100644 --- a/minipath/language/mp_es_es/dialogs_es_es.rc +++ b/minipath/language/mp_es_es/dialogs_es_es.rc @@ -210,7 +210,7 @@ BEGIN CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,10,139,205,1 CONTROL "Habilitar ""&Esc"" para...",IDC_ESCFUNCTION,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,10,148,85,10 CONTROL "Minimizar &ventana.",IDC_ESCMIN,"Button",BS_AUTORADIOBUTTON,100,148,71,10 - CONTROL "Sa&lir MiniPath.",IDC_ESCEXIT,"Button",BS_AUTORADIOBUTTON,100,160,63,10 + CONTROL "Cerrar MiniPath.",IDC_ESCEXIT,"Button",BS_AUTORADIOBUTTON,100,160,63,10 END IDPP_ITEMS DIALOGEX 0, 0, 225, 185 @@ -222,12 +222,12 @@ BEGIN LTEXT "Aspecto de elementos en la lista de carpetas.",IDC_STATIC,40,15,150,8 GROUPBOX "Colores",IDC_STATIC,10,41,205,134 LTEXT "Usar este color de texto cuando no se fija NINGÚN FILTRO:",IDC_STATIC,20,54,180,8 - CONTROL "Defecto color &windows.",IDC_COLOR_DEF1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,20,68,89,10 + CONTROL "Color por defecto &windows.",IDC_COLOR_DEF1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,20,68,89,10 CONTROL "Color &personal.:",IDC_COLOR_CUST1,"Button",BS_AUTORADIOBUTTON,20,82,60,10 EDITTEXT IDC_COLOR_SAMP1,85,80,30,14,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Pick Color...",IDC_COLOR_PICK1,119,80,50,14 - LTEXT "Utilizar este color de texto Cuando un FILTRO ESTÁ ACTIVO:",IDC_STATIC,20,105,200,8 - CONTROL "&Defecto color windows.",IDC_COLOR_DEF2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,20,119,89,10 + LTEXT "Utilizar este color de texto cuando un FILTRO ESTÁ ACTIVO:",IDC_STATIC,20,105,200,8 + CONTROL "Color por &defecto.",IDC_COLOR_DEF2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,20,119,89,10 CONTROL "C&olor personal.:",IDC_COLOR_CUST2,"Button",BS_AUTORADIOBUTTON,20,133,60,10 EDITTEXT IDC_COLOR_SAMP2,86,130,30,14,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Elegir...",IDC_COLOR_PICK2,120,130,50,14 diff --git a/minipath/language/mp_es_es/menu_es_es.rc b/minipath/language/mp_es_es/menu_es_es.rc index 4ec6ef80d..4f433da84 100644 --- a/minipath/language/mp_es_es/menu_es_es.rc +++ b/minipath/language/mp_es_es/menu_es_es.rc @@ -83,7 +83,7 @@ BEGIN BEGIN MENUITEM "&Carpetas", IDM_VIEW_FOLDERS MENUITEM "&Archivos", IDM_VIEW_FILES - MENUITEM "Objetos &Systema", IDM_VIEW_HIDDEN + MENUITEM "Objetos &Sistema", IDM_VIEW_HIDDEN END POPUP "&Ordenar" BEGIN @@ -121,7 +121,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Abrir MiniPath", IDM_TRAY_RESTORE - MENUITEM "Salir MiniPath", IDM_TRAY_EXIT + MENUITEM "Cerrar MiniPath", IDM_TRAY_EXIT END END From 7c0fa04e091934890a04bc5b578c956cacf2ec31 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 28 May 2019 20:30:03 +0200 Subject: [PATCH 4/6] Update Changes.txt for RC version --- Build/Changes.txt | 35 +++++++++++++++++++++---- np3portableapp/build_np3portableapp.cmd | 14 +++++----- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 3428ed6a8..ade6f6644 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -30,7 +30,36 @@ UCD - (UCD)ARDET is an Encoding Detector Library ================================================== -Current Version 5.19.522.build (2019-May 22) +Current Version 5.19.528.build (28 May 2019) +================================================== + +-------------------------------------------------- +NEW: +-------------------------------------------------- + +-------------------------------------------------- +CHANGES: +-------------------------------------------------- + +-------------------------------------------------- +ENHANCEMENT: +-------------------------------------------------- + +-------------------------------------------------- +FIXES: +-------------------------------------------------- + +-------------------------------------------------- +REMOVED: +-------------------------------------------------- + +-------------------------------------------------- +TRANSLATIONS (MUI): +-------------------------------------------------- + + +================================================== +Version 5.19.528.2228 RC (28 May 2019) ================================================== -------------------------------------------------- @@ -39,7 +68,6 @@ NEW: - Add Dark Theme "Obsidian" - Add option to disable Hyperlink Tooltip - ToolTip for Hyperlinks - - 2nd Solution to build a shared library (DLL) (C++ runtime & Scintilla) version of Notepad3 - Menu entry to mute MessageBox beeps - Theme Menu to load exported styles "on the fly (e.g.: "Dark Theme") @@ -67,7 +95,6 @@ CHANGES: - Add an "Always On Top" toolbar button - Rename "Doc Tail Chasing" => "Monitoring Log" - Optimized FileWatching interval for "Chasing Tail" mode - - Make "Add to Favorites" dialog resizable - Make Custom.Schemes and Find/Replace dialog resizable - BOOKMARK (margin flag) style changed to vertical flavor @@ -102,7 +129,6 @@ ENHANCEMENT: - Allow indicator styling for Hyperlink hover rendering - Find/Replace dialog <-> "Focused View" enhancements - Rework inconsistent line-breaks in status bar - - Rework EOL and Indentation check with dialogs -------------------------------------------------- @@ -110,7 +136,6 @@ FIXES: -------------------------------------------------- - Focused View: refolding by lexer - FocusedView started from Find/Replace dialog - - Do not ignore notify change for Paste/Swap/Undo/Redo - Colourise bug on find next (w/ mark occurrences) - Indentation warning dialog diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index df817d41b..2d01d1ab4 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -42,8 +42,8 @@ set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\Porta set NP3_DISTRIB_DIR=%SCRIPT_DIR%..\Build set NP3_DOC_DIR=%SCRIPT_DIR%..\doc -::set NP3_THEMES_DIR=%SCRIPT_DIR%..\Themes -set NP3_BUILD_SCHEMES_DIR=%SCRIPT_DIR%..\Build\Themes +::set NP3_THEMES_DIR=%SCRIPT_DIR%..\themes +set NP3_BUILD_SCHEMES_DIR=%SCRIPT_DIR%..\Build\themes ::set NP3_WIN32_DIR=%SCRIPT_DIR%..\Bin\Release_x86_v141 ::set NP3_X64_DIR=%SCRIPT_DIR%..\Bin\Release_x64_v141 set NP3_WIN32_DIR=%SCRIPT_DIR%..\Bin\Release_x86_v142 @@ -110,12 +110,12 @@ copy /B "%NP3_WIN32_DIR%\minipath.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" ::copy /B "%NP3_DISTRIB_DIR%\Update\wyUpdate\86\client.wyc" /B "%NP3_PORTAPP_DIR%\App\Notepad3\" /Y /V ::copy /B "%NP3_DISTRIB_DIR%\Update\wyUpdate\86\wyUpdate.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\" /Y /V -::del /s /f /q "%NP3_PORTAPP_DIR%\App\Themes\*.*" -::for /f "delims=" %%d in ('dir /ad /b "%NP3_PORTAPP_DIR%\App\Themes\"') do rmdir /s /q "%NP3_PORTAPP_DIR%\App\Themes\%%d" -::xcopy "%NP3_THEMES_DIR%" "%NP3_PORTAPP_DIR%\App\Themes" /C /V /I /S /Y +::del /s /f /q "%NP3_PORTAPP_DIR%\App\themes\*.*" +::for /f "delims=" %%d in ('dir /ad /b "%NP3_PORTAPP_DIR%\App\themes\"') do rmdir /s /q "%NP3_PORTAPP_DIR%\App\themes\%%d" +::xcopy "%NP3_THEMES_DIR%" "%NP3_PORTAPP_DIR%\App\themes" /C /V /I /S /Y -del /s /f /q "%NP3_PORTAPP_DIR%\App\DefaultData\settings\Themes\*.*" -xcopy "%NP3_BUILD_SCHEMES_DIR%" "%NP3_PORTAPP_DIR%\App\DefaultData\settings\Themes" /C /V /I /S /Y +del /s /f /q "%NP3_PORTAPP_DIR%\App\DefaultData\settings\themes\*.*" +xcopy "%NP3_BUILD_SCHEMES_DIR%" "%NP3_PORTAPP_DIR%\App\DefaultData\settings\themes" /C /V /I /S /Y for /d %%d in (%NP3_LANGUAGE_SET%) do ( mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\%%d" From 421433a2667dc41b81a4db1c8d0c53c5d9a8bddf Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Wed, 29 May 2019 00:43:37 +0200 Subject: [PATCH 5/6] MUI - Correction typo in hu-HU --- language/np3_hu_hu/menu_hu_hu.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 2acf5cbc2..f4a7a5b1e 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -267,7 +267,7 @@ BEGIN MENUITEM "Kijelölés az &elozoig\tCtrl+Alt+Shift+F2", IDM_EDIT_SELTOPREV END MENUITEM SEPARATOR - POPUP "Köny&vjelzok" + POPUP "Köny&vjelzõk" BEGIN MENUITEM "&Váltás\tCtrl+F2", BME_EDIT_BOOKMARKTOGGLE MENUITEM SEPARATOR @@ -390,7 +390,7 @@ BEGIN MENUITEM "Notepad&3 elrejtése", IDM_VIEW_ESCMINIMIZE MENUITEM "Kilé&pés a Notepad3-ból", IDM_VIEW_ESCEXIT END - MENUITEM "Eszközök &futtatása elott mentés", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Eszközök &futtatása elõtt mentés", IDM_VIEW_SAVEBEFORERUNNINGTOOLS MENUITEM SEPARATOR POPUP "&Emlékezés" BEGIN From c23fd336e00d24d81f0afa51e0ade77d2b0f4375 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Wed, 29 May 2019 08:45:15 +0200 Subject: [PATCH 6/6] + fix: Load external Toolbars (clear config on error, path relative to be portable) --- Build/Notepad3.ini | Bin 5996 -> 6182 bytes Versions/build.txt | 2 +- np3portableapp/_buildname.txt | 2 +- res/Notepad3.exe.manifest.conf | 4 ++-- src/Notepad3.c | 24 ++++++++++++++---------- src/VersionEx.h | 6 +++--- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Build/Notepad3.ini b/Build/Notepad3.ini index eef41b9f091783c4a613810e21f234544cfd0bde..a355fe5e074b9118ae3b124fd95f29df73077955 100644 GIT binary patch delta 206 zcmaE(x6ELJ7muwCLo|a8LkdF?LncERLn?zEgB3#!keAAk!;r{O0u_yCh-HXjC;*FO eFvJ7J^MNX3CVTQ2QfNXYk0WI!Y~IPUnF|2VxhwAg delta 20 ccmZ2x@J4Tg7tiDl9)ro>cpNsD@NVJ)09p - Notepad3 RC + Notepad3 RC2 diff --git a/src/Notepad3.c b/src/Notepad3.c index cda64aebd..65bcd546e 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -1868,17 +1868,17 @@ bool SelectExternalToolBar(HWND hwnd) StringCchCat(szFile, COUNTOF(szFile), L" "); StringCchCat(szFile, COUNTOF(szFile), szArg2); } - StringCchCopy(s_tchToolbarBitmap, COUNTOF(s_tchToolbarBitmap), szFile); - + PathRelativeToApp(szFile, s_tchToolbarBitmap, COUNTOF(s_tchToolbarBitmap), true,true, true); IniSetString(L"Toolbar Images", L"BitmapDefault", s_tchToolbarBitmap); } if (StrIsNotEmpty(s_tchToolbarBitmap)) { - StringCchCopy(s_tchToolbarBitmapHot, COUNTOF(s_tchToolbarBitmapHot), s_tchToolbarBitmap); - PathRemoveExtension(s_tchToolbarBitmapHot); - StringCchCat(s_tchToolbarBitmapHot, COUNTOF(s_tchToolbarBitmapHot), L"Hot.bmp"); - if (PathFileExists(s_tchToolbarBitmapHot)) { + StringCchCopy(szFile, COUNTOF(szFile), s_tchToolbarBitmap); + PathRemoveExtension(szFile); + StringCchCat(szFile, COUNTOF(szFile), L"Hot.bmp"); + if (PathFileExists(szFile)) { + PathRelativeToApp(szFile, s_tchToolbarBitmapHot, COUNTOF(s_tchToolbarBitmapHot), true, true, true); IniSetString(L"Toolbar Images", L"BitmapHot", s_tchToolbarBitmapHot); } else { @@ -1886,10 +1886,11 @@ bool SelectExternalToolBar(HWND hwnd) IniSetString(L"Toolbar Images", L"BitmapHot", NULL); } - StringCchCopy(s_tchToolbarBitmapDisabled, COUNTOF(s_tchToolbarBitmapDisabled), s_tchToolbarBitmap); - PathRemoveExtension(s_tchToolbarBitmapDisabled); - StringCchCat(s_tchToolbarBitmapDisabled, COUNTOF(s_tchToolbarBitmapDisabled), L"Disabled.bmp"); - if (PathFileExists(s_tchToolbarBitmapDisabled)) { + StringCchCopy(szFile, COUNTOF(szFile), s_tchToolbarBitmap); + PathRemoveExtension(szFile); + StringCchCat(szFile, COUNTOF(szFile), L"Disabled.bmp"); + if (PathFileExists(szFile)) { + PathRelativeToApp(szFile, s_tchToolbarBitmapDisabled, COUNTOF(s_tchToolbarBitmapDisabled), true, true, true); IniSetString(L"Toolbar Images", L"BitmapDisabled", s_tchToolbarBitmapDisabled); } else { @@ -1941,6 +1942,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_BITMAP, s_tchToolbarBitmap, (bmp.bmHeight * NUMTOOLBITMAPS), bmp.bmHeight, NUMTOOLBITMAPS); StringCchCopy(s_tchToolbarBitmap, COUNTOF(s_tchToolbarBitmap), L""); + IniSetString(L"Toolbar Images", L"BitmapDefault", NULL); DeleteObject(hbmp); hbmp = NULL; } @@ -1994,6 +1996,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_BITMAP, s_tchToolbarBitmapHot, (bmp.bmHeight * NUMTOOLBITMAPS), bmp.bmHeight, NUMTOOLBITMAPS); StringCchCopy(s_tchToolbarBitmapHot, COUNTOF(s_tchToolbarBitmapHot), L""); + IniSetString(L"Toolbar Images", L"BitmapHot", NULL); DeleteObject(hbmp); hbmp = NULL; } @@ -2040,6 +2043,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_BITMAP, s_tchToolbarBitmapDisabled, (bmp.bmHeight * NUMTOOLBITMAPS), bmp.bmHeight, NUMTOOLBITMAPS); StringCchCopy(s_tchToolbarBitmapDisabled, COUNTOF(s_tchToolbarBitmapDisabled), L""); + IniSetString(L"Toolbar Images", L"BitmapDisabled", NULL); DeleteObject(hbmp); hbmp = NULL; } diff --git a/src/VersionEx.h b/src/VersionEx.h index 6ed53c9c8..1a3f49f5b 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -7,8 +7,8 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 19 -#define VERSION_REV 527 -#define VERSION_BUILD 1732 +#define VERSION_REV 529 +#define VERSION_BUILD 1734 #define SCINTILLA_VER 415+ #define ONIGMO_REGEX_VER 6.2.0 -#define VERSION_PATCH RC +#define VERSION_PATCH RC2