mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Add hotkeys to the tooltip for toolbar items

Browse source 
Originally committed to SVN as r5538.
This commit is contained in:
Thomas Goyne 2011-08-17 05:32:27 +00:00
parent d3e7f02597
commit 319b454bb8
3 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/src/frame_main.cpp
View file

@ -254,7 +254,7 @@ void FrameMain::cmd_call(wxCommandEvent& event) {
void FrameMain::InitToolbar () { void FrameMain::InitToolbar () {
wxSystemOptions::SetOption("msw.remap", 0); wxSystemOptions::SetOption("msw.remap", 0);
toolbar::AttachToolbar(this, "main", context.get()); toolbar::AttachToolbar(this, "main", context.get(), "Default");
GetToolBar()->Realize(); GetToolBar()->Realize();
} }

3
aegisub/src/include/aegisub/toolbar.h
View file

@ -30,5 +30,6 @@ namespace toolbar {
/// @param frame Frame to attach the toolbar to /// @param frame Frame to attach the toolbar to
/// @param name Name of the toolbar /// @param name Name of the toolbar
/// @param context Project context /// @param context Project context
void AttachToolbar(wxFrame *frame, std::string const& name, agi::Context *context); /// @param hotkey Hotkey context for the tooltip
void AttachToolbar(wxFrame *frame, std::string const& name, agi::Context *context, std::string const& hotkey);
} }

29
aegisub/src/toolbar.cpp
View file

@ -20,9 +20,11 @@
#include "config.h" #include "config.h"
#include "include/aegisub/toolbar.h"
#include "command/command.h" #include "command/command.h"
#include "include/aegisub/context.h" #include "include/aegisub/context.h"
#include "include/aegisub/toolbar.h" #include "include/aegisub/hotkey.h"
#include "libresrc/libresrc.h" #include "libresrc/libresrc.h"
#include "main.h" #include "main.h"
@ -56,6 +58,8 @@ namespace {
agi::Context *context; agi::Context *context;
/// Commands for each of the buttons /// Commands for each of the buttons
std::vector<cmd::Command *> commands; std::vector<cmd::Command *> commands;
/// Hotkey context
std::string ht_context;
/// Listener for icon size change signal /// Listener for icon size change signal
agi::signal::Connection icon_size_slot; agi::signal::Connection icon_size_slot;
@ -126,7 +130,20 @@ namespace {
flags & cmd::COMMAND_TOGGLE ? wxITEM_CHECK : flags & cmd::COMMAND_TOGGLE ? wxITEM_CHECK :
wxITEM_NORMAL; wxITEM_NORMAL;
AddTool(TOOL_ID_BASE + commands.size(), command->StrMenu(), icon, command->StrHelp(), kind); wxString tooltip = command->StrHelp();
std::vector<std::string> hotkeys = hotkey::get_hotkey_strs(ht_context, command->name());
for (size_t i = 0; i < hotkeys.size(); ++i) {
if (i == 0)
tooltip += " (";
else
tooltip += "/";
tooltip += hotkeys[i];
}
if (hotkeys.size()) tooltip += ")";
AddTool(TOOL_ID_BASE + commands.size(), command->StrDisplay(), icon, tooltip, kind);
commands.push_back(command); commands.push_back(command);
needs_onidle = needs_onidle || flags != cmd::COMMAND_NORMAL; needs_onidle = needs_onidle || flags != cmd::COMMAND_NORMAL;
@ -141,11 +158,13 @@ namespace {
Realize(); Realize();
} }
public: public:
Toolbar(wxWindow *parent, std::string const& name, agi::Context *c) Toolbar(wxWindow *parent, std::string const& name, agi::Context *c, std::string const& ht_context)
: wxToolBar(parent, -1, wxDefaultPosition, wxDefaultSize, wxTB_FLAT | wxTB_HORIZONTAL) : wxToolBar(parent, -1, wxDefaultPosition, wxDefaultSize, wxTB_FLAT | wxTB_HORIZONTAL)
, name(name) , name(name)
, context(c) , context(c)
, ht_context(ht_context)
, icon_size_slot(OPT_SUB("App/Toolbar Icon Size", &Toolbar::OnIconSizeChanged, this)) , icon_size_slot(OPT_SUB("App/Toolbar Icon Size", &Toolbar::OnIconSizeChanged, this))
/// @todo bind to hotkey changed event when such a thing exists
{ {
Populate(); Populate();
Bind(wxEVT_COMMAND_TOOL_CLICKED, &Toolbar::OnClick, this); Bind(wxEVT_COMMAND_TOOL_CLICKED, &Toolbar::OnClick, this);
@ -154,7 +173,7 @@ namespace {
} }
namespace toolbar { namespace toolbar {
void AttachToolbar(wxFrame *frame, std::string const& name, agi::Context *c) { void AttachToolbar(wxFrame *frame, std::string const& name, agi::Context *c, std::string const& hotkey) {
frame->SetToolBar(new Toolbar(frame, name, c)); frame->SetToolBar(new Toolbar(frame, name, c, hotkey));
} }
} }