Merge pull request #1265 from manongjohn/2d_room_update

2D room update
2023-11-05 19:04:28 -05:00 · 2023-11-05 19:04:28 -05:00 · e48aeb4b54
parent ecec1d868d 0ab28b35a1
commit e48aeb4b54
7 changed files with 77 additions and 22 deletions
--- a/stuff/profiles/layouts/rooms/Default/room1.ini
+++ b/stuff/profiles/layouts/rooms/Default/room1.ini
@ -1,25 +1,24 @@
 [room]
 pane_0\name=StyleEditor
-pane_0\geometry=@Rect(34 30 259 358)
+pane_0\geometry=@Rect(38 30 259 390)
 pane_0\isVertical=true
 pane_0\visibleParts=5
 pane_0\splitterState=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\x1i\0\0\0 \x1\xff\xff\xff\xff\x1\0\0\0\x2\0)
 pane_1\name=Timeline
-pane_1\geometry=@Rect(34 764 1886 211)
+pane_1\geometry=@Rect(38 828 1882 269)
 pane_1\orientation=LeftToRight
 pane_1\frameZoomFactor=100
 pane_2\name=SceneViewer
-pane_2\geometry=@Rect(297 30 1623 704)
-pane_2\visibleParts=5
+pane_2\geometry=@Rect(301 30 1619 794)
+pane_2\viewerVisibleParts=7
 pane_2\consoleParts=3435969580
 pane_3\name=ToolBar
-pane_3\geometry=@Rect(0 30 30 945)
+pane_3\geometry=@Rect(0 30 34 1067)
 pane_4\name=ToolOptions
 pane_4\geometry=@Rect(0 0 1920 26)
 pane_5\name=LevelPalette
-pane_5\geometry=@Rect(34 392 259 368)
+pane_5\geometry=@Rect(38 424 259 400)
+pane_5\toolbarVisibleMsk=1
 pane_5\viewtype=0
-pane_6\name=CommandBar
-pane_6\geometry=@Rect(297 738 1623 26)
-hierarchy="-1 1 [ 4 [ 3 [ [ [ 0 5 ] [ 2 6 ] ] 1 ] ] ] "
+hierarchy="-1 1 [ 4 [ 3 [ [ [ 0 5 ] 2 ] 1 ] ] ] "
 name=2D
--- a/stuff/profiles/layouts/settings/commandbar.xml
+++ b/stuff/profiles/layouts/settings/commandbar.xml
@ -11,8 +11,7 @@
    <command>MI_Dup</command>
    <separator/>
    <command>MI_Collapse</command> 
-    <command>MI_OpenChild</command>
-    <command>MI_CloseChild</command>
+    <command>MI_ToggleXsheetBreadcrumbs</command>
    <command>MI_ToggleEditInPlace</command>    
    
  </commandbar>
--- a/stuff/profiles/layouts/settings/quicktoolbar.xml
+++ b/stuff/profiles/layouts/settings/quicktoolbar.xml
@ -1,5 +1,4 @@
-  <commandbar>
-
+<commandbar>
    <command>MI_ToggleAutoCreate</command>
    <command>MI_ToggleCreationInHoldCells</command>
    <command>MI_ToggleAutoStretch</command>
@ -8,17 +7,14 @@
    <command>MI_NewRasterLevel</command>
    <command>MI_NewToonzRasterLevel</command>
    <command>MI_NewVectorLevel</command>
-    <separator/>	
+    <separator/>
    <command>MI_Reframe1</command>
    <command>MI_Reframe2</command>
    <command>MI_Reframe3</command>
    <separator/>
    <command>MI_Dup</command>
    <separator/>
-    <command>MI_Collapse</command> 
-    <command>MI_OpenChild</command>
-    <command>MI_CloseChild</command>
+    <command>MI_Collapse</command>
+    <command>MI_ToggleXsheetBreadcrumbs</command>
    <command>MI_ToggleEditInPlace</command>
-
-  </commandbar>
-
+</commandbar>
--- a/toonz/sources/toonz/icons/dark/actions/16/toggle_sub_nav.svg
+++ b/toonz/sources/toonz/icons/dark/actions/16/toggle_sub_nav.svg
@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="100%"
+   height="100%"
+   viewBox="0 0 16 16"
+   version="1.1"
+   xml:space="preserve"
+   style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"
+   id="svg9"
+   sodipodi:docname="toggle_sub_nav.svg"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs13">
+        
+        
+        
+        
+    </defs><sodipodi:namedview
+   id="namedview11"
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1.0"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   inkscape:pagecheckerboard="0"
+   showgrid="false"
+   inkscape:zoom="31.775611"
+   inkscape:cx="11.596945"
+   inkscape:cy="9.1264964"
+   inkscape:window-width="1920"
+   inkscape:window-height="1141"
+   inkscape:window-x="-7"
+   inkscape:window-y="-7"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg9" />
+    
+<g
+   id="g8948"><rect
+     id="bg"
+     x="0"
+     y="0"
+     width="16"
+     height="16"
+     style="fill:#878787;fill-opacity:0" /><path
+     d="m 11,9 h 4 V 7 H 12 V 4 H 8 V 1 H 0 V 9 H 1 V 8 2 H 7 V 9 H 8 V 5 h 3 z m 1,0 V 8 h 2 v 1 z"
+     id="path3"
+     sodipodi:nodetypes="cccccccccccccccccccccccc" /><path
+     d="M 4.499,8 H 11 V 7 H 0 V 8 Z M 1,10 c 0.0027,0.526025 -0.257,0.696 0,1 H 14 V 10 Z M 0,4 V 5 H 7 V 4 Z"
+     style="fill-opacity:0.5"
+     id="path5"
+     sodipodi:nodetypes="cccccccccccccccc" /><path
+     id="rect4189"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none"
+     d="m 0,10 v 6 h 16 v -6 z m 1,1 h 4 l 3,2 -3,2 H 1 l 3,-2 z m 7,0 h 4 l 3,2 -3,2 H 8 l 3,-2 z"
+     sodipodi:nodetypes="ccccccccccccccccccc" /></g></svg>
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@ -2482,7 +2482,8 @@ void MainWindow::defineActions() {
  createRightClickMenuAction(MI_ToggleQuickToolbar,
                             QT_TR_NOOP("Toggle Quick Toolbar"), "");
  createRightClickMenuAction(MI_ToggleXsheetBreadcrumbs,
-                             QT_TR_NOOP("Toggle Sub-Scene Navigation Bar"), "");
+                             QT_TR_NOOP("Toggle Sub-Scene Navigation Bar"), "",
+                             "toggle_sub_nav");
  createRightClickMenuAction(MI_ToggleXsheetCameraColumn,
                             QT_TR_NOOP("Show/Hide Camera Column"), "");
  createRightClickMenuAction(MI_SetKeyframes, QT_TR_NOOP("&Set Key"), "Z",
--- a/toonz/sources/toonz/toonz.qrc
+++ b/toonz/sources/toonz/toonz.qrc
@ -400,6 +400,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>
--- a/toonz/sources/toonzlib/preferences.cpp
+++ b/toonz/sources/toonzlib/preferences.cpp
@ -587,7 +587,7 @@ void Preferences::definePreferenceItems() {
         "inputCellsWithoutDoubleClickingEnabled", QMetaType::Bool, false);
  define(shortcutCommandsWhileRenamingCellEnabled,
         "shortcutCommandsWhileRenamingCellEnabled", QMetaType::Bool, false);
-  define(showQuickToolbar, "showQuickToolbar", QMetaType::Bool, false);
+  define(showQuickToolbar, "showQuickToolbar", QMetaType::Bool, true);
  define(showXsheetBreadcrumbs, "showXsheetBreadcrumbs", QMetaType::Bool,
         false);
  define(expandFunctionHeader, "expandFunctionHeader", QMetaType::Bool, false);