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

Switch parameter order on createToolOptionsAction()

Browse source
This commit is contained in:
manongjohn 2023-07-11 21:33:55 -04:00
parent 017754a47c
commit 3e46c14f13
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
toonz/sources/toonz/mainwindow.cpp
View file

@ -1696,8 +1696,8 @@ QAction *MainWindow::createMiscAction(const char *id, const char *name,
QAction *MainWindow::createToolOptionsAction(const char *id, const char *name,
const QString &defaultShortcut,
QString newStatusTip,
const char *iconSVGName) {
const char *iconSVGName,
QString newStatusTip) {
QAction *action = new DVAction(tr(name), this);
if (iconSVGName && *iconSVGName)
action->setIcon(createQIcon(iconSVGName, false, true));
@ -3016,13 +3016,13 @@ void MainWindow::defineActions() {
createToolOptionsAction("A_ToolOption_Mode", QT_TR_NOOP("Mode"), "");
menuAct =
createToolOptionsAction("A_ToolOption_Mode:Areas",
QT_TR_NOOP("Mode - Areas"), "", "", "mode_areas");
QT_TR_NOOP("Mode - Areas"), "", "mode_areas", "");
menuAct =
createToolOptionsAction("A_ToolOption_Mode:Lines",
QT_TR_NOOP("Mode - Lines"), "", "", "mode_lines");
QT_TR_NOOP("Mode - Lines"), "", "mode_lines", "");
menuAct = createToolOptionsAction("A_ToolOption_Mode:Lines & Areas",
QT_TR_NOOP("Mode - Lines && Areas"), "", "",
"mode_areas_lines");
QT_TR_NOOP("Mode - Lines && Areas"), "",
"mode_areas_lines", "");
createToolOptionsAction("A_ToolOption_Mode:Endpoint to Endpoint",
QT_TR_NOOP("Mode - Endpoint to Endpoint"), "");
createToolOptionsAction("A_ToolOption_Mode:Endpoint to Line",
@ -3032,28 +3032,28 @@ void MainWindow::defineActions() {
createToolOptionsAction("A_ToolOption_Type", QT_TR_NOOP("Type"), "");
menuAct = createToolOptionsAction("A_ToolOption_Type:Normal",
QT_TR_NOOP("Type - Normal"), "", "",
"type_normal");
QT_TR_NOOP("Type - Normal"), "",
"type_normal", "");
menuAct = createToolOptionsAction("A_ToolOption_Type:Rectangular",
QT_TR_NOOP("Type - Rectangular"), "F5", "",
"type_rectangular");
QT_TR_NOOP("Type - Rectangular"), "F5",
"type_rectangular", "");
menuAct = createToolOptionsAction("A_ToolOption_Type:Freehand",
QT_TR_NOOP("Type - Freehand"), "", "",
"type_lasso");
QT_TR_NOOP("Type - Freehand"), "",
"type_lasso", "");
menuAct = createToolOptionsAction("A_ToolOption_Type:Polyline",
QT_TR_NOOP("Type - Polyline"), "", "",
"type_polyline");
QT_TR_NOOP("Type - Polyline"), "",
"type_polyline", "");
menuAct = createToolOptionsAction("A_ToolOption_Type:Freepick",
QT_TR_NOOP("Type - Pick+Freehand"), "", "",
"type_pickerlasso");
QT_TR_NOOP("Type - Pick+Freehand"), "",
"type_pickerlasso", "");
menuAct = createToolOptionsAction("A_ToolOption_Type:Segment",
QT_TR_NOOP("Type - Segment"), "", "",
"type_erase_segment");
QT_TR_NOOP("Type - Segment"), "",
"type_erase_segment", "");
createToolOptionsAction("A_ToolOption_TypeFont", QT_TR_NOOP("TypeTool Font"),
"");

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

@ -216,8 +216,8 @@ private:
QString newStatusTip = "");
QAction *createToolOptionsAction(const char *id, const char *name,
const QString &defaultShortcut,
QString newStatusTip = "",
const char *iconSVGName = "");
const char *iconSVGName = "",
QString newStatusTip = "");
QAction *createStopMotionAction(const char *id, const char *name,
const QString &defaultShortcut,
const char *iconSVGName = "",