Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-26 15:23:48 +01:00
Code Issues Releases Wiki Activity

move function

Browse Source
This commit is contained in:
Paul Licameli
2017-07-15 11:59:55 -04:00
parent fa96dcffb9
commit 812fd2adea
3 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/toolbars/ToolBar.cpp
View File

@@ -834,31 +834,13 @@ void ToolBar::MakeAlternateImages(AButton &button, int idx,
void ToolBar::SetButtonToolTip
(AButton &button, const std::vector<wxString> &commands, const wxString &separator)
{
const auto project = GetActiveProject();
const auto commandManager = project ? project->GetCommandManager() : nullptr;
wxString result;
auto iter = commands.begin(), end = commands.end();
while (iter != end) {
result += *iter++;
if (iter != end) {
if (!iter->empty()) {
if (commandManager) {
auto keyStr = commandManager->GetKeyFromName(*iter);
// For DarkAudacity, only add '(shortcut-info)' if there is
// some, rather than as in that case in Audacity saying
// '(no key)'. More users will be confused by the Audacity
// way than helped by it.
if (!keyStr.empty()){
result += wxT(" ");
result += Internat::Parenthesize(KeyStringDisplay(keyStr, true));
}
}
}
++iter;
}
if (iter != end)
result += separator;
}
const auto project = GetActiveProject();
const auto commandManager =
project ? project->GetCommandManager() : nullptr;
if (commandManager)
result =
commandManager->DescribeCommandsAndShortcuts(commands, separator);
button.SetToolTip(result);
}