From 81fe4a0a34e8e07305381e18e449246fef822673 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 18 Jun 2012 11:47:05 +0000 Subject: sync git-svn-id: http://svn.miranda-ng.org/main/trunk@469 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Chat/tools.c | 2 +- plugins/Chat/window.c | 6 +++--- plugins/Clist_modern/modern_clui.cpp | 4 ++-- plugins/Clist_mw/clui.cpp | 2 +- plugins/Clist_nicer/CLUIFrames/groupmenu.cpp | 2 +- plugins/Clist_nicer/SRC/clui.cpp | 2 +- plugins/ExternalAPI/m_toptoolbar.h | 18 +++++++++--------- plugins/Scriver/chat/window.c | 2 +- plugins/Scriver/input.c | 4 ++-- plugins/Scriver/msgdialog.c | 4 ++-- plugins/Scriver/msgwindow.c | 2 +- plugins/TabSRMM/chat/tools.cpp | 2 +- plugins/TabSRMM/chat/window.cpp | 4 ++-- plugins/TabSRMM/src/globals.cpp | 6 +++--- plugins/TabSRMM/src/msgdialog.cpp | 4 ++-- 15 files changed, 32 insertions(+), 32 deletions(-) (limited to 'plugins') diff --git a/plugins/Chat/tools.c b/plugins/Chat/tools.c index 6609a388a0..ef24f40a13 100644 --- a/plugins/Chat/tools.c +++ b/plugins/Chat/tools.c @@ -689,7 +689,7 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO HMENU hSubMenu = 0; *hMenu = GetSubMenu(g_hMenu, iIndex); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) *hMenu, 0); + TranslateMenu(*hMenu); gcmi.pszID = si->ptszID; gcmi.pszModule = si->pszModule; gcmi.pszUID = pszUID; diff --git a/plugins/Chat/window.c b/plugins/Chat/window.c index 2021496563..67052b2a35 100644 --- a/plugins/Chat/window.c +++ b/plugins/Chat/window.c @@ -607,7 +607,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, HMENU hSubMenu; hSubMenu = GetSubMenu(g_hMenu, 4); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0); + TranslateMenu(hSubMenu); SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM) & sel); EnableMenuItem(hSubMenu, ID_MESSAGE_UNDO, SendMessage(hwnd, EM_CANUNDO, 0,0)?MF_ENABLED:MF_GRAYED); @@ -2174,7 +2174,7 @@ LABEL_SHOWWINDOW: ClientToScreen(GetDlgItem(hwndDlg, IDC_TAB), &tci.pt); hSubMenu = GetSubMenu(g_hMenu, 5); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0); + TranslateMenu(hSubMenu); if (s) { WORD w = DBGetContactSettingWord(s->hContact, s->pszModule, "TabPosition", 0); if ( w == 0) @@ -2352,7 +2352,7 @@ LABEL_SHOWWINDOW: POINT pt; hSubMenu = GetSubMenu(g_hMenu, 2); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0); + TranslateMenu(hSubMenu); pt.x = (short) LOWORD(((ENLINK *) lParam)->lParam); pt.y = (short) HIWORD(((ENLINK *) lParam)->lParam); ClientToScreen(((NMHDR *) lParam)->hwndFrom, &pt); diff --git a/plugins/Clist_modern/modern_clui.cpp b/plugins/Clist_modern/modern_clui.cpp index 8830f119d6..914c0e240b 100644 --- a/plugins/Clist_modern/modern_clui.cpp +++ b/plugins/Clist_modern/modern_clui.cpp @@ -137,7 +137,7 @@ int CLUI::OnEvent_ContactMenuPreBuild(WPARAM wParam, LPARAM lParam) else { DBVARIANT dbv={0}; - if (ModernGetSettingString(hItem, "ContactPhoto", "File", &dbv)) + if (ModernGetSettingTString(hItem, "ContactPhoto", "File", &dbv)) { has_avatar = 0; } @@ -2264,7 +2264,7 @@ LRESULT CLUI::OnPaint( UINT msg, WPARAM wParam, LPARAM lParam ) LRESULT CLUI::OnCreate( UINT msg, WPARAM wParam, LPARAM lParam ) { - CallService(MS_LANGPACK_TRANSLATEMENU,(WPARAM)GetMenu(m_hWnd),0); + TranslateMenu(GetMenu(m_hWnd)); DrawMenuBar(m_hWnd); CLUIServices_ProtocolStatusChanged(0,0); diff --git a/plugins/Clist_mw/clui.cpp b/plugins/Clist_mw/clui.cpp index f8a820bca6..14079c2ac6 100644 --- a/plugins/Clist_mw/clui.cpp +++ b/plugins/Clist_mw/clui.cpp @@ -537,7 +537,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l switch (msg) { case WM_CREATE: - CallService(MS_LANGPACK_TRANSLATEMENU,(WPARAM)GetMenu(hwnd),0); + TranslateMenu(GetMenu(hwnd)); DrawMenuBar(hwnd); showOpts = DBGetContactSettingByte(NULL,"CLUI","SBarShow",1); diff --git a/plugins/Clist_nicer/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/CLUIFrames/groupmenu.cpp index 212b2be20e..a784e30883 100644 --- a/plugins/Clist_nicer/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_nicer/CLUIFrames/groupmenu.cpp @@ -145,7 +145,7 @@ INT_PTR GroupMenuonAddService(WPARAM wParam,LPARAM lParam) { } if (hAppearanceMenuItemProxy==(HANDLE)lParam) { hMenuOldContext = GetSubMenu(LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_CONTEXT)), 3); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hMenuOldContext, 0); + TranslateMenu(hMenuOldContext); CheckMenuItem(hMenuOldContext, POPUP_VISIBILITY, MF_BYCOMMAND | (cfg::dat.dwFlags & CLUI_SHOWVISI ? MF_CHECKED : MF_UNCHECKED)); CheckMenuItem(hMenuOldContext, POPUP_FRAME, MF_BYCOMMAND | (cfg::dat.dwFlags & CLUI_FRAME_CLISTSUNKEN ? MF_CHECKED : MF_UNCHECKED)); diff --git a/plugins/Clist_nicer/SRC/clui.cpp b/plugins/Clist_nicer/SRC/clui.cpp index efe6989d81..ed0c228011 100644 --- a/plugins/Clist_nicer/SRC/clui.cpp +++ b/plugins/Clist_nicer/SRC/clui.cpp @@ -908,7 +908,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l } transparentFocus = 1; - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) GetMenu(hwnd), 0); + TranslateMenu(GetMenu(hwnd)); PostMessage(hwnd, M_CREATECLC, 0, 0); return FALSE; } diff --git a/plugins/ExternalAPI/m_toptoolbar.h b/plugins/ExternalAPI/m_toptoolbar.h index f67a3f965b..c366c05169 100644 --- a/plugins/ExternalAPI/m_toptoolbar.h +++ b/plugins/ExternalAPI/m_toptoolbar.h @@ -1,23 +1,25 @@ - #ifndef M_TOPTOOLBAR_H #define M_TOPTOOLBAR_H //button flags #define TTBBF_DISABLED 1 -#define TTBBF_VISIBLE 2 +#define TTBBF_VISIBLE 2 #define TTBBF_PUSHED 4 #define TTBBF_SHOWTOOLTIP 8 #define TTBBF_DRAWBORDER 16 #define TTBBF_ISSEPARATOR 32 -#define TTBBF_ISLBUTTON 64 -#define TTBBF_ICONBYHANDLE 128 +#define TTBBF_ISLBUTTON 64 +#define TTBBF_ICONBYHANDLE 128 +#define TTBBF_ISSBUTTON 256 typedef struct { int cbSize; - char *pszServiceUp; - char *pszServiceDown; + char *pszService; DWORD dwFlags; - LPARAM lParamUp; + union { + LPARAM lParamUp; + TCHAR *program; + }; WPARAM wParamUp; LPARAM lParamDown; WPARAM wParamDown; @@ -30,8 +32,6 @@ typedef struct { HICON hIconDn; HANDLE hIconHandleDn; }; - char *tooltipUp; - char *tooltipDn; } TTBButton, * lpTTBButton; diff --git a/plugins/Scriver/chat/window.c b/plugins/Scriver/chat/window.c index cc49d7172c..a1a295e49d 100644 --- a/plugins/Scriver/chat/window.c +++ b/plugins/Scriver/chat/window.c @@ -2123,7 +2123,7 @@ LABEL_SHOWWINDOW: mii.dwTypeData = TranslateTS((toolbarButtons[i].name)); InsertMenuItem(hToolbarMenu, i, TRUE, &mii); } -// CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hToolbarMenu, 0); +// TranslateMenu(hToolbarMenu); pt.x = (short) LOWORD(GetMessagePos()); pt.y = (short) HIWORD(GetMessagePos()); i = TrackPopupMenu(hToolbarMenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL); diff --git a/plugins/Scriver/input.c b/plugins/Scriver/input.c index 8f61de3f8d..c941479b60 100644 --- a/plugins/Scriver/input.c +++ b/plugins/Scriver/input.c @@ -39,7 +39,7 @@ void InputAreaContextMenu(HWND hwnd, WPARAM wParam, LPARAM lParam, HANDLE hConta hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_CONTEXT)); hSubMenu = GetSubMenu(hMenu, 2); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0); + TranslateMenu(hSubMenu); SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM) & sel); if (sel.cpMin == sel.cpMax) { EnableMenuItem(hSubMenu, IDM_CUT, MF_BYCOMMAND | MF_GRAYED); @@ -409,7 +409,7 @@ BOOL HandleLinkClick(HINSTANCE hInstance, HWND hwndDlg, HWND hwndFocus, ENLINK * bOpenLink = FALSE; hMenu = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_CONTEXT)); hSubMenu = GetSubMenu(hMenu, 1); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0); + TranslateMenu(hSubMenu); pt.x = (short) LOWORD(((ENLINK *) lParam)->lParam); pt.y = (short) HIWORD(((ENLINK *) lParam)->lParam); ClientToScreen(((NMHDR *) lParam)->hwndFrom, &pt); diff --git a/plugins/Scriver/msgdialog.c b/plugins/Scriver/msgdialog.c index 8f17470549..a260fa2034 100644 --- a/plugins/Scriver/msgdialog.c +++ b/plugins/Scriver/msgdialog.c @@ -341,7 +341,7 @@ static LRESULT CALLBACK LogEditSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, CHARRANGE sel, all = { 0, -1 }; hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_CONTEXT)); hSubMenu = GetSubMenu(hMenu, 0); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0); + TranslateMenu(hSubMenu); SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM) & sel); if (sel.cpMin == sel.cpMax) EnableMenuItem(hSubMenu, IDM_COPY, MF_BYCOMMAND | MF_GRAYED); @@ -1036,7 +1036,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP mii.dwTypeData = TranslateTS((toolbarButtons[i].name)); InsertMenuItem(hToolbarMenu, i, TRUE, &mii); } -// CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hToolbarMenu, 0); +// TranslateMenu(hToolbarMenu); pt.x = (short) LOWORD(GetMessagePos()); pt.y = (short) HIWORD(GetMessagePos()); i = TrackPopupMenu(hToolbarMenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL); diff --git a/plugins/Scriver/msgwindow.c b/plugins/Scriver/msgwindow.c index cbbd0a3037..1bda12f9db 100644 --- a/plugins/Scriver/msgwindow.c +++ b/plugins/Scriver/msgwindow.c @@ -702,7 +702,7 @@ INT_PTR CALLBACK DlgProcParentWindow(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR MessageWindowTabData * mwtd = GetChildFromTab(dat->hwndTabs, tabId); hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_CONTEXT)); hSubMenu = GetSubMenu(hMenu, 3); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0); + TranslateMenu(hSubMenu); hUserMenu = (HMENU) SendMessage(mwtd->hwnd, DM_GETCONTEXTMENU, 0, 0); if (hUserMenu != NULL) { InsertMenu(hSubMenu, 0, MF_POPUP | MF_BYPOSITION, (UINT_PTR)hUserMenu, TranslateT("User Menu")); diff --git a/plugins/TabSRMM/chat/tools.cpp b/plugins/TabSRMM/chat/tools.cpp index 30aa3eba9e..3d8d54b381 100644 --- a/plugins/TabSRMM/chat/tools.cpp +++ b/plugins/TabSRMM/chat/tools.cpp @@ -943,7 +943,7 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO int pos; *hMenu = GetSubMenu(g_hMenu, iIndex); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) *hMenu, 0); + TranslateMenu(*hMenu); gcmi.pszID = si->ptszID; gcmi.pszModule = si->pszModule; gcmi.pszUID = pszUID; diff --git a/plugins/TabSRMM/chat/window.cpp b/plugins/TabSRMM/chat/window.cpp index eba669e62d..175dc95d35 100644 --- a/plugins/TabSRMM/chat/window.cpp +++ b/plugins/TabSRMM/chat/window.cpp @@ -616,7 +616,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, RemoveMenu(hSubMenu, 8, MF_BYPOSITION); RemoveMenu(hSubMenu, 4, MF_BYPOSITION); EnableMenuItem(hSubMenu, IDM_PASTEFORMATTED, MF_BYCOMMAND | ((mi && mi->bBold) ? MF_ENABLED : MF_GRAYED)); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0); + TranslateMenu(hSubMenu); SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM) & sel); if (sel.cpMin == sel.cpMax) { @@ -2944,7 +2944,7 @@ LABEL_SHOWWINDOW: POINT pt; hSubMenu = GetSubMenu(g_hMenu, 2); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0); + TranslateMenu(hSubMenu); pt.x = (short) LOWORD(((ENLINK *) lParam)->lParam); pt.y = (short) HIWORD(((ENLINK *) lParam)->lParam); ClientToScreen(((NMHDR *) lParam)->hwndFrom, &pt); diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index c924b06675..07a4462386 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -150,7 +150,7 @@ void CGlobals::reloadSystemStartup() dwThreadID = GetCurrentThreadId(); PluginConfig.g_hMenuContext = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_TABCONTEXT)); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM)g_hMenuContext, 0); + TranslateMenu(g_hMenuContext); SkinAddNewSoundEx("RecvMsgActive", "Instant messages", "Incoming (Focused Window)"); SkinAddNewSoundEx("RecvMsgInactive", "Instant messages", "Incoming (Unfocused Window)"); @@ -315,7 +315,7 @@ void CGlobals::reloadSettings(bool fReloadSkins) m_FlashOnMTN = M->GetByte(SRMSGMOD, SRMSGSET_SHOWTYPINGWINFLASH, SRMSGDEFSET_SHOWTYPINGWINFLASH); if(m_MenuBar == 0) { m_MenuBar = ::LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_MENUBAR)); - CallService(MS_LANGPACK_TRANSLATEMENU, WPARAM(m_MenuBar), 0); + TranslateMenu(m_MenuBar); } m_ipBackgroundGradient = M->GetDword(FONTMODULE, "ipfieldsbg", 0x62caff); @@ -364,7 +364,7 @@ const HMENU CGlobals::getMenuBar() { if(m_MenuBar == 0) { m_MenuBar = ::LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_MENUBAR)); - CallService(MS_LANGPACK_TRANSLATEMENU, WPARAM(m_MenuBar), 0); + TranslateMenu(m_MenuBar); } return(m_MenuBar); } diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 9d70e9079e..1116c4139e 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -135,7 +135,7 @@ static void ShowPopupMenu(TWindowData *dat, int idFrom, HWND hwndFrom, POINT pt) CheckMenuItem(hSubMenu, ID_EDITOR_SHOWMESSAGELENGTHINDICATOR, MF_BYCOMMAND | (PluginConfig.m_visualMessageSizeIndicator ? MF_CHECKED : MF_UNCHECKED)); EnableMenuItem(hSubMenu, ID_EDITOR_SHOWMESSAGELENGTHINDICATOR, MF_BYCOMMAND | (dat->pContainer->hwndStatus ? MF_ENABLED : MF_GRAYED)); } - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0); + TranslateMenu(hSubMenu); SendMessage(hwndFrom, EM_EXGETSEL, 0, (LPARAM) & sel); if (sel.cpMin == sel.cpMax) { EnableMenuItem(hSubMenu, IDM_COPY, MF_BYCOMMAND | MF_GRAYED); @@ -2320,7 +2320,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_CONTEXT)); hSubMenu = GetSubMenu(hMenu, 1); - CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0); + TranslateMenu(hSubMenu); pt.x = (short) LOWORD(((ENLINK *) lParam)->lParam); pt.y = (short) HIWORD(((ENLINK *) lParam)->lParam); ClientToScreen(((NMHDR *) lParam)->hwndFrom, &pt); -- cgit v1.2.3