From 7dcd1e659b4bd69b806e8aa9d8a112ef8a73d3e5 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Sun, 1 Sep 2013 17:46:03 +0000 Subject: - own toptoolbar support for tabsrmm git-svn-id: http://svn.miranda-ng.org/main/trunk@5894 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/src/CLCButton.cpp | 2 -- plugins/Clist_nicer/src/clui.cpp | 5 ----- plugins/TabSRMM/src/commonheaders.h | 1 + plugins/TabSRMM/src/globals.cpp | 21 +++++++++++++++++++++ plugins/TabSRMM/src/globals.h | 1 + 5 files changed, 23 insertions(+), 7 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_nicer/src/CLCButton.cpp b/plugins/Clist_nicer/src/CLCButton.cpp index e766f8b095..44762739e6 100644 --- a/plugins/Clist_nicer/src/CLCButton.cpp +++ b/plugins/Clist_nicer/src/CLCButton.cpp @@ -40,8 +40,6 @@ static BTNS[] = { IDC_TBSOUND, "CLN_sound", "CLN_soundsoff", LPGEN("Toggle sounds"), 0, 1, 0 }, { IDC_TBMINIMIZE, "CLN_minimize", NULL, LPGEN("Minimize contact list"), 1, 0, 0 }, { IDC_TBTOPSTATUS, "CLN_topstatus", NULL, LPGEN("Status menu"), 1, 0, 1 }, - { IDC_TABSRMMSLIST, "CLN_slist", NULL, LPGEN("tabSRMM session list"), 1, 0, 1 }, - { IDC_TABSRMMMENU, "CLN_menu", NULL, LPGEN("tabSRMM Menu"), 1, 0, 1 }, { IDC_TBSELECTVIEWMODE, "CLN_CLVM_select", NULL, LPGEN("Select view mode"), 1, 0, 1 }, { IDC_TBCONFIGUREVIEWMODE,"CLN_CLVM_options", NULL, LPGEN("Setup view modes"), 1, 0, 0 }, diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index 726a081f88..d809cfe0f3 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -1475,11 +1475,6 @@ skipbg: } return 0; - case IDC_TABSRMMSLIST: - case IDC_TABSRMMMENU: - if (ServiceExists("SRMsg_MOD/GetWindowFlags")) - CallService("SRMsg_MOD/Show_TrayMenu", 0, LOWORD(wParam) == IDC_TABSRMMSLIST ? 0 : 1); - return 0; case IDC_TBSOUND: cfg::dat.soundsOff = !cfg::dat.soundsOff; diff --git a/plugins/TabSRMM/src/commonheaders.h b/plugins/TabSRMM/src/commonheaders.h index 9392bbf7fa..403bde5359 100644 --- a/plugins/TabSRMM/src/commonheaders.h +++ b/plugins/TabSRMM/src/commonheaders.h @@ -86,6 +86,7 @@ #include #include #include +#include #include #include diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 3a4ece8828..48d35ce01b 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -309,6 +309,26 @@ void CGlobals::hookSystemEvents() HookEvent(ME_AV_MYAVATARCHANGED, ::MyAvatarChanged); } +int CGlobals::TopToolbarLoaded(WPARAM,LPARAM) +{ + TTBButton ttb = {0}; + ttb.cbSize = sizeof(ttb); + ttb.dwFlags = TTBBF_SHOWTOOLTIP | TTBBF_VISIBLE; + ttb.pszService = MS_TABMSG_TRAYSUPPORT; + ttb.name = "CLN_slist"; + ttb.pszTooltipUp = LPGEN("tabSRMM session list"); + ttb.hIconHandleUp = Skin_GetIcon("tabSRMM_sb_slist"); + TopToolbar_AddButton(&ttb); + + ttb.name = "CLN_menu"; + ttb.pszTooltipUp = LPGEN("tabSRMM Menu"); + ttb.lParamUp = ttb.lParamDown = 1; + ttb.hIconHandleUp = Skin_GetIcon("tabSRMM_container"); + TopToolbar_AddButton(&ttb); + + return 0; +} + /** * second part of the startup initialisation. All plugins are now fully loaded */ @@ -386,6 +406,7 @@ int CGlobals::ModulesLoaded(WPARAM wParam, LPARAM lParam) HookEvent(ME_MC_UNFORCESEND, MetaContactEvent); } HookEvent(ME_FONT_RELOAD, ::FontServiceFontsChanged); + HookEvent(ME_TTB_MODULELOADED, TopToolbarLoaded); return 0; } diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h index a45c18bac3..9e841f3eec 100644 --- a/plugins/TabSRMM/src/globals.h +++ b/plugins/TabSRMM/src/globals.h @@ -181,6 +181,7 @@ private: static int m_exLine; static bool m_exAllowContinue; private: + static int TopToolbarLoaded(WPARAM,LPARAM); static int ModulesLoaded(WPARAM wParam, LPARAM lParam); static int DBSettingChanged(WPARAM wParam, LPARAM lParam); static int DBContactDeleted(WPARAM wParam, LPARAM lParam); -- cgit v1.2.3