Index: base/shell/explorer-new/lang/bg-BG.rc =================================================================== --- base/shell/explorer-new/lang/bg-BG.rc (revision 51664) +++ base/shell/explorer-new/lang/bg-BG.rc (working copy) @@ -62,7 +62,7 @@ CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX " ", IDC_STATIC, 6,6,240,121 + GROUPBOX " ", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "& ", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX " &", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -70,6 +70,7 @@ AUTOCHECKBOX "& ", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX " & ", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "& ()", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/cs-CZ.rc =================================================================== --- base/shell/explorer-new/lang/cs-CZ.rc (revision 51664) +++ base/shell/explorer-new/lang/cs-CZ.rc (working copy) @@ -65,7 +65,7 @@ CAPTION "Hlavn panel" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Vzhled hlavnho panelu", IDC_STATIC, 6,6,240,121 + GROUPBOX "Vzhled hlavnho panelu", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "Uzamknout &hlavn panel", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "&Automaticky sktvat hlavn panel", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -73,6 +73,7 @@ AUTOCHECKBOX "&Seskupovat podobn tlatka hlavnho panelu", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Zobrazit &panel Snadn sputn", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "Zobrazit &nhledy oken", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/de-DE.rc =================================================================== --- base/shell/explorer-new/lang/de-DE.rc (revision 51664) +++ base/shell/explorer-new/lang/de-DE.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Taskleiste" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskleiste", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taskleiste", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "Task&leiste fixieren", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "Taskleiste a&utom. verstecken", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "hnliche Buttons &gruppieren", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Schnellstartleiste &anzeigen", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "Fenstervor&schau anzeigen", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/en-US.rc =================================================================== --- base/shell/explorer-new/lang/en-US.rc (revision 51664) +++ base/shell/explorer-new/lang/en-US.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/es-ES.rc =================================================================== --- base/shell/explorer-new/lang/es-ES.rc (revision 51664) +++ base/shell/explorer-new/lang/es-ES.rc (working copy) @@ -68,7 +68,7 @@ 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,121 + GROUPBOX "Apariencia de la Barra de tareas ", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Bloquear la barra de tareas", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "Ocultar automticam&ente la barra de tareas", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -76,6 +76,7 @@ AUTOCHECKBOX "&Agrupar botones similares de la barra de tareas", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Mostrar Inicio rpi&do", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "M&ostrar vista previa de las ventanas (miniaturas)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/fr-FR.rc =================================================================== --- base/shell/explorer-new/lang/fr-FR.rc (revision 51664) +++ base/shell/explorer-new/lang/fr-FR.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/it-IT.rc =================================================================== --- base/shell/explorer-new/lang/it-IT.rc (revision 51664) +++ base/shell/explorer-new/lang/it-IT.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Barra delle applicazioni" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Aspetto della Barra delle applicazioni", IDC_STATIC, 6,6,240,121 + GROUPBOX "Aspetto della Barra delle applicazioni", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Bloccare la Barra delle applicazioni", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "N&ascondere automaticamente", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "&Raggruppare pulsanti simili", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Mostrare Avvio &veloce", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Mostrare anteprima delle finestre (miniature)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/ja-JP.rc =================================================================== --- base/shell/explorer-new/lang/ja-JP.rc (revision 51664) +++ base/shell/explorer-new/lang/ja-JP.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "^XNo[" FONT 9, "MS UI Gothic", 0, 0, 0x1 BEGIN - GROUPBOX "^XNo[̊O", IDC_STATIC, 6,6,240,121 + GROUPBOX "^XNo[̊O", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "^XNo[Œ肷(&L)", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "^XNo[IɉB(&U)", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "ގ^XNo[{^O[v(&G)", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "NCbNN̕\(&Q)", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "EChẼvr[\(TlC)(&S)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/ko-KR.rc =================================================================== --- base/shell/explorer-new/lang/ko-KR.rc (revision 51664) +++ base/shell/explorer-new/lang/ko-KR.rc (working copy) @@ -64,7 +64,7 @@ CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -72,6 +72,7 @@ AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/lt-LT.rc =================================================================== --- base/shell/explorer-new/lang/lt-LT.rc (revision 51664) +++ base/shell/explorer-new/lang/lt-LT.rc (working copy) @@ -63,7 +63,7 @@ CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -71,6 +71,7 @@ AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Rodyti sekundes", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/nl-NL.rc =================================================================== --- base/shell/explorer-new/lang/nl-NL.rc (revision 51664) +++ base/shell/explorer-new/lang/nl-NL.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Taakbalk" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taakbalkweergave", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taakbalkweergave", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "Taakbalk &vergrendelen", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "Taakbalk a&utomatisch verbergen", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "&Gelijksoortige knoppen gegroepeerd weergeven", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Werkbalk &Snel starten weergeven", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "Venstervoorbeelden (miniatuurweergaven) &weergeven", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/no-NO.rc =================================================================== --- base/shell/explorer-new/lang/no-NO.rc (revision 51664) +++ base/shell/explorer-new/lang/no-NO.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Oppgavelinje" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Oppgavelinjens egenskaper", IDC_STATIC, 6,6,240,121 + GROUPBOX "Oppgavelinjens egenskaper", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Ls oppgavelinjen", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "&Skjul oppgavelinjen automatisk", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "&Grupper og lignende knapper p oppgavelinjen", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Vis &hurtigstart", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Vis vinduforhndvisning (miniaturbilde)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/pl-PL.rc =================================================================== --- base/shell/explorer-new/lang/pl-PL.rc (revision 51664) +++ base/shell/explorer-new/lang/pl-PL.rc (working copy) @@ -62,7 +62,7 @@ CAPTION "Pasek zada" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Wygld paska zada", IDC_STATIC, 6,6,240,121 + GROUPBOX "Wygld paska zada", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Zablokuj pasek zada", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&utomatyczne ukrywanie paska zada", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -70,6 +70,7 @@ AUTOCHECKBOX "&Grupuj programy w pasku zada", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Poka pasek &Szybkiego uruchamiania", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Poka podgld okien (miniaturki)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/ro-RO.rc =================================================================== --- base/shell/explorer-new/lang/ro-RO.rc (revision 51664) +++ base/shell/explorer-new/lang/ro-RO.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/ru-RU.rc =================================================================== --- base/shell/explorer-new/lang/ru-RU.rc (revision 51664) +++ base/shell/explorer-new/lang/ru-RU.rc (working copy) @@ -61,7 +61,7 @@ CAPTION " " FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX " ", IDC_STATIC, 6,6,240,121 + GROUPBOX " ", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "& ", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "& ", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -69,6 +69,7 @@ AUTOCHECKBOX "& ", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX " & ", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "& ()", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/sk-SK.rc =================================================================== --- base/shell/explorer-new/lang/sk-SK.rc (revision 51664) +++ base/shell/explorer-new/lang/sk-SK.rc (working copy) @@ -64,7 +64,7 @@ CAPTION "Panel loh" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Vzhad panela loh", IDC_STATIC, 6,6,240,121 + GROUPBOX "Vzhad panela loh", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "Za&mkn panel loh", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&utomaticky skva panel loh", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -72,6 +72,7 @@ AUTOCHECKBOX "&Zoskupova podobn tlaidl na paneli s nstrojmi", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Zobrazi panel &Rchle spustenie", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "Z&obrazi nhady okien (miniatry)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/uk-UA.rc =================================================================== --- base/shell/explorer-new/lang/uk-UA.rc (revision 51664) +++ base/shell/explorer-new/lang/uk-UA.rc (working copy) @@ -67,7 +67,7 @@ CAPTION " " FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX " ", IDC_STATIC, 6,6,240,121 + GROUPBOX " ", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "& ", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "& ", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -75,6 +75,7 @@ AUTOCHECKBOX "& ", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "³ & ", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&³ ()", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/precomp.h =================================================================== --- base/shell/explorer-new/precomp.h (revision 51664) +++ base/shell/explorer-new/precomp.h (working copy) @@ -361,6 +361,10 @@ * trayntfy.c */ +void LoadSettings(void); +void SaveSettings(void); +BOOL blShowSeconds; + /* TrayClockWnd */ #define TCWM_GETMINIMUMSIZE (WM_USER + 0x100) #define TCWM_UPDATETIME (WM_USER + 0x101) Index: base/shell/explorer-new/resource.h =================================================================== --- base/shell/explorer-new/resource.h (revision 51664) +++ base/shell/explorer-new/resource.h (working copy) @@ -63,6 +63,7 @@ #define IDC_TASKBARPROP_GROUP 2005 #define IDC_TASKBARPROP_SHOWQL 2006 #define IDC_TASKBARPROP_WNDPREV 2007 +#define IDC_TASKBARPROP_SECONDS 2008 #define IDB_TASKBARPROP_AUTOHIDE 2050 #define IDB_TASKBARPROP_LOCK_GROUP_NOQL 2051 Index: base/shell/explorer-new/trayntfy.c =================================================================== --- base/shell/explorer-new/trayntfy.c (revision 51664) +++ base/shell/explorer-new/trayntfy.c (working copy) @@ -22,11 +22,10 @@ /* * TrayClockWnd - */ + */ static const TCHAR szTrayClockWndClass[] = TEXT("TrayClockWClass"); static LPCTSTR s_szRegistryKey = _T("Software\\ReactOS\\Features\\Explorer"); -BOOL blShowSeconds; #define ID_TRAYCLOCK_TIMER 0 #define ID_TRAYCLOCK_TIMER_INIT 1 @@ -40,46 +39,69 @@ {TRUE, 0, NULL}, {FALSE, 0, TEXT("dddd")}, {FALSE, DATE_SHORTDATE, NULL} -}; +}; -HRESULT RegGetDWord(HKEY hKey, LPCTSTR szValueName, DWORD * lpdwResult) +HRESULT RegSetDWord(HKEY hKey, LPCTSTR szValueName, DWORD lpdwResult) { - LONG lResult; - DWORD dwDataSize = sizeof(DWORD); - DWORD dwType = 0; + LONG lResult; + if (hKey == NULL) return E_INVALIDARG; + lResult = RegSetValueEx(hKey, szValueName, 0, REG_DWORD, (LPBYTE) &lpdwResult, sizeof(DWORD)); + if (lResult != ERROR_SUCCESS) return HRESULT_FROM_WIN32(lResult); + return NOERROR; +} - // Check input parameters... - if (hKey == NULL || lpdwResult == NULL) return E_INVALIDARG; +HRESULT RegGetDWord(HKEY hKey, LPCTSTR szValueName, DWORD * lpdwResult) +{ + LONG lResult; + DWORD dwDataSize = sizeof(DWORD); + DWORD dwType = 0; + // Check input parameters... + if (hKey == NULL || lpdwResult == NULL) return E_INVALIDARG; + // Get dword value from the registry... + lResult = RegQueryValueEx(hKey, szValueName, 0, &dwType, (LPBYTE) lpdwResult, &dwDataSize); + // Check result and make sure the registry value is a DWORD(REG_DWORD)... + if (lResult != ERROR_SUCCESS) return HRESULT_FROM_WIN32(lResult); + else if (dwType != REG_DWORD) return DISP_E_TYPEMISMATCH; + return NOERROR; +} - // Get dword value from the registry... - lResult = RegQueryValueEx(hKey, szValueName, 0, &dwType, (LPBYTE) lpdwResult, &dwDataSize ); +void LoadSettings(void) +{ + HKEY hKey = NULL; + DWORD dwValue; - // Check result and make sure the registry value is a DWORD(REG_DWORD)... - if (lResult != ERROR_SUCCESS) return HRESULT_FROM_WIN32(lResult); - else if (dwType != REG_DWORD) return DISP_E_TYPEMISMATCH; - - return NOERROR; + if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) + { + RegGetDWord(hKey, TEXT("blShowSeconds"), &dwValue); + if (dwValue == 1) + { + blShowSeconds = TRUE; + } + else + { + blShowSeconds = FALSE; + } + + RegCloseKey(hKey); + } } -void LoadSettings(void) +void SaveSettings(void) { - HKEY hKey = NULL; - DWORD dwValue; + HKEY hKey = NULL; - if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) - { - RegGetDWord(hKey, TEXT("blShowSeconds"), &dwValue); - if (dwValue == 1) - { - blShowSeconds = TRUE; - } - else - { - blShowSeconds = FALSE; - } - - RegCloseKey(hKey); - } + if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) + { + if (blShowSeconds == TRUE) + { + RegSetDWord(hKey, TEXT("blShowSeconds"), 1); + } + else + { + RegSetDWord(hKey, TEXT("blShowSeconds"), 0); + } + RegCloseKey(hKey); + } } #define CLOCKWND_FORMAT_COUNT (sizeof(ClockWndFormats) / sizeof(ClockWndFormats[0])) @@ -94,7 +116,7 @@ HFONT hFont; RECT rcText; SYSTEMTIME LocalTime; - + union { DWORD dwFlags; @@ -257,7 +279,15 @@ if (ClockWndFormats[i].IsTime) { + if (blShowSeconds == FALSE) iRet = GetTimeFormat(LOCALE_USER_DEFAULT, + TIME_NOSECONDS, + &This->LocalTime, + ClockWndFormats[i].lpFormat, + This->szLines[i], + BufSize); + else + iRet = GetTimeFormat(LOCALE_USER_DEFAULT, ClockWndFormats[i].dwFormatFlags, &This->LocalTime, ClockWndFormats[i].lpFormat, @@ -276,11 +306,6 @@ if (iRet != 0 && i == 0) { - if (blShowSeconds == FALSE) - { - (This->szLines[0][5] = '\0'); - }; - /* Set the window text to the time only */ SetWindowText(This->hWnd, This->szLines[i]); @@ -344,10 +369,10 @@ /* Calculate the due time */ GetLocalTime(&This->LocalTime); uiDueTime = 1000 - (UINT)This->LocalTime.wMilliseconds; - if (blShowSeconds == TRUE) - uiDueTime += ( (UINT)This->LocalTime.wSecond) * 100; - else - uiDueTime += (59 - (UINT)This->LocalTime.wSecond) * 1000; + if (blShowSeconds == TRUE) + uiDueTime += ( (UINT)This->LocalTime.wSecond) * 100; + else + uiDueTime += (59 - (UINT)This->LocalTime.wSecond) * 1000; if (uiDueTime < USER_TIMER_MINIMUM || uiDueTime > USER_TIMER_MAXIMUM) uiDueTime = 1000; @@ -401,7 +426,7 @@ { UINT uiDueTime; BOOL Ret; - int intWait1, intWait2; + int intWait1, intWait2; /* Kill the initialization timer */ KillTimer(This->hWnd, @@ -409,26 +434,26 @@ This->IsInitTimerEnabled = FALSE; uiDueTime = TrayClockWnd_CalculateDueTime(This); - - if (blShowSeconds == TRUE) - { - intWait1 = 1000-200; - intWait2 = 1000; - } - else - { - intWait1 = 60*1000-200; - intWait2 = 60*1000; - } + + if (blShowSeconds == TRUE) + { + intWait1 = 1000-200; + intWait2 = 1000; + } + else + { + intWait1 = 60*1000-200; + intWait2 = 60*1000; + } if (uiDueTime > intWait1) { /* The update of the clock will be up to 200 ms late, but that's acceptable. We're going to setup a timer that fires depending - intWait2. */ + intWait2. */ Ret = SetTimer(This->hWnd, ID_TRAYCLOCK_TIMER, - intWait2, + intWait2, NULL) != 0; This->IsTimerEnabled = Ret; @@ -677,7 +702,7 @@ PTRAY_CLOCK_WND_DATA TcData; DWORD dwStyle; HWND hWnd = NULL; - LoadSettings(); + LoadSettings(); TcData = HeapAlloc(hProcessHeap, 0, Index: base/shell/explorer-new/trayprop.c =================================================================== --- base/shell/explorer-new/trayprop.c (revision 51664) +++ base/shell/explorer-new/trayprop.c (working copy) @@ -113,6 +113,8 @@ pPropInfo->hTaskbarWnd = hwnd; // FIXME: check buttons + LoadSettings(); + CheckDlgButton( pPropInfo->hTaskbarWnd , IDC_TASKBARPROP_SECONDS, (blShowSeconds == TRUE ? BST_CHECKED : BST_UNCHECKED )); UpdateTaskbarBitmap(pPropInfo); } @@ -143,8 +145,16 @@ switch(LOWORD(wParam)) { case IDC_TASKBARPROP_LOCK: + break; case IDC_TASKBARPROP_HIDE: + break; case IDC_TASKBARPROP_GROUP: + break; + case IDC_TASKBARPROP_SECONDS: + if (HIWORD(wParam) == BN_CLICKED) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + case IDC_TASKBARPROP_SHOWQL: if (HIWORD(wParam) == BN_CLICKED) { @@ -167,6 +177,18 @@ break; case PSN_APPLY: + { + //blShowSeconds = !blShowSeconds; + blShowSeconds = ((IsDlgButtonChecked(hwndDlg,IDC_TASKBARPROP_SECONDS) == BST_CHECKED ) ? TRUE : FALSE); + TCHAR str[255]; + if(blShowSeconds == TRUE) + _stprintf(str, _T("blShowSeconds = 1")); + else + _stprintf(str, _T("blShowSeconds = 0")); + + MessageBox(0, str, 0, MB_OK); + SaveSettings(); + } break; }