From 60c8c3179206b9dbfb177acb270c486059a788b4 Mon Sep 17 00:00:00 2001
From: Robert Naumann <gonzomdx@gmail.com>
Date: Tue, 24 Nov 2015 22:37:58 +0000
Subject: [PATCH] [EXPLORER] -Reactivate the 'show seconds' functionality.
 -Enable the the controls depending on checkbox states

svn path=/trunk/; revision=70104
---
 reactos/base/shell/explorer/trayprop.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/reactos/base/shell/explorer/trayprop.cpp b/reactos/base/shell/explorer/trayprop.cpp
index 19738a08586..f02831f6b9a 100644
--- a/reactos/base/shell/explorer/trayprop.cpp
+++ b/reactos/base/shell/explorer/trayprop.cpp
@@ -36,6 +36,7 @@ UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo)
 {
     HWND hwndLock, hwndHide, hwndGroup, hwndShowQL, hwndClock, hwndSeconds, hwndHideInactive;
     HWND hwndTaskbarBitmap, hwndTrayBitmap;
+    HWND hwndAdvancedButton;
     BOOL bLock, bHide, bGroup, bShowQL, bShowClock, bShowSeconds, bHideInactive;
     LPTSTR lpTaskBarImageName = NULL, lpTrayImageName = NULL;
     BOOL bRet = FALSE;
@@ -48,6 +49,8 @@ UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo)
     hwndClock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_CLOCK);
     hwndSeconds = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_SECONDS);
     hwndHideInactive = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDEICONS);
+    
+    hwndAdvancedButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_ICONCUST);
 
     if (hwndLock && hwndHide && hwndGroup && hwndShowQL && hwndClock && hwndSeconds && hwndHideInactive)
     {
@@ -109,10 +112,10 @@ UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo)
         
         if (bHideInactive)
         {
-            /* FIXME: when the customize button is disabled, enable it. */
+            EnableWindow(hwndAdvancedButton, TRUE);
             if(bShowClock)
             {
-                /* FIXME: when the seconds checkbox is disabled, enable it. */
+                EnableWindow(hwndSeconds, TRUE);
                 if(bShowSeconds)
                     lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_SECONDS);
                 else
@@ -120,16 +123,16 @@ UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo)
             }
             else
             {
-                /* FIXME: when the seconds checkbox is enabled, disable it it. */
+                EnableWindow(hwndSeconds, FALSE);
                 lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_NOCLOCK);
             }
         }
         else
         {
-            /* FIXME: when the customize button is enabled, disable it. */
+            EnableWindow(hwndAdvancedButton, FALSE);
             if(bShowClock)
             {
-                /* FIXME: when the seconds checkbox is disabled, enable it. */
+                EnableWindow(hwndSeconds, TRUE);
                 if(bShowSeconds)
                     lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_SECONDS);
                 else
@@ -137,7 +140,7 @@ UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo)
             }
             else
             {
-                /* FIXME: when the seconds checkbox is enabled, disable it it. */
+                EnableWindow(hwndSeconds, FALSE);
                 lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_NOCLOCK);
             }
         }
@@ -184,6 +187,7 @@ OnCreateTaskbarPage(HWND hwnd,
     pPropInfo->hTaskbarWnd = hwnd;
 
     // FIXME: check buttons
+    CheckDlgButton(hwnd, IDC_TASKBARPROP_SECONDS, AdvancedSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED);
 
     UpdateTaskbarBitmap(pPropInfo);
 }
@@ -241,6 +245,8 @@ TaskbarPageProc(HWND hwndDlg,
                     break;
 
                 case PSN_APPLY:
+                    AdvancedSettings.bShowSeconds = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_SECONDS);
+                    SaveSettingDword(szAdvancedSettingsKey, TEXT("ShowSeconds"), AdvancedSettings.bShowSeconds);
                     break;
             }