53bef6 Merge remote-tracking branch 'origin/master' into numpad_for_palette_shortcut

Merged and Committed by shun_iwasawa 8 years ago
107 files changed. 4995 lines added. 513 lines removed.
doc/how_to_build_linux.md
file modified
+14 -2
doc/how_to_build_win.md
file modified
+0 -7
doc/how_to_build_win_ja.md
file modified
+0 -7
stuff/config/qss/gray_048/gray_048.less
file modified
+12 -1
stuff/config/qss/gray_048/gray_048.qss
file modified
+9 -0
stuff/config/qss/gray_048/gray_048_mac.qss
file modified
+9 -0
stuff/config/qss/gray_072/gray_072.less
file modified
+12 -1
stuff/config/qss/gray_072/gray_072.qss
file modified
+9 -0
stuff/config/qss/gray_072/gray_072_mac.qss
file modified
+9 -0
stuff/config/qss/gray_072/imgs/gear.png
file added
+0
stuff/config/qss/gray_128/gray_128.less
file modified
+12 -1
stuff/config/qss/gray_128/gray_128.qss
file modified
+9 -0
stuff/config/qss/gray_128/gray_128_mac.qss
file modified
+9 -0
stuff/config/qss/gray_128/imgs/gear.png
file added
+0
stuff/profiles/layouts/rooms/Default/menubar_template.xml
file modified
+3 -1
stuff/profiles/layouts/rooms/StudioGhibli/menubar_template.xml
file modified
+1 -0
stuff/profiles/layouts/shortcuts/defopentoonz.ini
file added
+366
stuff/profiles/layouts/shortcuts/otadobe.ini
file added
+366
stuff/profiles/layouts/shortcuts/otharmony.ini
file added
+366
stuff/profiles/layouts/shortcuts/otretas.ini
file added
+366
thirdparty/libpng-1.6.21/lib/libpng16_2015.lib
file modified
+2 -2
thirdparty/libpng-1.6.21/lib/libpng16_2015d.lib
file modified
+2 -2
thirdparty/tiff-4.0.3/libtiff/tif_config.vc.h
file modified
+2 -0
toonz/sources/common/tapptools/tcolorutils.cpp
file modified
+2 -1
toonz/sources/common/tgeometry/tcurveutil.cpp
file modified
+2 -1
toonz/sources/common/tsystem/tfilepath.cpp
file modified
+12 -1
toonz/sources/common/tvrender/tcolorstyles.cpp
file modified
+6 -2
toonz/sources/common/tvrender/tpalette.cpp
file modified
+41 -2
toonz/sources/image/CMakeLists.txt
file modified
+1 -1
toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp
file modified
+34 -11
toonz/sources/image/ffmpeg/tiio_ffmpeg.h
file modified
+1 -0
toonz/sources/image/ffmpeg/tiio_gif.cpp
file modified
+11 -6
toonz/sources/image/ffmpeg/tiio_mp4.cpp
file modified
+9 -3
toonz/sources/image/ffmpeg/tiio_webm.cpp
file modified
+9 -3
toonz/sources/include/tcolorstyles.h
file modified
+6 -0
toonz/sources/include/tfilepath.h
file modified
+1 -1
toonz/sources/include/tools/cursors.h
file modified
+2 -0
toonz/sources/include/toonz/palettecmd.h
file modified
+11 -0
toonz/sources/include/toonz/preferences.h
file modified
+26 -4
toonz/sources/include/toonzqt/camerasettingswidget.h
file modified
+1 -0
toonz/sources/include/toonzqt/dvdialog.h
file modified
+13 -4
toonz/sources/include/toonzqt/flipconsole.h
file modified
+2 -1
toonz/sources/include/toonzqt/menubarcommand.h
file modified
+2 -1
toonz/sources/include/toonzqt/paletteviewergui.h
file modified
+0 -6
toonz/sources/include/toonzqt/selectioncommandids.h
file modified
+2 -0
toonz/sources/include/toonzqt/styleselection.h
file modified
+3 -1
toonz/sources/include/tpalette.h
file modified
+3 -0
toonz/sources/tcleanupper/tcleanupper.cpp
file modified
+10 -2
toonz/sources/tcomposer/tcomposer.cpp
file modified
+2 -2
toonz/sources/tconverter/tconverter.cpp
file modified
+1 -1
toonz/sources/tnztools/CMakeLists.txt
file modified
+1 -0
toonz/sources/tnztools/Resources/picker_style_organize.png
file added
+0
toonz/sources/tnztools/Resources/picker_style_white_organize.png
file added
+0
toonz/sources/tnztools/brushtool.cpp
file modified
+1 -1
toonz/sources/tnztools/cursormanager.cpp
file modified
+3 -0
toonz/sources/tnztools/stylepickertool.cpp
file modified
+265 -196
toonz/sources/tnztools/stylepickertool.h
file added
+54
toonz/sources/tnztools/tnztools.qrc
file modified
+2 -0
toonz/sources/tnztools/tooloptions.cpp
file modified
+11 -0
toonz/sources/toonz/CMakeLists.txt
file modified
+6 -2
toonz/sources/toonz/Resources/locator.png
file added
+0
toonz/sources/toonz/Resources/locator_click.png
file added
+0
toonz/sources/toonz/Resources/locator_over.png
file added
+0
toonz/sources/toonz/Resources/startup.png
file added
+0
toonz/sources/toonz/cellselectioncommand.cpp
file modified
+3 -0
toonz/sources/toonz/cleanupsettingspane.cpp
file modified
+59 -1
toonz/sources/toonz/cleanupsettingspane.h
file modified
+4 -0
toonz/sources/toonz/colormodelviewer.cpp
file modified
+53 -3
toonz/sources/toonz/colormodelviewer.h
file modified
+3 -0
toonz/sources/toonz/filebrowser.cpp
file modified
+2 -1
toonz/sources/toonz/flipbook.h
file modified
+2 -1
toonz/sources/toonz/iocommand.cpp
file modified
+52 -15
toonz/sources/toonz/iocommand.h
file modified
+2 -0
toonz/sources/toonz/locatorpopup.cpp
file added
+117
toonz/sources/toonz/locatorpopup.h
file added
+34
toonz/sources/toonz/magpiefileimportpopup.cpp
file modified
+1 -1
toonz/sources/toonz/mainwindow.cpp
file modified
+64 -49
toonz/sources/toonz/mainwindow.h
file modified
+2 -0
toonz/sources/toonz/menubar.cpp
file modified
+2 -0
toonz/sources/toonz/menubarcommandids.h
file modified
+2 -0
toonz/sources/toonz/penciltestpopup.cpp
file modified
+269 -38
toonz/sources/toonz/penciltestpopup.h
file modified
+28 -1
toonz/sources/toonz/preferencespopup.cpp
file modified
+151 -18
toonz/sources/toonz/preferencespopup.h
file modified
+15 -3
toonz/sources/toonz/sceneviewer.cpp
file modified
+16 -5
toonz/sources/toonz/sceneviewer.h
file modified
+6 -0
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+17 -1
toonz/sources/toonz/shortcutpopup.cpp
file modified
+379 -3
toonz/sources/toonz/shortcutpopup.h
file modified
+29 -1
toonz/sources/toonz/startuppopup.cpp
file added
+917
toonz/sources/toonz/startuppopup.h
file added
+109
toonz/sources/toonz/tapp.cpp
file modified
+13 -4
toonz/sources/toonz/toonz.qrc
file modified
+4 -0
toonz/sources/toonzlib/convert2tlv.cpp
file modified
+23 -5
toonz/sources/toonzlib/palettecmd.cpp
file modified
+177 -0
toonz/sources/toonzlib/preferences.cpp
file modified
+60 -0
toonz/sources/toonzlib/stagevisitor.cpp
file modified
+4 -0
toonz/sources/toonzlib/studiopalettecmd.cpp
file modified
+4 -0
toonz/sources/toonzlib/toonzfolders.cpp
file modified
+58 -3
toonz/sources/toonzqt/dvdialog.cpp
file modified
+76 -0
toonz/sources/toonzqt/flipconsole.cpp
file modified
+8 -4
toonz/sources/toonzqt/menubarcommand.cpp
file modified
+6 -3
toonz/sources/toonzqt/paletteviewer.cpp
file modified
+1 -4
toonz/sources/toonzqt/paletteviewergui.cpp
file modified
+37 -61
toonz/sources/toonzqt/studiopaletteviewer.cpp
file modified
+1 -0
toonz/sources/toonzqt/styleeditor.cpp
file modified
+5 -1
toonz/sources/toonzqt/styleselection.cpp
file modified
+46 -10
    Merge remote-tracking branch 'origin/master' into numpad_for_palette_shortcut
    
        
file modified
+14 -2
file modified
+0 -7
file modified
+0 -7
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
file modified
+13 -4