Commit in reactos/lib/cpl/desk on MAIN
desk.rc+20-251.4 -> 1.5
- oops...
- added screen saver controls

reactos/lib/cpl/desk
desk.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- desk.rc	16 Dec 2004 00:51:01 -0000	1.4
+++ desk.rc	16 Dec 2004 01:12:40 -0000	1.5
@@ -7,7 +7,7 @@
 #endif
 
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Display Control Panel\0"
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Display  Panel\0"
 #define REACTOS_STR_INTERNAL_NAME	"desk\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"desk.cpl\0"
 #ifdef _MSC_VER
@@ -16,7 +16,6 @@
 #include <reactos/version.rc>
 #endif
 
-#include <windows.h>
 IDD_PROPPAGEBACKGROUND DIALOGEX 0, 0, 246, 228
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Background"
@@ -40,6 +39,25 @@
 CAPTION "Screen Saver"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
+   CONTROL         "",1002,"Static",SS_BITMAP | SS_CENTERIMAGE,63,11,125,
+                    107
+    GROUPBOX        "&Screen Saver",200,7,129,238,48
+    COMBOBOX        1000,13,140,115,200,CBS_DROPDOWNLIST | CBS_SORT | 
+                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "Se&ttings...",1003,132,139,50,14,WS_GROUP
+    PUSHBUTTON      "Pre&view",1004,186,139,50,14
+    CONTROL         "&Password protected",1020,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,13,160,80,9
+    LTEXT           "&Wait:",1016,154,144,17,9
+    EDITTEXT        1006,173,158,30,12,ES_RIGHT | WS_GROUP
+    CONTROL         "",1007,"msctls_updown32",UDS_SETBUDDYINT | 
+                    UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | 
+                    UDS_NOTHOUSANDS | WS_BORDER | WS_GROUP,203,158,11,12
+    LTEXT           "minutes",1022,219,160,28,9
+    GROUPBOX        "Energy saving features of monitor",1017,7,179,238,33
+    PUSHBUTTON      "P&ower...",1014,186,190,50,14
+    LTEXT           "To adjust the power settings for your monitor, click Power.",
+                    1018,22,190,155,16
 END
 
 IDD_PROPPAGEAPPEARANCE DIALOGEX 0, 0, 246, 228
@@ -55,29 +73,6 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 END
-IDD_PROPPAGESCREENSAVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Screen Saver"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-
-END
-
-IDD_PROPPAGEAPPEARANCE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Appearance"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-
-END
-
-IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Settings"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-
-END
 
 STRINGTABLE 
 BEGIN
CVSspam 0.2.8