Index: base/shell/explorer-new/lang/bg-BG.rc =================================================================== --- base/shell/explorer-new/lang/bg-BG.rc (revision 57994) +++ base/shell/explorer-new/lang/bg-BG.rc (working copy) @@ -124,7 +124,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Пуск" Index: base/shell/explorer-new/lang/cs-CZ.rc =================================================================== --- base/shell/explorer-new/lang/cs-CZ.rc (revision 57994) +++ base/shell/explorer-new/lang/cs-CZ.rc (working copy) @@ -128,7 +128,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Start" Index: base/shell/explorer-new/lang/de-DE.rc =================================================================== --- base/shell/explorer-new/lang/de-DE.rc (revision 57994) +++ base/shell/explorer-new/lang/de-DE.rc (working copy) @@ -122,7 +122,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Start" Index: base/shell/explorer-new/lang/en-US.rc =================================================================== --- base/shell/explorer-new/lang/en-US.rc (revision 57994) +++ base/shell/explorer-new/lang/en-US.rc (working copy) @@ -122,7 +122,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Start" Index: base/shell/explorer-new/lang/es-ES.rc =================================================================== --- base/shell/explorer-new/lang/es-ES.rc (revision 57994) +++ base/shell/explorer-new/lang/es-ES.rc (working copy) @@ -131,7 +131,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Inicio" Index: base/shell/explorer-new/lang/fr-FR.rc =================================================================== --- base/shell/explorer-new/lang/fr-FR.rc (revision 57994) +++ base/shell/explorer-new/lang/fr-FR.rc (working copy) @@ -131,7 +131,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Démarrer" Index: base/shell/explorer-new/lang/it-IT.rc =================================================================== --- base/shell/explorer-new/lang/it-IT.rc (revision 57994) +++ base/shell/explorer-new/lang/it-IT.rc (working copy) @@ -122,7 +122,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Avvio" Index: base/shell/explorer-new/lang/ja-JP.rc =================================================================== --- base/shell/explorer-new/lang/ja-JP.rc (revision 57994) +++ base/shell/explorer-new/lang/ja-JP.rc (working copy) @@ -122,7 +122,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "スタート" Index: base/shell/explorer-new/lang/ko-KR.rc =================================================================== --- base/shell/explorer-new/lang/ko-KR.rc (revision 57994) +++ base/shell/explorer-new/lang/ko-KR.rc (working copy) @@ -136,7 +136,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "시작" Index: base/shell/explorer-new/lang/lt-LT.rc =================================================================== --- base/shell/explorer-new/lang/lt-LT.rc (revision 57994) +++ base/shell/explorer-new/lang/lt-LT.rc (working copy) @@ -126,6 +126,14 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Rodyti s&ekundes", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END STRINGTABLE DISCARDABLE BEGIN Index: base/shell/explorer-new/lang/nl-NL.rc =================================================================== --- base/shell/explorer-new/lang/nl-NL.rc (revision 57994) +++ base/shell/explorer-new/lang/nl-NL.rc (working copy) @@ -122,6 +122,14 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END STRINGTABLE DISCARDABLE BEGIN Index: base/shell/explorer-new/lang/no-NO.rc =================================================================== --- base/shell/explorer-new/lang/no-NO.rc (revision 57994) +++ base/shell/explorer-new/lang/no-NO.rc (working copy) @@ -131,7 +131,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Start" Index: base/shell/explorer-new/lang/pl-PL.rc =================================================================== --- base/shell/explorer-new/lang/pl-PL.rc (revision 57994) +++ base/shell/explorer-new/lang/pl-PL.rc (working copy) @@ -131,7 +131,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Start" Index: base/shell/explorer-new/lang/pt-BR.rc =================================================================== --- base/shell/explorer-new/lang/pt-BR.rc (revision 57994) +++ base/shell/explorer-new/lang/pt-BR.rc (working copy) @@ -124,7 +124,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Iniciar" Index: base/shell/explorer-new/lang/ro-RO.rc =================================================================== --- base/shell/explorer-new/lang/ro-RO.rc (revision 57994) +++ base/shell/explorer-new/lang/ro-RO.rc (working copy) @@ -123,7 +123,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Pornire" Index: base/shell/explorer-new/lang/ru-RU.rc =================================================================== --- base/shell/explorer-new/lang/ru-RU.rc (revision 57994) +++ base/shell/explorer-new/lang/ru-RU.rc (working copy) @@ -124,7 +124,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Пуск" Index: base/shell/explorer-new/lang/sk-SK.rc =================================================================== --- base/shell/explorer-new/lang/sk-SK.rc (revision 57994) +++ base/shell/explorer-new/lang/sk-SK.rc (working copy) @@ -127,7 +127,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Štart" Index: base/shell/explorer-new/lang/uk-UA.rc =================================================================== --- base/shell/explorer-new/lang/uk-UA.rc (revision 57994) +++ base/shell/explorer-new/lang/uk-UA.rc (working copy) @@ -130,7 +130,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "Пуск" Index: base/shell/explorer-new/lang/zh-CN.rc =================================================================== --- base/shell/explorer-new/lang/zh-CN.rc (revision 57994) +++ base/shell/explorer-new/lang/zh-CN.rc (working copy) @@ -130,7 +130,16 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN IDS_START "开始" Index: base/shell/explorer-new/precomp.h =================================================================== --- base/shell/explorer-new/precomp.h (revision 57994) +++ base/shell/explorer-new/precomp.h (working copy) @@ -26,6 +26,13 @@ #include "initguid.h" #include "undoc.h" +/* Structure to hold non-default options*/ +typedef struct tAdvancedSetts{ + BOOL bShowSeconds; +} tAdvancedSetts; + +tAdvancedSetts AdvancedSetts; + /* dynamic imports due to lack of support in msvc linker libs */ typedef INT (APIENTRY *REGSHELLHOOK)(HWND, DWORD); #ifdef UNICODE Index: base/shell/explorer-new/resource.h =================================================================== --- base/shell/explorer-new/resource.h (revision 57994) +++ base/shell/explorer-new/resource.h (working copy) @@ -80,6 +80,7 @@ #define IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL 2056 #define IDB_TASKBARPROP_NOLOCK_NOGROUP_QL 2057 #define IDB_TASKBARPROP_NOLOCK_GROUP_QL 2058 +#define IDC_TASKBARPROP_SECONDS 2059 /* Taskbar properties, startmenu*/ #define IDD_TASKBARPROP_STARTMENU 2100 @@ -99,6 +100,7 @@ #define IDC_TASKBARPROP_VOLUME 2205 #define IDC_TASKBARPROP_NETWORK 2206 #define IDC_TASKBARPROP_POWER 2207 +#define IDD_TASKBARPROP_ADVANCED 2208 /* Taskbar properties, toolbars */ #define IDD_TASKBARPROP_TOOLBARS 2300 Index: base/shell/explorer-new/trayntfy.c =================================================================== --- base/shell/explorer-new/trayntfy.c (revision 57994) +++ base/shell/explorer-new/trayntfy.c (working copy) @@ -688,8 +688,7 @@ */ static const TCHAR szTrayClockWndClass[] = TEXT("TrayClockWClass"); -static LPCTSTR s_szRegistryKey = _T("Software\\ReactOS\\Features\\Explorer"); -BOOL blShowSeconds; +//static LPCTSTR s_szRegistryKey = _T("Software\\ReactOS\\Features\\Explorer"); #define ID_TRAYCLOCK_TIMER 0 #define ID_TRAYCLOCK_TIMER_INIT 1 @@ -724,27 +723,6 @@ return NOERROR; } -void LoadSettings(void) -{ - HKEY hKey = NULL; - DWORD dwValue; - - 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); - } -} - #define CLOCKWND_FORMAT_COUNT (sizeof(ClockWndFormats) / sizeof(ClockWndFormats[0])) #define TRAY_CLOCK_WND_SPACING_X 0 @@ -965,7 +943,7 @@ if (ClockWndFormats[i].IsTime) { iRet = GetTimeFormat(LOCALE_USER_DEFAULT, - ClockWndFormats[i].dwFormatFlags, + AdvancedSetts.bShowSeconds == TRUE ? ClockWndFormats[i].dwFormatFlags : TIME_NOSECONDS, &This->LocalTime, ClockWndFormats[i].lpFormat, This->szLines[i], @@ -983,11 +961,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]); @@ -1051,7 +1024,7 @@ /* Calculate the due time */ GetLocalTime(&This->LocalTime); uiDueTime = 1000 - (UINT)This->LocalTime.wMilliseconds; - if (blShowSeconds == TRUE) + if (AdvancedSetts.bShowSeconds == TRUE) uiDueTime += (UINT)This->LocalTime.wSecond * 100; else uiDueTime += (59 - (UINT)This->LocalTime.wSecond) * 1000; @@ -1117,7 +1090,7 @@ uiDueTime = TrayClockWnd_CalculateDueTime(This); - if (blShowSeconds == TRUE) + if (AdvancedSetts.bShowSeconds == TRUE) { uiWait1 = 1000 - 200; uiWait2 = 1000; @@ -1403,7 +1376,6 @@ PTRAY_CLOCK_WND_DATA TcData; DWORD dwStyle; HWND hWnd = NULL; - LoadSettings(); TcData = HeapAlloc(hProcessHeap, 0, Index: base/shell/explorer-new/trayprop.c =================================================================== --- base/shell/explorer-new/trayprop.c (revision 57994) +++ base/shell/explorer-new/trayprop.c (working copy) @@ -188,7 +188,61 @@ return FALSE; } +INT_PTR CALLBACK +AdvancedSettsPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + CheckDlgButton(hwndDlg, IDC_TASKBARPROP_SECONDS, (AdvancedSetts.bShowSeconds == TRUE ? BST_CHECKED : BST_UNCHECKED)); + } + break; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDC_TASKBARPROP_SECONDS: + if (HIWORD(wParam) == BN_CLICKED) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + break; + + case WM_NOTIFY: + { + LPNMHDR pnmh = (LPNMHDR)lParam; + + switch(pnmh->code) + { + case PSN_SETACTIVE: + break; + + case PSN_APPLY: + { + AdvancedSetts.bShowSeconds = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_SECONDS); + } + break; + } + + break; + } + + case WM_DESTROY: + break; + + default: + return FALSE; + } + + return FALSE; +} + INT_PTR CALLBACK StartMenuPageProc(HWND hwndDlg, UINT uMsg, @@ -315,7 +369,7 @@ { PPROPSHEET_INFO pPropInfo; PROPSHEETHEADER psh; - PROPSHEETPAGE psp[4]; + PROPSHEETPAGE psp[5]; TCHAR szCaption[256]; pPropInfo = (PPROPSHEET_INFO)HeapAlloc(hProcessHeap, @@ -353,6 +407,7 @@ InitPropSheetPage(&psp[1], IDD_TASKBARPROP_STARTMENU, (DLGPROC)StartMenuPageProc, (LPARAM)pPropInfo); InitPropSheetPage(&psp[2], IDD_TASKBARPROP_NOTIFICATION, (DLGPROC)NotificationPageProc, (LPARAM)pPropInfo); InitPropSheetPage(&psp[3], IDD_TASKBARPROP_TOOLBARS, (DLGPROC)ToolbarsPageProc, (LPARAM)pPropInfo); + InitPropSheetPage(&psp[4], IDD_TASKBARPROP_ADVANCED, (DLGPROC)AdvancedSettsPageProc, (LPARAM)pPropInfo); PropertySheet(&psh);