[EXPLORER] Set icon size and show or hide desktop button from taskbar properties...

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.

diff --git a/base/shell/explorer/lang/bg-BG.rc b/base/shell/explorer/lang/bg-BG.rc
index 6bf40cd..f4efc7f 100644 (file)
--- 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 087b85b..af53b5a 100644 (file)
--- 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 2a7a898..9de204a 100644 (file)
--- 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 d71ba82..dcb8267 100644 (file)
--- 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 e11e13b..7265687 100644 (file)
--- 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 39f1169..bcf309d 100644 (file)
--- 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 d6b4a5d..2b72773 100644 (file)
--- 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 3e89bd4..1b2acd2 100644 (file)
--- 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 10893af..9daca42 100644 (file)
--- 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 7511e1d..8a1c55b 100644 (file)
--- 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 1d4a751..0c8558f 100644 (file)
--- 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 73243d6..f09fa41 100644 (file)
--- 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 f76f8b5..d6ed221 100644 (file)
--- 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 b1c079b..23a9b50 100644 (file)
--- 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 bda368f..e8914d2 100644 (file)
--- 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 a6e8800..29abc0c 100644 (file)
--- 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 7a7600c..92d51c8 100644 (file)
--- 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 bab8c6a..712a8ae 100644 (file)
--- 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 bf22dbf..a81d0c2 100644 (file)
--- 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 db33340..a9852d3 100644 (file)
--- 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 20b947b..c282ada 100644 (file)
--- 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 a0702db..9c36ed9 100644 (file)
--- 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 37d7e1c..5cd3bd3 100644 (file)
--- 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 2c51b84..e89edc1 100644 (file)
--- 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 545b98f..d4ccba1 100644 (file)
--- 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 83c2f77..7a52a83 100644 (file)
--- 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 4b94bcc..b12786e 100644 (file)
--- 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 7ff3b2a..3914ee4 100644 (file)
--- 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 e341f92..790a92c 100644 (file)
--- 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 e6eecca..3408a84 100644 (file)
--- 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 03f8db4..36daeb7 100644 (file)
--- 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 741d85f..e29a34e 100644 (file)
--- 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 a52e370..c9693ec 100644 (file)
--- 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 2ff1e6b..8ea838f 100644 (file)
--- 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 0f3daed..62ac29b 100644 (file)
--- 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 588e7d7..dcbc5cb 100644 (file)
--- 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 52ceb86..90e2c85 100644 (file)
--- 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 2fbcea8..5aacfa4 100644 (file)
--- 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;
     }