Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [EXPLORER] Set icon size and show or hide desktop button from taskbar properties (#5510)
by Carl J. Bialorucki 10 Aug '23

10 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28ae9fb73841e917a7c49… commit 28ae9fb73841e917a7c49d8e2b88a77f911dc895 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 10 09:06:55 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 10 17:06:55 2023 +0200 [EXPLORER] Set icon size and show or hide desktop button from taskbar properties (#5510) CORE-11698, CORE-15369 Allows a user to set the icon size and show or hide the desktop button in the taskbar using the taskbar properties menu. After applying these changes, the taskbar updates and resizes without requiring a restart. - This PR moves the 'Notification Area' section into its own separate tab. This allows us to include more options for users without increasing the size of the window. It is also very similar to the Windows Vista taskbar properties menu. - Some minor changes to allow the taskbar to refresh its view when the icon size or show desktop button setting changes. --- base/shell/explorer/lang/bg-BG.rc | 27 ++++-- base/shell/explorer/lang/cs-CZ.rc | 27 ++++-- base/shell/explorer/lang/de-DE.rc | 27 ++++-- base/shell/explorer/lang/en-US.rc | 27 ++++-- base/shell/explorer/lang/es-ES.rc | 51 ++++++----- base/shell/explorer/lang/et-EE.rc | 27 ++++-- base/shell/explorer/lang/eu-ES.rc | 27 ++++-- base/shell/explorer/lang/fi-FI.rc | 27 ++++-- base/shell/explorer/lang/fr-FR.rc | 27 ++++-- base/shell/explorer/lang/he-IL.rc | 27 ++++-- base/shell/explorer/lang/hi-IN.rc | 27 ++++-- base/shell/explorer/lang/hu-HU.rc | 27 ++++-- base/shell/explorer/lang/id-ID.rc | 27 ++++-- base/shell/explorer/lang/it-IT.rc | 27 ++++-- base/shell/explorer/lang/ja-JP.rc | 27 ++++-- base/shell/explorer/lang/ko-KR.rc | 27 ++++-- base/shell/explorer/lang/lt-LT.rc | 28 ++++-- base/shell/explorer/lang/ms-MY.rc | 27 ++++-- base/shell/explorer/lang/nl-NL.rc | 27 ++++-- base/shell/explorer/lang/no-NO.rc | 28 ++++-- base/shell/explorer/lang/pl-PL.rc | 27 ++++-- base/shell/explorer/lang/pt-BR.rc | 27 ++++-- base/shell/explorer/lang/pt-PT.rc | 27 ++++-- base/shell/explorer/lang/ro-RO.rc | 27 ++++-- base/shell/explorer/lang/ru-RU.rc | 27 ++++-- base/shell/explorer/lang/sk-SK.rc | 27 ++++-- base/shell/explorer/lang/sq-AL.rc | 27 ++++-- base/shell/explorer/lang/tr-TR.rc | 27 ++++-- base/shell/explorer/lang/uk-UA.rc | 27 ++++-- base/shell/explorer/lang/zh-CN.rc | 27 ++++-- base/shell/explorer/lang/zh-HK.rc | 27 ++++-- base/shell/explorer/lang/zh-TW.rc | 27 ++++-- base/shell/explorer/precomp.h | 1 + base/shell/explorer/resource.h | 33 +++++--- base/shell/explorer/settings.cpp | 4 + base/shell/explorer/taskswnd.cpp | 14 ++- base/shell/explorer/trayprop.cpp | 173 +++++++++++++++++++++++++------------- base/shell/explorer/traywnd.cpp | 25 +++--- 38 files changed, 787 insertions(+), 353 deletions(-) diff --git a/base/shell/explorer/lang/bg-BG.rc b/base/shell/explorer/lang/bg-BG.rc index 6bf40cd0ca3..f4efc7fc621 100644 --- a/base/shell/explorer/lang/bg-BG.rc +++ b/base/shell/explorer/lang/bg-BG.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Лентата със задачите" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Изглед на лентата със задачите", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Изглед на лентата със задачите", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Заключване на лентата със задачите", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Автоматично скриване на лентата със задачите", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Лентата със задачите стои над останалите прозорци", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "Групиране на приложенията в лентата със задачите", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Показване на бърз старт", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Зона за уведомления", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Часовник", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Покажи секундите", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Можете да поддържате лентата подредена, като скривате приложенията, върху които скоро не сте стартирали.", IDC_STATIC, 13, 169, 223, 16, WS_DISABLED - AUTOCHECKBOX "Скриване на неактивните иконки", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "Персонализиране...", IDC_TASKBARPROP_ICONCUST, 168, 191, 70, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "&Персонализиране...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Зона за уведомления" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Можете да поддържате лентата подредена, като скривате приложенията, върху които скоро не сте стартирали.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Скриване на неактивните иконки", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "Персонализиране...", IDC_TASKBARPROP_ICONCUST, 168, 70, 70, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Часовник", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Покажи секундите", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/cs-CZ.rc b/base/shell/explorer/lang/cs-CZ.rc index 087b85b75fc..af53b5a26dc 100644 --- a/base/shell/explorer/lang/cs-CZ.rc +++ b/base/shell/explorer/lang/cs-CZ.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Hlavní panel" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Vzhled hlavního panelu", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Vzhled hlavního panelu", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Uzamknout &hlavní panel", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Automaticky sktývat hlavní panel", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Zobrazit hlavní panel nad ostatními okny", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Seskupovat podobná tlačítka hlavního panelu", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Zobrazit &panel Snadné spuštění", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Oznamovací oblast", IDC_STATIC, 6, 114, 240, 99 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Zobrazit hodiny", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Zobrazit sekundy", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Přehlednost oznamovací oblasti lze zachovat pomocí skrytí nepoužívaných ikon.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Sk&rýt neaktivní ikony", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Upravit...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "Up&ravit...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Oznamovací oblast" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Přehlednost oznamovací oblasti lze zachovat pomocí skrytí nepoužívaných ikon.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Sk&rýt neaktivní ikony", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Upravit...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Zobrazit hodiny", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Zobrazit sekundy", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/de-DE.rc b/base/shell/explorer/lang/de-DE.rc index 2a7a898923e..9de204a5e59 100644 --- a/base/shell/explorer/lang/de-DE.rc +++ b/base/shell/explorer/lang/de-DE.rc @@ -75,20 +75,14 @@ STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSM CAPTION "Taskleiste" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskleiste", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Taskleiste", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Task&leiste fixieren", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Taskleiste a&utom. verstecken", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Taskleiste immer im Vordergrund halten", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "Ähnliche Buttons &gruppieren", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Schnellstartleiste &anzeigen", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Benachrichtigungsfeld", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Uhr Anzeigen", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Sekunden Anzeigen", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Das Benachrichtigungsfeld kann übersichtlich gestaltet werden, indem selten verwendete Symbole ausgeblendet werden.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Inaktive Symbole ausblenden", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "An&passen...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -105,6 +99,23 @@ BEGIN PUSHBUTTON "An&passen...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Benachrichtigungsfeld" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Das Benachrichtigungsfeld kann übersichtlich gestaltet werden, indem selten verwendete Symbole ausgeblendet werden.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Inaktive Symbole ausblenden", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "An&passen...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Uhr Anzeigen", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Sekunden Anzeigen", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/en-US.rc b/base/shell/explorer/lang/en-US.rc index d71ba82e66f..dcb82674148 100644 --- a/base/shell/explorer/lang/en-US.rc +++ b/base/shell/explorer/lang/en-US.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Show Cloc&k", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification Area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Cloc&k", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/es-ES.rc b/base/shell/explorer/lang/es-ES.rc index e11e13b7521..72656875165 100644 --- a/base/shell/explorer/lang/es-ES.rc +++ b/base/shell/explorer/lang/es-ES.rc @@ -75,20 +75,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Barra de tareas" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Apariencia de la barra de tareas ", IDC_STATIC, 6,6,240,104 + GROUPBOX "Apariencia de la barra de tareas", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 - AUTOCHECKBOX "&Bloquear la barra de tareas", IDC_TASKBARPROP_LOCK, 13,45,200,10 - AUTOCHECKBOX "Ocultar automáticam&ente la barra de tareas", IDC_TASKBARPROP_HIDE, 13,58,200,10 - AUTOCHECKBOX "Mantener la barra de tareas &siempre visible", IDC_TASKBARPROP_ONTOP, 13,71,200,10 - AUTOCHECKBOX "&Agrupar botones similares de la barra de tareas", IDC_TASKBARPROP_GROUP, 13,84,200,10 - AUTOCHECKBOX "Mostrar Inicio rápi&do", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 - GROUPBOX "Área de notificaciones", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Re&loj", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Mostrar segundos", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Puede mantener libre el área de notifación ocultando iconos que no se han usado recientemente.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Ocultar &iconos inactivos", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 184, 191, 50, 14 + AUTOCHECKBOX "&Bloquear la barra de tareas", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 + AUTOCHECKBOX "Ocultar automáticam&ente la barra de tareas", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 + AUTOCHECKBOX "Mantener la barra de tareas &siempre visible", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 + AUTOCHECKBOX "&Agrupar botones similares de la barra de tareas", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 + AUTOCHECKBOX "Mostrar Inicio rápi&do", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -96,13 +90,30 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Menú Inicio" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Menú inicio", IDC_TASKBARPROP_STARTMENU, 7,135,105,10 - LTEXT "Este estilo de menú proporciona un rápido acceso a las carpetas, programas favoritos, y búsquedas.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20,145,150,24 - PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCUST, 192,132,53,14 - AUTORADIOBUTTON "Menú Inicio &clásico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,175,105,10 - LTEXT "Este estilo de menú le proporciona el aspecto y funcionalidad clásicas.",IDC_TASKBARPROP_STARTMENUCLASSICTEXT,20,185,150,24 - PUSHBUTTON "P&ersonalizar...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,172,53,14 + CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN, 7, 7, 183, 108 + AUTORADIOBUTTON "&Menú inicio", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Este estilo de menú proporciona un rápido acceso a las carpetas, programas favoritos, y búsquedas.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 + AUTORADIOBUTTON "Menú Inicio &clásico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 + LTEXT "Este estilo de menú le proporciona el aspecto y funcionalidad clásicas.",IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 + PUSHBUTTON "P&ersonalizar...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 +END + +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Área de notificaciones" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Puede mantener libre el área de notifación ocultando iconos que no se han usado recientemente.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Ocultar &iconos inactivos", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 184, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Re&loj", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Mostrar segundos", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/et-EE.rc b/base/shell/explorer/lang/et-EE.rc index 39f1169661c..bcf309d01e9 100644 --- a/base/shell/explorer/lang/et-EE.rc +++ b/base/shell/explorer/lang/et-EE.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Tegumiriba" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Tegumiriba ilme", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Tegumiriba ilme", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Lukusta tegumiriba", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Peida tegumiriba &automaatselt", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Hoia &tegumiriba muude akende peall", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Rühmita sarnased tegumiriba nupud", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Kuva &kiirkäivitusikoonid", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Olekuala", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Kuva &kell", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Kuva sekundeid", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Olekuala lagenda hoidmiseks võite peita ikoonid, mida te pole viimasel ajal klõpsanud.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Peida passiivsed ikoonid", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Kohanda...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&Kohanda...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Olekuala" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Olekuala lagenda hoidmiseks võite peita ikoonid, mida te pole viimasel ajal klõpsanud.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Peida passiivsed ikoonid", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Kohanda...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Kuva &kell", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Kuva sekundeid", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/eu-ES.rc b/base/shell/explorer/lang/eu-ES.rc index d6b4a5d4f8c..2b727731c11 100644 --- a/base/shell/explorer/lang/eu-ES.rc +++ b/base/shell/explorer/lang/eu-ES.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Ataza-barra" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Ataza-barraren itxura ", IDC_STATIC, 6,6,240,104 + GROUPBOX "Ataza-barraren itxura ", IDC_STATIC, 6,6,240,120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "B&lokeatu ataza-barra", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "Aut&omatikoki ezkutatu ataza-barra", IDC_TASKBARPROP_HIDE, 13,58,200,10 AUTOCHECKBOX "&Eduki ataza-barra beste leihoen gainean", IDC_TASKBARPROP_ONTOP, 13,71,200,10 AUTOCHECKBOX "Elkart&u ataza-barrako antzeko botoiak", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Era&kutsi abiarazte bizkorra", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 - GROUPBOX "Jakinarazpen-area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Er&lojua", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Erakutsi segunduak", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Jakinarazpen-area txukun edukitzeko, ezkutatu azkenaldian erabili ez dituzun ikonoak.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "E&zkutatu ikono inaktiboak", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Pertsonalizatu...", IDC_TASKBARPROP_ICONCUST, 184, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&Pertsonalizatu...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,172,53,14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Jakinarazpen-area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Jakinarazpen-area txukun edukitzeko, ezkutatu azkenaldian erabili ez dituzun ikonoak.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "E&zkutatu ikono inaktiboak", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Pertsonalizatu...", IDC_TASKBARPROP_ICONCUST, 184, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Er&lojua", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Erakutsi segunduak", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/fi-FI.rc b/base/shell/explorer/lang/fi-FI.rc index 3e89bd40504..1b2acd2379e 100644 --- a/base/shell/explorer/lang/fi-FI.rc +++ b/base/shell/explorer/lang/fi-FI.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Tehtäväpalkki" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Tehtäväpalkin ulkoasu", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Tehtäväpalkin ulkoasu", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Lukitse tehtäväpalkki", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Piilota tehtäväpalkki &automaattisesti", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Pidä tehtäväpalkki muiden ikkunoiden päällä", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Ryhmitä samankaltaiset tehtäväpalkin painikkeet", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Näytä p&ikakäynnistys", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Ilmoitusalue", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Näytä &kello", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Näytä &sekunnit", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Voit pitää ilmoitusalueen siistinä piilottamalla kuvakkeet joita et ole klikannut viimeaikoina.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Piilota &ei-aktiiviset kuvakkeet", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Mukauta...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "M&ukauta...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ilmoitusalue" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Voit pitää ilmoitusalueen siistinä piilottamalla kuvakkeet joita et ole klikannut viimeaikoina.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Piilota &ei-aktiiviset kuvakkeet", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Mukauta...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Näytä &kello", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Näytä &sekunnit", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/fr-FR.rc b/base/shell/explorer/lang/fr-FR.rc index 10893af41fd..9daca429631 100644 --- a/base/shell/explorer/lang/fr-FR.rc +++ b/base/shell/explorer/lang/fr-FR.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Barre des tâches" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Apparence de la barre des tâches", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Apparence de la barre des tâches", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Verrouiller la barre des tâches", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Cacher a&utomatiquement la barre des tâches", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Garder la barre des &tâches au-dessus des autres fenêtres", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grouper les boutons similaires de la barre des tâches", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Montrer la &zone de lancement rapide", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Zone de notification", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Horloge", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Afficher les secondes", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Vous pouvez garder la zone de notification épurée en cachant les icônes sur lesquelles vous n'avez pas cliqué récemment.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Cacher les icônes inactives", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Personnaliser...", IDC_TASKBARPROP_ICONCUST, 185, 191, 53, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "&Personnaliser...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Zone de notification" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Vous pouvez garder la zone de notification épurée en cachant les icônes sur lesquelles vous n'avez pas cliqué récemment.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Cacher les icônes inactives", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Personnaliser...", IDC_TASKBARPROP_ICONCUST, 185, 70, 53, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Horloge", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Afficher les secondes", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/he-IL.rc b/base/shell/explorer/lang/he-IL.rc index 7511e1d8f3a..8a1c55b5b0b 100644 --- a/base/shell/explorer/lang/he-IL.rc +++ b/base/shell/explorer/lang/he-IL.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "שורת המשימות" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "מראה שורת המשימות", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "מראה שורת המשימות", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "נעל את שורת המשימות", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "הסתר אוטמטית את שורת המשימות", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "השאר את שורת המשימות תמיד מעל", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "קבץ לחצנים דומים", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "הראה את סרגל הפעלה מהירה", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "שעון", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "החבא סמלים לא פעילים", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "התאם אישית...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "התאם אישית...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "החבא סמלים לא פעילים", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "התאם אישית...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "שעון", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/hi-IN.rc b/base/shell/explorer/lang/hi-IN.rc index 1d4a751949d..0c8558f2316 100644 --- a/base/shell/explorer/lang/hi-IN.rc +++ b/base/shell/explorer/lang/hi-IN.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "टास्कबार" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "टास्कबार उपस्थिति", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "टास्कबार उपस्थिति", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&टास्कबार को लॉक करें", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "टास्कबार को ऑटो-हाइड कर दो", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "टास्कबार को अन्य विंडो के शीर्ष पर रखें", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&समान टास्कबार बटन का समूह करे", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&त्वरित लॉन्च दिखाएं", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "अधिसूचना क्षेत्र", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&घड़ी दिखाओ", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "सेकंड दिखाएं", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "आप उन आइकनों को छुपाकर अधिसूचना क्षेत्र को सुव्यवस्थित कर सकते हैं जिन्हें आपने हाल ही में क्लिक नहीं किया है।", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&निष्क्रिय आइकनों छुपाएं", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&कस्टमाइज़...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&कस्टमाइज़...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "अधिसूचना क्षेत्र" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "आप उन आइकनों को छुपाकर अधिसूचना क्षेत्र को सुव्यवस्थित कर सकते हैं जिन्हें आपने हाल ही में क्लिक नहीं किया है।", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&निष्क्रिय आइकनों छुपाएं", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&कस्टमाइज़...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&घड़ी दिखाओ", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "सेकंड दिखाएं", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/hu-HU.rc b/base/shell/explorer/lang/hu-HU.rc index 73243d68662..f09fa414fea 100644 --- a/base/shell/explorer/lang/hu-HU.rc +++ b/base/shell/explorer/lang/hu-HU.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Tálca" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "A tálca megjelenése", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "A tálca megjelenése", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "A tálca &zárolása", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A tálca automatikus &elrejtése", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "A tálca mindig legyen &látható a többi ablak előtt", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "Hasonló tálca gombok &csoportosítása", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&Gyorsindító megjelenítése", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Értesítési terület", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Az óra &megjelenítése", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Má&sodpercek megjelenítése", IDC_TASKBARPROP_SECONDS, 120, 153, 100, 10, WS_DISABLED - LTEXT "Rendezettebbé teheti az értesítési területet, ha elrejti azokat az ikonokat, amelyekre már régen nem kattintott rá.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "A nem aktív &ikonok elrejtése", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Testreszabás...", IDC_TASKBARPROP_ICONCUST, 188, 188, 53, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&Testreszabás...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Értesítési terület" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Rendezettebbé teheti az értesítési területet, ha elrejti azokat az ikonokat, amelyekre már régen nem kattintott rá.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "A nem aktív &ikonok elrejtése", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Testreszabás...", IDC_TASKBARPROP_ICONCUST, 188, 67, 53, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Az óra &megjelenítése", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Má&sodpercek megjelenítése", IDC_TASKBARPROP_SECONDS, 120, 127, 100, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/id-ID.rc b/base/shell/explorer/lang/id-ID.rc index f76f8b5bd04..d6ed221bbb5 100644 --- a/base/shell/explorer/lang/id-ID.rc +++ b/base/shell/explorer/lang/id-ID.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Bilah Tugas" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Tampilan bilah tugas", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Tampilan bilah tugas", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Kunci bilah tugas", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Otomatis sembunyikan bilah tugas", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Te&mpatkan bilah tugas pada bagian atas jendela lain", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "K&elompokkan tombol bilah tugas yang sama", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Tampilkan peluncur &cepat", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Area pemberitahuan", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Tampil&kan jam", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Tampilkan detik", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Area pemberitahuan akan terlihat rapi dengan menyembunyikan ikon yang belum pernah diklik akhir-akhir ini.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Sembunyikan ikon tidak aktif", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Sesuaikan...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "Ses&uaikan...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Area pemberitahuan" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Area pemberitahuan akan terlihat rapi dengan menyembunyikan ikon yang belum pernah diklik akhir-akhir ini.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Sembunyikan ikon tidak aktif", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Sesuaikan...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Tampil&kan jam", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Tampilkan detik", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/it-IT.rc b/base/shell/explorer/lang/it-IT.rc index b1c079b4b99..23a9b50159e 100644 --- a/base/shell/explorer/lang/it-IT.rc +++ b/base/shell/explorer/lang/it-IT.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Barra delle applicazioni" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Aspetto della Barra delle applicazioni", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Aspetto della Barra delle applicazioni", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Bloccare la Barra delle applicazioni", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "N&ascondere automaticamente", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Mantenere la Barra delle applicazioni in &primo piano", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Raggruppare pulsanti simili", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Mostrare Avvio &veloce", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Orolog&io", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Puoi tenere libera l'area di notifica nascondendo icone non usate recentemente.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Nascondere icone inattive", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Personalizzare...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "&Personalizza...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Puoi tenere libera l'area di notifica nascondendo icone non usate recentemente.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Nascondere icone inattive", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Personalizzare...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Orolog&io", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/ja-JP.rc b/base/shell/explorer/lang/ja-JP.rc index bda368f7eae..e8914d2f4ba 100644 --- a/base/shell/explorer/lang/ja-JP.rc +++ b/base/shell/explorer/lang/ja-JP.rc @@ -73,20 +73,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "タスクバー" FONT 9, "MS UI Gothic", 0, 0, 0x1 BEGIN - GROUPBOX "タスクバーの外観", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "タスクバーの外観", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "タスクバーを固定する(&L)", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "タスクバーを自動的に隠す(&U)", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "タスクバーを他のウインドウ上に保つ(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "類似するタスクバーボタンをグループ化する(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "クイック起動の表示(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "通知領域", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "時計(&K)", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "秒を表示", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "最近クリックしていないアイコンを隠して通知領域をすっきりさせることができます。", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "アクティブでないアイコンを隠す(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "カスタマイズ(&C)...", IDC_TASKBARPROP_ICONCUST, 175, 190, 65, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -103,6 +97,23 @@ BEGIN PUSHBUTTON "カスタマイズ(&C)...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "通知領域" +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "最近クリックしていないアイコンを隠して通知領域をすっきりさせることができます。", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "アクティブでないアイコンを隠す(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "カスタマイズ(&C)...", IDC_TASKBARPROP_ICONCUST, 175, 69, 65, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "時計(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "秒を表示", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/ko-KR.rc b/base/shell/explorer/lang/ko-KR.rc index a6e88008126..29abc0cc171 100644 --- a/base/shell/explorer/lang/ko-KR.rc +++ b/base/shell/explorer/lang/ko-KR.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Taskbar" FONT 9, "굴림", 0, 0, 0x1 BEGIN - GROUPBOX "작업 표시줄 모양", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "작업 표시줄 모양", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Show cloc&k", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 9, "굴림", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Show cloc&k", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/lt-LT.rc b/base/shell/explorer/lang/lt-LT.rc index 7a7600c8e2d..92d51c80bc0 100644 --- a/base/shell/explorer/lang/lt-LT.rc +++ b/base/shell/explorer/lang/lt-LT.rc @@ -71,21 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 58 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Cloc&k", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 - + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +95,23 @@ BEGIN PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Cloc&k", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/ms-MY.rc b/base/shell/explorer/lang/ms-MY.rc index bab8c6a7ac5..712a8aedf62 100644 --- a/base/shell/explorer/lang/ms-MY.rc +++ b/base/shell/explorer/lang/ms-MY.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Bar Tugas" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Rupa Bar Tugas", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Rupa Bar Tugas", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Kunci Bar Tugas(&L)", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A&uto-sembunyi bar tugas", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Simpan bar &tugas ini di atas tetingkap lain", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "Butan&g bar tugas kumpulkan dengan sama", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Paparkan Pelancaran Pantas(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Kawasan pemberitahuan", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Tunjukkan jam(&K)", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Tunjukkan saat", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Anda boleh memastikan kawasan pemberitahuan tidak bersepah dengan menyembunyikan ikon yang anda tidak klik baru-baru ini.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Menyembunyikan ikon yang tidak aktif(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "Suaikan...(&C)", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "Suaikan...(&C)", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Kawasan pemberitahuan" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Anda boleh memastikan kawasan pemberitahuan tidak bersepah dengan menyembunyikan ikon yang anda tidak klik baru-baru ini.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Menyembunyikan ikon yang tidak aktif(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "Suaikan...(&C)", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Tunjukkan jam(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Tunjukkan saat", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/nl-NL.rc b/base/shell/explorer/lang/nl-NL.rc index bf22dbfd0bc..a81d0c2fee4 100644 --- a/base/shell/explorer/lang/nl-NL.rc +++ b/base/shell/explorer/lang/nl-NL.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Taakbalk" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taakbalkweergave", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Taakbalkweergave", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Taakbalk &vergrendelen", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Taakbalk a&utomatisch verbergen", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Taakbalk altijd o&p voorgrond weergeven", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Gelijksoortige knoppen gegroepeerd weergeven", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Werkbalk &Snel starten weergeven", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Klok", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "U kunt het systeemvak opruimen door pictogrammen te verbergen waarop u recentelijk niet hebt geklikt.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Inactieve pictogrammen verbergen", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Aanpassen...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "&Aanpassen...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "U kunt het systeemvak opruimen door pictogrammen te verbergen waarop u recentelijk niet hebt geklikt.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Inactieve pictogrammen verbergen", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Aanpassen...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Klok", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/no-NO.rc b/base/shell/explorer/lang/no-NO.rc index db333409033..a9852d3e74a 100644 --- a/base/shell/explorer/lang/no-NO.rc +++ b/base/shell/explorer/lang/no-NO.rc @@ -71,21 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Oppgavelinje" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Oppgavelinjens egenskaper", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Oppgavelinjens egenskaper", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Lås oppgavelinjen", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Skjul oppgavelinjen automatisk", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Behold &oppgavelinjen på toppen over andre vinduer", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupper og lignende knapper på oppgavelinjen", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Vis &hurtigstart", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Ikoner", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Show clock", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Du kan beholde systemfeltet ryddig ved å skjule ikoner som du ikke har brukt så ofte.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Skjul inaktive ikoner", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Tilpass...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 - + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +95,23 @@ BEGIN PUSHBUTTON "&Tilpass...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ikoner" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Du kan beholde systemfeltet ryddig ved å skjule ikoner som du ikke har brukt så ofte.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Skjul inaktive ikoner", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Tilpass...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Show clock", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/pl-PL.rc b/base/shell/explorer/lang/pl-PL.rc index 20b947b0b33..c282ada24bb 100644 --- a/base/shell/explorer/lang/pl-PL.rc +++ b/base/shell/explorer/lang/pl-PL.rc @@ -74,20 +74,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Pasek zadań" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Wygląd paska zadań", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Wygląd paska zadań", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Za&blokuj pasek zadań", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Włącz autoukrywanie paska zadań", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Trzymaj pasek zadań na wierzchu", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupuj podobne przyciski paska zadań", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Pokaż pasek &Szybkiego uruchamiania", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Pasek powiadomień", IDC_STATIC, 6, 114, 240, 96 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Pokaż &zegar", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Pokaż sekundy", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Możesz uporządkować obszar powiadomień poprzez ukrycie rzadko używanych ikon.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Ukryj nieaktywne ikony", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Dostosuj...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -104,6 +98,23 @@ BEGIN PUSHBUTTON "&Dostosuj...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Pasek powiadomień" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Możesz uporządkować obszar powiadomień poprzez ukrycie rzadko używanych ikon.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Ukryj nieaktywne ikony", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Dostosuj...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Pokaż &zegar", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Pokaż sekundy", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/pt-BR.rc b/base/shell/explorer/lang/pt-BR.rc index a0702db0aeb..9c36ed9a014 100644 --- a/base/shell/explorer/lang/pt-BR.rc +++ b/base/shell/explorer/lang/pt-BR.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Barra de Tarefas" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Aparência da barra de tarefas", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Aparência da barra de tarefas", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Bloquear a barra de tarefas", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Ocultar automaticamente a barra de tarefas", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Manter barra de tarefas sobre outros janelas", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Agrupar botões similares da barra de tarefas", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&Exibir Inicialização Rápida", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Reló&gio", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Você pode manter a área de notificação organizada escondendo os ícones que você não tenha clicado recentemente.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Esconder ícones inativos", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Você pode manter a área de notificação organizada escondendo os ícones que você não tenha clicado recentemente.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Esconder ícones inativos", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Reló&gio", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/pt-PT.rc b/base/shell/explorer/lang/pt-PT.rc index 37d7e1c84f3..5cd3bd3ad36 100644 --- a/base/shell/explorer/lang/pt-PT.rc +++ b/base/shell/explorer/lang/pt-PT.rc @@ -73,20 +73,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Barra de Tarefas" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Aspecto da barra de tarefas", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Aspecto da barra de tarefas", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Bloquear a barra de tarefas", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Ocultar automaticamente a barra de tarefas", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Manter a barra de tarefas sobre outras janelas", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Agrupar botões similares da barra de tarefas", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&Mostrar Iniciação Rápida", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Área de Notificação", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Reló&gio", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Mostrar segundos", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Pode manter a área de notificação organizada ocultando os ícones que não clicou recentemente.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Ocultar ícones inactivos", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -103,6 +97,23 @@ BEGIN PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Área de Notificação" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Pode manter a área de notificação organizada ocultando os ícones que não clicou recentemente.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Ocultar ícones inactivos", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Reló&gio", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Mostrar segundos", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/ro-RO.rc b/base/shell/explorer/lang/ro-RO.rc index 2c51b84f5eb..e89edc15445 100644 --- a/base/shell/explorer/lang/ro-RO.rc +++ b/base/shell/explorer/lang/ro-RO.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Bară de activități" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Aspectul barei de activități", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Aspectul barei de activități", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Fi&xează bara de activități", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Auto-ascunde bara de activități", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Menține bara de activități deasupra celorlalte ferestre", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupează butoanele similare din bara de activități", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Afișează bara „&Lansări rapide”", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Zonă de notificare", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Afișează &ceas", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Afișează s&ecunde", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Puteți menține ordonată zona de notificare prin ascunderea pictogramelor neaccesate recent.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Asc&unde pictogramele neaccesate", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Particularizare…", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "Pa&rticularizare…", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Zonă de notificare" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Puteți menține ordonată zona de notificare prin ascunderea pictogramelor neaccesate recent.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Asc&unde pictogramele neaccesate", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Particularizare…", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Afișează &ceas", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Afișează s&ecunde", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/ru-RU.rc b/base/shell/explorer/lang/ru-RU.rc index 545b98f06bf..d4ccba1fc5e 100644 --- a/base/shell/explorer/lang/ru-RU.rc +++ b/base/shell/explorer/lang/ru-RU.rc @@ -75,20 +75,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Панель задач" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Свойства панели задач", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Свойства панели задач", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Закрепить панель задач", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Автоматически скрывать панель задач", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Отображать панель задач &поверх других окон", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Группировать схожие кнопки панели задач", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Отображать панель &быстрого запуска", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Область уведомлений", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Отображать &часы", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Отображать &секунды", IDC_TASKBARPROP_SECONDS, 120, 153, 83, 10, WS_DISABLED - LTEXT "Можно избежать загромождения области уведомлений, скрывая значки, которые давно не использовались.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Скрывать &неиспользуемые значки", IDC_TASKBARPROP_HIDEICONS, 13, 191, 128, 10 - PUSHBUTTON "&Настроить...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -105,6 +99,23 @@ BEGIN PUSHBUTTON "Н&астроить...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Область уведомлений" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Можно избежать загромождения области уведомлений, скрывая значки, которые давно не использовались.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Скрывать &неиспользуемые значки", IDC_TASKBARPROP_HIDEICONS, 13, 70, 128, 10 + PUSHBUTTON "&Настроить...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Отображать &часы", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Отображать &секунды", IDC_TASKBARPROP_SECONDS, 120, 127, 83, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/sk-SK.rc b/base/shell/explorer/lang/sk-SK.rc index 83c2f77fbaf..7a52a8316c5 100644 --- a/base/shell/explorer/lang/sk-SK.rc +++ b/base/shell/explorer/lang/sk-SK.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Panel úloh" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Vzhľad panela úloh", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Vzhľad panela úloh", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Za&mknúť panel úloh", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A&utomaticky skývať panel úloh", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Zo&brazovať panel úloh nad ostatnými oknami", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 // Ponechať panel úloh nad ostatnými oknami AUTOCHECKBOX "&Zoskupovať podobné tlačidlá na paneli s nástrojmi", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Zobraziť panel &Rýchle spustenie", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Ho&diny", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 16, 169, 223, 16 - AUTOCHECKBOX "&Skryť neaktívne ikony", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "P&rispôsobiť...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&Prispôsobiť...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 16, 48, 223, 16 + AUTOCHECKBOX "&Skryť neaktívne ikony", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "P&rispôsobiť...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Ho&diny", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/sq-AL.rc b/base/shell/explorer/lang/sq-AL.rc index 4b94bcc57a7..b12786ebff2 100644 --- a/base/shell/explorer/lang/sq-AL.rc +++ b/base/shell/explorer/lang/sq-AL.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Aparenca e Taskbar", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Aparenca e Taskbar", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Blloko taskbarin", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Fsheh automatikish taskbarin", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Mbaj &taskbar mbi dritaret e tjera", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupo butonat e njejte në taskbar", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Shfaq &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Shfaq Ora", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Ju mund të mbani zonën e njoftimit të pa prerë duke i fshehur ikona që ju nuk e keni klikuar kohët e fundit.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Fsheh ikonat inaktive", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "Rregulloje...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&Modifiko...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Ju mund të mbani zonën e njoftimit të pa prerë duke i fshehur ikona që ju nuk e keni klikuar kohët e fundit.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Fsheh ikonat inaktive", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "Rregulloje...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Shfaq Ora", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/tr-TR.rc b/base/shell/explorer/lang/tr-TR.rc index 7ff3b2a4d29..3914ee4abfb 100644 --- a/base/shell/explorer/lang/tr-TR.rc +++ b/base/shell/explorer/lang/tr-TR.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Görev Çubuğu" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Görev Çubuğu Görünümü", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Görev Çubuğu Görünümü", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Görev Çubuğunu Kilitle", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "G&örev Çubuğunu Kendiliğinden Gizle", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Gö&rev Çubuğunu Pencerelerin Üstünde Tut", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Benzer Görev Çubuğu Düğmelerini Gruplandır", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&Hızlı Başlat'ı Göster", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Simgeler", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Saat", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "S&aniyeleri Göster", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Son zamanlarda tıklamadığınız simgeleri gizleyerek bildirim alanını düzenli tutabilirsiniz.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Devre Dışı Simgeleri Gizle", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "Ö&zelleştir...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "Ö&zelleştir...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Simgeler" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Son zamanlarda tıklamadığınız simgeleri gizleyerek bildirim alanını düzenli tutabilirsiniz.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Devre Dışı Simgeleri Gizle", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "Ö&zelleştir...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Saat", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "S&aniyeleri Göster", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/uk-UA.rc b/base/shell/explorer/lang/uk-UA.rc index e341f929b55..790a92c91de 100644 --- a/base/shell/explorer/lang/uk-UA.rc +++ b/base/shell/explorer/lang/uk-UA.rc @@ -75,20 +75,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Панель задач" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Властивості панелі задач", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Властивості панелі задач", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Заборонити панель задач", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Автоматично приховувати панель задач", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Поверх інших вікон", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Групувати схожі кнопки", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Відображати панель &швидкого запуску", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Область сповіщень", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Годинник", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Показувати секунди", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Можна уникнути захаращення області повідомлень, приховуючи значки, які давно не використовувалися.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Приховувати невживані значки", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Налаштувати...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -105,6 +99,23 @@ BEGIN PUSHBUTTON "Н&алаштувати...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Область сповіщень" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Можна уникнути захаращення області повідомлень, приховуючи значки, які давно не використовувалися.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Приховувати невживані значки", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Налаштувати...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Годинник", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Показувати секунди", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/zh-CN.rc b/base/shell/explorer/lang/zh-CN.rc index e6eeccab616..3408a84d095 100644 --- a/base/shell/explorer/lang/zh-CN.rc +++ b/base/shell/explorer/lang/zh-CN.rc @@ -73,20 +73,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "任务栏" FONT 9, "宋体", 0, 0, 0x1 BEGIN - GROUPBOX "任务栏外观", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "任务栏外观", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "锁定任务栏(&L)", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "自动隐藏任务栏(&U)", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "将任务栏保持在其它窗口的前端(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "分组类似任务栏按钮(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "显示快速启动(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "通知区域", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "显示时钟(&K)", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "显示秒", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "您可以通过隐藏不常用的图标来保持通知区域的整洁。", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "隐藏不活动的图标(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "自定义(&C)...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -103,6 +97,23 @@ BEGIN PUSHBUTTON "自定义(&C)...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "通知区域" +FONT 9, "宋体", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "您可以通过隐藏不常用的图标来保持通知区域的整洁。", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "隐藏不活动的图标(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "自定义(&C)...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "显示时钟(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "显示秒", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/zh-HK.rc b/base/shell/explorer/lang/zh-HK.rc index 03f8db4bb15..36daeb70dc3 100644 --- a/base/shell/explorer/lang/zh-HK.rc +++ b/base/shell/explorer/lang/zh-HK.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "工作列" FONT 9, "新細明體", 0, 0, 0x1 BEGIN - GROUPBOX "工作列外觀", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "工作列外觀", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "鎖定工作列(&L)", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "自動隱藏工作列(&U)", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "使工作列顯示在最上層(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "合併類似的工作列按鈕(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "顯示快速啟動(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "通知區域", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "小時鐘(&K)", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "顯示秒", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "您可以隱藏最近未選取過的圖示以保持通知區域整潔。", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "隱藏非使用中的圖示(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "通知區域" +FONT 9, "新細明體", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "您可以隱藏最近未選取過的圖示以保持通知區域整潔。", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "隱藏非使用中的圖示(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "小時鐘(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "顯示秒", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/zh-TW.rc b/base/shell/explorer/lang/zh-TW.rc index 741d85f0ce5..e29a34e5e05 100644 --- a/base/shell/explorer/lang/zh-TW.rc +++ b/base/shell/explorer/lang/zh-TW.rc @@ -73,20 +73,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "工作列" FONT 9, "新細明體", 0, 0, 0x1 BEGIN - GROUPBOX "工作列外觀", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "工作列外觀", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "鎖定工作列(&L)", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "自動隱藏工作列(&U)", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "使工作列顯示在最上層(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "合併類似的工作列按鈕(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "顯示快速啟動(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "通知區域", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "小時鐘(&K)", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "顯示秒", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "您可以隱藏最近沒有選取過的圖示以保持通知區域整潔。", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "隱藏非使用中的圖示(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -103,6 +97,23 @@ BEGIN PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "通知區域" +FONT 9, "新細明體", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "您可以隱藏最近沒有選取過的圖示以保持通知區域整潔。", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "隱藏非使用中的圖示(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "小時鐘(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "顯示秒", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index a52e3704266..c9693ec04f1 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -212,6 +212,7 @@ struct TaskbarSettings BOOL bHideInactiveIcons; BOOL bSmallIcons; BOOL bCompactTrayIcons; + BOOL bShowDesktopButton; TW_STRUCKRECTS2 sr; BOOL Load(); diff --git a/base/shell/explorer/resource.h b/base/shell/explorer/resource.h index 2ff1e6b4e5f..8ea838f1bdc 100644 --- a/base/shell/explorer/resource.h +++ b/base/shell/explorer/resource.h @@ -87,6 +87,7 @@ #define IDD_CLASSICSTART_CUSTOMIZE 9 #define IDD_FILENAME_WARNING 20 #define IDD_TASKBARPROP_STARTMENU 205 +#define IDD_TASKBARPROP_NOTIFY 206 #define IDD_MODERNSTART_ADVANCED 1036 #define IDD_MODERNSTART_GENERAL 1037 @@ -110,19 +111,15 @@ \*******************************************************************************/ /* Taskbar Page */ -#define IDC_TASKBARPROP_FIRST_CMD 1000 -#define IDC_TASKBARPROP_HIDEICONS 1000 -#define IDC_TASKBARPROP_ICONCUST 1007 -#define IDC_TASKBARPROP_ONTOP 1101 -#define IDC_TASKBARPROP_HIDE 1102 -#define IDC_TASKBARPROP_CLOCK 1103 -#define IDC_TASKBARPROP_GROUP 1104 -#define IDC_TASKBARPROP_LOCK 1105 -#define IDC_TASKBARPROP_SECONDS 1106 -#define IDC_TASKBARPROP_SHOWQL 1107 -#define IDC_TASKBARPROP_LAST_CMD 1107 -#define IDC_TASKBARPROP_TASKBARBITMAP 1111 -#define IDC_TASKBARPROP_NOTIFICATIONBITMAP 1112 +#define IDC_TASKBARPROP_FIRST_CMD 1114 +#define IDC_TASKBARPROP_ONTOP 1114 +#define IDC_TASKBARPROP_HIDE 1115 +#define IDC_TASKBARPROP_GROUP 1116 +#define IDC_TASKBARPROP_LOCK 1117 +#define IDC_TASKBARPROP_SHOWQL 1118 +#define IDC_TASKBARPROP_SMALLICONS 1119 +#define IDC_TASKBARPROP_LAST_CMD 1119 +#define IDC_TASKBARPROP_TASKBARBITMAP 1120 /* Startmenu Page */ #define IDC_TASKBARPROP_STARTMENUCLASSICCUST 1130 @@ -134,6 +131,16 @@ #define IDC_TASKBARPROP_STARTMENU_BITMAP 1134 #define IDC_STARTBTN 1140 +/* Notification Area Page */ +#define IDC_TASKBARPROP_NOTIFY_FIRST_CMD 1000 +#define IDC_TASKBARPROP_HIDEICONS 1000 +#define IDC_TASKBARPROP_ICONCUST 1007 +#define IDC_TASKBARPROP_CLOCK 1103 +#define IDC_TASKBARPROP_SECONDS 1106 +#define IDC_TASKBARPROP_NOTIFICATIONBITMAP 1112 +#define IDC_TASKBARPROP_DESKTOP 1113 +#define IDC_TASKBARPROP_NOTIFY_LAST_CMD 1113 + /* Customize Notifications Dialog */ #define IDC_TASKBARPROP_NOTIREST 1402 #define IDC_NOTIFICATION_LIST 1005 diff --git a/base/shell/explorer/settings.cpp b/base/shell/explorer/settings.cpp index 0f3daeddea6..62ac29b5b2f 100644 --- a/base/shell/explorer/settings.cpp +++ b/base/shell/explorer/settings.cpp @@ -33,6 +33,7 @@ BOOL TaskbarSettings::Save() sr.cbSize = sizeof(sr); SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSmallIcons", REG_DWORD, &bSmallIcons, sizeof(bSmallIcons)); SHSetValueW(hkExplorer, L"Advanced", L"CompactTrayIcons", REG_DWORD, &bCompactTrayIcons, sizeof(bCompactTrayIcons)); + SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSd", REG_DWORD, &bShowDesktopButton, sizeof(bShowDesktopButton)); SHSetValueW(hkExplorer, L"StuckRects2", L"Settings", REG_BINARY, &sr, sizeof(sr)); /* TODO: AutoHide writes something to HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Desktop\Components\0 figure out what and why */ @@ -65,6 +66,9 @@ BOOL TaskbarSettings::Load() dwRet = SHGetValueW(hkExplorer, L"Advanced", L"CompactTrayIcons", NULL, &dwValue, &cbSize); bCompactTrayIcons = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : bSmallIcons; + dwRet = SHGetValueW(hkExplorer, L"Advanced", L"TaskbarSd", NULL, &dwValue, &cbSize); + bShowDesktopButton = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : TRUE; + cbSize = sizeof(sr); dwRet = SHGetValueW(hkExplorer, L"StuckRects2", L"Settings", NULL, &sr, &cbSize); diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 588e7d73fd3..dcbc5cb7be5 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -1847,13 +1847,25 @@ public: LRESULT OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + BOOL bSettingsChanged = FALSE; TaskbarSettings* newSettings = (TaskbarSettings*)lParam; + if (newSettings->bGroupButtons != g_TaskbarSettings.bGroupButtons) { + bSettingsChanged = TRUE; g_TaskbarSettings.bGroupButtons = newSettings->bGroupButtons; m_IsGroupingEnabled = g_TaskbarSettings.bGroupButtons; + } + + if (newSettings->bSmallIcons != g_TaskbarSettings.bSmallIcons) + { + bSettingsChanged = TRUE; + g_TaskbarSettings.bSmallIcons = newSettings->bSmallIcons; + } - /* Collapse or expand groups if necessary */ + if (bSettingsChanged) + { + /* Refresh each task item view */ RefreshWindowList(); UpdateButtonsSize(FALSE); } diff --git a/base/shell/explorer/trayprop.cpp b/base/shell/explorer/trayprop.cpp index 52ceb863ced..90e2c85996f 100644 --- a/base/shell/explorer/trayprop.cpp +++ b/base/shell/explorer/trayprop.cpp @@ -48,24 +48,17 @@ class CTaskBarSettingsPage : public CPropertyPageImpl<CTaskBarSettingsPage> { private: HBITMAP m_hbmpTaskbar; - HBITMAP m_hbmpTray; HWND m_hwndTaskbar; - void UpdateDialog() + void _UpdateDialog() { BOOL bLock = IsDlgButtonChecked(IDC_TASKBARPROP_LOCK); BOOL bHide = IsDlgButtonChecked(IDC_TASKBARPROP_HIDE); BOOL bGroup = IsDlgButtonChecked(IDC_TASKBARPROP_GROUP); BOOL bShowQL = IsDlgButtonChecked(IDC_TASKBARPROP_SHOWQL); - BOOL bShowClock = IsDlgButtonChecked(IDC_TASKBARPROP_CLOCK); - BOOL bShowSeconds = IsDlgButtonChecked(IDC_TASKBARPROP_SECONDS); - BOOL bHideInactive = IsDlgButtonChecked(IDC_TASKBARPROP_HIDEICONS); UINT uImageId; - HWND hwndCustomizeNotifyButton = GetDlgItem(IDC_TASKBARPROP_ICONCUST); - HWND hwndSeconds = GetDlgItem(IDC_TASKBARPROP_SECONDS); HWND hwndTaskbarBitmap = GetDlgItem(IDC_TASKBARPROP_TASKBARBITMAP); - HWND hwndTrayBitmap = GetDlgItem(IDC_TASKBARPROP_NOTIFICATIONBITMAP); if (bHide) uImageId = IDB_TASKBARPROP_AUTOHIDE; @@ -85,32 +78,8 @@ private: uImageId = IDB_TASKBARPROP_NOLOCK_NOGROUP_QL; else if (!bLock && bGroup && bShowQL) uImageId = IDB_TASKBARPROP_NOLOCK_GROUP_QL; - else - ASSERT(FALSE); SetBitmap(hwndTaskbarBitmap, &m_hbmpTaskbar, uImageId); - - ::EnableWindow(hwndCustomizeNotifyButton, bHideInactive); - ::EnableWindow(hwndSeconds, bShowClock); - if (!bShowSeconds) - CheckDlgButton(IDC_TASKBARPROP_SECONDS, BST_UNCHECKED); - - if (bHideInactive && bShowClock && bShowSeconds) - uImageId = IDB_SYSTRAYPROP_HIDE_SECONDS; - else if (bHideInactive && bShowClock && !bShowSeconds) - uImageId = IDB_SYSTRAYPROP_HIDE_CLOCK; - else if (bHideInactive && !bShowClock) - uImageId = IDB_SYSTRAYPROP_HIDE_NOCLOCK; - else if (!bHideInactive && bShowClock && bShowSeconds) - uImageId = IDB_SYSTRAYPROP_SHOW_SECONDS; - else if (!bHideInactive && bShowClock && !bShowSeconds) - uImageId = IDB_SYSTRAYPROP_SHOW_CLOCK; - else if (!bHideInactive && !bShowClock) - uImageId = IDB_SYSTRAYPROP_SHOW_NOCLOCK; - else - ASSERT(FALSE); - - SetBitmap(hwndTrayBitmap, &m_hbmpTray, uImageId); } public: @@ -118,14 +87,12 @@ public: BEGIN_MSG_MAP(CTaskBarSettingsPage) MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) - COMMAND_ID_HANDLER(IDC_TASKBARPROP_ICONCUST, OnCustomizeTrayIcons) COMMAND_RANGE_HANDLER(IDC_TASKBARPROP_FIRST_CMD, IDC_TASKBARPROP_LAST_CMD, OnCtrlCommand) CHAIN_MSG_MAP(CPropertyPageImpl<CTaskBarSettingsPage>) END_MSG_MAP() CTaskBarSettingsPage(HWND hwnd): m_hbmpTaskbar(NULL), - m_hbmpTray(NULL), m_hwndTaskbar(hwnd) { } @@ -134,8 +101,6 @@ public: { if (m_hbmpTaskbar) DeleteObject(m_hbmpTaskbar); - if (m_hbmpTray) - DeleteObject(m_hbmpTray); } LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) @@ -145,40 +110,29 @@ public: CheckDlgButton(IDC_TASKBARPROP_ONTOP, g_TaskbarSettings.sr.AlwaysOnTop ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(IDC_TASKBARPROP_GROUP, g_TaskbarSettings.bGroupButtons ? BST_CHECKED : BST_UNCHECKED); //CheckDlgButton(IDC_TASKBARPROP_SHOWQL, g_TaskbarSettings.bShowQuickLaunch ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(IDC_TASKBARPROP_CLOCK, (!g_TaskbarSettings.sr.HideClock) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(IDC_TASKBARPROP_SECONDS, g_TaskbarSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(IDC_TASKBARPROP_HIDEICONS, g_TaskbarSettings.bHideInactiveIcons ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_SMALLICONS, g_TaskbarSettings.bSmallIcons ? BST_CHECKED : BST_UNCHECKED); - UpdateDialog(); + _UpdateDialog(); return TRUE; } - LRESULT OnCustomizeTrayIcons(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) - { - ShowCustomizeNotifyIcons(hExplorerInstance, m_hWnd); - return 0; - } - LRESULT OnCtrlCommand(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - UpdateDialog(); + _UpdateDialog(); SetModified(TRUE); return 0; } int OnApply() { - TaskbarSettings newSettings; - memcpy(&newSettings, &g_TaskbarSettings, sizeof(TaskbarSettings)); + TaskbarSettings newSettings = g_TaskbarSettings; newSettings.bLock = IsDlgButtonChecked(IDC_TASKBARPROP_LOCK); newSettings.sr.AutoHide = IsDlgButtonChecked(IDC_TASKBARPROP_HIDE); newSettings.sr.AlwaysOnTop = IsDlgButtonChecked(IDC_TASKBARPROP_ONTOP); newSettings.bGroupButtons = IsDlgButtonChecked(IDC_TASKBARPROP_GROUP); //newSettings.bShowQuickLaunch = IsDlgButtonChecked(IDC_TASKBARPROP_SHOWQL); - newSettings.sr.HideClock = !IsDlgButtonChecked(IDC_TASKBARPROP_CLOCK); - newSettings.bShowSeconds = IsDlgButtonChecked(IDC_TASKBARPROP_SECONDS); - newSettings.bHideInactiveIcons = IsDlgButtonChecked(IDC_TASKBARPROP_HIDEICONS); + newSettings.bSmallIcons = IsDlgButtonChecked(IDC_TASKBARPROP_SMALLICONS); SendMessage(m_hwndTaskbar, TWM_SETTINGSCHANGED, 0, (LPARAM)&newSettings); @@ -191,7 +145,7 @@ class CStartMenuSettingsPage : public CPropertyPageImpl<CStartMenuSettingsPage> private: HBITMAP m_hbmpStartBitmap; - void UpdateDialog() + void _UpdateDialog() { HWND hwndCustomizeClassic = GetDlgItem(IDC_TASKBARPROP_STARTMENUCLASSICCUST); HWND hwndCustomizeModern = GetDlgItem(IDC_TASKBARPROP_STARTMENUCUST); @@ -252,7 +206,7 @@ public: { // fix me: start menu style (classic/modern) should be read somewhere from the registry. CheckDlgButton(IDC_TASKBARPROP_STARTMENUCLASSIC, BST_CHECKED); // HACK: This has to be read from registry!!!!!!! - UpdateDialog(); + _UpdateDialog(); return TRUE; } @@ -270,6 +224,105 @@ public: } }; +class CNotifySettingsPage : public CPropertyPageImpl<CNotifySettingsPage> +{ +private: + HBITMAP m_hbmpTray; + HWND m_hwndTaskbar; + + void _UpdateDialog() + { + BOOL bShowClock = IsDlgButtonChecked(IDC_TASKBARPROP_CLOCK); + BOOL bShowSeconds = IsDlgButtonChecked(IDC_TASKBARPROP_SECONDS); + BOOL bHideInactive = IsDlgButtonChecked(IDC_TASKBARPROP_HIDEICONS); + UINT uImageId; + + HWND hwndCustomizeNotifyButton = GetDlgItem(IDC_TASKBARPROP_ICONCUST); + HWND hwndSeconds = GetDlgItem(IDC_TASKBARPROP_SECONDS); + HWND hwndTrayBitmap = GetDlgItem(IDC_TASKBARPROP_NOTIFICATIONBITMAP); + + ::EnableWindow(hwndCustomizeNotifyButton, bHideInactive); + ::EnableWindow(hwndSeconds, bShowClock); + if (!bShowSeconds) + CheckDlgButton(IDC_TASKBARPROP_SECONDS, BST_UNCHECKED); + + if (bHideInactive && bShowClock && bShowSeconds) + uImageId = IDB_SYSTRAYPROP_HIDE_SECONDS; + else if (bHideInactive && bShowClock && !bShowSeconds) + uImageId = IDB_SYSTRAYPROP_HIDE_CLOCK; + else if (bHideInactive && !bShowClock) + uImageId = IDB_SYSTRAYPROP_HIDE_NOCLOCK; + else if (!bHideInactive && bShowClock && bShowSeconds) + uImageId = IDB_SYSTRAYPROP_SHOW_SECONDS; + else if (!bHideInactive && bShowClock && !bShowSeconds) + uImageId = IDB_SYSTRAYPROP_SHOW_CLOCK; + else if (!bHideInactive && !bShowClock) + uImageId = IDB_SYSTRAYPROP_SHOW_NOCLOCK; + + SetBitmap(hwndTrayBitmap, &m_hbmpTray, uImageId); + } + +public: + enum { IDD = IDD_TASKBARPROP_NOTIFY }; + + BEGIN_MSG_MAP(CNotifySettingsPage) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + COMMAND_ID_HANDLER(IDC_TASKBARPROP_ICONCUST, OnCustomizeTrayIcons) + COMMAND_RANGE_HANDLER(IDC_TASKBARPROP_NOTIFY_FIRST_CMD, IDC_TASKBARPROP_NOTIFY_LAST_CMD, OnCtrlCommand) + CHAIN_MSG_MAP(CPropertyPageImpl<CNotifySettingsPage>) + END_MSG_MAP() + + CNotifySettingsPage(HWND hwnd): + m_hbmpTray(NULL), + m_hwndTaskbar(hwnd) + { + } + + ~CNotifySettingsPage() + { + if (m_hbmpTray) + DeleteObject(m_hbmpTray); + } + + LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) + { + CheckDlgButton(IDC_TASKBARPROP_CLOCK, (!g_TaskbarSettings.sr.HideClock) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_SECONDS, g_TaskbarSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_HIDEICONS, g_TaskbarSettings.bHideInactiveIcons ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_DESKTOP, g_TaskbarSettings.bShowDesktopButton ? BST_CHECKED : BST_UNCHECKED); + + _UpdateDialog(); + return TRUE; + } + + LRESULT OnCustomizeTrayIcons(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) + { + ShowCustomizeNotifyIcons(hExplorerInstance, m_hWnd); + return 0; + } + + LRESULT OnCtrlCommand(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) + { + _UpdateDialog(); + SetModified(TRUE); + return 0; + } + + int OnApply() + { + TaskbarSettings newSettings = g_TaskbarSettings; + + newSettings.sr.HideClock = !IsDlgButtonChecked(IDC_TASKBARPROP_CLOCK); + newSettings.bShowSeconds = IsDlgButtonChecked(IDC_TASKBARPROP_SECONDS); + newSettings.bHideInactiveIcons = IsDlgButtonChecked(IDC_TASKBARPROP_HIDEICONS); + newSettings.bShowDesktopButton = IsDlgButtonChecked(IDC_TASKBARPROP_DESKTOP); + + SendMessage(m_hwndTaskbar, TWM_SETTINGSCHANGED, 0, (LPARAM)&newSettings); + + return PSNRET_NOERROR; + } +}; + static int CALLBACK PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) { @@ -291,15 +344,17 @@ VOID DisplayTrayProperties(IN HWND hwndOwner, IN HWND hwndTaskbar) { PROPSHEETHEADER psh; - HPROPSHEETPAGE hpsp[2]; + CSimpleArray<HPROPSHEETPAGE> hpsp; CTaskBarSettingsPage tbSettingsPage(hwndTaskbar); CStartMenuSettingsPage smSettingsPage; + CNotifySettingsPage naSettingsPage(hwndTaskbar); CStringW caption; caption.LoadStringW(IDS_TASKBAR_STARTMENU_PROP_CAPTION); - hpsp[0] = tbSettingsPage.Create(); - hpsp[1] = smSettingsPage.Create(); + hpsp.Add(tbSettingsPage.Create()); + hpsp.Add(smSettingsPage.Create()); + hpsp.Add(naSettingsPage.Create()); ZeroMemory(&psh, sizeof(psh)); psh.dwSize = sizeof(psh); @@ -308,9 +363,9 @@ DisplayTrayProperties(IN HWND hwndOwner, IN HWND hwndTaskbar) psh.hInstance = hExplorerInstance; psh.pszIcon = MAKEINTRESOURCEW(IDI_STARTMENU); psh.pszCaption = caption.GetString(); - psh.nPages = _countof(hpsp); + psh.nPages = hpsp.GetSize(); psh.nStartPage = 0; - psh.phpage = hpsp; + psh.phpage = hpsp.GetData(); psh.pfnCallback = PropSheetProc; PropertySheet(&psh); diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 2fbcea85299..5aacfa43c0c 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2531,15 +2531,6 @@ ChangePos: return m_ContextMenu->GetCommandString(idCmd, uType, pwReserved, pszName, cchMax); } - BOOL IsShowDesktopButtonNeeded() // Read the registry value - { - return SHRegGetBoolUSValueW( - L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", - L"TaskbarSd", - FALSE, - TRUE); - } - /********************************************************** * ##### message handling ##### */ @@ -2556,7 +2547,7 @@ ChangePos: m_StartButton.Create(m_hWnd); /* Create the 'Show Desktop' button if necessary */ - if (IsShowDesktopButtonNeeded()) + if (g_TaskbarSettings.bShowDesktopButton) m_ShowDesktopButton.DoCreate(m_hWnd); /* Load the saved tray window settings */ @@ -3525,6 +3516,20 @@ HandleTrayContextMenu: SetWindowPos(hWndInsertAfter, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); } + /* Toggle show desktop button */ + if (newSettings->bShowDesktopButton != g_TaskbarSettings.bShowDesktopButton) + { + g_TaskbarSettings.bShowDesktopButton = newSettings->bShowDesktopButton; + if (!g_TaskbarSettings.bShowDesktopButton) + ::DestroyWindow(m_ShowDesktopButton.m_hWnd); + else if (!m_ShowDesktopButton.IsWindow()) + m_ShowDesktopButton.DoCreate(m_hWnd); + AlignControls(NULL); + } + + /* Adjust taskbar size */ + CheckTrayWndPosition(); + g_TaskbarSettings.Save(); return 0; }

1 0

[reactos] 01/01: [DDK] Fix wsk.h header (#5544)
by Johannes Thoma 10 Aug '23

10 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=984284c436d507dd1c3e0… commit 984284c436d507dd1c3e0734ca2f5c64a35d59d9 Author: Johannes Thoma <johannes(a)johannesthoma.com> AuthorDate: Thu Aug 10 15:51:13 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 10 15:51:13 2023 +0200 [DDK] Fix wsk.h header (#5544) Some datagram related dispatcher function types (like PFN_WSK_SEND_TO) were used before they were declared. This patch moves the use after the definition. --- sdk/include/ddk/wsk.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/sdk/include/ddk/wsk.h b/sdk/include/ddk/wsk.h index 94d3c1b482f..e9458e8d882 100644 --- a/sdk/include/ddk/wsk.h +++ b/sdk/include/ddk/wsk.h @@ -284,23 +284,6 @@ NTSTATUS _Inout_ PIRP Irp); #endif /* (NTDDI_VERSION >= NTDDI_WIN8) */ -typedef struct _WSK_PROVIDER_DATAGRAM_DISPATCH -{ -#ifdef __cplusplus - WSK_PROVIDER_BASIC_DISPATCH Basic; -#else - WSK_PROVIDER_BASIC_DISPATCH; -#endif - PFN_WSK_BIND WskBind; - PFN_WSK_SEND_TO WskSendTo; - PFN_WSK_RECEIVE_FROM WskReceiveFrom; - PFN_WSK_RELEASE_DATAGRAM_INDICATION_LIST WskRelease; - PFN_WSK_GET_LOCAL_ADDRESS WskGetLocalAddress; -#if (NTDDI_VERSION >= NTDDI_WIN8) - PFN_WSK_SEND_MESSAGES WskSendMessages; -#endif -} WSK_PROVIDER_DATAGRAM_DISPATCH, *PWSK_PROVIDER_DATAGRAM_DISPATCH; - typedef NTSTATUS (WSKAPI * PFN_WSK_CONNECT) ( @@ -507,6 +490,23 @@ NTSTATUS _In_ PWSK_SOCKET Socket, _In_ PWSK_DATAGRAM_INDICATION DatagramIndication); +typedef struct _WSK_PROVIDER_DATAGRAM_DISPATCH +{ +#ifdef __cplusplus + WSK_PROVIDER_BASIC_DISPATCH Basic; +#else + WSK_PROVIDER_BASIC_DISPATCH; +#endif + PFN_WSK_BIND WskBind; + PFN_WSK_SEND_TO WskSendTo; + PFN_WSK_RECEIVE_FROM WskReceiveFrom; + PFN_WSK_RELEASE_DATAGRAM_INDICATION_LIST WskRelease; + PFN_WSK_GET_LOCAL_ADDRESS WskGetLocalAddress; +#if (NTDDI_VERSION >= NTDDI_WIN8) + PFN_WSK_SEND_MESSAGES WskSendMessages; +#endif +} WSK_PROVIDER_DATAGRAM_DISPATCH, *PWSK_PROVIDER_DATAGRAM_DISPATCH; + typedef NTSTATUS (WSKAPI * PFN_WSK_CLIENT_EVENT)(

1 0

[reactos] 01/01: [BROWSEUI] Don't forget to CoInitializeEx on COM thread (#5552)
by Katayama Hirofumi MZ 10 Aug '23

10 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0aa2e82c06656aa59f04f… commit 0aa2e82c06656aa59f04f0f96c4298bd26d5ad64 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 10 22:16:30 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 10 22:16:30 2023 +0900 [BROWSEUI] Don't forget to CoInitializeEx on COM thread (#5552) Use CoInitializeEx and CoUninitialize in CFindFolder::SearchThreadProc. CORE-19110 --- dll/win32/browseui/shellfind/CFindFolder.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index faa71f4c528..6108970fb55 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -455,6 +455,8 @@ DWORD WINAPI CFindFolder::SearchThreadProc(LPVOID lpParameter) { _SearchData *data = static_cast<_SearchData*>(lpParameter); + HRESULT hrCoInit = CoInitializeEx(NULL, COINIT_MULTITHREADED); + data->pFindFolder->NotifyConnections(DISPID_SEARCHSTART); UINT uTotalFound = RecursiveFind(data->szPath, data); @@ -469,6 +471,9 @@ DWORD WINAPI CFindFolder::SearchThreadProc(LPVOID lpParameter) CloseHandle(data->hStopEvent); delete data; + if (SUCCEEDED(hrCoInit)) + CoUninitialize(); + return 0; }

1 0

[reactos] 01/01: [XDK] Fix definition of KeRaiseIrqlToSynchLevel for x64 UP
by Timo Kreuzer 10 Aug '23

10 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9958c7be7e5df9a602fb… commit b9958c7be7e5df9a602fb9cbcd0338cf30c15012 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Aug 10 14:46:29 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 10 14:46:29 2023 +0300 [XDK] Fix definition of KeRaiseIrqlToSynchLevel for x64 UP --- sdk/include/xdk/amd64/ke.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/include/xdk/amd64/ke.h b/sdk/include/xdk/amd64/ke.h index b9238ccfd17..87d46752af8 100644 --- a/sdk/include/xdk/amd64/ke.h +++ b/sdk/include/xdk/amd64/ke.h @@ -116,7 +116,11 @@ FORCEINLINE KIRQL KeRaiseIrqlToSynchLevel(VOID) { +#ifdef CONFIG_SMP return KfRaiseIrql(12); // SYNCH_LEVEL = IPI_LEVEL - 2 +#else + return KfRaiseIrql(2); // SYNCH_LEVEL = DISPATCH_LEVEL +#endif } FORCEINLINE

1 0

[reactos] 01/01: [MSPAINT] Fix focus and radiobuttons of some dialogs (#5537)
by Katayama Hirofumi MZ 09 Aug '23

09 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=893715b72267723cb2a40… commit 893715b72267723cb2a40052f4cea8453e2d1eb0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 10 08:20:55 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 10 08:20:55 2023 +0900 [MSPAINT] Fix focus and radiobuttons of some dialogs (#5537) - Return TRUE on WM_INITDIALOG handling to set focus. - Check if the radiobutton is checked on the radiobutton action (considering BN_SETFOCUS etc.). CORE-18011 --- base/applications/mspaint/dialogs.cpp | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index 9c9fad3e567..7ec302dfe7f 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -42,7 +42,7 @@ LRESULT CMirrorRotateDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lPara { CheckDlgButton(IDD_MIRRORROTATERB1, BST_CHECKED); CheckDlgButton(IDD_MIRRORROTATERB4, BST_CHECKED); - return 0; + return TRUE; } LRESULT CMirrorRotateDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -74,6 +74,9 @@ LRESULT CMirrorRotateDialog::OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, LRESULT CMirrorRotateDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_MIRRORROTATERB3) != BST_CHECKED) + return 0; + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), TRUE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), TRUE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), TRUE); @@ -82,6 +85,12 @@ LRESULT CMirrorRotateDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWn LRESULT CMirrorRotateDialog::OnRadioButton12(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_MIRRORROTATERB1) != BST_CHECKED && + IsDlgButtonChecked(IDD_MIRRORROTATERB2) != BST_CHECKED) + { + return 0; + } + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), FALSE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), FALSE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), FALSE); @@ -122,7 +131,7 @@ LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, strRes.Format(IDS_PRINTRES, ROUND(PpcmFromDpi(g_xDpi)), ROUND(PpcmFromDpi(g_yDpi))); SetDlgItemText(IDD_ATTRIBUTESTEXT8, strRes); - return 0; + return TRUE; } LRESULT CAttributesDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -156,6 +165,9 @@ LRESULT CAttributesDialog::OnDefault(WORD wNotifyCode, WORD wID, HWND hWndCtl, B LRESULT CAttributesDialog::OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1) != BST_CHECKED) + return 0; + CString strNum; strNum.Format(_T("%.3lf"), newWidth / g_xDpi); SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); @@ -166,6 +178,9 @@ LRESULT CAttributesDialog::OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndC LRESULT CAttributesDialog::OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2) != BST_CHECKED) + return 0; + CString strNum; strNum.Format(_T("%.3lf"), newWidth / PpcmFromDpi(g_xDpi)); SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); @@ -176,6 +191,9 @@ LRESULT CAttributesDialog::OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndC LRESULT CAttributesDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3) != BST_CHECKED) + return 0; + SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); return 0; @@ -239,7 +257,7 @@ LRESULT CStretchSkewDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam SetDlgItemInt(IDD_STRETCHSKEWEDITVSTRETCH, 100, FALSE); SetDlgItemInt(IDD_STRETCHSKEWEDITHSKEW, 0, FALSE); SetDlgItemInt(IDD_STRETCHSKEWEDITVSKEW, 0, FALSE); - return 0; + return TRUE; } LRESULT CStretchSkewDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

1 0

[reactos] 01/01: [MSPAINT] Send mail with image (retry) (#5404)
by Katayama Hirofumi MZ 09 Aug '23

09 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba53f72a87f5abd3c1abf… commit ba53f72a87f5abd3c1abfaf59ebaeb31d2ad7e49 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 9 23:59:34 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 9 23:59:34 2023 +0900 [MSPAINT] Send mail with image (retry) (#5404) - Add OpenMailer function. - Add IDS_CANTSENDMAIL. - Send a mail by using mapi32!MAPISendMail/W. - Extend SaveDIBToFile function by adding a parameter. CORE-19094 --- base/applications/mspaint/common.h | 1 + base/applications/mspaint/dib.cpp | 4 +- base/applications/mspaint/dib.h | 2 +- base/applications/mspaint/lang/bg-BG.rc | 1 + base/applications/mspaint/lang/cs-CZ.rc | 1 + base/applications/mspaint/lang/de-DE.rc | 1 + base/applications/mspaint/lang/en-GB.rc | 1 + base/applications/mspaint/lang/en-US.rc | 1 + base/applications/mspaint/lang/es-ES.rc | 1 + base/applications/mspaint/lang/et-EE.rc | 1 + base/applications/mspaint/lang/eu-ES.rc | 1 + base/applications/mspaint/lang/fr-FR.rc | 1 + base/applications/mspaint/lang/he-IL.rc | 1 + base/applications/mspaint/lang/hu-HU.rc | 1 + base/applications/mspaint/lang/id-ID.rc | 1 + base/applications/mspaint/lang/it-IT.rc | 1 + base/applications/mspaint/lang/ja-JP.rc | 1 + base/applications/mspaint/lang/nl-NL.rc | 1 + base/applications/mspaint/lang/no-NO.rc | 1 + base/applications/mspaint/lang/pl-PL.rc | 1 + base/applications/mspaint/lang/pt-BR.rc | 1 + base/applications/mspaint/lang/pt-PT.rc | 1 + base/applications/mspaint/lang/ro-RO.rc | 1 + base/applications/mspaint/lang/ru-RU.rc | 1 + base/applications/mspaint/lang/sk-SK.rc | 1 + base/applications/mspaint/lang/sq-AL.rc | 1 + base/applications/mspaint/lang/sv-SE.rc | 1 + base/applications/mspaint/lang/tr-TR.rc | 1 + base/applications/mspaint/lang/uk-UA.rc | 1 + base/applications/mspaint/lang/vi-VN.rc | 1 + base/applications/mspaint/lang/zh-CN.rc | 1 + base/applications/mspaint/lang/zh-HK.rc | 1 + base/applications/mspaint/lang/zh-TW.rc | 1 + base/applications/mspaint/main.cpp | 117 ++++++++++++++++++++++++++++++++ base/applications/mspaint/resource.h | 1 + base/applications/mspaint/winproc.cpp | 7 ++ 36 files changed, 159 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index a3f3950ff7e..ee103d74911 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -47,3 +47,4 @@ BOOL zoomTo(int newZoom, int mouseX, int mouseY); BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1); void updateStartAndLast(LONG x, LONG y); void updateLast(LONG x, LONG y); +BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index a5b3f0b7896..c12a2f013a8 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -142,11 +142,11 @@ GetDIBHeight(HBITMAP hBitmap) return bm.bmHeight; } -BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile) +BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile, REFGUID guidFileType) { CImageDx img; img.Attach(hBitmap); - HRESULT hr = img.SaveDx(FileName, GUID_NULL, g_xDpi, g_yDpi); + HRESULT hr = img.SaveDx(FileName, guidFileType, g_xDpi, g_yDpi); img.Detach(); if (FAILED(hr)) diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 9c1e5d4f09c..cefdb6e42b5 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -22,7 +22,7 @@ static inline HBITMAP CopyDIBImage(HBITMAP hbm, INT cx = 0, INT cy = 0) int GetDIBWidth(HBITMAP hbm); int GetDIBHeight(HBITMAP hbm); -BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile); +BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile, REFGUID guidFileType = GUID_NULL); HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile); diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index f3b6382d5b7..66bf74763c3 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -263,4 +263,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 5e5fcbb6caa..57608b40f96 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -263,4 +263,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 4cfe2e6c328..fb947b1eeb2 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -262,4 +262,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index ce5b06fd04f..9dc21b13c6a 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -262,4 +262,5 @@ BEGIN IDS_PRINTRES "%d x %d dots per inch" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 935c3fe4c8b..805c239e8d0 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -263,4 +263,5 @@ BEGIN IDS_PRINTRES "%d x %d dots per inch" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index ac60a967781..a851b972dfc 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -265,4 +265,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 1f8012d233f..78d33480f3a 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -262,4 +262,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 1adb078efad..f9f38cd2056 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -263,4 +263,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index cadd7699281..8ea08410321 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -263,4 +263,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 03b1ef391e8..7735f853725 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -265,4 +265,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index d3299286f57..03315eabded 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -263,4 +263,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 9ae48324433..eeda00200d3 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -262,4 +262,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index d55a546848e..63ad7624367 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -263,4 +263,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index b44eb8b4b74..a98a0f73bab 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -264,4 +264,5 @@ BEGIN IDS_PRINTRES "%d x %d ピクセル/cm" IDS_CANTPASTE "クリップボードからの貼り付けに失敗しました。データ形式が間違っているか、未対応です。" IDS_SAVEERROR "次のファイルとして画像を保存するのに失敗しました:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index a08efcab887..29daec70fc7 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -262,4 +262,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 40290499bb0..7a16a4d668f 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -262,4 +262,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 9dbc184b3c1..b35b2691d2a 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -265,4 +265,5 @@ BEGIN IDS_PRINTRES "%d x %d piksel/cm" IDS_CANTPASTE "Nie można wkleić ze schowka. Format danych jest nieprawidłowy lub nieobsługiwany." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index 9ae3d5de864..c551cd77671 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -263,4 +263,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 8f164db2991..7ff2ba98503 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -263,4 +263,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index d6afd6a9a01..447e01c5337 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -264,4 +264,5 @@ BEGIN IDS_PRINTRES "%d x %d pixeli/cm" IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 654ea538794..125eadbcfdf 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -266,4 +266,5 @@ BEGIN IDS_PRINTRES "%d x %d точек/см" IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается." IDS_SAVEERROR "Не удалось сохранить точечный рисунок в файл:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index de9943cb899..dd80ce12592 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -262,4 +262,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index ca4fb20a5bc..a60ef9a2774 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -262,4 +262,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index a944710d617..dfe72b9b0b9 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -263,4 +263,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index 9026820d5d7..fab8c39fcc3 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -263,4 +263,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 2710a7e410a..f0e0676589a 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -264,4 +264,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 4cc725d213c..b1c7c2cc227 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -262,4 +262,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index e2283e68e6f..43fa7f34582 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -265,4 +265,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index c76ec7920aa..ff88459ddc6 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -263,4 +263,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 776a7e5d7e3..10401e53cb8 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -263,4 +263,5 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index a4cbb54b5b0..ba7ad18c213 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -7,10 +7,14 @@ #include "precomp.h" +#include <mapi.h> +#include <mapicode.h> + POINT g_ptStart, g_ptEnd; BOOL g_askBeforeEnlarging = FALSE; // TODO: initialize from registry HINSTANCE g_hinstExe = NULL; TCHAR g_szFileName[MAX_LONG_PATH] = { 0 }; +WCHAR g_szMailTempFile[MAX_LONG_PATH] = { 0 }; BOOL g_isAFile = FALSE; BOOL g_imageSaved = FALSE; BOOL g_showGrid = FALSE; @@ -69,6 +73,116 @@ OFNHookProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; } +typedef ULONG (WINAPI *FN_MAPISendMail)(LHANDLE, ULONG_PTR, lpMapiMessage, FLAGS, ULONG); +typedef ULONG (WINAPI *FN_MAPISendMailW)(LHANDLE, ULONG_PTR, lpMapiMessageW, FLAGS, ULONG); + +BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName) +{ + // Delete the temporary file if any + if (g_szMailTempFile[0]) + { + ::DeleteFileW(g_szMailTempFile); + g_szMailTempFile[0] = UNICODE_NULL; + } + + CStringW strFileTitle; + if (PathFileExistsW(pszPathName) && imageModel.IsImageSaved()) + { + strFileTitle = PathFindFileNameW(pszPathName); + } + else // Not existing or not saved + { + // Get the name of a temporary file + WCHAR szTempDir[MAX_PATH]; + ::GetTempPathW(_countof(szTempDir), szTempDir); + if (!::GetTempFileNameW(szTempDir, L"afx", 0, g_szMailTempFile)) + return FALSE; // Failure + + if (PathFileExistsW(g_szFileName)) + { + // Set file title + strFileTitle = PathFindFileNameW(g_szFileName); + + // Copy to the temporary file + if (!::CopyFileW(g_szFileName, g_szMailTempFile, FALSE)) + { + g_szMailTempFile[0] = UNICODE_NULL; + return FALSE; // Failure + } + } + else + { + // Set file title + strFileTitle.LoadString(IDS_DEFAULTFILENAME); + strFileTitle += L".png"; + + // Save it to the temporary file + HBITMAP hbm = imageModel.CopyBitmap(); + BOOL ret = SaveDIBToFile(hbm, g_szMailTempFile, FALSE, Gdiplus::ImageFormatPNG); + ::DeleteObject(hbm); + if (!ret) + { + g_szMailTempFile[0] = UNICODE_NULL; + return FALSE; // Failure + } + } + + // Use the temporary file + pszPathName = g_szMailTempFile; + } + + // Load "mapi32.dll" + HINSTANCE hMAPI = LoadLibraryW(L"mapi32.dll"); + if (!hMAPI) + return FALSE; // Failure + + // Attachment + MapiFileDescW attachmentW = { 0 }; + attachmentW.nPosition = (ULONG)-1; + attachmentW.lpszPathName = (LPWSTR)pszPathName; + attachmentW.lpszFileName = (LPWSTR)(LPCWSTR)strFileTitle; + + // Message with attachment + MapiMessageW messageW = { 0 }; + messageW.lpszSubject = NULL; + messageW.nFileCount = 1; + messageW.lpFiles = &attachmentW; + + // First, try to open the mailer by the function of Unicode version + FN_MAPISendMailW pMAPISendMailW = (FN_MAPISendMailW)::GetProcAddress(hMAPI, "MAPISendMailW"); + if (pMAPISendMailW) + { + pMAPISendMailW(0, (ULONG_PTR)hWnd, &messageW, MAPI_DIALOG | MAPI_LOGON_UI, 0); + ::FreeLibrary(hMAPI); + return TRUE; // MAPISendMailW will show an error message on failure + } + + // Convert to ANSI strings + CStringA szPathNameA(pszPathName), szFileTitleA(strFileTitle); + + MapiFileDesc attachment = { 0 }; + attachment.nPosition = (ULONG)-1; + attachment.lpszPathName = (LPSTR)(LPCSTR)szPathNameA; + attachment.lpszFileName = (LPSTR)(LPCSTR)szFileTitleA; + + MapiMessage message = { 0 }; + message.lpszSubject = NULL; + message.nFileCount = 1; + message.lpFiles = &attachment; + + // Try again but in ANSI version + FN_MAPISendMail pMAPISendMail = (FN_MAPISendMail)::GetProcAddress(hMAPI, "MAPISendMail"); + if (pMAPISendMail) + { + pMAPISendMail(0, (ULONG_PTR)hWnd, &message, MAPI_DIALOG | MAPI_LOGON_UI, 0); + ::FreeLibrary(hMAPI); + return TRUE; // MAPISendMail will show an error message on failure + } + + ::FreeLibrary(hMAPI); + return FALSE; // Failure +} + BOOL CMainWindow::GetOpenFileName(IN OUT LPTSTR pszFile, INT cchMaxFile) { static OPENFILENAME ofn = { 0 }; @@ -238,6 +352,9 @@ _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, INT nC // Write back settings to registry registrySettings.Store(); + if (g_szMailTempFile[0]) + ::DeleteFileW(g_szMailTempFile); + // Return the value that PostQuitMessage() gave return (INT)msg.wParam; } diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 1e34232d3c1..4ec9f9a0f98 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -221,3 +221,4 @@ #define IDS_PRINTRES 939 #define IDS_CANTPASTE 940 #define IDS_SAVEERROR 941 +#define IDS_CANTSENDMAIL 942 diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index f930174d45d..7aa25091766 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -666,6 +666,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH if (pd.hDevNames) GlobalFree(pd.hDevNames); break; + case IDM_FILESEND: + canvasWindow.finishDrawing(); + if (!OpenMailer(m_hWnd, g_szFileName)) + { + ShowError(IDS_CANTSENDMAIL); + } + break; case IDM_FILEASWALLPAPERPLANE: RegistrySettings::SetWallpaper(g_szFileName, RegistrySettings::TILED); break;

1 0

[reactos] 01/01: [USETUP] Update Portuguese (pt-PT) translation (#5508)
by Jose Carlos Jesus 09 Aug '23

09 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3463a3fba35489c36301f… commit 3463a3fba35489c36301f11a7f3b164c2570257c Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Wed Aug 9 05:54:52 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 9 11:54:52 2023 +0200 [USETUP] Update Portuguese (pt-PT) translation (#5508) Fix a typo, and add three forgotten error codes to pt-PT language. Co-authored-by: SecurityAndStuff <74931194+SecurityAndStuff(a)users.noreply.github.com> --- base/setup/usetup/lang/pt-PT.h | 51 +++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 3338810b0ac..6ee892d49ba 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -1389,7 +1389,7 @@ static MUI_ENTRY ptPTInstallDirectoryEntries[] = { 6, 8, - "O instalador ir\240 copiar os arquivos para a parti\207\306o seleccionada.", + "O instalador ir\240 copiar os ficheiros para a parti\207\306o seleccionada.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1455,7 +1455,7 @@ static MUI_ENTRY ptPTFileCopyEntries[] = { 0, 13, - "arquivos do ReactOS para a pasta de instala\207\306o.", + "ficheiros do ReactOS para a pasta de instala\207\306o.", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, TEXT_ID_STATIC }, @@ -1702,7 +1702,7 @@ static MUI_ENTRY ptPTPrepareCopyEntries[] = { 6, 8, - "O instalador est\240 a preparar o computador para copiar os arquivos", + "O instalador est\240 a preparar o computador para copiar os ficheiros", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1716,7 +1716,7 @@ static MUI_ENTRY ptPTPrepareCopyEntries[] = { 0, 0, - "A montar a lista de arquivos a serem copiados...", + "A montar a lista de ficheiros a serem copiados...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1741,7 +1741,7 @@ static MUI_ENTRY ptPTSelectFSEntries[] = { 6, 16, - "Seleccione um sistema de arquivos para a nova parti\207\306o na lista abaixo.", + "Seleccione um sistema de ficheiros para a nova parti\207\306o na lista abaixo.", 0 }, { @@ -1753,7 +1753,7 @@ static MUI_ENTRY ptPTSelectFSEntries[] = { 6, 18, - "sistema de arquivos desejado e pressione ENTER.", + "sistema de ficheiros desejado e pressione ENTER.", 0 }, { @@ -1884,9 +1884,24 @@ MUI_ERROR ptPTErrorEntries[] = " \x07 Para sair da instala\207\306o, pressione F3.", "F3=Sair ENTER=Continuar" }, + { + // ERROR_NO_BUILD_PATH + "Falha ao criar os caminhos para o direct\242rio de instala\207\306o do ReactOS!\n" + "ENTER = Reiniciar o computador" + }, + { + // ERROR_SOURCE_PATH + "N\306o pode excluir a parti\207\306o que cont\202m a fonte de instala\207\306o!\n" + "ENTER = Reiniciar o computador" + }, + { + // ERROR_SOURCE_DIR + "N\306o pode instalar o ReactOS dentro do direct\242rio de origem da instala\207\306o!\n" + "ENTER = Reiniciar o computador" + }, { // ERROR_NO_HDD - "N\306o foi poss\241vel localizar um disco r\241digo.\n", + "N\306o foi poss\241vel localizar um disco r\241gido.\n", "ENTER=Reiniciar" }, { @@ -1896,17 +1911,17 @@ MUI_ERROR ptPTErrorEntries[] = }, { // ERROR_LOAD_TXTSETUPSIF - "N\306o foi poss\241vel carregar o arquivo TXTSETUP.SIF.\n", + "N\306o foi poss\241vel carregar o ficheiro TXTSETUP.SIF.\n", "ENTER=Reiniciar" }, { // ERROR_CORRUPT_TXTSETUPSIF - "O arquivos TXTSETUP.SIF est\240 corrompido.\n", + "O ficheiro TXTSETUP.SIF est\240 corrompido.\n", "ENTER=Reiniciar" }, { // ERROR_SIGNATURE_TXTSETUPSIF, - "O arquivo TXTSETUP.SIF est\240 com a assinatura incorrecta.\n", + "O ficheiro TXTSETUP.SIF est\240 com a assinatura incorrecta.\n", "ENTER=Reiniciar" }, { @@ -1987,12 +2002,12 @@ MUI_ERROR ptPTErrorEntries[] = }, { // ERROR_IMPORT_HIVE, - "N\306o foi poss\241vel importar o arquivo de estrutura.", + "N\306o foi poss\241vel importar o ficheiro de estrutura.", "ENTER=Reiniciar" }, { // ERROR_FIND_REGISTRY - "N\306o foi poss\241vel encontrar os arquivos do registo.", + "N\306o foi poss\241vel encontrar os ficheiros do registo.", "ENTER=Reiniciar" }, { @@ -2007,22 +2022,22 @@ MUI_ERROR ptPTErrorEntries[] = }, { // ERROR_INVALID_CABINET_INF, - "O arquivo cab n\306o cont\202m um arquivo inf v\240lido.\n", + "O ficheiro cab n\306o cont\202m um ficheiro inf v\240lido.\n", "ENTER=Reiniciar" }, { // ERROR_CABINET_MISSING, - "N\306o foi poss\241vel econtrar o arquivo cab.\n", + "N\306o foi poss\241vel encontrar o ficheiro cab.\n", "ENTER=Reiniciar" }, { // ERROR_CABINET_SCRIPT, - "O arquivo cab n\306o cont\202m um script de instala\207\306o.\n", + "O ficheiro cab n\306o cont\202m um script de instala\207\306o.\n", "ENTER=Reiniciar" }, { // ERROR_COPY_QUEUE, - "N\306o foi poss\241vel abrir a lista de arquivos para c\242pia.\n", + "N\306o foi poss\241vel abrir a lista de ficheiros para c\242pia.\n", "ENTER=Reiniciar" }, { @@ -2033,13 +2048,13 @@ MUI_ERROR ptPTErrorEntries[] = { // ERROR_TXTSETUP_SECTION, "N\306o foi poss\241vel encontrar a sec\207\306o '%S' no\n" - "arquivo TXTSETUP.SIF.\n", + "ficheiro TXTSETUP.SIF.\n", "ENTER=Reiniciar" }, { // ERROR_CABINET_SECTION, "N\306o foi poss\241vel encontrar a sec\207\306o '%S' no\n" - "arquivo cab.\n", + "ficheiro cab.\n", "ENTER=Reiniciar" }, {

1 0

[reactos] 01/01: [REACTOS] Do not free shared icon for ShellAbout() calls (#5519)
by Serge Gautherie 09 Aug '23

09 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=016acd170dd75a7a24af2… commit 016acd170dd75a7a24af235339a5321e2c24bf5a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Aug 9 11:53:13 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 9 11:53:13 2023 +0200 [REACTOS] Do not free shared icon for ShellAbout() calls (#5519) CORE-18369 --- base/applications/calc/winmain.c | 14 ++++---------- base/applications/clipbrd/clipbrd.c | 6 ++---- base/applications/mplay32/mplay32.c | 5 ++--- base/applications/mscutils/eventvwr/eventvwr.c | 6 ++---- base/applications/mscutils/servman/mainwnd.c | 6 ++---- base/applications/mspaint/winproc.cpp | 5 ++--- base/applications/osk/main.c | 11 +++-------- base/applications/rapps/gui.cpp | 6 ++---- base/applications/sndrec32/sndrec32.cpp | 6 ++---- base/applications/taskmgr/about.c | 5 ++--- dll/win32/devmgr/devmgmt/MainWindow.cpp | 7 ++----- 11 files changed, 25 insertions(+), 52 deletions(-) diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index 519bf60990e..cc26983cc52 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -1945,9 +1945,9 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL hInstance, MAKEINTRESOURCE(IDI_CALC), IMAGE_ICON, - GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), - 0); + 0, + 0, + LR_DEFAULTSIZE | LR_SHARED); calc.hSmIcon = LoadImage( hInstance, @@ -1955,7 +1955,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), - 0); + LR_SHARED); do { /* ignore hwnd: dialogs are already visible! */ @@ -1985,12 +1985,6 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL save_config(); } while (calc.action != IDC_STATIC); - if (calc.hBgIcon != NULL) - DestroyIcon(calc.hBgIcon); - - if (calc.hSmIcon != NULL) - DestroyIcon(calc.hSmIcon); - stop_rpn_engine(); Theme_Stop(); diff --git a/base/applications/clipbrd/clipbrd.c b/base/applications/clipbrd/clipbrd.c index 6f5733cae48..6aaeaca88ea 100644 --- a/base/applications/clipbrd/clipbrd.c +++ b/base/applications/clipbrd/clipbrd.c @@ -248,13 +248,11 @@ static int OnCommand(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case CMD_ABOUT: { - HICON hIcon; WCHAR szTitle[MAX_STRING_LEN]; - hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCE(CLIPBRD_ICON)); LoadStringW(Globals.hInstance, STRING_CLIPBOARD, szTitle, ARRAYSIZE(szTitle)); - ShellAboutW(Globals.hMainWnd, szTitle, NULL, hIcon); - DeleteObject(hIcon); + ShellAboutW(Globals.hMainWnd, szTitle, NULL, + LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(CLIPBRD_ICON))); break; } diff --git a/base/applications/mplay32/mplay32.c b/base/applications/mplay32/mplay32.c index 8fafeaaaba0..6d1f01dba7b 100644 --- a/base/applications/mplay32/mplay32.c +++ b/base/applications/mplay32/mplay32.c @@ -1439,9 +1439,8 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) case IDM_ABOUT: { - HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN)); - ShellAbout(hwnd, szAppTitle, NULL, mplayIcon); - DeleteObject(mplayIcon); + ShellAbout(hwnd, szAppTitle, NULL, + LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN))); break; } diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index 7712565e118..f707d585041 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -3640,13 +3640,11 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDM_ABOUT: { - HICON hIcon; WCHAR szCopyright[MAX_LOADSTRING]; - hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_EVENTVWR)); LoadStringW(hInst, IDS_COPYRIGHT, szCopyright, ARRAYSIZE(szCopyright)); - ShellAboutW(hWnd, szTitle, szCopyright, hIcon); - DeleteObject(hIcon); + ShellAboutW(hWnd, szTitle, szCopyright, + LoadIconW(hInst, MAKEINTRESOURCEW(IDI_EVENTVWR))); break; } diff --git a/base/applications/mscutils/servman/mainwnd.c b/base/applications/mscutils/servman/mainwnd.c index 1b016fb593b..526d9700199 100644 --- a/base/applications/mscutils/servman/mainwnd.c +++ b/base/applications/mscutils/servman/mainwnd.c @@ -382,7 +382,6 @@ MainWndCommand(PMAIN_WND_INFO Info, { WCHAR szAppName[256]; WCHAR szAppAuthors[256]; - HICON hIcon; UNREFERENCED_PARAMETER(hControl); @@ -597,9 +596,8 @@ MainWndCommand(PMAIN_WND_INFO Info, LoadStringW(hInstance, IDS_APPNAME, szAppName, _countof(szAppName)); LoadStringW(hInstance, IDS_APPAUTHORS, szAppAuthors, _countof(szAppAuthors)); - hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_SM_ICON)); - ShellAboutW(Info->hMainWnd, szAppName, szAppAuthors, hIcon); - DestroyIcon(hIcon); + ShellAboutW(Info->hMainWnd, szAppName, szAppAuthors, + LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_SM_ICON))); break; } diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index de22a406243..f930174d45d 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -599,13 +599,12 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { case IDM_HELPINFO: { - HICON paintIcon = LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDI_APPICON)); TCHAR infotitle[100]; TCHAR infotext[200]; LoadString(g_hinstExe, IDS_INFOTITLE, infotitle, _countof(infotitle)); LoadString(g_hinstExe, IDS_INFOTEXT, infotext, _countof(infotext)); - ShellAbout(m_hWnd, infotitle, infotext, paintIcon); - DeleteObject(paintIcon); + ShellAbout(m_hWnd, infotitle, infotext, + LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDI_APPICON))); break; } case IDM_HELPHELPTOPICS: diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c index 680156639aa..d7457a7c4c9 100644 --- a/base/applications/osk/main.c +++ b/base/applications/osk/main.c @@ -138,19 +138,14 @@ DWORD WINAPI OSK_WarningDlgThread(LPVOID lpParameter) VOID OSK_About(VOID) { WCHAR szAuthors[MAX_PATH]; - HICON OSKIcon; - - /* Load the icon */ - OSKIcon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_OSK), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); /* Load the strings into the "About" dialog */ LoadStringW(Globals.hInstance, IDS_AUTHORS, szAuthors, _countof(szAuthors)); + /* Load the icon */ /* Finally, execute the "About" dialog by using the Shell routine */ - ShellAboutW(Globals.hMainWnd, Globals.szTitle, szAuthors, OSKIcon); - - /* Once done, destroy the icon */ - DestroyIcon(OSKIcon); + ShellAboutW(Globals.hMainWnd, Globals.szTitle, szAuthors, + LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_OSK), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED)); } /*********************************************************************** diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 9601a0c4585..0c81f789bd1 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -469,13 +469,11 @@ CMainWindow::ShowAboutDlg() { CStringW szApp; CStringW szAuthors; - HICON hIcon; szApp.LoadStringW(IDS_APPTITLE); szAuthors.LoadStringW(IDS_APP_AUTHORS); - hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); - ShellAboutW(m_hWnd, szApp, szAuthors, hIcon); - DestroyIcon(hIcon); + ShellAboutW(m_hWnd, szApp, szAuthors, + LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN))); } VOID diff --git a/base/applications/sndrec32/sndrec32.cpp b/base/applications/sndrec32/sndrec32.cpp index 0d408fc3f34..cfaf93bd25a 100644 --- a/base/applications/sndrec32/sndrec32.cpp +++ b/base/applications/sndrec32/sndrec32.cpp @@ -432,7 +432,6 @@ WndProc(HWND hWnd, HFONT oldfont; long long slid_samp = 0; WCHAR szAppName[100]; - HICON hIcon; /* Checking for global pointers to buffer and io audio devices */ if ((!AUD_IN) || (!AUD_OUT) || (!AUD_BUF)) @@ -598,9 +597,8 @@ WndProc(HWND hWnd, case ID_ABOUT: LoadStringW(hInst, IDS_APP_TITLE, szAppName, _countof(szAppName)); - hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_REACTOS_SNDREC32)); - ShellAboutW(hWnd, szAppName, NULL, hIcon); - DestroyIcon(hIcon); + ShellAboutW(hWnd, szAppName, NULL, + LoadIconW(hInst, MAKEINTRESOURCEW(IDI_REACTOS_SNDREC32))); break; case ID_FILE_SAVEAS: diff --git a/base/applications/taskmgr/about.c b/base/applications/taskmgr/about.c index e0decc1ddaa..f97f6588550 100644 --- a/base/applications/taskmgr/about.c +++ b/base/applications/taskmgr/about.c @@ -10,9 +10,8 @@ void OnAbout(void) { WCHAR szTaskmgr[128]; - HICON taskmgrIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER)); LoadStringW(hInst, IDS_APP_TITLE, szTaskmgr, sizeof(szTaskmgr)/sizeof(WCHAR)); - ShellAboutW(hMainWnd, szTaskmgr, NULL, taskmgrIcon); - DeleteObject(taskmgrIcon); + ShellAboutW(hMainWnd, szTaskmgr, NULL, + LoadIconW(hInst, MAKEINTRESOURCEW(IDI_TASKMANAGER))); } diff --git a/dll/win32/devmgr/devmgmt/MainWindow.cpp b/dll/win32/devmgr/devmgmt/MainWindow.cpp index 0bf96dc3c9e..723d93e281f 100644 --- a/dll/win32/devmgr/devmgmt/MainWindow.cpp +++ b/dll/win32/devmgr/devmgmt/MainWindow.cpp @@ -653,16 +653,13 @@ CDeviceManager::OnCommand(_In_ WPARAM wParam, { CAtlStringW szAppName; CAtlStringW szAppAuthors; - HICON hIcon; if (!szAppName.LoadStringW(g_hThisInstance, IDS_APPNAME)) szAppName = L"ReactOS Device Manager"; if (!szAppAuthors.LoadStringW(g_hThisInstance, IDS_APP_AUTHORS)) szAppAuthors = L""; - hIcon = LoadIconW(g_hThisInstance, MAKEINTRESOURCEW(IDI_MAIN_ICON)); - ShellAboutW(m_hMainWnd, szAppName, szAppAuthors, hIcon); - if (hIcon) - DestroyIcon(hIcon); + ShellAboutW(m_hMainWnd, szAppName, szAppAuthors, + LoadIconW(g_hThisInstance, MAKEINTRESOURCEW(IDI_MAIN_ICON))); // Set focus back to the treeview m_DeviceView->SetFocus();

1 0

[reactos] 01/01: [REACTOS] British English spellings (#5533)
by Andrew Dent 09 Aug '23

09 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=815d55c3782fce6f36f44… commit 815d55c3782fce6f36f445405a33974e1ff9276c Author: Andrew Dent <dent.ace(a)gmail.com> AuthorDate: Wed Aug 9 10:48:59 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 9 11:48:59 2023 +0200 [REACTOS] British English spellings (#5533) Fix spellings for en-GB: - Centre. - Colour. - Customise. - Unauthorise. --- base/applications/mspaint/lang/en-GB.rc | 4 ++-- dll/cpl/desk/lang/en-GB.rc | 6 +++--- dll/win32/shell32/lang/en-GB.rc | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 69e8873cf75..ce5b06fd04f 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -27,7 +27,7 @@ BEGIN MENUITEM "Send...", IDM_FILESEND MENUITEM SEPARATOR MENUITEM "Set as wallpaper (Tiled)", IDM_FILEASWALLPAPERPLANE - MENUITEM "Set as wallpaper (Centered)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "Set as wallpaper (Centred)", IDM_FILEASWALLPAPERCENTERED MENUITEM "Set as wallpaper (Stretched)", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR MENUITEM "Most recently used file", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED @@ -114,7 +114,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Invert colours\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc index 6383c7d4875..bd8a26ccfcd 100644 --- a/dll/cpl/desk/lang/en-GB.rc +++ b/dll/cpl/desk/lang/en-GB.rc @@ -26,7 +26,7 @@ BEGIN PUSHBUTTON "&Colour...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "&Placement", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 + PUSHBUTTON "Customise &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -246,9 +246,9 @@ END STRINGTABLE BEGIN IDS_CPLNAME "Display" - IDS_CPLDESCRIPTION "Customizes the desktop display and screen saver." + IDS_CPLDESCRIPTION "Customises the desktop display and screen saver." IDS_NONE "(None)" - IDS_CENTER "Center" + IDS_CENTER "Centre" IDS_STRETCH "Stretch" IDS_TILE "Tile" IDS_FIT "Fit" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index cec926eab93..e7415d373ae 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -207,7 +207,7 @@ BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 - LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 + LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorised program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE @@ -362,7 +362,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 CHECKBOX "Current User %s", 14000, 10, 45, 150, 10 - LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED + LTEXT "Protect my computer and data from unauthorised program activity", -1, 25, 57, 200, 10, WS_DISABLED CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE CHECKBOX "The following user:", 14002, 10, 100, 90, 10 LTEXT "User name:", -1, 20, 118, 54, 10 @@ -702,7 +702,7 @@ BEGIN END IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 -CAPTION "Customize" +CAPTION "Customise" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN @@ -770,7 +770,7 @@ BEGIN /* special folders descriptions */ IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." - IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customise the display of files and folders and change file associations." IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." @@ -1005,7 +1005,7 @@ BEGIN IDS_ADVANCED_CLASSIC_VIEW_STATE "Remember each folder's view settings" IDS_ADVANCED_PERSIST_BROWSERS "Restore previous folder windows at logon" IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" - IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" + IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in colour" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"

1 0

[reactos] 01/01: [REACTOS] Spelling fixes (#5534)
by Andrew Dent 09 Aug '23

09 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72ea2d4c265355e740421… commit 72ea2d4c265355e740421d0cc67d4a2f0a974602 Author: Andrew Dent <dent.ace(a)gmail.com> AuthorDate: Wed Aug 9 10:48:07 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 9 11:48:07 2023 +0200 [REACTOS] Spelling fixes (#5534) Fix spellings / hyphenation: `unassociate` ; `read-only` ; `double-click` --- base/shell/cmd/lang/cs-CZ.rc | 2 +- base/shell/cmd/lang/en-US.rc | 2 +- base/shell/cmd/lang/sk-SK.rc | 2 +- base/shell/explorer/traywnd.cpp | 2 +- dll/cpl/main/mouse.c | 2 +- dll/win32/devmgr/devmgmt/DeviceView.cpp | 2 +- dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc | 4 ++-- sdk/include/reactos/mc/errcodes.mc | 12 ++++++------ sdk/include/reactos/mc/ntstatus.mc | 2 +- win32ss/user/ntuser/msgqueue.c | 8 ++++---- 28 files changed, 37 insertions(+), 37 deletions(-) diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 25b7282795d..043cbcfca8a 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -126,7 +126,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ /S Delete file from all sub directory\n\ /A Select files to be deleted based on attributes.\n\ attributes\n\ - R Read Only files\n\ + R Read-only files\n\ S System files\n\ A Archiveable files\n\ H Hidden Files\n\ diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index 070e997db8c..e530cda2db9 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -121,7 +121,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ /S Delete file from all sub directory\n\ /A Select files to be deleted based on attributes.\n\ attributes\n\ - R Read Only files\n\ + R Read-only files\n\ S System files\n\ A Archiveable files\n\ H Hidden Files\n\ diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index c8da98bdfda..eccaa057f3b 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -127,7 +127,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ /S Delete file from all sub directory\n\ /A Select files to be deleted based on attributes.\n\ attributes\n\ - R Read Only files\n\ + R Read-only files\n\ S System files\n\ A Archiveable files\n\ H Hidden Files\n\ diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 576630a3359..2fbcea85299 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -3138,7 +3138,7 @@ HandleTrayContextMenu: LRESULT OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - /* Let the clock handle the double click */ + /* Let the clock handle the double-click */ ::SendMessageW(m_TrayNotify, uMsg, wParam, lParam); /* We "handle" this message so users can't cause a weird maximize/restore diff --git a/dll/cpl/main/mouse.c b/dll/cpl/main/mouse.c index 022515c61e9..28ca28f3590 100644 --- a/dll/cpl/main/mouse.c +++ b/dll/cpl/main/mouse.c @@ -382,7 +382,7 @@ ButtonProc(IN HWND hwndDlg, /* Reset swap mouse button setting */ SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_OrigSwapMouseButtons, NULL, 0); - /* Reset double click speed setting */ + /* Reset double-click speed setting */ SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_OrigDoubleClickSpeed, NULL, 0); //SetDoubleClickTime(pButtonData->g_OrigDoubleClickSpeed); } diff --git a/dll/win32/devmgr/devmgmt/DeviceView.cpp b/dll/win32/devmgr/devmgmt/DeviceView.cpp index 8fae7fbb601..3b38bf208e2 100644 --- a/dll/win32/devmgr/devmgmt/DeviceView.cpp +++ b/dll/win32/devmgr/devmgmt/DeviceView.cpp @@ -135,7 +135,7 @@ CDeviceView::OnDoubleClick( GetCursorPos(&hitInfo.pt); ScreenToClient(m_hTreeView, &hitInfo.pt); - // Check if we are trying to double click an item + // Check if we are trying to double-click an item hItem = TreeView_HitTest(m_hTreeView, &hitInfo); if (hItem != NULL && (hitInfo.flags & (TVHT_ONITEM | TVHT_ONITEMICON))) { diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 3c188becd5e..f748b48b598 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 9825c3a1f92..8fe2ea35f20 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 98e83f573d4..779d6ee557a 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -1018,7 +1018,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 5dc3bb704fa..b3bb48b457d 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -1018,7 +1018,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index d467a135b78..5ae43f646e1 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 6f9b532360d..cec926eab93 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index c0277a97623..80920dbd914 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index bb908ec07ef..983d4fb5fab 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index c23d965bb08..6faa9abaab2 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -1014,7 +1014,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "&מתקדם >>" IDS_NEWEXT_NEW "<חדש>" IDS_NEWEXT_SPECIFY_EXT "עליך לציין סיומת." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "סיומת בשימוש" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index c4de6949f82..6414dd62d2e 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 12306e561a4..4e883d0bcf6 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -1019,7 +1019,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 0d5d266a650..51ba62cf5a1 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 08b1a255184..08d51f68005 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 8740ac707bf..94b594c7465 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index dbff4ad2cc6..d3ea7e6974c 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index fe1b69ba5b6..3d5ff4af009 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 733369f50e9..25a95b57dfe 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -1016,7 +1016,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index d51b1824c74..46ed208c020 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc b/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc index 222c04d7610..33ee9145c2c 100644 --- a/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc +++ b/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc @@ -1226,7 +1226,7 @@ If the target drive does not have a drive letter, this command also assigns a local drive letter (see '%1!s!HELP LINK') using the first available letter. -Read only files, NTFS encrypted/compressed files and ZIP compressed +Read-only files, NTFS encrypted/compressed files and ZIP compressed image files (such as WinImage IMZ file) cannot be mounted directly and must be opened in RAM mode. @@ -1374,7 +1374,7 @@ OPTIONS: The trailing ':' is optional. The drive 0 is used if not specified. - /ON Enables the drive write protect - the drive becomes read only. + /ON Enables the drive write protect - the drive becomes read-only. /OFF Disables the drive write protect - the drive becomes writable. diff --git a/sdk/include/reactos/mc/errcodes.mc b/sdk/include/reactos/mc/errcodes.mc index a243c8f3a38..96408a3d4d3 100644 --- a/sdk/include/reactos/mc/errcodes.mc +++ b/sdk/include/reactos/mc/errcodes.mc @@ -18781,16 +18781,16 @@ Severity=Success Facility=System SymbolicName=ERROR_WMI_READ_ONLY Language=English -The WMI data item or data block is read only. +The WMI data item or data block is read-only. . Language=Russian -The WMI data item or data block is read only. +The WMI data item or data block is read-only. . Language=Polish Element danych WMI lub blok danych są tylko do odczytu. . Language=Romanian -The WMI data item or data block is read only. +The WMI data item or data block is read-only. . MessageId=4214 @@ -21620,16 +21620,16 @@ Severity=Success Facility=System SymbolicName=ERROR_FILE_READ_ONLY Language=English -The specified file is read only. +The specified file is read-only. . Language=Russian -The specified file is read only. +The specified file is read-only. . Language=Polish Podany plik jest tylko do odczytu. . Language=Romanian -The specified file is read only. +The specified file is read-only. . MessageId=6010 diff --git a/sdk/include/reactos/mc/ntstatus.mc b/sdk/include/reactos/mc/ntstatus.mc index 57b29436033..86c69332ae0 100644 --- a/sdk/include/reactos/mc/ntstatus.mc +++ b/sdk/include/reactos/mc/ntstatus.mc @@ -4100,7 +4100,7 @@ Severity=Error Facility=System SymbolicName=STATUS_WMI_READ_ONLY Language=English -The WMI data item or data block is read only. +The WMI data item or data block is read-only. . MessageId=0x2c7 diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index d35eb38cf9d..8c24de79853 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -1564,7 +1564,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, L } msg->lParam = MAKELONG( pt.x, pt.y ); - /* translate double clicks */ + /* translate double-clicks */ if ((msg->message == WM_LBUTTONDOWN) || (msg->message == WM_RBUTTONDOWN) || @@ -1573,7 +1573,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, L { BOOL update = *RemoveMessages; - /* translate double clicks - + /* translate double-clicks - * note that ...MOUSEMOVEs can slip in between * ...BUTTONDOWN and ...BUTTONDBLCLK messages */ @@ -1592,7 +1592,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, L message += (WM_LBUTTONDBLCLK - WM_LBUTTONDOWN); if (update) { - MessageQueue->msgDblClk.message = 0; /* clear the double click conditions */ + MessageQueue->msgDblClk.message = 0; /* clear the double-click conditions */ update = FALSE; } } @@ -1604,7 +1604,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, L return FALSE; } - /* update static double click conditions */ + /* update static double-click conditions */ if (update) MessageQueue->msgDblClk = *msg; } else

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs