diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/NewAwaySysMod/res/NewAwaySys.rc | 3 | ||||
| -rw-r--r-- | plugins/NewAwaySysMod/src/AwayOpt.cpp | 5 | ||||
| -rw-r--r-- | plugins/NewAwaySysMod/src/Properties.h | 45 | ||||
| -rw-r--r-- | plugins/NewAwaySysMod/src/resource.h | 2 |
4 files changed, 23 insertions, 32 deletions
diff --git a/plugins/NewAwaySysMod/res/NewAwaySys.rc b/plugins/NewAwaySysMod/res/NewAwaySys.rc index c441dbd6fb..f6e339efb3 100644 --- a/plugins/NewAwaySysMod/res/NewAwaySys.rc +++ b/plugins/NewAwaySysMod/res/NewAwaySys.rc @@ -78,8 +78,7 @@ BEGIN CONTROL "Enable autoreply",IDC_REPLYDLG_ENABLEREPLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,5,139,10
RTEXT "On event...",IDC_REPLYDLG_STATIC_ONEVENT,43,19,59,8
CONTROL "",IDC_REPLYDLG_EVENTMSG,"Button",BS_AUTOCHECKBOX | BS_ICON | WS_TABSTOP,110,17,29,12
- CONTROL "",IDC_REPLYDLG_EVENTURL,"Button",BS_AUTOCHECKBOX | BS_ICON | WS_TABSTOP,145,17,29,12
- CONTROL "",IDC_REPLYDLG_EVENTFILE,"Button",BS_AUTOCHECKBOX | BS_ICON | WS_TABSTOP,180,17,29,12
+ CONTROL "",IDC_REPLYDLG_EVENTFILE,"Button",BS_AUTOCHECKBOX | BS_ICON | WS_TABSTOP,145,17,29,12
CONTROL "Don't reply to ICQ contacts",IDC_REPLYDLG_DONTSENDTOICQ,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,119,275,10
CONTROL "Don't reply when I'm invisible to the contact",IDC_REPLYDLG_DONTREPLYINVISIBLE,
diff --git a/plugins/NewAwaySysMod/src/AwayOpt.cpp b/plugins/NewAwaySysMod/src/AwayOpt.cpp index 43eb9434dc..9e1400381f 100644 --- a/plugins/NewAwaySysMod/src/AwayOpt.cpp +++ b/plugins/NewAwaySysMod/src/AwayOpt.cpp @@ -534,7 +534,6 @@ INT_PTR CALLBACK AutoreplyOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l SendMessage(hButton, BUTTONSETASFLATBTN, TRUE, 0);
SendDlgItemMessage(hwndDlg, IDC_MOREOPTDLG_EVNTMSG, BUTTONSETASTHEMEDBTN, TRUE, 0);
- SendDlgItemMessage(hwndDlg, IDC_MOREOPTDLG_EVNTURL, BUTTONSETASTHEMEDBTN, TRUE, 0);
SendDlgItemMessage(hwndDlg, IDC_MOREOPTDLG_EVNTFILE, BUTTONSETASTHEMEDBTN, TRUE, 0);
SendMessage(hwndDlg, UM_ICONSCHANGED, 0, 0);
@@ -546,7 +545,6 @@ INT_PTR CALLBACK AutoreplyOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l Tooltips[] = {
IDC_REPLYDLG_RESETCOUNTERWHENSAMEICON, LPGENW("When this checkbox is ticked, NewAwaySys counts \"send times\" starting from the last status message change, even if status mode didn't change.\nWhen the checkbox isn't ticked, \"send times\" are counted from last status mode change (i.e., disabled state is more restrictive)."),
IDC_MOREOPTDLG_EVNTMSG, LPGENW("Message"),
- IDC_MOREOPTDLG_EVNTURL, LPGENW("URL"),
IDC_MOREOPTDLG_EVNTFILE, LPGENW("File")
};
hWndTooltips = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, L"", WS_POPUP | TTS_NOPREFIX, 0, 0, 0, 0, nullptr, nullptr, GetModuleHandleA("mir_app.mir"), nullptr);
@@ -575,7 +573,6 @@ INT_PTR CALLBACK AutoreplyOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l variables_skin_helpbutton(hwndDlg, IDC_REPLYDLG_VARS);
SendDlgItemMessage(hwndDlg, IDC_MOREOPTDLG_EVNTMSG, BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_IconList[ILI_EVENT_MESSAGE]);
- SendDlgItemMessage(hwndDlg, IDC_MOREOPTDLG_EVNTURL, BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_IconList[ILI_EVENT_URL]);
SendDlgItemMessage(hwndDlg, IDC_MOREOPTDLG_EVNTFILE, BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_IconList[ILI_EVENT_FILE]);
break;
@@ -599,7 +596,6 @@ INT_PTR CALLBACK AutoreplyOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l case IDC_REPLYDLG_ONLYIDLEREPLY:
case IDC_REPLYDLG_RESETCOUNTERWHENSAMEICON:
case IDC_REPLYDLG_EVENTMSG:
- case IDC_REPLYDLG_EVENTURL:
case IDC_REPLYDLG_EVENTFILE:
case IDC_REPLYDLG_LOGREPLY:
case IDC_REPLYDLG_DISABLE_ONL:
@@ -1125,7 +1121,6 @@ void InitOptions() g_AutoreplyOptPage.Items.AddElem(new COptItem_Checkbox(IDC_REPLYDLG_ENABLEREPLY, DB_ENABLEREPLY, DBVT_BYTE, AUTOREPLY_DEF_REPLY));
g_AutoreplyOptPage.Items.AddElem(new COptItem_Generic(IDC_REPLYDLG_STATIC_ONEVENT, IDC_REPLYDLG_ENABLEREPLY));
g_AutoreplyOptPage.Items.AddElem(new COptItem_Checkbox(IDC_REPLYDLG_EVENTMSG, "ReplyOnEvent", DBVT_BYTE, AUTOREPLY_DEF_REPLYONEVENT, EF_MSG, IDC_REPLYDLG_ENABLEREPLY));
- g_AutoreplyOptPage.Items.AddElem(new COptItem_Checkbox(IDC_REPLYDLG_EVENTURL, "ReplyOnEvent", DBVT_BYTE, AUTOREPLY_DEF_REPLYONEVENT, EF_URL, IDC_REPLYDLG_ENABLEREPLY));
g_AutoreplyOptPage.Items.AddElem(new COptItem_Checkbox(IDC_REPLYDLG_EVENTFILE, "ReplyOnEvent", DBVT_BYTE, AUTOREPLY_DEF_REPLYONEVENT, EF_FILE, IDC_REPLYDLG_ENABLEREPLY));
g_AutoreplyOptPage.Items.AddElem(new COptItem_Checkbox(IDC_REPLYDLG_DONTSENDTOICQ, "DontSendToICQ", DBVT_BYTE, 0, 0, IDC_REPLYDLG_ENABLEREPLY));
g_AutoreplyOptPage.Items.AddElem(new COptItem_Checkbox(IDC_REPLYDLG_DONTREPLYINVISIBLE, "DontReplyInvisible", DBVT_BYTE, 1, 0, IDC_REPLYDLG_ENABLEREPLY));
diff --git a/plugins/NewAwaySysMod/src/Properties.h b/plugins/NewAwaySysMod/src/Properties.h index 506c160076..8c8ca7261a 100644 --- a/plugins/NewAwaySysMod/src/Properties.h +++ b/plugins/NewAwaySysMod/src/Properties.h @@ -76,31 +76,30 @@ private: #define ILI_NOICON (-1)
#define ILI_EVENT_MESSAGE 0
-#define ILI_EVENT_URL 1
-#define ILI_EVENT_FILE 2
-#define ILI_PROTO_ONL 3
-#define ILI_PROTO_AWAY 4
-#define ILI_PROTO_NA 5
-#define ILI_PROTO_OCC 6
-#define ILI_PROTO_DND 7
-#define ILI_PROTO_FFC 8
-#define ILI_PROTO_INV 9
-#define ILI_PROTO_OTP 10
-#define ILI_PROTO_OTL 11
-#define ILI_DOT 12
-#define ILI_MSGICON 13
-#define ILI_IGNORE 14
-#define ILI_SOE_DISABLED 15
-#define ILI_SOE_ENABLED 16
-#define ILI_NEWMESSAGE 17
-#define ILI_NEWCATEGORY 18
-#define ILI_SAVE 19
-#define ILI_SAVEASNEW 20
-#define ILI_DELETE 21
-#define ILI_SETTINGS 22
+#define ILI_EVENT_FILE 1
+#define ILI_PROTO_ONL 2
+#define ILI_PROTO_AWAY 3
+#define ILI_PROTO_NA 4
+#define ILI_PROTO_OCC 5
+#define ILI_PROTO_DND 6
+#define ILI_PROTO_FFC 7
+#define ILI_PROTO_INV 8
+#define ILI_PROTO_OTP 9
+#define ILI_PROTO_OTL 10
+#define ILI_DOT 11
+#define ILI_MSGICON 12
+#define ILI_IGNORE 13
+#define ILI_SOE_DISABLED 14
+#define ILI_SOE_ENABLED 15
+#define ILI_NEWMESSAGE 16
+#define ILI_NEWCATEGORY 17
+#define ILI_SAVE 18
+#define ILI_SAVEASNEW 19
+#define ILI_DELETE 20
+#define ILI_SETTINGS 21
static unsigned Icons[] = {
- SKINICON_EVENT_MESSAGE | IL_SKINICON, SKINICON_EVENT_URL | IL_SKINICON, SKINICON_EVENT_FILE | IL_SKINICON,
+ SKINICON_EVENT_MESSAGE | IL_SKINICON, SKINICON_EVENT_FILE | IL_SKINICON,
ID_STATUS_ONLINE | IL_PROTOICON, ID_STATUS_AWAY | IL_PROTOICON, ID_STATUS_NA | IL_PROTOICON, ID_STATUS_OCCUPIED | IL_PROTOICON, ID_STATUS_DND | IL_PROTOICON, ID_STATUS_FREECHAT | IL_PROTOICON, ID_STATUS_INVISIBLE | IL_PROTOICON, ID_STATUS_ONTHEPHONE | IL_PROTOICON, ID_STATUS_OUTTOLUNCH | IL_PROTOICON,
IDI_DOT, IDI_MSGICON, IDI_IGNORE, IDI_SOE_ENABLED, IDI_SOE_DISABLED, IDI_NEWMESSAGE, IDI_NEWCATEGORY, IDI_SAVE, IDI_SAVEASNEW, IDI_DELETE, IDI_SETTINGS
};
diff --git a/plugins/NewAwaySysMod/src/resource.h b/plugins/NewAwaySysMod/src/resource.h index 422bf2f0d0..b1443d888b 100644 --- a/plugins/NewAwaySysMod/src/resource.h +++ b/plugins/NewAwaySysMod/src/resource.h @@ -81,8 +81,6 @@ #define IDC_REPLYDLG_DONTSENDTOICQ 1049
#define IDC_MOREOPTDLG_EVNTMSG 1050
#define IDC_REPLYDLG_EVENTMSG 1050
-#define IDC_MOREOPTDLG_EVNTURL 1051
-#define IDC_REPLYDLG_EVENTURL 1051
#define IDC_MOREOPTDLG_EVNTFILE 1052
#define IDC_REPLYDLG_EVENTFILE 1052
#define IDC_MOREOPTDLG_SENDONCE 1053
|