From e0b1fbf35cc17f73de8049cb72494c95669a9195 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Thu, 12 Jul 2012 13:56:54 +0000 Subject: minor toptoolbar fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@925 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AddContactPlus/src/main.cpp | 3 +-- plugins/Alarms/src/alarms.cpp | 2 +- plugins/AutoShutdown/src/settingsdlg.cpp | 22 +++++++++++----------- plugins/BasicHistory/src/BasicHistory.cpp | 3 +-- plugins/Clist_modern/modern_toolbar.cpp | 6 +++--- plugins/Clist_nicer/SRC/CLCButton.cpp | 2 +- plugins/FavContacts/src/main.cpp | 3 +-- plugins/HistoryPlusPlus/historypp.dpr | 3 +-- plugins/ListeningTo/listeningto.cpp | 2 +- plugins/NotesAndReminders/main.cpp | 10 +++++----- plugins/RecentContacts/RecentContacts.cpp | 6 +++--- plugins/SimpleStatusMsg/main.cpp | 3 +-- plugins/StatusPlugins/StartupStatus/toolbars.cpp | 3 +-- plugins/Svc_crshdmp/crshdmp.cpp | 14 ++++---------- plugins/Svc_dbepp/main.cpp | 6 +++--- plugins/UserInfoEx/dlg_anniversarylist.cpp | 5 ++--- plugins/UserInfoEx/svc_reminder.cpp | 5 ++--- plugins/WhenWasIt/hooked_events.cpp | 4 ++-- plugins/WhoUsesMyFiles/wumfplug.c | 4 +--- 19 files changed, 45 insertions(+), 61 deletions(-) diff --git a/plugins/AddContactPlus/src/main.cpp b/plugins/AddContactPlus/src/main.cpp index de529836c9..e7916e6274 100644 --- a/plugins/AddContactPlus/src/main.cpp +++ b/plugins/AddContactPlus/src/main.cpp @@ -128,9 +128,8 @@ static int CreateButton(WPARAM, LPARAM) TTBButton tbb = {0}; tbb.cbSize = sizeof(tbb); tbb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; - tbb.name = "Add Contact"; tbb.pszService = MS_ADDCONTACTPLUS_SHOW; - tbb.pszTooltipUp = "Add Contact"; + tbb.name = tbb.pszTooltipUp = LPGEN("Add Contact"); tbb.hIconHandleUp = hIconLibItem; hToolBarItem = TopToolbar_AddButton(&tbb); return 0; diff --git a/plugins/Alarms/src/alarms.cpp b/plugins/Alarms/src/alarms.cpp index b139485105..987ab56dd0 100644 --- a/plugins/Alarms/src/alarms.cpp +++ b/plugins/Alarms/src/alarms.cpp @@ -205,7 +205,7 @@ static int InitTopToolbarButton(WPARAM wParam, LPARAM lParam) ttb.hIconDn = LoadIcon(hInst, MAKEINTRESOURCE(IDI_TBDN)); ttb.pszService = MODULE "/NewAlarm"; ttb.dwFlags = TTBBF_VISIBLE; - ttb.name = "Set Alarm"; + ttb.name = ttb.pszTooltipUp = LPGEN("Set Alarm"); hTopToolbarButton = TopToolbar_AddButton(&ttb); CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hTopToolbarButton, (LPARAM)TTBST_RELEASED); diff --git a/plugins/AutoShutdown/src/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp index 7c6ff90591..377882b3c1 100644 --- a/plugins/AutoShutdown/src/settingsdlg.cpp +++ b/plugins/AutoShutdown/src/settingsdlg.cpp @@ -407,20 +407,20 @@ static HANDLE hToolbarButton; static int ToolbarLoaded(WPARAM wParam,LPARAM lParam) { - TTBButton ttbb; - - ZeroMemory(&ttbb,sizeof(ttbb)); - ttbb.cbSize=sizeof(ttbb); + TTBButton ttbb = {0}; + ttbb.cbSize = sizeof(ttbb); /* toptoolbar offers icolib support */ - ttbb.hIconUp=(HICON)LoadImage(hInst,MAKEINTRESOURCE(IDI_ACTIVE),IMAGE_ICON,0,0,0); - ttbb.hIconDn=(HICON)LoadImage(hInst,MAKEINTRESOURCE(IDI_INACTIVE),IMAGE_ICON,0,0,0); - ttbb.pszService="AutoShutdown/MenuCommand"; - ttbb.dwFlags=TTBBF_VISIBLE|TTBBF_SHOWTOOLTIP; - ttbb.name=Translate("Start/Stop automatic shutdown"); + ttbb.hIconUp = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_ACTIVE), IMAGE_ICON, 0, 0, 0); + ttbb.hIconDn = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_INACTIVE), IMAGE_ICON, 0, 0, 0); + ttbb.pszService = "AutoShutdown/MenuCommand"; + ttbb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; + ttbb.name = LPGEN("Start/Stop automatic shutdown"); + ttbb.pszTooltipUp = LPGEN("Stop automatic shutdown"); + ttbb.pszTooltipDn = LPGEN("Start automatic shutdown"); hToolbarButton = TopToolbar_AddButton(&ttbb); - if(ttbb.hIconUp!=NULL) DestroyIcon(ttbb.hIconUp); - if(ttbb.hIconDn!=NULL) DestroyIcon(ttbb.hIconDn); + if(ttbb.hIconUp != NULL) DestroyIcon(ttbb.hIconUp); + if(ttbb.hIconDn != NULL) DestroyIcon(ttbb.hIconDn); return 0; } diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index 0499410ea5..38bea5701d 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -106,9 +106,8 @@ int ToolbarModuleLoaded(WPARAM wParam,LPARAM lParam) if(ServiceExists(MS_TTB_REMOVEBUTTON)) { TTBButton tbb = {0}; tbb.cbSize = sizeof(tbb); - tbb.name = LPGEN("Open History"); tbb.pszService = MS_HISTORY_SHOWCONTACTHISTORY; - tbb.pszTooltipUp = LPGEN("Open History"); + tbb.name = tbb.pszTooltipUp = LPGEN("Open History"); tbb.dwFlags = TTBBF_SHOWTOOLTIP; tbb.hIconHandleUp = LoadSkinnedIconHandle(SKINICON_OTHER_HISTORY); hToolbarButton = TopToolbar_AddButton(&tbb); diff --git a/plugins/Clist_modern/modern_toolbar.cpp b/plugins/Clist_modern/modern_toolbar.cpp index 5f26d88dbf..33776eacd3 100644 --- a/plugins/Clist_modern/modern_toolbar.cpp +++ b/plugins/Clist_modern/modern_toolbar.cpp @@ -62,10 +62,10 @@ static int Modern_InitButtons(WPARAM, LPARAM) for (int i=0; i < SIZEOF(BTNS); i++) { if (BTNS[i].pszButtonID) { - tbb.name = BTNS[i].pszButtonID; + tbb.name = LPGEN(BTNS[i].pszButtonID); tbb.pszService = BTNS[i].pszServiceName; - tbb.pszTooltipUp = BTNS[i].pszTooltipUp; - tbb.pszTooltipDn = BTNS[i].pszTooltipDn; + tbb.pszTooltipUp = LPGEN(BTNS[i].pszTooltipUp); + tbb.pszTooltipDn = LPGEN(BTNS[i].pszTooltipDn); char buf[255]; mir_snprintf(buf,SIZEOF(buf),"%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_dn"); diff --git a/plugins/Clist_nicer/SRC/CLCButton.cpp b/plugins/Clist_nicer/SRC/CLCButton.cpp index 3b4b46f545..1b917fea47 100644 --- a/plugins/Clist_nicer/SRC/CLCButton.cpp +++ b/plugins/Clist_nicer/SRC/CLCButton.cpp @@ -57,7 +57,7 @@ static int InitDefaultButtons(WPARAM, LPARAM) for (int i=0; i < SIZEOF(BTNS); i++ ) { g_index = i; if (BTNS[i].pszButtonID) { - tbb.pszTooltipUp = tbb.name = BTNS[i].pszButtonName; + tbb.pszTooltipUp = tbb.name = LPGEN(BTNS[i].pszButtonName); tbb.pszService = BTNS[i].pszButtonID; tbb.hIconHandleUp = Skin_GetIconHandle(BTNS[i].pszButtonID); if (BTNS[i].pszButtonDn) diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp index 5233df1d65..88e6912edf 100644 --- a/plugins/FavContacts/src/main.cpp +++ b/plugins/FavContacts/src/main.cpp @@ -125,8 +125,7 @@ int ProcessTBLoaded(WPARAM wParam, LPARAM lParam) { TTBButton button = {0}; button.cbSize = sizeof(button); - button.pszTooltipUp = button.pszTooltipUp = - button.name = LPGEN("Favourite Contacts"); + button.pszTooltipUp = button.name = LPGEN("Favourite Contacts"); button.pszService = MS_FAVCONTACTS_SHOWMENU; button.dwFlags = TTBBF_SHOWTOOLTIP | TTBBF_VISIBLE; button.hIconHandleUp = (HANDLE)g_icoFavourite; diff --git a/plugins/HistoryPlusPlus/historypp.dpr b/plugins/HistoryPlusPlus/historypp.dpr index adba99a1cb..105f212769 100644 --- a/plugins/HistoryPlusPlus/historypp.dpr +++ b/plugins/HistoryPlusPlus/historypp.dpr @@ -362,11 +362,10 @@ begin ttb.cbSize := SizeOf(ttb); ttb.hIconUp := hppIcons[HPP_ICON_GLOBALSEARCH].handle; - ttb.hIconDn := hppIcons[HPP_ICON_GLOBALSEARCH].handle; ttb.pszService := MS_HPP_SHOWGLOBALSEARCH; ttb.dwFlags := TTBBF_VISIBLE or TTBBF_SHOWTOOLTIP; - ttb.name := PAnsiChar(Translate('Global History Search')); + ttb.name := ttb.pszTooltipUp := PAnsiChar(Translate('Global History Search')); CallService(MS_TTB_ADDBUTTON,WPARAM(@ttb), 0); UnhookEvent(HookTTBLoaded); end; diff --git a/plugins/ListeningTo/listeningto.cpp b/plugins/ListeningTo/listeningto.cpp index 219c92c7e1..4506f05cb3 100644 --- a/plugins/ListeningTo/listeningto.cpp +++ b/plugins/ListeningTo/listeningto.cpp @@ -531,7 +531,7 @@ int TopToolBarLoaded(WPARAM wParam, LPARAM lParam) ttb.hIconHandleUp = hIcon1; ttb.pszService = MS_LISTENINGTO_TTB; ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP | (enabled ? TTBBF_PUSHED : 0); - ttb.name = "Enable/Disable sending Listening To info (to all protocols)"; + ttb.name = LPGEN("Enable/Disable sending Listening To info (to all protocols)"); ttb.pszTooltipDn = LPGEN("Disable ListeningTo (to all protocols)"); ttb.pszTooltipUp = LPGEN("Enable ListeningTo (to all protocols)"); hTTB = TopToolbar_AddButton(&ttb); diff --git a/plugins/NotesAndReminders/main.cpp b/plugins/NotesAndReminders/main.cpp index 010f7489aa..2165a8e49b 100644 --- a/plugins/NotesAndReminders/main.cpp +++ b/plugins/NotesAndReminders/main.cpp @@ -161,16 +161,16 @@ int OnTopToolBarInit(WPARAM w,LPARAM L) { TTBButton ttb = {0}; ttb.cbSize = sizeof(TTBButton); - ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP | TTBBF_ICONBYHANDLE; + ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; - ttb.hIconHandleUp = ttb.hIconHandleDn = hIconLibItem[14]; + ttb.hIconHandleUp = hIconLibItem[14]; ttb.pszService = MODULENAME"/MenuCommandAddNew"; - ttb.name = "Add New Note"; + ttb.name = ttb.pszTooltipUp = LPGEN("Add New Note"); TopToolbar_AddButton(&ttb); - ttb.hIconHandleUp = ttb.hIconHandleDn = hIconLibItem[15]; + ttb.hIconHandleUp = hIconLibItem[15]; ttb.pszService = MODULENAME"/MenuCommandNewReminder"; - ttb.name = "Add New Reminder"; + ttb.name = ttb.pszTooltipUp = LPGEN("Add New Reminder"); TopToolbar_AddButton(&ttb); UnhookEvent(hkTopToolbarInit); diff --git a/plugins/RecentContacts/RecentContacts.cpp b/plugins/RecentContacts/RecentContacts.cpp index 3cb20ec310..b15f068e3e 100644 --- a/plugins/RecentContacts/RecentContacts.cpp +++ b/plugins/RecentContacts/RecentContacts.cpp @@ -454,12 +454,12 @@ static int OnContactSettingChanged( WPARAM wParam, LPARAM lParam ) int Create_TopToolbarShowList(WPARAM wParam, LPARAM lParam) { - TTBButton ttbb = { 0 }; + TTBButton ttbb = {0}; ttbb.cbSize = sizeof(ttbb); - ttbb.hIconHandleDn = hIcon; + ttbb.hIconHandleUp = hIcon; ttbb.pszService = msLastUC_ShowList; ttbb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; - ttbb.name = msLastUC_ShowListName; + ttbb.name = ttbb.pszTooltipUp = LPGEN(msLastUC_ShowListName); hTopToolbarButtonShowList = TopToolbar_AddButton(&ttbb); return 0; } diff --git a/plugins/SimpleStatusMsg/main.cpp b/plugins/SimpleStatusMsg/main.cpp index 4ba8a8a6a0..04c710f75b 100644 --- a/plugins/SimpleStatusMsg/main.cpp +++ b/plugins/SimpleStatusMsg/main.cpp @@ -1603,8 +1603,7 @@ static int AddTopToolbarButton(WPARAM wParam, LPARAM lParam) ttbb.hIconHandleUp = GetIconHandle(IDI_CSMSG); ttbb.pszService = MS_SIMPLESTATUSMSG_SHOWDIALOGINT; ttbb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; - ttbb.name = LPGEN("Change Status Message"); - ttbb.pszTooltipUp = LPGEN("Change Status Message"); + ttbb.name = ttbb.pszTooltipUp = LPGEN("Change Status Message"); hTTBButton = TopToolbar_AddButton(&ttbb); ReleaseIconEx("csmsg"); diff --git a/plugins/StatusPlugins/StartupStatus/toolbars.cpp b/plugins/StatusPlugins/StartupStatus/toolbars.cpp index 989468cdb4..a7a13a6bc9 100644 --- a/plugins/StatusPlugins/StartupStatus/toolbars.cpp +++ b/plugins/StatusPlugins/StartupStatus/toolbars.cpp @@ -73,11 +73,10 @@ int CreateTopToolbarButtons(WPARAM wParam, LPARAM lParam) char profileName[128]; strncpy(profileName, dbv.pszVal, sizeof(profileName)-1); - ttb.name = profileName; ttb.hIconHandleDn = hTtbDown; ttb.hIconHandleUp = hTtbUp; ttb.wParamDown = ttb.wParamUp = i; - ttb.pszTooltipUp = profileName; + ttb.name = ttb.pszTooltipUp = LPGEN(profileName); HANDLE ttbAddResult = TopToolbar_AddButton(&ttb); if (ttbAddResult) { ttbButtons[ttbButtonCount] = ttbAddResult; diff --git a/plugins/Svc_crshdmp/crshdmp.cpp b/plugins/Svc_crshdmp/crshdmp.cpp index 3dd69dd022..067cb2f10e 100644 --- a/plugins/Svc_crshdmp/crshdmp.cpp +++ b/plugins/Svc_crshdmp/crshdmp.cpp @@ -207,41 +207,35 @@ int OptionsInit(WPARAM wParam, LPARAM) return 0; } - static int ToolbarModulesLoaded(WPARAM, LPARAM) { TTBButton tbb = {0}; tbb.cbSize = sizeof(TTBButton); - tbb.name = LPGEN("Version Information To Clipboard"); tbb.pszService = MS_CRASHDUMPER_STORETOCLIP; - tbb.pszTooltipUp = LPGEN("Version Information To Clipboard"); + tbb.name = tbb.pszTooltipUp = LPGEN("Version Information To Clipboard"); tbb.hIconHandleUp = GetIconHandle("storeToClip"); tbb.dwFlags = TTBBF_VISIBLE; TopToolbar_AddButton(&tbb); - tbb.name = LPGEN("Version Information To File"); tbb.pszService = MS_CRASHDUMPER_STORETOFILE; - tbb.pszTooltipUp = LPGEN("Version Information To File"); + tbb.name = tbb.pszTooltipUp = LPGEN("Version Information To File"); tbb.hIconHandleUp = GetIconHandle("storeToFile"); tbb.dwFlags = 0; TopToolbar_AddButton(&tbb); - tbb.name = LPGEN("Show Version Information"); tbb.pszService = MS_CRASHDUMPER_VIEWINFO; - tbb.pszTooltipUp = LPGEN("Show Version Information"); + tbb.name = tbb.pszTooltipUp = LPGEN("Show Version Information"); tbb.hIconHandleUp = GetIconHandle("showInfo"); TopToolbar_AddButton(&tbb); - tbb.name = LPGEN("Upload Version Information"); tbb.pszService = MS_CRASHDUMPER_UPLOAD; - tbb.pszTooltipUp = LPGEN("Upload Version Information"); + tbb.name = tbb.pszTooltipUp = LPGEN("Upload Version Information"); tbb.hIconHandleUp = GetIconHandle("uploadInfo"); TopToolbar_AddButton(&tbb); return 0; } - static int ModulesLoaded(WPARAM, LPARAM) { char temp[MAX_PATH]; diff --git a/plugins/Svc_dbepp/main.cpp b/plugins/Svc_dbepp/main.cpp index b10a7e79fd..591ba3f1a1 100644 --- a/plugins/Svc_dbepp/main.cpp +++ b/plugins/Svc_dbepp/main.cpp @@ -150,15 +150,15 @@ BOOL IsCP_UTF8(void) static int OnTTBLoaded(WPARAM wParam,LPARAM lParam) { TTBButton ttbb = {0}; - HICON ico = LoadIcon(hInst,MAKEINTRESOURCE(ICO_DBE_BUTT)); + HICON ico = LoadIcon(hInst, MAKEINTRESOURCE(ICO_DBE_BUTT)); UnhookEvent(hTTBHook); ttbb.cbSize = sizeof(ttbb); ttbb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; ttbb.pszService = "DBEditorpp/MenuCommand"; - ttbb.name = "Database Editor++"; + ttbb.name = LPGEN("Database Editor++"); ttbb.hIconUp = ico; - ttbb.pszTooltipUp = "Show DataBase Editor"; + ttbb.pszTooltipUp = LPGEN("Show DataBase Editor"); hTTBButt = TopToolbar_AddButton(&ttbb); return 0; } diff --git a/plugins/UserInfoEx/dlg_anniversarylist.cpp b/plugins/UserInfoEx/dlg_anniversarylist.cpp index 53bd90f0ef..1b0cd689da 100644 --- a/plugins/UserInfoEx/dlg_anniversarylist.cpp +++ b/plugins/UserInfoEx/dlg_anniversarylist.cpp @@ -1090,13 +1090,12 @@ INT_PTR DlgAnniversaryListShow(WPARAM wParam, LPARAM lParam) VOID DlgAnniversaryListOnTopToolBarLoaded() { - TTBButton ttb = { 0 }; + TTBButton ttb = {0}; ttb.cbSize = sizeof(ttb); ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; ttb.pszService = MS_USERINFO_REMINDER_LIST; ttb.hIconHandleUp = Skin_GetIconHandle(ICO_COMMON_ANNIVERSARY); - ttb.pszTooltipUp = LPGEN("Anniversary list"); - ttb.name = "Anniversary list"; + ttb.name = ttb.pszTooltipUp = LPGEN("Anniversary list"); TopToolbar_AddButton(&ttb); } diff --git a/plugins/UserInfoEx/svc_reminder.cpp b/plugins/UserInfoEx/svc_reminder.cpp index f5f42bc20c..f91ba47f33 100644 --- a/plugins/UserInfoEx/svc_reminder.cpp +++ b/plugins/UserInfoEx/svc_reminder.cpp @@ -904,13 +904,12 @@ static INT OnContactSettingChanged(HANDLE hContact, DBCONTACTWRITESETTING* pdbcw VOID SvcReminderOnTopToolBarLoaded() { - TTBButton ttb = { 0 }; + TTBButton ttb = {0}; ttb.cbSize = sizeof(ttb); ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; ttb.pszService = MS_USERINFO_REMINDER_CHECK; - ttb.name = "Check anniversaries"; - ttb.pszTooltipUp = LPGEN("Check anniversaries"); + ttb.name = ttb.pszTooltipUp = LPGEN("Check anniversaries"); ttb.hIconHandleUp = Skin_GetIconHandle(ICO_COMMON_BIRTHDAY); TopToolbar_AddButton(&ttb); } diff --git a/plugins/WhenWasIt/hooked_events.cpp b/plugins/WhenWasIt/hooked_events.cpp index e80c3e3258..2f970fca2b 100644 --- a/plugins/WhenWasIt/hooked_events.cpp +++ b/plugins/WhenWasIt/hooked_events.cpp @@ -178,8 +178,8 @@ int OnTopToolBarModuleLoaded(WPARAM wParam, LPARAM lParam) ttb.cbSize = sizeof(ttb); ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; ttb.pszService = MS_WWI_CHECK_BIRTHDAYS; - ttb.hIconUp = ttb.hIconDn = hiCheckMenu; - ttb.name = "Check for birthdays"; + ttb.hIconUp = hiCheckMenu; + ttb.name = ttb.pszTooltipUp = LPGEN("Check for birthdays"); TopToolbar_AddButton(&ttb); return 0; } diff --git a/plugins/WhoUsesMyFiles/wumfplug.c b/plugins/WhoUsesMyFiles/wumfplug.c index 8c54f36990..4307c8d86e 100644 --- a/plugins/WhoUsesMyFiles/wumfplug.c +++ b/plugins/WhoUsesMyFiles/wumfplug.c @@ -551,13 +551,11 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lpara int InitTopToolbar(WPARAM wparam,LPARAM lparam) { TTBButton ttb = { 0 }; - char buttonname[] = "WUMF: Show connections list"; ttb.cbSize = sizeof(ttb); ttb.hIconUp = LoadIcon(hInst, MAKEINTRESOURCE(IDB_DRIVE)); - ttb.hIconDn = ttb.hIconUp; ttb.pszService = MS_WUMF_CONNECTIONSSHOW; ttb.dwFlags = TTBBF_VISIBLE|TTBBF_SHOWTOOLTIP; - ttb.name = buttonname; + ttb.name = ttb.pszTooltipUp = LPGEN("Show connections list"); hWumfBut = TopToolbar_AddButton(&ttb); return 0; } -- cgit v1.2.3