558b63 Merge branch 'master' of https://github.com/opentoonz/opentoonz

Merged and Committed by Gabriel Gazzán 9 years ago
147 files changed. 5666 lines added. 834 lines removed.
doc/how_to_build_linux.md
file modified
+49 -33
stuff/config/qss/gray_048/gray_048.less
file modified
+27 -17
stuff/config/qss/gray_048/gray_048.qss
file modified
+41 -32
stuff/config/qss/gray_048/gray_048_mac.qss
file modified
+41 -32
stuff/config/qss/gray_072/gray_072.less
file modified
+26 -16
stuff/config/qss/gray_072/gray_072.qss
file modified
+41 -32
stuff/config/qss/gray_072/gray_072_mac.qss
file modified
+41 -32
stuff/config/qss/gray_072/imgs/gear.png
file added
+0
stuff/config/qss/gray_072/imgs/sb_g_downarrow.png
file modified
+0 -0
stuff/config/qss/gray_072/imgs/sb_g_downarrow_pressed.png
file modified
+0 -0
stuff/config/qss/gray_072/imgs/sb_g_larrow.png
file modified
+0 -0
stuff/config/qss/gray_072/imgs/sb_g_larrow_pressed.png
file modified
+0 -0
stuff/config/qss/gray_072/imgs/sb_g_ls_downarrow.png
file removed
-0
stuff/config/qss/gray_072/imgs/sb_g_ls_downarrow_pressed.png
file removed
-0
stuff/config/qss/gray_072/imgs/sb_g_ls_uparrow.png
file removed
-0
stuff/config/qss/gray_072/imgs/sb_g_ls_uparrow_pressed.png
file removed
-0
stuff/config/qss/gray_072/imgs/sb_g_rarrow.png
file modified
+0 -0
stuff/config/qss/gray_072/imgs/sb_g_rarrow_pressed.png
file modified
+0 -0
stuff/config/qss/gray_072/imgs/sb_g_uparrow.png
file modified
+0 -0
stuff/config/qss/gray_072/imgs/sb_g_uparrow_pressed.png
file modified
+0 -0
stuff/config/qss/gray_128/gray_128.less
file modified
+27 -16
stuff/config/qss/gray_128/gray_128.qss
file modified
+41 -32
stuff/config/qss/gray_128/gray_128_mac.qss
file modified
+41 -32
stuff/config/qss/gray_128/imgs/gear.png
file added
+0
stuff/config/qss/gray_128/imgs/sb_g_downarrow.png
file modified
+0 -0
stuff/config/qss/gray_128/imgs/sb_g_downarrow_pressed.png
file modified
+0 -0
stuff/config/qss/gray_128/imgs/sb_g_larrow.png
file modified
+0 -0
stuff/config/qss/gray_128/imgs/sb_g_larrow_pressed.png
file modified
+0 -0
stuff/config/qss/gray_128/imgs/sb_g_rarrow.png
file modified
+0 -0
stuff/config/qss/gray_128/imgs/sb_g_rarrow_pressed.png
file modified
+0 -0
stuff/config/qss/gray_128/imgs/sb_g_uparrow.png
file modified
+0 -0
stuff/config/qss/gray_128/imgs/sb_g_uparrow_pressed.png
file modified
+0 -0
stuff/profiles/layouts/rooms/Default/menubar_template.xml
file modified
+4 -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/Makefile.am
file modified
+1 -0
toonz/sources/CMakeLists.txt
file modified
+1 -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
+77 -16
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
+19 -8
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/tools/tooloptions.h
file modified
+3 -1
toonz/sources/include/toonz/Naa2TlvConverter.h
file modified
+2 -1
toonz/sources/include/toonz/palettecmd.h
file modified
+11 -0
toonz/sources/include/toonz/preferences.h
file modified
+29 -3
toonz/sources/include/toonz/tproject.h
file modified
+1 -1
toonz/sources/include/toonz/tscenehandle.h
file modified
+4 -2
toonz/sources/include/toonzqt/camerasettingswidget.h
file modified
+1 -0
toonz/sources/include/toonzqt/dvdialog.h
file modified
+13 -4
toonz/sources/include/toonzqt/filefield.h
file modified
+3 -1
toonz/sources/include/toonzqt/flipconsole.h
file modified
+3 -1
toonz/sources/include/toonzqt/imageutils.h
file modified
+4 -2
toonz/sources/include/toonzqt/menubarcommand.h
file modified
+2 -1
toonz/sources/include/toonzqt/paletteviewergui.h
file modified
+1 -5
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
+8 -0
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
+12 -0
toonz/sources/toonz/CMakeLists.txt
file modified
+9 -3
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/comboviewerpane.cpp
file modified
+18 -6
toonz/sources/toonz/comboviewerpane.h
file modified
+5 -2
toonz/sources/toonz/convertpopup.cpp
file modified
+36 -7
toonz/sources/toonz/convertpopup.h
file modified
+2 -1
toonz/sources/toonz/filebrowser.cpp
file modified
+2 -1
toonz/sources/toonz/filebrowserpopup.cpp
file modified
+5 -7
toonz/sources/toonz/flipbook.h
file modified
+2 -1
toonz/sources/toonz/iocommand.cpp
file modified
+50 -13
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
+67 -51
toonz/sources/toonz/mainwindow.h
file modified
+2 -0
toonz/sources/toonz/menubar.cpp
file modified
+3 -0
toonz/sources/toonz/menubarcommandids.h
file modified
+3 -0
toonz/sources/toonz/penciltestpopup.cpp
file modified
+128 -0
toonz/sources/toonz/penciltestpopup.h
file modified
+5 -0
toonz/sources/toonz/preferencespopup.cpp
file modified
+146 -20
toonz/sources/toonz/preferencespopup.h
file modified
+12 -3
toonz/sources/toonz/rendercommand.cpp
file modified
+34 -0
toonz/sources/toonz/sceneviewer.cpp
file modified
+16 -5
toonz/sources/toonz/sceneviewer.h
file modified
+8 -0
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+34 -1
toonz/sources/toonz/shortcutpopup.cpp
file modified
+390 -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/styleshortcutswitchablepanel.cpp
file added
+112
toonz/sources/toonz/styleshortcutswitchablepanel.h
file added
+39
toonz/sources/toonz/tapp.cpp
file modified
+13 -4
toonz/sources/toonz/toonz.qrc
file modified
+4 -0
toonz/sources/toonz/tpanels.cpp
file modified
+2 -1
toonz/sources/toonz/tpanels.h
file modified
+2 -1
toonz/sources/toonz/viewerpane.cpp
file modified
+146 -33
toonz/sources/toonz/viewerpane.h
file modified
+15 -2
toonz/sources/toonz/xsheetviewer.cpp
file modified
+7 -7
toonz/sources/toonzlib/Naa2TlvConverter.cpp
file modified
+20 -3
toonz/sources/toonzlib/convert2tlv.cpp
file modified
+23 -5
toonz/sources/toonzlib/movierenderer.cpp
file modified
+2 -2
toonz/sources/toonzlib/outputproperties.cpp
file modified
+1 -1
toonz/sources/toonzlib/palettecmd.cpp
file modified
+177 -0
toonz/sources/toonzlib/preferences.cpp
file modified
+63 -1
toonz/sources/toonzlib/sceneproperties.cpp
file modified
+0 -2
toonz/sources/toonzlib/stagevisitor.cpp
file modified
+4 -0
toonz/sources/toonzlib/studiopalettecmd.cpp
file modified
+4 -0
toonz/sources/toonzlib/tproject.cpp
file modified
+5 -3
toonz/sources/toonzqt/dvdialog.cpp
file modified
+76 -0
toonz/sources/toonzqt/filefield.cpp
file modified
+6 -2
toonz/sources/toonzqt/flipconsole.cpp
file modified
+8 -4
toonz/sources/toonzqt/functiontreeviewer.cpp
file modified
+6 -3
toonz/sources/toonzqt/imageutils.cpp
file modified
+4 -3
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
+97 -57
toonz/sources/toonzqt/spreadsheetviewer.cpp
file modified
+5 -4
toonz/sources/toonzqt/studiopaletteviewer.cpp
file modified
+3 -0
toonz/sources/toonzqt/styleeditor.cpp
file modified
+5 -1
toonz/sources/toonzqt/styleselection.cpp
file modified
+46 -10
    Merge branch 'master' of https://github.com/opentoonz/opentoonz
    
        
file modified
+49 -33
empty file added
empty file added
file modified
+1 -1
empty file added
empty file added
empty file added
empty file added
file modified
+13 -4