From c2c418eafb367c365b8e347e8598b2d859cdea39 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 11 Dec 2016 21:01:31 +0300 Subject: fix for missing button text --- plugins/Scriver/src/msgs.cpp | 14 ++++++++++++++ src/core/stdmsg/src/msgs.cpp | 12 ++++++++++++ 2 files changed, 26 insertions(+) diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 0d6588ec67..a9c7dba2f0 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -433,6 +433,7 @@ int RegisterToolbarIcons(WPARAM, LPARAM) bbd.dwButtonID = IDOK; bbd.dwDefPos = 5; bbd.hIcon = IcoLib_GetIconHandle("scriver_SEND"); + bbd.pwszText = LPGENW("&OK"); bbd.pwszTooltip = LPGENW("Send message"); Srmm_AddButton(&bbd); @@ -440,6 +441,7 @@ int RegisterToolbarIcons(WPARAM, LPARAM) bbd.dwButtonID = IDC_QUOTE; bbd.dwDefPos = 10; bbd.hIcon = IcoLib_GetIconHandle("scriver_QUOTE"); + bbd.pwszText = LPGENW("&Quote"); bbd.pwszTooltip = LPGENW("Quote"); Srmm_AddButton(&bbd); @@ -447,18 +449,21 @@ int RegisterToolbarIcons(WPARAM, LPARAM) bbd.dwButtonID = IDC_ADD; bbd.dwDefPos = 20; bbd.hIcon = IcoLib_GetIconHandle("scriver_ADD"); + bbd.pwszText = LPGENW("&Add"); bbd.pwszTooltip = LPGENW("Add contact permanently to list"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_USERMENU; bbd.dwDefPos = 30; bbd.hIcon = Skin_GetIconHandle(SKINICON_OTHER_DOWNARROW); + bbd.pwszText = LPGENW("&User menu"); bbd.pwszTooltip = LPGENW("User menu"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_DETAILS; bbd.dwDefPos = 40; bbd.hIcon = IcoLib_GetIconHandle("scriver_USERDETAILS"); + bbd.pwszText = LPGENW("User &details"); bbd.pwszTooltip = LPGENW("View user's details"); Srmm_AddButton(&bbd); @@ -466,6 +471,7 @@ int RegisterToolbarIcons(WPARAM, LPARAM) bbd.dwButtonID = IDC_HISTORY; bbd.dwDefPos = 50; bbd.hIcon = IcoLib_GetIconHandle("scriver_HISTORY"); + bbd.pwszText = LPGENW("&History"); bbd.pwszTooltip = LPGENW("View user's history"); Srmm_AddButton(&bbd); @@ -474,30 +480,35 @@ int RegisterToolbarIcons(WPARAM, LPARAM) bbd.dwButtonID = IDC_CHAT_BOLD; bbd.dwDefPos = 10; bbd.hIcon = IcoLib_GetIconHandle("chat_bold"); + bbd.pwszText = LPGENW("&Bold"); bbd.pwszTooltip = LPGENW("Make the text bold (CTRL+B)"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_CHAT_ITALICS; bbd.dwDefPos = 15; bbd.hIcon = IcoLib_GetIconHandle("chat_italics"); + bbd.pwszText = LPGENW("&Italic"); bbd.pwszTooltip = LPGENW("Make the text italicized (CTRL+I)"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_CHAT_UNDERLINE; bbd.dwDefPos = 20; bbd.hIcon = IcoLib_GetIconHandle("chat_underline"); + bbd.pwszText = LPGENW("&Underline"); bbd.pwszTooltip = LPGENW("Make the text underlined (CTRL+U)"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_CHAT_COLOR; bbd.dwDefPos = 25; bbd.hIcon = IcoLib_GetIconHandle("chat_fgcol"); + bbd.pwszText = LPGENW("&Color"); bbd.pwszTooltip = LPGENW("Select a foreground color for the text (CTRL+K)"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_CHAT_BKGCOLOR; bbd.dwDefPos = 30; bbd.hIcon = IcoLib_GetIconHandle("chat_bkgcol"); + bbd.pwszText = LPGENW("&Background color"); bbd.pwszTooltip = LPGENW("Select a background color for the text"); Srmm_AddButton(&bbd); @@ -505,18 +516,21 @@ int RegisterToolbarIcons(WPARAM, LPARAM) bbd.dwButtonID = IDC_CHAT_CHANMGR; bbd.dwDefPos = 30; bbd.hIcon = IcoLib_GetIconHandle("chat_settings"); + bbd.pwszText = LPGENW("&Room settings"); bbd.pwszTooltip = LPGENW("Control this room (CTRL+O)"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_CHAT_SHOWNICKLIST; bbd.dwDefPos = 20; bbd.hIcon = IcoLib_GetIconHandle("chat_nicklist"); + bbd.pwszText = LPGENW("&Show/hide nick list"); bbd.pwszTooltip = LPGENW("Show/hide the nick list (CTRL+N)"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_CHAT_FILTER; bbd.dwDefPos = 10; bbd.hIcon = IcoLib_GetIconHandle("chat_filter"); + bbd.pwszText = LPGENW("&Filter"); bbd.pwszTooltip = LPGENW("Enable/disable the event filter (CTRL+F)"); Srmm_AddButton(&bbd); return 0; diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 9cc1c954cd..bc41df08d5 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -293,18 +293,21 @@ int RegisterToolbarIcons(WPARAM, LPARAM) bbd.dwButtonID = IDC_ADD; bbd.dwDefPos = 10; bbd.hIcon = Skin_GetIconHandle(SKINICON_OTHER_ADDCONTACT); + bbd.pwszText = LPGENW("&Add"); bbd.pwszTooltip = LPGENW("Add contact permanently to list"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_USERMENU; bbd.dwDefPos = 20; bbd.hIcon = Skin_GetIconHandle(SKINICON_OTHER_DOWNARROW); + bbd.pwszText = LPGENW("&User menu"); bbd.pwszTooltip = LPGENW("User menu"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_DETAILS; bbd.dwDefPos = 30; bbd.hIcon = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS); + bbd.pwszText = LPGENW("User &details"); bbd.pwszTooltip = LPGENW("View user's details"); Srmm_AddButton(&bbd); @@ -312,6 +315,7 @@ int RegisterToolbarIcons(WPARAM, LPARAM) bbd.dwButtonID = IDC_HISTORY; bbd.dwDefPos = 40; bbd.hIcon = Skin_GetIconHandle(SKINICON_OTHER_HISTORY); + bbd.pwszText = LPGENW("&History"); bbd.pwszTooltip = LPGENW("View user's history"); Srmm_AddButton(&bbd); @@ -320,30 +324,35 @@ int RegisterToolbarIcons(WPARAM, LPARAM) bbd.dwButtonID = IDC_BOLD; bbd.dwDefPos = 10; bbd.hIcon = GetIconHandle("bold"); + bbd.pwszText = LPGENW("&Bold"); bbd.pwszTooltip = LPGENW("Make the text bold (CTRL+B)"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_ITALICS; bbd.dwDefPos = 15; bbd.hIcon = GetIconHandle("italics"); + bbd.pwszText = LPGENW("&Italic"); bbd.pwszTooltip = LPGENW("Make the text italicized (CTRL+I)"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_UNDERLINE; bbd.dwDefPos = 20; bbd.hIcon = GetIconHandle("underline"); + bbd.pwszText = LPGENW("&Underline"); bbd.pwszTooltip = LPGENW("Make the text underlined (CTRL+U)"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_COLOR; bbd.dwDefPos = 25; bbd.hIcon = GetIconHandle("fgcol"); + bbd.pwszText = LPGENW("&Color"); bbd.pwszTooltip = LPGENW("Select a foreground color for the text (CTRL+K)"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_BKGCOLOR; bbd.dwDefPos = 30; bbd.hIcon = GetIconHandle("bkgcol"); + bbd.pwszText = LPGENW("&Background color"); bbd.pwszTooltip = LPGENW("Select a background color for the text"); Srmm_AddButton(&bbd); @@ -351,18 +360,21 @@ int RegisterToolbarIcons(WPARAM, LPARAM) bbd.dwButtonID = IDC_CHANMGR; bbd.dwDefPos = 30; bbd.hIcon = GetIconHandle("settings"); + bbd.pwszText = LPGENW("&Room settings"); bbd.pwszTooltip = LPGENW("Control this room (CTRL+O)"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_SHOWNICKLIST; bbd.dwDefPos = 20; bbd.hIcon = GetIconHandle("nicklist"); + bbd.pwszText = LPGENW("&Show/hide nick list"); bbd.pwszTooltip = LPGENW("Show/hide the nick list (CTRL+N)"); Srmm_AddButton(&bbd); bbd.dwButtonID = IDC_FILTER; bbd.dwDefPos = 10; bbd.hIcon = GetIconHandle("filter"); + bbd.pwszText = LPGENW("&Filter"); bbd.pwszTooltip = LPGENW("Enable/disable the event filter (CTRL+F)"); Srmm_AddButton(&bbd); return 0; -- cgit v1.2.3