Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: GetDetailsOf does not support column flags (#5755)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34066e475a12563d17c75… commit 34066e475a12563d17c75892c8c9d12754c8f8a1 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Tue Oct 3 10:43:44 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 3 10:43:44 2023 +0200 GetDetailsOf does not support column flags (#5755) GetDetailsOf does not support the column flags used by CompareIDs. As a side effect, also fixes LPARAM to UINT truncation on 64-bit. --- dll/win32/shell32/shlfolder.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/shlfolder.cpp b/dll/win32/shell32/shlfolder.cpp index ee6c78b47fd..92dff6c81ef 100644 --- a/dll/win32/shell32/shlfolder.cpp +++ b/dll/win32/shell32/shlfolder.cpp @@ -241,8 +241,9 @@ HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST SHELLDETAILS sd; WCHAR wszItem1[MAX_PATH], wszItem2[MAX_PATH]; HRESULT hres; + UINT col = LOWORD(lParam); // Column index without SHCIDS_* flags - hres = isf->GetDetailsOf(pidl1, lParam, &sd); + hres = isf->GetDetailsOf(pidl1, col, &sd); if (FAILED(hres)) return MAKE_COMPARE_HRESULT(1); @@ -250,7 +251,7 @@ HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST if (FAILED(hres)) return MAKE_COMPARE_HRESULT(1); - hres = isf->GetDetailsOf(pidl2, lParam, &sd); + hres = isf->GetDetailsOf(pidl2, col, &sd); if (FAILED(hres)) return MAKE_COMPARE_HRESULT(1);

1 year, 7 months

[reactos] 01/01: [TASKMGR] de-DE.rc Update part 3

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6528ab8fcb41eb47ee17c… commit 6528ab8fcb41eb47ee17cf738760126e6758af94 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Oct 3 06:31:04 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Oct 3 06:31:04 2023 +0200 [TASKMGR] de-DE.rc Update part 3 I spotted yet another flip: translation of IDS_TAB_PFDELTA and IDS_TAB_VMSIZE were flipped. I spotted that by toggling all columns off entirely in the View-Options dialog where the columns can be selected and then added only one column at a time. I did that for all options. I do recommend translators of other langs to do the same test, I was shocked about the amount of bugs I spotted for german. And it is very subtle / easy to miss, if you enable/disable multiple columns together! Let's call it a day now! --- base/applications/taskmgr/lang/de-DE.rc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index ff22fb07bea..aea8376cf63 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -231,7 +231,7 @@ BEGIN PUSHBUTTON "CPU-Lastanzeige", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "Speicher-Lastanzeige", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "CPU-Lastverlaufsanzeige", IDC_CPU_USAGE_HISTORY_GRAPH, 81, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE - PUSHBUTTON "Speicher-Lastanzeige", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + PUSHBUTTON "Speicher-Lastverlaufsanzeige", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 @@ -289,7 +289,7 @@ BEGIN CONTROL "&CPU %", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 80, 10 CONTROL "CP&U-Zeit", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 48, 10 CONTROL "&Speicherlast", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 90, 10 - CONTROL "Verän&derung der Speicherlast", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10 + CONTROL "&Delta Speicherlast", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10 CONTROL "&Maximale Speicherlast", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 115, 10 CONTROL "S&eitenfehler", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 CONTROL "BENUTZE&R-Objekte", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 90, 10 @@ -297,8 +297,8 @@ BEGIN CONTROL "E/A-Bytes (Lesen)", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 80, 10 CONTROL "S&itzungskennung", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 70, 10 CONTROL "Benut&zername", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 70, 10 - CONTROL "Veränderung der Seiten&fehler", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 120, 10 - CONTROL "Größe des &virtuellen Speichers", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 120, 10 + CONTROL "Delta Seiten&fehler", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 120, 10 + CONTROL "&Virtueller Speicher", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 120, 10 CONTROL "&Ausgelagerter Pool", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 80, 10 CONTROL "Nicht ausgelagerter P&ool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 CONTROL "&Basispriorität", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 @@ -390,10 +390,10 @@ BEGIN IDS_TAB_CPUTIME "CPU-Zeit" IDS_TAB_MEMUSAGE "Speicherlast" IDS_TAB_PEAKMEMUSAGE "Maximale Speicherlast" - IDS_TAB_MEMDELTA "Veränderung der Speicherlast" + IDS_TAB_MEMDELTA "Delta Speicherlast" IDS_TAB_PAGEFAULT "Seitenfehler" - IDS_TAB_PFDELTA "Maximale Seitenfehler" - IDS_TAB_VMSIZE "Virtuelle Arbeitsspeichergröße" + IDS_TAB_PFDELTA "Delta Seitenfehler" + IDS_TAB_VMSIZE "Virtueller Speicher" IDS_TAB_PAGEDPOOL "Ausgelagerter Pool" IDS_TAB_NPPOOL "Nichtausgelagerter Pool" IDS_TAB_BASEPRI "Basispriorität"

1 year, 7 months

[reactos] 01/01: [TASKMGR] *.rc Strip unused IDD_DEBUG_CHANNELS_DIALOG

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=65ce20896afa190326128… commit 65ce20896afa19032612871506dd5d1e8eb73119 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Oct 3 03:50:41 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Oct 3 03:50:41 2023 +0200 [TASKMGR] *.rc Strip unused IDD_DEBUG_CHANNELS_DIALOG This is an addendum to 0.4.15-dev-413-g ed7196d9645f66b49db434c509c2b7e18817dcca binary size shrinks slightly although that dlg was unused: taskmgr.exe RosBEWin2.2.2 GCC8.4.0dbg 715.264 -> 708.608 --- base/applications/taskmgr/lang/bg-BG.rc | 12 +----------- base/applications/taskmgr/lang/cs-CZ.rc | 10 ---------- base/applications/taskmgr/lang/da-DK.rc | 10 ---------- base/applications/taskmgr/lang/de-DE.rc | 10 ---------- base/applications/taskmgr/lang/el-GR.rc | 12 +----------- base/applications/taskmgr/lang/en-US.rc | 10 ---------- base/applications/taskmgr/lang/es-ES.rc | 12 +----------- base/applications/taskmgr/lang/et-EE.rc | 13 +------------ base/applications/taskmgr/lang/fr-FR.rc | 12 +----------- base/applications/taskmgr/lang/he-IL.rc | 12 +----------- base/applications/taskmgr/lang/hu-HU.rc | 12 +----------- base/applications/taskmgr/lang/id-ID.rc | 12 +----------- base/applications/taskmgr/lang/it-IT.rc | 10 ---------- base/applications/taskmgr/lang/ja-JP.rc | 10 ---------- base/applications/taskmgr/lang/ko-KR.rc | 12 +----------- base/applications/taskmgr/lang/nl-NL.rc | 10 ---------- base/applications/taskmgr/lang/no-NO.rc | 10 ---------- base/applications/taskmgr/lang/pl-PL.rc | 19 ++++--------------- base/applications/taskmgr/lang/pt-BR.rc | 10 ---------- base/applications/taskmgr/lang/pt-PT.rc | 10 ---------- base/applications/taskmgr/lang/ro-RO.rc | 15 ++------------- base/applications/taskmgr/lang/ru-RU.rc | 12 +----------- base/applications/taskmgr/lang/sk-SK.rc | 12 +----------- base/applications/taskmgr/lang/sq-AL.rc | 13 +------------ base/applications/taskmgr/lang/sv-SE.rc | 12 +----------- base/applications/taskmgr/lang/tr-TR.rc | 12 +----------- base/applications/taskmgr/lang/uk-UA.rc | 10 ---------- base/applications/taskmgr/lang/zh-CN.rc | 12 +----------- base/applications/taskmgr/lang/zh-HK.rc | 10 ---------- base/applications/taskmgr/lang/zh-TW.rc | 10 ---------- base/applications/taskmgr/resource.h | 2 -- 31 files changed, 21 insertions(+), 327 deletions(-) diff --git a/base/applications/taskmgr/lang/bg-BG.rc b/base/applications/taskmgr/lang/bg-BG.rc index 006a4abe5f7..7f523d3833c 100644 --- a/base/applications/taskmgr/lang/bg-BG.rc +++ b/base/applications/taskmgr/lang/bg-BG.rc @@ -232,16 +232,6 @@ BEGIN PUSHBUTTON "Дневник на паметта", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Обезбубяващи канали" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Затваряне", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Процесорно сродство" @@ -249,7 +239,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Добре", IDOK, 120, 133, 50, 14 PUSHBUTTON "Отказ", IDCANCEL, 174, 133, 50, 14 - LTEXT "Настройката на сродството на процесора указва на кои ЦПУта е разрешено изпълнението да действието.", IDC_STATIC,5,5,220,16 + LTEXT "Настройката на сродството на процесора указва на кои ЦПУта е разрешено изпълнението да действието.", IDC_STATIC,5,5,220,16 CONTROL "ЦПУ 0", IDC_CPU0, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 11, 28, 37, 10 CONTROL "ЦПУ 1", IDC_CPU1, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 41, 37, 10 CONTROL "ЦПУ 2", IDC_CPU2, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 54, 37, 10 diff --git a/base/applications/taskmgr/lang/cs-CZ.rc b/base/applications/taskmgr/lang/cs-CZ.rc index e8e1675cc5c..423155a957b 100644 --- a/base/applications/taskmgr/lang/cs-CZ.rc +++ b/base/applications/taskmgr/lang/cs-CZ.rc @@ -232,16 +232,6 @@ BEGIN PUSHBUTTON "Historie využití paměti", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Kanály ladění" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Zavřít", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Afinita procesoru" diff --git a/base/applications/taskmgr/lang/da-DK.rc b/base/applications/taskmgr/lang/da-DK.rc index 79c0f4b580d..27ea5d0f36c 100644 --- a/base/applications/taskmgr/lang/da-DK.rc +++ b/base/applications/taskmgr/lang/da-DK.rc @@ -232,16 +232,6 @@ BEGIN PUSHBUTTON "Hukommelses Forbrug Historik", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Debug Kanaler" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Luk", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processor Affinitet" diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index 943d9ef97ab..ff22fb07bea 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -234,16 +234,6 @@ BEGIN PUSHBUTTON "Speicher-Lastanzeige", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Debug-Kanäle" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Schließen", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Prozessorzugehörigkeit" diff --git a/base/applications/taskmgr/lang/el-GR.rc b/base/applications/taskmgr/lang/el-GR.rc index 58bfa1ebe2c..616f0de9115 100644 --- a/base/applications/taskmgr/lang/el-GR.rc +++ b/base/applications/taskmgr/lang/el-GR.rc @@ -1,4 +1,4 @@ -/* Greek (GR) resources by Dj Apal */ +/* TRANSLATOR: Dj Apal */ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT @@ -234,16 +234,6 @@ BEGIN PUSHBUTTON "MEM Usage History", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Debug Channels" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Close", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processor Affinity" diff --git a/base/applications/taskmgr/lang/en-US.rc b/base/applications/taskmgr/lang/en-US.rc index ec555f9c1f5..90b73950e6a 100644 --- a/base/applications/taskmgr/lang/en-US.rc +++ b/base/applications/taskmgr/lang/en-US.rc @@ -230,16 +230,6 @@ BEGIN PUSHBUTTON "MEM Usage History", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Debug Channels" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Close", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processor Affinity" diff --git a/base/applications/taskmgr/lang/es-ES.rc b/base/applications/taskmgr/lang/es-ES.rc index 5c1c4e8cac0..9a99ddebc89 100644 --- a/base/applications/taskmgr/lang/es-ES.rc +++ b/base/applications/taskmgr/lang/es-ES.rc @@ -1,4 +1,4 @@ -/* Spanish (Spain) resources by Carlos Garcia Gomez, Samuel Serapión and Ismael Ferreras Morezuelas (Swyter) */ +/* TRANSLATORS: Carlos Garcia Gomez, Samuel Serapión, Ismael Ferreras Morezuelas (Swyter) */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -234,16 +234,6 @@ BEGIN PUSHBUTTON "Historial de uso de memoria", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Canales de depuración" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Cerrar", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Afinidad del procesador" diff --git a/base/applications/taskmgr/lang/et-EE.rc b/base/applications/taskmgr/lang/et-EE.rc index 7d015c9a13d..4aba1b254f9 100644 --- a/base/applications/taskmgr/lang/et-EE.rc +++ b/base/applications/taskmgr/lang/et-EE.rc @@ -1,9 +1,8 @@ /* * PROJECT: Task Manager for ReactOS * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: base/applications/taskmgr/lang/et-EE.rc * PURPOSE: Estonian Language resource file - * TRANSLATOR: Joann Mõndresku (joannmondresku at gmail dot com) + * TRANSLATOR: Joann Mõndresku <joannmondresku(a)gmail.com> */ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT @@ -237,16 +236,6 @@ BEGIN PUSHBUTTON "Füüsilise mälu hõivatuse ajalugu", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Silumiskanalid" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Sule", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Protessori ühtivus" diff --git a/base/applications/taskmgr/lang/fr-FR.rc b/base/applications/taskmgr/lang/fr-FR.rc index d9bc6444733..204caaef666 100644 --- a/base/applications/taskmgr/lang/fr-FR.rc +++ b/base/applications/taskmgr/lang/fr-FR.rc @@ -1,4 +1,4 @@ -/* French (Fr) resources by Benoit Plante (aka cmoibenlepro) */ +/* TRANSLATOR: Benoit Plante (aka cmoibenlepro) */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -234,16 +234,6 @@ BEGIN PUSHBUTTON "Historique d'utilisation du fichier d'échange", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Cannaux de débogage" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Fermer", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Affinité du processeur" diff --git a/base/applications/taskmgr/lang/he-IL.rc b/base/applications/taskmgr/lang/he-IL.rc index c24c276a914..c9855c5ff30 100644 --- a/base/applications/taskmgr/lang/he-IL.rc +++ b/base/applications/taskmgr/lang/he-IL.rc @@ -1,4 +1,4 @@ -/* Hebrew translations by Baruch Rutman (peterooch) and Shy Zedaka */ +/* TRANSLATORS: Baruch Rutman (peterooch), Shy Zedaka */ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT @@ -234,16 +234,6 @@ BEGIN PUSHBUTTON "היסטורית שימוש בזיכרון", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Debug Channels" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "סגירה", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "קירבה בין מעבדים" diff --git a/base/applications/taskmgr/lang/hu-HU.rc b/base/applications/taskmgr/lang/hu-HU.rc index f4968d5432a..51fa95242a6 100644 --- a/base/applications/taskmgr/lang/hu-HU.rc +++ b/base/applications/taskmgr/lang/hu-HU.rc @@ -1,4 +1,4 @@ -/* Hungaruan (HU) translation by Robert Horvath - talley at cubeclub.hu */ +/* TRANSLATOR: Robert Horvath <talley(a)cubeclub.hu> */ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT @@ -234,16 +234,6 @@ BEGIN PUSHBUTTON "Memória használata", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Hibakereső csatornák" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Bezárás", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processzoraffinitás" diff --git a/base/applications/taskmgr/lang/id-ID.rc b/base/applications/taskmgr/lang/id-ID.rc index 8a4bbb32bf0..28427216fa3 100644 --- a/base/applications/taskmgr/lang/id-ID.rc +++ b/base/applications/taskmgr/lang/id-ID.rc @@ -1,4 +1,4 @@ -/* Indonesian resource file by Zaenal Mutaqin (ade999(a)gmail.com) and Mas Ahmad Muhammad (m.charly81(a)gmail.com) */ +/* TRANSLATORS: Zaenal Mutaqin <ade999(a)gmail.com> and Mas Ahmad Muhammad <m.charly81(a)gmail.com> */ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT @@ -234,16 +234,6 @@ BEGIN PUSHBUTTON "Riwayat Pemakaian MEM", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Saluran Debug" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Tutup", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Afinitas Prosesor" diff --git a/base/applications/taskmgr/lang/it-IT.rc b/base/applications/taskmgr/lang/it-IT.rc index 180b60e1d31..ff44c4e27a8 100644 --- a/base/applications/taskmgr/lang/it-IT.rc +++ b/base/applications/taskmgr/lang/it-IT.rc @@ -232,16 +232,6 @@ BEGIN PUSHBUTTON "Storico uso MEM", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Debug Channels" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Chiudi", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processor Affinity" diff --git a/base/applications/taskmgr/lang/ja-JP.rc b/base/applications/taskmgr/lang/ja-JP.rc index c75672e3640..bec1d437eaf 100644 --- a/base/applications/taskmgr/lang/ja-JP.rc +++ b/base/applications/taskmgr/lang/ja-JP.rc @@ -232,16 +232,6 @@ BEGIN PUSHBUTTON "メモリ使用量の履歴", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "デバッグチャンネル" -FONT 9, "MS UI Gothic" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "閉じる", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "プロセッサの関係" diff --git a/base/applications/taskmgr/lang/ko-KR.rc b/base/applications/taskmgr/lang/ko-KR.rc index ab574ed209a..1dc9dcb30b3 100644 --- a/base/applications/taskmgr/lang/ko-KR.rc +++ b/base/applications/taskmgr/lang/ko-KR.rc @@ -1,4 +1,4 @@ -/* Korean translation by Seungju Kim */ +/* TRANSLATOR: Seungju Kim */ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT @@ -234,16 +234,6 @@ BEGIN PUSHBUTTON "메모리 사용 기록", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "디버그 채널" -FONT 9, "굴림" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "닫기", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "프로세서 선호도" diff --git a/base/applications/taskmgr/lang/nl-NL.rc b/base/applications/taskmgr/lang/nl-NL.rc index 431849b61e2..64f70a7d0df 100644 --- a/base/applications/taskmgr/lang/nl-NL.rc +++ b/base/applications/taskmgr/lang/nl-NL.rc @@ -232,16 +232,6 @@ BEGIN PUSHBUTTON "Geschiedenis van wisselbestandsgebruik", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Debug kanalen" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Sluit", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processoraffiniteit" diff --git a/base/applications/taskmgr/lang/no-NO.rc b/base/applications/taskmgr/lang/no-NO.rc index b23dab747c6..86063df9bbf 100644 --- a/base/applications/taskmgr/lang/no-NO.rc +++ b/base/applications/taskmgr/lang/no-NO.rc @@ -232,16 +232,6 @@ BEGIN PUSHBUTTON "Minne bruk historie", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Debug kanaler" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Avslutt", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Prosessor slektskap" diff --git a/base/applications/taskmgr/lang/pl-PL.rc b/base/applications/taskmgr/lang/pl-PL.rc index f48b4408670..160755b4e75 100644 --- a/base/applications/taskmgr/lang/pl-PL.rc +++ b/base/applications/taskmgr/lang/pl-PL.rc @@ -1,9 +1,8 @@ /* - * Translated by xrogers - * xxrogers(a)users.sourceforge.net - * https://sourceforge.net/projects/reactospl - * UTF-8 conversion by Caemyr (May, 2011) - * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (August, 2014) + * TRANSLATOR: xrogers <xxrogers(a)users.sourceforge.net> + * https://sourceforge.net/projects/reactospl + * UTF-8 conversion by Caemyr (May, 2011) + * Updated by Saibamen - Adam Stachowicz <saibamenppl(a)gmail.com> (August, 2014) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -240,16 +239,6 @@ BEGIN PUSHBUTTON "Historia zużycia pamięci", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Kanały debugowania" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Zamknij", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Koligacje procesora" diff --git a/base/applications/taskmgr/lang/pt-BR.rc b/base/applications/taskmgr/lang/pt-BR.rc index 433aa6e7571..f2581fe758d 100644 --- a/base/applications/taskmgr/lang/pt-BR.rc +++ b/base/applications/taskmgr/lang/pt-BR.rc @@ -232,16 +232,6 @@ BEGIN PUSHBUTTON "MEM Usage History", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Canais de depuração" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Fechar", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Afinidade com processador" diff --git a/base/applications/taskmgr/lang/pt-PT.rc b/base/applications/taskmgr/lang/pt-PT.rc index a5b681d2258..1d6568e2d6d 100644 --- a/base/applications/taskmgr/lang/pt-PT.rc +++ b/base/applications/taskmgr/lang/pt-PT.rc @@ -234,16 +234,6 @@ BEGIN PUSHBUTTON "Histórico de uso da memória RAM", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Canais de depuração" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Fechar", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Afinidade com processador" diff --git a/base/applications/taskmgr/lang/ro-RO.rc b/base/applications/taskmgr/lang/ro-RO.rc index c8167b73f86..1b0d7df8a74 100644 --- a/base/applications/taskmgr/lang/ro-RO.rc +++ b/base/applications/taskmgr/lang/ro-RO.rc @@ -1,9 +1,8 @@ /* - * Translators: Petru Dimitriu (petrimetri at gmail dot com) - * Ștefan Fulea (stefan dot fulea at mail dot com) + * TRANSLATORS: Petru Dimitriu <petrimetri(a)gmail.com> + * Ștefan Fulea <stefan.fulea(a)mail.com> */ - LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDR_TASKMANAGER MENU @@ -238,16 +237,6 @@ BEGIN PUSHBUTTON "Afișaj istoric încărcătură memorie", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Canale de depanare" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Î&nchide", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Afinitate procesor" diff --git a/base/applications/taskmgr/lang/ru-RU.rc b/base/applications/taskmgr/lang/ru-RU.rc index 4bf7b69756c..da28e3bc231 100644 --- a/base/applications/taskmgr/lang/ru-RU.rc +++ b/base/applications/taskmgr/lang/ru-RU.rc @@ -1,4 +1,4 @@ -/* Russian language resource file by Dmitry Chapyshev, 2007-06-10, Kudratov Olimjon (olim98(a)bk.ru) */ +/* TRANSLATORS: Dmitry Chapyshev, 2007-06-10, Kudratov Olimjon <olim98(a)bk.ru> */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -234,16 +234,6 @@ BEGIN PUSHBUTTON "Хронология использования памяти", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Отладка потоков" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Закрыть", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Семейство процессоров" diff --git a/base/applications/taskmgr/lang/sk-SK.rc b/base/applications/taskmgr/lang/sk-SK.rc index 004f87b2f00..45567224455 100644 --- a/base/applications/taskmgr/lang/sk-SK.rc +++ b/base/applications/taskmgr/lang/sk-SK.rc @@ -1,4 +1,4 @@ -/* Slovak translation by Kario (kario(a)szm.sk) (09-08-2007) */ +/* TRANSLATOR: 2007 Kario <kario(a)szm.sk> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -234,16 +234,6 @@ BEGIN PUSHBUTTON "História využitia pamäte", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Kanály ladenia" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Zavrieť", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 270, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Afinita procesorov" diff --git a/base/applications/taskmgr/lang/sq-AL.rc b/base/applications/taskmgr/lang/sq-AL.rc index 58fa12df27a..06c4254a6e2 100644 --- a/base/applications/taskmgr/lang/sq-AL.rc +++ b/base/applications/taskmgr/lang/sq-AL.rc @@ -1,5 +1,4 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) - * DATE OF TR: 29-11-2013 +/* TRANSLATOR: 2013 Ardit Dani (Ard1t) <ardit.dani(a)gmail.com> */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL @@ -234,16 +233,6 @@ BEGIN PUSHBUTTON "Historia e perdorimit MEM", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Debug Channels" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Mbyll", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processor Affinity" diff --git a/base/applications/taskmgr/lang/sv-SE.rc b/base/applications/taskmgr/lang/sv-SE.rc index fbf39896943..5186e05c3ff 100644 --- a/base/applications/taskmgr/lang/sv-SE.rc +++ b/base/applications/taskmgr/lang/sv-SE.rc @@ -1,4 +1,4 @@ -/* Swedish translation by David Nordenberg */ +/* TRANSLATOR: David Nordenberg */ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL @@ -234,16 +234,6 @@ BEGIN PUSHBUTTON "Minneshistorik", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Felsökningskanaler" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Stäng", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Processorsamhörighet" diff --git a/base/applications/taskmgr/lang/tr-TR.rc b/base/applications/taskmgr/lang/tr-TR.rc index a20a43e7efb..27a1272cd9e 100644 --- a/base/applications/taskmgr/lang/tr-TR.rc +++ b/base/applications/taskmgr/lang/tr-TR.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013-2014, 2016, 2019 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* TRANSLATOR: 2013-2019 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -232,16 +232,6 @@ BEGIN PUSHBUTTON "Bellek Kullanım Geçmişi Grafiği", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Hata Ayıklama Kanalları" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Kapat", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "İşlemci İlişkisi" diff --git a/base/applications/taskmgr/lang/uk-UA.rc b/base/applications/taskmgr/lang/uk-UA.rc index dc6fe43e4b8..b7d630af65b 100644 --- a/base/applications/taskmgr/lang/uk-UA.rc +++ b/base/applications/taskmgr/lang/uk-UA.rc @@ -232,16 +232,6 @@ BEGIN PUSHBUTTON "Хронологія використання пам'яті", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Налагодження каналів" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "Закрити", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Відповідність процесорів" diff --git a/base/applications/taskmgr/lang/zh-CN.rc b/base/applications/taskmgr/lang/zh-CN.rc index 09c514557fe..5afc17c975f 100644 --- a/base/applications/taskmgr/lang/zh-CN.rc +++ b/base/applications/taskmgr/lang/zh-CN.rc @@ -2,7 +2,7 @@ * (Simplified Chinese resources) * (简体中文资源) * by zhangbing 2008 <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> - * Improved by Wexpo Lyu <laosb at lasteam.net> + * Improved by Wexpo Lyu <laosb(a)lasteam.net> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -239,16 +239,6 @@ BEGIN PUSHBUTTON "内存使用记录", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "调试频道" -FONT 9, "宋体" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "关闭", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "处理器关联" diff --git a/base/applications/taskmgr/lang/zh-HK.rc b/base/applications/taskmgr/lang/zh-HK.rc index dfb0ab3794e..d6abcc2aea5 100644 --- a/base/applications/taskmgr/lang/zh-HK.rc +++ b/base/applications/taskmgr/lang/zh-HK.rc @@ -240,16 +240,6 @@ BEGIN PUSHBUTTON "記憶體使用記錄", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "偵錯頻道" -FONT 9, "新細明體" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "關閉", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "處理器親和性" diff --git a/base/applications/taskmgr/lang/zh-TW.rc b/base/applications/taskmgr/lang/zh-TW.rc index 7e872c268a3..c83bfea34ee 100644 --- a/base/applications/taskmgr/lang/zh-TW.rc +++ b/base/applications/taskmgr/lang/zh-TW.rc @@ -240,16 +240,6 @@ BEGIN PUSHBUTTON "記憶體使用記錄", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END -IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "除錯頻道" -FONT 9, "新細明體" -BEGIN - CONTROL "List1", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | - LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 - PUSHBUTTON "關閉", IDOK, 171, 189, 69, 14 -END - IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "處理器親和性" diff --git a/base/applications/taskmgr/resource.h b/base/applications/taskmgr/resource.h index bda48393a30..ebfc0ebbbaf 100644 --- a/base/applications/taskmgr/resource.h +++ b/base/applications/taskmgr/resource.h @@ -32,8 +32,6 @@ #define IDR_PROCESS_PAGE_CONTEXT 144 #define IDB_TRAYMASK 150 #define IDB_TRAYICON 153 -#define IDD_DEBUG_CHANNELS_DIALOG 155 -#define IDC_DEBUG_CHANNELS_LIST 156 #define IDC_ENDTASK 1012 #define IDC_SWITCHTO 1013

1 year, 7 months

[reactos] 01/01: [TASKMGR] de-DE.rc Update

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=142c35fcce133ab6cbcc4… commit 142c35fcce133ab6cbcc4454d4d3ba61e434c917 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Oct 3 02:47:10 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Oct 3 02:47:10 2023 +0200 [TASKMGR] de-DE.rc Update GRAPH == 'Anzeige'. Addendum to last commit --- base/applications/taskmgr/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index 3b5e687ffd8..943d9ef97ab 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -231,7 +231,7 @@ BEGIN PUSHBUTTON "CPU-Lastanzeige", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "Speicher-Lastanzeige", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "CPU-Lastverlaufsanzeige", IDC_CPU_USAGE_HISTORY_GRAPH, 81, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE - PUSHBUTTON "Speicher-Lastverlauf", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + PUSHBUTTON "Speicher-Lastanzeige", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210

1 year, 7 months

[reactos] 01/01: [TASKMGR] de-DE German Update & bug-fixes

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e15d68ba5d9906674b363… commit e15d68ba5d9906674b363cf8362ed08494e53a76 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Oct 3 02:05:28 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Oct 3 02:05:28 2023 +0200 [TASKMGR] de-DE German Update & bug-fixes This fixes several issues: - add a few missing translations, e.g. ID_PROCESS_PAGE_PROPERTIES & ID_PROCESS_PAGE_OPENFILELOCATION - IDS_TAB_PEAKMEMUSAGE translation was flipped with IDS_TAB_MEMDELTA - IDC_MEM_USAGE_FRAME had text truncation, fix that by structurally switching to "Speicher" - waste less space for the listview headers in the Processes tab so user can display more columns conveniently without the headers unnecessarily being crippled to "..." - Sync some controls sizes back to en-US in the performance tab - Translation for ID_VIEW_CPUHISTORY_ONEGRAPHALL and ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU was swapped accidentally - Strip comment lines in the end, which were outdated anyway - avoid monsters that not even a german person can read like "Auslagerungsdateiauslastungs-Verlaufsanzeige" which is like "Donaudampfschifffahrtselektrizitätenhauptbetriebswerkbauunterbeamtengesellschaft" --- base/applications/taskmgr/lang/de-DE.rc | 108 ++++++++++++++++---------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index ad0478fade4..3b5e687ffd8 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -1,4 +1,4 @@ -/* Deutsch resource file by Klemens Friedl */ +/* TRANSLATOR: Klemens Friedl */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -184,8 +184,8 @@ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "CPU-Auslastung", IDC_CPU_USAGE_FRAME, 5, 5, 67, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "Auslagerungsdatei", IDC_MEM_USAGE_FRAME, 5, 63, 67, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT // 5, 63, 60, 54 + GROUPBOX "CPU-Last", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "Speicher-Last", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Insgesamt", IDC_TOTALS_FRAME, 5, 122, 117, 39, 0, WS_EX_TRANSPARENT GROUPBOX "Zugesicherter Speicher (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 117, 39, 0, WS_EX_TRANSPARENT GROUPBOX "Physikalischer Speicher (KB)", IDC_PHYSICAL_MEMORY_FRAME, 126, 122, 117, 39, 0, WS_EX_TRANSPARENT @@ -199,39 +199,39 @@ BEGIN ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_PROCESS_COUNT, 71, 149, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Insgesamt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 50, 8 // 27 - LTEXT "Grenzwert", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 50, 8, NOT WS_BORDER // 15 - LTEXT "Maximalwert", IDS_COMMIT_CHARGE_PEAK, 12, 193, 50, 8 // 34 + LTEXT "Insgesamt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 50, 8 + LTEXT "Grenzwert", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 50, 8, NOT WS_BORDER + LTEXT "Maximalwert", IDS_COMMIT_CHARGE_PEAK, 12, 193, 50, 8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 71, 174, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 71, 184, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_PEAK, 71, 193, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Insgesamt", IDS_PHYSICAL_MEMORY_TOTAL, 133, 131, 50, 8 // 27 - LTEXT "Verfügbar", IDS_PHYSICAL_MEMORY_AVAILABLE, 133, 140, 50, 8 // 30 - LTEXT "Systemcache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 133, 149, 46, 8 // 46 + LTEXT "Insgesamt", IDS_PHYSICAL_MEMORY_TOTAL, 133, 131, 50, 8 + LTEXT "Verfügbar", IDS_PHYSICAL_MEMORY_AVAILABLE, 133, 140, 50, 8 + LTEXT "Systemcache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 133, 149, 46, 8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Insgesamt", IDS_KERNEL_MEMORY_TOTAL, 133, 174, 50, 8 // 27 - LTEXT "Ausgelagert", IDS_KERNEL_MEMORY_PAGED, 133, 184, 50, 8 // 21 - LTEXT "Nicht ausgelagert", IDS_KERNEL_MEMORY_NONPAGED, 133, 193, 60, 8 // 34 + LTEXT "Insgesamt", IDS_KERNEL_MEMORY_TOTAL, 133, 174, 50, 8 + LTEXT "Ausgelagert", IDS_KERNEL_MEMORY_PAGED, 133, 184, 50, 8 + LTEXT "Nicht ausgelagert", IDS_KERNEL_MEMORY_NONPAGED, 133, 193, 60, 8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - GROUPBOX "Verlauf der CPU-Auslastung", IDC_CPU_USAGE_HISTORY_FRAME, 76, 5, 166, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "Verlauf der Auslagerungsdateiauslastung", IDC_MEMORY_USAGE_HISTORY_FRAME, 76, 63, 166, 54, 0, WS_EX_TRANSPARENT - PUSHBUTTON "CPU-Auslastungsanzeige", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE - PUSHBUTTON "Auslagerungsdateiauslastungsanzeige", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE - PUSHBUTTON "CPU-Auslastungsverlaufsanzeige", IDC_CPU_USAGE_HISTORY_GRAPH, 82, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE - PUSHBUTTON "Auslagerungsdateiauslastungs-Verlaufsanzeige", IDC_MEM_USAGE_HISTORY_GRAPH, 82, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + GROUPBOX "CPU-Lastverlauf", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "Speicher-Lastverlauf", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT + PUSHBUTTON "CPU-Lastanzeige", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + PUSHBUTTON "Speicher-Lastanzeige", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + PUSHBUTTON "CPU-Lastverlaufsanzeige", IDC_CPU_USAGE_HISTORY_GRAPH, 81, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + PUSHBUTTON "Speicher-Lastverlauf", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 @@ -286,40 +286,40 @@ BEGIN CONTROL "CPU 31", IDC_CPU31, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 175, 119, 41, 10 END -IDD_COLUMNS_DIALOG DIALOGEX 0, 0, 240, 199 // 0, 0, 195, 199 +IDD_COLUMNS_DIALOG DIALOGEX 0, 0, 240, 199 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Spalten auswählen" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 124, 178, 50, 14 // 84 - PUSHBUTTON "Abbrechen", IDCANCEL, 178, 178, 50, 14 // 138 - LTEXT "Wählen Sie die Spalten aus, die auf der Registerkarte Prozesse angezeigt werden sollen.", IDC_STATIC, 7, 7, 221, 17 // 181 + DEFPUSHBUTTON "OK", IDOK, 124, 178, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 178, 178, 50, 14 + LTEXT "Wählen Sie die Spalten aus, die auf der Registerkarte Prozesse angezeigt werden sollen.", IDC_STATIC, 7, 7, 221, 17 CONTROL "&Name", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 CONTROL "&PID (Prozess-ID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 88, 10 - CONTROL "&CPU-Auslastung", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 80, 10 // 53 + CONTROL "&CPU %", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 80, 10 CONTROL "CP&U-Zeit", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 48, 10 - CONTROL "&Speicherauslastung", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 90, 10 // 63 - CONTROL "Verän&d. der Speicherauslastung", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10 // 82 - CONTROL "&Maximale Speicherauslastung", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 115, 10 // 82 + CONTROL "&Speicherlast", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 90, 10 + CONTROL "Verän&derung der Speicherlast", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10 + CONTROL "&Maximale Speicherlast", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 115, 10 CONTROL "S&eitenfehler", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 - CONTROL "BENUTZE&R-Objekte", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 90, 10 // 62 + CONTROL "BENUTZE&R-Objekte", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 90, 10 CONTROL "E/A (Lesen)", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 49, 10 - CONTROL "E/A-Bytes (Lesen)", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 80, 10 // 65 - CONTROL "S&itzungskennung", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 70, 10 // 50 - CONTROL "Benut&zername", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 70, 10 // 51 - CONTROL "Veränderung der Seiten&fehler", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 120, 10 // 107,60 - CONTROL "Größe des &virtuellen Speichers", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 120, 10 // 107, 60 - CONTROL "&Ausgelagerter Pool", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 80, 10 // 107, 53 - CONTROL "Nicht ausgelagerter P&ool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 // 107 - CONTROL "&Basispriorität", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 // 107 - CONTROL "&Handleanzahl", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 59, 10 // 107 - CONTROL "&Threadanzahl", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 59, 10 // 107 - CONTROL "GDI-Obje&kte", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 55, 10 // 107 - CONTROL "E/A (Schreiben)", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 90, 10 // 107 - CONTROL "E/A-Bytes (Schreiben)", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 105, 10 // 107 - CONTROL "E/A (Andere)", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 138, 105, 10 // 107 - CONTROL "E/A-Bytes (Andere)", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 149, 110, 10 // 107 - CONTROL "Befeh&lszeile", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 65, 10 // 107 + CONTROL "E/A-Bytes (Lesen)", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 80, 10 + CONTROL "S&itzungskennung", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 70, 10 + CONTROL "Benut&zername", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 70, 10 + CONTROL "Veränderung der Seiten&fehler", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 120, 10 + CONTROL "Größe des &virtuellen Speichers", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 120, 10 + CONTROL "&Ausgelagerter Pool", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 80, 10 + CONTROL "Nicht ausgelagerter P&ool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 + CONTROL "&Basispriorität", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 + CONTROL "&Handles", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 59, 10 + CONTROL "&Threads", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 59, 10 + CONTROL "GDI-Obje&kte", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 55, 10 + CONTROL "E/A (Schreiben)", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 90, 10 + CONTROL "E/A-Bytes (Schreiben)", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 105, 10 + CONTROL "E/A (Andere)", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 138, 105, 10 + CONTROL "E/A-Bytes (Andere)", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 149, 110, 10 + CONTROL "Befeh&lszeile", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 65, 10 END /* String Tables */ @@ -353,7 +353,7 @@ BEGIN ID_WINDOWS_TILEVERTICALLY "Ordnet die Fenster vertikal auf dem Desktop an." ID_WINDOWS_MINIMIZE "Minimiert die Fenster" ID_WINDOWS_MAXIMIZE "Maximiert die Fenster" - ID_WINDOWS_CASCADE "Ordnet die Fenster diagonal überlappend auf den Desktop an." + ID_WINDOWS_CASCADE "Ordnet die Fenster diagonal überlappend auf dem Desktop an." ID_WINDOWS_BRINGTOFRONT "Zeigt das Fenster im Vordergrund an, aber wechselt nicht zu diesem." ID_HELP_TOPICS "Zeigt die Hilfethemen des Taskmanagers an." ID_HELP_ABOUT "Zeigt Programminformationen, Versionsnummer und Copyright an." @@ -361,8 +361,8 @@ BEGIN ID_OPTIONS_SHOW16BITTASKS "Zeigt die 16-Bit-Tasks unter der zugehörigen ntvdm.exe an." ID_VIEW_SELECTCOLUMNS "Legt fest welche Spalten auf der Registerkarte Prozesse angezeigt werden." ID_VIEW_SHOWKERNELTIMES "Zeigt die Kernel-Zeiten in den Systemmonitordiagrammen an." - ID_VIEW_CPUHISTORY_ONEGRAPHALL "Zeigt für jede CPU-Auslastung ein Verlaufsdiagramm an." - ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Zeigt die gesamte CPU-Auslastung in einem Verlaufsdiagramm an." + ID_VIEW_CPUHISTORY_ONEGRAPHALL "Zeigt alle CPUs in demselben Lastverlaufsdiagramm an." + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Zeigt für jede CPU ein eigenes Lastverlaufsdiagramm an." ID_APPLICATION_PAGE_SWITCHTO "Zeigt das Fenster im Vordergrund an und wechselt zu diesem Task." END @@ -381,8 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Legt die Priorität auf NORMAL fest." ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Legt die Priorität auf NIEDRIGER ALS NORMAL fest." ID_PROCESS_PAGE_SETPRIORITY_LOW "Legt die Priorität auf NIEDRIG fest." - ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" - ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" + ID_PROCESS_PAGE_PROPERTIES "Zeigt die Dateieigenschaften an." + ID_PROCESS_PAGE_OPENFILELOCATION "Öffnet den übergeordneten Ordner." END STRINGTABLE @@ -396,19 +396,19 @@ BEGIN IDS_TAB_PID "PID" IDS_TAB_USERNAME "Benutzername" IDS_TAB_SESSIONID "Sitzungskennung" - IDS_TAB_CPU "CPU-Auslastung" + IDS_TAB_CPU "CPU %" IDS_TAB_CPUTIME "CPU-Zeit" - IDS_TAB_MEMUSAGE "Speicherauslastung" - IDS_TAB_PEAKMEMUSAGE "Veränd. der Speicherauslastung" - IDS_TAB_MEMDELTA "Maximale Speicherauslastung" + IDS_TAB_MEMUSAGE "Speicherlast" + IDS_TAB_PEAKMEMUSAGE "Maximale Speicherlast" + IDS_TAB_MEMDELTA "Veränderung der Speicherlast" IDS_TAB_PAGEFAULT "Seitenfehler" IDS_TAB_PFDELTA "Maximale Seitenfehler" IDS_TAB_VMSIZE "Virtuelle Arbeitsspeichergröße" IDS_TAB_PAGEDPOOL "Ausgelagerter Pool" IDS_TAB_NPPOOL "Nichtausgelagerter Pool" IDS_TAB_BASEPRI "Basispriorität" - IDS_TAB_HANDLES "Handleanzahl" - IDS_TAB_THREADS "Threadanzahl" + IDS_TAB_HANDLES "Handles" + IDS_TAB_THREADS "Threads" IDS_TAB_USERPBJECTS "Benutzer-Objekte" IDS_TAB_GDIOBJECTS "GDI-Objekte" IDS_TAB_IOREADS "E/A (Lesen)"

1 year, 7 months

[reactos] 02/02: [EXPLORER][COMCTL32] Fix balloon tooltips and system pager alerts (#5559)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e46a8673d7c82f42e381… commit 3e46a8673d7c82f42e3819f56de8a91e16354010 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 10 09:21:03 2023 -0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Oct 3 01:08:45 2023 +0300 [EXPLORER][COMCTL32] Fix balloon tooltips and system pager alerts (#5559) - [EXPLORER] Set maximum balloon width for notification area - [COMCTL32] Fix balloon tooltip shape - Limit balloon tooltips from extending past the edges of the monitor, not the edges of the work area. - Instead of simply repositioning the main rectangle when the balloon is too far towards one edge of the screen, try flipping the balloon the other way. This is the same behavior as Windows Server 2003. - Tweak some values used to draw the balloon tooltips to more closely follow the Windows balloon tooltip style. - Removing trailing whitespace. - While the new changes are guarded, consider cancelling our Wine sync for common controls. Our common controls are responsible for many graphical issues and lack of features throughout ReactOS. CORE-19109 --- base/shell/explorer/syspager.cpp | 8 +++--- dll/win32/comctl32/tooltips.c | 54 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 35eb0faf75f..b039f189101 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -21,6 +21,8 @@ #include "precomp.h" +#define BALLOON_MAXWIDTH 340 + struct InternalIconData : NOTIFYICONDATA { // Must keep a separate copy since the original is unioned with uTimeout. @@ -617,19 +619,19 @@ void CBalloonQueue::Show(Info& info) // TODO: NIF_REALTIME, NIIF_NOSOUND, other Vista+ flags - const int index = IndexOf(info.pSource); + m_current = info.pSource; RECT rc; - m_toolbar->GetItemRect(index, &rc); + m_toolbar->GetItemRect(IndexOf(m_current), &rc); m_toolbar->ClientToScreen(&rc); const WORD x = (rc.left + rc.right) / 2; const WORD y = (rc.top + rc.bottom) / 2; m_tooltips->SetTitle(info.szInfoTitle, info.uIcon); m_tooltips->TrackPosition(x, y); + m_tooltips->SetMaxTipWidth(BALLOON_MAXWIDTH); m_tooltips->UpdateTipText(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd), info.szInfo); m_tooltips->TrackActivate(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd)); - m_current = info.pSource; int timeout = info.uTimeout; if (timeout < MinTimeout) timeout = MinTimeout; if (timeout > MaxTimeout) timeout = MaxTimeout; diff --git a/dll/win32/comctl32/tooltips.c b/dll/win32/comctl32/tooltips.c index 0d89a0256f9..8c8ef43eb08 100644 --- a/dll/win32/comctl32/tooltips.c +++ b/dll/win32/comctl32/tooltips.c @@ -162,10 +162,17 @@ typedef struct #define BALLOON_TEXT_MARGIN (NORMAL_TEXT_MARGIN+8) /* value used for CreateRoundRectRgn that specifies how much * each corner is curved */ +#ifdef __REACTOS__ +#define BALLOON_ROUNDEDNESS 16 +#define BALLOON_STEMHEIGHT 18 +#define BALLOON_STEMWIDTH 18 +#define BALLOON_STEMINDENT 16 +#else #define BALLOON_ROUNDEDNESS 20 #define BALLOON_STEMHEIGHT 13 #define BALLOON_STEMWIDTH 10 #define BALLOON_STEMINDENT 20 +#endif // __REACTOS__ #define BALLOON_ICON_TITLE_SPACING 8 /* horizontal spacing between icon and title */ #define BALLOON_TITLE_TEXT_SPACING 8 /* vertical spacing between icon/title and main text */ @@ -741,6 +748,40 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); +#ifdef __REACTOS__ + if (rect.right > mon_info.rcMonitor.right) + { + rect.left -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); + rect.right -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); + if (rect.right > mon_info.rcMonitor.right) + { + rect.left -= (rect.right - mon_info.rcMonitor.right); + rect.right = mon_info.rcMonitor.right; + } + } + + if (rect.left < mon_info.rcMonitor.left) + { + rect.right += abs(rect.left); + rect.left = 0; + } + + if (rect.bottom > mon_info.rcMonitor.bottom) + { + RECT rc; + if (toolPtr->uFlags & TTF_IDISHWND) + { + GetWindowRect((HWND)toolPtr->uId, &rc); + } + else + { + rc = toolPtr->rect; + MapWindowPoints(toolPtr->hwnd, NULL, (LPPOINT)&rc, 2); + } + rect.bottom = rc.top - 2; + rect.top = rect.bottom - size.cy; + } +#else if( rect.right > mon_info.rcWork.right ) { rect.left -= rect.right - mon_info.rcWork.right + 2; rect.right = mon_info.rcWork.right - 2; @@ -759,6 +800,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) rect.bottom = rc.top - 2; rect.top = rect.bottom - size.cy; } +#endif // __REACTOS__ AdjustWindowRectEx (&rect, GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE), FALSE, GetWindowLongW (infoPtr->hwndSelf, GWL_EXSTYLE)); @@ -775,7 +817,11 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) { pts[0].x = ptfx; pts[0].y = 0; +#ifdef __REACTOS__ + pts[1].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); +#else pts[1].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); +#endif pts[1].y = BALLOON_STEMHEIGHT; pts[2].x = pts[1].x + BALLOON_STEMWIDTH; pts[2].y = pts[1].y; @@ -787,7 +833,11 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) } else { +#ifdef __REACTOS__ + pts[0].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); +#else pts[0].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); +#endif pts[0].y = (rect.bottom - rect.top) - BALLOON_STEMHEIGHT; pts[1].x = pts[0].x + BALLOON_STEMWIDTH; pts[1].y = pts[0].y; @@ -805,7 +855,11 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) hRgn = CreateRoundRectRgn(0, (infoPtr->bToolBelow ? BALLOON_STEMHEIGHT : 0), rect.right - rect.left, +#ifdef __REACTOS__ + (infoPtr->bToolBelow ? rect.bottom - rect.top : rect.bottom - rect.top - BALLOON_STEMHEIGHT + 1), +#else (infoPtr->bToolBelow ? rect.bottom - rect.top : rect.bottom - rect.top - BALLOON_STEMHEIGHT), +#endif BALLOON_ROUNDEDNESS, BALLOON_ROUNDEDNESS); CombineRgn(hRgn, hRgn, hrStem, RGN_OR);

1 year, 7 months

[reactos] 01/02: [REACTOS] Revert badly formatted commits

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f53be821586dfd6bb66b3… commit f53be821586dfd6bb66b34be439f8cf2bc73b18e Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Oct 3 01:00:07 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Oct 3 01:00:07 2023 +0300 [REACTOS] Revert badly formatted commits This reverts commits ab1868c7bf7f700f9363a5553cb07d73b9ea962b and 1aa76275ac7aac74ef3b4d9a05e55ef9fcf7fd7b. --- base/shell/explorer/syspager.cpp | 8 +++--- dll/win32/comctl32/tooltips.c | 54 ---------------------------------------- 2 files changed, 3 insertions(+), 59 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index b039f189101..35eb0faf75f 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -21,8 +21,6 @@ #include "precomp.h" -#define BALLOON_MAXWIDTH 340 - struct InternalIconData : NOTIFYICONDATA { // Must keep a separate copy since the original is unioned with uTimeout. @@ -619,19 +617,19 @@ void CBalloonQueue::Show(Info& info) // TODO: NIF_REALTIME, NIIF_NOSOUND, other Vista+ flags - m_current = info.pSource; + const int index = IndexOf(info.pSource); RECT rc; - m_toolbar->GetItemRect(IndexOf(m_current), &rc); + m_toolbar->GetItemRect(index, &rc); m_toolbar->ClientToScreen(&rc); const WORD x = (rc.left + rc.right) / 2; const WORD y = (rc.top + rc.bottom) / 2; m_tooltips->SetTitle(info.szInfoTitle, info.uIcon); m_tooltips->TrackPosition(x, y); - m_tooltips->SetMaxTipWidth(BALLOON_MAXWIDTH); m_tooltips->UpdateTipText(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd), info.szInfo); m_tooltips->TrackActivate(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd)); + m_current = info.pSource; int timeout = info.uTimeout; if (timeout < MinTimeout) timeout = MinTimeout; if (timeout > MaxTimeout) timeout = MaxTimeout; diff --git a/dll/win32/comctl32/tooltips.c b/dll/win32/comctl32/tooltips.c index 8c8ef43eb08..0d89a0256f9 100644 --- a/dll/win32/comctl32/tooltips.c +++ b/dll/win32/comctl32/tooltips.c @@ -162,17 +162,10 @@ typedef struct #define BALLOON_TEXT_MARGIN (NORMAL_TEXT_MARGIN+8) /* value used for CreateRoundRectRgn that specifies how much * each corner is curved */ -#ifdef __REACTOS__ -#define BALLOON_ROUNDEDNESS 16 -#define BALLOON_STEMHEIGHT 18 -#define BALLOON_STEMWIDTH 18 -#define BALLOON_STEMINDENT 16 -#else #define BALLOON_ROUNDEDNESS 20 #define BALLOON_STEMHEIGHT 13 #define BALLOON_STEMWIDTH 10 #define BALLOON_STEMINDENT 20 -#endif // __REACTOS__ #define BALLOON_ICON_TITLE_SPACING 8 /* horizontal spacing between icon and title */ #define BALLOON_TITLE_TEXT_SPACING 8 /* vertical spacing between icon/title and main text */ @@ -748,40 +741,6 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); -#ifdef __REACTOS__ - if (rect.right > mon_info.rcMonitor.right) - { - rect.left -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); - rect.right -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); - if (rect.right > mon_info.rcMonitor.right) - { - rect.left -= (rect.right - mon_info.rcMonitor.right); - rect.right = mon_info.rcMonitor.right; - } - } - - if (rect.left < mon_info.rcMonitor.left) - { - rect.right += abs(rect.left); - rect.left = 0; - } - - if (rect.bottom > mon_info.rcMonitor.bottom) - { - RECT rc; - if (toolPtr->uFlags & TTF_IDISHWND) - { - GetWindowRect((HWND)toolPtr->uId, &rc); - } - else - { - rc = toolPtr->rect; - MapWindowPoints(toolPtr->hwnd, NULL, (LPPOINT)&rc, 2); - } - rect.bottom = rc.top - 2; - rect.top = rect.bottom - size.cy; - } -#else if( rect.right > mon_info.rcWork.right ) { rect.left -= rect.right - mon_info.rcWork.right + 2; rect.right = mon_info.rcWork.right - 2; @@ -800,7 +759,6 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) rect.bottom = rc.top - 2; rect.top = rect.bottom - size.cy; } -#endif // __REACTOS__ AdjustWindowRectEx (&rect, GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE), FALSE, GetWindowLongW (infoPtr->hwndSelf, GWL_EXSTYLE)); @@ -817,11 +775,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) { pts[0].x = ptfx; pts[0].y = 0; -#ifdef __REACTOS__ - pts[1].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); -#else pts[1].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); -#endif pts[1].y = BALLOON_STEMHEIGHT; pts[2].x = pts[1].x + BALLOON_STEMWIDTH; pts[2].y = pts[1].y; @@ -833,11 +787,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) } else { -#ifdef __REACTOS__ - pts[0].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); -#else pts[0].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); -#endif pts[0].y = (rect.bottom - rect.top) - BALLOON_STEMHEIGHT; pts[1].x = pts[0].x + BALLOON_STEMWIDTH; pts[1].y = pts[0].y; @@ -855,11 +805,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) hRgn = CreateRoundRectRgn(0, (infoPtr->bToolBelow ? BALLOON_STEMHEIGHT : 0), rect.right - rect.left, -#ifdef __REACTOS__ - (infoPtr->bToolBelow ? rect.bottom - rect.top : rect.bottom - rect.top - BALLOON_STEMHEIGHT + 1), -#else (infoPtr->bToolBelow ? rect.bottom - rect.top : rect.bottom - rect.top - BALLOON_STEMHEIGHT), -#endif BALLOON_ROUNDEDNESS, BALLOON_ROUNDEDNESS); CombineRgn(hRgn, hRgn, hrStem, RGN_OR);

1 year, 7 months

[reactos] 01/01: [BROWSEUI] More settings and window refresh (#5584)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f744bb29946167810a81c… commit f744bb29946167810a81c093bad6d4e5bf6bdf8a Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Mon Oct 2 14:43:00 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 2 22:43:00 2023 +0200 [BROWSEUI] More settings and window refresh (#5584) Adds the option to set the address edit box to use the display name or the full path. Also refreshes the window title and edit box in all open explorer windows when changing these settings using the folder options dialog. ## PROPOSED CHANGES ## - Create a new CabinetStateSettings type that inherits from the CABINETSTATE type. This allows us to add additional cabinet state settings not exposed in the CABINETSTATE type as well as adding a Load() method to easily populate the cabinet state settings. - Add a global cabinet state settings object. While most settings in browseui are stored independently in each shellbrowser window, cabinet state settings are global and apply to every shellbrowser window. This can be confirmed on Windows Server 2003 and Windows 7. - When receiving the WM_SETTINGCHANGE window message from the folder options dialog, refresh the title of the window and the text in the address edit box. This is the same behavior as Windows Server 2003 and Windows 7. Add a DWORD registry value to HKCU\...\Explorer\CabinetState\FullPathAddress to allow users to toggle this setting on or off in our folder options. CORE-9277 --- boot/bootdata/hivedef.inf | 1 + dll/win32/browseui/addresseditbox.cpp | 22 ++++----- dll/win32/browseui/addresseditbox.h | 2 + dll/win32/browseui/browseui.h | 1 + dll/win32/browseui/precomp.h | 15 +----- dll/win32/browseui/settings.cpp | 20 ++++++-- dll/win32/browseui/settings.h | 30 ++++++++++++ dll/win32/browseui/shellbrowser.cpp | 90 +++++++++++++++++------------------ 8 files changed, 104 insertions(+), 77 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 6551f5a7701..57b7ea8d2f0 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1901,6 +1901,7 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","Hidden",0x00 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ShowSuperHidden",0x00010003,0 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CabinetState",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CabinetState","FullPath",0x00010003,0 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CabinetState","FullPathAddress",0x00010003,1 HKCU,"SOFTWARE\Microsoft\Internet Explorer\Main","StatusBarOther",0x00010003,1 HKCU,"SOFTWARE\Microsoft\Internet Explorer\Toolbar","Locked",0x00010003,1 diff --git a/dll/win32/browseui/addresseditbox.cpp b/dll/win32/browseui/addresseditbox.cpp index 6051b43fb5b..cec978c191e 100644 --- a/dll/win32/browseui/addresseditbox.cpp +++ b/dll/win32/browseui/addresseditbox.cpp @@ -130,18 +130,12 @@ HRESULT CAddressEditBox::RefreshAddress() /* Set the path if filesystem; otherwise use the name */ WCHAR szPathOrName[MAX_PATH]; - if (!SHGetPathFromIDListW(absolutePIDL, szPathOrName)) - { - STRRET ret; - hr = pShellFolder->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR | SHGDN_FORPARSING, &ret); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + SHGDNF flags = SHGDN_FORADDRESSBAR; + if (gCabinetState.fFullPathAddress) + flags |= SHGDN_FORPARSING; - hr = StrRetToBufW(&ret, pidlChild, szPathOrName, _countof(szPathOrName)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - } - item.pszText = szPathOrName; + if (SUCCEEDED(IEGetNameAndFlags(absolutePIDL, flags, szPathOrName, _countof(szPathOrName), NULL))) + item.pszText = szPathOrName; /* Ownership of absolutePIDL will be moved to fCombobox. See CBEN_DELETEITEM */ item.lParam = reinterpret_cast<LPARAM>(absolutePIDL.Detach()); @@ -644,3 +638,9 @@ LPITEMIDLIST CAddressEditBox::GetItemData(int index) SendMessageW(hComboBoxEx, CBEM_GETITEMW, 0, (LPARAM)&item); return (LPITEMIDLIST)item.lParam; } + +LRESULT CAddressEditBox::OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + RefreshAddress(); + return NO_ERROR; +} diff --git a/dll/win32/browseui/addresseditbox.h b/dll/win32/browseui/addresseditbox.h index 336f38ff0c9..beb043e1e1e 100644 --- a/dll/win32/browseui/addresseditbox.h +++ b/dll/win32/browseui/addresseditbox.h @@ -91,6 +91,7 @@ public: virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize); // message handlers + LRESULT OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); DECLARE_REGISTRY_RESOURCEID(IDR_ADDRESSEDITBOX) DECLARE_NOT_AGGREGATABLE(CAddressEditBox) @@ -98,6 +99,7 @@ public: DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_MSG_MAP(CAddressEditBox) + MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChange) END_MSG_MAP() BEGIN_COM_MAP(CAddressEditBox) diff --git a/dll/win32/browseui/browseui.h b/dll/win32/browseui/browseui.h index 02d75a25e16..46907ad0ad7 100644 --- a/dll/win32/browseui/browseui.h +++ b/dll/win32/browseui/browseui.h @@ -24,3 +24,4 @@ HRESULT CTravelLog_CreateInstance(REFIID riid, void **ppv); HRESULT CBaseBar_CreateInstance(REFIID riid, void **ppv, BOOL vertical); HRESULT CBaseBarSite_CreateInstance(REFIID riid, void **ppv, BOOL bVertical); HRESULT CToolsBand_CreateInstance(REFIID riid, void **ppv); +HRESULT IEGetNameAndFlags(LPITEMIDLIST pidl, SHGDNF uFlags, LPWSTR pszBuf, UINT cchBuf, SFGAOF *rgfInOut); diff --git a/dll/win32/browseui/precomp.h b/dll/win32/browseui/precomp.h index c3c26e7115d..cfed44eef59 100644 --- a/dll/win32/browseui/precomp.h +++ b/dll/win32/browseui/precomp.h @@ -36,10 +36,7 @@ #include <wine/debug.h> #include "resource.h" - -#define BWM_SETTINGCHANGE (WM_USER + 300) -#define BWM_GETSETTINGSPTR (WM_USER + 301) -struct ShellSettings; +#include "settings.h" #include "ACLCustomMRU.h" #include "aclhistory.h" @@ -69,14 +66,4 @@ struct ShellSettings; WINE_DEFAULT_DEBUG_CHANNEL(browseui); -struct ShellSettings -{ - BOOL fLocked = FALSE; - BOOL fShowGoButton = FALSE; - BOOL fStatusBarVisible = FALSE; - - BOOL Save(); - BOOL Load(); -}; - #endif /* _BROWSEUI_PCH_ */ diff --git a/dll/win32/browseui/settings.cpp b/dll/win32/browseui/settings.cpp index de7e6c04480..65af70c950e 100644 --- a/dll/win32/browseui/settings.cpp +++ b/dll/win32/browseui/settings.cpp @@ -7,7 +7,9 @@ #include "precomp.h" -BOOL ShellSettings::Save() +CabinetStateSettings gCabinetState; + +void ShellSettings::Save() { SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"StatusBarOther", REG_DWORD, &fStatusBarVisible, sizeof(fStatusBarVisible), SHREGSET_FORCE_HKCU); @@ -17,11 +19,9 @@ BOOL ShellSettings::Save() SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", L"Locked", REG_DWORD, &fLocked, sizeof(fLocked), SHREGSET_FORCE_HKCU); - - return TRUE; } -BOOL ShellSettings::Load() +void ShellSettings::Load() { fStatusBarVisible = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"StatusBarOther", FALSE, FALSE); @@ -31,6 +31,16 @@ BOOL ShellSettings::Load() fLocked = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", L"Locked", FALSE, TRUE); +} + +void CabinetStateSettings::Load() +{ + ReadCabinetState(this, this->cLength); + + /* Overrides */ + fFullPathTitle = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", + L"FullPath", FALSE, FALSE); - return TRUE; + fFullPathAddress = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", + L"FullPathAddress", FALSE, TRUE); } diff --git a/dll/win32/browseui/settings.h b/dll/win32/browseui/settings.h new file mode 100644 index 00000000000..38e58c1fe99 --- /dev/null +++ b/dll/win32/browseui/settings.h @@ -0,0 +1,30 @@ +/* + * PROJECT: ReactOS browseui + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Settings header file + * COPYRIGHT: Copyright 2023 Carl Bialorucki <cbialo2(a)outlook.com> + */ + +#include "precomp.h" + +#define BWM_SETTINGCHANGE (WM_USER + 300) +#define BWM_GETSETTINGSPTR (WM_USER + 301) + +struct ShellSettings +{ + BOOL fLocked = FALSE; + BOOL fShowGoButton = FALSE; + BOOL fStatusBarVisible = FALSE; + + void Save(); + void Load(); +}; + +struct CabinetStateSettings : CABINETSTATE +{ + BOOL fFullPathAddress = TRUE; + + void Load(); +}; + +extern CabinetStateSettings gCabinetState; diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 9c8edff1822..114d6c59553 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -296,7 +296,6 @@ private: barInfo fClientBars[3]; CComPtr<ITravelLog> fTravelLog; HMENU fCurrentMenuBar; - CABINETSTATE fCabinetState; GUID fCurrentVertBar; //The guid of the built in vertical bar that is being shown // The next three fields support persisted history for shell views. // They do not need to be reference counted. @@ -350,7 +349,8 @@ public: HRESULT UpdateUpState(); void UpdateGotoMenu(HMENU theMenu); void UpdateViewMenu(HMENU theMenu); - void LoadCabinetState(); + void RefreshCabinetState(); + void UpdateWindowTitle(); /* // *** IDockingWindowFrame methods *** virtual HRESULT STDMETHODCALLTYPE AddToolbar(IUnknown *punkSrc, LPCWSTR pwszItem, DWORD dwAddFlags); @@ -721,6 +721,7 @@ CShellBrowser::CShellBrowser() fHistoryStream = NULL; fHistoryBindContext = NULL; m_settings.Load(); + gCabinetState.Load(); } CShellBrowser::~CShellBrowser() @@ -741,11 +742,6 @@ HRESULT CShellBrowser::Initialize() if (!menuDsa) return E_OUTOFMEMORY; - fCabinetState.cLength = sizeof(fCabinetState); - if (ReadCabinetState(&fCabinetState, sizeof(fCabinetState)) == FALSE) - { - } - // create window Create(HWND_DESKTOP); if (m_hWnd == NULL) @@ -790,8 +786,6 @@ HRESULT CShellBrowser::Initialize() fToolbarProxy.Initialize(m_hWnd, clientBar); - LoadCabinetState(); - // create status bar DWORD dwStatusStyle = WS_CHILD | WS_CLIPSIBLINGS | SBARS_SIZEGRIP | SBARS_TOOLTIPS; if (m_settings.fStatusBarVisible) @@ -923,7 +917,7 @@ cleanup: return hResult; } -long IEGetNameAndFlags(LPITEMIDLIST pidl, SHGDNF uFlags, LPWSTR pszBuf, UINT cchBuf, SFGAOF *rgfInOut) +HRESULT IEGetNameAndFlags(LPITEMIDLIST pidl, SHGDNF uFlags, LPWSTR pszBuf, UINT cchBuf, SFGAOF *rgfInOut) { return IEGetNameAndFlagsEx(pidl, uFlags, 0, pszBuf, cchBuf, rgfInOut); } @@ -1051,42 +1045,33 @@ HRESULT CShellBrowser::BrowseToPath(IShellFolder *newShellFolder, FireNavigateComplete(L"ERROR"); } - if (fCabinetState.fFullPathTitle) - nameFlags = SHGDN_FORADDRESSBAR | SHGDN_FORPARSING; - else - nameFlags = SHGDN_FORADDRESSBAR; - hResult = IEGetNameAndFlags(fCurrentDirectoryPIDL, nameFlags, newTitle, - sizeof(newTitle) / sizeof(wchar_t), NULL); - if (SUCCEEDED(hResult)) - { - SetWindowText(newTitle); + UpdateWindowTitle(); - LPCITEMIDLIST pidlChild; - INT index, indexOpen; - HIMAGELIST himlSmall, himlLarge; + LPCITEMIDLIST pidlChild; + INT index, indexOpen; + HIMAGELIST himlSmall, himlLarge; - CComPtr<IShellFolder> sf; - hResult = SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); - if (SUCCEEDED(hResult)) - { - index = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); + CComPtr<IShellFolder> sf; + hResult = SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); + if (SUCCEEDED(hResult)) + { + index = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); - Shell_GetImageLists(&himlLarge, &himlSmall); + Shell_GetImageLists(&himlLarge, &himlSmall); - HICON icSmall = ImageList_GetIcon(himlSmall, indexOpen, 0); - HICON icLarge = ImageList_GetIcon(himlLarge, indexOpen, 0); + HICON icSmall = ImageList_GetIcon(himlSmall, indexOpen, 0); + HICON icLarge = ImageList_GetIcon(himlLarge, indexOpen, 0); - /* Hack to make it possible to release the old icons */ - /* Something seems to go wrong with WM_SETICON */ - HICON oldSmall = (HICON)SendMessage(WM_GETICON, ICON_SMALL, 0); - HICON oldLarge = (HICON)SendMessage(WM_GETICON, ICON_BIG, 0); + /* Hack to make it possible to release the old icons */ + /* Something seems to go wrong with WM_SETICON */ + HICON oldSmall = (HICON)SendMessage(WM_GETICON, ICON_SMALL, 0); + HICON oldLarge = (HICON)SendMessage(WM_GETICON, ICON_BIG, 0); - SendMessage(WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(icSmall)); - SendMessage(WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(icLarge)); + SendMessage(WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(icSmall)); + SendMessage(WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(icLarge)); - DestroyIcon(oldSmall); - DestroyIcon(oldLarge); - } + DestroyIcon(oldSmall); + DestroyIcon(oldLarge); } FireCommandStateChangeAll(); @@ -1524,14 +1509,6 @@ void CShellBrowser::RepositionBars() clientRect.bottom - clientRect.top, SWP_NOOWNERZORDER | SWP_NOZORDER); } -void CShellBrowser::LoadCabinetState() -{ - fCabinetState.fFullPathTitle = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", - L"FullPath", - FALSE, - FALSE); -} - HRESULT CShellBrowser::FireEvent(DISPID dispIdMember, int argCount, VARIANT *arguments) { DISPPARAMS params; @@ -3600,6 +3577,7 @@ LRESULT CShellBrowser::RelayMsgToShellView(UINT uMsg, WPARAM wParam, LPARAM lPar LRESULT CShellBrowser::OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { + RefreshCabinetState(); SHPropagateMessage(m_hWnd, uMsg, wParam, lParam, TRUE); return 0; } @@ -3860,3 +3838,21 @@ HRESULT CShellBrowser_CreateInstance(REFIID riid, void **ppv) { return ShellObjectCreatorInit<CShellBrowser>(riid, ppv); } + +void CShellBrowser::RefreshCabinetState() +{ + gCabinetState.Load(); + UpdateWindowTitle(); +} + +void CShellBrowser::UpdateWindowTitle() +{ + WCHAR title[MAX_PATH]; + SHGDNF flags = SHGDN_FORADDRESSBAR; + + if (gCabinetState.fFullPathTitle) + flags |= SHGDN_FORPARSING; + + if (SUCCEEDED(IEGetNameAndFlags(fCurrentDirectoryPIDL, flags, title, _countof(title), NULL))) + SetWindowText(title); +}

1 year, 7 months

[reactos] 02/02: Fix balloon tooltip shape

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1aa76275ac7aac74ef3b4… commit 1aa76275ac7aac74ef3b4d9a05e55ef9fcf7fd7b Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 10 09:21:03 2023 -0600 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Mon Oct 2 22:39:10 2023 +0200 Fix balloon tooltip shape --- dll/win32/comctl32/tooltips.c | 54 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dll/win32/comctl32/tooltips.c b/dll/win32/comctl32/tooltips.c index 0d89a0256f9..8c8ef43eb08 100644 --- a/dll/win32/comctl32/tooltips.c +++ b/dll/win32/comctl32/tooltips.c @@ -162,10 +162,17 @@ typedef struct #define BALLOON_TEXT_MARGIN (NORMAL_TEXT_MARGIN+8) /* value used for CreateRoundRectRgn that specifies how much * each corner is curved */ +#ifdef __REACTOS__ +#define BALLOON_ROUNDEDNESS 16 +#define BALLOON_STEMHEIGHT 18 +#define BALLOON_STEMWIDTH 18 +#define BALLOON_STEMINDENT 16 +#else #define BALLOON_ROUNDEDNESS 20 #define BALLOON_STEMHEIGHT 13 #define BALLOON_STEMWIDTH 10 #define BALLOON_STEMINDENT 20 +#endif // __REACTOS__ #define BALLOON_ICON_TITLE_SPACING 8 /* horizontal spacing between icon and title */ #define BALLOON_TITLE_TEXT_SPACING 8 /* vertical spacing between icon/title and main text */ @@ -741,6 +748,40 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); +#ifdef __REACTOS__ + if (rect.right > mon_info.rcMonitor.right) + { + rect.left -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); + rect.right -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); + if (rect.right > mon_info.rcMonitor.right) + { + rect.left -= (rect.right - mon_info.rcMonitor.right); + rect.right = mon_info.rcMonitor.right; + } + } + + if (rect.left < mon_info.rcMonitor.left) + { + rect.right += abs(rect.left); + rect.left = 0; + } + + if (rect.bottom > mon_info.rcMonitor.bottom) + { + RECT rc; + if (toolPtr->uFlags & TTF_IDISHWND) + { + GetWindowRect((HWND)toolPtr->uId, &rc); + } + else + { + rc = toolPtr->rect; + MapWindowPoints(toolPtr->hwnd, NULL, (LPPOINT)&rc, 2); + } + rect.bottom = rc.top - 2; + rect.top = rect.bottom - size.cy; + } +#else if( rect.right > mon_info.rcWork.right ) { rect.left -= rect.right - mon_info.rcWork.right + 2; rect.right = mon_info.rcWork.right - 2; @@ -759,6 +800,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) rect.bottom = rc.top - 2; rect.top = rect.bottom - size.cy; } +#endif // __REACTOS__ AdjustWindowRectEx (&rect, GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE), FALSE, GetWindowLongW (infoPtr->hwndSelf, GWL_EXSTYLE)); @@ -775,7 +817,11 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) { pts[0].x = ptfx; pts[0].y = 0; +#ifdef __REACTOS__ + pts[1].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); +#else pts[1].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); +#endif pts[1].y = BALLOON_STEMHEIGHT; pts[2].x = pts[1].x + BALLOON_STEMWIDTH; pts[2].y = pts[1].y; @@ -787,7 +833,11 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) } else { +#ifdef __REACTOS__ + pts[0].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); +#else pts[0].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); +#endif pts[0].y = (rect.bottom - rect.top) - BALLOON_STEMHEIGHT; pts[1].x = pts[0].x + BALLOON_STEMWIDTH; pts[1].y = pts[0].y; @@ -805,7 +855,11 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) hRgn = CreateRoundRectRgn(0, (infoPtr->bToolBelow ? BALLOON_STEMHEIGHT : 0), rect.right - rect.left, +#ifdef __REACTOS__ + (infoPtr->bToolBelow ? rect.bottom - rect.top : rect.bottom - rect.top - BALLOON_STEMHEIGHT + 1), +#else (infoPtr->bToolBelow ? rect.bottom - rect.top : rect.bottom - rect.top - BALLOON_STEMHEIGHT), +#endif BALLOON_ROUNDEDNESS, BALLOON_ROUNDEDNESS); CombineRgn(hRgn, hRgn, hrStem, RGN_OR);

1 year, 7 months

[reactos] 01/02: Set maximum balloon width for notification area

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab1868c7bf7f700f9363a… commit ab1868c7bf7f700f9363a5553cb07d73b9ea962b Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 10 09:21:03 2023 -0600 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Mon Oct 2 22:39:10 2023 +0200 Set maximum balloon width for notification area --- base/shell/explorer/syspager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 35eb0faf75f..b039f189101 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -21,6 +21,8 @@ #include "precomp.h" +#define BALLOON_MAXWIDTH 340 + struct InternalIconData : NOTIFYICONDATA { // Must keep a separate copy since the original is unioned with uTimeout. @@ -617,19 +619,19 @@ void CBalloonQueue::Show(Info& info) // TODO: NIF_REALTIME, NIIF_NOSOUND, other Vista+ flags - const int index = IndexOf(info.pSource); + m_current = info.pSource; RECT rc; - m_toolbar->GetItemRect(index, &rc); + m_toolbar->GetItemRect(IndexOf(m_current), &rc); m_toolbar->ClientToScreen(&rc); const WORD x = (rc.left + rc.right) / 2; const WORD y = (rc.top + rc.bottom) / 2; m_tooltips->SetTitle(info.szInfoTitle, info.uIcon); m_tooltips->TrackPosition(x, y); + m_tooltips->SetMaxTipWidth(BALLOON_MAXWIDTH); m_tooltips->UpdateTipText(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd), info.szInfo); m_tooltips->TrackActivate(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd)); - m_current = info.pSource; int timeout = info.uTimeout; if (timeout < MinTimeout) timeout = MinTimeout; if (timeout > MaxTimeout) timeout = MaxTimeout;

1 year, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs