From 23f32f99462c0cda3fc5f424d62e96c04610dd2c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 19 Sep 2014 19:39:47 +0000 Subject: sms code field divided into two separate fields git-svn-id: http://svn.miranda-ng.org/main/trunk@10531 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/WhatsApp/res/whatsapp.rc | 4 +++- protocols/WhatsApp/src/dialogs.cpp | 6 +++++- protocols/WhatsApp/src/resource.h | 3 ++- protocols/WhatsApp/src/version.h | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) (limited to 'protocols') diff --git a/protocols/WhatsApp/res/whatsapp.rc b/protocols/WhatsApp/res/whatsapp.rc index d07ea1d8fa..e556992dff 100644 --- a/protocols/WhatsApp/res/whatsapp.rc +++ b/protocols/WhatsApp/res/whatsapp.rc @@ -88,10 +88,12 @@ BEGIN LTEXT "Nickname",IDC_STATIC,6,43,48,12 EDITTEXT IDC_NICK,60,42,119,12,ES_AUTOHSCROLL LTEXT "SMS code",IDC_STATIC,6,62,47,8 - EDITTEXT IDC_PW,60,60,119,12,ES_AUTOHSCROLL + EDITTEXT IDC_PW,60,60,20,12,ES_AUTOHSCROLL + EDITTEXT IDC_PW2,92,60,20,12,ES_AUTOHSCROLL PUSHBUTTON "Request code",IDC_BUTTON_REQUEST_CODE,13,80,81,18 PUSHBUTTON "Register code",IDC_BUTTON_REGISTER,98,80,81,18 CONTROL "Use SSL connection (443 port)",IDC_SSL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,108,173,10 + CTEXT "-",IDC_STATIC,82,62,8,8 END IDD_INPUTBOX DIALOGEX 0, 0, 300, 66 diff --git a/protocols/WhatsApp/src/dialogs.cpp b/protocols/WhatsApp/src/dialogs.cpp index a434493c04..9ac21dc690 100644 --- a/protocols/WhatsApp/src/dialogs.cpp +++ b/protocols/WhatsApp/src/dialogs.cpp @@ -13,7 +13,8 @@ INT_PTR CALLBACK WhatsAppAccountProc(HWND hwnd, UINT message, WPARAM wparam, LPA proto = reinterpret_cast(lparam); SetWindowLongPtr(hwnd, GWLP_USERDATA, lparam); - SendDlgItemMessage(hwnd, IDC_PW, EM_LIMITTEXT, 6, 0); + SendDlgItemMessage(hwnd, IDC_PW, EM_LIMITTEXT, 3, 0); + SendDlgItemMessage(hwnd, IDC_PW2, EM_LIMITTEXT, 3, 0); CheckDlgButton(hwnd, IDC_SSL, db_get_b(NULL, proto->ModuleName(), WHATSAPP_KEY_SSL, 0)); DBVARIANT dbv; @@ -33,12 +34,14 @@ INT_PTR CALLBACK WhatsAppAccountProc(HWND hwnd, UINT message, WPARAM wparam, LPA } EnableWindow(GetDlgItem(hwnd, IDC_PW), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_PW2), FALSE); if (!proto->isOffline()) { SendDlgItemMessage(hwnd, IDC_CC, EM_SETREADONLY, 1, 0); SendDlgItemMessage(hwnd, IDC_LOGIN, EM_SETREADONLY, 1, 0); SendDlgItemMessage(hwnd, IDC_NICK, EM_SETREADONLY, 1, 0); SendDlgItemMessage(hwnd, IDC_PW, EM_SETREADONLY, 1, 0); + SendDlgItemMessage(hwnd, IDC_PW2, EM_SETREADONLY, 1, 0); EnableWindow(GetDlgItem(hwnd, IDC_SSL), FALSE); } @@ -88,6 +91,7 @@ INT_PTR CALLBACK WhatsAppAccountProc(HWND hwnd, UINT message, WPARAM wparam, LPA case IDC_NICK: case IDC_SSL: case IDC_PW: + case IDC_PW2: SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0); } } diff --git a/protocols/WhatsApp/src/resource.h b/protocols/WhatsApp/src/resource.h index 41454c3199..c9872322c0 100644 --- a/protocols/WhatsApp/src/resource.h +++ b/protocols/WhatsApp/src/resource.h @@ -22,6 +22,7 @@ #define IDC_VALUE 1010 #define IDC_CANCEL 1011 #define IDC_OK 1012 +#define IDC_PW2 1013 #define IDC_TEXT 1014 // Next default values for new objects @@ -30,7 +31,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 105 #define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1019 +#define _APS_NEXT_CONTROL_VALUE 1015 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/protocols/WhatsApp/src/version.h b/protocols/WhatsApp/src/version.h index 46c9824af4..7586a6bc23 100644 --- a/protocols/WhatsApp/src/version.h +++ b/protocols/WhatsApp/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 1 #define __RELEASE_NUM 0 -#define __BUILD_NUM 2 +#define __BUILD_NUM 3 #include -- cgit v1.2.3