From 82996a4f0f6494aaedc014571f88fd31d6c54939 Mon Sep 17 00:00:00 2001 From: Jeremy Bullock Date: Tue, 6 Oct 2020 19:10:46 -0600 Subject: [PATCH] Change Column Insert Defaults (#307) --- .../rooms/Default/menubar_template.xml | 4 ++-- .../layouts/shortcuts/deftahoma2d.ini | 4 ++-- stuff/profiles/layouts/shortcuts/otadobe.ini | 4 ++-- .../profiles/layouts/shortcuts/otharmony.ini | 4 ++-- stuff/profiles/layouts/shortcuts/otretas.ini | 4 ++-- .../include/toonzqt/selectioncommandids.h | 4 ++-- toonz/sources/toonz/columnselection.cpp | 12 +++++----- toonz/sources/toonz/columnselection.h | 4 ++-- toonz/sources/toonz/mainwindow.cpp | 6 ++--- toonz/sources/toonz/menubar.cpp | 4 ++-- toonz/sources/toonz/xshcolumnviewer.cpp | 24 +++++++++---------- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/stuff/profiles/layouts/rooms/Default/menubar_template.xml b/stuff/profiles/layouts/rooms/Default/menubar_template.xml index ea1ac542..d09534a3 100644 --- a/stuff/profiles/layouts/rooms/Default/menubar_template.xml +++ b/stuff/profiles/layouts/rooms/Default/menubar_template.xml @@ -55,11 +55,11 @@ MI_Cut MI_Copy MI_Paste - MI_PasteAbove + MI_PasteBelow MI_PasteInto MI_PasteDuplicate MI_Insert - MI_InsertAbove + MI_InsertBelow MI_Clear MI_SelectAll diff --git a/stuff/profiles/layouts/shortcuts/deftahoma2d.ini b/stuff/profiles/layouts/shortcuts/deftahoma2d.ini index 41073638..7e8b4c97 100644 --- a/stuff/profiles/layouts/shortcuts/deftahoma2d.ini +++ b/stuff/profiles/layouts/shortcuts/deftahoma2d.ini @@ -169,7 +169,7 @@ MI_IncreaseStep="'" MI_Increment= MI_Ink1Check= MI_Insert=Ins -MI_InsertAbove=Shift+Ins +MI_InsertBelow=Shift+Ins MI_InsertFx=Ctrl+F MI_InsertGlobalKeyframe= MI_InsertSceneFrame= @@ -245,7 +245,7 @@ MI_OpenXshView= MI_OutputSettings=Ctrl+O MI_OverwritePalette= MI_Paste=Ctrl+V -MI_PasteAbove=Ctrl+Shift+V +MI_PasteBelow=Ctrl+Shift+V MI_PasteColors= MI_PasteInto= MI_PasteNames= diff --git a/stuff/profiles/layouts/shortcuts/otadobe.ini b/stuff/profiles/layouts/shortcuts/otadobe.ini index 0180bfba..842e8cf3 100644 --- a/stuff/profiles/layouts/shortcuts/otadobe.ini +++ b/stuff/profiles/layouts/shortcuts/otadobe.ini @@ -169,7 +169,7 @@ MI_IncreaseStep="+" MI_Increment= MI_Ink1Check= MI_Insert=Ins -MI_InsertAbove= +MI_InsertBelow= MI_InsertFx= MI_InsertGlobalKeyframe= MI_InsertSceneFrame= @@ -245,7 +245,7 @@ MI_OpenXshView= MI_OutputSettings= MI_OverwritePalette= MI_Paste=Ctrl+V -MI_PasteAbove= +MI_PasteBelow= MI_PasteColors= MI_PasteInto= MI_PasteNames= diff --git a/stuff/profiles/layouts/shortcuts/otharmony.ini b/stuff/profiles/layouts/shortcuts/otharmony.ini index 751f3214..01279294 100644 --- a/stuff/profiles/layouts/shortcuts/otharmony.ini +++ b/stuff/profiles/layouts/shortcuts/otharmony.ini @@ -169,7 +169,7 @@ MI_IncreaseStep="+" MI_Increment= MI_Ink1Check= MI_Insert=Ins -MI_InsertAbove= +MI_InsertBelow= MI_InsertFx= MI_InsertGlobalKeyframe= MI_InsertSceneFrame= @@ -245,7 +245,7 @@ MI_OpenXshView= MI_OutputSettings= MI_OverwritePalette= MI_Paste=Ctrl+V -MI_PasteAbove= +MI_PasteBelow= MI_PasteColors= MI_PasteInto= MI_PasteNames= diff --git a/stuff/profiles/layouts/shortcuts/otretas.ini b/stuff/profiles/layouts/shortcuts/otretas.ini index 82836cca..b53f97e9 100644 --- a/stuff/profiles/layouts/shortcuts/otretas.ini +++ b/stuff/profiles/layouts/shortcuts/otretas.ini @@ -169,7 +169,7 @@ MI_IncreaseStep="+" MI_Increment= MI_Ink1Check= MI_Insert=Ins -MI_InsertAbove= +MI_InsertBelow= MI_InsertFx= MI_InsertGlobalKeyframe= MI_InsertSceneFrame= @@ -245,7 +245,7 @@ MI_OpenXshView= MI_OutputSettings= MI_OverwritePalette= MI_Paste=Ctrl+V -MI_PasteAbove= +MI_PasteBelow= MI_PasteColors= MI_PasteInto= MI_PasteNames= diff --git a/toonz/sources/include/toonzqt/selectioncommandids.h b/toonz/sources/include/toonzqt/selectioncommandids.h index 6d545421..0c1f7a04 100644 --- a/toonz/sources/include/toonzqt/selectioncommandids.h +++ b/toonz/sources/include/toonzqt/selectioncommandids.h @@ -6,9 +6,9 @@ #define MI_Cut "MI_Cut" #define MI_Copy "MI_Copy" #define MI_Insert "MI_Insert" -#define MI_InsertAbove "MI_InsertAbove" +#define MI_InsertBelow "MI_InsertBelow" #define MI_Paste "MI_Paste" -#define MI_PasteAbove "MI_PasteAbove" +#define MI_PasteBelow "MI_PasteBelow" #define MI_PasteInto "MI_PasteInto" #define MI_PasteDuplicate "MI_PasteDuplicate" #define MI_PasteValues "MI_PasteValues" diff --git a/toonz/sources/toonz/columnselection.cpp b/toonz/sources/toonz/columnselection.cpp index c58e3aea..56e34a88 100644 --- a/toonz/sources/toonz/columnselection.cpp +++ b/toonz/sources/toonz/columnselection.cpp @@ -40,9 +40,9 @@ void TColumnSelection::enableCommands() { enableCommand(this, MI_Cut, &TColumnSelection::cutColumns); enableCommand(this, MI_Copy, &TColumnSelection::copyColumns); enableCommand(this, MI_Paste, &TColumnSelection::pasteColumns); - enableCommand(this, MI_PasteAbove, &TColumnSelection::pasteColumnsAbove); + enableCommand(this, MI_PasteBelow, &TColumnSelection::pasteColumnsBelow); enableCommand(this, MI_Clear, &TColumnSelection::deleteColumns); - enableCommand(this, MI_InsertAbove, &TColumnSelection::insertColumnsAbove); + enableCommand(this, MI_InsertBelow, &TColumnSelection::insertColumnsBelow); enableCommand(this, MI_Insert, &TColumnSelection::insertColumns); enableCommand(this, MI_Collapse, &TColumnSelection::collapse); enableCommand(this, MI_ExplodeChild, &TColumnSelection::explodeChild); @@ -70,7 +70,7 @@ void TColumnSelection::copyColumns() { //----------------------------------------------------------------------------- // pasteColumns will insert columns before the first column in the selection -void TColumnSelection::pasteColumns() { +void TColumnSelection::pasteColumnsBelow() { std::set indices; if (isEmpty()) // in case that no columns are selected indices.insert(0); @@ -83,7 +83,7 @@ void TColumnSelection::pasteColumns() { //----------------------------------------------------------------------------- // pasteColumnsAbove will insert columns after the last column in the selection -void TColumnSelection::pasteColumnsAbove() { +void TColumnSelection::pasteColumns() { std::set indices; if (isEmpty()) { // in case that no columns are selected TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); @@ -107,13 +107,13 @@ void TColumnSelection::cutColumns() { //----------------------------------------------------------------------------- -void TColumnSelection::insertColumns() { +void TColumnSelection::insertColumnsBelow() { ColumnCmd::insertEmptyColumns(m_indices); } //----------------------------------------------------------------------------- -void TColumnSelection::insertColumnsAbove() { +void TColumnSelection::insertColumns() { ColumnCmd::insertEmptyColumns(m_indices, true); } diff --git a/toonz/sources/toonz/columnselection.h b/toonz/sources/toonz/columnselection.h index fad22531..74737016 100644 --- a/toonz/sources/toonz/columnselection.h +++ b/toonz/sources/toonz/columnselection.h @@ -33,11 +33,11 @@ public: void copyColumns(); void pasteColumns(); - void pasteColumnsAbove(); + void pasteColumnsBelow(); void deleteColumns(); void cutColumns(); void insertColumns(); - void insertColumnsAbove(); + void insertColumnsBelow(); void collapse(); void explodeChild(); diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index 0178165b..d2af6315 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -1902,8 +1902,8 @@ void MainWindow::defineActions() { menuAct = createMenuEditAction(MI_Paste, tr("&Paste Insert"), "Ctrl+V"); menuAct->setIcon(createQIcon("paste")); - menuAct = createMenuEditAction(MI_PasteAbove, tr("&Paste Insert Above/After"), - "Ctrl+Shift+V"); + menuAct = createMenuEditAction( + MI_PasteBelow, tr("&Paste Insert Below/Before"), "Ctrl+Shift+V"); menuAct->setIcon(createQIcon("paste_above_after")); menuAct = createMenuEditAction(MI_PasteDuplicate, tr("&Paste as a Copy"), ""); menuAct->setIcon(createQIcon("paste_duplicate")); @@ -1926,7 +1926,7 @@ void MainWindow::defineActions() { createMenuEditAction(MI_ClearFrames, tr("&Clear Frames"), ""); menuAct = createMenuEditAction(MI_Insert, tr("&Insert"), "Ins"); menuAct->setIcon(createQIcon("insert")); - menuAct = createMenuEditAction(MI_InsertAbove, tr("&Insert Above/After"), + menuAct = createMenuEditAction(MI_InsertBelow, tr("&Insert Below/Before"), "Shift+Ins"); menuAct->setIcon(createQIcon("insert_above_after")); menuAct = createMenuEditAction(MI_Group, tr("&Group"), "Ctrl+G"); diff --git a/toonz/sources/toonz/menubar.cpp b/toonz/sources/toonz/menubar.cpp index a28029cc..50f8cec3 100644 --- a/toonz/sources/toonz/menubar.cpp +++ b/toonz/sources/toonz/menubar.cpp @@ -426,12 +426,12 @@ QMenuBar *StackedMenuBar::createFullMenuBar() { addMenuItem(editMenu, MI_Cut); addMenuItem(editMenu, MI_Copy); addMenuItem(editMenu, MI_Paste); - addMenuItem(editMenu, MI_PasteAbove); + addMenuItem(editMenu, MI_PasteBelow); // addMenuItem(editMenu, MI_PasteNew); addMenuItem(editMenu, MI_PasteInto); addMenuItem(editMenu, MI_PasteDuplicate); addMenuItem(editMenu, MI_Insert); - addMenuItem(editMenu, MI_InsertAbove); + addMenuItem(editMenu, MI_InsertBelow); addMenuItem(editMenu, MI_Clear); editMenu->addSeparator(); addMenuItem(editMenu, MI_SelectAll); diff --git a/toonz/sources/toonz/xshcolumnviewer.cpp b/toonz/sources/toonz/xshcolumnviewer.cpp index 12dc5467..546f7d86 100644 --- a/toonz/sources/toonz/xshcolumnviewer.cpp +++ b/toonz/sources/toonz/xshcolumnviewer.cpp @@ -2713,10 +2713,10 @@ void ColumnArea::contextMenuEvent(QContextMenuEvent *event) { menu.addAction(cmdManager->getAction(MI_Cut)); menu.addAction(cmdManager->getAction(MI_Copy)); menu.addAction(cmdManager->getAction(MI_Paste)); - menu.addAction(cmdManager->getAction(MI_PasteAbove)); + menu.addAction(cmdManager->getAction(MI_PasteBelow)); menu.addAction(cmdManager->getAction(MI_Clear)); menu.addAction(cmdManager->getAction(MI_Insert)); - menu.addAction(cmdManager->getAction(MI_InsertAbove)); + menu.addAction(cmdManager->getAction(MI_InsertBelow)); menu.addSeparator(); menu.addAction(cmdManager->getAction(MI_InsertFx)); menu.addAction(cmdManager->getAction(MI_NewNoteLevel)); @@ -2821,23 +2821,23 @@ void ColumnArea::contextMenuEvent(QContextMenuEvent *event) { } QAction *act = cmdManager->getAction(MI_Insert), - *act2 = cmdManager->getAction(MI_InsertAbove), + *act2 = cmdManager->getAction(MI_InsertBelow), *act3 = cmdManager->getAction(MI_Paste), - *act4 = cmdManager->getAction(MI_PasteAbove); + *act4 = cmdManager->getAction(MI_PasteBelow); QString actText = act->text(), act2Text = act2->text(), act3Text = act3->text(), act4Text = act4->text(); if (o->isVerticalTimeline()) { - act->setText(tr("&Insert Before")); - act2->setText(tr("&Insert After")); - act3->setText(tr("&Paste Insert Before")); - act4->setText(tr("&Paste Insert After")); + act->setText(tr("&Insert After")); + act2->setText(tr("&Insert Before")); + act3->setText(tr("&Paste Insert After")); + act4->setText(tr("&Paste Insert Before")); } else { - act->setText(tr("&Insert Below")); - act2->setText(tr("&Insert Above")); - act3->setText(tr("&Paste Insert Below")); - act4->setText(tr("&Paste Insert Above")); + act->setText(tr("&Insert Above")); + act2->setText(tr("&Insert Below")); + act3->setText(tr("&Paste Insert Above")); + act4->setText(tr("&Paste Insert Below")); } menu.exec(event->globalPos());