cde888 Merged in opentoonz master with conflicts resolved

Merged and Committed by manongjohn 5 years ago
146 files changed. 10137 lines added. 4964 lines removed.
stuff/config/loc/Čeština/colorfx.qmstuff/config/loc/Czech/colorfx.qm
file renamed
+0 -0
stuff/config/loc/Čeština/image.qmstuff/config/loc/Czech/image.qm
file renamed
+0 -0
stuff/config/loc/Čeština/tnzcore.qmstuff/config/loc/Czech/tnzcore.qm
file renamed
+0 -0
stuff/config/loc/Čeština/tnztools.qmstuff/config/loc/Czech/tnztools.qm
file renamed
+0 -0
stuff/config/loc/Čeština/toonz.qmstuff/config/loc/Czech/toonz.qm
file renamed
+0 -0
stuff/config/loc/Čeština/toonzlib.qmstuff/config/loc/Czech/toonzlib.qm
file renamed
+0 -0
stuff/config/loc/Čeština/toonzqt.qmstuff/config/loc/Czech/toonzqt.qm
file renamed
+0 -0
stuff/config/loc/Русский/colorfx.qmstuff/config/loc/Russian (Русский)/colorfx.qm
file renamed
+0 -0
stuff/config/loc/Русский/image.qmstuff/config/loc/Russian (Русский)/image.qm
file renamed
+0 -0
stuff/config/loc/Русский/tnzcore.qmstuff/config/loc/Russian (Русский)/tnzcore.qm
file renamed
+0 -0
stuff/config/loc/Русский/tnztools.qmstuff/config/loc/Russian (Русский)/tnztools.qm
file renamed
+0 -0
stuff/config/loc/Русский/toonz.qmstuff/config/loc/Russian (Русский)/toonz.qm
file renamed
+0 -0
stuff/config/loc/Русский/toonzlib.qmstuff/config/loc/Russian (Русский)/toonzlib.qm
file renamed
+0 -0
stuff/config/loc/Русский/toonzqt.qmstuff/config/loc/Russian (Русский)/toonzqt.qm
file renamed
+0 -0
stuff/config/loc/日本語/tnztools.qm
file modified
+0 -0
stuff/config/loc/日本語/toonz.qm
file modified
+0 -0
stuff/config/loc/日本語/toonzqt.qm
file modified
+0 -0
stuff/config/qss/Blue/Blue.qss
file modified
+1 -1
stuff/config/qss/Dark/Dark.qss
file modified
+1 -1
stuff/config/qss/Default/Default.qss
file modified
+1 -1
stuff/config/qss/Default/less/layouts/controls.less
file modified
+2 -1
stuff/config/qss/Light/Light.qss
file modified
+1 -1
stuff/profiles/layouts/rooms/Default/menubar_template.xml
file modified
+317 -253
toonz/sources/common/tapptools/tenv.cpp
file modified
+41 -1
toonz/sources/common/tfx/tmacrofx.cpp
file modified
+27 -2
toonz/sources/common/tsound/tsound_nt.cpp
file modified
+1 -1
toonz/sources/common/tsystem/tsystem.cpp
file modified
+136 -20
toonz/sources/include/tenv.h
file modified
+6 -0
toonz/sources/include/tfx.h
file modified
+2 -2
toonz/sources/include/tmacrofx.h
file modified
+7 -0
toonz/sources/include/tools/strokeselection.h
file modified
+2 -0
toonz/sources/include/toonz/txshsimplelevel.h
file modified
+2 -0
toonz/sources/include/toonzqt/combohistogram.h
file modified
+1 -0
toonz/sources/include/toonzqt/functionsheet.h
file modified
+7 -0
toonz/sources/include/toonzqt/fxschematicnode.h
file modified
+7 -1
toonz/sources/include/toonzqt/lutcalibrator.h
file modified
+3 -1
toonz/sources/include/toonzqt/schematicnode.h
file modified
+6 -6
toonz/sources/include/toonzqt/studiopaletteviewer.h
file modified
+17 -0
toonz/sources/include/toonzqt/styleeditor.h
file modified
+2 -0
toonz/sources/include/tsystem.h
file modified
+4 -1
toonz/sources/tnzcore/CMakeLists.txt
file modified
+7 -0
toonz/sources/tnztools/fullcolorerasertool.cpp
file modified
+4 -0
toonz/sources/tnztools/magnettool.cpp
file modified
+26 -10
toonz/sources/tnztools/strokeselection.cpp
file modified
+22 -0
toonz/sources/tnztools/tool.cpp
file modified
+4 -10
toonz/sources/tnztools/toonzrasterbrushtool.cpp
file modified
+40 -15
toonz/sources/tnztools/toonzrasterbrushtool.h
file modified
+2 -0
toonz/sources/tnztools/toonzvectorbrushtool.cpp
file modified
+10 -0
toonz/sources/tnztools/toonzvectorbrushtool.h
file modified
+3 -0
toonz/sources/toonz/boardsettingspopup.h
file modified
+3 -1
toonz/sources/toonz/cellselectioncommand.cpp
file modified
+9 -8
toonz/sources/toonz/cleanupsettingsmodel.cpp
file modified
+8 -8
toonz/sources/toonz/curveio.cpp
file modified
+7 -6
toonz/sources/toonz/dvdirtreeview.cpp
file modified
+19 -17
toonz/sources/toonz/dvitemview.cpp
file modified
+8 -5
toonz/sources/toonz/filebrowser.cpp
file modified
+36 -0
toonz/sources/toonz/filebrowser.h
file modified
+2 -0
toonz/sources/toonz/filebrowsermodel.cpp
file modified
+11 -14
toonz/sources/toonz/filedata.cpp
file modified
+3 -2
toonz/sources/toonz/fileselection.cpp
file modified
+6 -6
toonz/sources/toonz/filmstrip.cpp
file modified
+1 -7
toonz/sources/toonz/frameheadgadget.h
file modified
+1 -0
toonz/sources/toonz/imageviewer.cpp
file modified
+10 -1
toonz/sources/toonz/imageviewer.h
file modified
+2 -1
toonz/sources/toonz/keyframedata.cpp
file modified
+68 -0
toonz/sources/toonz/lipsyncpopup.cpp
file modified
+2 -2
toonz/sources/toonz/loadfoldercommand.cpp
file modified
+7 -5
toonz/sources/toonz/main.cpp
file modified
+2 -0
toonz/sources/toonz/mainwindow.cpp
file modified
+9 -2
toonz/sources/toonz/mainwindow.h
file modified
+1 -0
toonz/sources/toonz/matchlinecommand.cpp
file modified
+26 -28
toonz/sources/toonz/menubar.cpp
file modified
+188 -125
toonz/sources/toonz/menubarcommandids.h
file modified
+2 -0
toonz/sources/toonz/penciltestpopup.cpp
file modified
+24 -11
toonz/sources/toonz/penciltestpopup.h
file modified
+1 -0
toonz/sources/toonz/preferencespopup.cpp
file modified
+50 -18
toonz/sources/toonz/preferencespopup.h
file modified
+3 -1
toonz/sources/toonz/previewer.cpp
file modified
+40 -36
toonz/sources/toonz/psdsettingspopup.cpp
file modified
+17 -15
toonz/sources/toonz/psdsettingspopup.h
file modified
+1 -1
toonz/sources/toonz/rendercommand.cpp
file modified
+48 -28
toonz/sources/toonz/sceneviewer.cpp
file modified
+8 -1
toonz/sources/toonz/sceneviewer.h
file modified
+2 -0
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+1 -1
toonz/sources/toonz/svncommitdialog.cpp
file modified
+14 -5
toonz/sources/toonz/svndeletedialog.cpp
file modified
+12 -1
toonz/sources/toonz/svnlockdialog.cpp
file modified
+15 -13
toonz/sources/toonz/svnlockframerangedialog.cpp
file modified
+20 -6
toonz/sources/toonz/svnrevertdialog.cpp
file modified
+6 -1
toonz/sources/toonz/svnupdateandlockdialog.cpp
file modified
+2 -0
toonz/sources/toonz/svnupdatedialog.cpp
file modified
+2 -0
toonz/sources/toonz/vectorizerpopup.cpp
file modified
+17 -4
toonz/sources/toonz/vectorizerswatch.cpp
file modified
+34 -7
toonz/sources/toonz/vectorizerswatch.h
file modified
+7 -1
toonz/sources/toonz/versioncontrol.cpp
file modified
+30 -4
toonz/sources/toonz/versioncontroltimeline.cpp
file modified
+26 -25
toonz/sources/toonzlib/doubleparamcmd.cpp
file modified
+12 -12
toonz/sources/toonzlib/studiopalette.cpp
file modified
+7 -0
toonz/sources/toonzlib/tproject.cpp
file modified
+9 -1
toonz/sources/toonzlib/txshpalettelevel.cpp
file modified
+5 -0
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+29 -4
toonz/sources/toonzqt/docklayout.cpp
file modified
+20 -0
toonz/sources/toonzqt/dvdialog.cpp
file modified
+3 -3
toonz/sources/toonzqt/flipconsole.cpp
file modified
+27 -29
toonz/sources/toonzqt/functionsheet.cpp
file modified
+64 -34
toonz/sources/toonzqt/functionviewer.cpp
file modified
+12 -4
toonz/sources/toonzqt/infoviewer.cpp
file modified
+4 -4
toonz/sources/toonzqt/lutcalibrator.cpp
file modified
+6 -3
toonz/sources/toonzqt/paletteviewer.cpp
file modified
+10 -2
toonz/sources/toonzqt/schematicnode.cpp
file modified
+3 -4
toonz/sources/toonzqt/stageschematicnode.cpp
file modified
+5 -3
toonz/sources/toonzqt/studiopaletteviewer.cpp
file modified
+52 -62
toonz/sources/toonzqt/styleeditor.cpp
file modified
+31 -18
toonz/sources/translations/chinese/tnztools.ts
file modified
+28 -0
toonz/sources/translations/chinese/toonz.ts
file modified
+384 -39
toonz/sources/translations/chinese/toonzqt.ts
file modified
+137 -11
toonz/sources/translations/czech/tnzcore.ts
file modified
+1 -1
toonz/sources/translations/czech/tnztools.ts
file modified
+109 -77
toonz/sources/translations/czech/toonz.ts
file modified
+622 -277
toonz/sources/translations/czech/toonzlib.ts
file modified
+23 -23
toonz/sources/translations/czech/toonzqt.ts
file modified
+400 -262
toonz/sources/translations/french/tnztools.ts
file modified
+28 -0
toonz/sources/translations/french/toonz.ts
file modified
+374 -51
toonz/sources/translations/french/toonzqt.ts
file modified
+127 -20
toonz/sources/translations/german/tnztools.ts
file modified
+28 -0
toonz/sources/translations/german/toonz.ts
file modified
+374 -51
toonz/sources/translations/german/toonzqt.ts
file modified
+128 -14
toonz/sources/translations/italian/tnztools.ts
file modified
+28 -0
toonz/sources/translations/italian/toonz.ts
file modified
+374 -51
toonz/sources/translations/italian/toonzqt.ts
file modified
+128 -14
toonz/sources/translations/japanese/tnztools.ts
file modified
+28 -0
toonz/sources/translations/japanese/toonz.ts
file modified
+386 -40
toonz/sources/translations/japanese/toonzqt.ts
file modified
+134 -12
toonz/sources/translations/korean/tnzcore.ts
file modified
+1 -1
toonz/sources/translations/korean/tnztools.ts
file modified
+126 -94
toonz/sources/translations/korean/toonz.ts
file modified
+1398 -1199
toonz/sources/translations/korean/toonzlib.ts
file modified
+23 -23
toonz/sources/translations/korean/toonzqt.ts
file modified
+369 -295
toonz/sources/translations/russian/tnzcore.ts
file modified
+1 -1
toonz/sources/translations/russian/tnztools.ts
file modified
+126 -94
toonz/sources/translations/russian/toonz.ts
file modified
+1454 -1051
toonz/sources/translations/russian/toonzlib.ts
file modified
+23 -23
toonz/sources/translations/russian/toonzqt.ts
file modified
+404 -262
toonz/sources/translations/spanish/tnztools.ts
file modified
+28 -0
toonz/sources/translations/spanish/toonz.ts
file modified
+384 -39
toonz/sources/translations/spanish/toonzqt.ts
file modified
+137 -11
    Merged in opentoonz master with conflicts resolved
    
        
stuff/config/loc/Čeština/colorfx.qm stuff/config/loc/Czech/colorfx.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Čeština/image.qm stuff/config/loc/Czech/image.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Čeština/tnzcore.qm stuff/config/loc/Czech/tnzcore.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Čeština/tnztools.qm stuff/config/loc/Czech/tnztools.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Čeština/toonz.qm stuff/config/loc/Czech/toonz.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Čeština/toonzlib.qm stuff/config/loc/Czech/toonzlib.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Čeština/toonzqt.qm stuff/config/loc/Czech/toonzqt.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Русский/colorfx.qm stuff/config/loc/Russian (Русский)/colorfx.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Русский/image.qm stuff/config/loc/Russian (Русский)/image.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Русский/tnzcore.qm stuff/config/loc/Russian (Русский)/tnzcore.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Русский/tnztools.qm stuff/config/loc/Russian (Русский)/tnztools.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Русский/toonz.qm stuff/config/loc/Russian (Русский)/toonz.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Русский/toonzlib.qm stuff/config/loc/Russian (Русский)/toonzlib.qm
file renamed
file was renamed with no change to the file
stuff/config/loc/Русский/toonzqt.qm stuff/config/loc/Russian (Русский)/toonzqt.qm
file renamed
file was renamed with no change to the file
file modified
+6 -0
file modified
+2 -2
file modified
+2 -0
file modified
+188 -125