razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix output settings and room layout

Browse source
This commit is contained in:
Jeremy Bullock 2020-09-01 23:02:37 -06:00
parent ecab4aab78
commit 0ca2b5ccce
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
stuff/profiles/layouts/rooms/Default/room1.ini
View file

@ -1,23 +1,23 @@
[room] [room]
pane_0\name=StyleEditor pane_0\name=StyleEditor
pane_0\geometry=@Rect(39 30 310 374) pane_0\geometry=@Rect(34 30 228 356)
pane_0\isVertical=true pane_0\isVertical=true
pane_0\visibleParts=5 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_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\name=Timeline
pane_1\geometry=@Rect(39 789 1881 206) pane_1\geometry=@Rect(34 755 1886 220)
pane_1\orientation=LeftToRight
pane_1\frameZoomFactor=100
pane_2\name=SceneViewer pane_2\name=SceneViewer
pane_2\geometry=@Rect(353 30 1567 755) pane_2\geometry=@Rect(266 30 1654 721)
pane_2\visibleParts=5
pane_2\consoleParts=3435969580
pane_3\name=ToolBar pane_3\name=ToolBar
pane_3\geometry=@Rect(0 30 35 965) pane_3\geometry=@Rect(0 30 30 945)
pane_4\name=ToolOptions pane_4\name=ToolOptions
pane_4\geometry=@Rect(0 0 1920 26) pane_4\geometry=@Rect(0 0 1920 26)
pane_5\name=LevelPalette pane_5\name=LevelPalette
pane_5\geometry=@Rect(39 408 310 377) pane_5\geometry=@Rect(34 390 228 361)
pane_5\viewtype=0
hierarchy="-1 1 [ 4 [ 3 [ [ [ 0 5 ] 2 ] 1 ] ] ] " hierarchy="-1 1 [ 4 [ 3 [ [ [ 0 5 ] 2 ] 1 ] ] ] "
name=2D name=2D
pane_1\orientation=LeftToRight
pane_1\frameZoomFactor=100
pane_2\visibleParts=5
pane_2\consoleParts=3435969580
pane_5\viewtype=0

6
stuff/profiles/layouts/rooms/Default/room2.ini
View file

@ -1,13 +1,13 @@
[room] [room]
pane_0\name=SceneViewer pane_0\name=SceneViewer
pane_0\geometry=@Rect(0 0 1556 740) pane_0\geometry=@Rect(0 0 1570 698)
pane_0\visibleParts=5 pane_0\visibleParts=5
pane_0\consoleParts=3435969580 pane_0\consoleParts=3435969580
pane_1\name=Timeline pane_1\name=Timeline
pane_1\geometry=@Rect(0 744 1920 251) pane_1\geometry=@Rect(0 702 1920 273)
pane_1\orientation=LeftToRight pane_1\orientation=LeftToRight
pane_1\frameZoomFactor=100 pane_1\frameZoomFactor=100
pane_2\name=StopMotionController pane_2\name=StopMotionController
pane_2\geometry=@Rect(1560 0 360 740) pane_2\geometry=@Rect(1574 0 346 698)
hierarchy="-1 1 [ [ 0 2 ] 1 ] " hierarchy="-1 1 [ [ 0 2 ] 1 ] "
name=StopMotion name=StopMotion

1
toonz/sources/toonz/outputsettingspopup.cpp
View file

@ -228,7 +228,6 @@ OutputSettingsPopup::OutputSettingsPopup(bool isPreview)
showOtherSettingsButton = new QPushButton("", this); showOtherSettingsButton = new QPushButton("", this);
otherSettingsLabel = new QLabel(tr("Other Settings"), this); otherSettingsLabel = new QLabel(tr("Other Settings"), this);
otherSettingsFrame = new QFrame(this); otherSettingsFrame = new QFrame(this);
m_renderButton = new QPushButton(tr("Render"), this);
m_renderButton->setIcon(createQIcon("render")); m_renderButton->setIcon(createQIcon("render"));
m_renderButton->setIconSize(QSize(20, 20)); m_renderButton->setIconSize(QSize(20, 20));