From 7de38a08b97e0554e318b8c25806cef5d47259e6 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Thu, 12 Jun 2014 17:49:53 +0000 Subject: headers of not adopted plugins moved to !Deprecated git-svn-id: http://svn.miranda-ng.org/main/trunk@9438 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/QuickContacts/res/resource.rc | 2 -- plugins/QuickContacts/src/commons.h | 1 - plugins/QuickContacts/src/quickcontacts.cpp | 46 ----------------------------- plugins/QuickContacts/src/resource.h | 3 -- 4 files changed, 52 deletions(-) (limited to 'plugins/QuickContacts') diff --git a/plugins/QuickContacts/res/resource.rc b/plugins/QuickContacts/res/resource.rc index 0f173ee773..75b589855f 100644 --- a/plugins/QuickContacts/res/resource.rc +++ b/plugins/QuickContacts/res/resource.rc @@ -73,7 +73,6 @@ BEGIN 176,11 CONTROL "",IDC_MESSAGE,"MButtonClass",0x0,41,36,17,15, 0x18000000L - CONTROL "",IDC_VOICE,"MButtonClass",0x0,62,36,17,15,0x18000000L CONTROL "",IDC_FILE,"MButtonClass",0x0,83,36,17,15,0x18000000L CONTROL "",IDC_URL,"MButtonClass",0x0,104,36,17,15,0x18000000L CONTROL "",IDC_USERINFO,"MButtonClass",0x0,125,36,17,15, @@ -119,7 +118,6 @@ BEGIN "I", HOTKEY_INFO, VIRTKEY, CONTROL, NOINVERT "M", HOTKEY_MENU, VIRTKEY, CONTROL, NOINVERT "U", HOTKEY_URL, VIRTKEY, CONTROL, NOINVERT - "V", HOTKEY_VOICE, VIRTKEY, CONTROL, NOINVERT END #ifdef APSTUDIO_INVOKED diff --git a/plugins/QuickContacts/src/commons.h b/plugins/QuickContacts/src/commons.h index b9c41b88e9..ab0397762f 100644 --- a/plugins/QuickContacts/src/commons.h +++ b/plugins/QuickContacts/src/commons.h @@ -44,7 +44,6 @@ Boston, MA 02111-1307, USA. #include #include -#include #include #include "../utils/mir_options.h" diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index 6cd7065ba3..fe69dea394 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -132,12 +132,6 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) hkd.pszService = NULL; - hkd.lParam = HOTKEY_VOICE; - hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'V'); - hkd.pszName = "Quick Contacts/Voice"; - hkd.ptszDescription = LPGENT("Make a voice call"); - Hotkey_Register(&hkd); - hkd.lParam = HOTKEY_FILE; hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'F'); hkd.pszName = "Quick Contacts/File"; @@ -443,7 +437,6 @@ void EnableButtons(HWND hwndDlg, MCONTACT hContact) if (hContact == NULL) { EnableWindow(GetDlgItem(hwndDlg, IDC_MESSAGE), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_VOICE), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_FILE), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_URL), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_USERINFO), FALSE); @@ -466,11 +459,7 @@ void EnableButtons(HWND hwndDlg, MCONTACT hContact) if (pszProto != NULL) caps = CallProtoService(pszProto, PS_GETCAPS, PFLAGNUM_1, 0); - BOOL voice = (ServiceExists(MS_VOICESERVICE_CAN_CALL) - && CallService(MS_VOICESERVICE_CAN_CALL, hContact, 0) > 0); - EnableWindow(GetDlgItem(hwndDlg, IDC_MESSAGE), caps & PF1_IMSEND ? TRUE : FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_VOICE), voice); EnableWindow(GetDlgItem(hwndDlg, IDC_FILE), caps & PF1_FILESEND ? TRUE : FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_URL), caps & PF1_URLSEND ? TRUE : FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_USERINFO), TRUE); @@ -770,17 +759,6 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA // Buttons FillCheckbox(hwndDlg, IDC_SHOW_ALL_CONTACTS, LPGENT("Show all contacts"), hasNewHotkeyModule ? NULL : _T("Ctrl+A")); FillButton(hwndDlg, IDC_MESSAGE, LPGENT("Send message"), NULL, LoadSkinnedIcon(SKINICON_EVENT_MESSAGE)); - - if (ServiceExists(MS_VOICESERVICE_CAN_CALL)) - FillButton(hwndDlg, IDC_VOICE, LPGENT("Make a voice call"), hasNewHotkeyModule ? NULL : _T("Ctrl+V"), Skin_GetIcon("vca_call")); - else - { - GetWindowRect(GetDlgItem(hwndDlg, IDC_VOICE), &rc); - ScreenToClient(hwndDlg, &rc); - MoveWindow(GetDlgItem(hwndDlg, IDC_MESSAGE), rc, FALSE); - ShowWindow(GetDlgItem(hwndDlg, IDC_VOICE), SW_HIDE); - } - FillButton(hwndDlg, IDC_FILE, LPGENT("Send file"), hasNewHotkeyModule ? NULL : _T("Ctrl+F"), LoadSkinnedIcon(SKINICON_EVENT_FILE)); FillButton(hwndDlg, IDC_URL, LPGENT("Send URL"), hasNewHotkeyModule ? NULL : _T("Ctrl+U"), LoadSkinnedIcon(SKINICON_EVENT_URL)); FillButton(hwndDlg, IDC_USERINFO, LPGENT("Open user info"), hasNewHotkeyModule ? NULL : _T("Ctrl+I"), LoadSkinnedIcon(SKINICON_OTHER_USERDETAILS)); @@ -848,30 +826,6 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA SendMessage(hwndDlg, WM_CLOSE, 0, 0); break; } - case HOTKEY_VOICE: - case IDC_VOICE: - { - MCONTACT hContact = GetSelectedContact(hwndDlg); - if (hContact == NULL) - { - SetDlgItemText(hwndDlg, IDC_USERNAME, _T("")); - SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); - break; - } - - // Is button enabled? - if (!IsWindowEnabled(GetDlgItem(hwndDlg, IDC_VOICE))) - break; - - if (!ServiceExists(MS_VOICESERVICE_CALL)) - break; - - CallService(MS_VOICESERVICE_CALL, (WPARAM) hContact, 0); - - db_set_dw(NULL, MODULE_NAME, "LastSentTo", (DWORD) hContact); - SendMessage(hwndDlg, WM_CLOSE, 0, 0); - } - break; case HOTKEY_FILE: case IDC_FILE: diff --git a/plugins/QuickContacts/src/resource.h b/plugins/QuickContacts/src/resource.h index f7f6a0142f..38fd6df5cb 100644 --- a/plugins/QuickContacts/src/resource.h +++ b/plugins/QuickContacts/src/resource.h @@ -23,15 +23,12 @@ #define IDC_USERINFO 1065 #define IDC_HISTORY 1066 #define IDC_MENU 1067 -#define IDC_VOICE 1068 #define HOTKEY_FILE 40001 #define HOTKEY_URL 40002 #define HOTKEY_INFO 40003 #define HOTKEY_HISTORY 40004 #define HOTKEY_ALL_CONTACTS 40005 #define HOTKEY_MENU 40006 -#define HOTKEY_VOICE 40007 -#define IDC_STATIC -1 // Next default values for new objects // -- cgit v1.2.3