mirror of
https://github.com/rizonesoft/Notepad3.git
synced 2026-06-14 21:09:05 +08:00
Merge branch 'Dev_RC_Fixes' into Dev_ONIGURUMA
# Conflicts: # Versions/build.txt # np3portableapp/_buildname.txt # res/Notepad3.exe.manifest.conf # src/VersionEx.h
This commit is contained in:
Rainer Kottenhoff
commit
d63311fbfd
@ -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
|
||||
|
||||
Binary file not shown.
@ -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()
|
||||
|
||||
@ -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
|
||||
@ -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
|
||||
@ -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 "Cerrar Notepad3", IDM_TRAY_EXIT
|
||||
END
|
||||
END
|
||||
|
||||
|
||||
@ -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?"
|
||||
@ -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\
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -2014,17 +2014,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 {
|
||||
@ -2032,10 +2032,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 {
|
||||
@ -2087,6 +2088,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;
|
||||
}
|
||||
@ -2140,6 +2142,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;
|
||||
}
|
||||
@ -2186,6 +2189,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;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user