From 3aa29ef3d7220de7080eae79b4dc31ef99bb4015 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 8 Apr 2013 13:50:38 +0000 Subject: finger support option removed from tabSRMM git-svn-id: http://svn.miranda-ng.org/main/trunk@4388 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/globals.cpp | 1 - plugins/TabSRMM/src/globals.h | 1 - plugins/TabSRMM/src/modplus.cpp | 12 +----------- plugins/TabSRMM/src/msgdialog.cpp | 5 ----- plugins/TabSRMM/src/msgoptions_plus.cpp | 2 -- plugins/TabSRMM/src/translator.cpp | 1 - 6 files changed, 1 insertion(+), 21 deletions(-) (limited to 'plugins/TabSRMM') diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index cd45ba992f..67c4333121 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -302,7 +302,6 @@ 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); if (g_bSoundOnTyping && m_TypingSoundAdded == false) { SkinAddNewSoundEx("SoundOnTyping", LPGEN("Other"), LPGEN("TABSRMM: Typing")); diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h index 344c9ef134..6fb727ac6e 100644 --- a/plugins/TabSRMM/src/globals.h +++ b/plugins/TabSRMM/src/globals.h @@ -188,7 +188,6 @@ public: COLORREF m_ipBackgroundGradient; COLORREF m_ipBackgroundGradientHigh; COLORREF m_tbBackgroundHigh, m_tbBackgroundLow, m_fillColor, m_cRichBorders, m_genericTxtColor; - BYTE g_bClientInStatusBar; BYTE m_dontUseDefaultKbd; HANDLE hSvc[SERVICE_LAST]; HANDLE m_event_MsgWin, m_event_MsgPopup; diff --git a/plugins/TabSRMM/src/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp index aade81051f..bc8310eb7b 100644 --- a/plugins/TabSRMM/src/modplus.cpp +++ b/plugins/TabSRMM/src/modplus.cpp @@ -244,16 +244,6 @@ int ModPlus_Init(WPARAM wparam,LPARAM lparam) HookEvent(ME_MSG_BUTTONPRESSED, CustomButtonPressed); HookEvent(ME_MSG_TOOLBARLOADED, RegisterCustomButton); - if (PluginConfig.g_bClientInStatusBar&&ServiceExists(MS_MSG_ADDICON)) { - StatusIconData sid = {0}; - sid.cbSize = sizeof(sid); - sid.szModule = (char *)"tabmodplus"; - sid.flags = MBF_OWNERSTATE|MBF_HIDDEN; - sid.dwId = 1; - sid.szTooltip = 0; - sid.hIcon = sid.hIconDisabled = 0; - CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid); - } g_bStartup = 0; - return (0); + return 0; } diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index eafbe66f2c..1905ab5dcb 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -1594,9 +1594,6 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP dat->dwFlags &= ~MWF_INITMODE; TABSRMM_FireEvent(dat->hContact, hwndDlg, MSG_WINDOW_EVT_OPEN, 0); - if (PluginConfig.g_bClientInStatusBar) - ChangeClientIconInStatusBar(dat); - /* * show a popup if wanted... */ @@ -3415,8 +3412,6 @@ quote_from_last: GetClientIcon(dat); if (dat->hClientIcon && dat->Panel->isActive()) InvalidateRect(hwndDlg, NULL, TRUE); - if (PluginConfig.g_bClientInStatusBar) - ChangeClientIconInStatusBar(dat); return 0; case DM_UPDATEUIN: diff --git a/plugins/TabSRMM/src/msgoptions_plus.cpp b/plugins/TabSRMM/src/msgoptions_plus.cpp index bd6e613c51..7c505e0866 100644 --- a/plugins/TabSRMM/src/msgoptions_plus.cpp +++ b/plugins/TabSRMM/src/msgoptions_plus.cpp @@ -64,8 +64,6 @@ static void FillDialog(HWND hwndDlg) lvItems[i].handle = (LRESULT)TreeView_InsertItem(GetDlgItem(hwndDlg, IDC_PLUS_CHECKTREE), &tvi); } - PluginConfig.g_bClientInStatusBar = M->GetByte("adv_ClientIconInStatusBar", 0); - SendDlgItemMessage(hwndDlg, IDC_TIMEOUTSPIN, UDM_SETRANGE, 0, MAKELONG(300, SRMSGSET_MSGTIMEOUT_MIN / 1000)); SendDlgItemMessage(hwndDlg, IDC_TIMEOUTSPIN, UDM_SETPOS, 0, PluginConfig.m_MsgTimeout / 1000); diff --git a/plugins/TabSRMM/src/translator.cpp b/plugins/TabSRMM/src/translator.cpp index 990d688dec..0d42c72b4e 100644 --- a/plugins/TabSRMM/src/translator.cpp +++ b/plugins/TabSRMM/src/translator.cpp @@ -39,7 +39,6 @@ TOptionListGroup m_lvGroupsModPlus[] = { }; TOptionListItem m_lvItemsModPlus[] = { - 0, LPGENT("Show client icon in status bar (fingerprint plugin required)"), 0, LOI_TYPE_SETTING, (UINT_PTR)"adv_ClientIconInStatusBar", 0, 0, LPGENT("Show skinnable tooltip in chat (tipper plugin required)"), 1, LOI_TYPE_SETTING, (UINT_PTR)"adv_TipperTooltip", 0, 0, LPGENT("Enable typing sounds"), 0, LOI_TYPE_SETTING, (UINT_PTR)"adv_soundontyping", 0, 0, LPGENT("Disable animated GIF avatars (will not affect already open message windows)"), 0, LOI_TYPE_SETTING, (UINT_PTR)"adv_DisableAniAvatars", 0, -- cgit v1.2.3