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

Fixes (#76)

Browse source 
* Fix function editor colors, ruler status bar. . .

* Fix stop motion bugs
This commit is contained in:
Jeremy Bullock 2020-07-06 22:49:36 -06:00 committed by GitHub
parent d9a5c16baa
commit 0e717f4ad5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2118,12 +2118,12 @@ SpreadsheetViewer {
qproperty-MarkerLineColor: #1E96C4;
qproperty-BGColor: #383838;
qproperty-VerticalLineColor: #0f0f0f;
qproperty-KeyFrameColor: orange;
qproperty-KeyFrameBorderColor: #ffc04d;
qproperty-SelectedKeyFrameColor: #fab538;
qproperty-InBetweenColor: cyan;
qproperty-InBetweenBorderColor: #4dffff;
qproperty-SelectedInBetweenColor: #38fafa;
qproperty-KeyFrameColor: rgba(191, 146, 64, 0.1);
qproperty-KeyFrameBorderColor: orange;
qproperty-SelectedKeyFrameColor: rgba(191, 146, 64, 0.5);
qproperty-InBetweenColor: rgba(64, 191, 191, 0.1);
qproperty-InBetweenBorderColor: cyan;
qproperty-SelectedInBetweenColor: rgba(64, 191, 191, 0.5);
qproperty-SelectedEmptyColor: rgba(83, 133, 166, 0.3);
qproperty-SelectedSceneRangeEmptyColor: #5d5d5d;
qproperty-TextColor: #e6e6e6;

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

@ -2118,12 +2118,12 @@ SpreadsheetViewer {
qproperty-MarkerLineColor: #1E96C4;
qproperty-BGColor: #282828;
qproperty-VerticalLineColor: #000000;
qproperty-KeyFrameColor: orange;
qproperty-KeyFrameBorderColor: #ffc04d;
qproperty-SelectedKeyFrameColor: #fab538;
qproperty-InBetweenColor: cyan;
qproperty-InBetweenBorderColor: #4dffff;
qproperty-SelectedInBetweenColor: #38fafa;
qproperty-KeyFrameColor: rgba(191, 146, 64, 0.1);
qproperty-KeyFrameBorderColor: orange;
qproperty-SelectedKeyFrameColor: rgba(191, 146, 64, 0.5);
qproperty-InBetweenColor: rgba(64, 191, 191, 0.1);
qproperty-InBetweenBorderColor: cyan;
qproperty-SelectedInBetweenColor: rgba(64, 191, 191, 0.5);
qproperty-SelectedEmptyColor: rgba(83, 133, 166, 0.3);
qproperty-SelectedSceneRangeEmptyColor: #4d4d4d;
qproperty-TextColor: #e6e6e6;

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

@ -2118,12 +2118,12 @@ SpreadsheetViewer {
qproperty-MarkerLineColor: #1E96C4;
qproperty-BGColor: #404040;
qproperty-VerticalLineColor: #272727;
qproperty-KeyFrameColor: orange;
qproperty-KeyFrameBorderColor: #ffc04d;
qproperty-SelectedKeyFrameColor: #fab538;
qproperty-InBetweenColor: cyan;
qproperty-InBetweenBorderColor: #4dffff;
qproperty-SelectedInBetweenColor: #38fafa;
qproperty-KeyFrameColor: rgba(191, 146, 64, 0.1);
qproperty-KeyFrameBorderColor: orange;
qproperty-SelectedKeyFrameColor: rgba(191, 146, 64, 0.5);
qproperty-InBetweenColor: rgba(64, 191, 191, 0.1);
qproperty-InBetweenBorderColor: cyan;
qproperty-SelectedInBetweenColor: rgba(64, 191, 191, 0.5);
qproperty-SelectedEmptyColor: rgba(83, 133, 166, 0.3);
qproperty-SelectedSceneRangeEmptyColor: #757575;
qproperty-TextColor: #e6e6e6;

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

@ -552,13 +552,13 @@
@function-panel-Selected-color: #FFA500;
// Function Spreadsheet Viewer
@function-KeyFrame-color: @keyframe-total-color; //rgb(153,93,29);
@function-KeyFrameBorder-color: lighten(@function-KeyFrame-color, 15); //rgb(201,176,75);
@function-SelectedKeyFrame-color: lighten(desaturate(@function-KeyFrame-color, 5), 10);
@function-KeyFrame-color: fadeout(desaturate(@keyframe-total-color, 50), 90);
@function-KeyFrameBorder-color: @keyframe-total-color;
@function-SelectedKeyFrame-color: fadeout(desaturate(@keyframe-total-color, 50), 50);
@function-Inbetween-color: @keyframe-inbetween-color; //rgb(102,98,80);
@function-InbetweenBorder-color: lighten(@keyframe-inbetween-color, 15); //rgb(205,206,200);
@function-SelectedInbetween-color: lighten(desaturate(@function-Inbetween-color, 5), 10);
@function-Inbetween-color: fadeout(desaturate(@keyframe-inbetween-color, 50), 90);
@function-InbetweenBorder-color: @keyframe-inbetween-color; //rgb(205,206,200);
@function-SelectedInbetween-color: fadeout(desaturate(@keyframe-inbetween-color, 50), 50);
@function-SelectedSceneRangeEmpty-color: lighten(@bg, 17.6471);

3
toonz/sources/stopmotion/canon.cpp
View file

@ -873,6 +873,9 @@ bool Canon::downloadImage(EdsBaseRef object) {
memcpy(rawData, resizedBuf, newSize);
StopMotion::instance()->m_newImage->unlock();
m_proxyImageDimensions = StopMotion::instance()->m_newImage->getSize();
// write out the full res file
QFile fullImage(StopMotion::instance()->m_tempFile);
fullImage.open(QIODevice::WriteOnly);

2
toonz/sources/stopmotion/stopmotion.cpp
View file

@ -43,7 +43,7 @@
#include <QXmlStreamReader>
// Connected camera
TEnv::IntVar StopMotionOpacity("StopMotionOpacity", 100);
TEnv::IntVar StopMotionOpacity("StopMotionOpacity", 204);
TEnv::IntVar StopMotionAlwaysLiveView("StopMotionAlwaysLiveView", 0);
TEnv::IntVar StopMotionPlaceOnXSheet("StopMotionPlaceOnXSheet", 1);
TEnv::IntVar StopMotionReviewTime("StopMotionReviewTime", 1);

1
toonz/sources/tnztools/geometrictool.cpp
View file

@ -427,7 +427,6 @@ public:
if (targetType & TTool::Vectors) {
m_prop[0].bind(m_autogroup);
m_prop[0].bind(m_autofill);
m_prop[0].bind(m_smooth);
m_prop[0].bind(m_snap);
m_snap.setId("Snap");
m_prop[0].bind(m_snapSensitivity);

2
toonz/sources/toonz/mainwindow.cpp
View file

@ -2421,7 +2421,7 @@ void MainWindow::defineActions() {
createToolAction(T_Plastic, "plastic", tr("Plastic Tool"), "X",
tr("Plastic Tool: Builds a mesh that allows to deform and "
"animate a level"));
createToolAction(T_Ruler, "ruler", tr("Ruler Tool"), "");
createToolAction(T_Ruler, "ruler", tr("Ruler Tool"), "", tr("Ruler Tool: Measure distances on the canvas"));
createToolAction(T_Finger, "finger", tr("Finger Tool"), "",
tr("Finger Tool: Smudges small areas to cover with line"));

2
toonz/sources/toonz/tpanels.h
View file

@ -270,6 +270,7 @@ protected:
// reimplementation of TPanel::widgetFocusOnEnter
void widgetFocusOnEnter() override;
void widgetClearFocusOnLeave() override;
bool isActivatableOnEnter() override { return true; }
};
//=========================================================
@ -289,6 +290,7 @@ protected:
// reimplementation of TPanel::widgetFocusOnEnter
void widgetFocusOnEnter() override;
void widgetClearFocusOnLeave() override;
bool isActivatableOnEnter() override { return true; }
};
//=========================================================