From 2f10a9e6cc4782d61f0f15bbff36209af922bd34 Mon Sep 17 00:00:00 2001 From: mataes2007 Date: Thu, 17 Nov 2011 18:10:43 +0000 Subject: =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B?= =?UTF-8?q?=20=D0=B8=20=D0=BF=D0=BE=D0=B4=D1=87=D0=B8=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@174 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb --- lastseen-mod/options.c | 138 +++++++------------------------------------------ 1 file changed, 18 insertions(+), 120 deletions(-) (limited to 'lastseen-mod/options.c') diff --git a/lastseen-mod/options.c b/lastseen-mod/options.c index d4fbda6..cf5ab01 100644 --- a/lastseen-mod/options.c +++ b/lastseen-mod/options.c @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. File name : $URL: http://svn.berlios.de/svnroot/repos/mgoodies/trunk/lastseen-mod/options.c $ Revision : $Rev: 1570 $ -Last change on : $Date: 2007-12-30 00:30:07 +0200 (Вс, 30 дек 2007) $ +Last change on : $Date: 2007-12-30 01:30:07 +0300 (Вс, 30 дек 2007) $ Last change by : $Author: y_b $ */ #include "seen.h" @@ -39,7 +39,7 @@ int CheckIfOnline(void); int ResetMissed(void); static BOOL (WINAPI *pfnEnableThemeDialogTexture)(HANDLE, DWORD) = 0; -BOOL CALLBACK OptsPopUpsDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) +INT_PTR CALLBACK OptsPopUpsDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) { DBVARIANT dbv; int i; @@ -184,7 +184,7 @@ BOOL CALLBACK OptsPopUpsDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) return 0; } -BOOL CALLBACK OptsSettingsDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) +INT_PTR CALLBACK OptsSettingsDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) { DBVARIANT dbv; char szstamp[256]; @@ -293,7 +293,7 @@ BOOL CALLBACK OptsSettingsDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam { char szout[2048]=""; wsprintf(szout,VARIABLE_LIST); - MessageBox(NULL,szout,"Last Seen Variables",MB_OK|MB_TOPMOST); + MessageBox(NULL,szout,Translate("Last Seen Variables"),MB_OK|MB_TOPMOST); } break; //case WM_COMMAND @@ -406,7 +406,7 @@ BOOL CALLBACK OptsSettingsDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam TreeView_GetItem(hwndTreeView, &tvItem); protocol = (char*)tvItem.lParam; if ((BOOL)(tvItem.state >> 12) -1) { - size = (size + strlen(protocol)+2) * sizeof(char); + size = (size + (int)_tcslen(protocol)+2) * sizeof(char); watchedProtocols = (char *)realloc(watchedProtocols, size); strcat(watchedProtocols, protocol); strcat(watchedProtocols, " "); @@ -472,117 +472,6 @@ BOOL CALLBACK OptsSettingsDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam return 0; } -long OptsSettingsDlg, OptsPopUpsDlg; - - BOOL CALLBACK OptTabDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch (msg) - { - case WM_INITDIALOG: - { - TCITEMA tci; - RECT theTabSpace; - RECT rcClient; - { - RECT rcTab, rcDlg; - HWND hwndTab = GetDlgItem(hwndDlg, IDC_OPTIONSTAB); - TabCtrl_GetItemRect(hwndTab,0,&rcTab); - TabCtrl_DeleteAllItems(hwndTab); - theTabSpace.top = rcTab.bottom; // the size of the tab - GetWindowRect(GetDlgItem(hwndDlg, IDC_OPTIONSTAB), &rcTab); - GetWindowRect(hwndDlg, &rcDlg); - theTabSpace.bottom = rcTab.bottom -rcTab.top -theTabSpace.top; - theTabSpace.top = rcTab.top -rcDlg.top +theTabSpace.top; - theTabSpace.left = rcTab.left - rcDlg.left; - theTabSpace.right = rcTab.right-rcTab.left; - } - tci.mask = TCIF_PARAM|TCIF_TEXT; - if (!OptsPopUpsDlg) OptsPopUpsDlg = (long)CreateDialog(hInstance,MAKEINTRESOURCE(IDD_POPUPS), hwndDlg, OptsPopUpsDlgProc); - if(pfnEnableThemeDialogTexture) { - if(OptsPopUpsDlg) - pfnEnableThemeDialogTexture((HANDLE)OptsPopUpsDlg, ETDT_ENABLETAB); - } - tci.lParam = OptsPopUpsDlg; - GetClientRect((HWND)tci.lParam,&rcClient); - tci.pszText = Translate("Popups"); - SendMessage(GetDlgItem(hwndDlg, IDC_OPTIONSTAB), TCM_INSERTITEMA, (WPARAM)0, (LPARAM)&tci); - MoveWindow((HWND)tci.lParam,theTabSpace.left+(theTabSpace.right-rcClient.right)/2, - theTabSpace.top+(theTabSpace.bottom-rcClient.bottom)/2, - rcClient.right,rcClient.bottom,1); - ShowWindow((HWND)tci.lParam, SW_HIDE); - - if (!OptsSettingsDlg) OptsSettingsDlg = (long)CreateDialog(hInstance,MAKEINTRESOURCE(IDD_SETTINGS), hwndDlg, OptsSettingsDlgProc); - if(pfnEnableThemeDialogTexture) { - if(OptsSettingsDlg) - pfnEnableThemeDialogTexture((HANDLE)OptsSettingsDlg, ETDT_ENABLETAB); - } - tci.lParam = OptsSettingsDlg; - tci.pszText = Translate("Settings"); - GetClientRect((HWND)tci.lParam,&rcClient); - SendMessage(GetDlgItem(hwndDlg, IDC_OPTIONSTAB), TCM_INSERTITEMA, (WPARAM)0, (LPARAM)&tci); - MoveWindow((HWND)tci.lParam,theTabSpace.left+(theTabSpace.right-rcClient.right)/2, - theTabSpace.top+(theTabSpace.bottom-rcClient.bottom)/2, - rcClient.right,rcClient.bottom,1); - ShowWindow((HWND)tci.lParam, SW_SHOW); - TabCtrl_SetCurSel(GetDlgItem(hwndDlg, IDC_OPTIONSTAB),0); - return TRUE; - } - case PSM_CHANGED: - SendMessage(GetParent(hwndDlg), PSM_CHANGED, (unsigned int)hwndDlg, 0); - break; - case WM_DESTROY: - OptsSettingsDlg = OptsPopUpsDlg = 0; - break; - case WM_NOTIFY: - { - switch(((LPNMHDR)lParam)->idFrom) { - case 0: { - BOOL CommandApply = FALSE; - if ( (CommandApply = lParam && ((LPNMHDR)lParam)->code == PSN_APPLY) || (lParam && ((LPNMHDR)lParam)->code == PSN_RESET) ) { -#ifdef _DEBUG - MessageBoxA(hwndDlg,CommandApply?"Apply":"Cancel","EventHapened",0); -#endif - if (CommandApply) { - SendMessage((HWND)OptsSettingsDlg, WM_NOTIFY, wParam, lParam); - SendMessage((HWND)OptsPopUpsDlg, WM_NOTIFY, wParam, lParam); - return TRUE; - } else { - } - } //if PSN_APPLY - } - break; - case IDC_OPTIONSTAB: - switch (((LPNMHDR)lParam)->code) - { - case TCN_SELCHANGING: - { - TCITEM tci; - tci.mask = TCIF_PARAM; - TabCtrl_GetItem(GetDlgItem(hwndDlg,IDC_OPTIONSTAB),TabCtrl_GetCurSel(GetDlgItem(hwndDlg,IDC_OPTIONSTAB)),&tci); - ShowWindow((HWND)tci.lParam,SW_HIDE); - } - break; - case TCN_SELCHANGE: - { - TCITEM tci; - short int t; - tci.mask = TCIF_PARAM; - t = TabCtrl_GetCurSel(GetDlgItem(hwndDlg,IDC_OPTIONSTAB)); - TabCtrl_GetItem(GetDlgItem(hwndDlg,IDC_OPTIONSTAB),t,&tci); - ShowWindow((HWND)tci.lParam,SW_SHOW); - } - break; - } - break; - } - }//end case(LPNMHDR)lParam)->idFrom - break; - } - return FALSE; -} - - - int OptionsInit(WPARAM wparam,LPARAM lparam) { OPTIONSDIALOGPAGE odp; @@ -597,12 +486,21 @@ int OptionsInit(WPARAM wparam,LPARAM lparam) ZeroMemory(&odp,sizeof(odp)); odp.cbSize=sizeof(odp); - odp.pszGroup=Translate("Plugins"); + odp.position = 100000000; odp.hInstance=hInstance; - odp.pszTemplate=MAKEINTRESOURCE(IDD_OPTIONS); - odp.pszTitle=Translate("Last seen"); - odp.pfnDlgProc=OptTabDlgProc; odp.flags=ODPF_BOLDGROUPS; + odp.pszTemplate=MAKEINTRESOURCE(IDD_SETTINGS); + odp.pszGroup="Services"; + odp.pszTitle="Last seen"; + odp.pfnDlgProc= OptsSettingsDlgProc; CallService(MS_OPT_ADDPAGE,wparam,(LPARAM)&odp); + if (ServiceExists(MS_POPUP_ADDPOPUP)) + { + odp.pszTemplate = MAKEINTRESOURCE(IDD_POPUPS); + odp.pszGroup = "PopUps"; + odp.pszTitle = "Last seen"; + odp.pfnDlgProc = OptsPopUpsDlgProc; + CallService(MS_OPT_ADDPAGE,wparam,(LPARAM)&odp); + } return 0; } -- cgit v1.2.3