diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/NotesAndReminders/src/main.cpp | 12 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/notes.cpp | 448 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/reminders.cpp | 560 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/version.h | 4 |
4 files changed, 483 insertions, 541 deletions
diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index 857cd06334..f717e33e4d 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -80,7 +80,7 @@ static void addMenuItem(CMenuItem &mi) Menu_AddMainMenuItem(&mi);
}
-int OnModulesLoaded(WPARAM, LPARAM)
+static int OnModulesLoaded(WPARAM, LPARAM)
{
// register fonts and hotkeys
RegisterFontServiceFonts();
@@ -159,6 +159,13 @@ int OnModulesLoaded(WPARAM, LPARAM) return 0;
}
+static int OnPreShutdown(WPARAM, LPARAM)
+{
+ CloseNotesList();
+ CloseReminderList();
+ return 0;
+}
+
/////////////////////////////////////////////////////////////////////////////////////////
CMPlugin::CMPlugin() :
@@ -191,6 +198,7 @@ int CMPlugin::Load() g_plugin.addSound("AlertReminder3", LPGENW("Alerts"), LPGENW("Reminder triggered (Alternative 2)"));
HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
+ HookEvent(ME_SYSTEM_PRESHUTDOWN, OnPreShutdown);
HookEvent(ME_OPT_INITIALISE, OnOptInitialise);
InitIcons();
return 0;
@@ -200,8 +208,6 @@ int CMPlugin::Load() int CMPlugin::Unload()
{
- CloseNotesList();
- CloseReminderList();
SaveNotes();
SaveReminders();
DestroyMsgWindow();
diff --git a/plugins/NotesAndReminders/src/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp index 22e890ba81..81061d729f 100644 --- a/plugins/NotesAndReminders/src/notes.cpp +++ b/plugins/NotesAndReminders/src/notes.cpp @@ -25,18 +25,11 @@ #define WS_EX_LAYERED 0x00080000 #define LWA_ALPHA 0x00000002 -#define WM_RELOAD (WM_USER + 100) - -#define NOTIFY_LIST() if (ListNotesVisible) PostMessage(LV,WM_RELOAD,0,0) - #define NOTE_WND_CLASS L"MIM_StickyNote" #define IDM_COLORPRESET_BG 41000 #define IDM_COLORPRESET_FG 41100 -static bool ListNotesVisible = false; -static HWND LV; - struct ColorPreset { wchar_t *szName; @@ -102,9 +95,11 @@ struct STICKYNOTE : public MZeroedObject static OBJLIST<STICKYNOTE> g_arStickies(1, PtrKeySortT); void GetTriggerTimeString(const ULONGLONG *When, wchar_t *s, size_t strSize, BOOL bUtc); -void OnListResize(HWND hwndDlg); void FileTimeToTzLocalST(const FILETIME *lpUtc, SYSTEMTIME *tmLocal); +static void NotifyList(); +static class CNotesListDlg *pListDialog; + COLORREF GetCaptionColor(COLORREF bodyClr) { const DWORD r = ((bodyClr & 0xff) * 4) / 5; @@ -202,14 +197,6 @@ static bool CreateStickyNoteFont(STICKYNOTEFONT *pCustomFont, LOGFONT *plf) return pCustomFont->hFont != nullptr; } -void CloseNotesList() -{ - if (ListNotesVisible) { - DestroyWindow(LV); - ListNotesVisible = false; - } -} - void PurgeNotes(void) { char ValueName[16]; @@ -226,7 +213,7 @@ void DeleteNotes(void) PurgeNotes(); g_plugin.setDword("NotesData", 0); g_arStickies.destroy(); - NOTIFY_LIST(); + NotifyList(); } void BringAllNotesToFront(STICKYNOTE *pActive) @@ -346,7 +333,7 @@ static void JustSaveNotes(STICKYNOTE *pModified = nullptr) g_plugin.delSetting(ValueName); } - NOTIFY_LIST(); + NotifyList(); } void OnDeleteNote(HWND hdlg, STICKYNOTE *SN) @@ -354,7 +341,7 @@ void OnDeleteNote(HWND hdlg, STICKYNOTE *SN) if (MessageBoxW(hdlg, TranslateT("Are you sure you want to delete this note?"), TranslateT(SECTIONNAME), MB_OKCANCEL) == IDOK) { g_arStickies.remove(SN); JustSaveNotes(); - NOTIFY_LIST(); + NotifyList(); } } @@ -421,9 +408,9 @@ static int FindMenuItem(HMENU h, LPSTR lpszName) return -1; } -static BOOL DoContextMenu(HWND AhWnd, WPARAM, LPARAM lParam) +static BOOL DoContextMenu(HWND m_hwnd, WPARAM, LPARAM lParam) { - STICKYNOTE *SN = (STICKYNOTE*)GetPropA(AhWnd, "ctrldata"); + STICKYNOTE *SN = (STICKYNOTE*)GetPropA(m_hwnd, "ctrldata"); HMENU hMenuLoad, FhMenu, hSub; hMenuLoad = LoadMenuA(g_plugin.getInst(), "MNU_NOTEPOPUP"); @@ -452,7 +439,7 @@ static BOOL DoContextMenu(HWND AhWnd, WPARAM, LPARAM lParam) } TranslateMenu(FhMenu); - TrackPopupMenu(FhMenu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, LOWORD(lParam), HIWORD(lParam), 0, AhWnd, nullptr); + TrackPopupMenu(FhMenu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, LOWORD(lParam), HIWORD(lParam), 0, m_hwnd, nullptr); DestroyMenu(hMenuLoad); return TRUE; } @@ -1185,9 +1172,8 @@ static STICKYNOTE* NewNoteEx(int Ax, int Ay, int Aw, int Ah, const char *pszText // make sure that any event triggered by init doesn't cause a meaningless save KillTimer(TSN->SNHwnd, 1025); - if (!bLoading) { - NOTIFY_LIST(); - } + if (!bLoading) + NotifyList(); return TSN; } @@ -1360,7 +1346,7 @@ void LoadNotes(bool bIsStartup) } - NOTIFY_LIST(); + NotifyList(); } ///////////////////////////////////////////////////////////////////////////////////////// @@ -1420,280 +1406,267 @@ wchar_t* GetPreviewString(const char *lpsz) return s; } -static void InitListView(HWND AHLV) -{ - int i = 0; +///////////////////////////////////////////////////////////////////////////////////////// - wchar_t S1[128]; - wchar_t *V = TranslateT("Visible"); - wchar_t *T = TranslateT("Top"); +class CNotesListDlg : public CDlgBase +{ + void InitListView() + { + int i = 0; - ListView_SetHoverTime(AHLV, 700); - ListView_SetExtendedListViewStyle(AHLV, LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES | LVS_EX_TRACKSELECT); - ListView_DeleteAllItems(AHLV); + wchar_t S1[128]; + wchar_t *V = TranslateT("Visible"); + wchar_t *T = TranslateT("Top"); - for (auto &pNote : g_arStickies) { - LV_ITEM lvTIt; - lvTIt.mask = LVIF_TEXT; + m_list.SetHoverTime(700); + m_list.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES | LVS_EX_TRACKSELECT); + m_list.DeleteAllItems(); - if (!pNote->CustomTitle || !pNote->pwszTitle) - GetTriggerTimeString(&pNote->ID, S1, _countof(S1), TRUE); + for (auto &pNote : g_arStickies) { + LV_ITEM lvTIt; + lvTIt.mask = LVIF_TEXT; - lvTIt.iItem = i; - lvTIt.iSubItem = 0; - lvTIt.pszText = (pNote->CustomTitle && pNote->pwszTitle) ? pNote->pwszTitle : S1; - ListView_InsertItem(AHLV, &lvTIt); + if (!pNote->CustomTitle || !pNote->pwszTitle) + GetTriggerTimeString(&pNote->ID, S1, _countof(S1), TRUE); - if (pNote->bVisible) { lvTIt.iItem = i; - lvTIt.iSubItem = 1; - lvTIt.pszText = V; - ListView_SetItem(AHLV, &lvTIt); - } + lvTIt.iSubItem = 0; + lvTIt.pszText = (pNote->CustomTitle && pNote->pwszTitle) ? pNote->pwszTitle : S1; + m_list.InsertItem(&lvTIt); + + if (pNote->bVisible) { + lvTIt.iItem = i; + lvTIt.iSubItem = 1; + lvTIt.pszText = V; + m_list.SetItem(&lvTIt); + } + + if (pNote->bOnTop) { + lvTIt.iItem = i; + lvTIt.iSubItem = 2; + lvTIt.pszText = T; + m_list.SetItem(&lvTIt); + } - if (pNote->bOnTop) { lvTIt.iItem = i; - lvTIt.iSubItem = 2; - lvTIt.pszText = T; - ListView_SetItem(AHLV, &lvTIt); - } + lvTIt.iSubItem = 3; + lvTIt.pszText = GetPreviewString(pNote->szText); + m_list.SetItem(&lvTIt); - lvTIt.iItem = i; - lvTIt.iSubItem = 3; - lvTIt.pszText = GetPreviewString(pNote->szText); - ListView_SetItem(AHLV, &lvTIt); + i++; + } - i++; + m_list.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED); } - ListView_SetItemState(AHLV, 0, LVIS_SELECTED, LVIS_SELECTED); -} - -static BOOL DoListContextMenu(HWND AhWnd, WPARAM wParam, LPARAM lParam, STICKYNOTE *pNote) -{ - HWND hwndListView = (HWND)wParam; - if (hwndListView != GetDlgItem(AhWnd, IDC_LISTREMINDERS)) - return FALSE; - - HMENU hMenuLoad = LoadMenuA(g_plugin.getInst(), "MNU_NOTELISTPOPUP"); - HMENU FhMenu = GetSubMenu(hMenuLoad, 0); - - MENUITEMINFO mii = {0}; - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE; - mii.fState = MFS_DEFAULT; - if (!pNote) - mii.fState |= MFS_GRAYED; - SetMenuItemInfo(FhMenu, ID_CONTEXTMENUNOTE_EDITNOTE, FALSE, &mii); - - if (!pNote) { - EnableMenuItem(FhMenu, ID_CONTEXTMENUNOTE_REMOVENOTE, MF_GRAYED | MF_BYCOMMAND); - EnableMenuItem(FhMenu, ID_CONTEXTMENUNOTE_TOGGLEVISIBILITY, MF_GRAYED | MF_BYCOMMAND); - EnableMenuItem(FhMenu, ID_CONTEXTMENUNOTE_TOGGLEONTOP, MF_GRAYED | MF_BYCOMMAND); - } - else { - if (pNote->bVisible) - CheckMenuItem(FhMenu, ID_CONTEXTMENUNOTE_TOGGLEVISIBILITY, MF_CHECKED | MF_BYCOMMAND); - if (pNote->bOnTop) - CheckMenuItem(FhMenu, ID_CONTEXTMENUNOTE_TOGGLEONTOP, MF_CHECKED | MF_BYCOMMAND); - } - - TranslateMenu(FhMenu); - TrackPopupMenu(FhMenu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, LOWORD(lParam), HIWORD(lParam), 0, AhWnd, nullptr); - DestroyMenu(hMenuLoad); - return TRUE; -} + CCtrlListView m_list; + CCtrlButton btnNew; +public: + CNotesListDlg() : + CDlgBase(g_plugin, IDD_LISTREMINDERS), + m_list(this, IDC_LISTREMINDERS), + btnNew(this, IDC_ADDNEWREMINDER) + { + SetMinSize(394, 300); -static INT_PTR CALLBACK DlgProcViewNotes(HWND hwndDlg, UINT Message, WPARAM wParam, LPARAM lParam) -{ - switch (Message) { - case WM_SIZE: - OnListResize(hwndDlg); - break; + btnNew.OnClick = Callback(this, &CNotesListDlg::onClick_New); + } - case WM_GETMINMAXINFO: - { - MINMAXINFO *mm = (MINMAXINFO*)lParam; - mm->ptMinTrackSize.x = 394; - mm->ptMinTrackSize.y = 300; - } - return 0; + bool OnInitDialog() override + { + pListDialog = this; + Window_SetIcon_IcoLib(m_hwnd, iconList[13].hIcolib); - case WM_RELOAD: - SetDlgItemTextA(hwndDlg, IDC_REMINDERDATA, ""); - InitListView(GetDlgItem(hwndDlg, IDC_LISTREMINDERS)); - return TRUE; + SetWindowText(m_hwnd, LPGENW("Notes")); - case WM_CONTEXTMENU: - { - STICKYNOTE *pNote = nullptr; + TranslateDialogDefault(m_hwnd); - HWND H = GetDlgItem(hwndDlg, IDC_LISTREMINDERS); - if (ListView_GetSelectedCount(H)) { - int i = ListView_GetSelectionMark(H); - if (i != -1) - pNote = &g_arStickies[i]; - } + SetDlgItemText(m_hwnd, IDC_REMINDERDATA, L""); - if (DoListContextMenu(hwndDlg, wParam, lParam, pNote)) - return TRUE; - } - break; + LV_COLUMN lvCol; + lvCol.mask = LVCF_TEXT | LVCF_WIDTH; - case WM_INITDIALOG: - Window_SetIcon_IcoLib(hwndDlg, iconList[13].hIcolib); + lvCol.pszText = TranslateT("Note text"); + lvCol.cx = 150; + m_list.InsertColumn( 0, &lvCol); - SetWindowText(hwndDlg, LPGENW("Notes")); + lvCol.pszText = TranslateT("Top"); + lvCol.cx = 20; + m_list.InsertColumn(0, &lvCol); - TranslateDialogDefault(hwndDlg); + lvCol.pszText = TranslateT("Visible"); + lvCol.cx = 20; + m_list.InsertColumn(0, &lvCol); - SetDlgItemText(hwndDlg, IDC_REMINDERDATA, L""); - { - HWND H = GetDlgItem(hwndDlg, IDC_LISTREMINDERS); + lvCol.pszText = TranslateT("Date/Title"); + lvCol.cx = 165; + m_list.InsertColumn(0, &lvCol); - LV_COLUMN lvCol; - lvCol.mask = LVCF_TEXT | LVCF_WIDTH; + InitListView(); + SetWindowLongPtr(GetDlgItem(m_list.GetHwnd(), 0), GWL_ID, IDC_LISTREMINDERS_HEADER); - lvCol.pszText = TranslateT("Note text"); - lvCol.cx = 150; - ListView_InsertColumn(H, 0, &lvCol); + Utils_RestoreWindowPosition(m_hwnd, 0, MODULENAME, "ListNotes"); + return true; + } - lvCol.pszText = TranslateT("Top"); - lvCol.cx = 20; - ListView_InsertColumn(H, 0, &lvCol); + void OnDestroy() override + { + Utils_SaveWindowPosition(m_hwnd, 0, MODULENAME, "ListNotes"); + Window_FreeIcon_IcoLib(m_hwnd); + pListDialog = nullptr; + } - lvCol.pszText = TranslateT("Visible"); - lvCol.cx = 20; - ListView_InsertColumn(H, 0, &lvCol); + int Resizer(UTILRESIZECONTROL *urc) override + { + switch (urc->wId) { + case IDC_LISTREMINDERS: + return RD_ANCHORX_WIDTH | RD_ANCHORY_HEIGHT; - lvCol.pszText = TranslateT("Date/Title"); - lvCol.cx = 165; - ListView_InsertColumn(H, 0, &lvCol); + case IDC_REMINDERDATA: + return RD_ANCHORX_WIDTH | RD_ANCHORY_BOTTOM; + } + return RD_ANCHORX_RIGHT | RD_ANCHORY_BOTTOM; + } - InitListView(H); - SetWindowLongPtr(GetDlgItem(H, 0), GWL_ID, IDC_LISTREMINDERS_HEADER); - LV = hwndDlg; + void onClick_New(CCtrlButton *) + { + PluginMenuCommandAddNew(0, 0); + } - Utils_RestoreWindowPosition(hwndDlg, 0, MODULENAME, "ListNotes"); + void onContextMenu() + { + int idx = m_list.GetSelectionMark(); + STICKYNOTE *pNote = (idx != -1) ? &g_arStickies[idx] : nullptr; + + HMENU hMenuLoad = LoadMenuA(g_plugin.getInst(), "MNU_NOTELISTPOPUP"); + HMENU FhMenu = GetSubMenu(hMenuLoad, 0); + + MENUITEMINFO mii = { 0 }; + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STATE; + mii.fState = MFS_DEFAULT; + if (!pNote) + mii.fState |= MFS_GRAYED; + SetMenuItemInfo(FhMenu, ID_CONTEXTMENUNOTE_EDITNOTE, FALSE, &mii); + + if (!pNote) { + EnableMenuItem(FhMenu, ID_CONTEXTMENUNOTE_REMOVENOTE, MF_GRAYED | MF_BYCOMMAND); + EnableMenuItem(FhMenu, ID_CONTEXTMENUNOTE_TOGGLEVISIBILITY, MF_GRAYED | MF_BYCOMMAND); + EnableMenuItem(FhMenu, ID_CONTEXTMENUNOTE_TOGGLEONTOP, MF_GRAYED | MF_BYCOMMAND); + } + else { + if (pNote->bVisible) + CheckMenuItem(FhMenu, ID_CONTEXTMENUNOTE_TOGGLEVISIBILITY, MF_CHECKED | MF_BYCOMMAND); + if (pNote->bOnTop) + CheckMenuItem(FhMenu, ID_CONTEXTMENUNOTE_TOGGLEONTOP, MF_CHECKED | MF_BYCOMMAND); } - return TRUE; - - case WM_CLOSE: - DestroyWindow(hwndDlg); - ListNotesVisible = false; - return TRUE; - case WM_DESTROY: - ListNotesVisible = false; - Utils_SaveWindowPosition(hwndDlg, 0, MODULENAME, "ListNotes"); - Window_FreeIcon_IcoLib(hwndDlg); - return TRUE; + TranslateMenu(FhMenu); - case WM_NOTIFY: - if (wParam == IDC_LISTREMINDERS) { - LPNMLISTVIEW NM = (LPNMLISTVIEW)lParam; - switch (NM->hdr.code) { - case LVN_ITEMCHANGED: - SetDlgItemTextA(hwndDlg, IDC_REMINDERDATA, g_arStickies[NM->iItem].szText); - break; + RECT rc; + m_list.GetItemRect(idx, &rc, LVIR_LABEL); + POINT pt = { rc.left, rc.bottom }; + ClientToScreen(m_list.GetHwnd(), &pt); - case NM_DBLCLK: - if (ListView_GetSelectedCount(NM->hdr.hwndFrom)) { - int i = ListView_GetSelectionMark(NM->hdr.hwndFrom); - if (i != -1) - EditNote(&g_arStickies[i]); - } - break; - } - } - break; + int iSel = TrackPopupMenu(FhMenu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, 0, m_hwnd, nullptr); + DestroyMenu(hMenuLoad); - case WM_COMMAND: - switch (LOWORD(wParam)) { + switch (iSel) { case ID_CONTEXTMENUNOTE_EDITNOTE: - { - HWND H = GetDlgItem(hwndDlg, IDC_LISTREMINDERS); - if (ListView_GetSelectedCount(H)) { - int i = ListView_GetSelectionMark(H); - if (i != -1) { - EditNote(&g_arStickies[i]); - } - } + if (m_list.GetSelectedCount()) { + int i = m_list.GetSelectionMark(); + if (i != -1) + EditNote(&g_arStickies[i]); } - return TRUE; + break; case ID_CONTEXTMENUNOTE_TOGGLEVISIBILITY: - { - HWND H = GetDlgItem(hwndDlg, IDC_LISTREMINDERS); - if (ListView_GetSelectedCount(H)) { - int i = ListView_GetSelectionMark(H); - if (i != -1) { - auto &SN = g_arStickies[i]; - SN.bVisible = !SN.bVisible; - ShowWindow(SN.SNHwnd, SN.bVisible ? SW_SHOWNA : SW_HIDE); - JustSaveNotes(); - } + if (m_list.GetSelectedCount()) { + int i = m_list.GetSelectionMark(); + if (i != -1) { + auto &SN = g_arStickies[i]; + SN.bVisible = !SN.bVisible; + ShowWindow(SN.SNHwnd, SN.bVisible ? SW_SHOWNA : SW_HIDE); + JustSaveNotes(); } } - return TRUE; + break; case ID_CONTEXTMENUNOTE_TOGGLEONTOP: - { - HWND H = GetDlgItem(hwndDlg, IDC_LISTREMINDERS); - if (ListView_GetSelectedCount(H)) { - int i = ListView_GetSelectionMark(H); - if (i != -1) { - auto &SN = g_arStickies[i]; - SN.bOnTop = !SN.bOnTop; - SetWindowPos(SN.SNHwnd, SN.bOnTop ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE); - RedrawWindow(SN.SNHwnd, nullptr, nullptr, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); - JustSaveNotes(); - } + if (m_list.GetSelectedCount()) { + int i = m_list.GetSelectionMark(); + if (i != -1) { + auto &SN = g_arStickies[i]; + SN.bOnTop = !SN.bOnTop; + SetWindowPos(SN.SNHwnd, SN.bOnTop ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE); + RedrawWindow(SN.SNHwnd, nullptr, nullptr, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); + JustSaveNotes(); } } - return TRUE; - - case IDCANCEL: - DestroyWindow(hwndDlg); - ListNotesVisible = false; - return TRUE; + break; case ID_CONTEXTMENUNOTE_NEWNOTE: - case IDC_ADDNEWREMINDER: PluginMenuCommandAddNew(0, 0); - return TRUE; + break; case ID_CONTEXTMENUNOTE_DELETEALLNOTES: PluginMenuCommandDeleteNotes(0, 0); - return TRUE; + break; case ID_CONTEXTMENUNOTE_REMOVENOTE: - { - HWND H = GetDlgItem(hwndDlg, IDC_LISTREMINDERS); - if (ListView_GetSelectedCount(H)) { - int i = ListView_GetSelectionMark(H); - if (i != -1) - OnDeleteNote(hwndDlg, &g_arStickies[i]); - } + if (m_list.GetSelectedCount()) { + int i = m_list.GetSelectionMark(); + if (i != -1) + OnDeleteNote(m_hwnd, &g_arStickies[i]); } - return TRUE; + break; case ID_CONTEXTMENUNOTE_SHOW: ShowHideNotes(); - return TRUE; + break; case ID_CONTEXTMENUNOTE_BRINGALLTOTOP: BringAllNotesToFront(nullptr); - return TRUE; + break; } } - return FALSE; + + void Reload() + { + SetDlgItemTextA(m_hwnd, IDC_REMINDERDATA, ""); + InitListView(); + } + + void list_onItemChanged(CCtrlListView::TEventInfo *ev) + { + SetDlgItemTextA(m_hwnd, IDC_REMINDERDATA, g_arStickies[ev->nmlv->iItem].szText); + } + + void list_onDblClick(CCtrlListView::TEventInfo*) + { + if (m_list.GetSelectedCount()) { + int i = m_list.GetSelectionMark(); + if (i != -1) + EditNote(&g_arStickies[i]); + } + } +}; + +void CloseNotesList() +{ + if (pListDialog) + pListDialog->Close(); } +static void NotifyList() +{ + if (pListDialog) + pListDialog->Reload(); +} ///////////////////////////////////////////////////////////////////// -// Notes List hwndDlg (uses same dialog template as reminder list) +// Notes List dialog (uses same dialog template as reminder list) INT_PTR PluginMenuCommandAddNew(WPARAM, LPARAM) { @@ -1709,11 +1682,10 @@ INT_PTR PluginMenuCommandShowHide(WPARAM, LPARAM) INT_PTR PluginMenuCommandViewNotes(WPARAM, LPARAM) { - if (!ListNotesVisible) { - CreateDialog(g_plugin.getInst(), MAKEINTRESOURCE(IDD_LISTREMINDERS), nullptr, DlgProcViewNotes); - ListNotesVisible = true; - } - else BringWindowToTop(LV); + if (!pListDialog) + (new CNotesListDlg())->Show(); + else + BringWindowToTop(pListDialog->GetHwnd()); return 0; } diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index 33a5f7298d..520e47ac12 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -10,10 +10,6 @@ #define DATATAG_SNDSEL 3 // %d (which sound to use, default, alt1, alt2, -1 means no sound at all)
#define DATATAG_REPEAT 4 // %d (repeateable reminder)
-#define WM_RELOAD (WM_USER + 100)
-
-#define NOTIFY_LIST() if (bListReminderVisible) PostMessage(LV,WM_RELOAD,0,0)
-
/////////////////////////////////////////////////////////////////////////////////////////
static void RemoveReminderSystemEvent(struct REMINDERDATA *p);
@@ -43,20 +39,12 @@ struct REMINDERDATA : public MZeroedObject }
};
-static int ReminderSortCb(const REMINDERDATA *v1, const REMINDERDATA *v2)
-{
- if (v1->When == v2->When)
- return 0;
+static LIST<REMINDERDATA> arReminders(1, PtrKeySortT);
- return (v1->When < v2->When) ? -1 : 1;
-}
-
-static LIST<REMINDERDATA> arReminders(1, ReminderSortCb);
+static class CReminderListDlg *pListDialog;
static bool bNewReminderVisible = false;
-static bool bListReminderVisible = false;
static UINT QueuedReminderCount = 0;
-static HWND LV;
int WS_Send(SOCKET s, char *data, int datalen);
unsigned long WS_ResolveName(char *name, WORD *port, int defaultPort);
@@ -64,6 +52,8 @@ unsigned long WS_ResolveName(char *name, WORD *port, int defaultPort); void Send(char *user, char *host, const char *Msg, char* server);
wchar_t* GetPreviewString(const char *lpsz);
+static void NotifyList();
+
// time convertsion routines that take local time-zone specific daylight saving configuration into account
// (unlike the standard FileTimeToLocalFileTime functions)
@@ -96,10 +86,9 @@ static DWORD CreateUid() return 1;
// check existing reminders if uid is in use
- for (DWORD uid = 1;; uid++) {
+ for (DWORD uid = 1;; uid++)
if (!FindReminder(uid)) // uid in use
return uid;
- }
}
static void RemoveReminderSystemEvent(REMINDERDATA *p)
@@ -409,73 +398,6 @@ static void FireReminder(REMINDERDATA *pReminder, DWORD *pHasPlayedSound) }
}
-bool CheckRemindersAndStart(void)
-{
- // returns TRUE if there are any triggered reminder with bSystemEventQueued, this will shorten the update interval
- // allowing sound repeats with shorter intervals
-
- if (!arReminders.getCount())
- return false;
-
- ULONGLONG curT;
- SYSTEMTIME tm;
- GetSystemTime(&tm);
- SystemTimeToFileTime(&tm, (FILETIME*)&curT);
-
- // NOTE: reminder list is sorted by trigger time, so we can early out on the first reminder > cur time
- // quick check for normal case with no reminder ready to be triggered and no queued triggered reminders
- // (happens 99.99999999999% of the time)
- if (curT < arReminders[0]->When && !QueuedReminderCount)
- return false;
-
- bool bResult = false;
-
- // var used to avoid playing multiple alarm sounds during a single update
- DWORD bHasPlayedSound = 0;
-
- // if there are queued (triggered) reminders then iterate through entire list, becaue of WM_TIMECHANGE events
- // and for example daylight saving changes it's possible for an already triggered event to end up with When>curT
- bool bHasQueuedReminders = (QueuedReminderCount != 0);
-
- // allthough count should always be correct, it's fool proof to just count them again in the loop below
- QueuedReminderCount = 0;
-
- for (auto &pReminder : arReminders) {
- if (!bHasQueuedReminders && pReminder->When > curT)
- break;
-
- if (!pReminder->bVisible) {
- if (pReminder->bSystemEventQueued) {
- UpdateReminderEvent(pReminder, REMINDER_UPDATE_INTERVAL_SHORT / 1000, &bHasPlayedSound);
-
- QueuedReminderCount++;
- bResult = true;
- }
- else if (pReminder->When <= curT) {
- if (!g_RemindSMS) {
- FireReminder(pReminder, &bHasPlayedSound);
-
- if (pReminder->bSystemEventQueued)
- bResult = true;
- }
- else {
- char *p = strchr(g_RemindSMS, '@');
- if (p) {
- Send(g_RemindSMS, p+1, pReminder->szText, NULL);
- *p = '@';
-
- DeleteReminder(pReminder);
- JustSaveReminders();
- NOTIFY_LIST();
- }
- }
- }
- }
- }
-
- return bResult;
-}
-
static LRESULT CALLBACK DatePickerWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
switch (message) {
@@ -1182,7 +1104,7 @@ public: if (m_pReminder)
DeleteReminder(m_pReminder);
JustSaveReminders();
- NOTIFY_LIST();
+ NotifyList();
return true;
}
@@ -1534,7 +1456,7 @@ public: edtText.SetTextA("");
JustSaveReminders();
- NOTIFY_LIST();
+ NotifyList();
if (bClose)
Close();
}
@@ -1590,7 +1512,7 @@ public: }
};
-void EditReminder(REMINDERDATA *p)
+static void EditReminder(REMINDERDATA *p)
{
if (!p)
return;
@@ -1606,162 +1528,82 @@ void EditReminder(REMINDERDATA *p) /////////////////////////////////////////////////////////////////////////////////////////
-static void InitListView(HWND AHLV)
+static int ReminderSortCb(const REMINDERDATA *v1, const REMINDERDATA *v2)
{
- ListView_SetHoverTime(AHLV, 700);
- ListView_SetExtendedListViewStyle(AHLV, LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES | LVS_EX_TRACKSELECT);
- ListView_DeleteAllItems(AHLV);
-
- int i = 0;
- for (auto &pReminder : arReminders) {
- LV_ITEM lvTIt;
- lvTIt.mask = LVIF_TEXT;
-
- wchar_t S1[128];
- GetTriggerTimeString(&pReminder->When, S1, _countof(S1), TRUE);
-
- lvTIt.iItem = i;
- lvTIt.iSubItem = 0;
- lvTIt.pszText = S1;
- ListView_InsertItem(AHLV, &lvTIt);
- lvTIt.mask = LVIF_TEXT;
-
- wchar_t *S2 = GetPreviewString(pReminder->szText);
- lvTIt.iItem = i;
- lvTIt.iSubItem = 1;
- lvTIt.pszText = S2;
- ListView_SetItem(AHLV, &lvTIt);
-
- i++;
- }
+ if (v1->When == v2->When)
+ return 0;
- ListView_SetItemState(AHLV, 0, LVIS_SELECTED, LVIS_SELECTED);
+ return (v1->When < v2->When) ? -1 : 1;
}
-void OnListResize(HWND hwndDlg)
+class CReminderListDlg : public CDlgBase
{
- HWND hList = GetDlgItem(hwndDlg, IDC_LISTREMINDERS);
- HWND hText = GetDlgItem(hwndDlg, IDC_REMINDERDATA);
- HWND hBtnNew = GetDlgItem(hwndDlg, IDC_ADDNEWREMINDER);
- HWND hBtnClose = GetDlgItem(hwndDlg, IDCANCEL);
+ void RefreshList()
+ {
+ m_list.DeleteAllItems();
- POINT org = {};
- ClientToScreen(hwndDlg, &org);
+ LIST< REMINDERDATA> tmpSort(10, ReminderSortCb);
+ for (auto &it : arReminders)
+ tmpSort.insert(it);
- RECT lr, cr, tr, clsr;
- GetClientRect(hwndDlg, &cr);
- GetWindowRect(hList, &lr); OffsetRect(&lr, -org.x, -org.y);
- GetWindowRect(hText, &tr); OffsetRect(&tr, -org.x, -org.y);
- GetWindowRect(hBtnClose, &clsr); OffsetRect(&clsr, -org.x, -org.y);
+ int i = 0;
+ for (auto &pReminder : tmpSort) {
+ LV_ITEM lvTIt;
+ lvTIt.mask = LVIF_TEXT;
- int iMargin = lr.left;
- int th = tr.bottom - tr.top;
- int btnh = clsr.bottom - clsr.top;
- int btnw = clsr.right - clsr.left;
+ wchar_t S1[128];
+ GetTriggerTimeString(&pReminder->When, S1, _countof(S1), TRUE);
- clsr.left = cr.right - iMargin - btnw;
- clsr.top = cr.bottom - iMargin - btnh;
+ lvTIt.iItem = i;
+ lvTIt.iSubItem = 0;
+ lvTIt.pszText = S1;
+ m_list.InsertItem(&lvTIt);
+ lvTIt.mask = LVIF_TEXT;
- tr.left = iMargin;
- tr.right = cr.right - iMargin;
- tr.bottom = clsr.top - iMargin - 2;
- tr.top = tr.bottom - th;
+ wchar_t *S2 = GetPreviewString(pReminder->szText);
+ lvTIt.iItem = i;
+ lvTIt.iSubItem = 1;
+ lvTIt.pszText = S2;
+ m_list.SetItem(&lvTIt);
- lr.right = cr.right - iMargin;
- lr.bottom = tr.top - 5;
+ i++;
+ }
- MoveWindow(hList, lr.left, lr.top, lr.right - lr.left, lr.bottom - lr.top, FALSE);
- MoveWindow(hText, tr.left, tr.top, tr.right - tr.left, tr.bottom - tr.top, FALSE);
+ m_list.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
+ }
- MoveWindow(hBtnClose, clsr.left, clsr.top, btnw, btnh, FALSE);
- clsr.left -= btnw + 2;
- MoveWindow(hBtnNew, clsr.left, clsr.top, btnw, btnh, FALSE);
+ CCtrlListView m_list;
+ CCtrlButton btnNew;
- GetWindowRect(hList, &cr);
- ListView_SetColumnWidth(hList, 1, cr.right - cr.left - ListView_GetColumnWidth(hList, 0) - 4);
+public:
+ CReminderListDlg() :
+ CDlgBase(g_plugin, IDD_LISTREMINDERS),
+ m_list(this, IDC_LISTREMINDERS),
+ btnNew(this, IDC_ADDNEWREMINDER)
+ {
+ SetMinSize(394, 300);
- RedrawWindow(hwndDlg, nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE);
-}
+ btnNew.OnClick = Callback(this, &CReminderListDlg::onClick_New);
-static BOOL DoListContextMenu(HWND AhWnd, WPARAM wParam, LPARAM lParam)
-{
- HWND hwndListView = (HWND)wParam;
- if (hwndListView != GetDlgItem(AhWnd, IDC_LISTREMINDERS))
- return FALSE;
-
- HMENU hMenuLoad = LoadMenuA(g_plugin.getInst(), "MNU_REMINDERPOPUP");
- HMENU FhMenu = GetSubMenu(hMenuLoad, 0);
-
- int idx = ListView_GetSelectionMark(hwndListView);
- REMINDERDATA *pReminder = (idx == -1) ? nullptr : arReminders[idx];
-
- MENUITEMINFO mii = {};
- mii.cbSize = sizeof(mii);
- mii.fMask = MIIM_STATE;
- mii.fState = MFS_DEFAULT;
- if (!pReminder || pReminder->bSystemEventQueued)
- mii.fState |= MFS_GRAYED;
- SetMenuItemInfo(FhMenu, ID_CONTEXTMENUREMINDER_EDIT, FALSE, &mii);
-
- if (!pReminder)
- EnableMenuItem(FhMenu, ID_CONTEXTMENUREMINDER_DELETE, MF_GRAYED | MF_BYCOMMAND);
-
- POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
- if (pt.x == -1 && pt.y == -1) {
- RECT rc;
- ListView_GetItemRect(hwndListView, idx, &rc, LVIR_LABEL);
- pt.x = rc.left;
- pt.y = rc.bottom;
- ClientToScreen(hwndListView, &pt);
+ m_list.OnBuildMenu = Callback(this, &CReminderListDlg::onContextMenu);
+ m_list.OnDoubleClick = Callback(this, &CReminderListDlg::list_onDblClick);
+ m_list.OnItemChanged = Callback(this, &CReminderListDlg::list_onItemChanged);
}
- TranslateMenu(FhMenu);
- TrackPopupMenu(FhMenu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, 0, AhWnd, nullptr);
- DestroyMenu(hMenuLoad);
- return TRUE;
-}
-
-static INT_PTR CALLBACK DlgProcViewReminders(HWND hwndDlg, UINT Message, WPARAM wParam, LPARAM lParam)
-{
- HWND hList = GetDlgItem(hwndDlg, IDC_LISTREMINDERS);
- int idx, cx1, cx2;
-
- switch (Message) {
- case WM_SIZE:
- OnListResize(hwndDlg);
- break;
-
- case WM_GETMINMAXINFO:
- {
- MINMAXINFO *mm = (MINMAXINFO*)lParam;
- mm->ptMinTrackSize.x = 394;
- mm->ptMinTrackSize.y = 300;
- }
- return 0;
-
- case WM_RELOAD:
- SetDlgItemTextA(hwndDlg, IDC_REMINDERDATA, "");
- InitListView(hList);
- return TRUE;
-
- case WM_CONTEXTMENU:
- if (DoListContextMenu(hwndDlg, wParam, lParam))
- return TRUE;
- break;
-
- case WM_INITDIALOG:
- Window_SetIcon_IcoLib(hwndDlg, iconList[6].hIcolib);
-
- TranslateDialogDefault(hwndDlg);
- SetDlgItemTextA(hwndDlg, IDC_REMINDERDATA, "");
- {
- cx1 = 150, cx2 = 205;
- ptrA colWidth(g_plugin.getStringA("ColWidth"));
- if (colWidth != 0) {
- int tmp1 = 0, tmp2 = 0;
- if (2 == sscanf(colWidth, "%d,%d", &tmp1, &tmp2))
- cx1 = tmp1, cx2 = tmp2;
- }
+ bool OnInitDialog() override
+ {
+ pListDialog = this;
+ Window_SetIcon_IcoLib(m_hwnd, iconList[6].hIcolib);
+
+ TranslateDialogDefault(m_hwnd);
+ SetDlgItemTextA(m_hwnd, IDC_REMINDERDATA, "");
+
+ int cx1 = 150, cx2 = 205;
+ ptrA colWidth(g_plugin.getStringA("ColWidth"));
+ if (colWidth != 0) {
+ int tmp1 = 0, tmp2 = 0;
+ if (2 == sscanf(colWidth, "%d,%d", &tmp1, &tmp2))
+ cx1 = tmp1, cx2 = tmp2;
}
LV_COLUMN lvCol;
@@ -1769,110 +1611,233 @@ static INT_PTR CALLBACK DlgProcViewReminders(HWND hwndDlg, UINT Message, WPARAM lvCol.pszText = TranslateT("Date of activation");
lvCol.cx = cx1;
- ListView_InsertColumn(hList, 0, &lvCol);
+ m_list.InsertColumn(0, &lvCol);
lvCol.pszText = TranslateT("Reminder text");
lvCol.cx = cx2;
- ListView_InsertColumn(hList, 1, &lvCol);
+ m_list.InsertColumn(1, &lvCol);
- InitListView(hList);
+ m_list.SetHoverTime(700);
+ m_list.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES | LVS_EX_TRACKSELECT);
+ RefreshList();
- SetWindowLongPtr(GetDlgItem(hList, 0), GWL_ID, IDC_LISTREMINDERS_HEADER);
- LV = hwndDlg;
+ SetWindowLongPtr(GetDlgItem(m_list.GetHwnd(), 0), GWL_ID, IDC_LISTREMINDERS_HEADER);
- Utils_RestoreWindowPosition(hwndDlg, 0, MODULENAME, "ListReminders");
- return TRUE;
+ Utils_RestoreWindowPosition(m_hwnd, 0, MODULENAME, "ListReminders");
+ return true;
+ }
- case WM_CLOSE:
- DestroyWindow(hwndDlg);
- bListReminderVisible = false;
- return TRUE;
+ void OnDestroy() override
+ {
+ int cx1 = m_list.GetColumnWidth(0);
+ int cx2 = m_list.GetColumnWidth(1);
+ g_plugin.setString("ColWidth", CMStringA(FORMAT, "%d,%d", cx1, cx2));
- case WM_NOTIFY:
- if (wParam == IDC_LISTREMINDERS) {
- LPNMLISTVIEW NM = (LPNMLISTVIEW)lParam;
- switch (NM->hdr.code) {
- case LVN_ITEMCHANGED:
- SetDlgItemTextA(hwndDlg, IDC_REMINDERDATA, arReminders[NM->iItem]->szText);
- break;
+ Utils_SaveWindowPosition(m_hwnd, 0, MODULENAME, "ListReminders");
+ Window_FreeIcon_IcoLib(m_hwnd);
+ }
- case NM_DBLCLK:
- int i = ListView_GetSelectionMark(hList);
- if (i != -1)
- EditReminder(arReminders[i]);
- break;
- }
- }
- else if (wParam == IDC_LISTREMINDERS_HEADER) {
- LPNMHEADER NM = (LPNMHEADER)lParam;
- switch (NM->hdr.code) {
- case HDN_ENDTRACK:
- RECT rc;
- GetWindowRect(hList, &rc);
- ListView_SetColumnWidth(hList, 1, rc.right - rc.left - ListView_GetColumnWidth(hList, 0) - 4);
- break;
- }
+ int Resizer(UTILRESIZECONTROL *urc) override
+ {
+ switch (urc->wId) {
+ case IDC_LISTREMINDERS:
+ return RD_ANCHORX_WIDTH | RD_ANCHORY_HEIGHT;
+
+ case IDC_REMINDERDATA:
+ return RD_ANCHORX_WIDTH | RD_ANCHORY_BOTTOM;
}
- break;
+ return RD_ANCHORX_RIGHT | RD_ANCHORY_BOTTOM;
+ }
+
+ void onContextMenu(CCtrlListView*)
+ {
+ HMENU hMenuLoad = LoadMenuA(g_plugin.getInst(), "MNU_REMINDERPOPUP");
+ HMENU FhMenu = GetSubMenu(hMenuLoad, 0);
- case WM_COMMAND:
- switch (LOWORD(wParam)) {
+ int idx = m_list.GetSelectionMark();
+ REMINDERDATA *pReminder = (idx == -1) ? nullptr : arReminders[idx];
+
+ MENUITEMINFO mii = {};
+ mii.cbSize = sizeof(mii);
+ mii.fMask = MIIM_STATE;
+ mii.fState = MFS_DEFAULT;
+ if (!pReminder || pReminder->bSystemEventQueued)
+ mii.fState |= MFS_GRAYED;
+ SetMenuItemInfo(FhMenu, ID_CONTEXTMENUREMINDER_EDIT, FALSE, &mii);
+
+ if (!pReminder)
+ EnableMenuItem(FhMenu, ID_CONTEXTMENUREMINDER_DELETE, MF_GRAYED | MF_BYCOMMAND);
+
+ RECT rc;
+ m_list.GetItemRect(idx, &rc, LVIR_LABEL);
+ POINT pt = { rc.left, rc.bottom };
+ ClientToScreen(m_list.GetHwnd(), &pt);
+
+ TranslateMenu(FhMenu);
+ int iSel = TrackPopupMenu(FhMenu, TPM_RETURNCMD | TPM_LEFTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, 0, m_hwnd, nullptr);
+ DestroyMenu(hMenuLoad);
+
+ switch(iSel) {
case ID_CONTEXTMENUREMINDER_EDIT:
- idx = ListView_GetSelectionMark(hList);
+ idx = m_list.GetSelectionMark();
if (idx != -1)
EditReminder(arReminders[idx]);
- return TRUE;
-
- case IDCANCEL:
- DestroyWindow(hwndDlg);
- bListReminderVisible = false;
- return TRUE;
+ break;
case ID_CONTEXTMENUREMINDER_NEW:
- case IDC_ADDNEWREMINDER:
PluginMenuCommandNewReminder(0, 0);
- return TRUE;
+ break;
case ID_CONTEXTMENUREMINDER_DELETEALL:
- if (arReminders.getCount() && IDOK == MessageBox(hwndDlg, TranslateT("Are you sure you want to delete all reminders?"), _A2W(SECTIONNAME), MB_OKCANCEL)) {
- SetDlgItemTextA(hwndDlg, IDC_REMINDERDATA, "");
+ if (arReminders.getCount() && IDOK == MessageBox(m_hwnd, TranslateT("Are you sure you want to delete all reminders?"), _A2W(SECTIONNAME), MB_OKCANCEL)) {
+ SetDlgItemTextA(m_hwnd, IDC_REMINDERDATA, "");
DeleteReminders();
- InitListView(hList);
+ RefreshList();
}
- return TRUE;
+ break;
case ID_CONTEXTMENUREMINDER_DELETE:
- idx = ListView_GetSelectionMark(hList);
- if (idx != -1 && IDOK == MessageBox(hwndDlg, TranslateT("Are you sure you want to delete this reminder?"), _A2W(SECTIONNAME), MB_OKCANCEL)) {
- SetDlgItemTextA(hwndDlg, IDC_REMINDERDATA, "");
+ idx = m_list.GetSelectionMark();
+ if (idx != -1 && IDOK == MessageBox(m_hwnd, TranslateT("Are you sure you want to delete this reminder?"), _A2W(SECTIONNAME), MB_OKCANCEL)) {
+ SetDlgItemTextA(m_hwnd, IDC_REMINDERDATA, "");
DeleteReminder(arReminders[idx]);
JustSaveReminders();
- InitListView(hList);
+ RefreshList();
}
- return TRUE;
+ break;
}
- break;
+ }
- case WM_DESTROY:
- cx1 = ListView_GetColumnWidth(hList, 0);
- cx2 = ListView_GetColumnWidth(hList, 1);
- g_plugin.setString("ColWidth", CMStringA(FORMAT, "%d,%d", cx1, cx2));
+ void Reload()
+ {
+ SetDlgItemTextA(m_hwnd, IDC_REMINDERDATA, "");
+ RefreshList();
+ }
- Utils_SaveWindowPosition(hwndDlg, 0, MODULENAME, "ListReminders");
- Window_FreeIcon_IcoLib(hwndDlg);
- break;
+ void list_onItemChanged(CCtrlListView::TEventInfo *ev)
+ {
+ SetDlgItemTextA(m_hwnd, IDC_REMINDERDATA, arReminders[ev->nmlv->iItem]->szText);
}
- return FALSE;
-}
+
+ void list_onDblClick(CCtrlListView::TEventInfo*)
+ {
+ int i = m_list.GetSelectionMark();
+ if (i != -1)
+ EditReminder(arReminders[i]);
+ }
+
+ void onClick_New(CCtrlButton *)
+ {
+ PluginMenuCommandNewReminder(0, 0);
+ }
+
+ INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
+ {
+ RECT rc;
+
+ switch (msg) {
+ case WM_NOTIFY:
+ if (wParam == IDC_LISTREMINDERS_HEADER) {
+ LPNMHEADER NM = (LPNMHEADER)lParam;
+ if (NM->hdr.code == HDN_ENDTRACK) {
+ GetWindowRect(m_list.GetHwnd(), &rc);
+ m_list.SetColumnWidth(1, rc.right - rc.left - m_list.GetColumnWidth(0) - 4);
+ }
+ }
+ break;
+
+ case WM_SIZE:
+ CDlgBase::DlgProc(msg, wParam, lParam);
+
+ GetWindowRect(m_list.GetHwnd(), &rc);
+ m_list.SetColumnWidth(1, rc.right - rc.left - m_list.GetColumnWidth(0) - 4);
+ return 0;
+ }
+
+ return CDlgBase::DlgProc(msg, wParam, lParam);
+ }
+};
/////////////////////////////////////////////////////////////////////////////////////////
-void CloseReminderList()
+bool CheckRemindersAndStart(void)
{
- if (bListReminderVisible) {
- DestroyWindow(LV);
- bListReminderVisible = false;
+ // returns TRUE if there are any triggered reminder with bSystemEventQueued, this will shorten the update interval
+ // allowing sound repeats with shorter intervals
+
+ if (!arReminders.getCount())
+ return false;
+
+ ULONGLONG curT;
+ SYSTEMTIME tm;
+ GetSystemTime(&tm);
+ SystemTimeToFileTime(&tm, (FILETIME *)&curT);
+
+ // NOTE: reminder list is sorted by trigger time, so we can early out on the first reminder > cur time
+ // quick check for normal case with no reminder ready to be triggered and no queued triggered reminders
+ // (happens 99.99999999999% of the time)
+ if (curT < arReminders[0]->When && !QueuedReminderCount)
+ return false;
+
+ bool bResult = false;
+
+ // var used to avoid playing multiple alarm sounds during a single update
+ DWORD bHasPlayedSound = 0;
+
+ // if there are queued (triggered) reminders then iterate through entire list, becaue of WM_TIMECHANGE events
+ // and for example daylight saving changes it's possible for an already triggered event to end up with When>curT
+ bool bHasQueuedReminders = (QueuedReminderCount != 0);
+
+ // allthough count should always be correct, it's fool proof to just count them again in the loop below
+ QueuedReminderCount = 0;
+
+ for (auto &pReminder : arReminders) {
+ if (!bHasQueuedReminders && pReminder->When > curT)
+ break;
+
+ if (!pReminder->bVisible) {
+ if (pReminder->bSystemEventQueued) {
+ UpdateReminderEvent(pReminder, REMINDER_UPDATE_INTERVAL_SHORT / 1000, &bHasPlayedSound);
+
+ QueuedReminderCount++;
+ bResult = true;
+ }
+ else if (pReminder->When <= curT) {
+ if (!g_RemindSMS) {
+ FireReminder(pReminder, &bHasPlayedSound);
+
+ if (pReminder->bSystemEventQueued)
+ bResult = true;
+ }
+ else {
+ char *p = strchr(g_RemindSMS, '@');
+ if (p) {
+ Send(g_RemindSMS, p + 1, pReminder->szText, NULL);
+ *p = '@';
+
+ DeleteReminder(pReminder);
+ JustSaveReminders();
+ if (pListDialog)
+ pListDialog->Reload();
+ }
+ }
+ }
+ }
}
+
+ return bResult;
+}
+
+void CloseReminderList()
+{
+ if (pListDialog)
+ pListDialog->Close();
+}
+
+static void NotifyList()
+{
+ if (pListDialog)
+ pListDialog->Reload();
}
INT_PTR PluginMenuCommandNewReminder(WPARAM, LPARAM)
@@ -1886,11 +1851,10 @@ INT_PTR PluginMenuCommandNewReminder(WPARAM, LPARAM) INT_PTR PluginMenuCommandViewReminders(WPARAM, LPARAM)
{
- if (!bListReminderVisible) {
- CreateDialog(g_plugin.getInst(), MAKEINTRESOURCE(IDD_LISTREMINDERS), nullptr, DlgProcViewReminders);
- bListReminderVisible = true;
- }
- else BringWindowToTop(LV);
+ if (!pListDialog)
+ (new CReminderListDlg())->Show();
+ else
+ BringWindowToTop(pListDialog->GetHwnd());
return 0;
}
diff --git a/plugins/NotesAndReminders/src/version.h b/plugins/NotesAndReminders/src/version.h index b11916b763..539b0614a7 100644 --- a/plugins/NotesAndReminders/src/version.h +++ b/plugins/NotesAndReminders/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 2 -#define __RELEASE_NUM 0 -#define __BUILD_NUM 5 +#define __RELEASE_NUM 1 +#define __BUILD_NUM 0 #include <stdver.h> |