Author: tfaber
Date: Wed Dec 26 15:14:41 2012
New Revision: 58011
URL: http://svn.reactos.org/svn/reactos?rev=58011&view=rev
Log:
[EXPLORER_NEW]
- Add Advanced tab in task bar properties to support ReactOS-specific options
(currently: show seconds in tray clock). Patch by Edijs Kolesnikovics.
CORE-5410 #comment Patch committed, thanks! Awaiting the updated
save-to-registry functionality.
Modified:
trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc
trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc
trunk/reactos/base/shell/explorer-new/lang/de-DE.rc
trunk/reactos/base/shell/explorer-new/lang/en-US.rc
trunk/reactos/base/shell/explorer-new/lang/es-ES.rc
trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc
trunk/reactos/base/shell/explorer-new/lang/it-IT.rc
trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc
trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc
trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc
trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc
trunk/reactos/base/shell/explorer-new/lang/no-NO.rc
trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc
trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc
trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc
trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc
trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc
trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc
trunk/reactos/base/shell/explorer-new/lang/zh-CN.rc
trunk/reactos/base/shell/explorer-new/precomp.h
trunk/reactos/base/shell/explorer-new/resource.h
trunk/reactos/base/shell/explorer-new/trayntfy.c
trunk/reactos/base/shell/explorer-new/trayprop.c
Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -124,6 +124,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -128,6 +128,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/de-DE.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -122,6 +122,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/en-US.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -122,6 +122,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/es-ES.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -131,6 +131,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -131,6 +131,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/it-IT.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -122,6 +122,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -122,6 +122,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -136,6 +136,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -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
Modified: trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -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
Modified: trunk/reactos/base/shell/explorer-new/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/no-NO.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -131,6 +131,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -131,6 +131,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -124,6 +124,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -123,6 +123,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -124,6 +124,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -127,6 +127,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -130,6 +130,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lang/zh-CN.rc?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/lang/zh-CN.rc [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -130,6 +130,15 @@
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
Modified: trunk/reactos/base/shell/explorer-new/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/precomp.h?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -26,6 +26,13 @@
#include "initguid.h"
#include "undoc.h"
+/* Structure to hold non-default options*/
+typedef struct _ADVANCED_SETTINGS {
+ BOOL bShowSeconds;
+} ADVANCED_SETTINGS, *PADVANCED_SETTINGS;
+
+extern ADVANCED_SETTINGS AdvancedSettings;
+
/* dynamic imports due to lack of support in msvc linker libs */
typedef INT (APIENTRY *REGSHELLHOOK)(HWND, DWORD);
#ifdef UNICODE
Modified: trunk/reactos/base/shell/explorer-new/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/resource.h?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -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
Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/trayntfy.c?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -688,8 +688,6 @@
*/
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
@@ -722,27 +720,6 @@
else if (dwType != REG_DWORD) return DISP_E_TYPEMISMATCH;
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]))
@@ -965,7 +942,7 @@
if (ClockWndFormats[i].IsTime)
{
iRet = GetTimeFormat(LOCALE_USER_DEFAULT,
- ClockWndFormats[i].dwFormatFlags,
+ AdvancedSettings.bShowSeconds ?
ClockWndFormats[i].dwFormatFlags : TIME_NOSECONDS,
&This->LocalTime,
ClockWndFormats[i].lpFormat,
This->szLines[i],
@@ -983,11 +960,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 +1023,7 @@
/* Calculate the due time */
GetLocalTime(&This->LocalTime);
uiDueTime = 1000 - (UINT)This->LocalTime.wMilliseconds;
- if (blShowSeconds == TRUE)
+ if (AdvancedSettings.bShowSeconds)
uiDueTime += (UINT)This->LocalTime.wSecond * 100;
else
uiDueTime += (59 - (UINT)This->LocalTime.wSecond) * 1000;
@@ -1117,7 +1089,7 @@
uiDueTime = TrayClockWnd_CalculateDueTime(This);
- if (blShowSeconds == TRUE)
+ if (AdvancedSettings.bShowSeconds)
{
uiWait1 = 1000 - 200;
uiWait2 = 1000;
@@ -1403,7 +1375,6 @@
PTRAY_CLOCK_WND_DATA TcData;
DWORD dwStyle;
HWND hWnd = NULL;
- LoadSettings();
TcData = HeapAlloc(hProcessHeap,
0,
Modified: trunk/reactos/base/shell/explorer-new/trayprop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/trayprop.c?rev=58011&r1=58010&r2=58011&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/trayprop.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/trayprop.c [iso-8859-1] Wed Dec 26
15:14:41 2012
@@ -30,6 +30,8 @@
HBITMAP hTaskbarBitmap;
} PROPSHEET_INFO, *PPROPSHEET_INFO;
+ADVANCED_SETTINGS AdvancedSettings = { FALSE };
+
static BOOL
UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo)
@@ -38,7 +40,7 @@
HWND hwndBitmap;
BOOL bLock, bHide, bGroup, bShowQL;
LPTSTR lpImageName = NULL;
- BOOL bRet = FALSE;
+ BOOL bRet = FALSE;
hwndLock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_LOCK);
hwndHide = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDE);
@@ -188,8 +190,58 @@
return FALSE;
}
-
-INT_PTR CALLBACK
+static INT_PTR CALLBACK
+AdvancedSettingsPageProc(HWND hwndDlg,
+ UINT uMsg,
+ WPARAM wParam,
+ LPARAM lParam)
+{
+ switch (uMsg)
+ {
+ case WM_INITDIALOG:
+ CheckDlgButton(hwndDlg, IDC_TASKBARPROP_SECONDS,
AdvancedSettings.bShowSeconds ? 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:
+ AdvancedSettings.bShowSeconds =
IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_SECONDS);
+ break;
+ }
+
+ break;
+ }
+
+ case WM_DESTROY:
+ break;
+
+ default:
+ return FALSE;
+ }
+
+ return FALSE;
+}
+
+static INT_PTR CALLBACK
StartMenuPageProc(HWND hwndDlg,
UINT uMsg,
WPARAM wParam,
@@ -224,7 +276,7 @@
}
-INT_PTR CALLBACK
+static INT_PTR CALLBACK
NotificationPageProc(HWND hwndDlg,
UINT uMsg,
WPARAM wParam,
@@ -259,7 +311,7 @@
}
-INT_PTR CALLBACK
+static INT_PTR CALLBACK
ToolbarsPageProc(HWND hwndDlg,
UINT uMsg,
WPARAM wParam,
@@ -315,7 +367,7 @@
{
PPROPSHEET_INFO pPropInfo;
PROPSHEETHEADER psh;
- PROPSHEETPAGE psp[4];
+ PROPSHEETPAGE psp[5];
TCHAR szCaption[256];
pPropInfo = (PPROPSHEET_INFO)HeapAlloc(hProcessHeap,
@@ -349,10 +401,11 @@
psh.nStartPage = 0;
psh.ppsp = psp;
- InitPropSheetPage(&psp[0], IDD_TASKBARPROP_TASKBAR,
(DLGPROC)TaskbarPageProc, (LPARAM)pPropInfo);
- 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[0], IDD_TASKBARPROP_TASKBAR, TaskbarPageProc,
(LPARAM)pPropInfo);
+ InitPropSheetPage(&psp[1], IDD_TASKBARPROP_STARTMENU, StartMenuPageProc,
(LPARAM)pPropInfo);
+ InitPropSheetPage(&psp[2], IDD_TASKBARPROP_NOTIFICATION,
NotificationPageProc, (LPARAM)pPropInfo);
+ InitPropSheetPage(&psp[3], IDD_TASKBARPROP_TOOLBARS, ToolbarsPageProc,
(LPARAM)pPropInfo);
+ InitPropSheetPage(&psp[4], IDD_TASKBARPROP_ADVANCED,
AdvancedSettingsPageProc, (LPARAM)pPropInfo);
PropertySheet(&psh);
