mirror of https://github.com/aseprite/aseprite.git
Move app::Key to its own key.cpp file
This commit is contained in:
David Capello
parent
20b11a0fd3
commit
21ad78cdbb
|
|
@ -653,6 +653,7 @@ target_sources(app-lib PRIVATE
|
|||
ui/icon_button.cpp
|
||||
ui/incompat_file_window.cpp
|
||||
ui/input_chain.cpp
|
||||
ui/key.cpp
|
||||
ui/keyboard_shortcuts.cpp
|
||||
ui/layer_frame_comboboxes.cpp
|
||||
ui/main_menu_bar.cpp
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ private:
|
|||
|
||||
if (m_key && m_key->keycontext() != KeyContext::Any) {
|
||||
int w = m_headerItem->contextXPos() +
|
||||
font()->textLength(convertKeyContextToUserFriendlyString(m_key->keycontext()));
|
||||
font()->textLength(convert_keycontext_to_user_friendly_string(m_key->keycontext()));
|
||||
size.w = std::max(size.w, w);
|
||||
}
|
||||
|
||||
|
|
@ -317,7 +317,7 @@ private:
|
|||
|
||||
if (m_key && !m_key->shortcuts().empty()) {
|
||||
if (m_key->keycontext() != KeyContext::Any) {
|
||||
g->drawText(convertKeyContextToUserFriendlyString(m_key->keycontext()),
|
||||
g->drawText(convert_keycontext_to_user_friendly_string(m_key->keycontext()),
|
||||
fg,
|
||||
bg,
|
||||
gfx::Point(contextXPos, y));
|
||||
|
|
@ -595,7 +595,7 @@ private:
|
|||
case KeyContext::MoveTool:
|
||||
case KeyContext::FreehandTool:
|
||||
case KeyContext::ShapeTool:
|
||||
text = convertKeyContextToUserFriendlyString(key->keycontext()) + ": " + text;
|
||||
text = convert_keycontext_to_user_friendly_string(key->keycontext()) + ": " + text;
|
||||
break;
|
||||
}
|
||||
KeyItem* keyItem = new KeyItem(m_keys, m_menuKeys, text, key, nullptr, 0, &m_headerItem);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,593 @@
|
|||
// Aseprite
|
||||
// Copyright (C) 2018-2025 Igara Studio S.A.
|
||||
// Copyright (C) 2001-2018 David Capello
|
||||
//
|
||||
// This program is distributed under the terms of
|
||||
// the End-User License Agreement for Aseprite.
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "app/ui/key.h"
|
||||
|
||||
#include "app/commands/command.h"
|
||||
#include "app/i18n/strings.h"
|
||||
#include "app/tools/tool.h"
|
||||
#include "app/ui/keyboard_shortcuts.h"
|
||||
#include "ui/message.h"
|
||||
#include "ui/shortcut.h"
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#define I18N_KEY(a) app::Strings::keyboard_shortcuts_##a()
|
||||
|
||||
namespace {
|
||||
|
||||
struct KeyShortcutAction {
|
||||
const char* name;
|
||||
std::string userfriendly;
|
||||
app::KeyAction action;
|
||||
app::KeyContext context;
|
||||
};
|
||||
|
||||
std::vector<KeyShortcutAction> g_actions;
|
||||
|
||||
const std::vector<KeyShortcutAction>& actions()
|
||||
{
|
||||
if (g_actions.empty()) {
|
||||
g_actions = std::vector<KeyShortcutAction>{
|
||||
{ "CopySelection",
|
||||
I18N_KEY(copy_selection),
|
||||
app::KeyAction::CopySelection,
|
||||
app::KeyContext::TranslatingSelection },
|
||||
{ "SnapToGrid",
|
||||
I18N_KEY(snap_to_grid),
|
||||
app::KeyAction::SnapToGrid,
|
||||
app::KeyContext::TranslatingSelection },
|
||||
{ "LockAxis",
|
||||
I18N_KEY(lock_axis),
|
||||
app::KeyAction::LockAxis,
|
||||
app::KeyContext::TranslatingSelection },
|
||||
{ "FineControl",
|
||||
I18N_KEY(fine_translating),
|
||||
app::KeyAction::FineControl,
|
||||
app::KeyContext::TranslatingSelection },
|
||||
{ "MaintainAspectRatio",
|
||||
I18N_KEY(maintain_aspect_ratio),
|
||||
app::KeyAction::MaintainAspectRatio,
|
||||
app::KeyContext::ScalingSelection },
|
||||
{ "ScaleFromCenter",
|
||||
I18N_KEY(scale_from_center),
|
||||
app::KeyAction::ScaleFromCenter,
|
||||
app::KeyContext::ScalingSelection },
|
||||
{ "FineControl",
|
||||
I18N_KEY(fine_scaling),
|
||||
app::KeyAction::FineControl,
|
||||
app::KeyContext::ScalingSelection },
|
||||
{ "AngleSnap",
|
||||
I18N_KEY(angle_snap),
|
||||
app::KeyAction::AngleSnap,
|
||||
app::KeyContext::RotatingSelection },
|
||||
{ "AddSelection",
|
||||
I18N_KEY(add_selection),
|
||||
app::KeyAction::AddSelection,
|
||||
app::KeyContext::SelectionTool },
|
||||
{ "SubtractSelection",
|
||||
I18N_KEY(subtract_selection),
|
||||
app::KeyAction::SubtractSelection,
|
||||
app::KeyContext::SelectionTool },
|
||||
{ "IntersectSelection",
|
||||
I18N_KEY(intersect_selection),
|
||||
app::KeyAction::IntersectSelection,
|
||||
app::KeyContext::SelectionTool },
|
||||
{ "AutoSelectLayer",
|
||||
I18N_KEY(auto_select_layer),
|
||||
app::KeyAction::AutoSelectLayer,
|
||||
app::KeyContext::MoveTool },
|
||||
{ "StraightLineFromLastPoint",
|
||||
I18N_KEY(line_from_last_point),
|
||||
app::KeyAction::StraightLineFromLastPoint,
|
||||
app::KeyContext::FreehandTool },
|
||||
{ "AngleSnapFromLastPoint",
|
||||
I18N_KEY(angle_from_last_point),
|
||||
app::KeyAction::AngleSnapFromLastPoint,
|
||||
app::KeyContext::FreehandTool },
|
||||
{ "MoveOrigin",
|
||||
I18N_KEY(move_origin),
|
||||
app::KeyAction::MoveOrigin,
|
||||
app::KeyContext::ShapeTool },
|
||||
{ "SquareAspect",
|
||||
I18N_KEY(square_aspect),
|
||||
app::KeyAction::SquareAspect,
|
||||
app::KeyContext::ShapeTool },
|
||||
{ "DrawFromCenter",
|
||||
I18N_KEY(draw_from_center),
|
||||
app::KeyAction::DrawFromCenter,
|
||||
app::KeyContext::ShapeTool },
|
||||
{ "RotateShape",
|
||||
I18N_KEY(rotate_shape),
|
||||
app::KeyAction::RotateShape,
|
||||
app::KeyContext::ShapeTool },
|
||||
{ "LeftMouseButton",
|
||||
I18N_KEY(trigger_left_mouse_button),
|
||||
app::KeyAction::LeftMouseButton,
|
||||
app::KeyContext::Any },
|
||||
{ "RightMouseButton",
|
||||
I18N_KEY(trigger_right_mouse_button),
|
||||
app::KeyAction::RightMouseButton,
|
||||
app::KeyContext::Any }
|
||||
};
|
||||
}
|
||||
return g_actions;
|
||||
}
|
||||
|
||||
struct {
|
||||
const char* name;
|
||||
app::KeyContext context;
|
||||
} g_contexts[] = {
|
||||
{ "", app::KeyContext::Any },
|
||||
{ "Normal", app::KeyContext::Normal },
|
||||
{ "Selection", app::KeyContext::SelectionTool },
|
||||
{ "TranslatingSelection", app::KeyContext::TranslatingSelection },
|
||||
{ "ScalingSelection", app::KeyContext::ScalingSelection },
|
||||
{ "RotatingSelection", app::KeyContext::RotatingSelection },
|
||||
{ "MoveTool", app::KeyContext::MoveTool },
|
||||
{ "FreehandTool", app::KeyContext::FreehandTool },
|
||||
{ "ShapeTool", app::KeyContext::ShapeTool },
|
||||
{ "FramesSelection", app::KeyContext::FramesSelection },
|
||||
{ "Transformation", app::KeyContext::Transformation },
|
||||
{ NULL, app::KeyContext::Any }
|
||||
};
|
||||
|
||||
using Vec = app::DragVector;
|
||||
|
||||
struct KeyShortcutWheelAction {
|
||||
const char* name;
|
||||
const std::string userfriendly;
|
||||
Vec vector;
|
||||
};
|
||||
|
||||
std::vector<KeyShortcutWheelAction> g_wheel_actions;
|
||||
|
||||
const std::vector<KeyShortcutWheelAction>& wheel_actions()
|
||||
{
|
||||
if (g_wheel_actions.empty()) {
|
||||
g_wheel_actions = std::vector<KeyShortcutWheelAction>{
|
||||
{ "", "", Vec(0.0, 0.0) },
|
||||
{ "Zoom", I18N_KEY(zoom), Vec(8.0, 0.0) },
|
||||
{ "VScroll", I18N_KEY(scroll_vertically), Vec(4.0, 0.0) },
|
||||
{ "HScroll", I18N_KEY(scroll_horizontally), Vec(4.0, 0.0) },
|
||||
{ "FgColor", I18N_KEY(fg_color), Vec(8.0, 0.0) },
|
||||
{ "BgColor", I18N_KEY(bg_color), Vec(8.0, 0.0) },
|
||||
{ "FgTile", I18N_KEY(fg_tile), Vec(8.0, 0.0) },
|
||||
{ "BgTile", I18N_KEY(bg_tile), Vec(8.0, 0.0) },
|
||||
{ "Frame", I18N_KEY(change_frame), Vec(16.0, 0.0) },
|
||||
{ "BrushSize", I18N_KEY(change_brush_size), Vec(4.0, 0.0) },
|
||||
{ "BrushAngle", I18N_KEY(change_brush_angle), Vec(-4.0, 0.0) },
|
||||
{ "ToolSameGroup", I18N_KEY(change_tool_same_group), Vec(8.0, 0.0) },
|
||||
{ "ToolOtherGroup", I18N_KEY(change_tool), Vec(0.0, -8.0) },
|
||||
{ "Layer", I18N_KEY(change_layer), Vec(0.0, 8.0) },
|
||||
{ "InkType", I18N_KEY(change_ink_type), Vec(0.0, -16.0) },
|
||||
{ "InkOpacity", I18N_KEY(change_ink_opacity), Vec(0.0, 1.0) },
|
||||
{ "LayerOpacity", I18N_KEY(change_layer_opacity), Vec(0.0, 1.0) },
|
||||
{ "CelOpacity", I18N_KEY(change_cel_opacity), Vec(0.0, 1.0) },
|
||||
{ "Alpha", I18N_KEY(color_alpha), Vec(4.0, 0.0) },
|
||||
{ "HslHue", I18N_KEY(color_hsl_hue), Vec(1.0, 0.0) },
|
||||
{ "HslSaturation", I18N_KEY(color_hsl_saturation), Vec(4.0, 0.0) },
|
||||
{ "HslLightness", I18N_KEY(color_hsl_lightness), Vec(0.0, 4.0) },
|
||||
{ "HsvHue", I18N_KEY(color_hsv_hue), Vec(1.0, 0.0) },
|
||||
{ "HsvSaturation", I18N_KEY(color_hsv_saturation), Vec(4.0, 0.0) },
|
||||
{ "HsvValue", I18N_KEY(color_hsv_value), Vec(0.0, 4.0) }
|
||||
};
|
||||
}
|
||||
return g_wheel_actions;
|
||||
}
|
||||
|
||||
std::string get_user_friendly_string_for_keyaction(app::KeyAction action, app::KeyContext context)
|
||||
{
|
||||
for (const auto& a : actions()) {
|
||||
if (action == a.action && context == a.context)
|
||||
return a.userfriendly;
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
||||
std::string get_user_friendly_string_for_wheelaction(app::WheelAction wheelAction)
|
||||
{
|
||||
const int c = int(wheelAction);
|
||||
if (c >= int(app::WheelAction::First) && c <= int(app::WheelAction::Last))
|
||||
return wheel_actions()[c].userfriendly;
|
||||
return {};
|
||||
}
|
||||
|
||||
void erase_shortcut(app::KeySourceShortcutList& kvs,
|
||||
const app::KeySource source,
|
||||
const ui::Shortcut& shortcut)
|
||||
{
|
||||
for (auto it = kvs.begin(); it != kvs.end();) {
|
||||
auto& kv = *it;
|
||||
if (kv.first == source && kv.second == shortcut) {
|
||||
it = kvs.erase(it);
|
||||
}
|
||||
else
|
||||
++it;
|
||||
}
|
||||
}
|
||||
|
||||
void erase_shortcuts(app::KeySourceShortcutList& kvs, const app::KeySource source)
|
||||
{
|
||||
for (auto it = kvs.begin(); it != kvs.end();) {
|
||||
auto& kv = *it;
|
||||
if (kv.first == source) {
|
||||
it = kvs.erase(it);
|
||||
}
|
||||
else
|
||||
++it;
|
||||
}
|
||||
}
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
namespace base {
|
||||
|
||||
template<>
|
||||
app::KeyAction convert_to(const std::string& from)
|
||||
{
|
||||
for (const auto& a : actions()) {
|
||||
if (from == a.name)
|
||||
return a.action;
|
||||
}
|
||||
return app::KeyAction::None;
|
||||
}
|
||||
|
||||
template<>
|
||||
std::string convert_to(const app::KeyAction& from)
|
||||
{
|
||||
for (const auto& a : actions()) {
|
||||
if (from == a.action)
|
||||
return a.name;
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
||||
template<>
|
||||
app::WheelAction convert_to(const std::string& from)
|
||||
{
|
||||
for (int c = int(app::WheelAction::First); c <= int(app::WheelAction::Last); ++c) {
|
||||
if (from == wheel_actions()[c].name)
|
||||
return (app::WheelAction)c;
|
||||
}
|
||||
return app::WheelAction::None;
|
||||
}
|
||||
|
||||
template<>
|
||||
std::string convert_to(const app::WheelAction& from)
|
||||
{
|
||||
const int c = int(from);
|
||||
if (c >= int(app::WheelAction::First) && c <= int(app::WheelAction::Last))
|
||||
return wheel_actions()[c].name;
|
||||
return {};
|
||||
}
|
||||
|
||||
template<>
|
||||
app::KeyContext convert_to(const std::string& from)
|
||||
{
|
||||
for (int c = 0; g_contexts[c].name; ++c) {
|
||||
if (from == g_contexts[c].name)
|
||||
return g_contexts[c].context;
|
||||
}
|
||||
return app::KeyContext::Any;
|
||||
}
|
||||
|
||||
template<>
|
||||
std::string convert_to(const app::KeyContext& from)
|
||||
{
|
||||
for (int c = 0; g_contexts[c].name; ++c) {
|
||||
if (from == g_contexts[c].context)
|
||||
return g_contexts[c].name;
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
||||
} // namespace base
|
||||
|
||||
namespace app {
|
||||
|
||||
using namespace ui;
|
||||
|
||||
Key::Key(const Key& k)
|
||||
: m_type(k.m_type)
|
||||
, m_adds(k.m_adds)
|
||||
, m_dels(k.m_dels)
|
||||
, m_keycontext(k.m_keycontext)
|
||||
{
|
||||
switch (m_type) {
|
||||
case KeyType::Command:
|
||||
m_command = k.m_command;
|
||||
m_params = k.m_params;
|
||||
break;
|
||||
case KeyType::Tool:
|
||||
case KeyType::Quicktool: m_tool = k.m_tool; break;
|
||||
case KeyType::Action: m_action = k.m_action; break;
|
||||
case KeyType::WheelAction:
|
||||
m_action = k.m_action;
|
||||
m_wheelAction = k.m_wheelAction;
|
||||
break;
|
||||
case KeyType::DragAction:
|
||||
m_action = k.m_action;
|
||||
m_wheelAction = k.m_wheelAction;
|
||||
m_dragVector = k.m_dragVector;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Key::Key(Command* command, const Params& params, const KeyContext keyContext)
|
||||
: m_type(KeyType::Command)
|
||||
, m_keycontext(keyContext)
|
||||
, m_command(command)
|
||||
, m_params(params)
|
||||
{
|
||||
}
|
||||
|
||||
Key::Key(const KeyType type, tools::Tool* tool)
|
||||
: m_type(type)
|
||||
, m_keycontext(KeyContext::Any)
|
||||
, m_tool(tool)
|
||||
{
|
||||
}
|
||||
|
||||
Key::Key(const KeyAction action, const KeyContext keyContext)
|
||||
: m_type(KeyType::Action)
|
||||
, m_keycontext(keyContext)
|
||||
, m_action(action)
|
||||
{
|
||||
if (m_keycontext != KeyContext::Any)
|
||||
return;
|
||||
|
||||
// Automatic key context
|
||||
switch (action) {
|
||||
case KeyAction::None: m_keycontext = KeyContext::Any; break;
|
||||
case KeyAction::CopySelection:
|
||||
case KeyAction::SnapToGrid:
|
||||
case KeyAction::LockAxis:
|
||||
case KeyAction::FineControl: m_keycontext = KeyContext::TranslatingSelection; break;
|
||||
case KeyAction::AngleSnap: m_keycontext = KeyContext::RotatingSelection; break;
|
||||
case KeyAction::MaintainAspectRatio:
|
||||
case KeyAction::ScaleFromCenter: m_keycontext = KeyContext::ScalingSelection; break;
|
||||
case KeyAction::AddSelection:
|
||||
case KeyAction::SubtractSelection:
|
||||
case KeyAction::IntersectSelection: m_keycontext = KeyContext::SelectionTool; break;
|
||||
case KeyAction::AutoSelectLayer: m_keycontext = KeyContext::MoveTool; break;
|
||||
case KeyAction::StraightLineFromLastPoint:
|
||||
case KeyAction::AngleSnapFromLastPoint: m_keycontext = KeyContext::FreehandTool; break;
|
||||
case KeyAction::MoveOrigin:
|
||||
case KeyAction::SquareAspect:
|
||||
case KeyAction::DrawFromCenter:
|
||||
case KeyAction::RotateShape: m_keycontext = KeyContext::ShapeTool; break;
|
||||
case KeyAction::LeftMouseButton:
|
||||
case KeyAction::RightMouseButton: m_keycontext = KeyContext::Any; break;
|
||||
}
|
||||
}
|
||||
|
||||
Key::Key(const WheelAction wheelAction)
|
||||
: m_type(KeyType::WheelAction)
|
||||
, m_keycontext(KeyContext::MouseWheel)
|
||||
, m_action(KeyAction::None)
|
||||
, m_wheelAction(wheelAction)
|
||||
{
|
||||
}
|
||||
|
||||
// static
|
||||
KeyPtr Key::MakeDragAction(WheelAction dragAction)
|
||||
{
|
||||
KeyPtr k(new Key(dragAction));
|
||||
k->m_type = KeyType::DragAction;
|
||||
k->m_keycontext = KeyContext::Any;
|
||||
k->m_dragVector = wheel_actions()[(int)dragAction].vector;
|
||||
return k;
|
||||
}
|
||||
|
||||
const ui::Shortcuts& Key::shortcuts() const
|
||||
{
|
||||
if (!m_shortcuts) {
|
||||
m_shortcuts = std::make_unique<ui::Shortcuts>();
|
||||
|
||||
// Add default keys
|
||||
for (const auto& kv : m_adds) {
|
||||
if (kv.first == KeySource::Original)
|
||||
m_shortcuts->add(kv.second);
|
||||
}
|
||||
|
||||
// Delete/add extension-defined keys
|
||||
for (const auto& kv : m_dels) {
|
||||
if (kv.first == KeySource::ExtensionDefined)
|
||||
m_shortcuts->remove(kv.second);
|
||||
else {
|
||||
ASSERT(kv.first != KeySource::Original);
|
||||
}
|
||||
}
|
||||
for (const auto& kv : m_adds) {
|
||||
if (kv.first == KeySource::ExtensionDefined)
|
||||
m_shortcuts->add(kv.second);
|
||||
}
|
||||
|
||||
// Delete/add user-defined keys
|
||||
for (const auto& kv : m_dels) {
|
||||
if (kv.first == KeySource::UserDefined)
|
||||
m_shortcuts->remove(kv.second);
|
||||
}
|
||||
for (const auto& kv : m_adds) {
|
||||
if (kv.first == KeySource::UserDefined)
|
||||
m_shortcuts->add(kv.second);
|
||||
}
|
||||
}
|
||||
return *m_shortcuts;
|
||||
}
|
||||
|
||||
void Key::add(const ui::Shortcut& shortcut, const KeySource source, KeyboardShortcuts& globalKeys)
|
||||
{
|
||||
m_adds.emplace_back(source, shortcut);
|
||||
m_shortcuts.reset();
|
||||
|
||||
// Remove the shortcut from other commands
|
||||
if (source == KeySource::ExtensionDefined || source == KeySource::UserDefined) {
|
||||
erase_shortcut(m_dels, source, shortcut);
|
||||
|
||||
globalKeys.disableShortcut(shortcut, source, m_keycontext, this);
|
||||
}
|
||||
}
|
||||
|
||||
const ui::Shortcut* Key::isPressed(const Message* msg, const KeyContext keyContext) const
|
||||
{
|
||||
if (const auto* keyMsg = dynamic_cast<const KeyMessage*>(msg)) {
|
||||
for (const Shortcut& shortcut : shortcuts()) {
|
||||
if (shortcut.isPressed(keyMsg->modifiers(), keyMsg->scancode(), keyMsg->unicodeChar()) &&
|
||||
(m_keycontext == KeyContext::Any || match_key_context(m_keycontext, keyContext))) {
|
||||
return &shortcut;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (const auto* mouseMsg = dynamic_cast<const MouseMessage*>(msg)) {
|
||||
for (const Shortcut& shortcut : shortcuts()) {
|
||||
if ((shortcut.modifiers() == mouseMsg->modifiers()) &&
|
||||
(m_keycontext == KeyContext::Any ||
|
||||
// TODO we could have multiple mouse wheel key-context,
|
||||
// like "sprite editor" context, or "timeline" context,
|
||||
// etc.
|
||||
m_keycontext == KeyContext::MouseWheel)) {
|
||||
return &shortcut;
|
||||
}
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
const ui::Shortcut* Key::isPressed(const Message* msg) const
|
||||
{
|
||||
return isPressed(msg, KeyboardShortcuts::getCurrentKeyContext());
|
||||
}
|
||||
|
||||
bool Key::isPressed() const
|
||||
{
|
||||
const auto& ss = this->shortcuts();
|
||||
return std::any_of(ss.begin(), ss.end(), [](const Shortcut& shortcut) {
|
||||
return shortcut.isPressed();
|
||||
});
|
||||
}
|
||||
|
||||
bool Key::isLooselyPressed() const
|
||||
{
|
||||
const auto& ss = this->shortcuts();
|
||||
return std::any_of(ss.begin(), ss.end(), [](const Shortcut& shortcut) {
|
||||
return shortcut.isLooselyPressed();
|
||||
});
|
||||
}
|
||||
|
||||
bool Key::isCommandListed() const
|
||||
{
|
||||
return type() == KeyType::Command && command()->isListed(params());
|
||||
}
|
||||
|
||||
bool Key::hasShortcut(const ui::Shortcut& shortcut) const
|
||||
{
|
||||
return shortcuts().has(shortcut);
|
||||
}
|
||||
|
||||
bool Key::hasUserDefinedShortcuts() const
|
||||
{
|
||||
return std::any_of(m_adds.begin(), m_adds.end(), [](const auto& kv) {
|
||||
return (kv.first == KeySource::UserDefined);
|
||||
});
|
||||
}
|
||||
|
||||
void Key::disableShortcut(const ui::Shortcut& shortcut, const KeySource source)
|
||||
{
|
||||
// It doesn't make sense that the default keyboard shortcuts file
|
||||
// (gui.xml) removes some shortcut.
|
||||
ASSERT(source != KeySource::Original);
|
||||
|
||||
erase_shortcut(m_adds, source, shortcut);
|
||||
erase_shortcut(m_dels, source, shortcut);
|
||||
|
||||
m_dels.emplace_back(source, shortcut);
|
||||
m_shortcuts.reset();
|
||||
}
|
||||
|
||||
void Key::reset()
|
||||
{
|
||||
erase_shortcuts(m_adds, KeySource::UserDefined);
|
||||
erase_shortcuts(m_dels, KeySource::UserDefined);
|
||||
m_shortcuts.reset();
|
||||
}
|
||||
|
||||
void Key::copyOriginalToUser()
|
||||
{
|
||||
// Erase all user-defined keys
|
||||
erase_shortcuts(m_adds, KeySource::UserDefined);
|
||||
erase_shortcuts(m_dels, KeySource::UserDefined);
|
||||
|
||||
// Then copy all original & extension-defined keys as user-defined
|
||||
auto copy = m_adds;
|
||||
for (const auto& kv : copy)
|
||||
m_adds.emplace_back(KeySource::UserDefined, kv.second);
|
||||
m_shortcuts.reset();
|
||||
}
|
||||
|
||||
std::string Key::triggerString() const
|
||||
{
|
||||
switch (m_type) {
|
||||
case KeyType::Command: m_command->loadParams(m_params); return m_command->friendlyName();
|
||||
case KeyType::Tool:
|
||||
case KeyType::Quicktool: {
|
||||
std::string text = m_tool->getText();
|
||||
if (m_type == KeyType::Quicktool)
|
||||
text += " (quick)";
|
||||
return text;
|
||||
}
|
||||
case KeyType::Action: return get_user_friendly_string_for_keyaction(m_action, m_keycontext);
|
||||
case KeyType::WheelAction:
|
||||
case KeyType::DragAction: return get_user_friendly_string_for_wheelaction(m_wheelAction);
|
||||
}
|
||||
return "Unknown";
|
||||
}
|
||||
|
||||
void reset_key_tables_that_depends_on_language()
|
||||
{
|
||||
g_actions.clear();
|
||||
g_wheel_actions.clear();
|
||||
}
|
||||
|
||||
std::string key_tooltip(const char* str, const app::Key* key)
|
||||
{
|
||||
std::string res;
|
||||
if (str)
|
||||
res += str;
|
||||
if (key && !key->shortcuts().empty()) {
|
||||
res += " (";
|
||||
res += key->shortcuts().front().toString();
|
||||
res += ")";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
std::string convert_keycontext_to_user_friendly_string(const KeyContext keyctx)
|
||||
{
|
||||
switch (keyctx) {
|
||||
case KeyContext::Any: return {};
|
||||
case KeyContext::Normal: return I18N_KEY(key_context_normal);
|
||||
case KeyContext::SelectionTool: return I18N_KEY(key_context_selection);
|
||||
case KeyContext::TranslatingSelection: return I18N_KEY(key_context_translating_selection);
|
||||
case KeyContext::ScalingSelection: return I18N_KEY(key_context_scaling_selection);
|
||||
case KeyContext::RotatingSelection: return I18N_KEY(key_context_rotating_selection);
|
||||
case KeyContext::MoveTool: return I18N_KEY(key_context_move_tool);
|
||||
case KeyContext::FreehandTool: return I18N_KEY(key_context_freehand_tool);
|
||||
case KeyContext::ShapeTool: return I18N_KEY(key_context_shape_tool);
|
||||
case KeyContext::FramesSelection: return I18N_KEY(key_context_frames_selection);
|
||||
case KeyContext::Transformation: return I18N_KEY(key_context_transformation);
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
||||
} // namespace app
|
||||
|
|
@ -178,7 +178,13 @@ private:
|
|||
DragVector m_dragVector; // for KeyType::DragAction
|
||||
};
|
||||
|
||||
std::string convertKeyContextToUserFriendlyString(KeyContext keyContext);
|
||||
// Clears collection with strings that depends on the current
|
||||
// language, so they can be reconstructed when they are needed with a
|
||||
// new selected language.
|
||||
void reset_key_tables_that_depends_on_language();
|
||||
|
||||
std::string key_tooltip(const char* str, const Key* key);
|
||||
std::string convert_keycontext_to_user_friendly_string(KeyContext keyctx);
|
||||
|
||||
} // namespace app
|
||||
|
||||
|
|
@ -194,6 +200,11 @@ app::WheelAction convert_to(const std::string& from);
|
|||
template<>
|
||||
std::string convert_to(const app::WheelAction& from);
|
||||
|
||||
template<>
|
||||
app::KeyContext convert_to(const std::string& from);
|
||||
template<>
|
||||
std::string convert_to(const app::KeyContext& from);
|
||||
|
||||
} // namespace base
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -40,172 +40,10 @@
|
|||
|
||||
#define XML_KEYBOARD_FILE_VERSION "1"
|
||||
|
||||
#define I18N_KEY(a) app::Strings::keyboard_shortcuts_##a()
|
||||
|
||||
using namespace tinyxml2;
|
||||
|
||||
namespace {
|
||||
|
||||
struct KeyShortcutAction {
|
||||
const char* name;
|
||||
std::string userfriendly;
|
||||
app::KeyAction action;
|
||||
app::KeyContext context;
|
||||
};
|
||||
|
||||
static std::vector<KeyShortcutAction> g_actions;
|
||||
|
||||
static const std::vector<KeyShortcutAction>& actions()
|
||||
{
|
||||
if (g_actions.empty()) {
|
||||
g_actions = std::vector<KeyShortcutAction>{
|
||||
{ "CopySelection",
|
||||
I18N_KEY(copy_selection),
|
||||
app::KeyAction::CopySelection,
|
||||
app::KeyContext::TranslatingSelection },
|
||||
{ "SnapToGrid",
|
||||
I18N_KEY(snap_to_grid),
|
||||
app::KeyAction::SnapToGrid,
|
||||
app::KeyContext::TranslatingSelection },
|
||||
{ "LockAxis",
|
||||
I18N_KEY(lock_axis),
|
||||
app::KeyAction::LockAxis,
|
||||
app::KeyContext::TranslatingSelection },
|
||||
{ "FineControl",
|
||||
I18N_KEY(fine_translating),
|
||||
app::KeyAction::FineControl,
|
||||
app::KeyContext::TranslatingSelection },
|
||||
{ "MaintainAspectRatio",
|
||||
I18N_KEY(maintain_aspect_ratio),
|
||||
app::KeyAction::MaintainAspectRatio,
|
||||
app::KeyContext::ScalingSelection },
|
||||
{ "ScaleFromCenter",
|
||||
I18N_KEY(scale_from_center),
|
||||
app::KeyAction::ScaleFromCenter,
|
||||
app::KeyContext::ScalingSelection },
|
||||
{ "FineControl",
|
||||
I18N_KEY(fine_scaling),
|
||||
app::KeyAction::FineControl,
|
||||
app::KeyContext::ScalingSelection },
|
||||
{ "AngleSnap",
|
||||
I18N_KEY(angle_snap),
|
||||
app::KeyAction::AngleSnap,
|
||||
app::KeyContext::RotatingSelection },
|
||||
{ "AddSelection",
|
||||
I18N_KEY(add_selection),
|
||||
app::KeyAction::AddSelection,
|
||||
app::KeyContext::SelectionTool },
|
||||
{ "SubtractSelection",
|
||||
I18N_KEY(subtract_selection),
|
||||
app::KeyAction::SubtractSelection,
|
||||
app::KeyContext::SelectionTool },
|
||||
{ "IntersectSelection",
|
||||
I18N_KEY(intersect_selection),
|
||||
app::KeyAction::IntersectSelection,
|
||||
app::KeyContext::SelectionTool },
|
||||
{ "AutoSelectLayer",
|
||||
I18N_KEY(auto_select_layer),
|
||||
app::KeyAction::AutoSelectLayer,
|
||||
app::KeyContext::MoveTool },
|
||||
{ "StraightLineFromLastPoint",
|
||||
I18N_KEY(line_from_last_point),
|
||||
app::KeyAction::StraightLineFromLastPoint,
|
||||
app::KeyContext::FreehandTool },
|
||||
{ "AngleSnapFromLastPoint",
|
||||
I18N_KEY(angle_from_last_point),
|
||||
app::KeyAction::AngleSnapFromLastPoint,
|
||||
app::KeyContext::FreehandTool },
|
||||
{ "MoveOrigin",
|
||||
I18N_KEY(move_origin),
|
||||
app::KeyAction::MoveOrigin,
|
||||
app::KeyContext::ShapeTool },
|
||||
{ "SquareAspect",
|
||||
I18N_KEY(square_aspect),
|
||||
app::KeyAction::SquareAspect,
|
||||
app::KeyContext::ShapeTool },
|
||||
{ "DrawFromCenter",
|
||||
I18N_KEY(draw_from_center),
|
||||
app::KeyAction::DrawFromCenter,
|
||||
app::KeyContext::ShapeTool },
|
||||
{ "RotateShape",
|
||||
I18N_KEY(rotate_shape),
|
||||
app::KeyAction::RotateShape,
|
||||
app::KeyContext::ShapeTool },
|
||||
{ "LeftMouseButton",
|
||||
I18N_KEY(trigger_left_mouse_button),
|
||||
app::KeyAction::LeftMouseButton,
|
||||
app::KeyContext::Any },
|
||||
{ "RightMouseButton",
|
||||
I18N_KEY(trigger_right_mouse_button),
|
||||
app::KeyAction::RightMouseButton,
|
||||
app::KeyContext::Any }
|
||||
};
|
||||
}
|
||||
return g_actions;
|
||||
}
|
||||
|
||||
static struct {
|
||||
const char* name;
|
||||
app::KeyContext context;
|
||||
} g_contexts[] = {
|
||||
{ "", app::KeyContext::Any },
|
||||
{ "Normal", app::KeyContext::Normal },
|
||||
{ "Selection", app::KeyContext::SelectionTool },
|
||||
{ "TranslatingSelection", app::KeyContext::TranslatingSelection },
|
||||
{ "ScalingSelection", app::KeyContext::ScalingSelection },
|
||||
{ "RotatingSelection", app::KeyContext::RotatingSelection },
|
||||
{ "MoveTool", app::KeyContext::MoveTool },
|
||||
{ "FreehandTool", app::KeyContext::FreehandTool },
|
||||
{ "ShapeTool", app::KeyContext::ShapeTool },
|
||||
{ "FramesSelection", app::KeyContext::FramesSelection },
|
||||
{ "Transformation", app::KeyContext::Transformation },
|
||||
{ NULL, app::KeyContext::Any }
|
||||
};
|
||||
|
||||
using Vec = app::DragVector;
|
||||
|
||||
struct KeyShortcutWheelAction {
|
||||
const char* name;
|
||||
const std::string userfriendly;
|
||||
Vec vector;
|
||||
};
|
||||
|
||||
static std::vector<KeyShortcutWheelAction> g_wheel_actions;
|
||||
|
||||
static const std::vector<KeyShortcutWheelAction>& wheel_actions()
|
||||
{
|
||||
if (g_wheel_actions.empty()) {
|
||||
g_wheel_actions = std::vector<KeyShortcutWheelAction>{
|
||||
{ "", "", Vec(0.0, 0.0) },
|
||||
{ "Zoom", I18N_KEY(zoom), Vec(8.0, 0.0) },
|
||||
{ "VScroll", I18N_KEY(scroll_vertically), Vec(4.0, 0.0) },
|
||||
{ "HScroll", I18N_KEY(scroll_horizontally), Vec(4.0, 0.0) },
|
||||
{ "FgColor", I18N_KEY(fg_color), Vec(8.0, 0.0) },
|
||||
{ "BgColor", I18N_KEY(bg_color), Vec(8.0, 0.0) },
|
||||
{ "FgTile", I18N_KEY(fg_tile), Vec(8.0, 0.0) },
|
||||
{ "BgTile", I18N_KEY(bg_tile), Vec(8.0, 0.0) },
|
||||
{ "Frame", I18N_KEY(change_frame), Vec(16.0, 0.0) },
|
||||
{ "BrushSize", I18N_KEY(change_brush_size), Vec(4.0, 0.0) },
|
||||
{ "BrushAngle", I18N_KEY(change_brush_angle), Vec(-4.0, 0.0) },
|
||||
{ "ToolSameGroup", I18N_KEY(change_tool_same_group), Vec(8.0, 0.0) },
|
||||
{ "ToolOtherGroup", I18N_KEY(change_tool), Vec(0.0, -8.0) },
|
||||
{ "Layer", I18N_KEY(change_layer), Vec(0.0, 8.0) },
|
||||
{ "InkType", I18N_KEY(change_ink_type), Vec(0.0, -16.0) },
|
||||
{ "InkOpacity", I18N_KEY(change_ink_opacity), Vec(0.0, 1.0) },
|
||||
{ "LayerOpacity", I18N_KEY(change_layer_opacity), Vec(0.0, 1.0) },
|
||||
{ "CelOpacity", I18N_KEY(change_cel_opacity), Vec(0.0, 1.0) },
|
||||
{ "Alpha", I18N_KEY(color_alpha), Vec(4.0, 0.0) },
|
||||
{ "HslHue", I18N_KEY(color_hsl_hue), Vec(1.0, 0.0) },
|
||||
{ "HslSaturation", I18N_KEY(color_hsl_saturation), Vec(4.0, 0.0) },
|
||||
{ "HslLightness", I18N_KEY(color_hsl_lightness), Vec(0.0, 4.0) },
|
||||
{ "HsvHue", I18N_KEY(color_hsv_hue), Vec(1.0, 0.0) },
|
||||
{ "HsvSaturation", I18N_KEY(color_hsv_saturation), Vec(4.0, 0.0) },
|
||||
{ "HsvValue", I18N_KEY(color_hsv_value), Vec(0.0, 4.0) }
|
||||
};
|
||||
}
|
||||
return g_wheel_actions;
|
||||
}
|
||||
|
||||
const char* get_shortcut(XMLElement* elem)
|
||||
{
|
||||
const char* shortcut = NULL;
|
||||
|
|
@ -227,384 +65,12 @@ const char* get_shortcut(XMLElement* elem)
|
|||
return shortcut;
|
||||
}
|
||||
|
||||
std::string get_user_friendly_string_for_keyaction(app::KeyAction action, app::KeyContext context)
|
||||
{
|
||||
for (const auto& a : actions()) {
|
||||
if (action == a.action && context == a.context)
|
||||
return a.userfriendly;
|
||||
}
|
||||
return std::string();
|
||||
}
|
||||
|
||||
std::string get_user_friendly_string_for_wheelaction(app::WheelAction wheelAction)
|
||||
{
|
||||
int c = int(wheelAction);
|
||||
if (c >= int(app::WheelAction::First) && c <= int(app::WheelAction::Last)) {
|
||||
return wheel_actions()[c].userfriendly;
|
||||
}
|
||||
else
|
||||
return std::string();
|
||||
}
|
||||
|
||||
void erase_shortcut(app::KeySourceShortcutList& kvs,
|
||||
const app::KeySource source,
|
||||
const ui::Shortcut& shortcut)
|
||||
{
|
||||
for (auto it = kvs.begin(); it != kvs.end();) {
|
||||
auto& kv = *it;
|
||||
if (kv.first == source && kv.second == shortcut) {
|
||||
it = kvs.erase(it);
|
||||
}
|
||||
else
|
||||
++it;
|
||||
}
|
||||
}
|
||||
|
||||
void erase_shortcuts(app::KeySourceShortcutList& kvs, const app::KeySource source)
|
||||
{
|
||||
for (auto it = kvs.begin(); it != kvs.end();) {
|
||||
auto& kv = *it;
|
||||
if (kv.first == source) {
|
||||
it = kvs.erase(it);
|
||||
}
|
||||
else
|
||||
++it;
|
||||
}
|
||||
}
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
namespace base {
|
||||
|
||||
template<>
|
||||
app::KeyAction convert_to(const std::string& from)
|
||||
{
|
||||
for (const auto& a : actions()) {
|
||||
if (from == a.name)
|
||||
return a.action;
|
||||
}
|
||||
return app::KeyAction::None;
|
||||
}
|
||||
|
||||
template<>
|
||||
std::string convert_to(const app::KeyAction& from)
|
||||
{
|
||||
for (const auto& a : actions()) {
|
||||
if (from == a.action)
|
||||
return a.name;
|
||||
}
|
||||
return std::string();
|
||||
}
|
||||
|
||||
template<>
|
||||
app::WheelAction convert_to(const std::string& from)
|
||||
{
|
||||
for (int c = int(app::WheelAction::First); c <= int(app::WheelAction::Last); ++c) {
|
||||
if (from == wheel_actions()[c].name)
|
||||
return (app::WheelAction)c;
|
||||
}
|
||||
return app::WheelAction::None;
|
||||
}
|
||||
|
||||
template<>
|
||||
std::string convert_to(const app::WheelAction& from)
|
||||
{
|
||||
int c = int(from);
|
||||
if (c >= int(app::WheelAction::First) && c <= int(app::WheelAction::Last)) {
|
||||
return wheel_actions()[c].name;
|
||||
}
|
||||
else
|
||||
return std::string();
|
||||
}
|
||||
|
||||
template<>
|
||||
app::KeyContext convert_to(const std::string& from)
|
||||
{
|
||||
for (int c = 0; g_contexts[c].name; ++c) {
|
||||
if (from == g_contexts[c].name)
|
||||
return g_contexts[c].context;
|
||||
}
|
||||
return app::KeyContext::Any;
|
||||
}
|
||||
|
||||
template<>
|
||||
std::string convert_to(const app::KeyContext& from)
|
||||
{
|
||||
for (int c = 0; g_contexts[c].name; ++c) {
|
||||
if (from == g_contexts[c].context)
|
||||
return g_contexts[c].name;
|
||||
}
|
||||
return std::string();
|
||||
}
|
||||
|
||||
} // namespace base
|
||||
} // namespace
|
||||
|
||||
namespace app {
|
||||
|
||||
using namespace ui;
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// Key
|
||||
|
||||
Key::Key(const Key& k)
|
||||
: m_type(k.m_type)
|
||||
, m_adds(k.m_adds)
|
||||
, m_dels(k.m_dels)
|
||||
, m_keycontext(k.m_keycontext)
|
||||
{
|
||||
switch (m_type) {
|
||||
case KeyType::Command:
|
||||
m_command = k.m_command;
|
||||
m_params = k.m_params;
|
||||
break;
|
||||
case KeyType::Tool:
|
||||
case KeyType::Quicktool: m_tool = k.m_tool; break;
|
||||
case KeyType::Action: m_action = k.m_action; break;
|
||||
case KeyType::WheelAction:
|
||||
m_action = k.m_action;
|
||||
m_wheelAction = k.m_wheelAction;
|
||||
break;
|
||||
case KeyType::DragAction:
|
||||
m_action = k.m_action;
|
||||
m_wheelAction = k.m_wheelAction;
|
||||
m_dragVector = k.m_dragVector;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Key::Key(Command* command, const Params& params, const KeyContext keyContext)
|
||||
: m_type(KeyType::Command)
|
||||
, m_keycontext(keyContext)
|
||||
, m_command(command)
|
||||
, m_params(params)
|
||||
{
|
||||
}
|
||||
|
||||
Key::Key(const KeyType type, tools::Tool* tool)
|
||||
: m_type(type)
|
||||
, m_keycontext(KeyContext::Any)
|
||||
, m_tool(tool)
|
||||
{
|
||||
}
|
||||
|
||||
Key::Key(const KeyAction action, const KeyContext keyContext)
|
||||
: m_type(KeyType::Action)
|
||||
, m_keycontext(keyContext)
|
||||
, m_action(action)
|
||||
{
|
||||
if (m_keycontext != KeyContext::Any)
|
||||
return;
|
||||
|
||||
// Automatic key context
|
||||
switch (action) {
|
||||
case KeyAction::None: m_keycontext = KeyContext::Any; break;
|
||||
case KeyAction::CopySelection:
|
||||
case KeyAction::SnapToGrid:
|
||||
case KeyAction::LockAxis:
|
||||
case KeyAction::FineControl: m_keycontext = KeyContext::TranslatingSelection; break;
|
||||
case KeyAction::AngleSnap: m_keycontext = KeyContext::RotatingSelection; break;
|
||||
case KeyAction::MaintainAspectRatio:
|
||||
case KeyAction::ScaleFromCenter: m_keycontext = KeyContext::ScalingSelection; break;
|
||||
case KeyAction::AddSelection:
|
||||
case KeyAction::SubtractSelection:
|
||||
case KeyAction::IntersectSelection: m_keycontext = KeyContext::SelectionTool; break;
|
||||
case KeyAction::AutoSelectLayer: m_keycontext = KeyContext::MoveTool; break;
|
||||
case KeyAction::StraightLineFromLastPoint:
|
||||
case KeyAction::AngleSnapFromLastPoint: m_keycontext = KeyContext::FreehandTool; break;
|
||||
case KeyAction::MoveOrigin:
|
||||
case KeyAction::SquareAspect:
|
||||
case KeyAction::DrawFromCenter:
|
||||
case KeyAction::RotateShape: m_keycontext = KeyContext::ShapeTool; break;
|
||||
case KeyAction::LeftMouseButton: m_keycontext = KeyContext::Any; break;
|
||||
case KeyAction::RightMouseButton: m_keycontext = KeyContext::Any; break;
|
||||
}
|
||||
}
|
||||
|
||||
Key::Key(const WheelAction wheelAction)
|
||||
: m_type(KeyType::WheelAction)
|
||||
, m_keycontext(KeyContext::MouseWheel)
|
||||
, m_action(KeyAction::None)
|
||||
, m_wheelAction(wheelAction)
|
||||
{
|
||||
}
|
||||
|
||||
// static
|
||||
KeyPtr Key::MakeDragAction(WheelAction dragAction)
|
||||
{
|
||||
KeyPtr k(new Key(dragAction));
|
||||
k->m_type = KeyType::DragAction;
|
||||
k->m_keycontext = KeyContext::Any;
|
||||
k->m_dragVector = wheel_actions()[(int)dragAction].vector;
|
||||
return k;
|
||||
}
|
||||
|
||||
const ui::Shortcuts& Key::shortcuts() const
|
||||
{
|
||||
if (!m_shortcuts) {
|
||||
m_shortcuts = std::make_unique<ui::Shortcuts>();
|
||||
|
||||
// Add default keys
|
||||
for (const auto& kv : m_adds) {
|
||||
if (kv.first == KeySource::Original)
|
||||
m_shortcuts->add(kv.second);
|
||||
}
|
||||
|
||||
// Delete/add extension-defined keys
|
||||
for (const auto& kv : m_dels) {
|
||||
if (kv.first == KeySource::ExtensionDefined)
|
||||
m_shortcuts->remove(kv.second);
|
||||
else {
|
||||
ASSERT(kv.first != KeySource::Original);
|
||||
}
|
||||
}
|
||||
for (const auto& kv : m_adds) {
|
||||
if (kv.first == KeySource::ExtensionDefined)
|
||||
m_shortcuts->add(kv.second);
|
||||
}
|
||||
|
||||
// Delete/add user-defined keys
|
||||
for (const auto& kv : m_dels) {
|
||||
if (kv.first == KeySource::UserDefined)
|
||||
m_shortcuts->remove(kv.second);
|
||||
}
|
||||
for (const auto& kv : m_adds) {
|
||||
if (kv.first == KeySource::UserDefined)
|
||||
m_shortcuts->add(kv.second);
|
||||
}
|
||||
}
|
||||
return *m_shortcuts;
|
||||
}
|
||||
|
||||
void Key::add(const ui::Shortcut& shortcut, const KeySource source, KeyboardShortcuts& globalKeys)
|
||||
{
|
||||
m_adds.emplace_back(source, shortcut);
|
||||
m_shortcuts.reset();
|
||||
|
||||
// Remove the shortcut from other commands
|
||||
if (source == KeySource::ExtensionDefined || source == KeySource::UserDefined) {
|
||||
erase_shortcut(m_dels, source, shortcut);
|
||||
|
||||
globalKeys.disableShortcut(shortcut, source, m_keycontext, this);
|
||||
}
|
||||
}
|
||||
|
||||
const ui::Shortcut* Key::isPressed(const Message* msg, const KeyContext keyContext) const
|
||||
{
|
||||
if (const auto* keyMsg = dynamic_cast<const KeyMessage*>(msg)) {
|
||||
for (const Shortcut& shortcut : shortcuts()) {
|
||||
if (shortcut.isPressed(keyMsg->modifiers(), keyMsg->scancode(), keyMsg->unicodeChar()) &&
|
||||
(m_keycontext == KeyContext::Any || match_key_context(m_keycontext, keyContext))) {
|
||||
return &shortcut;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (const auto* mouseMsg = dynamic_cast<const MouseMessage*>(msg)) {
|
||||
for (const Shortcut& shortcut : shortcuts()) {
|
||||
if ((shortcut.modifiers() == mouseMsg->modifiers()) &&
|
||||
(m_keycontext == KeyContext::Any ||
|
||||
// TODO we could have multiple mouse wheel key-context,
|
||||
// like "sprite editor" context, or "timeline" context,
|
||||
// etc.
|
||||
m_keycontext == KeyContext::MouseWheel)) {
|
||||
return &shortcut;
|
||||
}
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
const ui::Shortcut* Key::isPressed(const Message* msg) const
|
||||
{
|
||||
return isPressed(msg, KeyboardShortcuts::getCurrentKeyContext());
|
||||
}
|
||||
|
||||
bool Key::isPressed() const
|
||||
{
|
||||
const auto& ss = this->shortcuts();
|
||||
return std::any_of(ss.begin(), ss.end(), [](const Shortcut& shortcut) {
|
||||
return shortcut.isPressed();
|
||||
});
|
||||
}
|
||||
|
||||
bool Key::isLooselyPressed() const
|
||||
{
|
||||
const auto& ss = this->shortcuts();
|
||||
return std::any_of(ss.begin(), ss.end(), [](const Shortcut& shortcut) {
|
||||
return shortcut.isLooselyPressed();
|
||||
});
|
||||
}
|
||||
|
||||
bool Key::isCommandListed() const
|
||||
{
|
||||
return type() == KeyType::Command && command()->isListed(params());
|
||||
}
|
||||
|
||||
bool Key::hasShortcut(const ui::Shortcut& shortcut) const
|
||||
{
|
||||
return shortcuts().has(shortcut);
|
||||
}
|
||||
|
||||
bool Key::hasUserDefinedShortcuts() const
|
||||
{
|
||||
return std::any_of(m_adds.begin(), m_adds.end(), [](const auto& kv) {
|
||||
return (kv.first == KeySource::UserDefined);
|
||||
});
|
||||
}
|
||||
|
||||
void Key::disableShortcut(const ui::Shortcut& shortcut, const KeySource source)
|
||||
{
|
||||
// It doesn't make sense that the default keyboard shortcuts file
|
||||
// (gui.xml) removes some shortcut.
|
||||
ASSERT(source != KeySource::Original);
|
||||
|
||||
erase_shortcut(m_adds, source, shortcut);
|
||||
erase_shortcut(m_dels, source, shortcut);
|
||||
|
||||
m_dels.emplace_back(source, shortcut);
|
||||
m_shortcuts.reset();
|
||||
}
|
||||
|
||||
void Key::reset()
|
||||
{
|
||||
erase_shortcuts(m_adds, KeySource::UserDefined);
|
||||
erase_shortcuts(m_dels, KeySource::UserDefined);
|
||||
m_shortcuts.reset();
|
||||
}
|
||||
|
||||
void Key::copyOriginalToUser()
|
||||
{
|
||||
// Erase all user-defined keys
|
||||
erase_shortcuts(m_adds, KeySource::UserDefined);
|
||||
erase_shortcuts(m_dels, KeySource::UserDefined);
|
||||
|
||||
// Then copy all original & extension-defined keys as user-defined
|
||||
auto copy = m_adds;
|
||||
for (const auto& kv : copy)
|
||||
m_adds.emplace_back(KeySource::UserDefined, kv.second);
|
||||
m_shortcuts.reset();
|
||||
}
|
||||
|
||||
std::string Key::triggerString() const
|
||||
{
|
||||
switch (m_type) {
|
||||
case KeyType::Command: m_command->loadParams(m_params); return m_command->friendlyName();
|
||||
case KeyType::Tool:
|
||||
case KeyType::Quicktool: {
|
||||
std::string text = m_tool->getText();
|
||||
if (m_type == KeyType::Quicktool)
|
||||
text += " (quick)";
|
||||
return text;
|
||||
}
|
||||
case KeyType::Action: return get_user_friendly_string_for_keyaction(m_action, m_keycontext);
|
||||
case KeyType::WheelAction:
|
||||
case KeyType::DragAction: return get_user_friendly_string_for_wheelaction(m_wheelAction);
|
||||
}
|
||||
return "Unknown";
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// KeyboardShortcuts
|
||||
|
||||
static std::unique_ptr<KeyboardShortcuts> g_singleton;
|
||||
|
||||
// static
|
||||
|
|
@ -624,11 +90,7 @@ void KeyboardShortcuts::destroyInstance()
|
|||
KeyboardShortcuts::KeyboardShortcuts()
|
||||
{
|
||||
ASSERT(Strings::instance());
|
||||
Strings::instance()->LanguageChange.connect([] {
|
||||
// Clear collections so they are re-constructed with the new language
|
||||
g_actions.clear();
|
||||
g_wheel_actions.clear();
|
||||
});
|
||||
Strings::instance()->LanguageChange.connect([] { reset_key_tables_that_depends_on_language(); });
|
||||
}
|
||||
|
||||
KeyboardShortcuts::~KeyboardShortcuts()
|
||||
|
|
@ -1317,35 +779,4 @@ void KeyboardShortcuts::addMissingKeysForCommands()
|
|||
}
|
||||
}
|
||||
|
||||
std::string key_tooltip(const char* str, const app::Key* key)
|
||||
{
|
||||
std::string res;
|
||||
if (str)
|
||||
res += str;
|
||||
if (key && !key->shortcuts().empty()) {
|
||||
res += " (";
|
||||
res += key->shortcuts().front().toString();
|
||||
res += ")";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
std::string convertKeyContextToUserFriendlyString(KeyContext keyContext)
|
||||
{
|
||||
switch (keyContext) {
|
||||
case KeyContext::Any: return std::string();
|
||||
case KeyContext::Normal: return I18N_KEY(key_context_normal);
|
||||
case KeyContext::SelectionTool: return I18N_KEY(key_context_selection);
|
||||
case KeyContext::TranslatingSelection: return I18N_KEY(key_context_translating_selection);
|
||||
case KeyContext::ScalingSelection: return I18N_KEY(key_context_scaling_selection);
|
||||
case KeyContext::RotatingSelection: return I18N_KEY(key_context_rotating_selection);
|
||||
case KeyContext::MoveTool: return I18N_KEY(key_context_move_tool);
|
||||
case KeyContext::FreehandTool: return I18N_KEY(key_context_freehand_tool);
|
||||
case KeyContext::ShapeTool: return I18N_KEY(key_context_shape_tool);
|
||||
case KeyContext::FramesSelection: return I18N_KEY(key_context_frames_selection);
|
||||
case KeyContext::Transformation: return I18N_KEY(key_context_transformation);
|
||||
}
|
||||
return std::string();
|
||||
}
|
||||
|
||||
} // namespace app
|
||||
|
|
|
|||
|
|
@ -85,8 +85,6 @@ private:
|
|||
mutable Keys m_keys;
|
||||
};
|
||||
|
||||
std::string key_tooltip(const char* str, const Key* key);
|
||||
|
||||
inline std::string key_tooltip(const char* str,
|
||||
const char* commandName,
|
||||
const Params& params = Params(),
|
||||
|
|
|
|||
Loading…
Reference in New Issue