Merge pull request #2413 from hpwamr/mui

MUI - Preparation for grepWinNP3 toolbar icon
This commit is contained in:
Pairi Daiza 2020-06-10 17:54:44 +02:00 committed by GitHub
commit 5c035be8de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 33 additions and 9 deletions

View File

@ -32,13 +32,14 @@ GRE - (GRE)pWinNP3 Search in Files Tool
=====================================================
Current BETA Version 5.20.609.(build_#) (2020-06-09)
Current BETA Version 5.20.610.(build_#) (2020-06-10)
=====================================================
-----------------------------------------------------
NEW:
-----------------------------------------------------
-
- Add a grepWinNP3 toolbar icon.
- Configurable Zoom-Tooltip clear delay ([Settings2] ZoomTooltipimeout=3200.
- Add Install/Remove "Open with Notepad3" to Notepad3 Install version.
- Add another Dark Theme "Sombra".

View File

@ -1 +1 @@
2
1

View File

@ -1 +1 @@
609
610

View File

@ -306,7 +306,7 @@
<None Include="translationsNP3\Italiano (Italia) [it-IT].lang" />
<None Include="translationsNP3\Magyar (Magyarország) [hu-HU].lang" />
<None Include="translationsNP3\Nederlands (Nederland) [nl-NL].lang" />
<None Include="translationsNP3\Polski (Polska)Polski [pl-PL].lang" />
<None Include="translationsNP3\Polski (Polska) [pl-PL].lang" />
<None Include="translationsNP3\Português (Portugal) [pt-PT].lang" />
<None Include="translationsNP3\Português Brasileiro (Brasil) [pt-BR].lang" />
<None Include="translationsNP3\Slovenčina (Slovensko) [sk-SK].lang" />

View File

@ -338,7 +338,7 @@
<None Include="translationsNP3\Nederlands (Nederland) [nl-NL].lang">
<Filter>translationsNP3</Filter>
</None>
<None Include="translationsNP3\Polski (Polska)Polski [pl-PL].lang">
<None Include="translationsNP3\Polski (Polska) [pl-PL].lang">
<Filter>translationsNP3</Filter>
</None>
<None Include="translationsNP3\Português (Portugal) [pt-PT].lang">

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Gefokusde Aansig"
IDT_VIEW_CHASING_DOCTAIL "Moniteringslogboek"
IDT_VIEW_PIN_ON_TOP "Altyd Bo-op"
IDT_GREP_WIN_TOOL "Search in Files"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Факусаваны прагляд"
IDT_VIEW_CHASING_DOCTAIL "Назіранне за файлам"
IDT_VIEW_PIN_ON_TOP "Зверху іншых вокнаў"
IDT_GREP_WIN_TOOL "Шукаць у файлах"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Fokussierte Ansicht"
IDT_VIEW_CHASING_DOCTAIL "Logfile Monitoring"
IDT_VIEW_PIN_ON_TOP "Immer im Vordergrung"
IDT_GREP_WIN_TOOL "Suche in &Dateien"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Focused View"
IDT_VIEW_CHASING_DOCTAIL "Monitoring Log"
IDT_VIEW_PIN_ON_TOP "Always On Top"
IDT_GREP_WIN_TOOL "Search in Files"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Vista enfocada"
IDT_VIEW_CHASING_DOCTAIL "Monitoreo de Log"
IDT_VIEW_PIN_ON_TOP "Siempre visible"
IDT_GREP_WIN_TOOL "Buscar en archivos"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Vue Focalisée"
IDT_VIEW_CHASING_DOCTAIL "Surveillance de Log"
IDT_VIEW_PIN_ON_TOP "Toujours visible"
IDT_GREP_WIN_TOOL "Rechercher dans fichiers"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Focused View"
IDT_VIEW_CHASING_DOCTAIL "Monitoring Log"
IDT_VIEW_PIN_ON_TOP "Always On Top"
IDT_GREP_WIN_TOOL "Search in Files"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Fókuszált nézet"
IDT_VIEW_CHASING_DOCTAIL "Naplófájl követése"
IDT_VIEW_PIN_ON_TOP "Mindig felül"
IDT_GREP_WIN_TOOL "Keresés fájlokban"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Focused View"
IDT_VIEW_CHASING_DOCTAIL "Monitoring Log"
IDT_VIEW_PIN_ON_TOP "Always On Top"
IDT_GREP_WIN_TOOL "Search in Files"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Vista focalizzata"
IDT_VIEW_CHASING_DOCTAIL "Monitoraggio log"
IDT_VIEW_PIN_ON_TOP "Sempre in primo piano"
IDT_GREP_WIN_TOOL "Cerca nei file"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "単語一望モード"
IDT_VIEW_CHASING_DOCTAIL "編集制限モード"
IDT_VIEW_PIN_ON_TOP "常に手前に表示"
IDT_GREP_WIN_TOOL "ファイル群から検索"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "집중"
IDT_VIEW_CHASING_DOCTAIL "열람(&M)"
IDT_VIEW_PIN_ON_TOP "항상 위에"
IDT_GREP_WIN_TOOL "Search in Files"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Gefocust zicht"
IDT_VIEW_CHASING_DOCTAIL "Log Monitoren"
IDT_VIEW_PIN_ON_TOP "Altijd bovenop"
IDT_GREP_WIN_TOOL "Zoek in bestanden"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Widok skupiony"
IDT_VIEW_CHASING_DOCTAIL "Dziennik monitorowania"
IDT_VIEW_PIN_ON_TOP "Zawsze na wierzchu"
IDT_GREP_WIN_TOOL "Szukaj w plikach"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Focused View"
IDT_VIEW_CHASING_DOCTAIL "Monitoring Log"
IDT_VIEW_PIN_ON_TOP "Always On Top"
IDT_GREP_WIN_TOOL "Search in Files"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Vista focada"
IDT_VIEW_CHASING_DOCTAIL "Registo de monitorização"
IDT_VIEW_PIN_ON_TOP "Sempre visível"
IDT_GREP_WIN_TOOL "Procurar em ficheiro"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Фокусировка просмотра"
IDT_VIEW_CHASING_DOCTAIL "Слежение за файлом"
IDT_VIEW_PIN_ON_TOP "Поверх других окон"
IDT_GREP_WIN_TOOL "Искать в файлах"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Zamerať zobrazenie"
IDT_VIEW_CHASING_DOCTAIL "Monitorovať logovanie"
IDT_VIEW_PIN_ON_TOP "Vždy na vrchu"
IDT_GREP_WIN_TOOL "Vyhľadávať v súboroch"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Växla vy"
IDT_VIEW_CHASING_DOCTAIL "Övervaknigslogg"
IDT_VIEW_PIN_ON_TOP "Alltid överst"
IDT_GREP_WIN_TOOL "Sök i filer"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Focused View"
IDT_VIEW_CHASING_DOCTAIL "Monitoring Log"
IDT_VIEW_PIN_ON_TOP "Always On Top"
IDT_GREP_WIN_TOOL "Search in Files"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "Focused View"
IDT_VIEW_CHASING_DOCTAIL "Monitoring Log"
IDT_VIEW_PIN_ON_TOP "Always On Top"
IDT_GREP_WIN_TOOL "Search in Files"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "仅显示匹配行"
IDT_VIEW_CHASING_DOCTAIL "日志监控"
IDT_VIEW_PIN_ON_TOP "总是置顶"
IDT_GREP_WIN_TOOL "在文件中查找"
END
STRINGTABLE

View File

@ -92,6 +92,7 @@ BEGIN
IDT_VIEW_TOGGLE_VIEW "僅顯示符合行"
IDT_VIEW_CHASING_DOCTAIL "日誌監控"
IDT_VIEW_PIN_ON_TOP "總是置頂"
IDT_GREP_WIN_TOOL "在檔案中查詢"
END
STRINGTABLE

View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.609.2"
version="5.20.610.1"
type="win32"
/>
<description>Notepad3 BETA</description>

View File

@ -82,7 +82,7 @@ grepWinLng_t grepWinLangResName[] =
{ MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), L".\\lng\\gwLng\\日本語 (日本)[ja-JP].lang"},
{ MAKELANGID(LANG_KOREAN, SUBLANG_KOREAN), L".\\lng\\gwLng\\한국어 (대한민국) [ko-KR].lang"},
{ MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH), L".\\lng\\gwLng\\Nederlands (Nederland) [nl-NL].lang"},
{ MAKELANGID(LANG_POLISH, SUBLANG_POLISH_POLAND), L".\\lng\\gwLng\\Polski (Polska)Polski [pl-PL].lang"},
{ MAKELANGID(LANG_POLISH, SUBLANG_POLISH_POLAND), L".\\lng\\gwLng\\Polski (Polska) [pl-PL].lang"},
{ MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN), L".\\lng\\gwLng\\Português Brasileiro (Brasil) [pt-BR].lang"},
{ MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE), L".\\lng\\gwLng\\Português (Portugal) [pt-PT].lang"},
{ MAKELANGID(LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA), L".\\lng\\gwLng\\Русский (Pоссия) [ru-RU].lang"},

View File

@ -8,8 +8,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 609
#define VERSION_BUILD 2
#define VERSION_REV 610
#define VERSION_BUILD 1
#define SCINTILLA_VER 433
#define ONIGURUMA_REGEX_VER 6.9.5
#define UCHARDET_VER 2018.09.27