mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-30 04:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show all tools/quicktools in keyboard shortcuts dialog

Browse Source
This commit is contained in:
David Capello 2016-12-01 17:36:10 -03:00
parent 812e75f613
commit 6c8186c531
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/app/commands/cmd_keyboard_shortcuts.cpp
View File

@ -8,6 +8,7 @@
#include "config.h"
#endif
#include "app/app.h"
#include "app/app_menus.h"
#include "app/commands/command.h"
#include "app/context.h"
@ -15,6 +16,7 @@
#include "app/modules/gui.h"
#include "app/resource_finder.h"
#include "app/tools/tool.h"
#include "app/tools/tool_box.h"
#include "app/ui/app_menuitem.h"
#include "app/ui/keyboard_shortcuts.h"
#include "app/ui/search_entry.h"
@ -38,8 +40,9 @@
namespace app {
using namespace ui;
using namespace skin;
using namespace tools;
using namespace ui;
static int g_sep = 0;
@ -410,7 +413,13 @@ private:
// Load keyboard shortcuts
fillList(this->menus(), AppMenus::instance()->getRootMenu(), 0);
fillList(this->tools(), App::instance()->toolBox());
for (Key* key : *app::KeyboardShortcuts::instance()) {
if (key->type() == KeyType::Tool ||
key->type() == KeyType::Quicktool) {
continue;
}
std::string text = key->triggerString();
switch (key->keycontext()) {
case KeyContext::SelectionTool:
@ -437,16 +446,11 @@ private:
}
KeyItem* keyItem = new KeyItem(text, key, NULL, 0);
ListBox* listBox = NULL;
ListBox* listBox = nullptr;
switch (key->type()) {
case KeyType::Command:
listBox = this->commands();
break;
case KeyType::Tool:
case KeyType::Quicktool: {
listBox = this->tools();
break;
}
case KeyType::Action:
listBox = this->actions();
break;
@ -608,6 +612,23 @@ private:
}
}
void fillList(ListBox* listbox, ToolBox* toolbox) {
for (Tool* tool : *toolbox) {
std::string text = tool->getText();
Key* key = app::KeyboardShortcuts::instance()->tool(tool);
KeyItem* keyItem = new KeyItem(text, key, nullptr, 0);
m_allKeyItems.push_back(keyItem);
listbox->addChild(keyItem);
text += " (quick)";
key = app::KeyboardShortcuts::instance()->quicktool(tool);
keyItem = new KeyItem(text, key, nullptr, 0);
m_allKeyItems.push_back(keyItem);
listbox->addChild(keyItem);
}
}
std::vector<KeyItem*> m_allKeyItems;
bool m_searchChange;
};