From 2daa10fc6e063ab3e4824dc22820bbe7d3ce733f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 2 Aug 2022 17:33:56 +0300 Subject: UInfoEx: details options dialog -> UI classes --- plugins/UserInfoEx/src/ctrl_annivedit.cpp | 7 +- plugins/UserInfoEx/src/ctrl_base.cpp | 12 +-- plugins/UserInfoEx/src/ctrl_combo.cpp | 2 +- plugins/UserInfoEx/src/ctrl_contact.cpp | 4 +- plugins/UserInfoEx/src/ctrl_edit.cpp | 3 +- plugins/UserInfoEx/src/dlg_anniversarylist.cpp | 2 +- plugins/UserInfoEx/src/dlg_propsheet.cpp | 12 +-- plugins/UserInfoEx/src/init.cpp | 17 ++++ plugins/UserInfoEx/src/psp_general.cpp | 2 +- plugins/UserInfoEx/src/psp_options.cpp | 126 ++++++++++--------------- plugins/UserInfoEx/src/stdafx.h | 4 + plugins/UserInfoEx/src/svc_constants.h | 12 +-- 12 files changed, 90 insertions(+), 113 deletions(-) diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.cpp b/plugins/UserInfoEx/src/ctrl_annivedit.cpp index a8cbe82c6c..0fcfb55a82 100644 --- a/plugins/UserInfoEx/src/ctrl_annivedit.cpp +++ b/plugins/UserInfoEx/src/ctrl_annivedit.cpp @@ -143,12 +143,7 @@ void CAnnivEditCtrl::EnableCurrentItem() MCONTACT hContact; PSGetContact(_hwndDlg, hContact); - const uint8_t bEnabled - = !hContact || - (pCurrent->Flags() & CTRLF_HASCUSTOM) || - !(pCurrent->Flags() & (CTRLF_HASPROTO|CTRLF_HASMETA)) || - !g_plugin.getByte(SET_PROPSHEET_PCBIREADONLY, 0); - + const uint8_t bEnabled = !hContact || (pCurrent->Flags() & CTRLF_HASCUSTOM) || !(pCurrent->Flags() & (CTRLF_HASPROTO|CTRLF_HASMETA)) || !g_plugin.bReadOnly; EnableWindow(_hBtnEdit, bEnabled); EnableWindow(_hBtnDel, bEnabled); EnableWindow(_hwndDate, bEnabled); diff --git a/plugins/UserInfoEx/src/ctrl_base.cpp b/plugins/UserInfoEx/src/ctrl_base.cpp index 7b435fc2cd..2a6802c2f9 100644 --- a/plugins/UserInfoEx/src/ctrl_base.cpp +++ b/plugins/UserInfoEx/src/ctrl_base.cpp @@ -33,11 +33,11 @@ COLORREF clrMeta = -1; void Ctrl_InitTextColours() { - clrBoth = g_plugin.getDword(SET_PROPSHEET_CLRBOTH, RGB(0, 160, 10)); - clrChanged = g_plugin.getDword(SET_PROPSHEET_CLRCHANGED, RGB(190, 0, 0)); - clrCustom = g_plugin.getDword(SET_PROPSHEET_CLRCUSTOM, RGB(0, 10, 130)); - clrNormal = g_plugin.getDword(SET_PROPSHEET_CLRNORMAL, RGB(90, 90, 90)); - clrMeta = g_plugin.getDword(SET_PROPSHEET_CLRMETA, RGB(120, 40, 130)); + clrBoth = g_plugin.clrBoth; + clrChanged = g_plugin.clrChanged; + clrCustom = g_plugin.clrCustom; + clrNormal = g_plugin.clrNormal; + clrMeta = g_plugin.clrMeta; } INT_PTR CALLBACK Ctrl_SetTextColour(HDC hdc, uint16_t wFlags) @@ -55,7 +55,7 @@ INT_PTR CALLBACK Ctrl_SetTextColour(HDC hdc, uint16_t wFlags) INT_PTR CALLBACK Ctrl_SetTextColour(HWND hCtrl, HDC hdc) { - if (hCtrl && g_plugin.getByte(SET_PROPSHEET_SHOWCOLOURS, 1)) + if (hCtrl && g_plugin.bShowColours) { LPCTRL pCtrl = (LPCTRL)GetUserData(hCtrl); if (PtrIsValid(pCtrl)) diff --git a/plugins/UserInfoEx/src/ctrl_combo.cpp b/plugins/UserInfoEx/src/ctrl_combo.cpp index 512371116a..71d1c79db9 100644 --- a/plugins/UserInfoEx/src/ctrl_combo.cpp +++ b/plugins/UserInfoEx/src/ctrl_combo.cpp @@ -150,7 +150,7 @@ BOOL CCombo::OnInfoChanged(MCONTACT hContact, LPCSTR pszProto) _Flags.B.hasCustom = _Flags.B.hasProto = _Flags.B.hasMeta = false; _Flags.W |= DB::Setting::GetWStringCtrl(hContact, USERINFO, USERINFO, pszProto, _pszSetting, &dbv); - EnableWindow(_hwnd, !hContact || _Flags.B.hasCustom || !g_plugin.getByte(SET_PROPSHEET_PCBIREADONLY, 0)); + EnableWindow(_hwnd, !hContact || _Flags.B.hasCustom || !g_plugin.bReadOnly); if (_Flags.B.hasCustom || _Flags.B.hasProto || _Flags.B.hasMeta) { switch (dbv.type) { diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp index 7ce07cdb30..9ec68ef570 100644 --- a/plugins/UserInfoEx/src/ctrl_contact.cpp +++ b/plugins/UserInfoEx/src/ctrl_contact.cpp @@ -566,7 +566,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L * return: a brush **/ case WM_CTLCOLOREDIT: - if (!g_plugin.getByte(SET_PROPSHEET_SHOWCOLOURS, 1) || (HWND)lParam != cbex->hEdit || !cbex->pItems || cbex->iSelectedItem < 0) + if (!g_plugin.bShowColours || (HWND)lParam != cbex->hEdit || !cbex->pItems || cbex->iSelectedItem < 0) break; return Ctrl_SetTextColour((HDC)wParam, cbex->pItems[cbex->iSelectedItem].wFlags); @@ -1137,7 +1137,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L bEnabled = !hContact || (cbex->pItems[cbex->iSelectedItem].wFlags & CTRLF_HASCUSTOM) || !(cbex->pItems[cbex->iSelectedItem].wFlags & (CTRLF_HASPROTO | CTRLF_HASMETA)) || - !g_plugin.getByte(SET_PROPSHEET_PCBIREADONLY, 0); + !g_plugin.bReadOnly; EnableWindow(cbex->hBtnEdit, bEnabled); EnableWindow(cbex->hBtnDel, bEnabled && GetWindowTextLength(cbex->hEdit) > 0); diff --git a/plugins/UserInfoEx/src/ctrl_edit.cpp b/plugins/UserInfoEx/src/ctrl_edit.cpp index 75a82e7a37..8f69f97972 100644 --- a/plugins/UserInfoEx/src/ctrl_edit.cpp +++ b/plugins/UserInfoEx/src/ctrl_edit.cpp @@ -113,8 +113,7 @@ BOOL CEditCtrl::OnInfoChanged(MCONTACT hContact, LPCSTR pszProto) _Flags.B.hasCustom = _Flags.B.hasProto = _Flags.B.hasMeta = false; _Flags.W |= DB::Setting::GetWStringCtrl(hContact, _pszModule, _pszModule, pszProto, _pszSetting, &dbv); - EnableWindow(_hwnd, - !hContact || _Flags.B.hasCustom || !g_plugin.getByte(SET_PROPSHEET_PCBIREADONLY, 0)); + EnableWindow(_hwnd, !hContact || _Flags.B.hasCustom || !g_plugin.bReadOnly); MIR_FREE(_pszValue); switch (dbv.type) { diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp index 21320df313..ca81ab6656 100644 --- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp +++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp @@ -894,7 +894,7 @@ public: INT_PTR DlgAnniversaryListShow(WPARAM, LPARAM) { if (!gpDlg) { - myGlobals.WantAeroAdaption = g_plugin.getByte(SET_PROPSHEET_AEROADAPTION, TRUE); + myGlobals.WantAeroAdaption = g_plugin.bAero; gpDlg = new CAnnivList(); } else gpDlg->BringToFront(); diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index cdfcb19319..445833be29 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -205,8 +205,8 @@ static int SortProc(CPsTreeItem **item1, CPsTreeItem **item2) static INT_PTR ShowDialog(WPARAM wParam, LPARAM) { // update some cached settings - myGlobals.ShowPropsheetColours = g_plugin.getByte(SET_PROPSHEET_SHOWCOLOURS, TRUE); - myGlobals.WantAeroAdaption = g_plugin.getByte(SET_PROPSHEET_AEROADAPTION, TRUE); + myGlobals.ShowPropsheetColours = g_plugin.bShowColours; + myGlobals.WantAeroAdaption = g_plugin.bAero; // allow only one dialog per user if (HWND hWnd = WindowList_Find(g_hWindowList, wParam)) { @@ -220,9 +220,9 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM) bool bScanMetaSubContacts = false; // init the treeview options - if (g_plugin.getByte(SET_PROPSHEET_SORTITEMS, FALSE)) + if (g_plugin.bSortTree) psh._dwFlags |= PSTVF_SORTTREE; - if (g_plugin.getByte(SET_PROPSHEET_GROUPS, TRUE)) + if (g_plugin.bTreeGroups) psh._dwFlags |= PSTVF_GROUPS; // create imagelist @@ -382,7 +382,7 @@ static int InitDetails(WPARAM wParam, LPARAM lParam) { CPsHdr *pPsh = (CPsHdr *)wParam; if (!(pPsh->_dwFlags & PSF_PROTOPAGESONLY)) { - uint8_t bChangeDetailsEnabled = myGlobals.CanChangeDetails && g_plugin.getByte(SET_PROPSHEET_CHANGEMYDETAILS, FALSE); + bool bChangeDetailsEnabled = myGlobals.CanChangeDetails && g_plugin.bChangeDetails; if (lParam || bChangeDetailsEnabled) { USERINFOPAGE uip = {}; uip.flags = ODPF_ICON | ODPF_UNICODE; @@ -1215,7 +1215,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar g_clistApi.pfnInvalidateDisplayNameCacheEntry(pPs->hContact); // need to upload owners settings - if (!pPs->hContact && myGlobals.CanChangeDetails && g_plugin.getByte(SET_PROPSHEET_CHANGEMYDETAILS, FALSE)) { + if (!pPs->hContact && myGlobals.CanChangeDetails && g_plugin.bChangeDetails) { if (pPs->pUpload = new CPsUpload(pPs, LOWORD(wParam) == IDOK)) { if (pPs->pUpload->UploadFirst() == CPsUpload::UPLOAD_CONTINUE) break; diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp index 83bf8c3ed5..4961c6f5e6 100644 --- a/plugins/UserInfoEx/src/init.cpp +++ b/plugins/UserInfoEx/src/init.cpp @@ -46,12 +46,27 @@ static PLUGININFOEX pluginInfoEx = CMPlugin::CMPlugin() : PLUGIN(MODULENAME, pluginInfoEx), + // Propsheet options + bAero(MODULENAME, "AeroAdaption", true), + bReadOnly(MODULENAME, "PBCIReadOnly", false), + bSortTree(MODULENAME, "TreeSortItems", false), + bTreeGroups(MODULENAME, "TreeGroups", true), + bShowColours(MODULENAME, "ShowColours", true), + bChangeDetails(MODULENAME, "ChangeMyDetails", false), + + clrBoth(MODULENAME, "colourBoth", RGB(0, 160, 10)), + clrMeta(MODULENAME, "colourMeta", RGB(120, 40, 130)), + clrCustom(MODULENAME, "colourUser", RGB(0, 10, 130)), + clrNormal(MODULENAME, "colourNormal", RGB(90, 90, 90)), + clrChanged(MODULENAME, "colourChanged", RGB(190, 0, 0)), + // Reminder options bRemindExtraIcon(MODULENAME, "RemindExtraIcon", true), bRemindFlashIcon(MODULENAME, "RemindFlashIcon", false), bRemindMenuEnabled(MODULENAME, "RemindMenuEnabled", true), bRemindStartupCheck(MODULENAME, "RemindStartupCheck", false), bRemindCheckVisible(MODULENAME, "RemindCheckVisible", false), + iRemindState(MODULENAME, "RemindEnabled", REMIND_ALL), wRemindOffset(MODULENAME, "RemindOffset", 9), wRemindSoundOffset(MODULENAME, "RemindSoundOffset", 3), @@ -61,9 +76,11 @@ CMPlugin::CMPlugin() : bPopupEnabled(MODULENAME, "PopupEnabled", true), bPopupMsgbox(MODULENAME, "PopupMsgBox", false), bPopupProgress(MODULENAME, "PopupProgress", false), + iPopupDelay(MODULENAME, "PopupDelay", 0), iAnnivClrType(MODULENAME, "PopupAnnivClrType", POPUP_COLOR_CUSTOM), iBirthClrType(MODULENAME, "PopupBirthClrType", POPUP_COLOR_CUSTOM), + clrAback(MODULENAME, "PopupAnnivClrBack", RGB(90, 190, 130)), clrAtext(MODULENAME, "PopupAnnivClrText", RGB(0, 0, 0)), clrBback(MODULENAME, "PopupBirthClrBirthBack", RGB(192, 180, 30)), diff --git a/plugins/UserInfoEx/src/psp_general.cpp b/plugins/UserInfoEx/src/psp_general.cpp index 81c3017219..e399575b98 100644 --- a/plugins/UserInfoEx/src/psp_general.cpp +++ b/plugins/UserInfoEx/src/psp_general.cpp @@ -67,7 +67,7 @@ struct PSPGeneralDlg : public PSPBaseDlg CheckDlgButton(m_hwnd, RADIO_FEMALE, (dbv.bVal == 'F') ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(m_hwnd, RADIO_MALE, (dbv.bVal == 'M') ? BST_CHECKED : BST_UNCHECKED); - bool bEnable = !m_hContact || Flags.B.hasCustom || !g_plugin.getByte(SET_PROPSHEET_PCBIREADONLY, 0); + bool bEnable = !m_hContact || Flags.B.hasCustom || !g_plugin.bReadOnly; EnableWindow(GetDlgItem(m_hwnd, RADIO_FEMALE), bEnable); EnableWindow(GetDlgItem(m_hwnd, RADIO_MALE), bEnable); } diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index 6b27c7b7d5..d153747d9b 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -381,84 +381,57 @@ static INT_PTR CALLBACK DlgProc_AdvancedOpts(HWND hDlg, UINT uMsg, WPARAM wParam ///////////////////////////////////////////////////////////////////////////////////////// // Details options dialog -static INT_PTR CALLBACK DlgProc_DetailsDlgOpts(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +class CDetailsOptsDlg : public CDlgBase { - static uint8_t bInitialized = 0; - - switch (uMsg) { - case WM_INITDIALOG: - TranslateDialogDefault(hDlg); - bInitialized = 0; + CCtrlCheck chkClr, chkGroups, chkSortTree, chkAero, chkReadonly, chkChange; + CCtrlColor clrNormal, clrCustom, clrBoth, clrChanged, clrMeta; - // init colors - DBGetCheckBtn(hDlg, CHECK_OPT_CLR, SET_PROPSHEET_SHOWCOLOURS, TRUE); - SendMessage(hDlg, WM_COMMAND, MAKEWPARAM(CHECK_OPT_CLR, BN_CLICKED), (LPARAM)GetDlgItem(hDlg, CHECK_OPT_CLR)); - DBGetColor(hDlg, CLR_NORMAL, SET_PROPSHEET_CLRNORMAL, RGB(90, 90, 90)); - DBGetColor(hDlg, CLR_USER, SET_PROPSHEET_CLRCUSTOM, RGB(0, 10, 130)); - DBGetColor(hDlg, CLR_BOTH, SET_PROPSHEET_CLRBOTH, RGB(0, 160, 10)); - DBGetColor(hDlg, CLR_CHANGED, SET_PROPSHEET_CLRCHANGED, RGB(190, 0, 0)); - DBGetColor(hDlg, CLR_META, SET_PROPSHEET_CLRMETA, RGB(120, 40, 130)); - - // treeview options - DBGetCheckBtn(hDlg, CHECK_OPT_GROUPS, SET_PROPSHEET_GROUPS, TRUE); - DBGetCheckBtn(hDlg, CHECK_OPT_SORTTREE, SET_PROPSHEET_SORTITEMS, FALSE); - DBGetCheckBtn(hDlg, CHECK_OPT_AEROADAPTION, SET_PROPSHEET_AEROADAPTION, TRUE); - - // common options - DBGetCheckBtn(hDlg, CHECK_OPT_READONLY, SET_PROPSHEET_PCBIREADONLY, FALSE); - DBGetCheckBtn(hDlg, CHECK_OPT_CHANGEMYDETAILS, SET_PROPSHEET_CHANGEMYDETAILS, FALSE); - Button_Enable(GetDlgItem(hDlg, CHECK_OPT_CHANGEMYDETAILS), myGlobals.CanChangeDetails); - - bInitialized = 1; - return TRUE; - - case WM_NOTIFY: - switch (((LPNMHDR)lParam)->code) { - case PSN_APPLY: - DBWriteCheckBtn(hDlg, CHECK_OPT_CLR, SET_PROPSHEET_SHOWCOLOURS); - DBWriteCheckBtn(hDlg, CHECK_OPT_GROUPS, SET_PROPSHEET_GROUPS); - DBWriteCheckBtn(hDlg, CHECK_OPT_SORTTREE, SET_PROPSHEET_SORTITEMS); - DBWriteCheckBtn(hDlg, CHECK_OPT_READONLY, SET_PROPSHEET_PCBIREADONLY); - DBWriteCheckBtn(hDlg, CHECK_OPT_AEROADAPTION, SET_PROPSHEET_AEROADAPTION); - DBWriteCheckBtn(hDlg, CHECK_OPT_CHANGEMYDETAILS, SET_PROPSHEET_CHANGEMYDETAILS); - - DBWriteColor(hDlg, CLR_NORMAL, SET_PROPSHEET_CLRNORMAL); - DBWriteColor(hDlg, CLR_USER, SET_PROPSHEET_CLRCUSTOM); - DBWriteColor(hDlg, CLR_BOTH, SET_PROPSHEET_CLRBOTH); - DBWriteColor(hDlg, CLR_CHANGED, SET_PROPSHEET_CLRCHANGED); - DBWriteColor(hDlg, CLR_META, SET_PROPSHEET_CLRMETA); - } - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) { - case CHECK_OPT_CLR: - if (HIWORD(wParam) == BN_CLICKED) { - BOOL bChecked = SendMessage((HWND)lParam, BM_GETCHECK, NULL, NULL); - const int idCtrl[] = { CLR_NORMAL, CLR_USER, CLR_BOTH, CLR_CHANGED, CLR_META, TXT_OPT_CLR_NORMAL, - TXT_OPT_CLR_USER, TXT_OPT_CLR_BOTH, TXT_OPT_CLR_CHANGED, TXT_OPT_CLR_META }; +public: + CDetailsOptsDlg() : + CDlgBase(g_plugin, IDD_OPT_DETAILSDLG), + chkClr(this, CHECK_OPT_CLR), + chkAero(this, CHECK_OPT_AEROADAPTION), + chkGroups(this, CHECK_OPT_GROUPS), + chkChange(this, CHECK_OPT_CHANGEMYDETAILS), + chkReadonly(this, CHECK_OPT_READONLY), + chkSortTree(this, CHECK_OPT_SORTTREE), + + clrBoth(this, CLR_BOTH), + clrMeta(this, CLR_META), + clrNormal(this, CLR_NORMAL), + clrCustom(this, CLR_USER), + clrChanged(this, CLR_CHANGED) + { + CreateLink(chkClr, g_plugin.bShowColours); + CreateLink(chkAero, g_plugin.bAero); + CreateLink(chkGroups, g_plugin.bTreeGroups); + CreateLink(chkChange, g_plugin.bChangeDetails); + CreateLink(chkReadonly, g_plugin.bReadOnly); + CreateLink(chkSortTree, g_plugin.bSortTree); + + CreateLink(clrBoth, g_plugin.clrBoth); + CreateLink(clrMeta, g_plugin.clrMeta); + CreateLink(clrNormal, g_plugin.clrNormal); + CreateLink(clrCustom, g_plugin.clrCustom); + CreateLink(clrChanged, g_plugin.clrChanged); + + chkClr.OnChange = Callback(this, &CDetailsOptsDlg::onChange_Clr); + } - EnableControls(hDlg, idCtrl, _countof(idCtrl), bChecked); - } - __fallthrough; + bool OnInitDialog() override + { + chkChange.Enable(myGlobals.CanChangeDetails); + return true; + } - case CHECK_OPT_GROUPS: - case CHECK_OPT_SORTTREE: - case CHECK_OPT_AEROADAPTION: - case CHECK_OPT_READONLY: - case CHECK_OPT_CHANGEMYDETAILS: - case CHECK_OPT_MI_CONTACT: - if (bInitialized && HIWORD(wParam) == BN_CLICKED) - NotifyParentOfChange(hDlg); - break; + void onChange_Clr(CCtrlCheck *pCheck) + { + const int idCtrl[] = { CLR_NORMAL, CLR_USER, CLR_BOTH, CLR_CHANGED, CLR_META, TXT_OPT_CLR_NORMAL, + TXT_OPT_CLR_USER, TXT_OPT_CLR_BOTH, TXT_OPT_CLR_CHANGED, TXT_OPT_CLR_META }; - default: - if (bInitialized && HIWORD(wParam) == CPN_COLOURCHANGED) - NotifyParentOfChange(hDlg); - } + EnableControls(m_hwnd, idCtrl, _countof(idCtrl), pCheck->IsChecked()); } - return FALSE; -} +}; ///////////////////////////////////////////////////////////////////////////////////////// // Reminder options dialog @@ -487,7 +460,7 @@ public: CreateLink(chkVisible, g_plugin.bRemindCheckVisible); CreateLink(spin1, g_plugin.wRemindOffset); - CreateLink(spin1, g_plugin.wRemindNotifyInterval); + CreateLink(spin2, g_plugin.wRemindNotifyInterval); CreateLink(spinOffset, g_plugin.wRemindSoundOffset); cmbEnabled.OnSelChanged = Callback(this, &CReminderOptsDlg::onChange_Enabled); @@ -776,14 +749,13 @@ int OnInitOptions(WPARAM wParam, LPARAM) // Details Dialog page odp.szTab.a = LPGEN("Details dialog"); - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DETAILSDLG); - odp.pfnDlgProc = DlgProc_DetailsDlgOpts; + odp.pszTemplate = 0; + odp.pfnDlgProc = 0; + odp.pDialog = new CDetailsOptsDlg(); g_plugin.addOptions(wParam, &odp); // Reminder page odp.szTab.a = LPGEN("Reminder"); - odp.pszTemplate = 0; - odp.pfnDlgProc = 0; odp.pDialog = new CReminderOptsDlg(); g_plugin.addOptions(wParam, &odp); diff --git a/plugins/UserInfoEx/src/stdafx.h b/plugins/UserInfoEx/src/stdafx.h index ea7d3ce8bd..7c43b96d5f 100644 --- a/plugins/UserInfoEx/src/stdafx.h +++ b/plugins/UserInfoEx/src/stdafx.h @@ -107,6 +107,10 @@ struct CMPlugin : public PLUGIN { CMPlugin(); + // Prop sheet options + CMOption bShowColours, bTreeGroups, bSortTree, bReadOnly, bChangeDetails, bAero; + CMOption clrNormal, clrCustom, clrBoth, clrChanged, clrMeta; + // Reminder options CMOption iRemindState; CMOption wRemindOffset, wRemindSoundOffset, wRemindNotifyInterval; diff --git a/plugins/UserInfoEx/src/svc_constants.h b/plugins/UserInfoEx/src/svc_constants.h index b1e8bb5443..da9304a742 100644 --- a/plugins/UserInfoEx/src/svc_constants.h +++ b/plugins/UserInfoEx/src/svc_constants.h @@ -39,19 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MOD_CLIST "CList" // database settings (propertysheet) -#define SET_PROPSHEET_PCBIREADONLY "PBCIReadOnly" #define SET_PROPSHEET_READONLYLABEL "TILReadonly" -#define SET_PROPSHEET_AEROADAPTION "AeroAdaption" -#define SET_PROPSHEET_SHOWCOLOURS "ShowColours" -#define SET_PROPSHEET_CLRNORMAL "colourNormal" -#define SET_PROPSHEET_CLRCUSTOM "colourUser" -#define SET_PROPSHEET_CLRBOTH "colourBoth" -#define SET_PROPSHEET_CLRCHANGED "colourChanged" -#define SET_PROPSHEET_CLRMETA "colourMeta" + #define SET_PROPSHEET_SAVEVCARD "vCardOnExit" -#define SET_PROPSHEET_GROUPS "TreeGroups" -#define SET_PROPSHEET_SORTITEMS "TreeSortItems" -#define SET_PROPSHEET_CHANGEMYDETAILS "ChangeMyDetails" #define SET_ABOUT_ACTIVEWINDOW "AboutActiveWin" #define SET_MI_MAIN "miMenu" #define SET_MI_CONTACT "miContact" -- cgit v1.2.3