razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Allow multiple key stroke shortcuts

Browse source
This commit is contained in:
manongjohn 2022-01-13 07:47:22 -05:00
parent 6f1d0fc0b6
commit 4e67e1df08
2 changed files with 72 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
toonz/sources/toonz/shortcutpopup.cpp
View file

@ -80,7 +80,7 @@ public:
//-----------------------------------------------------------------------------
ShortcutViewer::ShortcutViewer(QWidget *parent)
: QKeySequenceEdit(parent), m_action(0) {
: QKeySequenceEdit(parent), m_action(0), m_keysPressed(0) {
setObjectName("ShortcutViewer");
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
connect(this, SIGNAL(editingFinished()), this, SLOT(onEditingFinished()));
@ -110,9 +110,11 @@ void ShortcutViewer::keyPressEvent(QKeyEvent *event) {
int key = event->key();
Qt::KeyboardModifiers modifiers = event->modifiers();
if (m_keysPressed == 0) {
if (key == Qt::Key_Home || key == Qt::Key_End || key == Qt::Key_PageDown ||
key == Qt::Key_PageUp || key == Qt::Key_Escape || key == Qt::Key_Print ||
key == Qt::Key_Pause || key == Qt::Key_ScrollLock) {
key == Qt::Key_PageUp || key == Qt::Key_Escape ||
key == Qt::Key_Print || key == Qt::Key_Pause ||
key == Qt::Key_ScrollLock) {
event->ignore();
return;
}
@ -133,28 +135,49 @@ void ShortcutViewer::keyPressEvent(QKeyEvent *event) {
event->ignore();
return;
}
}
m_keysPressed++;
QKeySequenceEdit::keyPressEvent(event);
}
//-----------------------------------------------------------------------------
void ShortcutViewer::onEditingFinished() {
// limit to one shortcut key input
QKeySequence keys = (keySequence().isEmpty())
? QKeySequence()
: QKeySequence(keySequence()[0]);
m_keysPressed = 0;
int seqCount = keySequence().count();
int k1 = seqCount >= 1 ? keySequence()[0] : 0;
int k2 = seqCount >= 2 ? keySequence()[1] : 0;
int k3 = seqCount >= 3 ? keySequence()[2] : 0;
int k4 = seqCount >= 4 ? keySequence()[3] : 0;
QKeySequence keys(k1, k2, k3, k4);
if (m_action) {
CommandManager *cm = CommandManager::instance();
std::string shortcutString = keys.toString().toStdString();
// Check partial sequences (k1, k1+k2, k1+k2+k3, k1+k2+k3+k4) for matches to
// existing shortcuts
for (int i = 0; i < seqCount; i++) {
QKeySequence tmpKeys = QKeySequence(k1, (i >= 1 ? k2 : 0),
(i >= 2 ? k3 : 0), (i >= 3 ? k4 : 0));
QAction *oldAction =
cm->getActionFromShortcut(keys.toString().toStdString());
cm->getActionFromShortcut(tmpKeys.toString().toStdString());
if (oldAction == m_action) return;
if (oldAction) {
QString msg = tr("%1 is already assigned to '%2'\nAssign to '%3'?")
.arg(keys.toString())
QString msg;
if (seqCount == (i + 1)) {
msg = tr("'%1' is already assigned to '%2'\nAssign to '%3'?")
.arg(tmpKeys.toString())
.arg(oldAction->iconText())
.arg(m_action->iconText());
} else {
msg = tr("Initial sequence '%1' is assigned to '%2' which takes "
"priority.\nAssign shortcut sequence anyway?")
.arg(tmpKeys.toString())
.arg(oldAction->iconText());
}
int ret = DVGui::MsgBox(msg, tr("Yes"), tr("No"), 1);
activateWindow();
if (ret == 2 || ret == 0) {
@ -163,6 +186,8 @@ void ShortcutViewer::onEditingFinished() {
return;
}
}
}
std::string shortcutString = keys.toString().toStdString();
CommandManager::instance()->setShortcut(m_action, shortcutString);
emit shortcutChanged();
}
@ -201,6 +226,9 @@ ShortcutTree::ShortcutTree(QWidget *parent) : QTreeWidget(parent) {
setColumnCount(2);
header()->close();
header()->setSectionResizeMode(0, QHeaderView::ResizeMode::Fixed);
header()->setSectionResizeMode(1, QHeaderView::ResizeMode::ResizeToContents);
header()->setDefaultSectionSize(300);
// setStyleSheet("border-bottom:1px solid rgb(120,120,120); border-left:1px
// solid rgb(120,120,120); border-top:1px solid rgb(120,120,120)");
@ -336,14 +364,6 @@ void ShortcutTree::searchItems(const QString &searchWord) {
//-----------------------------------------------------------------------------
void ShortcutTree::resizeEvent(QResizeEvent *event) {
header()->resizeSection(0, width() - 120);
header()->resizeSection(1, 120);
QTreeView::resizeEvent(event);
}
//-----------------------------------------------------------------------------
void ShortcutTree::onCurrentItemChanged(QTreeWidgetItem *current,
QTreeWidgetItem *previous) {
ShortcutItem *item = dynamic_cast<ShortcutItem *>(current);

4
toonz/sources/toonz/shortcutpopup.h
View file

@ -27,6 +27,8 @@ class ShortcutViewer final : public QKeySequenceEdit {
Q_OBJECT
QAction *m_action;
int m_keysPressed;
public:
ShortcutViewer(QWidget *parent);
~ShortcutViewer();
@ -69,8 +71,6 @@ protected:
void addFolder(const QString &title, int commandType,
QTreeWidgetItem *folder = 0);
void resizeEvent(QResizeEvent *event);
public slots:
void onCurrentItemChanged(QTreeWidgetItem *current,
QTreeWidgetItem *previous);