- Removed dialog bypass commands entirely.

toonz/sources/toonz/Resources/merge_wogroups.svg

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg843"
-   style="clip-rule:evenodd;fill-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5"
-   xml:space="preserve"
-   version="1.1"
-   viewBox="0 0 18 18"
-   height="18"
-   width="18"><metadata
-     id="metadata849"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs847"><marker
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="DistanceStart"
-       style="overflow:visible"><g
-         style="stroke:#181818;stroke-opacity:1;fill:#181818;fill-opacity:1"
-         id="g2300"><path
-           id="path2306"
-           d="M 0,0 L 2,0"
-           style="fill:#181818;stroke:#181818;stroke-width:1.15;stroke-linecap:square;stroke-opacity:1;fill-opacity:1" /><path
-           id="path2302"
-           d="M 0,0 L 13,4 L 9,0 13,-4 L 0,0 z "
-           style="fill:#181818;fill-rule:evenodd;stroke:#181818;stroke-opacity:1;fill-opacity:1" /><path
-           id="path2304"
-           d="M 0,-4 L 0,40"
-           style="fill:#181818;stroke:#181818;stroke-width:1;stroke-linecap:square;stroke-opacity:1;fill-opacity:1" /></g></marker></defs><path
-     id="path833"
-     style="fill:#ffffff"
-     d="M 7.045,1.026 12.5,1 v 3 l 4,-0.086 V 17 h -11 v -2 h -4 V 6.476 Z" /><path
-     id="path835"
-     style="fill:#181818;fill-opacity:1"
-     d="m 12.5,4 4,-0.086 V 17 h -11 v -2 h -4 V 6.476 L 7.045,1.026 12.5,1 Z M 7.308,1.664 2.14,6.744 V 14.36 H 5.5 l 0.063,0.004 0.062,0.009 0.061,0.015 0.059,0.021 0.056,0.027 0.054,0.032 0.051,0.038 0.046,0.042 0.042,0.046 0.038,0.051 0.032,0.054 0.027,0.056 0.021,0.059 0.015,0.061 0.009,0.062 L 6.14,15 v 1.36 h 9.72 V 4.567 L 12.514,4.639 12.45,4.638 12.387,4.629 12.325,4.615 12.265,4.595 12.207,4.568 12.152,4.536 12.1,4.499 12.053,4.457 12.009,4.41 11.971,4.36 11.938,4.305 11.91,4.248 11.889,4.188 11.873,4.126 11.864,4.064 11.86,4 V 1.643 Z" /><path
-     id="rect5579"
-     d="M 6.4999999,6.476 V 9.9875 L 9.5,10 V 6.4765625 Z M 9.5,10.013672 v 3.523437 l 3,0.01389 v -3.537328 z"
-     style="opacity:1;vector-effect:none;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.47;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke" /><path
-     id="path837"
-     style="fill:none;fill-opacity:1;stroke:#181818;stroke-width:0.47;stroke-miterlimit:1.5;stroke-dasharray:1.41,1.41,0,0;stroke-dashoffset:0"
-     d="M 12.5,6.476 H 6.4999999 v 7.023 L 12.5,13.551 Z" /><path
-     id="path841"
-     style="fill:#181818;stroke:none"
-     d="M 5.98,6.476 1.5,6.803 7.372,1.024 Z" /><path
-     id="path839"
-     style="fill:#d8d8d8"
-     d="M 5.435,5.825 3.32,5.979 6.092,3.251 Z" /></svg>

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;
   }
 

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");

toonz/sources/toonz/matchlinecommand.cpp

@@ -166,75 +166,6 @@ public:
 
 } MergeColumnsCommand;
 
-//*****************************************************************************
-//    MergeColumns /wo Groups  command
-//*****************************************************************************
-
-class MergeColumnsCommandWOGroups final : public MenuItemHandler {
-public:
-  MergeColumnsCommandWOGroups() : MenuItemHandler(MI_MergeColumnsWOGroups) {}
-
-  void execute() override {
-    TColumnSelection *selection =
-        dynamic_cast<TColumnSelection *>(TSelection::getCurrent());
-
-    std::set<int> indices =
-        selection ? selection->getIndices() : std::set<int>();
-
-    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<TColumnSelection *>(TSelection::getCurrent());
-
-    std::set<int> indices =
-        selection ? selection->getIndices() : std::set<int>();
-
-    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
 //*****************************************************************************

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();

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"

toonz/sources/toonz/toonz.qrc

@@ -143,7 +143,6 @@
         <file>Resources/magnet_rollover.svg</file>
         <file>Resources/menu.svg</file>
         <file>Resources/merge.svg</file>
-        <file>Resources/merge_wogroups.svg</file>
         <file>Resources/motionpath_fileicon.svg</file>
         <file>Resources/motionpath.svg</file>
         <file>Resources/motionpath_delete.svg</file>