mirror of
https://github.com/reactos/reactos.git
synced 2024-10-03 16:05:37 +00:00
[EXPLORER] -Reactivate the 'show seconds' functionality.
-Enable the the controls depending on checkbox states svn path=/trunk/; revision=70104
This commit is contained in:
parent
fa9f7f4b41
commit
60c8c31792
|
@ -36,6 +36,7 @@ UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo)
|
||||||
{
|
{
|
||||||
HWND hwndLock, hwndHide, hwndGroup, hwndShowQL, hwndClock, hwndSeconds, hwndHideInactive;
|
HWND hwndLock, hwndHide, hwndGroup, hwndShowQL, hwndClock, hwndSeconds, hwndHideInactive;
|
||||||
HWND hwndTaskbarBitmap, hwndTrayBitmap;
|
HWND hwndTaskbarBitmap, hwndTrayBitmap;
|
||||||
|
HWND hwndAdvancedButton;
|
||||||
BOOL bLock, bHide, bGroup, bShowQL, bShowClock, bShowSeconds, bHideInactive;
|
BOOL bLock, bHide, bGroup, bShowQL, bShowClock, bShowSeconds, bHideInactive;
|
||||||
LPTSTR lpTaskBarImageName = NULL, lpTrayImageName = NULL;
|
LPTSTR lpTaskBarImageName = NULL, lpTrayImageName = NULL;
|
||||||
BOOL bRet = FALSE;
|
BOOL bRet = FALSE;
|
||||||
|
@ -48,6 +49,8 @@ UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo)
|
||||||
hwndClock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_CLOCK);
|
hwndClock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_CLOCK);
|
||||||
hwndSeconds = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_SECONDS);
|
hwndSeconds = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_SECONDS);
|
||||||
hwndHideInactive = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDEICONS);
|
hwndHideInactive = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDEICONS);
|
||||||
|
|
||||||
|
hwndAdvancedButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_ICONCUST);
|
||||||
|
|
||||||
if (hwndLock && hwndHide && hwndGroup && hwndShowQL && hwndClock && hwndSeconds && hwndHideInactive)
|
if (hwndLock && hwndHide && hwndGroup && hwndShowQL && hwndClock && hwndSeconds && hwndHideInactive)
|
||||||
{
|
{
|
||||||
|
@ -109,10 +112,10 @@ UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo)
|
||||||
|
|
||||||
if (bHideInactive)
|
if (bHideInactive)
|
||||||
{
|
{
|
||||||
/* FIXME: when the customize button is disabled, enable it. */
|
EnableWindow(hwndAdvancedButton, TRUE);
|
||||||
if(bShowClock)
|
if(bShowClock)
|
||||||
{
|
{
|
||||||
/* FIXME: when the seconds checkbox is disabled, enable it. */
|
EnableWindow(hwndSeconds, TRUE);
|
||||||
if(bShowSeconds)
|
if(bShowSeconds)
|
||||||
lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_SECONDS);
|
lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_SECONDS);
|
||||||
else
|
else
|
||||||
|
@ -120,16 +123,16 @@ UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* FIXME: when the seconds checkbox is enabled, disable it it. */
|
EnableWindow(hwndSeconds, FALSE);
|
||||||
lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_NOCLOCK);
|
lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_NOCLOCK);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* FIXME: when the customize button is enabled, disable it. */
|
EnableWindow(hwndAdvancedButton, FALSE);
|
||||||
if(bShowClock)
|
if(bShowClock)
|
||||||
{
|
{
|
||||||
/* FIXME: when the seconds checkbox is disabled, enable it. */
|
EnableWindow(hwndSeconds, TRUE);
|
||||||
if(bShowSeconds)
|
if(bShowSeconds)
|
||||||
lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_SECONDS);
|
lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_SECONDS);
|
||||||
else
|
else
|
||||||
|
@ -137,7 +140,7 @@ UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* FIXME: when the seconds checkbox is enabled, disable it it. */
|
EnableWindow(hwndSeconds, FALSE);
|
||||||
lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_NOCLOCK);
|
lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_NOCLOCK);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -184,6 +187,7 @@ OnCreateTaskbarPage(HWND hwnd,
|
||||||
pPropInfo->hTaskbarWnd = hwnd;
|
pPropInfo->hTaskbarWnd = hwnd;
|
||||||
|
|
||||||
// FIXME: check buttons
|
// FIXME: check buttons
|
||||||
|
CheckDlgButton(hwnd, IDC_TASKBARPROP_SECONDS, AdvancedSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED);
|
||||||
|
|
||||||
UpdateTaskbarBitmap(pPropInfo);
|
UpdateTaskbarBitmap(pPropInfo);
|
||||||
}
|
}
|
||||||
|
@ -241,6 +245,8 @@ TaskbarPageProc(HWND hwndDlg,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PSN_APPLY:
|
case PSN_APPLY:
|
||||||
|
AdvancedSettings.bShowSeconds = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_SECONDS);
|
||||||
|
SaveSettingDword(szAdvancedSettingsKey, TEXT("ShowSeconds"), AdvancedSettings.bShowSeconds);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue