From d43bb0c485f53eb987ea9279e5da2bb93b40df08 Mon Sep 17 00:00:00 2001
From: melieconiek <42298081+melieconiek@users.noreply.github.com>
Date: Jan 02 2020 17:23:29 +0000
Subject: - Removed dialog bypass commands entirely.
---
diff --git a/toonz/sources/toonz/Resources/merge_wogroups.svg b/toonz/sources/toonz/Resources/merge_wogroups.svg
deleted file mode 100644
index f06cb6f..0000000
--- a/toonz/sources/toonz/Resources/merge_wogroups.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toonz/sources/toonz/columnselection.cpp b/toonz/sources/toonz/columnselection.cpp
index cd39953..c58e3ae 100644
--- a/toonz/sources/toonz/columnselection.cpp
+++ b/toonz/sources/toonz/columnselection.cpp
@@ -201,8 +201,6 @@ void TColumnSelection::selectColumn(int col, bool on) {
m_indices.erase(col);
CommandManager::instance()->enable(MI_MergeColumns, false);
- CommandManager::instance()->enable(MI_MergeColumnsWGroups, false);
- CommandManager::instance()->enable(MI_MergeColumnsWOGroups, false);
CommandManager::instance()->enable(MI_ApplyMatchLines, false);
CommandManager::instance()->enable(MI_MergeCmapped, false);
@@ -218,8 +216,6 @@ void TColumnSelection::selectColumn(int col, bool on) {
if (it == m_indices.end()) {
CommandManager::instance()->enable(MI_MergeColumns, true);
- CommandManager::instance()->enable(MI_MergeColumnsWGroups, true);
- CommandManager::instance()->enable(MI_MergeColumnsWOGroups, true);
return;
}
diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index 53cd490..2ac4133 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -1785,11 +1785,6 @@ void MainWindow::defineActions() {
QAction *mergeLevelsAction =
createMenuXsheetAction(MI_MergeColumns, tr("&Merge Levels"), "");
mergeLevelsAction->setIcon(QIcon(":Resources/merge.svg"));
- QAction *mergeLevelsWOGroupsAction =
- createMenuXsheetAction(MI_MergeColumnsWOGroups, tr("&Merge Levels (Do Not Group Vector Levels)"), "");
- mergeLevelsWOGroupsAction->setIcon(QIcon(":Resources/merge_wogroups.svg"));
- QAction *mergeLevelsWGroupsAction =
- createMenuXsheetAction(MI_MergeColumnsWGroups, tr("&Merge Levels (Group Vector Levels)"), "");
createMenuXsheetAction(MI_InsertFx, tr("&New FX..."), "Ctrl+F");
QAction *newOutputAction =
createMenuXsheetAction(MI_NewOutputFx, tr("&New Output"), "Alt+O");
diff --git a/toonz/sources/toonz/matchlinecommand.cpp b/toonz/sources/toonz/matchlinecommand.cpp
index a12ee9b..f77ded0 100644
--- a/toonz/sources/toonz/matchlinecommand.cpp
+++ b/toonz/sources/toonz/matchlinecommand.cpp
@@ -167,75 +167,6 @@ public:
} MergeColumnsCommand;
//*****************************************************************************
-// MergeColumns /wo Groups command
-//*****************************************************************************
-
-class MergeColumnsCommandWOGroups final : public MenuItemHandler {
-public:
- MergeColumnsCommandWOGroups() : MenuItemHandler(MI_MergeColumnsWOGroups) {}
-
- void execute() override {
- TColumnSelection *selection =
- dynamic_cast(TSelection::getCurrent());
-
- std::set indices =
- selection ? selection->getIndices() : std::set();
-
- if (indices.empty()) {
- DVGui::warning(QObject::tr(
- "It is not possible to execute the merge column command because "
- "no column was selected."));
- return;
- }
-
- if (indices.size() == 1) {
- DVGui::warning(QObject::tr(
- "It is not possible to execute the merge column command because "
- "only one columns is selected."));
- return;
- }
-
- mergeColumns(indices, false);
- TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
- }
-
-} MergeColumnsWOGroupsCommand;
-
-//*****************************************************************************
-// MergeColumns /w Groups command
-//*****************************************************************************
-
-class MergeColumnsCommandWGroups final : public MenuItemHandler {
-public:
- MergeColumnsCommandWGroups() : MenuItemHandler(MI_MergeColumnsWGroups) {}
-
- void execute() override {
- TColumnSelection *selection =
- dynamic_cast(TSelection::getCurrent());
-
- std::set indices =
- selection ? selection->getIndices() : std::set();
-
- if (indices.empty()) {
- DVGui::warning(QObject::tr(
- "It is not possible to execute the merge column command because "
- "no column was selected."));
- return;
- }
-
- if (indices.size() == 1) {
- DVGui::warning(QObject::tr(
- "It is not possible to execute the merge column command because "
- "only one columns is selected."));
- return;
- }
-
- mergeColumns(indices, true);
- TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
- }
-} MergeColumnsWGroupsCommand;
-
-//*****************************************************************************
// ApplyMatchlines command
//*****************************************************************************
diff --git a/toonz/sources/toonz/menubar.cpp b/toonz/sources/toonz/menubar.cpp
index ae90d2c..7be2a2f 100644
--- a/toonz/sources/toonz/menubar.cpp
+++ b/toonz/sources/toonz/menubar.cpp
@@ -1255,7 +1255,6 @@ QMenuBar *StackedMenuBar::createFullMenuBar() {
addMenuItem(xsheetMenu, MI_MergeCmapped);
xsheetMenu->addSeparator();
addMenuItem(xsheetMenu, MI_MergeColumns);
- addMenuItem(xsheetMenu, MI_MergeColumnsWOGroups);
addMenuItem(xsheetMenu, MI_DeleteMatchLines);
addMenuItem(xsheetMenu, MI_DeleteInk);
xsheetMenu->addSeparator();
diff --git a/toonz/sources/toonz/menubarcommandids.h b/toonz/sources/toonz/menubarcommandids.h
index 7c55b1c..f8dd74e 100644
--- a/toonz/sources/toonz/menubarcommandids.h
+++ b/toonz/sources/toonz/menubarcommandids.h
@@ -131,8 +131,6 @@
#define MI_ApplyMatchLines "MI_ApplyMatchLines"
#define MI_MergeCmapped "MI_MergeCmapped"
#define MI_MergeColumns "MI_MergeColumns"
-#define MI_MergeColumnsWGroups "MI_MergeColumnsWGroups"
-#define MI_MergeColumnsWOGroups "MI_MergeColumnsWOGroups"
#define MI_DeleteMatchLines "MI_DeleteMatchLines"
#define MI_DeleteInk "MI_DeleteInk"
#define MI_InsertSceneFrame "MI_InsertSceneFrame"
diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc
index 31171ba..2a15dc3 100644
--- a/toonz/sources/toonz/toonz.qrc
+++ b/toonz/sources/toonz/toonz.qrc
@@ -143,7 +143,6 @@
Resources/magnet_rollover.svg
Resources/menu.svg
Resources/merge.svg
- Resources/merge_wogroups.svg
Resources/motionpath_fileicon.svg
Resources/motionpath.svg
Resources/motionpath_delete.svg