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

More fixes. (#265)

Browse source 
* Some fixes

* fix fractalnoisefx

Signed-off-by: Jeremy Bullock <jcbullock@gmail.com>

* gui modifications

Signed-off-by: Jeremy Bullock <jcbullock@gmail.com>

* Finish to style update patch

* OpenToonz #3510
Co-authored-by: shun-iwasawa shun-iwasawa@users.noreply.github.com

Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
This commit is contained in:
Jeremy Bullock 2020-10-01 12:19:00 -06:00 committed by GitHub
parent 6125029b08
commit d2a6a32213
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 265 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
stuff/config/qss/Dark/Dark.qss
View file

@ -189,11 +189,13 @@ QTabBar::tab:only-one {
/* -----------------------------------------------------------------------------
Main
----------------------------------------------------------------------------- */
QWidget {
QWidget,
QTextEdit[readOnly="true"] {
background-color: #303030;
color: #e6e6e6;
}
QWidget:disabled {
QWidget:disabled,
QTextEdit[readOnly="true"]:disabled {
color: rgba(230, 230, 230, 0.4);
}
QFrame {
@ -953,6 +955,7 @@ QComboBox QAbstractItemView {
.LineEdit,
QPlainTextEdit,
QLineEdit,
QTextEdit,
#TaskSheetItem,
#tasksRemoveBox,
#tasksAddBox {
@ -967,6 +970,7 @@ QLineEdit,
.LineEdit:focus,
QPlainTextEdit:focus,
QLineEdit:focus,
QTextEdit:focus,
#TaskSheetItem:focus,
#tasksRemoveBox:focus,
#tasksAddBox:focus {
@ -977,6 +981,7 @@ QLineEdit:focus,
.LineEdit:disabled,
QPlainTextEdit:disabled,
QLineEdit:disabled,
QTextEdit:disabled,
#TaskSheetItem:disabled,
#tasksRemoveBox:disabled,
#tasksAddBox:disabled {
@ -984,6 +989,15 @@ QLineEdit:disabled,
border-color: #434343;
color: rgba(230, 230, 230, 0.4);
}
QTextEdit[readOnly="true"] {
border: 0;
}
QTextEdit[readOnly="true"]:focus,
QTextEdit[readOnly="true"]:disabled {
background-color: #303030;
color: #e6e6e6;
border: 0;
}
/* -----------------------------------------------------------------------------
CheckBox
----------------------------------------------------------------------------- */
@ -2152,7 +2166,9 @@ Ruler {
/* ScrollAreas (Row, Column and Cell)
----------------------------------------------------------------------------- */
#xsheetArea,
#ScrollArea {
#ScrollColumnArea,
#ScrollRowArea,
#ScrollCellArea {
background-color: #303030;
border: 0;
}
@ -2324,6 +2340,16 @@ FunctionTreeView {
}
/* Function Editor Spreadsheet
----------------------------------------------------------------------------- */
#ScrollRowArea,
#ScrollCellArea {
border-top: 1 solid rgba(0, 0, 0, 0.4);
}
#ScrollCellArea {
border-left: 1 solid rgba(0, 0, 0, 0.4);
}
#ScrollColumnArea {
padding-left: 2;
}
FunctionPanel {
qproperty-BGColor: #303030;
qproperty-ValueLineColor: rgba(0, 0, 0, 0.1);
@ -2339,7 +2365,7 @@ SpreadsheetViewer {
qproperty-CurrentRowBgColor: rgba(83, 133, 166, 0.7);
qproperty-LightLineColor: rgba(0, 0, 0, 0.3);
qproperty-MarkerLineColor: rgba(255, 255, 255, 0.15);
qproperty-BGColor: #303030;
qproperty-BGColor: #262626;
qproperty-VerticalLineColor: rgba(0, 0, 0, 0.4);
qproperty-KeyFrameColor: #995d1d;
qproperty-KeyFrameBorderColor: #db9041;
@ -2350,7 +2376,7 @@ SpreadsheetViewer {
qproperty-SelectedEmptyColor: rgba(90, 100, 106, 0.5);
qproperty-SelectedSceneRangeEmptyColor: rgba(90, 100, 106, 0.5);
qproperty-TextColor: #e6e6e6;
qproperty-ColumnHeaderBorderColor: #0f0f0f;
qproperty-ColumnHeaderBorderColor: #4a4a4a;
}
#ExpressionField {
background-color: #cecece;

32
stuff/config/qss/Darker/Darker.qss
View file

@ -189,11 +189,13 @@ QTabBar::tab:only-one {
/* -----------------------------------------------------------------------------
Main
----------------------------------------------------------------------------- */
QWidget {
QWidget,
QTextEdit[readOnly="true"] {
background-color: #202020;
color: #e6e6e6;
}
QWidget:disabled {
QWidget:disabled,
QTextEdit[readOnly="true"]:disabled {
color: rgba(230, 230, 230, 0.4);
}
QFrame {
@ -953,6 +955,7 @@ QComboBox QAbstractItemView {
.LineEdit,
QPlainTextEdit,
QLineEdit,
QTextEdit,
#TaskSheetItem,
#tasksRemoveBox,
#tasksAddBox {
@ -967,6 +970,7 @@ QLineEdit,
.LineEdit:focus,
QPlainTextEdit:focus,
QLineEdit:focus,
QTextEdit:focus,
#TaskSheetItem:focus,
#tasksRemoveBox:focus,
#tasksAddBox:focus {
@ -977,6 +981,7 @@ QLineEdit:focus,
.LineEdit:disabled,
QPlainTextEdit:disabled,
QLineEdit:disabled,
QTextEdit:disabled,
#TaskSheetItem:disabled,
#tasksRemoveBox:disabled,
#tasksAddBox:disabled {
@ -984,6 +989,15 @@ QLineEdit:disabled,
border-color: #2d2d2d;
color: rgba(230, 230, 230, 0.4);
}
QTextEdit[readOnly="true"] {
border: 0;
}
QTextEdit[readOnly="true"]:focus,
QTextEdit[readOnly="true"]:disabled {
background-color: #202020;
color: #e6e6e6;
border: 0;
}
/* -----------------------------------------------------------------------------
CheckBox
----------------------------------------------------------------------------- */
@ -2152,7 +2166,9 @@ Ruler {
/* ScrollAreas (Row, Column and Cell)
----------------------------------------------------------------------------- */
#xsheetArea,
#ScrollArea {
#ScrollColumnArea,
#ScrollRowArea,
#ScrollCellArea {
background-color: #202020;
border: 0;
}
@ -2324,6 +2340,16 @@ FunctionTreeView {
}
/* Function Editor Spreadsheet
----------------------------------------------------------------------------- */
#ScrollRowArea,
#ScrollCellArea {
border-top: 1 solid rgba(0, 0, 0, 0.3);
}
#ScrollCellArea {
border-left: 1 solid rgba(0, 0, 0, 0.3);
}
#ScrollColumnArea {
padding-left: 2;
}
FunctionPanel {
qproperty-BGColor: #282828;
qproperty-ValueLineColor: rgba(0, 0, 0, 0.1);

32
stuff/config/qss/Light/Light.qss
View file

@ -189,11 +189,13 @@ QTabBar::tab:only-one {
/* -----------------------------------------------------------------------------
Main
----------------------------------------------------------------------------- */
QWidget {
QWidget,
QTextEdit[readOnly="true"] {
background-color: #DBDBDB;
color: #000;
}
QWidget:disabled {
QWidget:disabled,
QTextEdit[readOnly="true"]:disabled {
color: rgba(0, 0, 0, 0.4);
}
QFrame {
@ -953,6 +955,7 @@ QComboBox QAbstractItemView {
.LineEdit,
QPlainTextEdit,
QLineEdit,
QTextEdit,
#TaskSheetItem,
#tasksRemoveBox,
#tasksAddBox {
@ -967,6 +970,7 @@ QLineEdit,
.LineEdit:focus,
QPlainTextEdit:focus,
QLineEdit:focus,
QTextEdit:focus,
#TaskSheetItem:focus,
#tasksRemoveBox:focus,
#tasksAddBox:focus {
@ -977,6 +981,7 @@ QLineEdit:focus,
.LineEdit:disabled,
QPlainTextEdit:disabled,
QLineEdit:disabled,
QTextEdit:disabled,
#TaskSheetItem:disabled,
#tasksRemoveBox:disabled,
#tasksAddBox:disabled {
@ -984,6 +989,15 @@ QLineEdit:disabled,
border-color: #c2c2c2;
color: rgba(0, 0, 0, 0.4);
}
QTextEdit[readOnly="true"] {
border: 0;
}
QTextEdit[readOnly="true"]:focus,
QTextEdit[readOnly="true"]:disabled {
background-color: #DBDBDB;
color: #000;
border: 0;
}
/* -----------------------------------------------------------------------------
CheckBox
----------------------------------------------------------------------------- */
@ -2152,7 +2166,9 @@ Ruler {
/* ScrollAreas (Row, Column and Cell)
----------------------------------------------------------------------------- */
#xsheetArea,
#ScrollArea {
#ScrollColumnArea,
#ScrollRowArea,
#ScrollCellArea {
background-color: #DBDBDB;
border: 0;
}
@ -2324,6 +2340,16 @@ FunctionTreeView {
}
/* Function Editor Spreadsheet
----------------------------------------------------------------------------- */
#ScrollRowArea,
#ScrollCellArea {
border-top: 1 solid rgba(0, 0, 0, 0.15);
}
#ScrollCellArea {
border-left: 1 solid rgba(0, 0, 0, 0.15);
}
#ScrollColumnArea {
padding-left: 2;
}
FunctionPanel {
qproperty-BGColor: #808080;
qproperty-ValueLineColor: rgba(0, 0, 0, 0.1);

32
stuff/config/qss/Medium/Medium.qss
View file

@ -189,11 +189,13 @@ QTabBar::tab:only-one {
/* -----------------------------------------------------------------------------
Main
----------------------------------------------------------------------------- */
QWidget {
QWidget,
QTextEdit[readOnly="true"] {
background-color: #484848;
color: #e6e6e6;
}
QWidget:disabled {
QWidget:disabled,
QTextEdit[readOnly="true"]:disabled {
color: rgba(230, 230, 230, 0.4);
}
QFrame {
@ -953,6 +955,7 @@ QComboBox QAbstractItemView {
.LineEdit,
QPlainTextEdit,
QLineEdit,
QTextEdit,
#TaskSheetItem,
#tasksRemoveBox,
#tasksAddBox {
@ -967,6 +970,7 @@ QLineEdit,
.LineEdit:focus,
QPlainTextEdit:focus,
QLineEdit:focus,
QTextEdit:focus,
#TaskSheetItem:focus,
#tasksRemoveBox:focus,
#tasksAddBox:focus {
@ -977,6 +981,7 @@ QLineEdit:focus,
.LineEdit:disabled,
QPlainTextEdit:disabled,
QLineEdit:disabled,
QTextEdit:disabled,
#TaskSheetItem:disabled,
#tasksRemoveBox:disabled,
#tasksAddBox:disabled {
@ -984,6 +989,15 @@ QLineEdit:disabled,
border-color: #3a3a3a;
color: rgba(230, 230, 230, 0.4);
}
QTextEdit[readOnly="true"] {
border: 0;
}
QTextEdit[readOnly="true"]:focus,
QTextEdit[readOnly="true"]:disabled {
background-color: #484848;
color: #e6e6e6;
border: 0;
}
/* -----------------------------------------------------------------------------
CheckBox
----------------------------------------------------------------------------- */
@ -2152,7 +2166,9 @@ Ruler {
/* ScrollAreas (Row, Column and Cell)
----------------------------------------------------------------------------- */
#xsheetArea,
#ScrollArea {
#ScrollColumnArea,
#ScrollRowArea,
#ScrollCellArea {
background-color: #484848;
border: 0;
}
@ -2324,6 +2340,16 @@ FunctionTreeView {
}
/* Function Editor Spreadsheet
----------------------------------------------------------------------------- */
#ScrollRowArea,
#ScrollCellArea {
border-top: 1 solid rgba(0, 0, 0, 0.3);
}
#ScrollCellArea {
border-left: 1 solid rgba(0, 0, 0, 0.3);
}
#ScrollColumnArea {
padding-left: 2;
}
FunctionPanel {
qproperty-BGColor: #404040;
qproperty-ValueLineColor: rgba(0, 0, 0, 0.1);

1
stuff/config/qss/Medium/less/Medium.less
View file

@ -550,6 +550,7 @@
@function-LightLightBG-color: @xsheet-OnionSkinAreaBG-color;
@function-SelectedSceneRangeEmpty-color: @xsheet-SelectedEmptyCell-color;
@function-ColumnHeaderBorder-color: darken(@bg, 13);
@function-ColumnHeaderBG-color: @xsheet-NotEmptyColumn-color;
// Keyframe Colors
@function-KeyFrame-color: darken(desaturate(spin(@keyframe-total-color, 0.0000), 0.7570), 8.4314);

17
stuff/config/qss/Medium/less/layouts/controls.less
View file

@ -144,11 +144,24 @@ QComboBox {
}
}
QPlainTextEdit
,QLineEdit {
QPlainTextEdit,
QLineEdit,
QTextEdit {
&:extend(.LineEdit all);
}
// reset all styles for read-only QtextEdit
QTextEdit[readOnly="true"]{
&:extend(QWidget all);
border: 0;
&:focus,
&:disabled {
background-color: @bg;
color: @text-color;
border: 0;
}
}
/* -----------------------------------------------------------------------------
CheckBox
----------------------------------------------------------------------------- */

20
stuff/config/qss/Medium/less/layouts/xsheet.less
View file

@ -6,7 +6,9 @@
----------------------------------------------------------------------------- */
#xsheetArea,
#ScrollArea {
#ScrollColumnArea,
#ScrollRowArea,
#ScrollCellArea {
background-color: @xsheet-empty-bg-color;
border: 0;
}
@ -240,6 +242,20 @@ FunctionTreeView {
// If a qproperty shares the same likeness with XSheet then pair the variables.
// XSheet should be considered as parent.
#ScrollRowArea,
#ScrollCellArea {
border-top:1 solid @xsheet-VerticalLine-color;
}
#ScrollCellArea {
border-left:1 solid @xsheet-VerticalLine-color;
}
#ScrollColumnArea {
padding-left:2;
}
FunctionPanel {
qproperty-BGColor: @function-panel-bg-color;
qproperty-ValueLineColor: @function-panel-ValueLine-color;
@ -256,7 +272,7 @@ SpreadsheetViewer {
qproperty-CurrentRowBgColor: @xsheet-CurrentRowBG-color; // paired
qproperty-LightLineColor: @xsheet-LightLine-color; // paired
qproperty-MarkerLineColor: @xsheet-MarkerLine-color; // paired
qproperty-BGColor: @xsheet-NotEmptyColumn-color; // paired
qproperty-BGColor: @function-ColumnHeaderBG-color;
qproperty-VerticalLineColor: @xsheet-VerticalLine-color; // paired
qproperty-KeyFrameColor: @function-KeyFrame-color;
qproperty-KeyFrameBorderColor: @function-KeyFrameBorder-color;

4
stuff/config/qss/Medium/less/themes/Dark.less
View file

@ -108,3 +108,7 @@
// Function Curve Panel
@function-panel-OtherCurves-color: lighten(@function-panel-bg-color, 30);
// Function Spreadsheet Viewer
@function-ColumnHeaderBorder-color: lighten(@bg, 10);
@function-ColumnHeaderBG-color: darken(@bg, 4);

32
stuff/config/qss/Neutral/Neutral.qss
View file

@ -189,11 +189,13 @@ QTabBar::tab:only-one {
/* -----------------------------------------------------------------------------
Main
----------------------------------------------------------------------------- */
QWidget {
QWidget,
QTextEdit[readOnly="true"] {
background-color: #808080;
color: #000;
}
QWidget:disabled {
QWidget:disabled,
QTextEdit[readOnly="true"]:disabled {
color: rgba(0, 0, 0, 0.4);
}
QFrame {
@ -953,6 +955,7 @@ QComboBox QAbstractItemView {
.LineEdit,
QPlainTextEdit,
QLineEdit,
QTextEdit,
#TaskSheetItem,
#tasksRemoveBox,
#tasksAddBox {
@ -967,6 +970,7 @@ QLineEdit,
.LineEdit:focus,
QPlainTextEdit:focus,
QLineEdit:focus,
QTextEdit:focus,
#TaskSheetItem:focus,
#tasksRemoveBox:focus,
#tasksAddBox:focus {
@ -977,6 +981,7 @@ QLineEdit:focus,
.LineEdit:disabled,
QPlainTextEdit:disabled,
QLineEdit:disabled,
QTextEdit:disabled,
#TaskSheetItem:disabled,
#tasksRemoveBox:disabled,
#tasksAddBox:disabled {
@ -984,6 +989,15 @@ QLineEdit:disabled,
border-color: #6d6d6d;
color: rgba(0, 0, 0, 0.4);
}
QTextEdit[readOnly="true"] {
border: 0;
}
QTextEdit[readOnly="true"]:focus,
QTextEdit[readOnly="true"]:disabled {
background-color: #808080;
color: #000;
border: 0;
}
/* -----------------------------------------------------------------------------
CheckBox
----------------------------------------------------------------------------- */
@ -2152,7 +2166,9 @@ Ruler {
/* ScrollAreas (Row, Column and Cell)
----------------------------------------------------------------------------- */
#xsheetArea,
#ScrollArea {
#ScrollColumnArea,
#ScrollRowArea,
#ScrollCellArea {
background-color: #808080;
border: 0;
}
@ -2324,6 +2340,16 @@ FunctionTreeView {
}
/* Function Editor Spreadsheet
----------------------------------------------------------------------------- */
#ScrollRowArea,
#ScrollCellArea {
border-top: 1 solid rgba(0, 0, 0, 0.3);
}
#ScrollCellArea {
border-left: 1 solid rgba(0, 0, 0, 0.3);
}
#ScrollColumnArea {
padding-left: 2;
}
FunctionPanel {
qproperty-BGColor: #5a5a5a;
qproperty-ValueLineColor: rgba(0, 0, 0, 0.1);

1
toonz/sources/common/tfx/ttzpimagefx.cpp
View file

@ -10,6 +10,7 @@
//**********************************************************************************************
void parseIndexes(std::string indexes, std::vector<std::string> &items) {
if (indexes.length() == 1 && indexes == "-") indexes = "";
#ifdef _MSC_VER
char seps[] = " ,;";
char *token;

5
toonz/sources/stdfx/iwa_fractalnoisefx.cpp
View file

@ -155,9 +155,6 @@ void Iwa_FractalNoiseFx::doCompute(TTile &tile, double frame,
TAffine subAff = TTranslation(param.subOffset) * TScale(param.subScaling) *
TRotation(-param.subRotation);
TAffine offsetAff =
TTranslation((double)outDim.lx * 0.5, (double)outDim.ly * 0.5);
TAffine genAff;
// for cyclic evolution, rotate the sample position in ZW space instead of
@ -178,7 +175,7 @@ void Iwa_FractalNoiseFx::doCompute(TTile &tile, double frame,
for (int gen = 0; gen < genCount; gen++) {
// affine transformation for the current generation
TAffine currentAff =
(globalAff * parentOffsetAff * parentAff * genAff * offsetAff).inv();
(globalAff * parentOffsetAff * parentAff * genAff).inv();
// scale of the current pattern ( used for the Dynamic / Dynamic Twist
// offset )
double scale = sqrt(std::abs(currentAff.det()));

24
toonz/sources/toonz/levelsettingspopup.cpp
View file

@ -321,6 +321,7 @@ LevelSettingsPopup::LevelSettingsPopup()
, m_scanPathFld(0) {
setWindowTitle(tr("Level Settings"));
m_mainFrame->setFixedHeight(280);
m_mainFrame->setFixedWidth(380);
this->layout()->setSizeConstraint(QLayout::SetFixedSize);
m_nameFld = new LineEdit();
@ -403,18 +404,18 @@ LevelSettingsPopup::LevelSettingsPopup()
m_activateFlags[m_squarePixCB] = dpiWidgetsFlag;
unsigned int rasterWidgetsFlag = ToonzRaster | Raster | MultiSelection;
m_activateFlags[widthLabel] = rasterWidgetsFlag;
m_activateFlags[m_widthFld] = rasterWidgetsFlag;
m_activateFlags[heightLabel] = rasterWidgetsFlag;
m_activateFlags[m_heightFld] = rasterWidgetsFlag;
m_activateFlags[widthLabel] = rasterWidgetsFlag | HideOnPixelMode;
m_activateFlags[m_widthFld] = rasterWidgetsFlag | HideOnPixelMode;
m_activateFlags[heightLabel] = rasterWidgetsFlag | HideOnPixelMode;
m_activateFlags[m_heightFld] = rasterWidgetsFlag | HideOnPixelMode;
m_activateFlags[m_useCameraDpiBtn] = dpiWidgetsFlag;
m_activateFlags[m_cameraDpiLabel] =
AllTypes | HideOnPixelMode | MultiSelection;
m_activateFlags[m_imageDpiLabel] = dpiWidgetsFlag;
m_activateFlags[m_imageResLabel] = dpiWidgetsFlag;
m_activateFlags[m_imageResLabel] = ToonzRaster | Raster;
m_activateFlags[cameraDpiTitle] = AllTypes | HideOnPixelMode | MultiSelection;
m_activateFlags[imageDpiTitle] = dpiWidgetsFlag;
m_activateFlags[imageResTitle] = dpiWidgetsFlag;
m_activateFlags[imageResTitle] = ToonzRaster | Raster;
m_activateFlags[m_doPremultiply] = Raster | MultiSelection;
m_activateFlags[m_whiteTransp] = Raster | MultiSelection;
@ -480,9 +481,7 @@ LevelSettingsPopup::LevelSettingsPopup()
dpiLayout->addWidget(imageDpiTitle, 5, 0,
Qt::AlignRight | Qt::AlignVCenter);
dpiLayout->addWidget(m_imageDpiLabel, 5, 1, 1, 3);
dpiLayout->addWidget(imageResTitle, 6, 0,
Qt::AlignRight | Qt::AlignVCenter);
dpiLayout->addWidget(m_imageResLabel, 6, 1, 1, 3);
}
dpiLayout->setColumnStretch(0, 0);
dpiLayout->setColumnStretch(1, 1);
@ -491,6 +490,13 @@ LevelSettingsPopup::LevelSettingsPopup()
dpiBox->setLayout(dpiLayout);
m_topLayout->addWidget(dpiBox);
dpiBox->hide();
QHBoxLayout* resLayout = new QHBoxLayout(this);
resLayout->addWidget(imageResTitle);
resLayout->addWidget(m_imageResLabel);
resLayout->addStretch();
m_topLayout->addLayout(resLayout);
m_topLayout->addWidget(m_doPremultiply);

25
toonz/sources/toonz/pane.cpp
View file

@ -154,19 +154,16 @@ void TPanel::enterEvent(QEvent *event) {
//}
if (w) {
// grab the focus, unless a line-edit is focused currently
bool shouldSetFocus = true;
QWidget *focusWidget = qApp->focusWidget();
if (focusWidget) {
QLineEdit *lineEdit = dynamic_cast<QLineEdit *>(focusWidget);
if (lineEdit) {
shouldSetFocus = false;
}
if (focusWidget && dynamic_cast<QLineEdit*>(focusWidget)) {
event->accept();
return;
}
if (shouldSetFocus) {
widgetFocusOnEnter();
}
widgetFocusOnEnter();
// Some panels (e.g. Viewer, StudioPalette, Palette, ColorModel) are
// activated when mouse enters. Viewer is activatable only when being
@ -182,7 +179,13 @@ void TPanel::enterEvent(QEvent *event) {
//-----------------------------------------------------------------------------
/*! clear focus when mouse leaves
*/
void TPanel::leaveEvent(QEvent *event) { widgetClearFocusOnLeave(); }
void TPanel::leaveEvent(QEvent *event) {
QWidget* focusWidget = qApp->focusWidget();
if (focusWidget && dynamic_cast<QLineEdit*>(focusWidget)) {
return;
}
widgetClearFocusOnLeave();
}
//-----------------------------------------------------------------------------
/*! load and restore previous geometry and state of the floating panel.
@ -636,7 +639,7 @@ TPanelTitleBarButtonForGrids::TPanelTitleBarButtonForGrids(
});
QSlider* horizonOffsetSlider = new QSlider(this);
horizonOffsetSlider->setRange(-500, 500);
horizonOffsetSlider->setRange(-1000, 1000);
horizonOffsetSlider->setValue(HorizonOffset);
horizonOffsetSlider->setOrientation(Qt::Horizontal);
QLabel* horizonOffsetLabel = new QLabel(this);

25
toonz/sources/toonz/preferencespopup.cpp
View file

@ -935,7 +935,7 @@ void PreferencesPopup::insertDualUIs(
void PreferencesPopup::insertFootNote(QGridLayout* layout) {
QLabel* note =
new QLabel(tr("* Changes will take effect the next time you run Tahoma"));
new QLabel(tr("* Changes will take effect the next time you run Tahoma2D"));
note->setStyleSheet("font-size: 10px; font: italic;");
layout->addWidget(note, layout->rowCount(), 0, 1, 2,
Qt::AlignLeft | Qt::AlignVCenter);
@ -956,7 +956,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {
{undoMemorySize, tr("Undo Memory Size (MB):")},
{taskchunksize, tr("Render Task Chunk Size:")},
{replaceAfterSaveLevelAs,
tr("Replace Toonz Level after SaveLevelAs command")},
tr("Replace Vector and Smart Level after SaveLevelAs command")},
{backupEnabled, tr("Backup Scene and Animation Levels when Saving")},
{backupKeepCount, tr("# of backups to keep:")},
{sceneNumberingEnabled, tr("Show Info in Rendered Frames")},
@ -1076,7 +1076,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {
{inputCellsWithoutDoubleClickingEnabled,
tr("Enable to Input Cells without Double Clicking")},
{shortcutCommandsWhileRenamingCellEnabled,
tr("Enable Tahoma Commands' Shortcut Keys While Renaming Cell")},
tr("Enable Tahoma2D Commands' Shortcut Keys While Renaming Cell")},
{showXSheetToolbar, tr("Show Toolbar in the Xsheet")},
{expandFunctionHeader,
tr("Expand Function Editor Header to Match Xsheet Toolbar Height*")},
@ -1128,7 +1128,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {
{automaticSVNFolderRefreshEnabled,
tr("Automatically Refresh Folder Contents")},
{latestVersionCheckEnabled,
tr("Check for the Latest Version of Tahoma on Launch")},
tr("Check for the Latest Version of Tahoma2D on Launch")},
// Touch / Tablet Settings
// TounchGestureControl // Touch Gesture is a checkable command and not in
@ -1501,7 +1501,7 @@ QWidget* PreferencesPopup::createLoadingPage() {
insertUI(autoExposeEnabled, lay);
insertUI(subsceneFolderEnabled, lay);
insertUI(removeSceneNumberFromLoadedLevelName, lay);
insertUI(IgnoreImageDpi, lay);
//insertUI(IgnoreImageDpi, lay);
insertUI(initialLoadTlvCachingBehavior, lay,
getComboItemList(initialLoadTlvCachingBehavior));
insertUI(columnIconLoadingPolicy, lay,
@ -1583,10 +1583,9 @@ QWidget* PreferencesPopup::createImportExportPage() {
QGridLayout* lay = new QGridLayout();
setupLayout(lay);
putLabel(tr("Tahoma can use FFmpeg for additional file formats.\n") +
tr("FFmpeg is not bundled with Tahoma.\n") +
tr("Please provide the path where FFmpeg is located on your "
"computer."),
putLabel(tr("Tahoma2D can use FFmpeg for additional file formats.\n") +
tr("FFmpeg is bundled with Tahoma2D,\n") +
tr("but you can provide the path to a different ffmpeg location."),
lay);
insertUI(ffmpegPath, lay);
@ -1616,7 +1615,7 @@ QWidget* PreferencesPopup::createDrawingPage() {
QGridLayout* lay = new QGridLayout();
setupLayout(lay);
insertUI(scanLevelType, lay, getComboItemList(scanLevelType));
//insertUI(scanLevelType, lay, getComboItemList(scanLevelType));
insertUI(DefLevelType, lay, getComboItemList(DefLevelType));
insertUI(newLevelSizeToCameraSizeEnabled, lay);
insertDualUIs(DefLevelWidth, DefLevelHeight, lay);
@ -1633,7 +1632,7 @@ QWidget* PreferencesPopup::createDrawingPage() {
insertUI(saveUnpaintedInCleanup, lay);
insertUI(minimizeSaveboxAfterEditing, lay);
insertUI(useNumpadForSwitchingStyles, lay);
insertUI(downArrowInLevelStripCreatesNewFrame, lay);
//insertUI(downArrowInLevelStripCreatesNewFrame, lay);
QGridLayout* replaceVectorsLay = insertGroupBox(
tr("Replace Vectors with Simplified Vectors Command"), lay);
{
@ -1715,8 +1714,8 @@ QWidget* PreferencesPopup::createXsheetPage() {
QGridLayout* xshToolbarLay = insertGroupBoxUI(showXSheetToolbar, lay);
{ insertUI(expandFunctionHeader, xshToolbarLay); }
insertUI(showColumnNumbers, lay);
insertUI(syncLevelRenumberWithXsheet, lay);
insertUI(currentTimelineEnabled, lay);
//insertUI(syncLevelRenumberWithXsheet, lay);
//insertUI(currentTimelineEnabled, lay);
insertUI(currentColumnColor, lay);
lay->setRowStretch(lay->rowCount(), 1);

10
toonz/sources/toonz/subscenecommand.cpp
View file

@ -2221,7 +2221,7 @@ void SubsceneCmd::collapse(std::set<int> &indices) {
QList<QString> list;
list.append(
QObject::tr("Include relevant pegbars in the sub-xsheet as well."));
QObject::tr("Maintain parenting relationships in the sub-xsheet as well."));
list.append(
QObject::tr("Include only selected columns in the sub-xsheet."));
@ -2328,9 +2328,9 @@ void SubsceneCmd::collapse(const QList<TFxP> &fxs) {
QString question(QObject::tr("Collapsing columns: what you want to do?"));
QList<QString> list;
list.append(
QObject::tr("Include relevant pegbars in the sub-xsheet as well."));
QObject::tr("Maintain parenting relationships in the sub-xsheet as well."));
list.append(
QObject::tr("Include only selected columns in the sub-xsheet."));
QObject::tr("Include the selected columns in the sub-xsheet without parenting info."));
int ret = DVGui::RadioButtonMsgBox(DVGui::WARNING, question, list);
if (ret == 0) return;
onlyColumns = (ret == 2);
@ -2392,8 +2392,8 @@ void SubsceneCmd::explode(int index) {
/*- Pegbarを親Sheetに持って出るか？の質問ダイアログ -*/
QString question(QObject::tr("Exploding Sub-xsheet: what you want to do?"));
QList<QString> list;
list.append(QObject::tr("Bring relevant pegbars in the main xsheet."));
list.append(QObject::tr("Bring only columns in the main xsheet."));
list.append(QObject::tr("Maintain parenting relationships in the main xsheet."));
list.append(QObject::tr("Bring columns in the main xsheet without parenting."));
int ret = DVGui::RadioButtonMsgBox(DVGui::WARNING, question, list);
if (ret == 0) return;
// Collect column stage object informations

4
toonz/sources/toonzlib/preferences.cpp
View file

@ -421,7 +421,7 @@ void Preferences::definePreferenceItems() {
define(subsceneFolderEnabled, "subsceneFolderEnabled", QMetaType::Bool, true);
define(removeSceneNumberFromLoadedLevelName,
"removeSceneNumberFromLoadedLevelName", QMetaType::Bool, false);
define(IgnoreImageDpi, "IgnoreImageDpi", QMetaType::Bool, false);
define(IgnoreImageDpi, "IgnoreImageDpi", QMetaType::Bool, true);
define(initialLoadTlvCachingBehavior, "initialLoadTlvCachingBehavior",
QMetaType::Int, 0); // On Demand
define(columnIconLoadingPolicy, "columnIconLoadingPolicy", QMetaType::Int,
@ -532,7 +532,7 @@ void Preferences::definePreferenceItems() {
define(shortPlayFrameCount, "shortPlayFrameCount", QMetaType::Int, 8, 1, 100);
define(previewAlwaysOpenNewFlip, "previewAlwaysOpenNewFlip", QMetaType::Bool,
false);
define(fitToFlipbook, "fitToFlipbook", QMetaType::Bool, false);
define(fitToFlipbook, "fitToFlipbook", QMetaType::Bool, true);
define(generatedMovieViewEnabled, "generatedMovieViewEnabled",
QMetaType::Bool, true);

12
toonz/sources/toonzqt/functionsheet.cpp
View file

@ -289,7 +289,7 @@ void FunctionSheetColumnHeadViewer::paintEvent(QPaintEvent *e) {
/*--- Fill header with background color ---*/
for (int c = c0; c <= c1; c++) {
FunctionTreeModel::Channel *channel = m_sheet->getChannel(c);
if (!channel) continue;
if (!channel) break;
int x0 = getViewer()->columnToX(c);
int x1 = getViewer()->columnToX(c + 1) - 1;
// Column Width
@ -300,7 +300,15 @@ void FunctionSheetColumnHeadViewer::paintEvent(QPaintEvent *e) {
for (int c = c0; c <= c1; ++c) {
FunctionTreeModel::Channel *channel = m_sheet->getChannel(c);
if (!channel) continue;
if (!channel) {
if (c != c0) {
// draw "the end" border
int x0 = getViewer()->columnToX(c);
painter.setPen(getViewer()->getColumnHeaderBorderColor());
painter.drawLine(x0, y0, x0, y3);
}
break;
}
int i = c - c0 + 1;
/*---- Channel Column of the current Column and the preceding and following
* Columns ---*/

39
toonz/sources/toonzqt/spreadsheetviewer.cpp
View file

@ -351,7 +351,7 @@ void RowPanel::drawCurrentRowGadget(QPainter &p, int r0, int r1) {
int currentRow = getViewer()->getCurrentRow();
int y = getViewer()->rowToY(currentRow);
if (currentRow < r0 || r1 < currentRow) return;
p.fillRect(1, y + 1, width() - 2, 19, getViewer()->getCurrentRowBgColor());
p.fillRect(1, y + 1, width() - 1, 19, getViewer()->getCurrentRowBgColor());
}
//-----------------------------------------------------------------------------
@ -474,21 +474,21 @@ SpreadsheetViewer::SpreadsheetViewer(QWidget *parent)
// column header
m_columnScrollArea = new Spreadsheet::ScrollArea;
m_columnScrollArea->setObjectName("ScrollArea");
m_columnScrollArea->setObjectName("ScrollColumnArea");
m_columnScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_columnScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_columnScrollArea->setFocusPolicy(Qt::NoFocus);
// row area
m_rowScrollArea = new Spreadsheet::ScrollArea;
m_rowScrollArea->setObjectName("ScrollArea");
m_rowScrollArea->setObjectName("ScrollRowArea");
m_rowScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_rowScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_rowScrollArea->setFocusPolicy(Qt::NoFocus);
// cell area
m_cellScrollArea = new Spreadsheet::ScrollArea;
m_cellScrollArea->setObjectName("ScrollArea");
m_cellScrollArea->setObjectName("ScrollCellArea");
m_cellScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
m_cellScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
// m_cellScrollArea->horizontalScrollBar()->setObjectName("XsheetScrollBar");
@ -687,13 +687,13 @@ int SpreadsheetViewer::rowToY(int row) const {
/*!Shift is a consequence of style sheet border.*/
CellPosition SpreadsheetViewer::xyToPosition(const QPoint &point) const {
int row = (point.y() + 1) / m_rowHeight;
int col = (point.x() + 1) / m_columnWidth;
int col = (point.x()) / m_columnWidth;
return CellPosition(row, col);
}
/*!Shift is a consequence of style sheet border.*/
QPoint SpreadsheetViewer::positionToXY(const CellPosition &pos) const {
int x = (pos.layer() * m_columnWidth) - 1;
int x = (pos.layer() * m_columnWidth);
int y = (pos.frame() * m_rowHeight) - 1;
return QPoint(x, y);
}
@ -707,8 +707,8 @@ CellRange SpreadsheetViewer::xyRectToRange(const QRect &rect) const {
bool SpreadsheetViewer::refreshContentSize(int scrollDx, int scrollDy) {
QSize viewportSize = m_cellScrollArea->viewport()->size();
QPoint offset = m_cellScrollArea->widget()->pos();
offset =
QPoint(std::min(0, offset.x() - scrollDx), std::min(0, offset.y() - scrollDy));
offset = QPoint(std::min(0, offset.x() - scrollDx),
std::min(0, offset.y() - scrollDy));
QSize contentSize(columnToX(m_columnCount + 1), rowToY(m_rowCount + 1));
@ -733,10 +733,11 @@ bool SpreadsheetViewer::refreshContentSize(int scrollDx, int scrollDy) {
}
void SpreadsheetViewer::showEvent(QShowEvent *) {
int viewportHeight = m_cellScrollArea->height();
int contentHeight = rowToY(m_rowCount * 0 + 50);
QScrollBar *vSc = m_cellScrollArea->verticalScrollBar();
int actualContentHeight = std::max(contentHeight, vSc->value() + viewportHeight);
int viewportHeight = m_cellScrollArea->height();
int contentHeight = rowToY(m_rowCount * 0 + 50);
QScrollBar *vSc = m_cellScrollArea->verticalScrollBar();
int actualContentHeight =
std::max(contentHeight, vSc->value() + viewportHeight);
m_rowScrollArea->widget()->setFixedHeight(actualContentHeight);
m_cellScrollArea->widget()->setFixedHeight(actualContentHeight);
if (m_frameHandle)
@ -805,13 +806,13 @@ void SpreadsheetViewer::wheelEvent(QWheelEvent *event) {
default: // Qt::MouseEventSynthesizedByQt,
// Qt::MouseEventSynthesizedByApplication
{
std::cout << "not supported wheelEvent.source(): "
"Qt::MouseEventSynthesizedByQt, "
"Qt::MouseEventSynthesizedByApplication"
<< std::endl;
break;
}
{
std::cout << "not supported wheelEvent.source(): "
"Qt::MouseEventSynthesizedByQt, "
"Qt::MouseEventSynthesizedByApplication"
<< std::endl;
break;
}
} // end switch
}