plugins:

	alarms:
		added days of week.
		closes #318

1 files changed, 49 insertions, 24 deletions

diff --git a/plugins/Alarms/res/resource.rc b/plugins/Alarms/res/resource.rc
index 13104dbf7e..32a34ebd7f 100644..100755
--- a/plugins/Alarms/res/resource.rc
+++ b/plugins/Alarms/res/resource.rc
@@ -63,45 +63,53 @@ BEGIN
     PUSHBUTTON      "Preview",IDC_BTN_PREVIEW,250,181,42,25

 END

 

-IDD_DIALOG2 DIALOGEX 0, 0, 381, 234

+IDD_DIALOG2 DIALOGEX 0, 0, 381, 249

 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

 CAPTION "Alarm"

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,138,213,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,194,213,50,14

+    DEFPUSHBUTTON   "OK",IDOK,138,228,50,14

+    PUSHBUTTON      "Cancel",IDCANCEL,194,228,50,14

     EDITTEXT        IDC_TITLE,8,13,151,14,ES_AUTOHSCROLL

     LTEXT           "Title:",IDC_STATIC,8,3,104,8

-    EDITTEXT        IDC_DESC,7,40,152,57,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN

+    EDITTEXT        IDC_DESC,7,40,152,71,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN

     LTEXT           "Description:",IDC_STATIC,8,30,96,8

-    GROUPBOX        "Actions",IDC_STATIC,7,100,367,88

-    CONTROL         "Popup window",IDC_CHK_APOPUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,110,119,10

-    CONTROL         "Sound:",IDC_CHK_ASOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,120,84,10

-    CONTROL         "Run command:",IDC_CHK_ACOMMAND,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,16,131,119,10

-    LTEXT           "Parameters:",IDC_STATIC,16,159,119,8

-    EDITTEXT        IDC_ED_COMMAND,16,143,351,14,ES_AUTOHSCROLL

-    EDITTEXT        IDC_ED_PARAMS,16,169,351,14,ES_AUTOHSCROLL

-    CONTROL         "Alert 1",IDC_RAD_SND1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,105,120,61,10

-    CONTROL         "Alert 2",IDC_RAD_SND2,"Button",BS_AUTORADIOBUTTON,171,120,61,10

-    CONTROL         "Alert 3",IDC_RAD_SND3,"Button",BS_AUTORADIOBUTTON,237,120,61,10

-    CONTROL         "Speak",IDC_RAD_SPK,"Button",BS_AUTORADIOBUTTON,303,120,61,10

+    GROUPBOX        "Actions",IDC_STATIC,7,116,367,88

+    CONTROL         "Popup window",IDC_CHK_APOPUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,126,119,10

+    CONTROL         "Sound:",IDC_CHK_ASOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,136,84,10

+    CONTROL         "Run command:",IDC_CHK_ACOMMAND,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,16,147,119,10

+    LTEXT           "Parameters:",IDC_STATIC,16,175,119,8

+    EDITTEXT        IDC_ED_COMMAND,16,159,351,14,ES_AUTOHSCROLL

+    EDITTEXT        IDC_ED_PARAMS,16,185,351,14,ES_AUTOHSCROLL

+    CONTROL         "Alert 1",IDC_RAD_SND1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,105,136,61,10

+    CONTROL         "Alert 2",IDC_RAD_SND2,"Button",BS_AUTORADIOBUTTON,171,136,61,10

+    CONTROL         "Alert 3",IDC_RAD_SND3,"Button",BS_AUTORADIOBUTTON,237,136,61,10

+    CONTROL         "Speak",IDC_RAD_SPK,"Button",BS_AUTORADIOBUTTON,303,136,61,10

     CONTROL         "DateTimePicker1",IDC_TIME,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP | 0x8,174,19,55,13

-    GROUPBOX        "Occurrence",IDC_STATIC,305,9,69,88

+    GROUPBOX        "Occurrence",IDC_STATIC,305,9,69,100

     CONTROL         "Once",IDC_RAD_ONCE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,311,19,58,10

-    CONTROL         "Weekly",IDC_RAD_WEEKLY,"Button",BS_AUTORADIOBUTTON,311,45,58,10

+    CONTROL         "Weekly",IDC_RAD_WEEKLY,"Button",BS_AUTORADIOBUTTON,311,69,58,10

     CONTROL         "Daily",IDC_RAD_DAILY,"Button",BS_AUTORADIOBUTTON,311,32,58,10

     CONTROL         "Weekdays",IDC_RAD_WEEKDAYS,"Button",BS_AUTORADIOBUTTON,311,58,58,10

-    CONTROL         "Monthly",IDC_RAD_MONTHLY,"Button",BS_AUTORADIOBUTTON,311,71,58,10

-    CONTROL         "Yearly",IDC_RAD_YEARLY,"Button",BS_AUTORADIOBUTTON,311,84,58,10

+    CONTROL         "Monthly",IDC_RAD_MONTHLY,"Button",BS_AUTORADIOBUTTON,311,80,58,10

+    CONTROL         "Yearly",IDC_RAD_YEARLY,"Button",BS_AUTORADIOBUTTON,311,92,58,10

     COMBOBOX        IDC_DAY,231,36,64,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     CONTROL         "i'm hiding",IDC_CHK_INVIS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,113,28,45,10

     COMBOBOX        IDC_DAYNUM,174,36,48,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    GROUPBOX        "Date and time",IDC_STATIC,167,9,134,88

+    GROUPBOX        "Date and time",IDC_STATIC,167,9,134,100

     EDITTEXT        IDC_RELMIN,238,19,57,13,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "Disable next occurrence",IDC_CHK_SUSPEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,192,128,10

-    CONTROL         "Don't trigger on startup",IDC_CHK_NOSTARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,147,192,113,10

-    CONTROL         "No reminder",IDC_CHK_NOREMINDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,263,192,110,10

+    CONTROL         "Disable next occurrence",IDC_CHK_SUSPEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,209,128,10

+    CONTROL         "Don't trigger on startup",IDC_CHK_NOSTARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,141,209,113,10

+    CONTROL         "No reminder",IDC_CHK_NOREMINDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,209,110,10

     CONTROL         "",IDC_DATE,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,185,65,100,15

+    CONTROL         "Selected Days",IDC_RAD_DAYS,"Button",BS_AUTORADIOBUTTON,311,46,61,10

+    CONTROL         "1",IDC_CHK_DAY1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,87,20,10

+    CONTROL         "2",IDC_CHK_DAY2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,87,20,10

+    CONTROL         "3",IDC_CHK_DAY3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,208,87,20,10

+    CONTROL         "4",IDC_CHK_DAY4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,227,87,20,10

+    CONTROL         "5",IDC_CHK_DAY5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,97,20,10

+    CONTROL         "6",IDC_CHK_DAY6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,190,98,20,10

+    CONTROL         "7",IDC_CHK_DAY7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,209,98,20,10

 END

 

 IDD_ALARM DIALOGEX 0, 0, 185, 82

@@ -138,7 +146,8 @@ BEGIN
         LEFTMARGIN, 7

         RIGHTMARGIN, 374

         TOPMARGIN, 7

-        BOTTOMMARGIN, 227

+        BOTTOMMARGIN, 242

+        HORZGUIDE, 219

     END

 

     IDD_ALARM, DIALOG

@@ -184,11 +193,16 @@ END
 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_MAINMENU            ICON                    "clock.ico"

+

 IDI_LIST1               ICON                    "green.ico"

+

 IDI_LIST2               ICON                    "yellow.ico"

+

 IDI_TBUP                ICON                    "iconttbup.ico"

+

 IDI_TBDN                ICON                    "iconttbdown.ico"

 

+

 /////////////////////////////////////////////////////////////////////////////

 //

 // Menu

@@ -208,6 +222,17 @@ BEGIN
     END

 END

 

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// AFX_DIALOG_LAYOUT

+//

+

+IDD_DIALOG2 AFX_DIALOG_LAYOUT

+BEGIN

+    0

+END

+

 #endif    // English (Australia) resources

 /////////////////////////////////////////////////////////////////////////////