Merge pull request #5235 from manongjohn/xsheet_breadcrumbs

Sub-Xsheet Navigation Bar

stuff/config/qss/Blue/Blue.qss

@@ -2267,6 +2267,14 @@ Ruler {
 #RenameCellField {
   padding-right: 3;
 }
+#XsheetBreadcrumbs {
+  padding: 0 5px 0 5px;
+  margin: 0;
+  border-bottom: 1 solid #262728;
+}
+#XsheetBreadcrumbs::separator:horizontal {
+  margin: 0 0 0 2;
+}
 /* xsheetColumnHeader (Context Menus)
 ----------------------------------------------------------------------------- */
 #xsheetColumnAreaMenu_Preview {

stuff/config/qss/Dark/Dark.qss

@@ -2267,6 +2267,14 @@ Ruler {
 #RenameCellField {
   padding-right: 3;
 }
+#XsheetBreadcrumbs {
+  padding: 0 5px 0 5px;
+  margin: 0;
+  border-bottom: 1 solid #111111;
+}
+#XsheetBreadcrumbs::separator:horizontal {
+  margin: 0 0 0 2;
+}
 /* xsheetColumnHeader (Context Menus)
 ----------------------------------------------------------------------------- */
 #xsheetColumnAreaMenu_Preview {

stuff/config/qss/Default/Default.qss

@@ -2267,6 +2267,14 @@ Ruler {
 #RenameCellField {
   padding-right: 3;
 }
+#XsheetBreadcrumbs {
+  padding: 0 5px 0 5px;
+  margin: 0;
+  border-bottom: 1 solid #2c2c2c;
+}
+#XsheetBreadcrumbs::separator:horizontal {
+  margin: 0 0 0 2;
+}
 /* xsheetColumnHeader (Context Menus)
 ----------------------------------------------------------------------------- */
 #xsheetColumnAreaMenu_Preview {

stuff/config/qss/Default/less/layouts/xsheet.less

@@ -40,6 +40,15 @@
   padding-right: 3;
 }
 
+#XsheetBreadcrumbs {
+  padding: 0 5px 0 5px;
+  margin: 0;
+  border-bottom: 1 solid @accent;
+  &::separator:horizontal {
+    margin: 0 0 0 2;
+  }
+}
+
 /* xsheetColumnHeader (Context Menus)
 ----------------------------------------------------------------------------- */
 

stuff/config/qss/Light/Light.qss

@@ -2267,6 +2267,14 @@ Ruler {
 #RenameCellField {
   padding-right: 3;
 }
+#XsheetBreadcrumbs {
+  padding: 0 5px 0 5px;
+  margin: 0;
+  border-bottom: 1 solid #a8a8a8;
+}
+#XsheetBreadcrumbs::separator:horizontal {
+  margin: 0 0 0 2;
+}
 /* xsheetColumnHeader (Context Menus)
 ----------------------------------------------------------------------------- */
 #xsheetColumnAreaMenu_Preview {

stuff/config/qss/Neutral/Neutral.qss

@@ -2267,6 +2267,14 @@ Ruler {
 #RenameCellField {
   padding-right: 3;
 }
+#XsheetBreadcrumbs {
+  padding: 0 5px 0 5px;
+  margin: 0;
+  border-bottom: 1 solid #5a5a5a;
+}
+#XsheetBreadcrumbs::separator:horizontal {
+  margin: 0 0 0 2;
+}
 /* xsheetColumnHeader (Context Menus)
 ----------------------------------------------------------------------------- */
 #xsheetColumnAreaMenu_Preview {

toonz/sources/include/toonz/childstack.h

@@ -5,6 +5,8 @@
 
 #include "tcommon.h"
 
+#include "toonz/txshchildlevel.h"
+
 #undef DVAPI
 #undef DVVAR
 #ifdef TOONZLIB_EXPORTS
@@ -36,11 +38,29 @@ class TXshChildLevel;
    properties, getAncestor(), getAncestorCount(), getAncestorAffine(),
    getTopXsheet().
 */
+
 //=============================================================================
+//! The Node class is a container of element necessary to define a sub-xsheet.
+/*!
+   The class contain a pointer to \b TXsheet \b m_xsheet, two integer to
+   identify column
+   \b m_col and row \b m_row, a \b TXshChildLevelP \b m_cl and a bool \b
+   m_justCreated.
+*/
+
+class AncestorNode {
+public:
+  TXsheet *m_xsheet;
+  int m_row, m_col;
+  std::map<int, int> m_rowTable;
+  TXshChildLevelP m_cl;
+  bool m_justCreated;
+  AncestorNode()
+      : m_xsheet(0), m_row(0), m_col(0), m_rowTable(), m_justCreated(false) {}
+};
 
 class DVAPI ChildStack {
-  class Node;
-  std::vector<Node *> m_stack;
+  std::vector<AncestorNode *> m_stack;
   TXsheet *m_xsheet;
   ToonzScene *m_scene;
 
@@ -114,6 +134,8 @@ visible in \b row.
 */
   bool getAncestorAffine(TAffine &aff, int row) const;
 
+  AncestorNode *getAncestorInfo(int ancestorDepth);
+
 private:
   // not implemented
   ChildStack(const ChildStack &);

toonz/sources/include/toonz/preferences.h

@@ -390,6 +390,9 @@ class DVAPI Preferences final : public QObject  // singleton
   bool isShowXSheetToolbarEnabled() const {
     return getBoolValue(showXSheetToolbar);
   }
+  bool isShowXsheetBreadcrumbsEnabled() const {
+    return getBoolValue(showXsheetBreadcrumbs);
+  }
   bool isExpandFunctionHeaderEnabled() const {
     return getBoolValue(expandFunctionHeader);
   }

toonz/sources/include/toonz/preferencesitemids.h

@@ -130,6 +130,7 @@ enum PreferencesItemId {
   inputCellsWithoutDoubleClickingEnabled,
   shortcutCommandsWhileRenamingCellEnabled,
   showXSheetToolbar,
+  showXsheetBreadcrumbs,
   expandFunctionHeader,
   showColumnNumbers,
   unifyColumnVisibilityToggles,

toonz/sources/toonz/CMakeLists.txt

@@ -146,13 +146,15 @@ if(PLATFORM EQUAL 64)
         cameracapturelevelcontrol.h
         penciltestpopup.h
         navtageditorpopup.h
+        xshbreadcrumbs.h
     )
 else()
     set(MOC_HEADERS
         ${MOC_HEADERS}
         cameracapturelevelcontrol_qt.h
         penciltestpopup_qt.h
         navtageditorpopup.h
+        xshbreadcrumbs.h
     )
 endif()
 
@@ -404,13 +406,15 @@ if(PLATFORM EQUAL 64)
         cameracapturelevelcontrol.cpp
         penciltestpopup.cpp
         navtageditorpopup.cpp
+        xshbreadcrumbs.cpp
     )
 else()
     set(SOURCES
         ${SOURCES}
         cameracapturelevelcontrol_qt.cpp
         penciltestpopup_qt.cpp
         navtageditorpopup.cpp
+        xshbreadcrumbs.cpp
     )
 endif()
 

toonz/sources/toonz/mainwindow.cpp

@@ -2309,6 +2309,9 @@ void MainWindow::defineActions() {
                              "view_file");
   createRightClickMenuAction(MI_ToggleXSheetToolbar,
                              QT_TR_NOOP("Toggle XSheet Toolbar"), "");
+  createRightClickMenuAction(MI_ToggleXsheetBreadcrumbs,
+                             QT_TR_NOOP("Toggle Sub-Xsheet Navigation Bar"), "",
+                             "toggle_sub_nav");
   createRightClickMenuAction(MI_ToggleXsheetCameraColumn,
                              QT_TR_NOOP("Show/Hide Xsheet Camera Column"), "");
   createRightClickMenuAction(MI_SetKeyframes, QT_TR_NOOP("&Set Key"), "Z",

toonz/sources/toonz/menubarcommandids.h

@@ -313,6 +313,7 @@
 #define MI_UnlockAllColumns "MI_UnlockAllColumns"
 #define MI_ToggleColumnLocks "MI_ToggleColumnLocks"
 #define MI_ToggleXSheetToolbar "MI_ToggleXSheetToolbar"
+#define MI_ToggleXsheetBreadcrumbs "MI_ToggleXsheetBreadcrumbs"
 #define MI_FoldColumns "MI_FoldColumns"
 #define MI_ToggleXsheetCameraColumn "MI_ToggleXsheetCameraColumn"
 #define MI_ToggleCurrentTimeIndicator "MI_ToggleCurrentTimeIndicator"

toonz/sources/toonz/preferencespopup.cpp

@@ -687,6 +687,13 @@ void PreferencesPopup::onUnifyColumnVisibilityTogglesChanged() {
 
 //-----------------------------------------------------------------------------
 
+void PreferencesPopup::onShowXsheetBreadcrumbsClicked() {
+  TApp::instance()->getCurrentScene()->notifyPreferenceChanged(
+      "XsheetBreadcrumbs");
+}
+
+//-----------------------------------------------------------------------------
+
 void PreferencesPopup::onModifyExpressionOnMovingReferencesChanged() {
   TApp::instance()->getCurrentScene()->notifyPreferenceChanged(
       "modifyExpressionOnMovingReferences");
@@ -1284,8 +1291,9 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {
       {shortcutCommandsWhileRenamingCellEnabled,
        tr("Enable OpenToonz Commands' Shortcut Keys While Renaming Cell")},
       {showXSheetToolbar, tr("Show Toolbar in the Xsheet")},
+      {showXsheetBreadcrumbs, tr("Show Sub-Xsheet Navigation Bar")},
       {expandFunctionHeader,
-       tr("Expand Function Editor Header to Match Xsheet Toolbar Height*")},
+       tr("Expand Function Editor Header to Match Xsheet Header Height*")},
       {showColumnNumbers, tr("Show Column Numbers in Column Headers")},
       {unifyColumnVisibilityToggles,
        tr("Unify Preview and Camstand Visibility Toggles")},
@@ -2024,8 +2032,12 @@ QWidget* PreferencesPopup::createXsheetPage() {
   insertUI(useArrowKeyToShiftCellSelection, lay);
   insertUI(inputCellsWithoutDoubleClickingEnabled, lay);
   insertUI(shortcutCommandsWhileRenamingCellEnabled, lay);
-  QGridLayout* xshToolbarLay = insertGroupBoxUI(showXSheetToolbar, lay);
-  { insertUI(expandFunctionHeader, xshToolbarLay); }
+  QGridLayout* xshToolbarLay = insertGroupBox(tr("Xsheet Tools"), lay);
+  {
+    insertUI(showXSheetToolbar, xshToolbarLay);
+    insertUI(showXsheetBreadcrumbs, xshToolbarLay);
+    insertUI(expandFunctionHeader, xshToolbarLay);
+  }
   insertUI(showColumnNumbers, lay);
   insertUI(unifyColumnVisibilityToggles, lay);
   insertUI(parentColorsInXsheetColumn, lay);
@@ -2046,6 +2058,8 @@ QWidget* PreferencesPopup::createXsheetPage() {
   m_onEditedFuncMap.insert(
       unifyColumnVisibilityToggles,
       &PreferencesPopup::onUnifyColumnVisibilityTogglesChanged);
+  m_onEditedFuncMap.insert(showXsheetBreadcrumbs,
+                           &PreferencesPopup::onShowXsheetBreadcrumbsClicked);
 
   QCheckBox* linkColumnNameWithLevelCheck =
       getUI<QCheckBox*>(linkColumnNameWithLevel);

toonz/sources/toonz/preferencespopup.h

@@ -140,6 +140,7 @@ class PreferencesPopup final : public QDialog {
   void onShowKeyframesOnCellAreaChanged();
   void onShowXSheetToolbarClicked();
   void onUnifyColumnVisibilityTogglesChanged();
+  void onShowXsheetBreadcrumbsClicked();
   // Animation
   void onModifyExpressionOnMovingReferencesChanged();
   // Preview

toonz/sources/toonz/toonz.qrc

@@ -382,6 +382,8 @@
     <file>icons/dark/actions/16/next_nav_tag.svg</file>
     <file>icons/dark/actions/16/prev_nav_tag.svg</file>
 
+    <file>icons/dark/actions/16/toggle_sub_nav.svg</file>
+
     <!-- Modes, Types, Options -->
 		<file>icons/dark/actions/16/ink_check.svg</file>
 		<file>icons/dark/actions/16/inks_only.svg</file>