From e58823d961a630eb62e60d2ccb443761ba5f1704 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 14 Jun 2012 15:51:34 +0000 Subject: - all MS_CLIST_ADD*ITEM services replaced with Menu_Add*Item stubs. - massive cleanup of the menu-related code git-svn-id: http://svn.miranda-ng.org/main/trunk@410 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/clist/keyboard.cpp | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src/modules/clist/keyboard.cpp') diff --git a/src/modules/clist/keyboard.cpp b/src/modules/clist/keyboard.cpp index e02abed203..cb8a428f22 100644 --- a/src/modules/clist/keyboard.cpp +++ b/src/modules/clist/keyboard.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-2009 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +11,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -This program is distributed in the hope that it will be useful, +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -26,15 +26,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static INT_PTR hkHideShow(WPARAM, LPARAM) { - cli.pfnShowHide(0,0); + cli.pfnShowHide(0, 0); return 0; } /* -INT_PTR hkSearch(WPARAM wParam,LPARAM lParam) +INT_PTR hkSearch(WPARAM wParam, LPARAM lParam) { DBVARIANT dbv={0}; - if (!DBGetContactSettingString(NULL,"CList","SearchUrl",&dbv)) { - CallService(MS_UTILS_OPENURL,DBGetContactSettingByte(NULL,"CList","HKSearchNewWnd",0),(LPARAM)dbv.pszVal); + if (!DBGetContactSettingString(NULL, "CList", "SearchUrl", &dbv)) { + CallService(MS_UTILS_OPENURL, DBGetContactSettingByte(NULL, "CList", "HKSearchNewWnd", 0), (LPARAM)dbv.pszVal); DBFreeVariant(&dbv); } return 0; @@ -50,17 +50,17 @@ static INT_PTR hkRead(WPARAM, LPARAM) static INT_PTR hkOpts(WPARAM, LPARAM) { - CallService("Options/OptionsCommand",0, 0); + CallService("Options/OptionsCommand", 0, 0); return 0; } /* -static INT_PTR hkCloseMiranda(WPARAM wParam,LPARAM lParam) +static INT_PTR hkCloseMiranda(WPARAM wParam, LPARAM lParam) { CallService("CloseAction", 0, 0); return 0; } -INT_PTR hkRestoreStatus(WPARAM wParam,LPARAM lParam) +INT_PTR hkRestoreStatus(WPARAM wParam, LPARAM lParam) { int nStatus = DBGetContactSettingWord(NULL, "CList", "Status", ID_STATUS_OFFLINE); CallService(MS_CLIST_SETSTATUSMODE, nStatus, 0); @@ -77,12 +77,12 @@ int InitClistHotKeys(void) { HOTKEYDESC shk = {0}; - CreateServiceFunction("CLIST/HK/SHOWHIDE",hkHideShow); - CreateServiceFunction("CLIST/HK/Opts",hkOpts); - CreateServiceFunction("CLIST/HK/Read",hkRead); -// CreateServiceFunction("CLIST/HK/CloseMiranda",hkCloseMiranda); -// CreateServiceFunction("CLIST/HK/RestoreStatus",hkRestoreStatus); -// CreateServiceFunction("CLIST/HK/AllOffline",hkAllOffline); + CreateServiceFunction("CLIST/HK/SHOWHIDE", hkHideShow); + CreateServiceFunction("CLIST/HK/Opts", hkOpts); + CreateServiceFunction("CLIST/HK/Read", hkRead); +// CreateServiceFunction("CLIST/HK/CloseMiranda", hkCloseMiranda); +// CreateServiceFunction("CLIST/HK/RestoreStatus", hkRestoreStatus); +// CreateServiceFunction("CLIST/HK/AllOffline", hkAllOffline); shk.cbSize=sizeof(shk); shk.pszDescription="Show Hide Contact List"; @@ -90,42 +90,42 @@ int InitClistHotKeys(void) shk.pszSection="Main"; shk.pszService="CLIST/HK/SHOWHIDE"; shk.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'A'); - CallService(MS_HOTKEY_REGISTER,0,(LPARAM)&shk); + CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk); shk.pszDescription="Read Message"; shk.pszName="ReadMessage"; shk.pszSection="Main"; shk.pszService="CLIST/HK/Read"; shk.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'I'); - CallService(MS_HOTKEY_REGISTER,0,(LPARAM)&shk); + CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk); /* shk.pszDescription="Search in site"; shk.pszName="SearchInWeb"; shk.pszSection="Main"; shk.pszService="CLIST/HK/Search"; shk.DefHotKey=846; - CallService(MS_HOTKEY_REGISTER,0,(LPARAM)&shk); + CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk); */ shk.pszDescription = "Open Options Page"; shk.pszName = "ShowOptions"; shk.pszSection = "Main"; shk.pszService = "CLIST/HK/Opts"; shk.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'O') | HKF_MIRANDA_LOCAL; - CallService(MS_HOTKEY_REGISTER,0,(LPARAM)&shk); + CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk); shk.pszDescription = "Open Logging Options"; shk.pszName = "ShowLogOptions"; shk.pszSection = "Main"; shk.pszService = "Netlib/Log/Win"; shk.DefHotKey = 0; - CallService(MS_HOTKEY_REGISTER,0,(LPARAM)&shk); + CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk); shk.pszDescription="Open Find User Dialog"; shk.pszName="FindUsers"; shk.pszSection="Main"; shk.pszService="FindAdd/FindAddCommand"; shk.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'F') | HKF_MIRANDA_LOCAL; - CallService(MS_HOTKEY_REGISTER,0,(LPARAM)&shk); + CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk); /* shk.pszDescription="Close Miranda"; @@ -133,21 +133,21 @@ int InitClistHotKeys(void) shk.pszSection="Main"; shk.pszService="CLIST/HK/CloseMiranda"; shk.DefHotKey=0; - CallService(MS_HOTKEY_REGISTER,0,(LPARAM)&shk); + CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk); shk.pszDescription="Restore last status"; shk.pszName="RestoreLastStatus"; shk.pszSection="Status"; shk.pszService="CLIST/HK/RestoreStatus"; shk.DefHotKey=0; - CallService(MS_HOTKEY_REGISTER,0,(LPARAM)&shk); + CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk); shk.pszDescription="Set All Offline"; shk.pszName="AllOffline"; shk.pszSection="Status"; shk.pszService="CLIST/HK/AllOffline"; shk.DefHotKey=0; - CallService(MS_HOTKEY_REGISTER,0,(LPARAM)&shk); + CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&shk); */ return 0; } -- cgit v1.2.3