032f72 Merge pull request #804 from shun-iwasawa/numpad_for_palette_shortcut

26 files Merged by Jeremy Bullock 8 years ago , Committed by GitHub 8 years ago ,
26 files changed. 437 lines added. 57 lines removed.
stuff/profiles/layouts/shortcuts/defopentoonz.ini
file modified
+3 -3
stuff/profiles/layouts/shortcuts/otharmony.ini
file modified
+3 -3
toonz/sources/common/tvrender/tpalette.cpp
file modified
+37 -15
toonz/sources/include/tools/tooloptions.h
file modified
+3 -1
toonz/sources/include/toonz/preferences.h
file modified
+7 -0
toonz/sources/include/toonz/tscenehandle.h
file modified
+4 -2
toonz/sources/include/toonzqt/paletteviewergui.h
file modified
+2 -0
toonz/sources/include/tpalette.h
file modified
+5 -0
toonz/sources/tnztools/tooloptions.cpp
file modified
+1 -0
toonz/sources/toonz/CMakeLists.txt
file modified
+4 -2
toonz/sources/toonz/comboviewerpane.cpp
file modified
+18 -6
toonz/sources/toonz/comboviewerpane.h
file modified
+5 -2
toonz/sources/toonz/mainwindow.cpp
file modified
+3 -3
toonz/sources/toonz/preferencespopup.cpp
file modified
+52 -2
toonz/sources/toonz/preferencespopup.h
file modified
+3 -1
toonz/sources/toonz/sceneviewer.h
file modified
+2 -0
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+17 -0
toonz/sources/toonz/shortcutpopup.cpp
file modified
+11 -0
toonz/sources/toonz/styleshortcutswitchablepanel.cpp
file added
+112
toonz/sources/toonz/styleshortcutswitchablepanel.h
file added
+39
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
+21 -11
toonz/sources/toonz/viewerpane.h
file modified
+4 -2
toonz/sources/toonzlib/preferences.cpp
file modified
+12 -1
toonz/sources/toonzqt/paletteviewergui.cpp
file modified
+65 -1
    Merge pull request #804 from shun-iwasawa/numpad_for_palette_shortcut
    
    Enable switching the current style using numpad keys