[ros-diffs] [gedmurphy] 41943: Add the resources for the tray property dialog, based on the Vista dialog look and feel

Author: gedmurphy
Date: Tue Jul 14 01:31:56 2009
New Revision: 41943

URL: http://svn.reactos.org/svn/reactos?rev=41943&view=rev
Log:
Add the resources for the tray property dialog, based on the Vista dialog look and feel

Modified:
    trunk/reactos/base/shell/explorer-new/lang/en-US.rc
    trunk/reactos/base/shell/explorer-new/resource.h
    trunk/reactos/base/shell/explorer-new/trayprop.c

Modified: trunk/reactos/base/shell/explorer-new/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la…
==============================================================================
--- 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] Tue Jul 14 01:31:56
2009
@@ -4,7 +4,6 @@
 BEGIN
     POPUP ""
     BEGIN
-
         MENUITEM SEPARATOR
         MENUITEM "Task Manager", ID_SHELL_CMD_OPEN_TASKMGR
         MENUITEM SEPARATOR
@@ -54,6 +53,67 @@
     END
 END
 
+
+IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "Taskbar"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    GROUPBOX        "Taskbar appearance", IDC_STATIC, 6,6,240,121, WS_DISABLED
+    CONTROL         "", IDC_TASKBARPROP_TASKBARBITMAP, "Static",
SS_BITMAP | SS_SUNKEN, 13,18,224,21, WS_DISABLED
+    AUTOCHECKBOX    "&Lock the taskbar", IDC_TASKBARPROP_LOCK,
13,45,200,10, WS_DISABLED
+    AUTOCHECKBOX    "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE,
13,58,200,10, WS_DISABLED
+    AUTOCHECKBOX    "Keep the &taskbar on top of other windows",
IDC_TASKBARPROP_ONTOP, 13,71,200,10, WS_DISABLED
+    AUTOCHECKBOX    "&Group similar taskbar buttons",
IDC_TASKBARPROP_GROUP, 13,84,200,10, WS_DISABLED
+    AUTOCHECKBOX    "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL,
13,97,200,10, WS_DISABLED
+    AUTOCHECKBOX    "&Show window previews (thumbnails)",
IDC_TASKBARPROP_WNDPREV 13,110,200,10, WS_DISABLED
+END
+
+IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "Start Menu"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7,7,105,10
+    LTEXT           "This menu style gives you easy access to your folders, favorite
programs, and search.", IDC_STATIC, 20,17,150,24, WS_DISABLED
+    PUSHBUTTON      "&Customize...", IDC_TASKBARPROP_STARTMENUCUST,
192,4,53,14, WS_DISABLED
+    AUTORADIOBUTTON "Classic Start &menu",
IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED
+    LTEXT           "This menu style gives you the classic look and
functionality",-1,20,57,150,24, WS_DISABLED
+    PUSHBUTTON      "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST,
192,44,53,14, WS_DISABLED
+    GROUPBOX        "Privacy",IDC_STATIC, 7,100,238,42
+    AUTOCHECKBOX    "Store and display a list of recently opened &files",
IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED
+    AUTOCHECKBOX    "Store and display a list of recently opened
&programs",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
+END
+
+IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "Notification Area"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    CONTROL         "", IDC_TASKBARPROP_TASKBARBITMAP, "Static",
SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
+    GROUPBOX        "Icons", IDC_STATIC, 6,33,240,58, WS_DISABLED
+    LTEXT           "You can keep the notification area uncluttered by hiding icons
that you have not clicked recently.", IDC_STATIC, 13,48,223,16, WS_DISABLED
+    AUTOCHECKBOX    "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS,
13,70,125,10, WS_DISABLED
+    PUSHBUTTON      "&Customize...", IDC_TASKBARPROP_ICONCUST,
188,70,50,14, WS_DISABLED
+    GROUPBOX        "System icons", IDC_STATIC, 6,97,240,84, WS_DISABLED
+    LTEXT           "Select which system icons to always show.", IDC_STATIC,
13,112,223,16, WS_DISABLED
+    AUTOCHECKBOX    "Cloc&k", IDC_TASKBARPROP_CLOCK, 13,126,200,10,
WS_DISABLED
+    AUTOCHECKBOX    "&Volume", IDC_TASKBARPROP_VOLUME, 13,139,200,10,
WS_DISABLED
+    AUTOCHECKBOX    "&Network", IDC_TASKBARPROP_NETWORK, 13,152,200,10,
WS_DISABLED
+    AUTOCHECKBOX    "&Power", IDC_TASKBARPROP_POWER, 13,164,200,10,
WS_DISABLED
+
+END
+
+IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "Toolbars"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    LTEXT           "Select which toolbars to add to the taskbar.", IDC_STATIC,
7,7,223,12, WS_DISABLED
+    CONTROL         "", IDC_TASKBARPROP_DESKBANDLIST,
"SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160,
WS_EX_CLIENTEDGE
+END
+
+
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_START             "Start"

Modified: trunk/reactos/base/shell/explorer-new/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/re…
==============================================================================
--- trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] Tue Jul 14 01:31:56
2009
@@ -1,5 +1,7 @@
 #ifndef __RESOURCE_H
 #define __RESOURCE_H
+
+#define IDC_STATIC -1
 
 #define IDI_START   101
 
@@ -47,10 +49,40 @@
 
 /* Taskbar resources */
 #define IDD_TASKBARPAGE 2000
+#define IDC_TASKBAR_BITMAP 2001
 #define IDD_STARTMENUPAGE 2001
 #define IDD_NOTIFICATIONPAGE 2002
 #define IDD_TOOLBARSPAGE 2003
 
+#define IDD_TASKBARPROP_TASKBAR 2000
+#define IDC_TASKBARPROP_TASKBARBITMAP 2001
+#define IDC_TASKBARPROP_LOCK 2002
+#define IDC_TASKBARPROP_HIDE 2003
+#define IDC_TASKBARPROP_ONTOP 2004
+#define IDC_TASKBARPROP_GROUP 2005
+#define IDC_TASKBARPROP_SHOWQL 2006
+#define IDC_TASKBARPROP_WNDPREV 2007
+
+#define IDD_TASKBARPROP_STARTMENU 2100
+#define IDC_TASKBARPROP_STARTMENU 2101
+#define IDC_TASKBARPROP_STARTMENUCUST 2102
+#define IDC_TASKBARPROP_STARTMENUCLASSIC 2103
+#define IDC_TASKBARPROP_STARTMENUCLASSICCUST 2104
+#define IDC_TASKBARPROP_RECENTFILES 2105
+#define IDC_TASKBARPROP_RECENTFOLDERS 2106
+
+#define IDD_TASKBARPROP_NOTIFICATION 2200
+#define IDC_TASKBARPROP_TASKBARBITMAP 2201
+#define IDC_TASKBARPROP_HIDEICONS 2202
+#define IDC_TASKBARPROP_ICONCUST 2203
+#define IDC_TASKBARPROP_CLOCK 2204
+#define IDC_TASKBARPROP_VOLUME 2205
+#define IDC_TASKBARPROP_NETWORK 2206
+#define IDC_TASKBARPROP_POWER 2207
+
+#define IDD_TASKBARPROP_TOOLBARS 2300
+#define IDC_TASKBARPROP_DESKBANDLIST 2301
+
 #define IDS_TASKBAR_STARTMENU_PROP_CAPTION 2200
 
 #endif /* __RESOURCE_H */

Modified: trunk/reactos/base/shell/explorer-new/trayprop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr…
==============================================================================
--- trunk/reactos/base/shell/explorer-new/trayprop.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/trayprop.c [iso-8859-1] Tue Jul 14 01:31:56
2009
@@ -178,10 +178,7 @@
     PROPSHEETHEADER psh;
     PROPSHEETPAGE psp[4];
     TCHAR szCaption[256];
-#if 1
-    MessageBox(NULL, _T("Not implemented"), NULL, 0);
-    return NULL;
-#endif
+
     if (!LoadString(hExplorerInstance,
                     IDS_TASKBAR_STARTMENU_PROP_CAPTION,
                     szCaption,
@@ -201,10 +198,10 @@
     psh.nStartPage = 0;
     psh.ppsp = psp;
 
-    InitPropSheetPage(&psp[0], IDD_TASKBARPAGE, (DLGPROC)TaskbarPageProc);
-    InitPropSheetPage(&psp[1], IDD_STARTMENUPAGE, (DLGPROC)StartMenuPageProc);
-    InitPropSheetPage(&psp[2], IDD_NOTIFICATIONPAGE, (DLGPROC)NotificationPageProc);
-    InitPropSheetPage(&psp[3], IDD_TOOLBARSPAGE, (DLGPROC)ToolbarsPageProc);
+    InitPropSheetPage(&psp[0], IDD_TASKBARPROP_TASKBAR, (DLGPROC)TaskbarPageProc);
+    InitPropSheetPage(&psp[1], IDD_TASKBARPROP_STARTMENU,
(DLGPROC)StartMenuPageProc);
+    InitPropSheetPage(&psp[2], IDD_TASKBARPROP_NOTIFICATION,
(DLGPROC)NotificationPageProc);
+    InitPropSheetPage(&psp[3], IDD_TASKBARPROP_TOOLBARS, (DLGPROC)ToolbarsPageProc);
 
     return (HWND)PropertySheet(&psh);
 }