diff --git a/toonz/sources/toonz/convertpopup.cpp b/toonz/sources/toonz/convertpopup.cpp index f0e9dad..c3a5731 100644 --- a/toonz/sources/toonz/convertpopup.cpp +++ b/toonz/sources/toonz/convertpopup.cpp @@ -330,6 +330,8 @@ ConvertPopup::ConvertPopup(bool specifyInput) , m_isConverting(false) { // Su MAC i dialog modali non hanno bottoni di chiusura nella titleBar setModal(false); + m_mainFrame->setFixedHeight(220); + this->layout()->setSizeConstraint(QLayout::SetFixedSize); TlvMode_Unpainted = tr("Unpainted tlv"); TlvMode_UnpaintedFromNonAA = tr("Unpainted tlv from non AA source"); TlvMode_PaintedFromTwoImages = tr("Painted tlv from two images"); diff --git a/toonz/sources/toonz/levelsettingspopup.cpp b/toonz/sources/toonz/levelsettingspopup.cpp index f50fb5f..283c12b 100644 --- a/toonz/sources/toonz/levelsettingspopup.cpp +++ b/toonz/sources/toonz/levelsettingspopup.cpp @@ -320,6 +320,8 @@ LevelSettingsPopup::LevelSettingsPopup() , m_whiteTransp(0) , m_scanPathFld(0) { setWindowTitle(tr("Level Settings")); + m_mainFrame->setFixedHeight(280); + this->layout()->setSizeConstraint(QLayout::SetFixedSize); m_nameFld = new LineEdit(); m_pathFld = new FileField(); // Path diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cpp index 1163909..4df4bdc 100644 --- a/toonz/sources/toonz/preferencespopup.cpp +++ b/toonz/sources/toonz/preferencespopup.cpp @@ -1040,7 +1040,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) { tr("Show Raster Images Darken Blended")}, {showFrameNumberWithLetters, tr("Show \"ABC\" Appendix to the Frame Number in Xsheet Cell")}, - {iconSize, tr("Level Strip Icon Size*:")}, + {iconSize, tr("Level Strip Thumbnail Size*:")}, {viewShrink, tr("Viewer Shrink:")}, {viewStep, tr("Step:")}, {viewerZoomCenter, tr("Viewer Zoom Center:")}, @@ -1372,18 +1372,9 @@ QWidget* PreferencesPopup::createGeneralPage() { insertUI(defaultViewerEnabled, lay); insertUI(rasterOptimizedMemory, lay); - QGridLayout* autoSaveLay = insertGroupBoxUI(autosaveEnabled, lay); - { - insertUI(autosavePeriod, autoSaveLay); - insertUI(autosaveSceneEnabled, autoSaveLay); - insertUI(autosaveOtherFilesEnabled, autoSaveLay); - } insertUI(startupPopupEnabled, lay); insertUI(undoMemorySize, lay); insertUI(taskchunksize, lay); - insertUI(replaceAfterSaveLevelAs, lay); - QGridLayout* backupLay = insertGroupBoxUI(backupEnabled, lay); - { insertUI(backupKeepCount, backupLay); } insertUI(sceneNumberingEnabled, lay); insertUI(watchFileSystemEnabled, lay); @@ -1621,7 +1612,15 @@ QWidget* PreferencesPopup::createSavingPage() { QWidget* widget = new QWidget(this); QGridLayout* lay = new QGridLayout(); setupLayout(lay); - + QGridLayout* autoSaveLay = insertGroupBoxUI(autosaveEnabled, lay); + { + insertUI(autosavePeriod, autoSaveLay); + insertUI(autosaveSceneEnabled, autoSaveLay); + insertUI(autosaveOtherFilesEnabled, autoSaveLay); + } + insertUI(replaceAfterSaveLevelAs, lay); + QGridLayout* backupLay = insertGroupBoxUI(backupEnabled, lay); + { insertUI(backupKeepCount, backupLay); } QLabel* matteColorLabel = new QLabel(tr("Matte color is used for background when overwriting " "raster levels with transparent pixels\nin non " @@ -1745,7 +1744,7 @@ QWidget* PreferencesPopup::createToolsPage() { } insertUI(levelBasedToolsDisplay, lay, getComboItemList(levelBasedToolsDisplay)); - insertUI(useCtrlAltToResizeBrush, lay); + //insertUI(useCtrlAltToResizeBrush, lay); lay->setRowStretch(lay->rowCount(), 1); widget->setLayout(lay); diff --git a/toonz/sources/toonzqt/functionsegmentviewer.cpp b/toonz/sources/toonzqt/functionsegmentviewer.cpp index ca1d3dc..f7cadf5 100644 --- a/toonz/sources/toonzqt/functionsegmentviewer.cpp +++ b/toonz/sources/toonzqt/functionsegmentviewer.cpp @@ -1469,7 +1469,7 @@ void FunctionSegmentViewer::onPrevCurveButtonPressed() { int r0 = (int)prevKey.m_frame; int r1 = (int)currentKey.m_frame; - + m_panel->update(); m_sheet->getSelection()->selectSegment(m_curve, currentKeyIndex - 1, QRect(col, r0, 1, r1 - r0 + 1)); m_sheet->updateAll(); @@ -1502,7 +1502,7 @@ void FunctionSegmentViewer::onNextCurveButtonPressed() { int r0 = (int)nextKey.m_frame; int r1 = (int)nextNextKey.m_frame; - + m_panel->update(); m_sheet->getSelection()->selectSegment(m_curve, currentKeyIndex + 1, QRect(col, r0, 1, r1 - r0 + 1)); m_sheet->updateAll();