Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenToonz Patches thru 2/9/2023 #1139

Merged
merged 93 commits into from
Mar 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
709aabd
update bokeh advanced fx iwa
shun-iwasawa May 20, 2022
d52d1f1
Fix cropped input fields
andeon Jun 5, 2022
b2a4372
OCA Export
justburner Jul 24, 2022
488cae8
Fix OCA Export of Stop Frame Holds and bug fix using incorrect Output…
manongjohn Feb 10, 2023
d56647e
Fix Starting frame Multi-thread FFMPEG
justburner Mar 1, 2022
eaa9b0b
Simplify uneditable check code
justburner Jul 10, 2022
1f33804
modify hiding and showing controls in fx settings
shun-iwasawa Jul 28, 2022
a74ae09
particles fx motion blur
shun-iwasawa Jun 19, 2022
2e2a0af
sampling size for gradient warp iwa fx
shun-iwasawa Jun 29, 2022
2ec94a8
Custom Panel
shun-iwasawa May 11, 2022
7f978fe
expand xsheet frame area
shun-iwasawa Aug 10, 2022
30a1d73
Move navigation tag with frame expansion
manongjohn Feb 11, 2023
fac71c5
Palette Gizmo Button
justburner Aug 20, 2022
7354a9d
Added: menu to hide toolbar buttons, Name Editor button and missing i…
justburner Aug 22, 2022
fa7e844
thicken xsheet marker lines
shun-iwasawa Jul 8, 2022
ea3f154
fix custom panel registration
shun-iwasawa Sep 26, 2022
934f8b3
toggle blank frames menu command
shun-iwasawa Sep 26, 2022
a4ce0fd
export xsheet pdf: frame length field
shun-iwasawa Sep 26, 2022
85ffe92
histogram popup enhancements - open histogram next to the viewer - sh…
shun-iwasawa Oct 6, 2022
3db537c
snap schematic node Ctrl+drag to snap to neighbor node Shift+drag to …
shun-iwasawa Aug 17, 2021
23ea8ba
spin blur fx gadget alternated coloring
shun-iwasawa Jul 25, 2022
9414f0e
convert tzp to tlv in folder
shun-iwasawa Oct 13, 2022
50f5eb2
fix custom panel editor hiding
shun-iwasawa Oct 27, 2022
4ce265a
Fix Custom Panel list refreshing improperly
manongjohn Feb 12, 2023
81b78a8
Animation tool option: select camera after switching it
flurick Nov 2, 2022
f390c90
Keep selection valid when cutting frames
flurick Jun 10, 2022
3bdad9b
floor bump fx iwa
shun-iwasawa Nov 27, 2019
32dcc6b
fix radial and spin blur ino offset
shun-iwasawa Dec 5, 2022
c049006
Bigger curve points for function curve panel and better contrast
konero Dec 2, 2022
780d809
Refine Icons
konero Nov 28, 2022
dc17e34
Remove duplicate
konero Nov 28, 2022
28dd798
Remove duplicate
konero Nov 28, 2022
e4ef9d9
Remove duplicate
konero Nov 28, 2022
d724493
Add icon for zero thick lines
konero Nov 28, 2022
1f35ea2
Add missing unlink icon for schematic menu
konero Nov 28, 2022
9b27022
Change palette window tab icon to new palette icon
konero Nov 28, 2022
8908325
Use delete icon for delete page command
konero Nov 28, 2022
9bcaf99
Use new clapboard glyph for task status icons
konero Nov 29, 2022
8bf9350
Icons for style picker modes
konero Nov 30, 2022
b009858
Squashed commit of the following:
konero Nov 30, 2022
1b9446f
Fixed some Fx Schematic/Palette viewer icons showing when turned off
manongjohn Feb 13, 2023
6f44f1c
Misc. updates to style editor brush pages
justburner Oct 22, 2022
926b4f3
tangentflow, motionflow, flowblur, flowpaintbrush and flow-line style
shun-iwasawa Aug 6, 2020
c4051ff
fix output settings dirty flag
shun-iwasawa Dec 12, 2022
67d7d16
Hide brush tips folder from Style Editor
manongjohn Feb 15, 2023
b387bd8
refactoring: unify viewer and comboviewer classes
shun-iwasawa Dec 15, 2022
8e989c2
Make MyScroller Configurable in Stylesheet
konero Dec 20, 2022
d9ba0ee
Paint brush commands
konero Dec 21, 2022
e71bdde
Remove whitespace
konero Dec 29, 2022
33d474a
fix particles fx column placement bug
shun-iwasawa Dec 22, 2022
5ba47b0
Triangle brush cursors
konero Jan 15, 2023
594093c
OpenEXR I/O
shun-iwasawa Dec 17, 2021
793337e
floating point & linear color space rendering
shun-iwasawa Nov 9, 2021
2c5f655
enhance viewer preview - render all frames, multi-thread mode - rende…
shun-iwasawa Dec 14, 2022
046bdd4
fix viewer parts visibility
shun-iwasawa Feb 8, 2023
6b41e56
new Fill Tool - Pick+Freehand
justburner Nov 2, 2022
cea78e5
Fix oversized icons in file browser
manongjohn Feb 22, 2023
7b474d9
3rd party interface adjustments + more
justburner Oct 28, 2022
b33713d
HSLBlend images alpha fix
justburner Jan 22, 2023
0836548
refactoring: replace obsolete Qt functions
shun-iwasawa Jan 18, 2023
0eaf939
#morevna #board Create a copy of FileBrowser Panel, name it as "Prepr…
morevnaproject Dec 29, 2020
a6d50b5
#morevna #board Copy filebrowser.cpp/h to scenebrowser.cpp/h
morevnaproject Jul 19, 2020
7e6bef8
#morevna #board Create copy of FileBrowser class as SceneBrowser class
morevnaproject Jul 26, 2020
a51ff84
#morevna #board Hide TreeView widget
morevnaproject Jul 26, 2020
0b171db
#morevna #board Switch scenes with single click.
morevnaproject Jul 26, 2020
aedd80d
#morevna #board Do not display folders
morevnaproject Jul 26, 2020
2661d05
#morevna #board Force Thumbnail view
morevnaproject Jul 26, 2020
3b4c982
#morevna #board Add missing file
morevnaproject Aug 9, 2020
de14e31
Update directory when scene switched
morevnaproject Aug 9, 2020
704028c
Always show folder of currently opened scene
morevnaproject Aug 16, 2020
7c80cef
Copy buttonbar from DVItemView to separate class
morevnaproject Aug 16, 2020
071c9b0
Remove toolbar buttons.
morevnaproject Aug 16, 2020
0f841e1
Fix bug with panel not updated.
morevnaproject Aug 23, 2020
ed69c4f
Cleanup
morevnaproject Aug 23, 2020
66c611d
Rename "newFolder" to "newScene"
morevnaproject Sep 25, 2020
6ecfeda
Creating new scene works now (numbers not generated properly yet)
morevnaproject Oct 9, 2020
e834b7a
Scenes created prperly numbered
morevnaproject Oct 16, 2020
ac54000
Cleanup.
morevnaproject Oct 16, 2020
c19a017
Add "-" before number if initial scene name has no number
morevnaproject Oct 30, 2020
e207049
Determine number length from scene name
morevnaproject Oct 30, 2020
c1325ea
Fix bug with creating scenes
morevnaproject Oct 30, 2020
02f2de4
Keep scrolling after adding scene
morevnaproject Nov 27, 2020
d958733
Do not add "-" for new scenes (if no number in name)
morevnaproject Nov 27, 2020
f3edf29
Rebase on master
flurick Nov 24, 2022
beae330
Clarify button label
flurick Nov 24, 2022
27cae13
Hide the tree view for now
flurick Nov 24, 2022
5a8ce11
Bigger board "icon" size
flurick Nov 25, 2022
460f2a6
Disable icon ChessBackground (accidentally also for filebrowser)
flurick Nov 25, 2022
ce3941f
Missed changes from "refactoring: replace obsolete Qt functions"
manongjohn Feb 26, 2023
6d84f93
Fix missing save qsetting parameter
manongjohn Feb 26, 2023
0c9b91f
Audio fixes and enhancements
justburner Feb 27, 2022
0fcc299
Fix error in TSoundOutputDevice::getPreferredFormat
manongjohn Feb 27, 2023
3e5fc1a
Fix autodetect thirdparty software for non-windows builds
manongjohn Feb 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
150 changes: 148 additions & 2 deletions stuff/config/current.txt

Large diffs are not rendered by default.

33 changes: 31 additions & 2 deletions stuff/config/qss/Dark/Dark.qss
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,7 @@ QTreeWidget {
----------------------------------------------------------------------------- */
.Button,
QPushButton,
#CustomPanelButton,
.ComboBox,
#enableBlankFrameButton,
QComboBox {
Expand All @@ -849,6 +850,7 @@ QComboBox {
}
.Button:hover,
QPushButton:hover,
#CustomPanelButton:hover,
#ViewerFpsSlider::sub-line:horizontal:hover,
#ViewerFpsSlider::add-line:horizontal:hover,
#enableBlankFrameButton:hover {
Expand All @@ -858,6 +860,7 @@ QPushButton:hover,
}
.Button:pressed,
QPushButton:pressed,
#CustomPanelButton:pressed,
#ViewerFpsSlider::sub-line:horizontal:pressed,
#ViewerFpsSlider::add-line:horizontal:pressed,
#enableBlankFrameButton:pressed {
Expand All @@ -867,24 +870,28 @@ QPushButton:pressed,
}
.Button:checked,
QPushButton:checked,
#CustomPanelButton:checked,
#enableBlankFrameButton:checked {
background-color: #141414;
border-color: #0f0f0f;
color: #f3f3f3;
}
.Button:checked:hover,
QPushButton:checked:hover,
#CustomPanelButton:checked:hover,
#enableBlankFrameButton:checked:hover {
background-color: #282828;
border-color: #1c1c1c;
}
.Button:checked:hover:pressed,
QPushButton:checked:hover:pressed,
#CustomPanelButton:checked:hover:pressed,
#enableBlankFrameButton:checked:hover:pressed {
background: #1c1c1c;
}
.Button:disabled,
QPushButton:disabled,
#CustomPanelButton:disabled,
.ComboBox:disabled,
#ViewerFpsSlider::sub-line:horizontal:disabled,
#ViewerFpsSlider::add-line:horizontal:disabled,
Expand All @@ -897,6 +904,9 @@ QComboBox:disabled {
#PushButton_NoPadding {
padding: 3;
}
#CustomPanelButton {
padding: 0;
}
/* -----------------------------------------------------------------------------
ComboBox
----------------------------------------------------------------------------- */
Expand Down Expand Up @@ -1289,6 +1299,13 @@ QProgressBar::chunk {
border: 1 solid #111111;
border-radius: 2;
}
/* -----------------------------------------------------------------------------
Custom Panel Widgets
----------------------------------------------------------------------------- */
MyScroller {
qproperty-ScrollerBorderColor: #8d8d8d;
qproperty-ScrollerBGColor: #1c1c1c;
}
/* -----------------------------------------------------------------------------
File Browser
----------------------------------------------------------------------------- */
Expand Down Expand Up @@ -1525,6 +1542,12 @@ QStatusBar #StatusBarLabel {
#HexagonalColorWheel {
qproperty-BGColor: #303030;
}
#StyleChooserPage {
qproperty-CommonChipBoxColor: black;
qproperty-SolidChipBoxColor: #e41000;
qproperty-SelectedChipBoxColor: white;
qproperty-SelectedChipBox2Color: #c7ca32;
}
/* -------------------------------------------------------------------------- */
/* Horizontal QSlider */
#colorSlider::groove:horizontal {
Expand Down Expand Up @@ -2262,9 +2285,13 @@ Ruler {
XsheetViewer {
qproperty-TextColor: #e6e6e6;
qproperty-ErrorTextColor: #ff7b7b;
qproperty-SelectedTextColor: #e6e6e6;
qproperty-CurrentFrameTextColor: #e6e6e6;
qproperty-BGColor: #303030;
qproperty-LightLineColor: rgba(0, 0, 0, 0.3);
qproperty-MarkerLineColor: rgba(255, 255, 255, 0.15);
qproperty-SecMarkerLineColor: rgba(255, 255, 255, 0.25);
qproperty-SelectedMarkerLineColor: rgba(255, 255, 255, 0.15);
qproperty-VerticalLineColor: rgba(0, 0, 0, 0.4);
qproperty-VerticalLineHeadColor: #0f0f0f;
qproperty-PreviewFrameTextColor: #9fdaff;
Expand Down Expand Up @@ -2398,8 +2425,8 @@ FunctionTreeView {
}
FunctionPanel {
qproperty-BGColor: #303030;
qproperty-ValueLineColor: rgba(0, 0, 0, 0.1);
qproperty-FrameLineColor: rgba(0, 0, 0, 0.1);
qproperty-ValueLineColor: #3a3a3a;
qproperty-FrameLineColor: #444444;
qproperty-OtherCurvesColor: #7d7d7d;
qproperty-RulerBackground: #282828;
qproperty-TextColor: #e6e6e6;
Expand All @@ -2411,6 +2438,7 @@ SpreadsheetViewer {
qproperty-CurrentRowBgColor: rgba(163, 82, 147, 0.7);
qproperty-LightLineColor: rgba(0, 0, 0, 0.3);
qproperty-MarkerLineColor: rgba(255, 255, 255, 0.15);
qproperty-SecMarkerLineColor: rgba(255, 255, 255, 0.25);
qproperty-BGColor: #262626;
qproperty-VerticalLineColor: rgba(0, 0, 0, 0.4);
qproperty-KeyFrameColor: #995d1d;
Expand All @@ -2426,6 +2454,7 @@ SpreadsheetViewer {
qproperty-SelectedEmptyColor: rgba(106, 89, 102, 0.5);
qproperty-SelectedSceneRangeEmptyColor: rgba(106, 89, 102, 0.5);
qproperty-TextColor: #e6e6e6;
qproperty-CurrentRowTextColor: #e6e6e6;
qproperty-ColumnHeaderBorderColor: #4a4a4a;
}
#ExpressionField {
Expand Down
41 changes: 35 additions & 6 deletions stuff/config/qss/Darker/Darker.qss
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,7 @@ QTreeWidget {
----------------------------------------------------------------------------- */
.Button,
QPushButton,
#CustomPanelButton,
.ComboBox,
#enableBlankFrameButton,
QComboBox {
Expand All @@ -849,6 +850,7 @@ QComboBox {
}
.Button:hover,
QPushButton:hover,
#CustomPanelButton:hover,
#ViewerFpsSlider::sub-line:horizontal:hover,
#ViewerFpsSlider::add-line:horizontal:hover,
#enableBlankFrameButton:hover {
Expand All @@ -858,6 +860,7 @@ QPushButton:hover,
}
.Button:pressed,
QPushButton:pressed,
#CustomPanelButton:pressed,
#ViewerFpsSlider::sub-line:horizontal:pressed,
#ViewerFpsSlider::add-line:horizontal:pressed,
#enableBlankFrameButton:pressed {
Expand All @@ -867,24 +870,28 @@ QPushButton:pressed,
}
.Button:checked,
QPushButton:checked,
#CustomPanelButton:checked,
#enableBlankFrameButton:checked {
background-color: #040404;
border-color: #000000;
color: #f3f3f3;
}
.Button:checked:hover,
QPushButton:checked:hover,
#CustomPanelButton:checked:hover,
#enableBlankFrameButton:checked:hover {
background-color: #181818;
border-color: #0c0c0c;
}
.Button:checked:hover:pressed,
QPushButton:checked:hover:pressed,
#CustomPanelButton:checked:hover:pressed,
#enableBlankFrameButton:checked:hover:pressed {
background: #0c0c0c;
}
.Button:disabled,
QPushButton:disabled,
#CustomPanelButton:disabled,
.ComboBox:disabled,
#ViewerFpsSlider::sub-line:horizontal:disabled,
#ViewerFpsSlider::add-line:horizontal:disabled,
Expand All @@ -897,6 +904,9 @@ QComboBox:disabled {
#PushButton_NoPadding {
padding: 3;
}
#CustomPanelButton {
padding: 0;
}
/* -----------------------------------------------------------------------------
ComboBox
----------------------------------------------------------------------------- */
Expand Down Expand Up @@ -1289,6 +1299,13 @@ QProgressBar::chunk {
border: 1 solid #060606;
border-radius: 2;
}
/* -----------------------------------------------------------------------------
Custom Panel Widgets
----------------------------------------------------------------------------- */
MyScroller {
qproperty-ScrollerBorderColor: #8d8d8d;
qproperty-ScrollerBGColor: #0c0c0c;
}
/* -----------------------------------------------------------------------------
File Browser
----------------------------------------------------------------------------- */
Expand Down Expand Up @@ -1525,6 +1542,12 @@ QStatusBar #StatusBarLabel {
#HexagonalColorWheel {
qproperty-BGColor: #202020;
}
#StyleChooserPage {
qproperty-CommonChipBoxColor: black;
qproperty-SolidChipBoxColor: #e41000;
qproperty-SelectedChipBoxColor: white;
qproperty-SelectedChipBox2Color: #c7ca32;
}
/* -------------------------------------------------------------------------- */
/* Horizontal QSlider */
#colorSlider::groove:horizontal {
Expand Down Expand Up @@ -2262,9 +2285,13 @@ Ruler {
XsheetViewer {
qproperty-TextColor: #e6e6e6;
qproperty-ErrorTextColor: #ff7b7b;
qproperty-SelectedTextColor: #e6e6e6;
qproperty-CurrentFrameTextColor: #e6e6e6;
qproperty-BGColor: #1b1b1b;
qproperty-LightLineColor: rgba(0, 0, 0, 0.2);
qproperty-MarkerLineColor: rgba(255, 255, 255, 0.15);
qproperty-SecMarkerLineColor: rgba(255, 255, 255, 0.25);
qproperty-SelectedMarkerLineColor: rgba(255, 255, 255, 0.15);
qproperty-VerticalLineColor: rgba(0, 0, 0, 0.3);
qproperty-VerticalLineHeadColor: #000000;
qproperty-PreviewFrameTextColor: #9fdaff;
Expand Down Expand Up @@ -2397,20 +2424,21 @@ FunctionTreeView {
padding-left: 2;
}
FunctionPanel {
qproperty-BGColor: #282828;
qproperty-ValueLineColor: rgba(0, 0, 0, 0.1);
qproperty-FrameLineColor: rgba(0, 0, 0, 0.1);
qproperty-OtherCurvesColor: #747474;
qproperty-RulerBackground: #202020;
qproperty-BGColor: #131313;
qproperty-ValueLineColor: #1d1d1d;
qproperty-FrameLineColor: #282828;
qproperty-OtherCurvesColor: #606060;
qproperty-RulerBackground: #0c0c0c;
qproperty-TextColor: #e6e6e6;
qproperty-SubColor: #282828;
qproperty-SubColor: #131313;
qproperty-SelectedColor: #FFA500;
}
SpreadsheetViewer {
qproperty-LightLightBGColor: #1b1b1b;
qproperty-CurrentRowBgColor: rgba(163, 82, 147, 0.7);
qproperty-LightLineColor: rgba(0, 0, 0, 0.2);
qproperty-MarkerLineColor: rgba(255, 255, 255, 0.15);
qproperty-SecMarkerLineColor: rgba(255, 255, 255, 0.25);
qproperty-BGColor: #282828;
qproperty-VerticalLineColor: rgba(0, 0, 0, 0.3);
qproperty-KeyFrameColor: #995d1d;
Expand All @@ -2426,6 +2454,7 @@ SpreadsheetViewer {
qproperty-SelectedEmptyColor: rgba(99, 83, 96, 0.5);
qproperty-SelectedSceneRangeEmptyColor: rgba(99, 83, 96, 0.5);
qproperty-TextColor: #e6e6e6;
qproperty-CurrentRowTextColor: #e6e6e6;
qproperty-ColumnHeaderBorderColor: #000000;
}
#ExpressionField {
Expand Down
Loading