22de1e Merge branch 'master' into shortplay

Merged and Committed by Jeremy Bullock 4 years ago
166 files changed. 32514 lines added. 5395 lines removed.
doc/how_to_build_win.md
file modified
+16 -0
doc/how_to_build_win_ja.md
file modified
+11 -0
stuff/config/qss/Blue/Blue.qss
file modified
+1962 -1
stuff/config/qss/Dark/Dark.qss
file modified
+1962 -1
stuff/config/qss/Default/Default.qss
file modified
+1962 -1
stuff/config/qss/Default/imgs/black/checkpartially.svg
file added
+58
stuff/config/qss/Default/imgs/black/checkpartially_disabled.svg
file added
+58
stuff/config/qss/Default/imgs/white/checkpartially.svg
file added
+58
stuff/config/qss/Default/imgs/white/checkpartially_disabled.svg
file added
+58
stuff/config/qss/Default/less/layouts/controls.less
file modified
+13 -0
stuff/config/qss/Default/less/layouts/misc.less
file modified
+38 -0
stuff/config/qss/Light/Light.qss
file modified
+1963 -1
stuff/doc/LICENSE/LICENSE_libjpeg-turbo.txt
file added
+35
stuff/doc/LICENSE/LICENSE_opencv.txt
file added
+36
stuff/profiles/layouts/rooms/Default/menubar_template.xml
file modified
+1 -0
thirdparty/canon/.gitignore
file added
+2
thirdparty/canon/copy_canon_sdk.txt
file added
+2
thirdparty/libjpeg-turbo64/.gitignore
file added
+2
thirdparty/libjpeg-turbo64/.gitkeep
file added
+0
thirdparty/libjpeg-turbo64/copy_libjpeg-turbo64.txt
file added
+1
toonz/sources/CMakeLists.txt
file modified
+23 -2
toonz/sources/common/tvectorimage/tstroke.cpp
file modified
+25 -26
toonz/sources/include/tmachine.h
file modified
+0 -9
toonz/sources/include/tools/cursors.h
file modified
+5 -1
toonz/sources/include/tools/tool.h
file modified
+52 -9
toonz/sources/include/tools/toolutils.h
file modified
+14 -4
toonz/sources/include/toonz/levelproperties.h
file modified
+13 -4
toonz/sources/include/toonz/preferences.h
file modified
+13 -4
toonz/sources/include/toonz/preferencesitemids.h
file modified
+7 -1
toonz/sources/include/toonz/stage.h
file modified
+4 -2
toonz/sources/include/toonz/stageplayer.h
file modified
+3 -0
toonz/sources/include/toonz/stagevisitor.h
file modified
+4 -0
toonz/sources/include/toonz/ttileset.h
file modified
+2 -2
toonz/sources/stopmotion/stopmotion.cpp
file added
+4013
toonz/sources/stopmotion/stopmotion.h
file added
+380
toonz/sources/stopmotion/stopmotioncontroller.cpp
file added
+1730
toonz/sources/stopmotion/stopmotioncontroller.h
file added
+206
toonz/sources/tnztools/Resources/ex_next.png
file added
+0
toonz/sources/tnztools/Resources/ex_next_left.png
file added
+0
toonz/sources/tnztools/Resources/ex_prev.png
file added
+0
toonz/sources/tnztools/Resources/ex_prev_left.png
file added
+0
toonz/sources/tnztools/bendertool.cpp
file modified
+10 -1
toonz/sources/tnztools/controlpointeditortool.cpp
file modified
+8 -0
toonz/sources/tnztools/cursormanager.cpp
file modified
+4 -0
toonz/sources/tnztools/cuttertool.cpp
file modified
+10 -1
toonz/sources/tnztools/geometrictool.cpp
file modified
+36 -7
toonz/sources/tnztools/irontool.cpp
file modified
+10 -1
toonz/sources/tnztools/magnettool.cpp
file modified
+10 -1
toonz/sources/tnztools/pinchtool.cpp
file modified
+8 -0
toonz/sources/tnztools/pumptool.cpp
file modified
+10 -1
toonz/sources/tnztools/rasterselectiontool.cpp
file modified
+1 -1
toonz/sources/tnztools/rasterselectiontool.h
file modified
+1 -1
toonz/sources/tnztools/selectiontool.cpp
file modified
+20 -40
toonz/sources/tnztools/selectiontool.h
file modified
+16 -9
toonz/sources/tnztools/tnztools.qrc
file modified
+4 -0
toonz/sources/tnztools/tool.cpp
file modified
+560 -176
toonz/sources/tnztools/tooloptionscontrols.cpp
file modified
+4 -3
toonz/sources/tnztools/toolutils.cpp
file modified
+140 -34
toonz/sources/tnztools/toonzvectorbrushtool.cpp
file modified
+180 -36
toonz/sources/tnztools/toonzvectorbrushtool.h
file modified
+13 -2
toonz/sources/tnztools/typetool.cpp
file modified
+10 -1
toonz/sources/tnztools/vectorselectiontool.cpp
file modified
+13 -1
toonz/sources/tnztools/vectorselectiontool.h
file modified
+9 -1
toonz/sources/toonz/CMakeLists.txt
file modified
+34 -1
toonz/sources/toonz/Resources/xdts.svg
file added
+191
toonz/sources/toonz/cellselection.cpp
file modified
+194 -79
toonz/sources/toonz/cellselection.h
file modified
+6 -1
toonz/sources/toonz/cellselectioncommand.cpp
file modified
+47 -0
toonz/sources/toonz/dvitemview.cpp
file modified
+2 -1
toonz/sources/toonz/dvitemview.h
file modified
+5 -0
toonz/sources/toonz/filebrowser.cpp
file modified
+47 -10
toonz/sources/toonz/filebrowser.h
file modified
+11 -0
toonz/sources/toonz/filebrowserpopup.cpp
file modified
+345 -208
toonz/sources/toonz/filebrowserpopup.h
file modified
+32 -12
toonz/sources/toonz/filmstripcommand.cpp
file modified
+33 -10
toonz/sources/toonz/filmstripcommand.h
file modified
+3 -1
toonz/sources/toonz/iocommand.cpp
file modified
+25 -23
toonz/sources/toonz/iocommand.h
file modified
+28 -26
toonz/sources/toonz/keyframeselection.cpp
file modified
+118 -8
toonz/sources/toonz/keyframeselection.h
file modified
+5 -0
toonz/sources/toonz/levelsettingspopup.cpp
file modified
+922 -447
toonz/sources/toonz/levelsettingspopup.h
file modified
+43 -18
toonz/sources/toonz/mainwindow.cpp
file modified
+38 -0
toonz/sources/toonz/menubar.cpp
file modified
+3 -0
toonz/sources/toonz/menubarcommandids.h
file modified
+23 -0
toonz/sources/toonz/preferencespopup.cpp
file modified
+16 -20
toonz/sources/toonz/preferencespopup.h
file modified
+0 -1
toonz/sources/toonz/sceneviewer.cpp
file modified
+223 -2
toonz/sources/toonz/sceneviewer.h
file modified
+8 -0
toonz/sources/toonz/sceneviewercontextmenu.cpp
file modified
+86 -1
toonz/sources/toonz/sceneviewercontextmenu.h
file modified
+5 -0
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+24 -1
toonz/sources/toonz/toonz.qrc
file modified
+1 -0
toonz/sources/toonz/tpanels.cpp
file modified
+33 -0
toonz/sources/toonz/tpanels.h
file modified
+1 -0
toonz/sources/toonz/xdtsimportpopup.cpp
file added
+152
toonz/sources/toonz/xdtsimportpopup.h
file added
+30
toonz/sources/toonz/xdtsio.cpp
file added
+527
toonz/sources/toonz/xdtsio.h
file added
+242
toonz/sources/toonz/xshcellviewer.cpp
file modified
+104 -104
toonz/sources/toonz/xshrowviewer.cpp
file modified
+28 -0
toonz/sources/toonz/xshrowviewer.h
file modified
+4 -0
toonz/sources/toonzfarm/tfarm/tfarmtask.cpp
file modified
+1 -2
toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp
file modified
+4 -8
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
file modified
+4 -8
toonz/sources/toonzlib/fxcommand.cpp
file modified
+9 -6
toonz/sources/toonzlib/levelproperties.cpp
file modified
+3 -1
toonz/sources/toonzlib/preferences.cpp
file modified
+38 -2
toonz/sources/toonzlib/stage.cpp
file modified
+27 -4
toonz/sources/toonzlib/stageplayer.cpp
file modified
+1 -0
toonz/sources/toonzlib/stagevisitor.cpp
file modified
+23 -4
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+10 -0
toonz/sources/toonzqt/icongenerator.cpp
file modified
+15 -9
toonz/sources/translations/chinese/image.ts
file modified
+9 -9
toonz/sources/translations/chinese/tnzcore.ts
file modified
+1 -1
toonz/sources/translations/chinese/tnztools.ts
file modified
+28 -0
toonz/sources/translations/chinese/toonz.ts
file modified
+959 -67
toonz/sources/translations/chinese/toonzlib.ts
file modified
+5 -0
toonz/sources/translations/chinese/toonzqt.ts
file modified
+74 -4
toonz/sources/translations/czech/image.ts
file modified
+9 -9
toonz/sources/translations/czech/tnzcore.ts
file modified
+2 -3
toonz/sources/translations/czech/tnztools.ts
file modified
+294 -256
toonz/sources/translations/czech/toonz.ts
file modified
+957 -72
toonz/sources/translations/czech/toonzlib.ts
file modified
+29 -23
toonz/sources/translations/czech/toonzqt.ts
file modified
+239 -157
toonz/sources/translations/french/image.ts
file modified
+9 -9
toonz/sources/translations/french/tnzcore.ts
file modified
+0 -4
toonz/sources/translations/french/tnztools.ts
file modified
+28 -0
toonz/sources/translations/french/toonz.ts
file modified
+971 -138
toonz/sources/translations/french/toonzlib.ts
file modified
+5 -0
toonz/sources/translations/french/toonzqt.ts
file modified
+74 -4
toonz/sources/translations/german/image.ts
file modified
+9 -9
toonz/sources/translations/german/tnzcore.ts
file modified
+0 -4
toonz/sources/translations/german/tnztools.ts
file modified
+28 -0
toonz/sources/translations/german/toonz.ts
file modified
+985 -132
toonz/sources/translations/german/toonzlib.ts
file modified
+5 -0
toonz/sources/translations/german/toonzqt.ts
file modified
+74 -4
toonz/sources/translations/italian/image.ts
file modified
+9 -9
toonz/sources/translations/italian/tnzcore.ts
file modified
+0 -4
toonz/sources/translations/italian/tnztools.ts
file modified
+28 -0
toonz/sources/translations/italian/toonz.ts
file modified
+975 -137
toonz/sources/translations/italian/toonzlib.ts
file modified
+5 -0
toonz/sources/translations/italian/toonzqt.ts
file modified
+74 -4
toonz/sources/translations/japanese/image.ts
file modified
+9 -9
toonz/sources/translations/japanese/tnzcore.ts
file modified
+1 -1
toonz/sources/translations/japanese/tnztools.ts
file modified
+28 -0
toonz/sources/translations/japanese/toonz.ts
file modified
+1031 -115
toonz/sources/translations/japanese/toonzlib.ts
file modified
+5 -0
toonz/sources/translations/japanese/toonzqt.ts
file modified
+74 -4
toonz/sources/translations/korean/tnzcore.ts
file modified
+11 -11
toonz/sources/translations/korean/tnztools.ts
file modified
+36 -8
toonz/sources/translations/korean/toonz.ts
file modified
+819 -54
toonz/sources/translations/korean/toonzlib.ts
file modified
+132 -127
toonz/sources/translations/korean/toonzqt.ts
file modified
+91 -59
toonz/sources/translations/russian/image.ts
file modified
+9 -9
toonz/sources/translations/russian/tnzcore.ts
file modified
+2 -3
toonz/sources/translations/russian/tnztools.ts
file modified
+294 -256
toonz/sources/translations/russian/toonz.ts
file modified
+3091 -1956
toonz/sources/translations/russian/toonzlib.ts
file modified
+29 -23
toonz/sources/translations/russian/toonzqt.ts
file modified
+239 -157
toonz/sources/translations/spanish/image.ts
file modified
+9 -9
toonz/sources/translations/spanish/tnzcore.ts
file modified
+1 -1
toonz/sources/translations/spanish/tnztools.ts
file modified
+28 -0
toonz/sources/translations/spanish/toonz.ts
file modified
+1028 -127
toonz/sources/translations/spanish/toonzlib.ts
file modified
+5 -0
toonz/sources/translations/spanish/toonzqt.ts
file modified
+74 -4
    Merge branch 'master' into shortplay
    
        
file modified
+16 -0
file modified
+11 -0
file modified
+1962 -1
file modified
+1962 -1
file modified
+1963 -1
empty file added
file modified
+23 -2
empty file added
empty file added
file modified
+560 -176
file modified
+28 -26