From 30ab6ceb71842f003f649b3d62b89af010cf40d1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 20 Jun 2012 17:00:14 +0000 Subject: - direct call of MS_SKIN_ADDNEWSOUND replaced with Skin_AddSound() call; - obsolete structure SKINSOUNDDESC removed - dynamically translated hot keys; - checked correct LPGEN'ing of the sounds creation; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@500 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/container.cpp | 2 +- plugins/TabSRMM/src/generic_msghandlers.cpp | 2 +- plugins/TabSRMM/src/globals.cpp | 36 ++++++++++++++--------------- plugins/TabSRMM/src/msgdlgutils.cpp | 4 ++-- plugins/TabSRMM/src/typingnotify.cpp | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp index d10459da58..5181022eac 100644 --- a/plugins/TabSRMM/src/container.cpp +++ b/plugins/TabSRMM/src/container.cpp @@ -2202,7 +2202,7 @@ buttons_done: * hwnd: handle of a message dialog. * * returns the tab index (zero based), -1 if no tab is found (which SHOULD not - * really happen, but who knows... ;) ) + * really happen, but who knows... ;)) */ int TSAPI GetTabIndexFromHWND(HWND hwndTab, HWND hwnd) diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index b08957e938..d889bb2bca 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -1320,7 +1320,7 @@ HWND TSAPI DM_CreateClist(TWindowData *dat) HWND hwndClist = CreateWindowExA(0, "CListControl", "", WS_TABSTOP | WS_VISIBLE | WS_CHILD | 0x248, 184, 0, 30, 30, dat->hwnd, (HMENU)IDC_CLIST, g_hInst, NULL); - //MAD: fix for little bug, when following code didn't work (another hack :) ) + //MAD: fix for little bug, when following code didn't work (another hack :)) HANDLE hItem; SendMessage(hwndClist, WM_TIMER, 14, 0); // diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 07a4462386..a1c7d1033e 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -137,26 +137,26 @@ void CGlobals::reloadSystemStartup() HDC hScrnDC; DBVARIANT dbv = {0}; - m_WinVerMajor = WinVerMajor(); - m_WinVerMinor = WinVerMinor(); - m_bIsXP = IsWinVerXPPlus(); - m_bIsVista = IsWinVerVistaPlus(); - m_bIsWin7 = IsWinVer7Plus(); + m_WinVerMajor = WinVerMajor(); + m_WinVerMinor = WinVerMinor(); + m_bIsXP = IsWinVerXPPlus(); + m_bIsVista = IsWinVerVistaPlus(); + m_bIsWin7 = IsWinVer7Plus(); ::LoadTSButtonModule(); ::RegisterTabCtrlClass(); CTip::registerClass(); - dwThreadID = GetCurrentThreadId(); + dwThreadID = GetCurrentThreadId(); - PluginConfig.g_hMenuContext = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_TABCONTEXT)); + PluginConfig.g_hMenuContext = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_TABCONTEXT)); TranslateMenu(g_hMenuContext); - SkinAddNewSoundEx("RecvMsgActive", "Instant messages", "Incoming (Focused Window)"); - SkinAddNewSoundEx("RecvMsgInactive", "Instant messages", "Incoming (Unfocused Window)"); - SkinAddNewSoundEx("AlertMsg", "Instant messages", "Incoming (New Session)"); - SkinAddNewSoundEx("SendMsg", "Instant messages", "Outgoing"); - SkinAddNewSoundEx("SendError", "Instant messages", "Message send error"); + SkinAddNewSoundEx("RecvMsgActive", LPGEN("Instant messages"), LPGEN("Incoming (Focused Window)")); + SkinAddNewSoundEx("RecvMsgInactive", LPGEN("Instant messages"), LPGEN("Incoming (Unfocused Window)")); + SkinAddNewSoundEx("AlertMsg", LPGEN("Instant messages"), LPGEN("Incoming (New Session)")); + SkinAddNewSoundEx("SendMsg", LPGEN("Instant messages"), LPGEN("Outgoing")); + SkinAddNewSoundEx("SendError", LPGEN("Instant messages"), LPGEN("Message send error")); hCurSplitNS = LoadCursor(NULL, IDC_SIZENS); hCurSplitWE = LoadCursor(NULL, IDC_SIZEWE); @@ -348,16 +348,16 @@ void CGlobals::reloadSettings(bool fReloadSkins) */ void CGlobals::reloadAdv() { - g_bDisableAniAvatars= M->GetByte("adv_DisableAniAvatars", 0); - g_bSoundOnTyping = M->GetByte("adv_soundontyping", 0); - m_dontUseDefaultKbd= M->GetByte("adv_leaveKeyboardAlone", 1); - g_bClientInStatusBar = M->GetByte("adv_ClientIconInStatusBar", 0); + g_bDisableAniAvatars = M->GetByte("adv_DisableAniAvatars", 0); + g_bSoundOnTyping = M->GetByte("adv_soundontyping", 0); + m_dontUseDefaultKbd = M->GetByte("adv_leaveKeyboardAlone", 1); + g_bClientInStatusBar = M->GetByte("adv_ClientIconInStatusBar", 0); if(g_bSoundOnTyping && m_TypingSoundAdded == false) { - SkinAddNewSoundEx("SoundOnTyping", "Other", "TABSRMM: Typing"); + SkinAddNewSoundEx("SoundOnTyping", LPGEN("Other"), LPGEN("TABSRMM: Typing")); m_TypingSoundAdded = true; } - m_AllowOfflineMultisend = M->GetByte("AllowOfflineMultisend", 0); + m_AllowOfflineMultisend = M->GetByte("AllowOfflineMultisend", 0); } const HMENU CGlobals::getMenuBar() diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 770b415110..de5b221208 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -63,7 +63,7 @@ static int g_status_events[] = { }; static int g_status_events_size = 0; -#define MAX_REGS(_A_) ( sizeof(_A_) / sizeof(_A_[0]) ) +#define MAX_REGS(_A_) ( sizeof(_A_) / sizeof(_A_[0])) BOOL TSAPI IsStatusEvent(int eventType) { @@ -412,7 +412,7 @@ int TSAPI MsgWindowMenuHandler(TWindowData *dat, int selection, int menuId) case ID_TABMENU_LEAVECHATROOM: { if (dat && dat->bType == SESSIONTYPE_CHAT) { SESSION_INFO *si = (SESSION_INFO *)dat->si; - if ( (si != NULL) && (dat->hContact != NULL) ) { + if ( (si != NULL) && (dat->hContact != NULL)) { char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) dat->hContact, 0); if ( szProto ) CallProtoService( szProto, PS_LEAVECHAT, (WPARAM)dat->hContact, 0 ); diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp index 71b5138bd6..f57b381e3b 100644 --- a/plugins/TabSRMM/src/typingnotify.cpp +++ b/plugins/TabSRMM/src/typingnotify.cpp @@ -558,9 +558,9 @@ int TN_ModuleInit() mi.pszPopupName = LPGEN("PopUps"); hDisableMenu = Menu_AddMainMenuItem(&mi); } - SkinAddNewSoundEx("TNStart", "Instant messages", "Contact started typing"); - SkinAddNewSoundEx("TNStop", "Instant messages", "Contact stopped typing"); + SkinAddNewSoundEx("TNStart", LPGEN("Instant messages"), LPGEN("Contact started typing")); + SkinAddNewSoundEx("TNStop", LPGEN("Instant messages"), LPGEN("Contact stopped typing")); return 0; } -- cgit v1.2.3