summaryrefslogtreecommitdiff
path: root/yapp/options.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'yapp/options.cpp')
-rw-r--r--yapp/options.cpp73
1 files changed, 37 insertions, 36 deletions
diff --git a/yapp/options.cpp b/yapp/options.cpp
index fa8426d..94a12c4 100644
--- a/yapp/options.cpp
+++ b/yapp/options.cpp
@@ -86,27 +86,28 @@ void SaveOptions() {
}
void ShowExamplePopups() {
- POPUPDATAT pd = {0};
- pd.lchIcon = hPopupIcon;
-
- _tcscpy(pd.lptzContactName, TranslateT("Example"));
- _tcscpy(pd.lptzText, TranslateT("The quick brown fox jumped over the lazy dog."));
- CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&pd, 0);
- _tcscpy(pd.lptzContactName, TranslateT("Example With a Long Title"));
- _tcscpy(pd.lptzText, TranslateT("The quick brown fox jumped over the lazy dog."));
- CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&pd, 0);
- _tcscpy(pd.lptzContactName, TranslateT("Example"));
- _tcscpy(pd.lptzText, TranslateT("Thequickbrownfoxjumpedoverthelazydog."));
- CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&pd, 0);
+ PopupData pd = {sizeof(PopupData)};
+ pd.hIcon = hPopupIcon;
+ pd.flags = PDF_TCHAR;
+
+ pd.ptzTitle = TranslateT("Example");
+ pd.ptzText = TranslateT("The quick brown fox jumped over the lazy dog.");
+ CallService(MS_YAPP_SHOWPOPUP, (WPARAM)&pd, 0);
+ pd.ptzTitle = TranslateT("Example With a Long Title");
+ pd.ptzText = TranslateT("The quick brown fox jumped over the lazy dog.");
+ CallService(MS_YAPP_SHOWPOPUP, (WPARAM)&pd, 0);
+ pd.ptzTitle = TranslateT("Example");
+ pd.ptzText = TranslateT("Thequickbrownfoxjumpedoverthelazydog.");
+ CallService(MS_YAPP_SHOWPOPUP, (WPARAM)&pd, 0);
HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
while(hContact) {
if(options.av_layout != PAV_NONE && ServiceExists(MS_AV_DRAWAVATAR)) {
AVATARCACHEENTRY *ace = (AVATARCACHEENTRY *)CallService(MS_AV_GETAVATARBITMAP, (WPARAM)hContact, 0);
- if(ace && ace->dwFlags & AVS_BITMAP_VALID) {
- pd.lchContact = hContact;
- _tcscpy(pd.lptzText, TranslateT("An avatar."));
- CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&pd, 0);
+ if(ace && (ace->dwFlags & AVS_BITMAP_VALID)) {
+ pd.hContact = hContact;
+ pd.ptzText = TranslateT("An avatar.");
+ CallService(MS_YAPP_SHOWPOPUP, (WPARAM)&pd, 0);
break;
}
}
@@ -353,17 +354,17 @@ static BOOL CALLBACK DlgProcOpts1(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
return 0;
}
-POPUPCLASS *newclasses = 0;
+PopupClass *newclasses = 0;
static BOOL CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
switch ( msg ) {
case WM_INITDIALOG:
TranslateDialogDefault( hwndDlg );
{
if(num_classes) {
- newclasses = (POPUPCLASS *)malloc(num_classes * sizeof(POPUPCLASS));
- memcpy(newclasses, classes, num_classes * sizeof(POPUPCLASS));
+ newclasses = (PopupClass *)malloc(num_classes * sizeof(PopupClass));
+ memcpy(newclasses, classes, num_classes * sizeof(PopupClass));
- POPUPCLASS *pc;
+ PopupClass *pc;
int index;
for(int i = 0; i < num_classes; i++) {
pc = &newclasses[i];
@@ -388,8 +389,8 @@ static BOOL CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam, L
int i = SendDlgItemMessage(hwndDlg, IDC_LST_CLASSES, LB_GETITEMDATA, index, 0);
SendDlgItemMessage(hwndDlg, IDC_COL_TEXT, CPM_SETCOLOUR, 0, (LPARAM)newclasses[i].colorText);
SendDlgItemMessage(hwndDlg, IDC_COL_BG, CPM_SETCOLOUR, 0, (LPARAM)newclasses[i].colorBack);
- CheckDlgButton(hwndDlg, IDC_CHK_TIMEOUT, newclasses[i].iSeconds != -1);
- SetDlgItemInt(hwndDlg, IDC_ED_TIMEOUT, newclasses[i].iSeconds, TRUE);
+ CheckDlgButton(hwndDlg, IDC_CHK_TIMEOUT, newclasses[i].timeout != -1);
+ SetDlgItemInt(hwndDlg, IDC_ED_TIMEOUT, newclasses[i].timeout, TRUE);
}
EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TIMEOUT), index != -1 && IsDlgButtonChecked(hwndDlg, IDC_CHK_TIMEOUT));
return TRUE;
@@ -399,7 +400,7 @@ static BOOL CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam, L
int i = SendDlgItemMessage(hwndDlg, IDC_LST_CLASSES, LB_GETITEMDATA, index, 0);
BOOL tr;
int t = GetDlgItemInt(hwndDlg, IDC_ED_TIMEOUT, &tr, FALSE);
- newclasses[i].iSeconds = t;
+ newclasses[i].timeout = t;
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
}
@@ -412,9 +413,9 @@ static BOOL CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam, L
{
BOOL isChecked = IsDlgButtonChecked(hwndDlg, IDC_CHK_TIMEOUT);
EnableWindow(GetDlgItem(hwndDlg, IDC_ED_TIMEOUT), isChecked);
- if(isChecked) newclasses[i].iSeconds = 0;
- else newclasses[i].iSeconds = -1;
- SetDlgItemInt(hwndDlg, IDC_ED_TIMEOUT, newclasses[i].iSeconds, TRUE);
+ if(isChecked) newclasses[i].timeout = 0;
+ else newclasses[i].timeout = -1;
+ SetDlgItemInt(hwndDlg, IDC_ED_TIMEOUT, newclasses[i].timeout, TRUE);
}
SendMessage( GetParent( hwndDlg ), PSM_CHANGED, 0, 0 );
break;
@@ -428,19 +429,19 @@ static BOOL CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam, L
break;
case IDC_BTN_PREVIEW:
if(newclasses[i].flags & PCF_UNICODE) {
- POPUPCLASS pc = newclasses[i];
- pc.PluginWindowProc = 0;
- POPUPDATACLASS d = {sizeof(d), pc.pszName};
+ PopupClass pc = newclasses[i];
+ pc.windowProc = 0;
+ PopupClassInstance d = {sizeof(d), pc.pszName};
d.pwszTitle = L"Preview";
d.pwszText = L"The quick brown fox jumps over the lazy dog.";
- CallService(MS_POPUP_ADDPOPUPCLASS, (WPARAM)&pc, (LPARAM)&d);
+ CallService(MS_YAPP_CLASSINSTANCE, (WPARAM)&pc, (LPARAM)&d);
} else {
- POPUPCLASS pc = newclasses[i];
- pc.PluginWindowProc = 0;
- POPUPDATACLASS d = {sizeof(d), pc.pszName};
+ PopupClass pc = newclasses[i];
+ pc.windowProc = 0;
+ PopupClassInstance d = {sizeof(d), pc.pszName};
d.pszTitle = "Preview";
d.pszText = "The quick brown fox jumps over the lazy dog.";
- CallService(MS_POPUP_ADDPOPUPCLASS, (WPARAM)&pc, (LPARAM)&d);
+ CallService(MS_YAPP_CLASSINSTANCE, (WPARAM)&pc, (LPARAM)&d);
}
break;
}
@@ -449,11 +450,11 @@ static BOOL CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam, L
break;
case WM_NOTIFY:
if (((LPNMHDR)lParam)->code == (unsigned)PSN_APPLY ) {
- memcpy(classes, newclasses, num_classes * sizeof(POPUPCLASS));
+ memcpy(classes, newclasses, num_classes * sizeof(PopupClass));
char setting[256];
for(int i = 0; i < num_classes; i++) {
mir_snprintf(setting, 256, "%s/Timeout", classes[i].pszName);
- DBWriteContactSettingWord(0, MODULE, setting, classes[i].iSeconds);
+ DBWriteContactSettingWord(0, MODULE, setting, classes[i].timeout);
mir_snprintf(setting, 256, "%s/TextCol", classes[i].pszName);
DBWriteContactSettingDword(0, MODULE, setting, (DWORD)classes[i].colorText);
mir_snprintf(setting, 256, "%s/BgCol", classes[i].pszName);
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-08 14:54:30 +0000