From 9bad6cb2e2eec6489554baaf3662865e1c9ad073 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Wed, 27 Mar 2013 19:20:16 +0000 Subject: BuddyPounce: - options&dialog cosmetics - fully commented unused items (possible for future use) - options moved to "Message sessions" group patch from person git-svn-id: http://svn.miranda-ng.org/main/trunk@4219 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BuddyPounce/res/resource.rc | 50 ++++++++++++++++++------------------- plugins/BuddyPounce/src/dialog.cpp | 38 ++++++++++++++-------------- plugins/BuddyPounce/src/main.cpp | 2 +- plugins/BuddyPounce/src/resource.h | 4 +-- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/plugins/BuddyPounce/res/resource.rc b/plugins/BuddyPounce/res/resource.rc index d5e184b06c..47ea5417da 100644 --- a/plugins/BuddyPounce/res/resource.rc +++ b/plugins/BuddyPounce/res/resource.rc @@ -35,29 +35,30 @@ BEGIN EDITTEXT IDC_MESSAGE,7,18,243,59,ES_MULTILINE | ES_READONLY | WS_VSCROLL END -IDD_POUNCE DIALOG 0, 0, 314, 146 +IDD_POUNCE DIALOGEX 0, 0, 314, 146 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Buddy Pounce" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN EDITTEXT IDC_MESSAGE,8,15,161,60,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL - DEFPUSHBUTTON "OK",IDOK,72,129,21,14 - PUSHBUTTON "Cancel",IDCANCEL,106,129,33,14 + DEFPUSHBUTTON "OK",IDOK,64,129,25,14 + PUSHBUTTON "Cancel",IDCANCEL,93,129,42,14 GROUPBOX "The Message:",GRP_MSG,4,4,171,76 - PUSHBUTTON "Delete Pounce",IDC_DELETE,154,129,58,14 - PUSHBUTTON "Load default Settings",IDC_DEFAULT,230,129,78,14 + PUSHBUTTON "Delete Pounce",IDC_DELETE,140,129,80,14 + PUSHBUTTON "Load default Settings",IDC_DEFAULT,226,129,82,14 GROUPBOX "Setting Value",IDC_STATIC,4,83,171,43,WS_DISABLED LTEXT "Setting text...........",IDC_SETTINGMSG,8,92,144,8,NOT WS_VISIBLE | WS_TABSTOP EDITTEXT IDC_SETTINGNUMBER,16,106,42,12,ES_NUMBER | NOT WS_VISIBLE CONTROL "Spin2",IDC_SPIN,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | NOT WS_VISIBLE | WS_TABSTOP,47,106,11,12 - EDITTEXT IDC_SETTINGTEXT,16,106,153,12,ES_AUTOHSCROLL | NOT WS_VISIBLE - PUSHBUTTON "...",IDC_BUTTON,155,90,14,12,NOT WS_VISIBLE GROUPBOX "Settings",IDC_STATIC,179,35,129,91 LISTBOX IDC_SETTINGS,183,46,119,72,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP GROUPBOX "Contact To Send Pounce To",IDC_STATIC,179,4,129,28 COMBOBOX IDC_CONTACTS,183,15,119,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<< Simple",IDC_SIMPLE,8,129,50,14 LTEXT "",IDC_SETTINGMSG2,65,106,104,8,NOT WS_VISIBLE +// EDITTEXT IDC_SETTINGTEXT,16,106,153,12,ES_AUTOHSCROLL | NOT WS_VISIBLE +// PUSHBUTTON "...",IDC_BUTTON,155,90,14,12,NOT WS_VISIBLE + END IDD_POUNCE_SIMPLE DIALOG 0, 0, 186, 90 @@ -92,28 +93,27 @@ BEGIN CONTROL "Check1",IDC_CHECK10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,66,81,10 END -IDD_OPTIONS DIALOGEX 0, 0, 314, 240 +IDD_OPTIONS DIALOGEX 0, 0, 314, 249 STYLE DS_SETFONT | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - CONTROL "Use Advanced Dialog",IDC_USEADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,18,85,10 - EDITTEXT IDC_MESSAGE,15,81,157,60,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL - GROUPBOX "The Message: (Characters: )",GRP_MSG,13,71,165,76 - GROUPBOX "Setting Value",IDC_STATIC,13,150,165,43,WS_DISABLED - LTEXT "Setting text...........",IDC_SETTINGMSG,15,159,144,8,NOT WS_VISIBLE | WS_TABSTOP - EDITTEXT IDC_SETTINGNUMBER,20,164,42,12,ES_NUMBER | NOT WS_VISIBLE - CONTROL "Spin2",IDC_SPIN,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | NOT WS_VISIBLE | WS_TABSTOP,51,164,11,12 - EDITTEXT IDC_SETTINGTEXT,20,172,152,12,ES_AUTOHSCROLL | NOT WS_VISIBLE - PUSHBUTTON "...",IDC_BUTTON,159,156,14,12,NOT WS_VISIBLE - GROUPBOX "Settings",IDC_STATIC,183,71,118,122 - LISTBOX IDC_SETTINGS,187,82,109,103,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - LTEXT "",IDC_SETTINGMSG2,69,172,104,8,NOT WS_VISIBLE - GROUPBOX "Default Settings",IDC_STATIC,7,45,300,155 - CONTROL "Show Delivery Messages",IDC_SHOWDELIVERYMSGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,30,95,10 - LTEXT "These settings are also used when sending a ""Simple"" pounce",IDC_STATIC,13,56,198,8 + CONTROL "Use Advanced Dialog",IDC_USEADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,183,136,10 + EDITTEXT IDC_MESSAGE,17,48,279,56,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL + GROUPBOX "The Message: (Characters: )",GRP_MSG,13,36,288,71 + GROUPBOX "Setting Value",IDC_STATIC,136,108,165,70 + LTEXT "Setting text...........",IDC_SETTINGMSG,145,120,150,12,NOT WS_VISIBLE | WS_TABSTOP + EDITTEXT IDC_SETTINGNUMBER,153,135,42,12,ES_NUMBER | NOT WS_VISIBLE + CONTROL "Spin2",IDC_SPIN,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | NOT WS_VISIBLE | WS_TABSTOP,184,135,11,12 + LTEXT "",IDC_SETTINGMSG2,163,155,133,8,NOT WS_VISIBLE + GROUPBOX "Default Settings",IDC_STATIC,7,14,300,186 + CONTROL "Show Delivery Messages",IDC_SHOWDELIVERYMSGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,184,147,10 + LTEXT "These settings are also used when sending a ""Simple"" pounce",IDC_STATIC,13,25,283,8 + GROUPBOX "Settings",IDC_STATIC,13,108,118,70 + LISTBOX IDC_SETTINGS,17,118,109,55,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +// EDITTEXT IDC_SETTINGTEXT,20,172,152,12,ES_AUTOHSCROLL | NOT WS_VISIBLE //for send file +// PUSHBUTTON "...",IDC_BUTTON,159,156,14,12,NOT WS_VISIBLE //for send file END - ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp index db6f956dac..1f1aae170c 100644 --- a/plugins/BuddyPounce/src/dialog.cpp +++ b/plugins/BuddyPounce/src/dialog.cpp @@ -33,7 +33,7 @@ void populateContacts(HANDLE BPhContact,HWND hwnd2CB) void saveLastSetting(HANDLE hContact, HWND hwnd) { - TCHAR number[8], string[1024]; + TCHAR number[8];//, string[1024];//for sending file name switch (DBGetContactSettingByte(hContact, modname, "LastSetting", 2)) // nothing to do { case 0: // Send If My Status Is... @@ -60,10 +60,10 @@ void saveLastSetting(HANDLE hContact, HWND hwnd) DBWriteContactSettingByte(hContact, modname, "ConfirmTimeout", (BYTE)_ttoi(number)); break; - case 7: // send a file - GetDlgItemText(hwnd, IDC_SETTINGTEXT, string, 1024); - DBWriteContactSettingTString(hContact, modname, "FileToSend", string); - break; +// case 7: // send a file +// GetDlgItemText(hwnd, IDC_SETTINGTEXT, string, 1024); +// DBWriteContactSettingTString(hContact, modname, "FileToSend", string); +// break; } } @@ -71,10 +71,10 @@ void hideAll(HWND hwnd) { ShowWindow(GetDlgItem(hwnd, IDC_SETTINGMSG), SW_HIDE); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGMSG2), SW_HIDE); - ShowWindow(GetDlgItem(hwnd, IDC_BUTTON), SW_HIDE); +// ShowWindow(GetDlgItem(hwnd, IDC_BUTTON), SW_HIDE); ShowWindow(GetDlgItem(hwnd, IDC_SETTINGNUMBER), SW_HIDE); ShowWindow(GetDlgItem(hwnd, IDC_SPIN), SW_HIDE); - ShowWindow(GetDlgItem(hwnd, IDC_SETTINGTEXT), SW_HIDE); +// ShowWindow(GetDlgItem(hwnd, IDC_SETTINGTEXT), SW_HIDE); } void getDefaultMessage(HWND hwnd, UINT control, HANDLE hContact) @@ -406,12 +406,12 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l ShowWindow(GetDlgItem(hwnd, IDC_SPIN), SW_SHOW); break; - case 7: // send a file - ShowWindow(GetDlgItem(hwnd, IDC_SETTINGMSG), SW_SHOW); - SetDlgItemText(hwnd, IDC_SETTINGMSG, TranslateT("Send a file")); - ShowWindow(GetDlgItem(hwnd, IDC_BUTTON), SW_SHOW); - ShowWindow(GetDlgItem(hwnd, IDC_SETTINGTEXT), SW_SHOW); - break; +// case 7: // send a file +// ShowWindow(GetDlgItem(hwnd, IDC_SETTINGMSG), SW_SHOW); +// SetDlgItemText(hwnd, IDC_SETTINGMSG, TranslateT("Send a file")); +// ShowWindow(GetDlgItem(hwnd, IDC_BUTTON), SW_SHOW); +// ShowWindow(GetDlgItem(hwnd, IDC_SETTINGTEXT), SW_SHOW); +// break; } DBWriteContactSettingByte(wi->hContact, modname, "LastSetting", (BYTE)item); } @@ -542,12 +542,12 @@ INT_PTR CALLBACK BuddyPounceOptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, L ShowWindow(GetDlgItem(hwnd, IDC_SPIN), SW_SHOW); break; - case 7: // send a file - ShowWindow(GetDlgItem(hwnd, IDC_SETTINGMSG), SW_SHOW); - SetDlgItemText(hwnd, IDC_SETTINGMSG, TranslateT("Send a file")); - ShowWindow(GetDlgItem(hwnd, IDC_BUTTON), SW_SHOW); - ShowWindow(GetDlgItem(hwnd, IDC_SETTINGTEXT), SW_SHOW); - break; +// case 7: // send a file +// ShowWindow(GetDlgItem(hwnd, IDC_SETTINGMSG), SW_SHOW); +// SetDlgItemText(hwnd, IDC_SETTINGMSG, TranslateT("Send a file")); +// ShowWindow(GetDlgItem(hwnd, IDC_BUTTON), SW_SHOW); +// ShowWindow(GetDlgItem(hwnd, IDC_SETTINGTEXT), SW_SHOW); +// break; } DBWriteContactSettingByte(wi->hContact, modname, "LastSetting", (BYTE)item); } diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp index 111dbbc5d4..9e60608d2d 100644 --- a/plugins/BuddyPounce/src/main.cpp +++ b/plugins/BuddyPounce/src/main.cpp @@ -106,7 +106,7 @@ int BuddyPounceOptInit(WPARAM wParam, LPARAM lParam) odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); - odp.ptszGroup = LPGENT("Plugins"); + odp.ptszGroup = LPGENT("Message Sessions"); odp.ptszTitle = LPGENT("Buddy Pounce"); odp.pfnDlgProc = BuddyPounceOptionsDlgProc; Options_AddPage(wParam, &odp); diff --git a/plugins/BuddyPounce/src/resource.h b/plugins/BuddyPounce/src/resource.h index 6d9de9b857..fc32b059dc 100644 --- a/plugins/BuddyPounce/src/resource.h +++ b/plugins/BuddyPounce/src/resource.h @@ -49,8 +49,8 @@ #define IDC_SETTINGMSG 1061 #define IDC_SETTINGNUMBER 1066 #define IDC_SPIN 1067 -#define IDC_SETTINGTEXT 1068 -#define IDC_BUTTON 1069 +//#define IDC_SETTINGTEXT 1068 +//#define IDC_BUTTON 1069 #define IDC_SETTINGS 1075 #define IDC_CONTACTS 1076 #define IDC_ADVANCED 1078 -- cgit v1.2.3