Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

refactor(ui): detect panel shortcuts via DVAction only

Ahl761de79458ade9
diff --git a/toonz/sources/include/toonzqt/menubarcommand.h b/toonz/sources/include/toonzqt/menubarcommand.h
index dc74c512b..b1f0dc2a0 100644
--- a/toonz/sources/include/toonzqt/menubarcommand.h
+++ b/toonz/sources/include/toonzqt/menubarcommand.h
@@ -181,7 +181,6 @@ public:
bool executeTriggeredByShortcut() const {
return m_executeTriggeredByShortcut;
}
- QAction *actionForShortcutKey(const QKeySequence &key) const;
void setPendingShortcutAction(QAction *action);
void enable(CommandId id, bool enabled);
diff --git a/toonz/sources/toonzqt/menubarcommand.cpp b/toonz/sources/toonzqt/menubarcommand.cpp
index ed72fb1f1..f28e8d6d0 100644
--- a/toonz/sources/toonzqt/menubarcommand.cpp
+++ b/toonz/sources/toonzqt/menubarcommand.cpp
@@ -30,27 +30,6 @@ void updateToolTip(QAction *action) {
action->setToolTip(tooltip);
}
-class ShortcutTriggerFilter final : public QObject {
- CommandManager *m_manager;
-
-public:
- explicit ShortcutTriggerFilter(CommandManager *manager)
- : m_manager(manager) {}
-
-protected:
- bool eventFilter(QObject *watched, QEvent *event) override {
- if (event->type() != QEvent::Shortcut) return false;
-
- QShortcutEvent *shortcutEvent = static_cast<QShortcutEvent *>(event);
- if (shortcutEvent->isAmbiguous()) return false;
-
- QAction *action = m_manager->actionForShortcutKey(shortcutEvent->key());
- if (action) m_manager->setPendingShortcutAction(action);
-
- return false;
- }
-};
-
} // namespace
//=========================================================
@@ -83,9 +62,7 @@ void AuxActionsCreatorManager::createAuxActions(QObject *parent) {
//=========================================================
CommandManager::CommandManager()
- : m_executeTriggeredByShortcut(false), m_pendingShortcutAction(nullptr) {
- if (qApp) qApp->installEventFilter(new ShortcutTriggerFilter(this));
-}
+ : m_executeTriggeredByShortcut(false), m_pendingShortcutAction(nullptr) {}
//---------------------------------------------------------
@@ -176,16 +153,6 @@ void CommandManager::define(CommandId id, CommandType type,
// set handler (id, handler)
// possibly changes enable/disable qaction state
//
-QAction *CommandManager::actionForShortcutKey(const QKeySequence &key) const {
- std::map<QAction *, Node *>::const_iterator it;
- for (it = m_qactionTable.begin(); it != m_qactionTable.end(); ++it) {
- if (it->first->shortcut() == key) return it->first;
- }
- return nullptr;
-}
-
-//---------------------------------------------------------
-
void CommandManager::setPendingShortcutAction(QAction *action) {
m_pendingShortcutAction = action;
}