diff --git a/stuff/profiles/layouts/rooms/Default/layouts.txt b/stuff/profiles/layouts/rooms/Default/layouts.txt index 473b7c8..c303627 100644 --- a/stuff/profiles/layouts/rooms/Default/layouts.txt +++ b/stuff/profiles/layouts/rooms/Default/layouts.txt @@ -1,9 +1,9 @@ room1.ini room2.ini room3.ini -room9.ini room4.ini room5.ini room6.ini room7.ini room8.ini +room9.ini diff --git a/stuff/profiles/layouts/rooms/Default/room1.ini b/stuff/profiles/layouts/rooms/Default/room1.ini index aec7553..ac7209e 100644 --- a/stuff/profiles/layouts/rooms/Default/room1.ini +++ b/stuff/profiles/layouts/rooms/Default/room1.ini @@ -1,20 +1,26 @@ [room] pane_0\name=Xsheet -pane_0\geometry=@Rect(1518 34 402 962) +pane_0\geometry=@Rect(1121 30 159 668) +pane_0\orientation=TopToBottom +pane_0\frameZoomFactor=100 pane_1\name=FilmStrip -pane_1\geometry=@Rect(1168 34 342 514) +pane_1\geometry=@Rect(921 30 196 369) pane_2\name=LevelPalette -pane_2\geometry=@Rect(421 706 739 290) +pane_2\geometry=@Rect(296 553 621 145) pane_2\viewtype=2 pane_3\name=StyleEditor -pane_3\geometry=@Rect(1168 556 342 440) +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(43 34 1117 664) +pane_4\geometry=@Rect(39 30 878 519) pane_5\name=ToolBar -pane_5\geometry=@Rect(0 34 35 962) +pane_5\geometry=@Rect(0 30 35 668) pane_6\name=ToolOptions -pane_6\geometry=@Rect(0 0 1920 26) +pane_6\geometry=@Rect(0 0 1280 26) pane_7\name=StudioPalette -pane_7\geometry=@Rect(43 706 370 290) +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 diff --git a/stuff/profiles/layouts/rooms/Default/room2.ini b/stuff/profiles/layouts/rooms/Default/room2.ini index f70a529..b183308 100644 --- a/stuff/profiles/layouts/rooms/Default/room2.ini +++ b/stuff/profiles/layouts/rooms/Default/room2.ini @@ -1,13 +1,15 @@ [room] pane_0\name=CleanupSettings -pane_0\geometry=@Rect(1278 34 642 962) +pane_0\geometry=@Rect(956 30 324 668) pane_1\name=ToolOptions -pane_1\geometry=@Rect(0 0 1920 26) +pane_1\geometry=@Rect(0 0 1280 26) pane_2\name=SceneViewer -pane_2\geometry=@Rect(43 34 1227 567) +pane_2\geometry=@Rect(39 30 913 422) pane_3\name=ToolBar -pane_3\geometry=@Rect(0 34 35 962) +pane_3\geometry=@Rect(0 30 35 668) pane_4\name=Xsheet -pane_4\geometry=@Rect(43 609 1227 387) +pane_4\geometry=@Rect(39 456 913 242) +pane_4\orientation=TopToBottom +pane_4\frameZoomFactor=100 hierarchy="-1 1 [ 1 [ 3 [ 2 4 ] 0 ] ] " name=Cleanup diff --git a/stuff/profiles/layouts/rooms/Default/room3.ini b/stuff/profiles/layouts/rooms/Default/room3.ini index 7d56a5a..7848c00 100644 --- a/stuff/profiles/layouts/rooms/Default/room3.ini +++ b/stuff/profiles/layouts/rooms/Default/room3.ini @@ -1,16 +1,19 @@ [room] pane_0\name=SceneViewer -pane_0\geometry=@Rect(43 34 1080 962) +pane_0\geometry=@Rect(39 30 928 668) pane_1\name=ToolBar -pane_1\geometry=@Rect(0 34 35 962) +pane_1\geometry=@Rect(0 30 35 668) pane_2\name=FilmStrip -pane_2\geometry=@Rect(1537 34 383 962) +pane_2\geometry=@Rect(1169 30 111 668) pane_3\name=ToolOptions -pane_3\geometry=@Rect(0 0 1920 26) +pane_3\geometry=@Rect(0 0 1280 26) pane_4\name=LevelPalette -pane_4\geometry=@Rect(1131 34 398 217) +pane_4\geometry=@Rect(971 30 194 72) pane_4\viewtype=2 pane_5\name=StyleEditor -pane_5\geometry=@Rect(1131 259 398 737) +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 diff --git a/stuff/profiles/layouts/rooms/Default/room4.ini b/stuff/profiles/layouts/rooms/Default/room4.ini index 3e3603b..ebdadaf 100644 --- a/stuff/profiles/layouts/rooms/Default/room4.ini +++ b/stuff/profiles/layouts/rooms/Default/room4.ini @@ -1,18 +1,23 @@ [room] -pane_0\name=SceneViewer -pane_0\geometry=@Rect(43 34 1095 557) -pane_1\name=ToolBar -pane_1\geometry=@Rect(0 34 35 962) -pane_2\name=ToolOptions -pane_2\geometry=@Rect(0 0 1920 26) -pane_3\name=Xsheet -pane_3\geometry=@Rect(1146 34 480 578) -pane_4\name=FunctionEditor -pane_4\geometry=@Rect(43 599 1095 397) -pane_5\name=Schematic -pane_5\geometry=@Rect(1146 620 774 376) -pane_5\viewtype=1 -pane_6\name=FilmStrip -pane_6\geometry=@Rect(1634 34 286 578) -hierarchy="-1 1 [ 2 [ 1 [ 0 4 ] [ [ 3 6 ] 5 ] ] ] " -name=Animation +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 diff --git a/stuff/profiles/layouts/rooms/Default/room5.ini b/stuff/profiles/layouts/rooms/Default/room5.ini index d21f88d..4b72e28 100644 --- a/stuff/profiles/layouts/rooms/Default/room5.ini +++ b/stuff/profiles/layouts/rooms/Default/room5.ini @@ -1,20 +1,21 @@ [room] pane_0\name=SceneViewer -pane_0\geometry=@Rect(43 34 1181 604) +pane_0\geometry=@Rect(39 30 779 412) pane_1\name=ToolBar -pane_1\geometry=@Rect(0 34 35 962) +pane_1\geometry=@Rect(0 30 35 668) pane_2\name=ToolOptions -pane_2\geometry=@Rect(0 0 1920 26) -pane_3\name=ColorModel -pane_3\geometry=@Rect(1232 34 341 278) -pane_4\name=Xsheet -pane_4\geometry=@Rect(43 646 1181 350) -pane_5\name=LevelPalette -pane_5\geometry=@Rect(1232 320 688 130) -pane_5\viewtype=2 -pane_6\name=StyleEditor -pane_6\geometry=@Rect(1232 458 688 538) -pane_7\name=StudioPalette -pane_7\geometry=@Rect(1581 34 339 278) -hierarchy="-1 1 [ 2 [ 1 [ 0 4 ] [ [ 3 7 ] 5 6 ] ] ] " -name=Palette +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_4\name=FunctionEditor +pane_4\geometry=@Rect(39 446 779 252) +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 ] ] ] " +name=Animation diff --git a/stuff/profiles/layouts/rooms/Default/room6.ini b/stuff/profiles/layouts/rooms/Default/room6.ini index 140070d..83ac701 100644 --- a/stuff/profiles/layouts/rooms/Default/room6.ini +++ b/stuff/profiles/layouts/rooms/Default/room6.ini @@ -1,9 +1,26 @@ [room] -pane_0\name=Xsheet -pane_0\geometry=@Rect(0 0 1104 996) -pane_1\name=FunctionEditor -pane_1\geometry=@Rect(1112 487 808 509) -pane_2\name=SceneViewer -pane_2\geometry=@Rect(1112 0 808 479) -hierarchy="-1 0 [ 0 [ 2 1 ] ] " -name=Xsheet +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 diff --git a/stuff/profiles/layouts/rooms/Default/room7.ini b/stuff/profiles/layouts/rooms/Default/room7.ini index b2759ed..f861a2a 100644 --- a/stuff/profiles/layouts/rooms/Default/room7.ini +++ b/stuff/profiles/layouts/rooms/Default/room7.ini @@ -1,7 +1,12 @@ [room] -pane_0\name=Browser -pane_0\geometry=@Rect(0 0 1920 495) -pane_1\name=SceneCast -pane_1\geometry=@Rect(0 503 1920 493) -hierarchy="-1 1 [ 0 1 ] " -name=Browser +pane_0\name=Xsheet +pane_0\geometry=@Rect(0 0 786 698) +pane_0\orientation=TopToBottom +pane_0\frameZoomFactor=100 +pane_1\name=FunctionEditor +pane_1\geometry=@Rect(790 336 490 362) +pane_1\toggleStatus=0 +pane_2\name=SceneViewer +pane_2\geometry=@Rect(790 0 490 332) +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 b3c7f6c..076fcc4 100644 --- a/stuff/profiles/layouts/rooms/Default/room8.ini +++ b/stuff/profiles/layouts/rooms/Default/room8.ini @@ -1,7 +1,7 @@ [room] -pane_0\name=Tasks -pane_0\geometry=@Rect(0 0 956 996) -pane_1\name=BatchServers -pane_1\geometry=@Rect(964 0 956 996) -hierarchy="-1 0 [ 0 1 ] " -name=Farm +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 diff --git a/stuff/profiles/layouts/rooms/Default/room9.ini b/stuff/profiles/layouts/rooms/Default/room9.ini index a1bf55f..497c208 100644 --- a/stuff/profiles/layouts/rooms/Default/room9.ini +++ b/stuff/profiles/layouts/rooms/Default/room9.ini @@ -1,23 +1,7 @@ [room] -hierarchy="-1 1 [ 5 [ [ 0 6 ] 4 3 1 ] 2 ] " -pane_0\name=StyleEditor -name=Timeline -pane_0\geometry=@Rect(0 30 238 487) -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(1660 30 260 681) -pane_2\name=Timeline -pane_2\geometry=@Rect(0 715 1920 278) -pane_2\orientation=LeftToRight -pane_2\frameZoomFactor=100 -pane_3\name=SceneViewer -pane_3\geometry=@Rect(281 30 1375 681) -pane_4\name=ToolBar -pane_4\geometry=@Rect(242 30 35 681) -pane_5\name=ToolOptions -pane_5\geometry=@Rect(0 0 1920 26) -pane_6\name=LevelPalette -pane_6\geometry=@Rect(0 521 238 190) -pane_6\viewtype=2 +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 diff --git a/toonz/sources/toonz/filmstrip.cpp b/toonz/sources/toonz/filmstrip.cpp index 69a9554..7fe018d 100644 --- a/toonz/sources/toonz/filmstrip.cpp +++ b/toonz/sources/toonz/filmstrip.cpp @@ -672,6 +672,14 @@ void FilmstripFrames::drawFrameIcon(QPainter &p, const QRect &r, int index, QPixmap inbetweenPixmap( svgToPixmap(":Resources/filmstrip_inbetween.svg")); + + if (r.height() - 6 < inbetweenPixmap.height()) { + QSize rectSize(inbetweenPixmap.size()); + rectSize.setHeight(r.height() - 6); + inbetweenPixmap = inbetweenPixmap.scaled( + rectSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + } + p.drawPixmap( x0 + 2, y1 - inbetweenPixmap.height() / inbetweenPixmap.devicePixelRatio() - @@ -914,6 +922,15 @@ void FilmstripFrames::mouseMoveEvent(QMouseEvent *e) { pos = e->globalPos(); scroll((m_pos.y() - pos.y()) * 10); m_pos = pos; + } else { + TFrameId fid = index2fid(index); + TXshSimpleLevel *sl = getLevel(); + + if (sl && m_selection && sl->getType() == PLI_XSHLEVEL && + m_selection->isInInbetweenRange(fid) && + e->pos().x() > width() - 20 - fs_rightMargin) { + setToolTip(tr("Auto Inbetween")); + } } } diff --git a/toonz/sources/toonzlib/preferences.cpp b/toonz/sources/toonzlib/preferences.cpp index 97cfcf9..87c18a1 100644 --- a/toonz/sources/toonzlib/preferences.cpp +++ b/toonz/sources/toonzlib/preferences.cpp @@ -237,7 +237,7 @@ Preferences::Preferences() , m_defLevelWidth(0.0) , m_defLevelHeight(0.0) , m_defLevelDpi(0.0) - , m_iconSize(160, 90) + , m_iconSize(80, 45) , m_blankColor(TPixel32::White) , m_frontOnionColor(TPixel::Black) , m_backOnionColor(TPixel::Black) @@ -250,7 +250,7 @@ Preferences::Preferences() , m_shrink(1) , m_step(1) , m_blanksCount(0) - , m_keyframeType(3) + , m_keyframeType(2) , m_animationStep(1) , m_textureSize(0) , m_xsheetStep(10) @@ -262,11 +262,11 @@ Preferences::Preferences() , m_currentLanguage("English") , m_currentStyleSheet("Default") , m_undoMemorySize(100) - , m_dragCellsBehaviour(0) + , m_dragCellsBehaviour(1) , m_lineTestFpsCapture(25) , m_defLevelType(0) , m_vectorSnappingTarget(SnapAll) - , m_autocreationType(1) + , m_autocreationType(2) , m_autoExposeEnabled(true) , m_autoCreateEnabled(true) , m_subsceneFolderEnabled(true) @@ -295,7 +295,7 @@ Preferences::Preferences() , m_regionAntialias(false) , m_keepFillOnVectorSimplify(true) , m_useHigherDpiOnVectorSimplify(false) - , m_downArrowInLevelStripCreatesNewFrame(false) + , m_downArrowInLevelStripCreatesNewFrame(true) , m_viewerBGColor(128, 128, 128, 255) , m_previewBGColor(64, 64, 64, 255) , m_chessboardColor1(180, 180, 180) @@ -312,22 +312,22 @@ Preferences::Preferences() , m_moveCurrentFrameByClickCellArea(true) , m_onionSkinEnabled(true) , m_onionSkinDuringPlayback(false) - , m_dropdownShortcutsCycleOptions(false) + , m_dropdownShortcutsCycleOptions(true) , m_multiLayerStylePickerEnabled(false) , m_showKeyframesOnXsheetCellArea(true) , m_projectRoot(0x08) , m_customProjectRoot("") , m_precompute(true) , m_fastRenderPath("desktop") - , m_ffmpegTimeout(60) + , m_ffmpegTimeout(600) , m_shortcutPreset("defopentoonz") , m_useNumpadForSwitchingStyles(true) , m_newLevelSizeToCameraSizeEnabled(false) - , m_showXSheetToolbar(false) - , m_syncLevelRenumberWithXsheet(false) + , m_showXSheetToolbar(true) + , m_syncLevelRenumberWithXsheet(true) , m_expandFunctionHeader(false) , m_showColumnNumbers(false) - , m_useArrowKeyToShiftCellSelection(false) + , m_useArrowKeyToShiftCellSelection(true) , m_inputCellsWithoutDoubleClickingEnabled(false) , m_importPolicy(0) , m_guidedDrawingType(0) @@ -346,11 +346,11 @@ Preferences::Preferences() , m_cursorOutlineEnabled(true) , m_currentColumnColor(TPixel::Black) , m_enableWinInk(false) - , m_useOnionColorsForShiftAndTraceGhosts(false) + , m_useOnionColorsForShiftAndTraceGhosts(true) , m_rasterBackgroundColor(TPixel::White) , m_backupKeepCount(1) { TCamera camera; - m_defLevelType = PLI_XSHLEVEL; + m_defLevelType = TZP_XSHLEVEL; m_defLevelWidth = camera.getSize().lx; m_defLevelHeight = camera.getSize().ly; m_defLevelDpi = camera.getDpi().x;