Notes & reminders:

- manual delphi resources replaced with VS-style control ids;
- reminder notification dialog moved to UI classes;
- fixes #1746 (Notes and Reminders: add repeat reminders support)

1 files changed, 61 insertions, 28 deletions

diff --git a/plugins/NotesAndReminders/res/resource.rc b/plugins/NotesAndReminders/res/resource.rc
index f5384b3821..d1cddd06ef 100644
--- a/plugins/NotesAndReminders/res/resource.rc
+++ b/plugins/NotesAndReminders/res/resource.rc
@@ -17,7 +17,7 @@
 

 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)

 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-#pragma code_page(1252)

+#pragma code_page(1251)

 

 #ifdef APSTUDIO_INVOKED

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

@@ -93,26 +93,26 @@ EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Add Reminder"

 FONT 8, "MS Sans Serif", 0, 0, 0x1

 BEGIN

-    GROUPBOX        "Trigger On Time && Date:",1005,4,2,146,52

-    LTEXT           "Date",IDC_STATIC,10,18,24,8

-    CONTROL         "DateTimePicker1",1000,"SysDateTimePick32",DTS_LONGDATEFORMAT | WS_TABSTOP,38,16,107,13

-    LTEXT           "Time",IDC_STATIC,10,37,25,8

-    COMBOBOX        IDC_COMBOREMINDERTIME,38,35,107,198,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP

+    LTEXT           "Date",IDC_STATIC,8,8,24,8

+    CONTROL         "DateTimePicker1",IDC_DATE,"SysDateTimePick32",DTS_LONGDATEFORMAT | WS_TABSTOP,39,6,107,13

+    LTEXT           "Time",IDC_STATIC,8,25,25,8

+    COMBOBOX        IDC_COMBOREMINDERTIME,39,23,107,198,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP

+    CONTROL         "Repeat each day",IDC_CHECK_REPEAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,42,138,10

     GROUPBOX        "Reminder Note:",1006,4,58,230,99

-    EDITTEXT        1004,9,70,220,81,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

+    EDITTEXT        IDC_REMINDER,9,70,220,81,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

     GROUPBOX        "",IDC_STATIC,4,157,228,22,NOT WS_VISIBLE

-    CONTROL         "None",1008,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_TABSTOP,13,167,45,8

-    CONTROL         "Daily",1009,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_TABSTOP,68,167,45,8

-    CONTROL         "Weekly",1010,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_TABSTOP,124,167,45,8

-    CONTROL         "Monthly",1011,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_TABSTOP,178,167,45,8

+    CONTROL         "None",IDC_NONE,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_TABSTOP,13,167,45,8

+    CONTROL         "Daily",IDC_DAILY,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_TABSTOP,68,167,45,8

+    CONTROL         "Weekly",IDC_WEEKLY,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_TABSTOP,124,167,45,8

+    CONTROL         "Monthly",IDC_MONTHLY,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_TABSTOP,178,167,45,8

     LTEXT           "Repeat Alert Sound",IDC_STATIC,31,166,90,8,0,WS_EX_RIGHT

     COMBOBOX        IDC_COMBO_REPEATSND,126,163,107,81,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     LTEXT           "Use Sound",IDC_STATIC,31,185,90,8,0,WS_EX_RIGHT

     COMBOBOX        IDC_COMBO_SOUND,126,182,90,81,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     PUSHBUTTON      "",IDC_BTN_PLAYSOUND,220,183,13,12,BS_ICON

-    DEFPUSHBUTTON   "&Add Reminder",1002,158,6,76,14

-    PUSHBUTTON      "&Close",1003,158,23,76,14

-    PUSHBUTTON      "&View Reminders",1007,158,40,76,14

+    DEFPUSHBUTTON   "&Add Reminder",IDC_ADDREMINDER,158,6,76,14

+    PUSHBUTTON      "&Close",IDC_CLOSE,158,23,76,14

+    PUSHBUTTON      "&View Reminders",IDC_VIEWREMINDERS,158,40,76,14

     LTEXT           "reftime",IDC_REFTIME,0,191,22,8,NOT WS_VISIBLE | NOT WS_GROUP

 END

 

@@ -122,18 +122,18 @@ EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Reminder"

 FONT 8, "MS Sans Serif", 0, 0, 0x1

 BEGIN

-    EDITTEXT        1000,3,4,233,80,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL

-    CONTROL         "After:",1004,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,11,90,32,10,WS_EX_TRANSPARENT

-    CONTROL         "On Time && Date:",1005,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,51,90,65,10,WS_EX_TRANSPARENT

-    GROUPBOX        "",-1,4,90,148,52

-    COMBOBOX        1003,24,113,107,104,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP

+    EDITTEXT        IDC_REMDATA,3,4,233,80,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL

+    CONTROL         "After:",IDC_AFTER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,11,90,32,10,WS_EX_TRANSPARENT

+    CONTROL         "On Time && Date:",IDC_ONDATE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,51,90,65,10,WS_EX_TRANSPARENT

+    GROUPBOX        "",0,4,90,148,52

+    COMBOBOX        IDC_REMINDAGAININ,24,113,107,104,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP

     LTEXT           "Date",IDC_STATIC_DATE,10,106,23,8

-    CONTROL         "DateTimePicker1",1006,"SysDateTimePick32",DTS_LONGDATEFORMAT | WS_TABSTOP,39,104,107,13

+    CONTROL         "DateTimePicker1",IDC_DATEAGAIN,"SysDateTimePick32",DTS_LONGDATEFORMAT | WS_TABSTOP,39,104,107,13

     LTEXT           "Time",IDC_STATIC_TIME,10,125,24,8

-    COMBOBOX        1007,39,123,107,198,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP

-    DEFPUSHBUTTON   "&Remind Again",1002,161,92,75,14

-    PUSHBUTTON      "&Create Note",1008,161,111,75,14

-    PUSHBUTTON      "&Dismiss",1001,161,129,75,14

+    COMBOBOX        IDC_TIMEAGAIN,39,123,107,198,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP

+    DEFPUSHBUTTON   "&Remind Again",IDC_REMINDAGAIN,161,92,75,14

+    PUSHBUTTON      "&Create Note",IDC_NONE,161,111,75,14

+    PUSHBUTTON      "&Dismiss",IDC_DISMISS,161,129,75,14

     LTEXT           "reftime",IDC_REFTIME,0,137,22,8,NOT WS_VISIBLE | NOT WS_GROUP

 END

 

@@ -143,10 +143,10 @@ EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Reminders"

 FONT 8, "MS Sans Serif", 0, 0, 0x1

 BEGIN

-    CONTROL         "List1",1000,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,3,4,251,146

-    EDITTEXT        1001,3,153,251,69,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL

-    PUSHBUTTON      "Add New",1002,151,227,50,14

-    DEFPUSHBUTTON   "&Close",1003,203,227,50,14

+    CONTROL         "List1",IDC_LISTREMINDERS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,3,4,251,146

+    EDITTEXT        IDC_REMINDERDATA,3,153,251,69,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL

+    PUSHBUTTON      "Add New",IDC_ADDNEWREMINDER,151,227,50,14

+    DEFPUSHBUTTON   "&Close",IDC_CLOSE,203,227,50,14

 END

 

 

@@ -271,9 +271,42 @@ BEGIN
         VERTGUIDE, 291

         VERTGUIDE, 296

     END

+

+    IDD_ADDREMINDER, DIALOG

+    BEGIN

+    END

+

+    IDD_NOTIFYREMINDER, DIALOG

+    BEGIN

+    END

+

+    IDD_LISTREMINDERS, DIALOG

+    BEGIN

+    END

 END

 #endif    // APSTUDIO_INVOKED

 

+

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

+//

+// AFX_DIALOG_LAYOUT

+//

+

+IDD_ADDREMINDER AFX_DIALOG_LAYOUT

+BEGIN

+    0

+END

+

+IDD_NOTIFYREMINDER AFX_DIALOG_LAYOUT

+BEGIN

+    0

+END

+

+IDD_LISTREMINDERS AFX_DIALOG_LAYOUT

+BEGIN

+    0

+END

+

 #endif    // Neutral resources

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