diff options
| -rw-r--r-- | plugins/BossKeyPlus/src/BossKey.cpp | 6 | ||||
| -rw-r--r-- | plugins/Sessions/Src/Main.cpp | 16 | ||||
| -rw-r--r-- | plugins/UserInfoEx/dlg_anniversarylist.cpp | 4 | ||||
| -rw-r--r-- | plugins/UserInfoEx/svc_reminder.cpp | 4 | ||||
| -rw-r--r-- | plugins/WhenWasIt/icons.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/jabber_menu.cpp | 12 |
6 files changed, 21 insertions, 23 deletions
diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index b61d3f3624..be4221173b 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -687,9 +687,9 @@ static int ModernToolbarInit(WPARAM, LPARAM) // Modern toolbar support TTBButton button = {0};
button.cbSize = sizeof(button);
button.pszService = MS_BOSSKEY_HIDE;
- button.pszTooltipUp = button.pszTooltipDn = button.name = LPGEN("Hide Miranda IM");
- button.dwFlags = TTBBF_DISABLED|TTBBF_SHOWTOOLTIP;
- button.hIconHandleUp = button.hIconHandleDn = g_hIcon;
+ button.pszTooltipUp = button.name = LPGEN("Hide Miranda IM");
+ button.dwFlags = TTBBF_DISABLED | TTBBF_SHOWTOOLTIP;
+ button.hIconHandleUp = g_hIcon;
TopToolbar_AddButton(&button);
return 0;
}
diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp index da51bde5fe..53027ee6e3 100644 --- a/plugins/Sessions/Src/Main.cpp +++ b/plugins/Sessions/Src/Main.cpp @@ -859,23 +859,23 @@ static int CreateButtons(WPARAM wparam,LPARAM lparam) button.dwFlags = TTBBF_SHOWTOOLTIP | TTBBF_VISIBLE | TTBBF_ICONBYHANDLE;
button.pszService = MS_SESSIONS_OPENMANAGER;
- button.pszTooltipUp = button.pszTooltipUp = button.name = LPGEN("Open Sessions Manager");
- button.hIconHandleDn = button.hIconHandleUp = hibSessionsLoad;
+ button.pszTooltipUp = button.name = LPGEN("Open Sessions Manager");
+ button.hIconHandleUp = hibSessionsLoad;
TopToolbar_AddButton(&button);
button.pszService = MS_SESSIONS_SAVEUSERSESSION;
- button.pszTooltipUp = button.pszTooltipUp = button.name = LPGEN("Save Session");
- button.hIconHandleDn = button.hIconHandleUp = hibSessionsSave;
+ button.pszTooltipUp = button.name = LPGEN("Save Session");
+ button.hIconHandleUp = hibSessionsSave;
TopToolbar_AddButton(&button);
button.pszService = MS_SESSIONS_RESTORELASTSESSION;
- button.pszTooltipUp = button.pszTooltipUp = button.name = LPGEN("Restore Last Session");
- button.hIconHandleDn = button.hIconHandleUp = hibSessionsLoadLast;
+ button.pszTooltipUp = button.name = LPGEN("Restore Last Session");
+ button.hIconHandleUp = hibSessionsLoadLast;
TopToolbar_AddButton(&button);
button.pszService = MS_SESSIONS_SHOWFAVORITESMENU;
- button.pszTooltipUp = button.pszTooltipUp = button.name = LPGEN("Show Favorite Sessions Menu");
- button.hIconHandleDn = button.hIconHandleUp = hibChecked;
+ button.pszTooltipUp = button.name = LPGEN("Show Favorite Sessions Menu");
+ button.hIconHandleUp = hibChecked;
TopToolbar_AddButton(&button);
return 0;
}
diff --git a/plugins/UserInfoEx/dlg_anniversarylist.cpp b/plugins/UserInfoEx/dlg_anniversarylist.cpp index 827e4e7b78..539ba3bd6b 100644 --- a/plugins/UserInfoEx/dlg_anniversarylist.cpp +++ b/plugins/UserInfoEx/dlg_anniversarylist.cpp @@ -1094,8 +1094,8 @@ VOID DlgAnniversaryListOnTopToolBarLoaded() ttb.cbSize = sizeof(ttb);
ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP | TTBBF_ICONBYHANDLE;
ttb.pszService = MS_USERINFO_REMINDER_LIST;
- ttb.hIconHandleDn = ttb.hIconHandleUp = Skin_GetIconHandle(ICO_COMMON_ANNIVERSARY);
- ttb.pszTooltipDn = ttb.pszTooltipUp = LPGEN("Anniversary list");
+ ttb.hIconHandleUp = Skin_GetIconHandle(ICO_COMMON_ANNIVERSARY);
+ ttb.pszTooltipUp = LPGEN("Anniversary list");
ttb.name = "Anniversary list";
TopToolbar_AddButton(&ttb);
}
diff --git a/plugins/UserInfoEx/svc_reminder.cpp b/plugins/UserInfoEx/svc_reminder.cpp index e9a6658ad2..98f52f9c21 100644 --- a/plugins/UserInfoEx/svc_reminder.cpp +++ b/plugins/UserInfoEx/svc_reminder.cpp @@ -910,8 +910,8 @@ VOID SvcReminderOnTopToolBarLoaded() ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP | TTBBF_ICONBYHANDLE;
ttb.pszService = MS_USERINFO_REMINDER_CHECK;
ttb.name = "Check anniversaries";
- ttb.pszTooltipUp = ttb.pszTooltipDn = LPGEN("Check anniversaries");
- ttb.hIconHandleDn = ttb.hIconHandleUp = Skin_GetIconHandle(ICO_COMMON_BIRTHDAY);
+ ttb.pszTooltipUp = LPGEN("Check anniversaries");
+ ttb.hIconHandleUp = Skin_GetIconHandle(ICO_COMMON_BIRTHDAY);
TopToolbar_AddButton(&ttb);
}
diff --git a/plugins/WhenWasIt/icons.cpp b/plugins/WhenWasIt/icons.cpp index 805593ade4..0b24c21442 100644 --- a/plugins/WhenWasIt/icons.cpp +++ b/plugins/WhenWasIt/icons.cpp @@ -68,9 +68,7 @@ int LoadIcons() GetIcons();
if (ServiceExists(MS_EXTRAICON_REGISTER))
- {
hWWIExtraIcons = ExtraIcon_Register("WhenWasIt", Translate("WhenWasIt birthday reminder"), "MenuCheck", OnExtraIconListRebuild, OnExtraImageApply);
- }
return 0;
}
diff --git a/protocols/JabberG/jabber_menu.cpp b/protocols/JabberG/jabber_menu.cpp index cc5c18b9ae..8f2f5dafec 100644 --- a/protocols/JabberG/jabber_menu.cpp +++ b/protocols/JabberG/jabber_menu.cpp @@ -985,20 +985,20 @@ int g_OnToolbarInit(WPARAM, LPARAM) List_InsertPtr( &arServices, CreateServiceFunction("JABBER/*/Groupchat", g_ToolbarHandleJoinGroupchat ));
button.pszService = "JABBER/*/Groupchat";
- button.pszTooltipUp = button.pszTooltipUp = button.name = "Join conference";
- button.hIconHandleDn = button.hIconHandleUp = (HANDLE)g_GetIconHandle(IDI_GROUP);
+ button.pszTooltipUp = button.name = LPGEN("Join conference");
+ button.hIconHandleUp = g_GetIconHandle(IDI_GROUP);
TopToolbar_AddButton(&button);
List_InsertPtr( &arServices, CreateServiceFunction("JABBER/*/Bookmarks", g_ToolbarHandleBookmarks ));
button.pszService = "JABBER/*/Bookmarks";
- button.pszTooltipUp = button.pszTooltipUp = button.name = "Open bookmarks";
- button.hIconHandleDn = button.hIconHandleUp = (HANDLE)g_GetIconHandle(IDI_BOOKMARKS);
+ button.pszTooltipUp = button.name = LPGEN("Open bookmarks");
+ button.hIconHandleUp = g_GetIconHandle(IDI_BOOKMARKS);
TopToolbar_AddButton(&button);
List_InsertPtr( &arServices, CreateServiceFunction("JABBER/*/ServiceDiscovery", g_ToolbarHandleServiceDiscovery ));
button.pszService = "JABBER/*/ServiceDiscovery";
- button.pszTooltipUp = button.pszTooltipUp = button.name = "Service discovery";
- button.hIconHandleDn = button.hIconHandleUp = (HANDLE)g_GetIconHandle(IDI_SERVICE_DISCOVERY);
+ button.pszTooltipUp = button.name = LPGEN("Service discovery");
+ button.hIconHandleUp = g_GetIconHandle(IDI_SERVICE_DISCOVERY);
TopToolbar_AddButton(&button);
return 0;
}
|