Skip to content

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

C

feat: add shortcuts and menu entries for assistant types

Ahl7615fecfa30924
diff --git a/stuff/profiles/layouts/rooms/Default/menubar_template.xml b/stuff/profiles/layouts/rooms/Default/menubar_template.xml
index 391438443..267de0b69 100644
--- a/stuff/profiles/layouts/rooms/Default/menubar_template.xml
+++ b/stuff/profiles/layouts/rooms/Default/menubar_template.xml
@@ -107,6 +107,7 @@
<command>MI_NewToonzRasterLevel</command>
<command>MI_NewVectorLevel</command>
<command>MI_NewRasterLevel</command>
+ <command>MI_NewMetaLevel</command>
<command>MI_NewNoteLevel</command>
</menu>
<command>MI_LoadLevel</command>
diff --git a/stuff/profiles/layouts/settings/xsheettoolbar.xml b/stuff/profiles/layouts/settings/xsheettoolbar.xml
index 625c2c8e6..6012b112b 100644
--- a/stuff/profiles/layouts/settings/xsheettoolbar.xml
+++ b/stuff/profiles/layouts/settings/xsheettoolbar.xml
@@ -3,6 +3,7 @@
<command>MI_NewToonzRasterLevel</command>
<command>MI_NewRasterLevel</command>
<command>MI_NewVectorLevel</command>
+ <command>MI_NewMetaLevel</command>
<separator/>
<command>MI_Collapse</command>
<command>MI_OpenChild</command>
diff --git a/stuff/profiles/layouts/shortcuts/defopentoonz.ini b/stuff/profiles/layouts/shortcuts/defopentoonz.ini
index eefb62d89..c4d2b10db 100644
--- a/stuff/profiles/layouts/shortcuts/defopentoonz.ini
+++ b/stuff/profiles/layouts/shortcuts/defopentoonz.ini
@@ -24,6 +24,17 @@ A_ToolOption_EditToolActiveAxis:Scale=
A_ToolOption_EditToolActiveAxis:Shear=
A_ToolOption_EditToolActiveAxis=
A_ToolOption_FrameRange=
+A_ToolOption_AssistantType=
+A_ToolOption_AssistantType:assistantEllipse=
+A_ToolOption_AssistantType:assistantFisheye=
+A_ToolOption_AssistantType:assistantLine=
+A_ToolOption_AssistantType:assistantPerspective=
+A_ToolOption_AssistantType:assistantVanishingPoint=
+A_ToolOption_AssistantType:replicatorAffine=
+A_ToolOption_AssistantType:replicatorGrid=
+A_ToolOption_AssistantType:replicatorJitter=
+A_ToolOption_AssistantType:replicatorMirror=
+A_ToolOption_AssistantType:replicatorStar=
A_ToolOption_GeometricEdge=
A_ToolOption_GeometricShape=
A_ToolOption_GlobalKey=
@@ -63,6 +74,17 @@ A_ToolOption_TypeSize=
A_ToolOption_TypeStyle=
MI_About=
MI_ACheck=
+MI_AssistantEllipse=
+MI_AssistantFisheye=
+MI_AssistantLine=
+MI_AssistantNextType=
+MI_AssistantPerspective=
+MI_AssistantReplicatorAffine=
+MI_AssistantReplicatorGrid=
+MI_AssistantReplicatorJitter=
+MI_AssistantReplicatorMirror=
+MI_AssistantReplicatorStar=
+MI_AssistantVanishingPoint=
MI_ActivateAllColumns=
MI_ActivateSelectedColumns=
MI_ActivateThisColumnOnly=
@@ -204,6 +226,7 @@ MI_NewRasterLevel=
MI_NewScene=Ctrl+N
MI_NewToonzRasterLevel=
MI_NewVectorLevel=
+MI_NewMetaLevel=
MI_NextDrawing=.
MI_NextFrame=Shift+.
MI_NextStep=
diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index a32ca63dd..0d44c9d55 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -2132,8 +2132,8 @@ void MainWindow::defineActions() {
"new_toonz_raster_level");
createMenuLevelAction(MI_NewRasterLevel, QT_TR_NOOP("&New Raster Level"), "",
"new_raster_level");
- createMenuFileAction(MI_NewMetaLevel, QT_TR_NOOP("&New Assistant Level"),
- "new_meta_level");
+ createMenuLevelAction(MI_NewMetaLevel, QT_TR_NOOP("&New Assistant Level"), "",
+ "assistant");
createMenuLevelAction(MI_LoadLevel, QT_TR_NOOP("&Load Level..."), "",
"load_level");
createMenuLevelAction(MI_SaveLevel, QT_TR_NOOP("&Save Level"), "",
@@ -2966,6 +2966,37 @@ void MainWindow::defineActions() {
createAction(MI_PlasticAnimate, QT_TR_NOOP("Plastic Tool - Animate"), "",
ToolCommandType);
+ /*-- Edit Assistants tool + type switching shortcuts --*/
+ createAction(MI_AssistantNextType,
+ QT_TR_NOOP("Assistant Type - Cycle"), "", ToolCommandType);
+ createAction(MI_AssistantLine, QT_TR_NOOP("Assistant Type - Line"), "",
+ ToolCommandType, "assistant_line");
+ createAction(MI_AssistantEllipse, QT_TR_NOOP("Assistant Type - Ellipse"), "",
+ ToolCommandType, "assistant_ellipse");
+ createAction(MI_AssistantPerspective,
+ QT_TR_NOOP("Assistant Type - Perspective"), "",
+ ToolCommandType, "assistant_perspective");
+ createAction(MI_AssistantVanishingPoint,
+ QT_TR_NOOP("Assistant Type - Vanishing Point"), "",
+ ToolCommandType, "assistant_vanishingpoint");
+ createAction(MI_AssistantFisheye, QT_TR_NOOP("Assistant Type - Fisheye"), "",
+ ToolCommandType, "assistant_fisheye");
+ createAction(MI_AssistantReplicatorStar,
+ QT_TR_NOOP("Assistant Type - Replicator Star"), "",
+ ToolCommandType, "replicator_star");
+ createAction(MI_AssistantReplicatorMirror,
+ QT_TR_NOOP("Assistant Type - Replicator Mirror"), "",
+ ToolCommandType, "replicator_mirror");
+ createAction(MI_AssistantReplicatorJitter,
+ QT_TR_NOOP("Assistant Type - Replicator Jitter"), "",
+ ToolCommandType, "replicator_jitter");
+ createAction(MI_AssistantReplicatorGrid,
+ QT_TR_NOOP("Assistant Type - Replicator Grid"), "",
+ ToolCommandType, "replicator_grid");
+ createAction(MI_AssistantReplicatorAffine,
+ QT_TR_NOOP("Assistant Type - Replicator Affine"), "",
+ ToolCommandType, "replicator_affine");
+
// Tool Modifiers
createToolOptionsAction(MI_SelectNextGuideStroke,
@@ -3071,6 +3102,29 @@ void MainWindow::defineActions() {
QT_TR_NOOP("Geometric Shape Polygon"), "");
createToolOptionsAction("A_ToolOption_GeometricEdge",
QT_TR_NOOP("Geometric Edge"), "");
+ createToolOptionsAction("A_ToolOption_AssistantType",
+ QT_TR_NOOP("Assistant Type"), "");
+ createToolOptionsAction("A_ToolOption_AssistantType:assistantLine",
+ QT_TR_NOOP("Assistant Type - Line"), "");
+ createToolOptionsAction("A_ToolOption_AssistantType:assistantEllipse",
+ QT_TR_NOOP("Assistant Type - Ellipse"), "");
+ createToolOptionsAction("A_ToolOption_AssistantType:assistantPerspective",
+ QT_TR_NOOP("Assistant Type - Perspective"), "");
+ createToolOptionsAction(
+ "A_ToolOption_AssistantType:assistantVanishingPoint",
+ QT_TR_NOOP("Assistant Type - Vanishing Point"), "");
+ createToolOptionsAction("A_ToolOption_AssistantType:assistantFisheye",
+ QT_TR_NOOP("Assistant Type - Fisheye"), "");
+ createToolOptionsAction("A_ToolOption_AssistantType:replicatorStar",
+ QT_TR_NOOP("Assistant Type - Replicator Star"), "");
+ createToolOptionsAction("A_ToolOption_AssistantType:replicatorMirror",
+ QT_TR_NOOP("Assistant Type - Replicator Mirror"), "");
+ createToolOptionsAction("A_ToolOption_AssistantType:replicatorJitter",
+ QT_TR_NOOP("Assistant Type - Replicator Jitter"), "");
+ createToolOptionsAction("A_ToolOption_AssistantType:replicatorGrid",
+ QT_TR_NOOP("Assistant Type - Replicator Grid"), "");
+ createToolOptionsAction("A_ToolOption_AssistantType:replicatorAffine",
+ QT_TR_NOOP("Assistant Type - Replicator Affine"), "");
createToolOptionsAction("A_ToolOption_Mode", QT_TR_NOOP("Mode"), "");
menuAct = createToolOptionsAction(
"A_ToolOption_Mode:Areas", QT_TR_NOOP("Mode - Areas"), "", "mode_areas");
diff --git a/toonz/sources/toonz/menubar.cpp b/toonz/sources/toonz/menubar.cpp
index c81786dbd..65a30b901 100644
--- a/toonz/sources/toonz/menubar.cpp
+++ b/toonz/sources/toonz/menubar.cpp
@@ -1238,6 +1238,7 @@ QMenuBar *StackedMenuBar::createFullMenuBar() {
addMenuItem(newMenu, MI_NewToonzRasterLevel);
addMenuItem(newMenu, MI_NewVectorLevel);
addMenuItem(newMenu, MI_NewRasterLevel);
+ addMenuItem(newMenu, MI_NewMetaLevel);
addMenuItem(newMenu, MI_NewNoteLevel);
}
addMenuItem(levelMenu, MI_LoadLevel);
diff --git a/toonz/sources/toonz/menubarcommandids.h b/toonz/sources/toonz/menubarcommandids.h
index 4d7fe83d1..dbb6304d7 100644
--- a/toonz/sources/toonz/menubarcommandids.h
+++ b/toonz/sources/toonz/menubarcommandids.h
@@ -355,6 +355,18 @@
#define MI_SelectionFreehand "MI_SelectionFreehand"
#define MI_SelectionPolyline "MI_SelectionPolyline"
+#define MI_AssistantNextType "MI_AssistantNextType"
+#define MI_AssistantLine "MI_AssistantLine"
+#define MI_AssistantEllipse "MI_AssistantEllipse"
+#define MI_AssistantPerspective "MI_AssistantPerspective"
+#define MI_AssistantVanishingPoint "MI_AssistantVanishingPoint"
+#define MI_AssistantFisheye "MI_AssistantFisheye"
+#define MI_AssistantReplicatorStar "MI_AssistantReplicatorStar"
+#define MI_AssistantReplicatorMirror "MI_AssistantReplicatorMirror"
+#define MI_AssistantReplicatorJitter "MI_AssistantReplicatorJitter"
+#define MI_AssistantReplicatorGrid "MI_AssistantReplicatorGrid"
+#define MI_AssistantReplicatorAffine "MI_AssistantReplicatorAffine"
+
#define MI_GeometricNextShape "MI_GeometricNextShape"
#define MI_GeometricRectangle "MI_GeometricRectangle"
#define MI_GeometricCircle "MI_GeometricCircle"
diff --git a/toonz/sources/toonz/tooloptionsshortcutinvoker.cpp b/toonz/sources/toonz/tooloptionsshortcutinvoker.cpp
index edff4dec8..52af1db95 100644
--- a/toonz/sources/toonz/tooloptionsshortcutinvoker.cpp
+++ b/toonz/sources/toonz/tooloptionsshortcutinvoker.cpp
@@ -599,6 +599,30 @@ void ToolOptionsShortcutInvoker::initialize() {
&ToolOptionsShortcutInvoker::TogglePlasticBuildSkeleton);
setCommandHandler(MI_PlasticAnimate, this,
&ToolOptionsShortcutInvoker::TogglePlasticAnimate);
+
+ /*-- Edit Assistants tool + type switching shortcuts --*/
+ setCommandHandler(MI_AssistantNextType, this,
+ &ToolOptionsShortcutInvoker::toggleAssistantNextType);
+ setCommandHandler(MI_AssistantLine, this,
+ &ToolOptionsShortcutInvoker::toggleAssistantLine);
+ setCommandHandler(MI_AssistantEllipse, this,
+ &ToolOptionsShortcutInvoker::toggleAssistantEllipse);
+ setCommandHandler(MI_AssistantPerspective, this,
+ &ToolOptionsShortcutInvoker::toggleAssistantPerspective);
+ setCommandHandler(MI_AssistantVanishingPoint, this,
+ &ToolOptionsShortcutInvoker::toggleAssistantVanishingPoint);
+ setCommandHandler(MI_AssistantFisheye, this,
+ &ToolOptionsShortcutInvoker::toggleAssistantFisheye);
+ setCommandHandler(MI_AssistantReplicatorStar, this,
+ &ToolOptionsShortcutInvoker::toggleAssistantReplicatorStar);
+ setCommandHandler(MI_AssistantReplicatorMirror, this,
+ &ToolOptionsShortcutInvoker::toggleAssistantReplicatorMirror);
+ setCommandHandler(MI_AssistantReplicatorJitter, this,
+ &ToolOptionsShortcutInvoker::toggleAssistantReplicatorJitter);
+ setCommandHandler(MI_AssistantReplicatorGrid, this,
+ &ToolOptionsShortcutInvoker::toggleAssistantReplicatorGrid);
+ setCommandHandler(MI_AssistantReplicatorAffine, this,
+ &ToolOptionsShortcutInvoker::toggleAssistantReplicatorAffine);
}
//-----------------------------------------------------------------------------
@@ -800,6 +824,89 @@ void ToolOptionsShortcutInvoker::toggleGeometricPolygon() {
->getAction("A_ToolOption_GeometricShape:Polygon")
->trigger();
}
+
+//---------------------------------------------------------------------------------------
+/*-- Edit Assistants tool + type switching shortcuts --*/
+void ToolOptionsShortcutInvoker::toggleAssistantNextType() {
+ if (TApp::instance()->getCurrentTool()->getTool()->getName() ==
+ T_EditAssistants)
+ CommandManager::instance()
+ ->getAction("A_ToolOption_AssistantType")
+ ->trigger();
+ else
+ CommandManager::instance()->getAction(T_EditAssistants)->trigger();
+}
+
+void ToolOptionsShortcutInvoker::toggleAssistantLine() {
+ CommandManager::instance()->getAction(T_EditAssistants)->trigger();
+ CommandManager::instance()
+ ->getAction("A_ToolOption_AssistantType:assistantLine")
+ ->trigger();
+}
+
+void ToolOptionsShortcutInvoker::toggleAssistantEllipse() {
+ CommandManager::instance()->getAction(T_EditAssistants)->trigger();
+ CommandManager::instance()
+ ->getAction("A_ToolOption_AssistantType:assistantEllipse")
+ ->trigger();
+}
+
+void ToolOptionsShortcutInvoker::toggleAssistantPerspective() {
+ CommandManager::instance()->getAction(T_EditAssistants)->trigger();
+ CommandManager::instance()
+ ->getAction("A_ToolOption_AssistantType:assistantPerspective")
+ ->trigger();
+}
+
+void ToolOptionsShortcutInvoker::toggleAssistantVanishingPoint() {
+ CommandManager::instance()->getAction(T_EditAssistants)->trigger();
+ CommandManager::instance()
+ ->getAction("A_ToolOption_AssistantType:assistantVanishingPoint")
+ ->trigger();
+}
+
+void ToolOptionsShortcutInvoker::toggleAssistantFisheye() {
+ CommandManager::instance()->getAction(T_EditAssistants)->trigger();
+ CommandManager::instance()
+ ->getAction("A_ToolOption_AssistantType:assistantFisheye")
+ ->trigger();
+}
+
+void ToolOptionsShortcutInvoker::toggleAssistantReplicatorStar() {
+ CommandManager::instance()->getAction(T_EditAssistants)->trigger();
+ CommandManager::instance()
+ ->getAction("A_ToolOption_AssistantType:replicatorStar")
+ ->trigger();
+}
+
+void ToolOptionsShortcutInvoker::toggleAssistantReplicatorMirror() {
+ CommandManager::instance()->getAction(T_EditAssistants)->trigger();
+ CommandManager::instance()
+ ->getAction("A_ToolOption_AssistantType:replicatorMirror")
+ ->trigger();
+}
+
+void ToolOptionsShortcutInvoker::toggleAssistantReplicatorJitter() {
+ CommandManager::instance()->getAction(T_EditAssistants)->trigger();
+ CommandManager::instance()
+ ->getAction("A_ToolOption_AssistantType:replicatorJitter")
+ ->trigger();
+}
+
+void ToolOptionsShortcutInvoker::toggleAssistantReplicatorGrid() {
+ CommandManager::instance()->getAction(T_EditAssistants)->trigger();
+ CommandManager::instance()
+ ->getAction("A_ToolOption_AssistantType:replicatorGrid")
+ ->trigger();
+}
+
+void ToolOptionsShortcutInvoker::toggleAssistantReplicatorAffine() {
+ CommandManager::instance()->getAction(T_EditAssistants)->trigger();
+ CommandManager::instance()
+ ->getAction("A_ToolOption_AssistantType:replicatorAffine")
+ ->trigger();
+}
+
//---------------------------------------------------------------------------------------
/*-- Type tool + mode switching shortcuts --*/
void ToolOptionsShortcutInvoker::toggleTypeNextStyle() {
diff --git a/toonz/sources/toonz/tooloptionsshortcutinvoker.h b/toonz/sources/toonz/tooloptionsshortcutinvoker.h
index ad670cbb0..adde699ee 100644
--- a/toonz/sources/toonz/tooloptionsshortcutinvoker.h
+++ b/toonz/sources/toonz/tooloptionsshortcutinvoker.h
@@ -247,6 +247,19 @@ protected slots:
void toggleRGBPickerFreehand();
void toggleRGBPickerPolyline();
+ /*-- Edit Assistants tool + type switching shortcuts --*/
+ void toggleAssistantNextType();
+ void toggleAssistantLine();
+ void toggleAssistantEllipse();
+ void toggleAssistantPerspective();
+ void toggleAssistantVanishingPoint();
+ void toggleAssistantFisheye();
+ void toggleAssistantReplicatorStar();
+ void toggleAssistantReplicatorMirror();
+ void toggleAssistantReplicatorJitter();
+ void toggleAssistantReplicatorGrid();
+ void toggleAssistantReplicatorAffine();
+
/*-- Skeleton tool + mode switching shortcuts --*/
void ToggleSkeletonNextMode();
void ToggleSkeletonBuildSkeleton();