OpenToonz - An open-source full-featured 2D animation creation software
C
Scrub Key
manongjohndf80ee7bc201
diff --git a/toonz/sources/include/tools/cursors.h b/toonz/sources/include/tools/cursors.hindex 2069bbd6d..e03b6ca8d 100644--- a/toonz/sources/include/tools/cursors.h+++ b/toonz/sources/include/tools/cursors.h@@ -51,6 +51,7 @@ enum {ScaleInvCursor,ScaleHCursor,ScaleVCursor,+ ScrubCursor,StrokeSelectCursor,TapeCursor,TypeInCursor,diff --git a/toonz/sources/include/toonzqt/menubarcommand.h b/toonz/sources/include/toonzqt/menubarcommand.hindex 9af65ca7e..9e8ab69f8 100644--- a/toonz/sources/include/toonzqt/menubarcommand.h+++ b/toonz/sources/include/toonzqt/menubarcommand.h@@ -70,6 +70,7 @@ enum CommandType {CellMarkCommandType,MenuCommandType,VisualizationButtonCommandType,+ SpecialModifierKeyType,HiddenCommandType};diff --git a/toonz/sources/include/toonzqt/viewcommandids.h b/toonz/sources/include/toonzqt/viewcommandids.hindex dface1165..619db1654 100644--- a/toonz/sources/include/toonzqt/viewcommandids.h+++ b/toonz/sources/include/toonzqt/viewcommandids.h@@ -17,6 +17,8 @@#define V_RotateReset "T_RotateReset"#define V_PositionReset "T_PositionReset"+#define V_Scrub "T_Scrub"+// following command ids are for command bar#define VB_ViewReset "VB_ViewReset"#define VB_ZoomFit "VB_ZoomFit"diff --git a/toonz/sources/tnztools/cursormanager.cpp b/toonz/sources/tnztools/cursormanager.cppindex 0b801da3b..e7dad6bfb 100644--- a/toonz/sources/tnztools/cursormanager.cpp+++ b/toonz/sources/tnztools/cursormanager.cpp@@ -63,6 +63,7 @@ const struct {{ToolCursor::LevelSelectCursor, "level_select", 7, 3, true},{ToolCursor::MagnetCursor, "magnet", 18, 18, true},{ToolCursor::PanCursor, "pan", 17, 17, true},+ {ToolCursor::ScrubCursor, "scrub", 17, 17, false},{ToolCursor::PickerCursorLine, "", 0, 0, false},{ToolCursor::PickerCursorLineBase, "picker_style", 7, 22, true},diff --git a/toonz/sources/toonz/Resources/scrub.png b/toonz/sources/toonz/Resources/scrub.pngnew file mode 100644index 000000000..ac4bfe5e5Binary files /dev/null and b/toonz/sources/toonz/Resources/scrub.png differdiff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cppindex 63c869f4a..a32ca63dd 100644--- a/toonz/sources/toonz/mainwindow.cpp+++ b/toonz/sources/toonz/mainwindow.cpp@@ -1894,6 +1894,13 @@ QAction *MainWindow::createStopMotionAction(const char *id, const char *name,//-----------------------------------------------------------------------------+QAction *MainWindow::createSpecialModifierAction(+ const char *id, const char *name, const QString &defaultShortcut) {+ return createAction(id, name, defaultShortcut, SpecialModifierKeyType);+}++//-----------------------------------------------------------------------------+QAction *MainWindow::createToggle(const char *id, const char *name,const QString &defaultShortcut,bool startStatus, CommandType type,@@ -3288,6 +3295,9 @@ void MainWindow::defineActions() {QT_TR_NOOP("Show original live view images."), "");#endif // x64+ // Special Modifier Keys+ createSpecialModifierAction(V_Scrub, QT_TR_NOOP("Viewer Scrub"), "#");+// create cell mark actionsfor (int markId = 0; markId < 12; markId++) {std::string cmdId = (std::string)MI_SetCellMark + std::to_string(markId);diff --git a/toonz/sources/toonz/mainwindow.h b/toonz/sources/toonz/mainwindow.hindex d51d47333..d6bb060d4 100644--- a/toonz/sources/toonz/mainwindow.h+++ b/toonz/sources/toonz/mainwindow.h@@ -222,6 +222,9 @@ private:const QString &defaultShortcut,const char *iconSVGName = "");+ QAction *createSpecialModifierAction(const char *id, const char *name,+ const QString &defaultShortcut);+protected slots:void onCurrentRoomChanged(int newRoomIndex);void onIndexSwapped(int firstIndex, int secondIndex);diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cppindex 5c13799e6..ad4c99b83 100644--- a/toonz/sources/toonz/sceneviewer.cpp+++ b/toonz/sources/toonz/sceneviewer.cpp@@ -826,7 +826,8 @@ SceneViewer::SceneViewer(ImageUtils::FullScreenWidget *parent), m_toolDisableReason(""), m_editPreviewSubCamera(false), m_isLocator(false)- , m_isBusyOnTabletMove(false) {+ , m_isBusyOnTabletMove(false)+ , m_mouseScrubbing(0) {m_visualSettings.m_sceneProperties =TApp::instance()->getCurrentScene()->getScene()->getProperties();#if defined(x64)diff --git a/toonz/sources/toonz/sceneviewer.h b/toonz/sources/toonz/sceneviewer.hindex d866a2a03..7a8751153 100644--- a/toonz/sources/toonz/sceneviewer.h+++ b/toonz/sources/toonz/sceneviewer.h@@ -93,6 +93,12 @@ class SceneViewer final : public TToolViewer,bool m_rotating = false;bool m_zooming = false;bool m_panning = false;++ TPointD m_oldPos;+ bool m_dragging;+ int m_mouseScrubbing = 0;+ QAction *m_keyAction;+QPointF m_firstPanPoint;QPointF m_undoPoint;double m_scaleFactor; // used for zoom gesture@@ -367,6 +373,8 @@ protected:// center: window coordinate, pixels, topleft originvoid zoomQt(const QPoint ¢er, double scaleFactor);+ void mouseScrub(const TMouseEvent &e);+// overridden from TToolViewervoid pan(const TPointD &delta) override { panQt(QPointF(delta.x, delta.y)); }diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cppindex 1de05a9bd..10e68a4de 100644--- a/toonz/sources/toonz/sceneviewerevents.cpp+++ b/toonz/sources/toonz/sceneviewerevents.cpp@@ -531,6 +531,25 @@ void SceneViewer::onMove(const TMouseEvent &event) {bool cursorSet = false;m_lastMousePos = curPos;+ if (event.buttons() == Qt::LeftButton && m_mouseScrubbing > 0) {+ if (m_mouseScrubbing == 1) {+ m_mouseScrubbing = 2;+ m_dragging = true;+ m_oldPos = event.m_pos;+ setToolCursor(this, ToolCursor::ScrubCursor);+ return;+ }+ // panning+ mouseScrub(event);+ setToolCursor(this, ToolCursor::ScrubCursor);+ return;+ }++ if (m_mouseScrubbing > 0) {+ setToolCursor(this, ToolCursor::ScrubCursor);+ return;+ }+if (m_editPreviewSubCamera) {if (!PreviewSubCameraManager::instance()->mouseMoveEvent(this, event)) {if (m_tabletEvent && m_tabletState == StartStroke && m_tabletMove) {@@ -730,6 +749,18 @@ void SceneViewer::mousePressEvent(QMouseEvent *event) {//-----------------------------------------------------------------------------void SceneViewer::onPress(const TMouseEvent &event) {+ m_dragging = true;+ if (m_mouseScrubbing > 0) {+ m_pos = event.mousePos() * getDevPixRatio();+ m_mouseButton = event.button();+ m_buttonClicked = true;+ if (m_tabletEvent && m_tabletState == Touched) {+ m_tabletState = StartStroke;+ } else if (m_mouseButton == Qt::LeftButton) {+ m_mouseState = StartStroke;+ }+ return;+ }if (m_mouseButton != Qt::NoButton) {if (event.m_isTablet && m_mouseState != None) {// qDebug() << "[onPress] Switched from MousePress to TabletPress";@@ -882,6 +913,8 @@ void SceneViewer::onRelease(const TMouseEvent &event) {if (!m_buttonClicked) return;m_buttonClicked = false;+ m_dragging = false;+TTool *tool = TApp::instance()->getCurrentTool()->getTool();if (!tool || !tool->isEnabled()) {if (!m_toolDisableReason.isEmpty() && m_mouseButton == Qt::LeftButton &&@@ -1265,9 +1298,28 @@ bool SceneViewer::event(QEvent *e) {return true;}if (e->type() == QEvent::ShortcutOverride || e->type() == QEvent::KeyPress) {- if (!((QKeyEvent *)e)->isAutoRepeat()) {+ QKeyEvent *keyEvent = static_cast<QKeyEvent *>(e);++ if (!keyEvent->isAutoRepeat()) {TApp::instance()->getCurrentTool()->storeTool();}++ std::string keyStr = QKeySequence(keyEvent->key() + keyEvent->modifiers())+ .toString()+ .toStdString();+ QAction *action = CommandManager::instance()->getActionFromShortcut(keyStr);+ std::string actionId = CommandManager::instance()->getIdFromAction(action);++ if (actionId == V_Scrub) {+ if (m_mouseScrubbing == 0) {+ m_mouseScrubbing = 1;+ m_keyAction = action;+ m_keyAction->setEnabled(false);+ setToolCursor(this, ToolCursor::ScrubCursor);+ }+ e->accept();+ return true;+ }}if (e->type() == QEvent::ShortcutOverride) {TTool *tool = TApp::instance()->getCurrentTool()->getTool();@@ -1298,12 +1350,28 @@ bool SceneViewer::event(QEvent *e) {return true;}if (e->type() == QEvent::KeyRelease) {- if (!((QKeyEvent *)e)->isAutoRepeat()) {+ QKeyEvent *keyEvent = static_cast<QKeyEvent *>(e);++ if (!keyEvent->isAutoRepeat()) {QWidget *focusWidget = QApplication::focusWidget();if (focusWidget == 0 ||QString(focusWidget->metaObject()->className()) == "SceneViewer")TApp::instance()->getCurrentTool()->restoreTool();}++ if (m_keyAction) {+ if (keyEvent->isAutoRepeat()) {+ e->accept();+ return true;+ } else {+ m_mouseScrubbing = 0;+ m_keyAction->setEnabled(true);+ m_keyAction = 0;+ invalidateToolStatus();+ e->accept();+ return true;+ }+ }}// discard too frequent move events@@ -1816,3 +1884,18 @@ void SceneViewer::onToolSwitched() {onLevelChanged();update();}++//-----------------------------------------------------------------------------++void SceneViewer::mouseScrub(const TMouseEvent &e) {+ TPointD delta = e.m_pos - m_oldPos;++ if (std::abs(delta.x) < 20) return;++ if (delta.x < 0)+ CommandManager::instance()->execute(MI_PrevFrame);+ else if (delta.x > 0)+ CommandManager::instance()->execute(MI_NextFrame);++ m_oldPos = e.m_pos;+}diff --git a/toonz/sources/toonz/shortcutpopup.cpp b/toonz/sources/toonz/shortcutpopup.cppindex 0c73b3020..a73001508 100644--- a/toonz/sources/toonz/shortcutpopup.cpp+++ b/toonz/sources/toonz/shortcutpopup.cpp@@ -282,6 +282,7 @@ ShortcutTree::ShortcutTree(QWidget *parent) : QTreeWidget(parent) {addFolder(tr("Visualization"), ZoomCommandType);addFolder(tr("Misc"), MiscCommandType);addFolder(tr("RGBA Channels"), RGBACommandType);+ addFolder(tr("Special Modifier Keys"), SpecialModifierKeyType);sortItems(0, Qt::AscendingOrder);@@ -443,6 +444,7 @@ void ShortcutTree::refreshTree() {addFolder(tr("Visualization"), ZoomCommandType);addFolder(tr("Misc"), MiscCommandType);addFolder(tr("RGBA Channels"), RGBACommandType);+ addFolder(tr("Special Modifier Keys"), SpecialModifierKeyType);sortItems(0, Qt::AscendingOrder);diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrcindex 03c97f8cc..db5c9fbab 100644--- a/toonz/sources/toonz/toonz.qrc+++ b/toonz/sources/toonz/toonz.qrc@@ -715,5 +715,6 @@<file>Resources/scripticon.png</file><file>Resources/savescreen.png</file><file>Resources/warning.svg</file>+ <file>Resources/scrub.png</file></qresource></RCC>