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

This commit is contained in:
METANEOCORTEX\Kotti 2023-10-16 11:52:50 +02:00
commit 028939806c
2 changed files with 8 additions and 6 deletions

View File

@ -96,7 +96,7 @@ BEGIN
CONTROL "Re&spetar inicio de la palabra",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10
CONTROL "&Transformar backslashes",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,100,10
CONTROL "Con &Expresión Regular",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,96,10
CONTROL "Dot &matches line-breaks",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,95,10
CONTROL "Punto &igual a saltos de línea.",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,105,10
CONTROL "No &hacer bucle",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,75,10
CONTROL "Ce&rrar tras encontrar",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,80,10
CONTROL "Marcar &ocurrencias",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,73,10
@ -130,7 +130,7 @@ BEGIN
CONTROL "Re&spetar inicio de la palabra",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10
CONTROL "&Transformar backslashes",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,100,10
CONTROL "Con &Expresión Regular",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,97,10
CONTROL "Dot &matches line-breaks",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,124,95,10
CONTROL "Punto &igual a saltos de línea.",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,124,105,10
CONTROL "&No &hacer bucle",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,75,10
CONTROL "Ce&rrar tras reemplazar",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,84,10
CONTROL "Marca &ocurrencias",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,73,10
@ -319,9 +319,9 @@ BEGIN
PUSHBUTTON "&Restablecer",IDC_STYLEDEFAULT,377,201,42,14
PUSHBUTTON "",IDC_PREVSTYLE,426,201,15,14,BS_BITMAP
PUSHBUTTON "",IDC_NEXTSTYLE,445,201,15,14,BS_BITMAP
LTEXT "Dark-Mode Contrast(%):", IDC_STATIC2,181,222,80,8
EDITTEXT IDC_DARK_MODE_CONTRAST,265,221,24,12,ES_AUTOHSCROLL
LTEXT "[0-6000] Default: 75%",IDC_STATIC3,300,222,80,8
LTEXT "Contraste en modo oscuro (%) :", IDC_STATIC2,181,222,105,8
EDITTEXT IDC_DARK_MODE_CONTRAST,288,221,24,12,ES_AUTOHSCROLL
LTEXT "[0-6000] Defecto: 75%",IDC_STATIC3,320,222,80,8
PUSHBUTTON "&Importar...",IDC_IMPORT,181,240,50,14
PUSHBUTTON "E&xportar...",IDC_EXPORT,237,240,50,14
DEFPUSHBUTTON "Aceptar",IDOK,355,240,50,14

View File

@ -149,7 +149,9 @@ inline LPCWSTR _Win10BuildToReleaseId(const DWORD build)
#if defined(_MSC_VER)
#if (_MSC_VER == 1937)
#if (_MSC_FULL_VER >= 193732824)
#if (_MSC_FULL_VER >= 193732825)
#define VER_CPL MS Visual C++ 2022 v17.7.5
#elif (_MSC_FULL_VER >= 193732824)
#define VER_CPL MS Visual C++ 2022 v17.7.4
#elif (_MSC_FULL_VER >= 193732822)
#define VER_CPL MS Visual C++ 2022 v17.7.(0-3)