organize preferences popup
This commit is contained in:
shun_iwasawa
parent
b0ee30d3b2
commit
f2419f8f4d
1 changed files with 193 additions and 174 deletions
|
|
@ -1242,24 +1242,12 @@ PreferencesPopup::PreferencesPopup()
|
|||
new CheckBox(tr("Move Current Frame by Clicking on Xsheet / Numerical "
|
||||
"Columns Cell Area"),
|
||||
this);
|
||||
// Viewer BG color
|
||||
m_viewerBgColorFld = new ColorField(this, false, m_pref->getViewerBgColor());
|
||||
// Preview BG color
|
||||
m_previewBgColorFld =
|
||||
new ColorField(this, false, m_pref->getPreviewBgColor());
|
||||
// bg chessboard colors
|
||||
TPixel32 col1, col2;
|
||||
m_pref->getChessboardColors(col1, col2);
|
||||
m_chessboardColor1Fld = new ColorField(this, false, col1);
|
||||
m_chessboardColor2Fld = new ColorField(this, false, col2);
|
||||
CheckBox *openFlipbookAfterCB =
|
||||
new CheckBox(tr("Open Flipbook after Rendering"), this);
|
||||
CheckBox *actualPixelOnSceneModeCB =
|
||||
new CheckBox(tr("Enable Actual Pixel View on Scene Editing Mode"), this);
|
||||
CheckBox *levelNameOnEachMarkerCB =
|
||||
new CheckBox(tr("Display Level Name on Each Marker"), this);
|
||||
CheckBox *showRasterImageDarkenBlendedInViewerCB = new CheckBox(
|
||||
tr("Show Raster Images Darken Blended in Camstand View"), this);
|
||||
CheckBox *showRasterImageDarkenBlendedInViewerCB =
|
||||
new CheckBox(tr("Show Raster Images Darken Blended"), this);
|
||||
CheckBox *showShowFrameNumberWithLettersCB = new CheckBox(
|
||||
tr("Show \"ABC\" Appendix to the Frame Number in Xsheet Cell"), this);
|
||||
QComboBox *viewerZoomCenterComboBox = new QComboBox(this);
|
||||
|
|
@ -1276,7 +1264,7 @@ PreferencesPopup::PreferencesPopup()
|
|||
CheckBox *show0ThickLinesCB =
|
||||
new CheckBox(tr("Show Lines with Thickness 0"), this);
|
||||
CheckBox *regionAntialiasCB =
|
||||
new CheckBox(tr("Antialiased region boundaries"), this);
|
||||
new CheckBox(tr("Antialiased Region Boundaries"), this);
|
||||
|
||||
//--- Loading ------------------------------
|
||||
categoryList->addItem(tr("Loading"));
|
||||
|
|
@ -1329,10 +1317,6 @@ PreferencesPopup::PreferencesPopup()
|
|||
|
||||
CheckBox *keepOriginalCleanedUpCB =
|
||||
new CheckBox(tr("Keep Original Cleaned Up Drawings As Backup"), this);
|
||||
CheckBox *multiLayerStylePickerCB = new CheckBox(
|
||||
tr("Multi Layer Style Picker : Switch Levels by Picking"), this);
|
||||
CheckBox *useSaveboxToLimitFillingOpCB =
|
||||
new CheckBox(tr("Use the TLV Savebox to Limit Filling Operations"), this);
|
||||
CheckBox *minimizeSaveboxAfterEditingCB =
|
||||
new CheckBox(tr("Minimize Savebox after Editing"), this);
|
||||
m_useNumpadForSwitchingStyles =
|
||||
|
|
@ -1342,12 +1326,16 @@ PreferencesPopup::PreferencesPopup()
|
|||
m_useHigherDpiOnVectorSimplifyCB = new CheckBox(
|
||||
tr("Use higher DPI for calculations - Slower but more accurate"), this);
|
||||
m_downArrowInLevelStripCreatesNewFrame = new CheckBox(
|
||||
tr("Down arrow at end of level strip creates a new frame"), this);
|
||||
tr("Down Arrow at End of Level Strip Creates a New Frame"), this);
|
||||
|
||||
//--- Tools -------------------------------
|
||||
categoryList->addItem(tr("Tools"));
|
||||
|
||||
m_dropdownShortcutsCycleOptionsCB = new QComboBox(this);
|
||||
CheckBox *multiLayerStylePickerCB = new CheckBox(
|
||||
tr("Multi Layer Style Picker : Switch Levels by Picking"), this);
|
||||
CheckBox *useSaveboxToLimitFillingOpCB =
|
||||
new CheckBox(tr("Use the TLV Savebox to Limit Filling Operations"), this);
|
||||
|
||||
//--- Xsheet ------------------------------
|
||||
categoryList->addItem(tr("Xsheet"));
|
||||
|
|
@ -1370,8 +1358,7 @@ PreferencesPopup::PreferencesPopup()
|
|||
m_showXSheetToolbar = new QGroupBox(tr("Show Toolbar in the XSheet "), this);
|
||||
m_showXSheetToolbar->setCheckable(true);
|
||||
m_expandFunctionHeader = new CheckBox(
|
||||
tr("Expand Function Editor Header to Match Xsheet Toolbar Height "
|
||||
"(Requires Restart)"),
|
||||
tr("Expand Function Editor Header to Match Xsheet Toolbar Height*"),
|
||||
this);
|
||||
CheckBox *showColumnNumbersCB =
|
||||
new CheckBox(tr("Show Column Numbers in Column Headers"), this);
|
||||
|
|
@ -1410,6 +1397,8 @@ PreferencesPopup::PreferencesPopup()
|
|||
CheckBox *displayInNewFlipBookCB =
|
||||
new CheckBox(tr("Display in a New Flipbook Window"), this);
|
||||
CheckBox *fitToFlipbookCB = new CheckBox(tr("Fit to Flipbook"), this);
|
||||
CheckBox *openFlipbookAfterCB =
|
||||
new CheckBox(tr("Open Flipbook after Rendering"), this);
|
||||
|
||||
//--- Onion Skin ------------------------------
|
||||
categoryList->addItem(tr("Onion Skin"));
|
||||
|
|
@ -1429,8 +1418,19 @@ PreferencesPopup::PreferencesPopup()
|
|||
m_onionPaperThickness = new DVGui::IntLineEdit(this, thickness, 0, 100);
|
||||
m_guidedDrawingStyle = new QComboBox(this);
|
||||
|
||||
//--- Transparency Check ------------------------------
|
||||
categoryList->addItem(tr("Transparency Check"));
|
||||
//--- Colors ------------------------------
|
||||
categoryList->addItem(tr("Colors"));
|
||||
|
||||
// Viewer BG color
|
||||
m_viewerBgColorFld = new ColorField(this, false, m_pref->getViewerBgColor());
|
||||
// Preview BG color
|
||||
m_previewBgColorFld =
|
||||
new ColorField(this, false, m_pref->getPreviewBgColor());
|
||||
// bg chessboard colors
|
||||
TPixel32 col1, col2;
|
||||
m_pref->getChessboardColors(col1, col2);
|
||||
m_chessboardColor1Fld = new ColorField(this, false, col1);
|
||||
m_chessboardColor2Fld = new ColorField(this, false, col2);
|
||||
|
||||
TPixel32 bgColor, inkColor, paintColor;
|
||||
m_pref->getTranspCheckData(bgColor, inkColor, paintColor);
|
||||
|
|
@ -1544,7 +1544,6 @@ PreferencesPopup::PreferencesPopup()
|
|||
m_viewShrink->setValue(shrink);
|
||||
m_viewStep->setValue(step);
|
||||
moveCurrentFrameCB->setChecked(m_pref->isMoveCurrentEnabled());
|
||||
openFlipbookAfterCB->setChecked(m_pref->isGeneratedMovieViewEnabled());
|
||||
actualPixelOnSceneModeCB->setChecked(
|
||||
m_pref->isActualPixelViewOnSceneEditingModeEnabled());
|
||||
levelNameOnEachMarkerCB->setChecked(m_pref->isLevelNameOnEachMarkerEnabled());
|
||||
|
|
@ -1635,10 +1634,8 @@ PreferencesPopup::PreferencesPopup()
|
|||
|
||||
//--- Drawing ------------------------------
|
||||
keepOriginalCleanedUpCB->setChecked(m_pref->isSaveUnpaintedInCleanupEnable());
|
||||
multiLayerStylePickerCB->setChecked(m_pref->isMultiLayerStylePickerEnabled());
|
||||
minimizeSaveboxAfterEditingCB->setChecked(
|
||||
m_pref->isMinimizeSaveboxAfterEditing());
|
||||
useSaveboxToLimitFillingOpCB->setChecked(m_pref->getFillOnlySavebox());
|
||||
m_useNumpadForSwitchingStyles->setChecked(
|
||||
m_pref->isUseNumpadForSwitchingStylesEnabled());
|
||||
m_keepFillOnVectorSimplifyCB->setChecked(
|
||||
|
|
@ -1706,6 +1703,8 @@ PreferencesPopup::PreferencesPopup()
|
|||
m_dropdownShortcutsCycleOptionsCB->addItems(dropdownBehaviorTypes);
|
||||
m_dropdownShortcutsCycleOptionsCB->setCurrentIndex(
|
||||
m_pref->getDropdownShortcutsCycleOptions() ? 1 : 0);
|
||||
multiLayerStylePickerCB->setChecked(m_pref->isMultiLayerStylePickerEnabled());
|
||||
useSaveboxToLimitFillingOpCB->setChecked(m_pref->getFillOnlySavebox());
|
||||
|
||||
//--- Xsheet ------------------------------
|
||||
xsheetAutopanDuringPlaybackCB->setChecked(m_pref->isXsheetAutopanEnabled());
|
||||
|
|
@ -1748,6 +1747,7 @@ PreferencesPopup::PreferencesPopup()
|
|||
rewindAfterPlaybackCB->setChecked(m_pref->rewindAfterPlaybackEnabled());
|
||||
displayInNewFlipBookCB->setChecked(m_pref->previewAlwaysOpenNewFlipEnabled());
|
||||
fitToFlipbookCB->setChecked(m_pref->fitToFlipbookEnabled());
|
||||
openFlipbookAfterCB->setChecked(m_pref->isGeneratedMovieViewEnabled());
|
||||
|
||||
//--- Onion Skin ------------------------------
|
||||
m_onionSkinVisibility->setChecked(m_pref->isOnionSkinEnabled());
|
||||
|
|
@ -1894,7 +1894,8 @@ PreferencesPopup::PreferencesPopup()
|
|||
{
|
||||
styleLay->addWidget(new QLabel(tr("Style:")), 0, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
styleLay->addWidget(styleSheetType, 0, 1);
|
||||
styleLay->addWidget(styleSheetType, 0, 1,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
|
||||
styleLay->addWidget(new QLabel(tr("Pixels Only:"), this), 1, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
|
|
@ -1902,23 +1903,22 @@ PreferencesPopup::PreferencesPopup()
|
|||
|
||||
styleLay->addWidget(new QLabel(tr("Unit:"), this), 2, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
styleLay->addWidget(m_unitOm, 2, 1);
|
||||
styleLay->addWidget(m_unitOm, 2, 1, Qt::AlignLeft | Qt::AlignVCenter);
|
||||
|
||||
styleLay->addWidget(new QLabel(tr("Camera Unit:"), this), 3, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
styleLay->addWidget(m_cameraUnitOm, 3, 1);
|
||||
styleLay->addWidget(m_cameraUnitOm, 3, 1,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
|
||||
styleLay->addWidget(new QLabel(tr("Rooms*:"), this), 4, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
styleLay->addWidget(roomChoice, 4, 1);
|
||||
styleLay->addWidget(roomChoice, 4, 1, Qt::AlignLeft | Qt::AlignVCenter);
|
||||
}
|
||||
styleLay->setColumnStretch(0, 0);
|
||||
styleLay->setColumnStretch(1, 0);
|
||||
styleLay->setColumnStretch(2, 1);
|
||||
userInterfaceFrameLay->addLayout(styleLay, 0);
|
||||
|
||||
userInterfaceFrameLay->addWidget(openFlipbookAfterCB, 0,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
userInterfaceFrameLay->addWidget(moveCurrentFrameCB, 0,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
userInterfaceFrameLay->addWidget(actualPixelOnSceneModeCB, 0,
|
||||
|
|
@ -1930,66 +1930,60 @@ PreferencesPopup::PreferencesPopup()
|
|||
userInterfaceFrameLay->addWidget(showShowFrameNumberWithLettersCB, 0,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
|
||||
QGridLayout *bgColorsLay = new QGridLayout();
|
||||
bgColorsLay->setMargin(0);
|
||||
bgColorsLay->setHorizontalSpacing(5);
|
||||
bgColorsLay->setVerticalSpacing(10);
|
||||
QGridLayout *interfaceBottomLay = new QGridLayout();
|
||||
interfaceBottomLay->setMargin(0);
|
||||
interfaceBottomLay->setHorizontalSpacing(5);
|
||||
interfaceBottomLay->setVerticalSpacing(10);
|
||||
{
|
||||
bgColorsLay->addWidget(new QLabel(tr("Icon Size *"), this), 0, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
bgColorsLay->addWidget(m_iconSizeLx, 0, 1);
|
||||
bgColorsLay->addWidget(new QLabel(tr("X"), this), 0, 2,
|
||||
Qt::AlignCenter);
|
||||
bgColorsLay->addWidget(m_iconSizeLy, 0, 3);
|
||||
interfaceBottomLay->addWidget(new QLabel(tr("Icon Size *"), this), 0, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
interfaceBottomLay->addWidget(m_iconSizeLx, 0, 1);
|
||||
interfaceBottomLay->addWidget(new QLabel(tr("X"), this), 0, 2,
|
||||
Qt::AlignCenter);
|
||||
interfaceBottomLay->addWidget(m_iconSizeLy, 0, 3);
|
||||
|
||||
bgColorsLay->addWidget(new QLabel(tr("Viewer Shrink"), this), 1, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
bgColorsLay->addWidget(m_viewShrink, 1, 1);
|
||||
bgColorsLay->addWidget(new QLabel(tr("Step"), this), 1, 3,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
bgColorsLay->addWidget(m_viewStep, 1, 4);
|
||||
interfaceBottomLay->addWidget(new QLabel(tr("Viewer Shrink"), this), 1,
|
||||
0, Qt::AlignRight | Qt::AlignVCenter);
|
||||
interfaceBottomLay->addWidget(m_viewShrink, 1, 1);
|
||||
interfaceBottomLay->addWidget(new QLabel(tr("Step"), this), 1, 3,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
interfaceBottomLay->addWidget(m_viewStep, 1, 4);
|
||||
|
||||
bgColorsLay->addWidget(new QLabel(tr("Viewer BG Color"), this), 2, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
bgColorsLay->addWidget(m_viewerBgColorFld, 2, 1, 1, 5);
|
||||
|
||||
bgColorsLay->addWidget(new QLabel(tr("Preview BG Color"), this), 3, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
bgColorsLay->addWidget(m_previewBgColorFld, 3, 1, 1, 5);
|
||||
|
||||
bgColorsLay->addWidget(new QLabel(tr("ChessBoard Color 1"), this), 4, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
bgColorsLay->addWidget(m_chessboardColor1Fld, 4, 1, 1, 5);
|
||||
|
||||
bgColorsLay->addWidget(new QLabel(tr("Chessboard Color 2"), this), 5, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
bgColorsLay->addWidget(m_chessboardColor2Fld, 5, 1, 1, 5);
|
||||
|
||||
bgColorsLay->addWidget(new QLabel(tr("Viewer Zoom Center"), this), 6, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
bgColorsLay->addWidget(viewerZoomCenterComboBox, 6, 1, 1, 4);
|
||||
interfaceBottomLay->addWidget(
|
||||
new QLabel(tr("Viewer Zoom Center"), this), 2, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
interfaceBottomLay->addWidget(viewerZoomCenterComboBox, 2, 1, 1, 5,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
|
||||
if (languageType) {
|
||||
bgColorsLay->addWidget(new QLabel(tr("Language *:")), 7, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
bgColorsLay->addWidget(languageType, 7, 1, 1, 4);
|
||||
interfaceBottomLay->addWidget(new QLabel(tr("Language *:")), 3, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
interfaceBottomLay->addWidget(languageType, 3, 1, 1, 5,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
}
|
||||
if (m_interfaceFont->count() > 0) {
|
||||
bgColorsLay->addWidget(new QLabel(tr("Font *:")), 8, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
bgColorsLay->addWidget(m_interfaceFont, 8, 1, 1, 4);
|
||||
bgColorsLay->addWidget(new QLabel(tr("Font Weight *:")), 9, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
bgColorsLay->addWidget(m_interfaceFontWeight, 9, 1, 1, 4);
|
||||
interfaceBottomLay->addWidget(new QLabel(tr("Font *:")), 4, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
QHBoxLayout *fontLay = new QHBoxLayout();
|
||||
fontLay->setSpacing(5);
|
||||
fontLay->setMargin(0);
|
||||
{
|
||||
fontLay->addWidget(m_interfaceFont);
|
||||
fontLay->addSpacing(10);
|
||||
fontLay->addWidget(new QLabel(tr("Weight *:")));
|
||||
fontLay->addWidget(m_interfaceFontWeight);
|
||||
fontLay->addStretch(1);
|
||||
}
|
||||
interfaceBottomLay->addLayout(fontLay, 4, 1, 1, 5);
|
||||
}
|
||||
}
|
||||
bgColorsLay->setColumnStretch(0, 0);
|
||||
bgColorsLay->setColumnStretch(1, 0);
|
||||
bgColorsLay->setColumnStretch(2, 0);
|
||||
bgColorsLay->setColumnStretch(3, 0);
|
||||
bgColorsLay->setColumnStretch(4, 0);
|
||||
bgColorsLay->setColumnStretch(5, 1);
|
||||
userInterfaceFrameLay->addLayout(bgColorsLay, 0);
|
||||
interfaceBottomLay->setColumnStretch(0, 0);
|
||||
interfaceBottomLay->setColumnStretch(1, 0);
|
||||
interfaceBottomLay->setColumnStretch(2, 0);
|
||||
interfaceBottomLay->setColumnStretch(3, 0);
|
||||
interfaceBottomLay->setColumnStretch(4, 0);
|
||||
interfaceBottomLay->setColumnStretch(5, 1);
|
||||
userInterfaceFrameLay->addLayout(interfaceBottomLay, 0);
|
||||
|
||||
userInterfaceFrameLay->addStretch(1);
|
||||
|
||||
|
|
@ -2058,8 +2052,8 @@ PreferencesPopup::PreferencesPopup()
|
|||
cacheLay->addWidget(
|
||||
new QLabel(
|
||||
tr("Palette Type on Loading Raster Image as Color Model:")),
|
||||
3, 0, Qt::AlignRight | Qt::AlignVCenter);
|
||||
cacheLay->addWidget(paletteTypeForRasterColorModelComboBox, 3, 1, 1, 5);
|
||||
3, 0, 1, 6);
|
||||
cacheLay->addWidget(paletteTypeForRasterColorModelComboBox, 4, 1, 1, 5);
|
||||
}
|
||||
cacheLay->setColumnStretch(0, 0);
|
||||
cacheLay->setColumnStretch(1, 0);
|
||||
|
|
@ -2082,20 +2076,12 @@ PreferencesPopup::PreferencesPopup()
|
|||
{
|
||||
ioLay->addWidget(
|
||||
new QLabel(
|
||||
tr("OpenToonz can use FFmpeg for additional file formats.")),
|
||||
0, Qt::AlignCenter | Qt::AlignVCenter);
|
||||
ioLay->addWidget(new QLabel(tr("FFmpeg is not bundled with OpenToonz")),
|
||||
0, Qt::AlignCenter | Qt::AlignVCenter);
|
||||
ioLay->addWidget(new QLabel(" "), 0, Qt::AlignCenter | Qt::AlignVCenter);
|
||||
ioLay->addWidget(new QLabel(tr("NOTE: This is an experimental feature.")),
|
||||
0, Qt::AlignCenter | Qt::AlignVCenter);
|
||||
ioLay->addWidget(new QLabel(tr("Please SAVE YOUR WORK before exporting "
|
||||
"in MP4, WEBM, or GIF format.")),
|
||||
0, Qt::AlignCenter | Qt::AlignVCenter);
|
||||
ioLay->addWidget(new QLabel(" "), 0, Qt::AlignCenter | Qt::AlignVCenter);
|
||||
ioLay->addWidget(new QLabel(tr("Please provide the path where FFmpeg is "
|
||||
"located on your computer.")),
|
||||
0, Qt::AlignLeft | Qt::AlignVCenter);
|
||||
tr("OpenToonz can use FFmpeg for additional file formats.\n") +
|
||||
tr("FFmpeg is not bundled with OpenToonz.\n") +
|
||||
tr("Please provide the path where FFmpeg is located on your "
|
||||
"computer.")),
|
||||
0, Qt::AlignLeft | Qt::AlignVCenter);
|
||||
|
||||
QGridLayout *ioGridLay = new QGridLayout();
|
||||
ioGridLay->setVerticalSpacing(10);
|
||||
ioGridLay->setHorizontalSpacing(15);
|
||||
|
|
@ -2109,17 +2095,16 @@ PreferencesPopup::PreferencesPopup()
|
|||
new QLabel(tr("Number of seconds to wait for FFmpeg to complete "
|
||||
"processing the output:")),
|
||||
2, 0, 1, 4);
|
||||
ioGridLay->addWidget(
|
||||
new QLabel(tr("Note: FFmpeg begins working once all images "
|
||||
"have been processed.")),
|
||||
3, 0, 1, 4);
|
||||
ioGridLay->addWidget(new QLabel(tr("Note: FFmpeg begins working once "
|
||||
"all images have been processed.")),
|
||||
3, 0, 1, 4);
|
||||
ioGridLay->addWidget(new QLabel(tr("FFmpeg Timeout:")), 4, 0,
|
||||
Qt::AlignRight);
|
||||
ioGridLay->addWidget(m_ffmpegTimeout, 4, 1, 1, 3);
|
||||
ioGridLay->addWidget(new QLabel(" "), 5, 0);
|
||||
ioGridLay->addWidget(
|
||||
new QLabel(tr("Please indicate where you would like "
|
||||
"exports from Fast Render(MP4) to go.")),
|
||||
new QLabel(tr("Please indicate where you would like exports from "
|
||||
"Fast Render(MP4) to go.")),
|
||||
6, 0, 1, 4);
|
||||
ioGridLay->addWidget(new QLabel(tr("Fast Render Path: ")), 7, 0,
|
||||
Qt::AlignRight);
|
||||
|
|
@ -2146,11 +2131,13 @@ PreferencesPopup::PreferencesPopup()
|
|||
{
|
||||
drawingTopLay->addWidget(new QLabel(tr("Scan File Format:")), 0, 0,
|
||||
Qt::AlignRight);
|
||||
drawingTopLay->addWidget(m_defScanLevelType, 0, 1, 1, 3);
|
||||
drawingTopLay->addWidget(m_defScanLevelType, 0, 1, 1, 3,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
|
||||
drawingTopLay->addWidget(new QLabel(tr("Default Level Type:")), 1, 0,
|
||||
Qt::AlignRight);
|
||||
drawingTopLay->addWidget(m_defLevelType, 1, 1, 1, 3);
|
||||
drawingTopLay->addWidget(m_defLevelType, 1, 1, 1, 3,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
drawingTopLay->addWidget(m_newLevelToCameraSizeCB, 2, 0, 1, 3);
|
||||
drawingTopLay->addWidget(new QLabel(tr("Width:")), 3, 0,
|
||||
Qt::AlignRight);
|
||||
|
|
@ -2162,10 +2149,12 @@ PreferencesPopup::PreferencesPopup()
|
|||
drawingTopLay->addWidget(m_defLevelDpi, 4, 1);
|
||||
drawingTopLay->addWidget(new QLabel(tr("Autocreation:")), 5, 0,
|
||||
Qt::AlignRight);
|
||||
drawingTopLay->addWidget(m_autocreationType, 5, 1, 1, 3);
|
||||
drawingTopLay->addWidget(m_autocreationType, 5, 1, 1, 3,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
drawingTopLay->addWidget(new QLabel(tr("Vector Snapping:")), 6, 0,
|
||||
Qt::AlignRight);
|
||||
drawingTopLay->addWidget(m_vectorSnappingTargetCB, 6, 1, 1, 3);
|
||||
drawingTopLay->addWidget(m_vectorSnappingTargetCB, 6, 1, 1, 3,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
}
|
||||
drawingFrameLay->addLayout(drawingTopLay, 0);
|
||||
|
||||
|
|
@ -2173,10 +2162,6 @@ PreferencesPopup::PreferencesPopup()
|
|||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
drawingFrameLay->addWidget(minimizeSaveboxAfterEditingCB, 0,
|
||||
Qt::AlignLeft | Qt::AlignVCenter); // 6.4
|
||||
drawingFrameLay->addWidget(useSaveboxToLimitFillingOpCB, 0,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
drawingFrameLay->addWidget(multiLayerStylePickerCB, 0,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
drawingFrameLay->addWidget(m_useNumpadForSwitchingStyles, 0,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
drawingFrameLay->addWidget(m_downArrowInLevelStripCreatesNewFrame, 0,
|
||||
|
|
@ -2189,8 +2174,7 @@ PreferencesPopup::PreferencesPopup()
|
|||
replaceVectorsLay->addWidget(m_keepFillOnVectorSimplifyCB);
|
||||
replaceVectorsLay->addWidget(m_useHigherDpiOnVectorSimplifyCB);
|
||||
replaceVectorGroupBox->setLayout(replaceVectorsLay);
|
||||
drawingFrameLay->addWidget(replaceVectorGroupBox, 0,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
drawingFrameLay->addWidget(replaceVectorGroupBox, 0);
|
||||
drawingFrameLay->addStretch(1);
|
||||
}
|
||||
drawingBox->setLayout(drawingFrameLay);
|
||||
|
|
@ -2211,13 +2195,18 @@ PreferencesPopup::PreferencesPopup()
|
|||
toolsFrameLay->addWidget(new QLabel(tr("Dropdown Shortcuts:")), 0, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
toolsFrameLay->addWidget(m_dropdownShortcutsCycleOptionsCB, 0, 1);
|
||||
toolsFrameLay->addWidget(useSaveboxToLimitFillingOpCB, 1, 0, 1, 3,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
toolsFrameLay->addWidget(multiLayerStylePickerCB, 2, 0, 1, 3,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
}
|
||||
toolsFrameLay->setColumnStretch(0, 0);
|
||||
toolsFrameLay->setColumnStretch(1, 0);
|
||||
toolsFrameLay->setColumnStretch(2, 1);
|
||||
toolsFrameLay->setRowStretch(0, 0);
|
||||
toolsFrameLay->setRowStretch(1, 0);
|
||||
toolsFrameLay->setRowStretch(2, 1);
|
||||
toolsFrameLay->setRowStretch(2, 0);
|
||||
toolsFrameLay->setRowStretch(3, 1);
|
||||
toolsBox->setLayout(toolsFrameLay);
|
||||
stackedWidget->addWidget(toolsBox);
|
||||
|
||||
|
|
@ -2232,19 +2221,22 @@ PreferencesPopup::PreferencesPopup()
|
|||
xsheetFrameLay->setHorizontalSpacing(15);
|
||||
xsheetFrameLay->setVerticalSpacing(10);
|
||||
{
|
||||
xsheetFrameLay->addWidget(new QLabel(tr("Layout Preference*:")), 0, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
xsheetFrameLay->addWidget(xsheetLayoutOptions, 0, 1);
|
||||
xsheetFrameLay->addWidget(new QLabel(tr("Column Header Layout*:")), 0,
|
||||
0, Qt::AlignRight | Qt::AlignVCenter);
|
||||
xsheetFrameLay->addWidget(xsheetLayoutOptions, 0, 1, 1, 2,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
|
||||
xsheetFrameLay->addWidget(new QLabel(tr("Next/Previous Step Frames:")),
|
||||
1, 0, Qt::AlignRight | Qt::AlignVCenter);
|
||||
xsheetFrameLay->addWidget(m_xsheetStep, 1, 1);
|
||||
xsheetFrameLay->addWidget(m_xsheetStep, 1, 1, 1, 2,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
|
||||
xsheetFrameLay->addWidget(xsheetAutopanDuringPlaybackCB, 2, 0, 1, 2);
|
||||
xsheetFrameLay->addWidget(xsheetAutopanDuringPlaybackCB, 2, 0, 1, 3);
|
||||
|
||||
xsheetFrameLay->addWidget(new QLabel(tr("Cell-dragging Behaviour:")), 3,
|
||||
0, Qt::AlignRight | Qt::AlignVCenter);
|
||||
xsheetFrameLay->addWidget(m_cellsDragBehaviour, 3, 1);
|
||||
xsheetFrameLay->addWidget(m_cellsDragBehaviour, 3, 1, 1, 2,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
|
||||
xsheetFrameLay->addWidget(ignoreAlphaonColumn1CB, 4, 0, 1, 2);
|
||||
xsheetFrameLay->addWidget(showKeyframesOnCellAreaCB, 5, 0, 1, 2);
|
||||
|
|
@ -2326,16 +2318,14 @@ PreferencesPopup::PreferencesPopup()
|
|||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
previewLayout->addWidget(fitToFlipbookCB, 4, 0, 1, 3,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
previewLayout->addWidget(openFlipbookAfterCB, 5, 0, 1, 3,
|
||||
Qt::AlignLeft | Qt::AlignVCenter);
|
||||
}
|
||||
previewLayout->setColumnStretch(0, 0);
|
||||
previewLayout->setColumnStretch(1, 0);
|
||||
previewLayout->setColumnStretch(2, 1);
|
||||
previewLayout->setRowStretch(0, 0);
|
||||
previewLayout->setRowStretch(1, 0);
|
||||
previewLayout->setRowStretch(2, 0);
|
||||
previewLayout->setRowStretch(3, 0);
|
||||
previewLayout->setRowStretch(4, 0);
|
||||
previewLayout->setRowStretch(5, 1);
|
||||
for (int i = 0; i <= 5; i++) previewLayout->setRowStretch(i, 0);
|
||||
previewLayout->setRowStretch(6, 1);
|
||||
previewBox->setLayout(previewLayout);
|
||||
stackedWidget->addWidget(previewBox);
|
||||
|
||||
|
|
@ -2385,33 +2375,62 @@ PreferencesPopup::PreferencesPopup()
|
|||
onionBox->setLayout(onionLay);
|
||||
stackedWidget->addWidget(onionBox);
|
||||
|
||||
//--- Transparency Check --------------------------
|
||||
QWidget *tcBox = new QWidget(this);
|
||||
QGridLayout *tcLay = new QGridLayout();
|
||||
tcLay->setMargin(15);
|
||||
tcLay->setHorizontalSpacing(10);
|
||||
tcLay->setVerticalSpacing(10);
|
||||
//--- Colors --------------------------
|
||||
QWidget *colorBox = new QWidget(this);
|
||||
QGridLayout *colorLay = new QGridLayout();
|
||||
colorLay->setMargin(15);
|
||||
colorLay->setHorizontalSpacing(10);
|
||||
colorLay->setVerticalSpacing(10);
|
||||
{
|
||||
tcLay->addWidget(new QLabel(tr("Ink Color on White Bg:")), 0, 0,
|
||||
Qt::AlignRight);
|
||||
tcLay->addWidget(m_transpCheckInkColor, 0, 1);
|
||||
colorLay->addWidget(new QLabel(tr("Viewer BG Color"), this), 0, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
colorLay->addWidget(m_viewerBgColorFld, 0, 1);
|
||||
|
||||
tcLay->addWidget(new QLabel(tr("Ink Color on Black Bg:")), 1, 0,
|
||||
Qt::AlignRight);
|
||||
tcLay->addWidget(m_transpCheckBgColor, 1, 1);
|
||||
colorLay->addWidget(new QLabel(tr("Preview BG Color"), this), 1, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
colorLay->addWidget(m_previewBgColorFld, 1, 1);
|
||||
|
||||
tcLay->addWidget(new QLabel(tr("Paint Color:")), 2, 0, Qt::AlignRight);
|
||||
tcLay->addWidget(m_transpCheckPaintColor, 2, 1);
|
||||
colorLay->addWidget(new QLabel(tr("ChessBoard Color 1"), this), 2, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
colorLay->addWidget(m_chessboardColor1Fld, 2, 1);
|
||||
|
||||
colorLay->addWidget(new QLabel(tr("Chessboard Color 2"), this), 3, 0,
|
||||
Qt::AlignRight | Qt::AlignVCenter);
|
||||
colorLay->addWidget(m_chessboardColor2Fld, 3, 1);
|
||||
|
||||
QGroupBox *tcBox = new QGroupBox(tr("Transparency Check"), this);
|
||||
QGridLayout *tcLay = new QGridLayout();
|
||||
tcLay->setMargin(15);
|
||||
tcLay->setHorizontalSpacing(10);
|
||||
tcLay->setVerticalSpacing(10);
|
||||
{
|
||||
tcLay->addWidget(new QLabel(tr("Ink Color on White Bg:")), 0, 0,
|
||||
Qt::AlignRight);
|
||||
tcLay->addWidget(m_transpCheckInkColor, 0, 1);
|
||||
|
||||
tcLay->addWidget(new QLabel(tr("Ink Color on Black Bg:")), 1, 0,
|
||||
Qt::AlignRight);
|
||||
tcLay->addWidget(m_transpCheckBgColor, 1, 1);
|
||||
|
||||
tcLay->addWidget(new QLabel(tr("Paint Color:")), 2, 0, Qt::AlignRight);
|
||||
tcLay->addWidget(m_transpCheckPaintColor, 2, 1);
|
||||
}
|
||||
tcLay->setColumnStretch(0, 0);
|
||||
tcLay->setColumnStretch(1, 0);
|
||||
tcLay->setColumnStretch(2, 1);
|
||||
for (int i = 0; i <= 2; i++) tcLay->setRowStretch(i, 0);
|
||||
tcLay->setRowStretch(3, 1);
|
||||
tcBox->setLayout(tcLay);
|
||||
|
||||
colorLay->addWidget(tcBox, 4, 0, 1, 3);
|
||||
}
|
||||
tcLay->setColumnStretch(0, 0);
|
||||
tcLay->setColumnStretch(1, 0);
|
||||
tcLay->setColumnStretch(2, 1);
|
||||
tcLay->setRowStretch(0, 0);
|
||||
tcLay->setRowStretch(1, 0);
|
||||
tcLay->setRowStretch(2, 0);
|
||||
tcLay->setRowStretch(3, 1);
|
||||
tcBox->setLayout(tcLay);
|
||||
stackedWidget->addWidget(tcBox);
|
||||
colorLay->setColumnStretch(0, 0);
|
||||
colorLay->setColumnStretch(1, 0);
|
||||
colorLay->setColumnStretch(2, 1);
|
||||
for (int i = 0; i <= 4; i++) colorLay->setRowStretch(i, 0);
|
||||
colorLay->setRowStretch(5, 1);
|
||||
colorBox->setLayout(colorLay);
|
||||
stackedWidget->addWidget(colorBox);
|
||||
|
||||
//--- Version Control --------------------------
|
||||
QWidget *versionControlBox = new QWidget(this);
|
||||
|
|
@ -2504,8 +2523,6 @@ PreferencesPopup::PreferencesPopup()
|
|||
SLOT(onCameraUnitChanged(int)));
|
||||
ret = ret && connect(roomChoice, SIGNAL(currentIndexChanged(int)),
|
||||
SLOT(onRoomChoiceChanged(int)));
|
||||
ret = ret && connect(openFlipbookAfterCB, SIGNAL(stateChanged(int)), this,
|
||||
SLOT(onViewGeneratedMovieChanged(int)));
|
||||
ret = ret && connect(m_iconSizeLx, SIGNAL(editingFinished()),
|
||||
SLOT(onIconSizeChanged()));
|
||||
ret = ret && connect(m_iconSizeLy, SIGNAL(editingFinished()),
|
||||
|
|
@ -2536,21 +2553,6 @@ PreferencesPopup::PreferencesPopup()
|
|||
ret = ret &&
|
||||
connect(showShowFrameNumberWithLettersCB, SIGNAL(stateChanged(int)),
|
||||
this, SLOT(onShowFrameNumberWithLettersChanged(int)));
|
||||
// Viewer BG color
|
||||
ret = ret && connect(m_viewerBgColorFld,
|
||||
SIGNAL(colorChanged(const TPixel32 &, bool)), this,
|
||||
SLOT(setViewerBgColor(const TPixel32 &, bool)));
|
||||
// Preview BG color
|
||||
ret = ret && connect(m_previewBgColorFld,
|
||||
SIGNAL(colorChanged(const TPixel32 &, bool)), this,
|
||||
SLOT(setPreviewBgColor(const TPixel32 &, bool)));
|
||||
// bg chessboard colors
|
||||
ret = ret && connect(m_chessboardColor1Fld,
|
||||
SIGNAL(colorChanged(const TPixel32 &, bool)), this,
|
||||
SLOT(setChessboardColor1(const TPixel32 &, bool)));
|
||||
ret = ret && connect(m_chessboardColor2Fld,
|
||||
SIGNAL(colorChanged(const TPixel32 &, bool)), this,
|
||||
SLOT(setChessboardColor2(const TPixel32 &, bool)));
|
||||
// Column Icon
|
||||
ret = ret &&
|
||||
connect(m_columnIconOm, SIGNAL(currentIndexChanged(const QString &)),
|
||||
|
|
@ -2606,10 +2608,6 @@ PreferencesPopup::PreferencesPopup()
|
|||
//--- Drawing ----------------------
|
||||
ret = ret && connect(keepOriginalCleanedUpCB, SIGNAL(stateChanged(int)), this,
|
||||
SLOT(onSaveUnpaintedInCleanupChanged(int)));
|
||||
ret = ret && connect(multiLayerStylePickerCB, SIGNAL(stateChanged(int)), this,
|
||||
SLOT(onMultiLayerStylePickerChanged(int)));
|
||||
ret = ret && connect(useSaveboxToLimitFillingOpCB, SIGNAL(stateChanged(int)),
|
||||
this, SLOT(onGetFillOnlySavebox(int)));
|
||||
ret = ret && connect(m_defScanLevelType,
|
||||
SIGNAL(currentIndexChanged(const QString &)),
|
||||
SLOT(onScanLevelTypeChanged(const QString &)));
|
||||
|
|
@ -2646,6 +2644,10 @@ PreferencesPopup::PreferencesPopup()
|
|||
ret = ret && connect(m_dropdownShortcutsCycleOptionsCB,
|
||||
SIGNAL(currentIndexChanged(int)),
|
||||
SLOT(onDropdownShortcutsCycleOptionsChanged(int)));
|
||||
ret = ret && connect(multiLayerStylePickerCB, SIGNAL(stateChanged(int)), this,
|
||||
SLOT(onMultiLayerStylePickerChanged(int)));
|
||||
ret = ret && connect(useSaveboxToLimitFillingOpCB, SIGNAL(stateChanged(int)),
|
||||
this, SLOT(onGetFillOnlySavebox(int)));
|
||||
|
||||
//--- Xsheet ----------------------
|
||||
ret = ret && connect(xsheetAutopanDuringPlaybackCB, SIGNAL(stateChanged(int)),
|
||||
|
|
@ -2700,6 +2702,8 @@ PreferencesPopup::PreferencesPopup()
|
|||
SLOT(onPreviewAlwaysOpenNewFlip(int)));
|
||||
ret = ret && connect(fitToFlipbookCB, SIGNAL(stateChanged(int)), this,
|
||||
SLOT(onFitToFlipbook(int)));
|
||||
ret = ret && connect(openFlipbookAfterCB, SIGNAL(stateChanged(int)), this,
|
||||
SLOT(onViewGeneratedMovieChanged(int)));
|
||||
|
||||
//--- Onion Skin ----------------------
|
||||
ret = ret &&
|
||||
|
|
@ -2721,7 +2725,22 @@ PreferencesPopup::PreferencesPopup()
|
|||
ret = ret && connect(showCurrentTimelineCB, SIGNAL(stateChanged(int)), this,
|
||||
SLOT(onShowCurrentTimelineChanged(int)));
|
||||
|
||||
//--- Transparency Check ----------------------
|
||||
//--- Colors ----------------------
|
||||
// Viewer BG color
|
||||
ret = ret && connect(m_viewerBgColorFld,
|
||||
SIGNAL(colorChanged(const TPixel32 &, bool)), this,
|
||||
SLOT(setViewerBgColor(const TPixel32 &, bool)));
|
||||
// Preview BG color
|
||||
ret = ret && connect(m_previewBgColorFld,
|
||||
SIGNAL(colorChanged(const TPixel32 &, bool)), this,
|
||||
SLOT(setPreviewBgColor(const TPixel32 &, bool)));
|
||||
// bg chessboard colors
|
||||
ret = ret && connect(m_chessboardColor1Fld,
|
||||
SIGNAL(colorChanged(const TPixel32 &, bool)), this,
|
||||
SLOT(setChessboardColor1(const TPixel32 &, bool)));
|
||||
ret = ret && connect(m_chessboardColor2Fld,
|
||||
SIGNAL(colorChanged(const TPixel32 &, bool)), this,
|
||||
SLOT(setChessboardColor2(const TPixel32 &, bool)));
|
||||
ret = ret && connect(m_transpCheckBgColor,
|
||||
SIGNAL(colorChanged(const TPixel32 &, bool)),
|
||||
SLOT(onTranspCheckDataChanged(const TPixel32 &, bool)));
|
||||
|
|
|
|||
Loading…
Reference in a new issue