Skip to content

Commit

Permalink
Merge pull request #4385 from shun-iwasawa/modify_default_layout
Browse files Browse the repository at this point in the history
Modify default workspace layout
  • Loading branch information
RodneyBaker committed Mar 31, 2022
2 parents 1e95899 + 456ea9c commit 4dd8f76
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 39 deletions.
15 changes: 8 additions & 7 deletions stuff/profiles/layouts/rooms/Default/room1.ini
@@ -1,27 +1,28 @@
[room]
pane_0\name=ToolBar
pane_0\geometry=@Rect(0 30 34 668)
pane_0\geometry=@Rect(0 30 34 965)
pane_1\name=FilmStrip
pane_1\geometry=@Rect(1156 30 124 510)
pane_1\geometry=@Rect(1796 30 124 720)
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_2\geometry=@Rect(0 0 1920 26)
pane_3\name=LevelPalette
pane_3\geometry=@Rect(790 377 362 163)
pane_3\geometry=@Rect(1452 482 340 268)
pane_3\toolbarOnTop=0
pane_3\viewtype=0
pane_4\name=StyleEditor
pane_4\geometry=@Rect(790 30 362 343)
pane_4\geometry=@Rect(1452 30 340 448)
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\geometry=@Rect(38 754 1882 241)
pane_5\orientation=LeftToRight
pane_5\frameZoomFactor=60
pane_6\name=SceneViewer
pane_6\geometry=@Rect(38 30 748 510)
pane_6\geometry=@Rect(38 30 1410 720)
pane_6\visibleParts=5
hierarchy="-1 1 [ 2 [ 0 [ [ 6 [ 4 3 ] 1 ] 5 ] ] ] "
name=Drawing
16 changes: 9 additions & 7 deletions stuff/profiles/layouts/rooms/Default/room3.ini
@@ -1,25 +1,27 @@
[room]
pane_0\name=ToolBar
pane_0\geometry=@Rect(0 30 34 668)
pane_0\geometry=@Rect(0 30 34 965)
pane_1\name=ToolOptions
pane_1\geometry=@Rect(0 0 1280 26)
pane_1\geometry=@Rect(0 0 1920 26)
pane_2\name=Xsheet
pane_2\geometry=@Rect(334 479 734 219)
pane_2\geometry=@Rect(547 628 948 367)
pane_2\orientation=TopToBottom
pane_2\frameZoomFactor=100
pane_3\name=LevelPalette
pane_3\geometry=@Rect(38 479 292 219)
pane_3\geometry=@Rect(38 628 505 367)
pane_3\toolbarOnTop=0
pane_3\viewtype=2
pane_4\name=StyleEditor
pane_4\geometry=@Rect(38 30 611 445)
pane_4\geometry=@Rect(38 30 312 594)
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\geometry=@Rect(1499 628 421 367)
pane_5\toolbarOnTop=0
pane_5\viewtype=1
pane_6\name=SceneViewer
pane_6\geometry=@Rect(653 30 627 445)
pane_6\geometry=@Rect(354 30 1566 594)
pane_6\visibleParts=5
hierarchy="-1 1 [ 1 [ 0 [ [ 4 6 ] [ 3 2 5 ] ] ] ] "
name=Palette
13 changes: 7 additions & 6 deletions stuff/profiles/layouts/rooms/Default/room4.ini
@@ -1,20 +1,21 @@
[room]
pane_0\name=FilmStrip
pane_0\geometry=@Rect(1156 30 124 668)
pane_0\geometry=@Rect(1797 30 123 965)
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\geometry=@Rect(1489 619 304 376)
pane_1\toolbarOnTop=0
pane_1\viewtype=1
pane_2\name=ToolBar
pane_2\geometry=@Rect(0 30 34 668)
pane_2\geometry=@Rect(0 30 34 965)
pane_3\name=ToolOptions
pane_3\geometry=@Rect(0 0 1280 26)
pane_3\geometry=@Rect(0 0 1920 26)
pane_4\name=ColorModel
pane_4\geometry=@Rect(927 30 225 436)
pane_4\geometry=@Rect(1489 30 304 585)
pane_5\name=SceneViewer
pane_5\geometry=@Rect(38 30 885 668)
pane_5\geometry=@Rect(38 30 1447 965)
pane_5\visibleParts=5
hierarchy="-1 1 [ 3 [ 2 5 [ 4 1 ] 0 ] ] "
name=InknPaint
15 changes: 8 additions & 7 deletions stuff/profiles/layouts/rooms/Default/room5.ini
@@ -1,26 +1,27 @@
[room]
pane_0\name=Xsheet
pane_0\geometry=@Rect(801 30 351 402)
pane_0\geometry=@Rect(1121 30 681 551)
pane_0\orientation=TopToBottom
pane_0\frameZoomFactor=100
pane_1\name=ToolBar
pane_1\geometry=@Rect(0 30 34 668)
pane_1\geometry=@Rect(0 30 34 965)
pane_2\name=ToolOptions
pane_2\geometry=@Rect(0 0 1280 26)
pane_2\geometry=@Rect(0 0 1920 26)
pane_3\name=Schematic
pane_3\geometry=@Rect(801 436 479 262)
pane_3\geometry=@Rect(1121 585 799 410)
pane_3\viewtype=1
pane_4\name=FunctionEditor
pane_4\geometry=@Rect(38 435 759 263)
pane_4\geometry=@Rect(38 584 1079 411)
pane_4\toggleStatus=0
pane_4\showIbtwnValuesInSheet=true
pane_4\syncSize=true
pane_5\name=FilmStrip
pane_5\geometry=@Rect(1156 30 124 402)
pane_5\geometry=@Rect(1806 30 114 551)
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\geometry=@Rect(38 30 1079 550)
pane_6\visibleParts=5
hierarchy="-1 1 [ 2 [ 1 [ 6 4 ] [ [ 0 5 ] 3 ] ] ] "
name=Animation
11 changes: 6 additions & 5 deletions stuff/profiles/layouts/rooms/Default/room6.ini
@@ -1,17 +1,18 @@
[room]
pane_0\name=ToolOptions
pane_0\geometry=@Rect(0 0 1280 26)
pane_0\geometry=@Rect(0 0 1920 26)
pane_1\name=FunctionEditor
pane_1\geometry=@Rect(859 30 421 668)
pane_1\geometry=@Rect(1180 30 740 965)
pane_1\toggleStatus=0
pane_1\showIbtwnValuesInSheet=true
pane_1\syncSize=true
pane_2\name=Schematic
pane_2\geometry=@Rect(38 347 817 351)
pane_2\geometry=@Rect(38 496 1138 499)
pane_2\viewtype=0
pane_3\name=ToolBar
pane_3\geometry=@Rect(0 30 34 668)
pane_3\geometry=@Rect(0 30 34 965)
pane_4\name=SceneViewer
pane_4\geometry=@Rect(38 30 817 313)
pane_4\geometry=@Rect(38 30 1138 462)
pane_4\visibleParts=5
hierarchy="-1 1 [ 0 [ 3 [ 4 2 ] 1 ] ] "
name=Schematic
7 changes: 4 additions & 3 deletions stuff/profiles/layouts/rooms/Default/room7.ini
@@ -1,14 +1,15 @@
[room]
pane_0\name=Xsheet
pane_0\geometry=@Rect(0 0 730 698)
pane_0\geometry=@Rect(0 0 1050 995)
pane_0\orientation=TopToBottom
pane_0\frameZoomFactor=100
pane_1\name=FunctionEditor
pane_1\geometry=@Rect(734 345 546 353)
pane_1\geometry=@Rect(1054 494 866 501)
pane_1\toggleStatus=0
pane_1\showIbtwnValuesInSheet=true
pane_1\syncSize=true
pane_2\name=SceneViewer
pane_2\geometry=@Rect(734 0 546 341)
pane_2\geometry=@Rect(1054 0 866 490)
pane_2\visibleParts=5
hierarchy="-1 0 [ 0 [ 2 1 ] ] "
name=Xsheet
2 changes: 1 addition & 1 deletion stuff/profiles/layouts/rooms/Default/room8.ini
@@ -1,5 +1,5 @@
[room]
pane_0\name=Tasks
pane_0\geometry=@Rect(0 0 1280 698)
pane_0\geometry=@Rect(0 0 1920 995)
hierarchy="-1 0 0 "
name=Tasks
4 changes: 2 additions & 2 deletions stuff/profiles/layouts/rooms/Default/room9.ini
@@ -1,7 +1,7 @@
[room]
pane_0\name=Browser
pane_0\geometry=@Rect(0 0 1280 356)
pane_0\geometry=@Rect(0 0 1920 505)
pane_1\name=SceneCast
pane_1\geometry=@Rect(0 360 1280 338)
pane_1\geometry=@Rect(0 509 1920 486)
hierarchy="-1 1 [ 0 1 ] "
name=Browser
5 changes: 4 additions & 1 deletion toonz/sources/toonz/main.cpp
Expand Up @@ -735,7 +735,10 @@ int main(int argc, char *argv[]) {

TFilePath fp = ToonzFolder::getModuleFile("mainwindow.ini");
QSettings settings(toQString(fp), QSettings::IniFormat);
w.restoreGeometry(settings.value("MainWindowGeometry").toByteArray());
if (settings.contains("MainWindowGeometry"))
w.restoreGeometry(settings.value("MainWindowGeometry").toByteArray());
else // maximize window on the first launch
w.setWindowState(w.windowState() | Qt::WindowMaximized);

ExpressionReferenceManager::instance()->init();

Expand Down

0 comments on commit 4dd8f76

Please sign in to comment.