c53f28 Merge remote-tracking branch 'origin/master' into organize_palette

Merged and Committed by shun_iwasawa 7 years ago
67 files changed. 843 lines added. 250 lines removed.
CONTRIBUTING.md
file modified
+7 -7
ci-scripts/osx/travis-build.sh
file modified
+4 -0
ci-scripts/osx/travis-install.sh
file modified
+2 -0
stuff/config/qss/gray_048/gray_048.less
file modified
+9 -0
stuff/config/qss/gray_048/gray_048.qss
file modified
+8 -0
stuff/config/qss/gray_048/gray_048_mac.qss
file modified
+8 -0
stuff/config/qss/gray_072/gray_072.less
file modified
+9 -0
stuff/config/qss/gray_072/gray_072.qss
file modified
+8 -0
stuff/config/qss/gray_072/gray_072_mac.qss
file modified
+8 -0
stuff/config/qss/gray_072/imgs/tpaneltitlebar_border.png
file added
+0
stuff/config/qss/gray_072/imgs/tpaneltitlebar_border_active.png
file added
+0
stuff/config/qss/gray_072/imgs/tpaneltitlebar_border_float.png
file added
+0
stuff/config/qss/gray_072/imgs/tpaneltitlebar_border_float_active.png
file added
+0
stuff/config/qss/gray_128/gray_128.less
file modified
+10 -0
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/tpaneltitlebar_border.png
file added
+0
stuff/config/qss/gray_128/imgs/tpaneltitlebar_border_active.png
file added
+0
stuff/config/qss/gray_128/imgs/tpaneltitlebar_border_float.png
file added
+0
stuff/config/qss/gray_128/imgs/tpaneltitlebar_border_float_active.png
file added
+0
stuff/profiles/layouts/rooms/Default/menubar_template.xml
file modified
+12 -0
toonz/sources/beautification.bat
file removed
-5
toonz/sources/beautification.sh
file modified
+3 -1
toonz/sources/common/trop/tblur.cpp
file modified
+1 -1
toonz/sources/common/tunit/tunit.cpp
file modified
+3 -2
toonz/sources/common/twain/twain.h
file modified
+9 -17
toonz/sources/include/tfx.h
file modified
+0 -1
toonz/sources/include/toonz/preferences.h
file modified
+3 -2
toonz/sources/include/toonz/stage.h
file modified
+1 -1
toonz/sources/include/toonz/tcamera.h
file modified
+3 -0
toonz/sources/include/toonz/tscenehandle.h
file modified
+3 -0
toonz/sources/include/toonzqt/lineedit.h
file modified
+1 -0
toonz/sources/include/tpersist.h
file modified
+1 -2
toonz/sources/include/trenderresourcemanager.h
file modified
+1 -2
toonz/sources/include/tsmartpointer.h
file modified
+1 -2
toonz/sources/stdfx/stdfx.h
file modified
+0 -1
toonz/sources/toonz/Resources/geometric.svg
file modified
+88 -63
toonz/sources/toonz/Resources/geometric_old.svg
file added
+63
toonz/sources/toonz/Resources/geometric_rollover.svg
file modified
+88 -63
toonz/sources/toonz/Resources/geometric_rollover_old.svg
file added
+63
toonz/sources/toonz/camerasettingspopup.cpp
file modified
+2 -1
toonz/sources/toonz/cellselection.cpp
file modified
+112 -2
toonz/sources/toonz/cellselection.h
file modified
+3 -0
toonz/sources/toonz/comboviewerpane.cpp
file modified
+24 -0
toonz/sources/toonz/comboviewerpane.h
file modified
+2 -1
toonz/sources/toonz/filebrowserpopup.cpp
file modified
+12 -1
toonz/sources/toonz/iocommand.cpp
file modified
+31 -2
toonz/sources/toonz/levelsettingspopup.cpp
file modified
+3 -1
toonz/sources/toonz/menubar.cpp
file modified
+14 -2
toonz/sources/toonz/menubarpopup.cpp
file modified
+1 -0
toonz/sources/toonz/pane.cpp
file modified
+14 -23
toonz/sources/toonz/pane.h
file modified
+31 -0
toonz/sources/toonz/preferencespopup.cpp
file modified
+37 -9
toonz/sources/toonz/preferencespopup.h
file modified
+3 -1
toonz/sources/toonz/projectpopup.cpp
file modified
+2 -1
toonz/sources/toonz/sceneviewer.cpp
file modified
+5 -1
toonz/sources/toonz/viewerpane.cpp
file modified
+25 -0
toonz/sources/toonz/viewerpane.h
file modified
+2 -1
toonz/sources/toonz/xshcellviewer.cpp
file modified
+52 -23
toonz/sources/toonzlib/preferences.cpp
file modified
+9 -0
toonz/sources/toonzlib/stage.cpp
file modified
+2 -2
toonz/sources/toonzlib/tcamera.cpp
file modified
+2 -1
toonz/sources/toonzlib/txsheet.cpp
file modified
+11 -0
toonz/sources/toonzqt/camerasettingswidget.cpp
file modified
+6 -6
toonz/sources/toonzqt/cleanupcamerasettingswidget.cpp
file modified
+1 -1
toonz/sources/toonzqt/dvdialog.cpp
file modified
+1 -1
toonz/sources/toonzqt/lineedit.cpp
file modified
+1 -0
    Merge remote-tracking branch 'origin/master' into organize_palette
    
        
file modified
+7 -7
file modified
+0 -1
file modified
+0 -1
file modified
+14 -23
file modified
+31 -0