From 5393c21872f7379d501eb150a45f04677a10e09f Mon Sep 17 00:00:00 2001 From: Kite Date: Mar 05 2021 22:22:58 +0000 Subject: Update Default Room Set (#3697) * Update Default Room Set Beginner oriented changes, but keeps to a professional flow. The Drawing room should be enough for anyone to become acquainted with the program. Add task room Color model to InknPaint More commands for command bar and xsheet toolbar Adds animation room back for puppets --- diff --git a/stuff/profiles/layouts/rooms/Default/room1.ini b/stuff/profiles/layouts/rooms/Default/room1.ini index ac7209e..ace7c69 100644 --- a/stuff/profiles/layouts/rooms/Default/room1.ini +++ b/stuff/profiles/layouts/rooms/Default/room1.ini @@ -1,26 +1,27 @@ [room] -pane_0\name=Xsheet -pane_0\geometry=@Rect(1121 30 159 668) -pane_0\orientation=TopToBottom -pane_0\frameZoomFactor=100 +pane_0\name=ToolBar +pane_0\geometry=@Rect(0 30 34 668) pane_1\name=FilmStrip -pane_1\geometry=@Rect(921 30 196 369) -pane_2\name=LevelPalette -pane_2\geometry=@Rect(296 553 621 145) -pane_2\viewtype=2 -pane_3\name=StyleEditor -pane_3\geometry=@Rect(921 403 196 295) -pane_3\isVertical=true -pane_3\visibleParts=15 -pane_3\splitterState=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xf0\0\0\0\xf0\x1\xff\xff\xff\xff\x1\0\0\0\x2\0) -pane_4\name=SceneViewer -pane_4\geometry=@Rect(39 30 878 519) -pane_5\name=ToolBar -pane_5\geometry=@Rect(0 30 35 668) -pane_6\name=ToolOptions -pane_6\geometry=@Rect(0 0 1280 26) -pane_7\name=StudioPalette -pane_7\geometry=@Rect(39 553 253 145) -pane_7\viewtype=1 -hierarchy="-1 1 [ 6 [ 5 [ 4 [ 7 2 ] ] [ 1 3 ] 0 ] ] " -name=Basics +pane_1\geometry=@Rect(1156 30 124 510) +pane_1\vertical=1 +pane_1\showCombo=1 +pane_1\navigator=1 +pane_2\name=ToolOptions +pane_2\geometry=@Rect(0 0 1280 26) +pane_3\name=LevelPalette +pane_3\geometry=@Rect(790 377 362 163) +pane_3\viewtype=0 +pane_4\name=StyleEditor +pane_4\geometry=@Rect(790 30 362 343) +pane_4\isVertical=true +pane_4\visibleParts=7 +pane_4\splitterState=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\x1]\0\0\0\x62\x1\xff\xff\xff\xff\x1\0\0\0\x2\0) +pane_5\name=Timeline +pane_5\geometry=@Rect(38 544 1242 154) +pane_5\orientation=LeftToRight +pane_5\frameZoomFactor=60 +pane_6\name=SceneViewer +pane_6\geometry=@Rect(38 30 748 510) +pane_6\visibleParts=5 +hierarchy="-1 1 [ 2 [ 0 [ [ 6 [ 4 3 ] 1 ] 5 ] ] ] " +name=Drawing diff --git a/stuff/profiles/layouts/rooms/Default/room2.ini b/stuff/profiles/layouts/rooms/Default/room2.ini index b183308..a556a6f 100644 --- a/stuff/profiles/layouts/rooms/Default/room2.ini +++ b/stuff/profiles/layouts/rooms/Default/room2.ini @@ -1,14 +1,15 @@ [room] pane_0\name=CleanupSettings -pane_0\geometry=@Rect(956 30 324 668) +pane_0\geometry=@Rect(987 30 293 668) pane_1\name=ToolOptions pane_1\geometry=@Rect(0 0 1280 26) pane_2\name=SceneViewer -pane_2\geometry=@Rect(39 30 913 422) +pane_2\geometry=@Rect(38 30 945 445) +pane_2\visibleParts=5 pane_3\name=ToolBar -pane_3\geometry=@Rect(0 30 35 668) +pane_3\geometry=@Rect(0 30 34 668) pane_4\name=Xsheet -pane_4\geometry=@Rect(39 456 913 242) +pane_4\geometry=@Rect(38 479 945 219) pane_4\orientation=TopToBottom pane_4\frameZoomFactor=100 hierarchy="-1 1 [ 1 [ 3 [ 2 4 ] 0 ] ] " diff --git a/stuff/profiles/layouts/rooms/Default/room3.ini b/stuff/profiles/layouts/rooms/Default/room3.ini index 7848c00..862617b 100644 --- a/stuff/profiles/layouts/rooms/Default/room3.ini +++ b/stuff/profiles/layouts/rooms/Default/room3.ini @@ -1,19 +1,25 @@ [room] -pane_0\name=SceneViewer -pane_0\geometry=@Rect(39 30 928 668) -pane_1\name=ToolBar -pane_1\geometry=@Rect(0 30 35 668) -pane_2\name=FilmStrip -pane_2\geometry=@Rect(1169 30 111 668) -pane_3\name=ToolOptions -pane_3\geometry=@Rect(0 0 1280 26) -pane_4\name=LevelPalette -pane_4\geometry=@Rect(971 30 194 72) -pane_4\viewtype=2 -pane_5\name=StyleEditor -pane_5\geometry=@Rect(971 106 194 592) -pane_5\isVertical=true -pane_5\visibleParts=15 -pane_5\splitterState=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xf0\0\0\0\xf0\x1\xff\xff\xff\xff\x1\0\0\0\x2\0) -hierarchy="-1 1 [ 3 [ 1 0 [ 4 5 ] 2 ] ] " -name=Drawing +pane_0\name=ToolBar +pane_0\geometry=@Rect(0 30 34 668) +pane_1\name=ToolOptions +pane_1\geometry=@Rect(0 0 1280 26) +pane_2\name=Xsheet +pane_2\geometry=@Rect(334 479 734 219) +pane_2\orientation=TopToBottom +pane_2\frameZoomFactor=100 +pane_3\name=LevelPalette +pane_3\geometry=@Rect(38 479 292 219) +pane_3\viewtype=2 +pane_4\name=StyleEditor +pane_4\geometry=@Rect(38 30 611 445) +pane_4\isVertical=true +pane_4\visibleParts=15 +pane_4\splitterState=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xf4\0\0\0\xf5\x1\xff\xff\xff\xff\x1\0\0\0\x2\0) +pane_5\name=StudioPalette +pane_5\geometry=@Rect(1072 479 208 219) +pane_5\viewtype=1 +pane_6\name=SceneViewer +pane_6\geometry=@Rect(653 30 627 445) +pane_6\visibleParts=5 +hierarchy="-1 1 [ 1 [ 0 [ [ 4 6 ] [ 3 2 5 ] ] ] ] " +name=Palette diff --git a/stuff/profiles/layouts/rooms/Default/room4.ini b/stuff/profiles/layouts/rooms/Default/room4.ini index ebdadaf..5c5a3c5 100644 --- a/stuff/profiles/layouts/rooms/Default/room4.ini +++ b/stuff/profiles/layouts/rooms/Default/room4.ini @@ -1,23 +1,20 @@ [room] -pane_0\name=StyleEditor -pane_0\geometry=@Rect(0 30 191 405) -pane_0\isVertical=true -pane_0\visibleParts=15 -pane_0\splitterState=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xa4\0\0\0\xd6\x1\xff\xff\xff\xff\x1\0\0\0\x2\0) -pane_1\name=FilmStrip -pane_1\geometry=@Rect(1169 30 111 517) -pane_2\name=Timeline -pane_2\geometry=@Rect(0 551 1280 147) -pane_2\orientation=LeftToRight -pane_2\frameZoomFactor=100 -pane_3\name=SceneViewer -pane_3\geometry=@Rect(234 30 931 517) -pane_4\name=ToolBar -pane_4\geometry=@Rect(195 30 35 517) -pane_5\name=ToolOptions -pane_5\geometry=@Rect(0 0 1280 26) -pane_6\name=LevelPalette -pane_6\geometry=@Rect(0 439 191 108) -pane_6\viewtype=2 -hierarchy="-1 1 [ 5 [ [ 0 6 ] 4 3 1 ] 2 ] " -name=Timeline +pane_0\name=FilmStrip +pane_0\geometry=@Rect(1156 30 124 668) +pane_0\vertical=1 +pane_0\showCombo=1 +pane_0\navigator=1 +pane_1\name=LevelPalette +pane_1\geometry=@Rect(927 470 225 228) +pane_1\viewtype=1 +pane_2\name=ToolBar +pane_2\geometry=@Rect(0 30 34 668) +pane_3\name=ToolOptions +pane_3\geometry=@Rect(0 0 1280 26) +pane_4\name=ColorModel +pane_4\geometry=@Rect(927 30 225 436) +pane_5\name=SceneViewer +pane_5\geometry=@Rect(38 30 885 668) +pane_5\visibleParts=5 +hierarchy="-1 1 [ 3 [ 2 5 [ 4 1 ] 0 ] ] " +name=InknPaint diff --git a/stuff/profiles/layouts/rooms/Default/room5.ini b/stuff/profiles/layouts/rooms/Default/room5.ini index 4b72e28..4b10b77 100644 --- a/stuff/profiles/layouts/rooms/Default/room5.ini +++ b/stuff/profiles/layouts/rooms/Default/room5.ini @@ -1,21 +1,26 @@ [room] -pane_0\name=SceneViewer -pane_0\geometry=@Rect(39 30 779 412) +pane_0\name=Xsheet +pane_0\geometry=@Rect(801 30 351 402) +pane_0\orientation=TopToBottom +pane_0\frameZoomFactor=100 pane_1\name=ToolBar -pane_1\geometry=@Rect(0 30 35 668) +pane_1\geometry=@Rect(0 30 34 668) pane_2\name=ToolOptions pane_2\geometry=@Rect(0 0 1280 26) -pane_3\name=Xsheet -pane_3\geometry=@Rect(822 30 343 435) -pane_3\orientation=TopToBottom -pane_3\frameZoomFactor=100 +pane_3\name=Schematic +pane_3\geometry=@Rect(801 436 479 262) +pane_3\viewtype=1 pane_4\name=FunctionEditor -pane_4\geometry=@Rect(39 446 779 252) +pane_4\geometry=@Rect(38 435 759 263) pane_4\toggleStatus=0 -pane_5\name=Schematic -pane_5\geometry=@Rect(822 469 458 229) -pane_5\viewtype=1 -pane_6\name=FilmStrip -pane_6\geometry=@Rect(1169 30 111 435) -hierarchy="-1 1 [ 2 [ 1 [ 0 4 ] [ [ 3 6 ] 5 ] ] ] " +pane_4\showIbtwnValuesInSheet=true +pane_5\name=FilmStrip +pane_5\geometry=@Rect(1156 30 124 402) +pane_5\vertical=1 +pane_5\showCombo=1 +pane_5\navigator=1 +pane_6\name=SceneViewer +pane_6\geometry=@Rect(38 30 759 401) +pane_6\visibleParts=5 +hierarchy="-1 1 [ 2 [ 1 [ 6 4 ] [ [ 0 5 ] 3 ] ] ] " name=Animation diff --git a/stuff/profiles/layouts/rooms/Default/room6.ini b/stuff/profiles/layouts/rooms/Default/room6.ini index 83ac701..f0132ab 100644 --- a/stuff/profiles/layouts/rooms/Default/room6.ini +++ b/stuff/profiles/layouts/rooms/Default/room6.ini @@ -1,26 +1,17 @@ [room] -pane_0\name=SceneViewer -pane_0\geometry=@Rect(39 30 865 459) -pane_1\name=ToolBar -pane_1\geometry=@Rect(0 30 35 668) -pane_2\name=ToolOptions -pane_2\geometry=@Rect(0 0 1280 26) -pane_3\name=ColorModel -pane_3\geometry=@Rect(908 30 185 181) -pane_4\name=Xsheet -pane_4\geometry=@Rect(39 493 865 205) -pane_4\orientation=TopToBottom -pane_4\frameZoomFactor=100 -pane_5\name=LevelPalette -pane_5\geometry=@Rect(908 215 372 40) -pane_5\viewtype=2 -pane_6\name=StyleEditor -pane_6\geometry=@Rect(908 259 372 439) -pane_6\isVertical=true -pane_6\visibleParts=15 -pane_6\splitterState=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xf0\0\0\0\xf0\x1\xff\xff\xff\xff\x1\0\0\0\x2\0) -pane_7\name=StudioPalette -pane_7\geometry=@Rect(1097 30 183 181) -pane_7\viewtype=1 -hierarchy="-1 1 [ 2 [ 1 [ 0 4 ] [ [ 3 7 ] 5 6 ] ] ] " -name=Palette +pane_0\name=ToolOptions +pane_0\geometry=@Rect(0 0 1280 26) +pane_1\name=FunctionEditor +pane_1\geometry=@Rect(859 30 421 668) +pane_1\toggleStatus=0 +pane_1\showIbtwnValuesInSheet=true +pane_2\name=Schematic +pane_2\geometry=@Rect(38 347 817 351) +pane_2\viewtype=0 +pane_3\name=ToolBar +pane_3\geometry=@Rect(0 30 34 668) +pane_4\name=SceneViewer +pane_4\geometry=@Rect(38 30 817 313) +pane_4\visibleParts=5 +hierarchy="-1 1 [ 0 [ 3 [ 4 2 ] 1 ] ] " +name=Schematic diff --git a/stuff/profiles/layouts/rooms/Default/room7.ini b/stuff/profiles/layouts/rooms/Default/room7.ini index f861a2a..f00b9c5 100644 --- a/stuff/profiles/layouts/rooms/Default/room7.ini +++ b/stuff/profiles/layouts/rooms/Default/room7.ini @@ -1,12 +1,14 @@ [room] pane_0\name=Xsheet -pane_0\geometry=@Rect(0 0 786 698) +pane_0\geometry=@Rect(0 0 730 698) pane_0\orientation=TopToBottom pane_0\frameZoomFactor=100 pane_1\name=FunctionEditor -pane_1\geometry=@Rect(790 336 490 362) +pane_1\geometry=@Rect(734 345 546 353) pane_1\toggleStatus=0 +pane_1\showIbtwnValuesInSheet=true pane_2\name=SceneViewer -pane_2\geometry=@Rect(790 0 490 332) +pane_2\geometry=@Rect(734 0 546 341) +pane_2\visibleParts=5 hierarchy="-1 0 [ 0 [ 2 1 ] ] " name=Xsheet diff --git a/stuff/profiles/layouts/rooms/Default/room8.ini b/stuff/profiles/layouts/rooms/Default/room8.ini index 076fcc4..921ce02 100644 --- a/stuff/profiles/layouts/rooms/Default/room8.ini +++ b/stuff/profiles/layouts/rooms/Default/room8.ini @@ -1,7 +1,5 @@ [room] -pane_0\name=Browser -pane_0\geometry=@Rect(0 0 1280 348) -pane_1\name=SceneCast -pane_1\geometry=@Rect(0 352 1280 346) -hierarchy="-1 1 [ 0 1 ] " -name=Browser +pane_0\name=Tasks +pane_0\geometry=@Rect(0 0 1280 698) +hierarchy="-1 0 0 " +name=Tasks diff --git a/stuff/profiles/layouts/rooms/Default/room9.ini b/stuff/profiles/layouts/rooms/Default/room9.ini index 497c208..4f65f8e 100644 --- a/stuff/profiles/layouts/rooms/Default/room9.ini +++ b/stuff/profiles/layouts/rooms/Default/room9.ini @@ -1,7 +1,7 @@ [room] -pane_0\name=Tasks -pane_0\geometry=@Rect(0 0 638 698) -pane_1\name=BatchServers -pane_1\geometry=@Rect(642 0 638 698) -hierarchy="-1 0 [ 0 1 ] " -name=Farm +pane_0\name=Browser +pane_0\geometry=@Rect(0 0 1280 356) +pane_1\name=SceneCast +pane_1\geometry=@Rect(0 360 1280 338) +hierarchy="-1 1 [ 0 1 ] " +name=Browser diff --git a/stuff/profiles/layouts/settings/commandbar.xml b/stuff/profiles/layouts/settings/commandbar.xml index ef79a8f..783f676 100644 --- a/stuff/profiles/layouts/settings/commandbar.xml +++ b/stuff/profiles/layouts/settings/commandbar.xml @@ -1,19 +1,30 @@ - - - MI_NewVectorLevel - MI_NewToonzRasterLevel - MI_NewRasterLevel - - MI_Reframe1 - MI_Reframe2 - MI_Reframe3 + + + MI_Undo + MI_Redo - MI_Dup + MI_SaveAll - MI_Collapse - MI_OpenChild - MI_CloseChild - MI_ToggleEditInPlace - - - + MI_Copy + MI_Cut + MI_Paste + MI_Clear + + MI_AddFrames + MI_PrevDrawing + MI_NextDrawing + + MI_ShiftTrace + MI_EditShift + MI_NoShift + MI_ResetShift + + MI_SendBack + MI_SendBackward + MI_BringForward + MI_BringToFront + MI_Group + MI_Ungroup + MI_EnterGroup + MI_ExitGroup + diff --git a/stuff/profiles/layouts/settings/xsheettoolbar.xml b/stuff/profiles/layouts/settings/xsheettoolbar.xml index ef79a8f..625c2c8 100644 --- a/stuff/profiles/layouts/settings/xsheettoolbar.xml +++ b/stuff/profiles/layouts/settings/xsheettoolbar.xml @@ -1,19 +1,28 @@ - - - MI_NewVectorLevel + + MI_NewToonzRasterLevel MI_NewRasterLevel - + MI_NewVectorLevel + + MI_Collapse + MI_OpenChild + MI_CloseChild + MI_ToggleEditInPlace + + MI_CreateBlankDrawing + MI_Duplicate + MI_AutoInputCellNumber + MI_FillEmptyCell + + MI_DecreaseStep + MI_IncreaseStep + MI_Reframe1 MI_Reframe2 MI_Reframe3 MI_Dup - - MI_Collapse - MI_OpenChild - MI_CloseChild - MI_ToggleEditInPlace - - - + MI_Reverse + MI_Swing + MI_Random +