Commit graph

254 commits

Author SHA1 Message Date
Jeremy Bullock
82996a4f0f
Change Column Insert Defaults (#307) 2020-10-06 19:10:46 -06:00
Jeremy Bullock
62ab3d2af4
UI Updates (#294) 2020-10-05 00:15:49 -06:00
artisteacher
d8e36aaf45
Fix override warnings (#164)
There are 100+ warnings due to ______ overriding a member function without being marked override. This adds override in those cases to silence the warnings.
2020-09-15 15:49:57 -06:00
manongjohn
df81651d5e
Display Fx Icon as timeline/xsheet thumbnail (#130) 2020-08-31 15:44:23 -06:00
Jeremy Bullock
af90cdedbe
UI update and Icons from Konero (#126)
* add multi arc mockup

* implement mutli arc

* add join and smooth option

* reset multiarc and arc when deactivated

* create self loop if the last point is the same as the first

* make join option in multiarc consistent with tape tool

* fix a bug where thickness don't affect mutliarc in vector level

* remove join option in geometric tool

* stop mutliarc after closing shape

* double click can also end multi arc

* fix a bug where multiArc will produce buggy stroke

* fix a bug where geometric tools is not deactivated

* add multiArc shortcut

* rewrite multiArc

* revert changes to tvectorimage

* add undo data for multiArc

* Paste as Copy Command for XSheet

* Remove unneeded code

* Bug fix

* prevent guide lines from jumping around in MultiArc

* make stroke color consistent in MultiArc

* remove color in MultiArc's undo data

* make color consistent in MultiArc with previous version

* Fix single image raster levels

* fix compilation error

* fix a bug where multiArc might generate bugged stroke

* Remove ICONV dep (#3304)

* fix crash on saving studio palette

* Move to Paste Special Menu

* Don't Set Fixed Width if Docking a Floating Panel

* Update how_to_build_win.md

New draft of pr for requested changes to windows build instructions.

* fix geometric tool multiarc smooth option

* fix level saving failure

* fix wrong warning after saving palette

* fix a bug where moving a control point while holding alt has unintended result

* fix travis-install (#3389)

* Fix assert debug crash in flipconsole.cpp

Fix crash when using the viewer controls in the console (debug)

* Redraw Audio Waveform

Fills the waveform rather than outlines it.

* Update .gitignore

* fix undo data when drawing arc and mutliarc

* fix overwriting raster drawing palette (#3387)

* mode sensitive fx settings

* Create New Style Command Button (#3394)

* Create New Style Command Button

This PR creates a new button in the pallette editor that creates a new style.  Button is large and easy access for a faster and easier workflow.  Original code developed by Turtletooth for Tahoma.  Given permission to develop within Openoonz.

Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com>

* Update paletteviewergui.cpp

Made changes to the PR per request by Shun.

* Fixed a space within the code that wasn't suppose to be there.

Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>

* tahoma license (#3396)

* new style button optional

* fix loading pegbars (removing updateKeyframes)

* periodic random expression

* add fx in linear color space
this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd.
in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories.

* fractal noise iwa fx

* skip unnecessary icon invalidation

* fix frame range fill with tablet

* stop function editor to open by dbl clicking key

* Expanding the radius of the rotation handle.

This just changes when the cursor transforms into the rotation tool.

(cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39)

* fix vector img patern stroke style

* Update Stylesheets

- Support the new icon sizes
- XSheet and Timeline significantly redesigned
- Lots of margin fixes and refactoring
- Remove deprecated icons, as some icons are moved into binary
- New Light theme

* New Icons

- Redesigns almost every icon as symbolic
- Adds icons for most commands

* Add Option for Icon Themes

- Adds option for icon themes
- Removes useless label from Preferences category list

* Update Icon Functions

- Adds themePath() boolean
- Adds function for recoloring black pixels in pixmaps to any color
- Rebuilds createQIcon to use fromTheme() and recolorPixmap()
- Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon
- Removes a grey horizontal line drawn above the console play bar in the viewer

* Set Default Icon Theme and Paths

- Sets search paths for icons for use with QIcon::fromTheme()
- Sets default start icon theme on first install
- Sets flag for displaying icons in menus, so we can selectively hide them

* Set Icons for Commands

- Sets icons for the commands
- Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16
- Selectively allows icons to display for Tools in menus

* Change Icon Sizes, General Fixes and Stylesheet Additions

- Change icon sizes to new size
- Remove margin around FX Editor window
- Remove white line under color sliders in Style Editor
- Make keyframe icons uniform and color stylable in the stylesheets
- Removes deprecated stylesheet strings
- Redesign GUI for palette list view
- Make tree list header sort row stylable
- Remove black lines from scrollbars in New Project window
- Remove margin around combobox in Level Strip
- Alter how some lines are drawn in the Timeline to fix some alpha issues
- Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility
- Make text always viewable in the FPS field in console bar
- Increase size of radio buttons in Cleanup Settings
- Increase size of switches in motion path nodes
- Remove unessesary "Layer" label in Timeline and other rects
- Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more
- Moves some external stylesheet icons into binary

* Make TPanelTitleBar Icon States Stylable

- Makes icon states for TPanelTitleBar buttons stylable in stylesheets

* Travis Fixes

* Swap Startup Popup Logos

They were in the wrong folders

* Revert "Swap Startup Popup Logos"

This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d.

* Fix Startup Popup Logo

It wasn't switching

* Feedback Changes

- Change render visualization to clapboard
- Fix text contrast on levels in XSheet

* Make Cell Selection More Clear

* Darken Light Theme and Tint Empty Cell Selection

* Fix missing icons

* Fix memo button

* Bring back colors

* Hide Motion Tab

* Fix Play Range Area (Light)

Make play range area more visible

* Vector Column Color

Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com>
Co-authored-by: Kite <konero@users.noreply.github.com>
Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com>
Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
2020-08-31 12:51:22 -06:00
Jeremy Bullock
24ad08ec6c
Fix crash on toggling show style index (#124) 2020-08-19 08:56:24 -06:00
Jeremy Bullock
e736578c26
Make short play work universally (#105)
* Make short play work universally

* Take into account play markers

* Make shortplay ignore markers
2020-08-03 21:07:44 -06:00
Jeremy Bullock
7ce531ac30
OT Changes as of 7-26 (#104) 2020-07-27 21:16:51 -06:00
Jeremy Bullock
f5da61aa1b
OT changes as of 7/22 (#94) 2020-07-25 23:23:46 -06:00
manongjohn
08655aa21f
Display Default Palette (#95)
* Default Palettes

* Fix level detection at frame 1

* Add default/personal palettes location

* Add Personal Palettes category to Studio Palette Window

* Fix default palette comments

* Fix save default palette warning message
2020-07-25 22:51:26 -06:00
Jeremy Bullock
05ff19a19d
Remove Letter Ports (#87) 2020-07-13 21:41:44 -06:00
Jeremy Bullock
83c0cff6dc
Merge changes from OpenToonz as of 7-7 (#77)
* add multi arc mockup

* implement mutli arc

* add join and smooth option

* reset multiarc and arc when deactivated

* create self loop if the last point is the same as the first

* make join option in multiarc consistent with tape tool

* fix a bug where thickness don't affect mutliarc in vector level

* remove join option in geometric tool

* stop mutliarc after closing shape

* double click can also end multi arc

* fix a bug where multiArc will produce buggy stroke

* fix a bug where geometric tools is not deactivated

* add multiArc shortcut

* rewrite multiArc

* revert changes to tvectorimage

* add undo data for multiArc

* Paste as Copy Command for XSheet

* Remove unneeded code

* Bug fix

* prevent guide lines from jumping around in MultiArc

* make stroke color consistent in MultiArc

* remove color in MultiArc's undo data

* make color consistent in MultiArc with previous version

* Fix single image raster levels

* fix compilation error

* fix a bug where multiArc might generate bugged stroke

* Remove ICONV dep (#3304)

* fix crash on saving studio palette

* Move to Paste Special Menu

* Don't Set Fixed Width if Docking a Floating Panel

* Update how_to_build_win.md

New draft of pr for requested changes to windows build instructions.

* fix geometric tool multiarc smooth option

* fix level saving failure

* fix wrong warning after saving palette

* fix a bug where moving a control point while holding alt has unintended result

* fix overwriting raster drawing palette

* Hide color swatch on color 0

Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
2020-07-07 11:06:59 -06:00
Jeremy Bullock
133c867d93
Merge with core OpenToonz as of 7-5 (#73)
* add multi arc mockup

* implement mutli arc

* add join and smooth option

* reset multiarc and arc when deactivated

* create self loop if the last point is the same as the first

* make join option in multiarc consistent with tape tool

* fix a bug where thickness don't affect mutliarc in vector level

* remove join option in geometric tool

* stop mutliarc after closing shape

* double click can also end multi arc

* fix a bug where multiArc will produce buggy stroke

* fix a bug where geometric tools is not deactivated

* add multiArc shortcut

* rewrite multiArc

* revert changes to tvectorimage

* add undo data for multiArc

* Paste as Copy Command for XSheet

* Remove unneeded code

* Bug fix

* prevent guide lines from jumping around in MultiArc

* make stroke color consistent in MultiArc

* remove color in MultiArc's undo data

* make color consistent in MultiArc with previous version

* Fix single image raster levels

* fix compilation error

* fix a bug where multiArc might generate bugged stroke

* Remove ICONV dep (#3304)

* fix crash on saving studio palette

* Move to Paste Special Menu

* Don't Set Fixed Width if Docking a Floating Panel

Co-authored-by: pojienie <pojienie@gmail.com>
Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Rodney <rodney.baker@gmail.com>
2020-07-05 23:32:52 -06:00
Jeremy Bullock
b0b1772962
Grab Bag (#69) 2020-07-03 01:28:13 -06:00
Jeremy Bullock
89237c9196
Add Delete Frame Command to Level Strip (#60) 2020-06-30 10:16:47 -06:00
Jeremy Bullock
aed83334b2
Option to Hide Style Indexes (Hidden by default) (#54) 2020-06-19 21:11:29 -06:00
Jeremy Bullock
34cf4cc79f
Status Bar (#50)
* Status bar

* Status Bar Working
2020-06-15 02:27:26 -06:00
Jeremy Bullock
b817711ff2
Fix variety of panels (#48) 2020-06-12 00:11:25 -06:00
Jeremy Bullock
c04aa72cd3
Project Management Overhaul (#47)
* Redo Project Management  - Part 1

* Part 2

* Fix build

* Cleanup
2020-06-08 22:42:51 -06:00
Jeremy Bullock
8044d337b2
Changes by Konero (#45) 2020-06-04 22:40:15 -06:00
Jeremy Bullock
1cc5c4c01f
Time (#34)
* time label

* Add color info to fps slider
2020-06-01 22:55:58 -06:00
Jeremy Bullock
4b19ca95f2
Put back scan and cleanup (#13) 2020-05-27 00:38:36 -06:00
Jeremy Bullock
8bdf569e52 Scene viewer defaults 2020-05-24 16:00:44 -06:00
Jeremy Bullock
6b19431bd1 Fix palette 2020-05-24 02:37:30 -06:00
Jeremy Bullock
606afc272f
Function Editor Overhaul (#5) 2020-05-22 15:31:30 -06:00
Jeremy Bullock
68fa16d5ac Merge remote-tracking branch 'shun/g/current_column_color_for_function_editor' 2020-05-21 15:08:13 -06:00
shun-iwasawa
2ce475a92d use current column color for function editor 2020-05-21 16:47:52 +09:00
Jeremy Bullock
50d82d74ab
Rip it out (#2)
* Part 1

* Part 1

* Part 2
2020-05-18 18:34:29 -06:00
Jeremy Bullock
2a9c90549e Merge branch 'lip_sync' into tahoma 2020-05-17 09:05:26 -06:00
Jeremy Bullock
61fa797483 Fix lip sync extend to end 2020-05-16 22:24:15 -06:00
Jeremy Bullock
6573fc8ecc Add stop motion folder in shortcut popup 2020-04-30 13:54:36 -06:00
Jeremy Bullock
83d04e8b46 Frame slider and Play bar can be hidden separately 2020-04-14 14:00:48 -06:00
shun-iwasawa
0ed559b3ac curvesfx enhancement 2020-03-19 02:34:54 +09:00
shun-iwasawa
4c05e2b044 fix curvefx crash 2020-01-28 16:37:27 +09:00
shun-iwasawa
b373379e6e delete unused styles 2020-01-23 12:17:43 +09:00
shun-iwasawa
842f681285 fix studio palette hang up 2020-01-15 16:30:19 +09:00
shun-iwasawa
2a343cd8e2 fix style editor UI 2020-01-10 16:06:45 +09:00
shun-iwasawa
e12bfdc57a fix imagepainter bg color (#2921) 2019-12-05 11:44:50 -07:00
manongjohn
7f31502972 Block saving reserved file names 2019-12-02 23:59:36 -05:00
Rodney
83a3865c94
Merge pull request #2540 from manongjohn/add_flip_buttons
Add view modifier buttons to viewer control panel
2019-11-27 22:12:50 -06:00
Rodney
07a4704092
Merge pull request #2799 from martinvanzijl/move-curve-points-with-arrow-keys
Add ability to move curve points using arrow keys
2019-11-02 13:11:03 -07:00
manongjohn
8b1bbae35f Match command tree to default menu layout 2019-10-30 15:10:33 -04:00
manongjohn
eff652f361 Resolve OT master conflicts 2019-10-27 12:09:44 -04:00
Rodney
011361bdba
Merge pull request #2734 from manongjohn/keyframe_shortcuts
Add next/prev keyframe shortcuts
2019-10-19 11:31:31 -05:00
shun-iwasawa
76d093f2f4
Nonlinear Slider for the Brush Size Options (#2824)
* nonlinear slider for tool size

* nonlinear slider for finger magnet and pinch tools
2019-10-11 12:13:41 +09:00
manongjohn
77dd6e0d90 Add viewer modifier buttons to viewer control panel 2019-10-10 10:01:40 -04:00
manongjohn
c40ac590f5
Merge pull request #2175 from manongjohn/schematic_gesture_control
Schematic navigation enhancement
2019-10-01 16:07:23 -04:00
Rodney
b1dada5d17
Merge pull request #2786 from shun-iwasawa/g/add_swap_colors_button_to_gradient_fx
Add Swap Colors Button to Gradient Fxs
2019-09-20 17:46:09 -05:00
shun-iwasawa
a64bad4437
fix color field undo registration (#2787) 2019-09-20 18:32:30 +09:00
Martin van Zijl
9c03916708 Add ability to move curve points using arrow keys. 2019-09-20 13:57:20 +12:00
shun-iwasawa
cac18a8405 add swap colors button to gradient fx 2019-09-19 17:19:58 +09:00
shun-iwasawa
298c968d24
change step and type in function selection (#2754) 2019-09-10 19:07:56 +09:00
shun-iwasawa
875c7e58ec multi selection in function sheet column header 2019-09-06 19:05:41 +09:00
manongjohn
4be4bb9896 Add next/prev keyframe shortcuts 2019-08-26 23:55:22 -04:00
Rodney
bc1c45412d
Merge pull request #2711 from manongjohn/fix_schematic_spline_toggles
Fix schematic spline option icon zooming
2019-08-22 12:00:09 -05:00
shun-iwasawa
199e297326 translation fix and update 2019-08-22 12:42:06 +09:00
shun-iwasawa
260cd75f60 hide inbetween values in finction sheet 2019-08-21 17:33:34 +09:00
shun-iwasawa
e40777885d
Fix OpenGL widgets in floating panels disapper on room switch (#2684)
* fix floating gl window disappers on room switch
2019-08-19 17:18:25 +09:00
manongjohn
7b18ae0f39 Fix spline option icon zooming 2019-08-17 09:46:36 -04:00
manongjohn
07a2f0ea21 Merged in opentoonz master to resolve conflicts 2019-08-09 20:59:48 -04:00
shun-iwasawa
d74d26669d Merge remote-tracking branch 'origin' into otakuto-remove-tArrayCount-macro 2019-08-07 11:19:41 +09:00
Rodney
3ca92c27e4
Merge pull request #2655 from shun-iwasawa/display_cycle_in_function_sheet
Display Cycled Values in Function Editor Spread Sheet
2019-08-06 16:41:26 -05:00
shun-iwasawa
92d40c810b fix crash with visualization commands 2019-08-05 17:37:40 +09:00
shun-iwasawa
7a6807b001
Modify saving and restoring panels / popups geometries. (#2685)
* restore floating panel state

* save popup geometry in dtor
2019-08-02 19:18:00 +09:00
shun-iwasawa
fe2893b15c clang format 2019-08-02 15:48:26 +09:00
shun-iwasawa
31b6f77785 Merge branch 'remove-tArrayCount-macro' of https://github.com/otakuto/opentoonz into otakuto-remove-tArrayCount-macro 2019-08-02 15:47:17 +09:00
manongjohn
649b9abaec Palette switching behavior changes (#2518)
* Track and restore current style

* Auto switch to new style page

* Auto Switch to drag/drop-merged palette page

* Default to style 1 when returning to deleted style
2019-07-12 00:57:23 +09:00
shun_iwasawa
768e206cf8 display cycle in function sheet 2019-07-01 18:22:30 +09:00
manongjohn
b13816d1b0 Fx setting popup enhancements (#2479)
* Set min fx settings popup size

* Keep popup dimensions when frame changes

* Correct crash issue with keeping size between frames

* Update fx settings with node change

* Fix shrinking swatch size on empty fx

* Convert Fx Settings to dockable window

* Fixing Travis build error

* Replace FxSettingsPanel with DockWidget

* Set initial switch window dimensions

* Open popup in center of screen
2019-06-19 22:27:48 -06:00
manongjohn
4f0f61174e Viewer context menu additions (#2501) 2019-05-29 16:26:30 +09:00
manongjohn
2c447c1ed4 Image viewer gesture controls (#2500)
* Add gesture control to ImageViewer, PlaneViewer and SwatchViewer
2019-05-09 15:44:40 +09:00
manongjohn
0b7d7e407d Stop pan while zooming and other fixes 2019-01-17 18:20:19 -05:00
manongjohn
2d59e66990 Merge remote-tracking branch 'origin/master' into schematic_gesture_control 2019-01-09 01:18:26 -05:00
manongjohn
adae7d2881 Fix schematic group node display issue (#2403)
* Fix schematic group node display issue

* Fix scene infinitely updating
2018-12-27 10:51:57 +09:00
Tact Yoshida
1d7cf9a5bf Remove tArrayCount macro 2018-12-20 05:16:25 +09:00
shun-iwasawa
5b2332a085 New Fx: Text Fx Iwa (#2393)
* text fx iwa

* fix for osx and linux
2018-12-18 14:55:22 +09:00
shun-iwasawa
7846407b39 remove mysettings (#2366) 2018-11-16 18:28:38 +09:00
shun-iwasawa
102e065515 fix tapetool crash (#2352) 2018-11-04 22:37:12 -07:00
otakuto
6985407a96 remove duplicate include (#2271) 2018-10-31 12:00:01 +09:00
shun-iwasawa
cd46940982 New Feature : Adding Clapperboard (#2314)
* clapperboard

* fixed image item and added aspect ratio prop

* board -> clapperboard
2018-10-16 15:24:43 +09:00
otakuto
fb35734678 use nullptr instead of Q_NULLPTR (#2246) 2018-10-12 16:05:14 +09:00
shun-iwasawa
045b61c7fa schematic ui modification (#2241) 2018-09-11 14:43:03 +09:00
shun-iwasawa
21e83868df stage schematic multiple connect feature (#2196) 2018-08-01 15:30:42 +09:00
manongjohn
6b57d9c910 schematic zoom/pan logic update 2018-07-30 09:43:18 -04:00
manongjohn
3c9f8d8668 Fix cursor icon over schematic viewer buttons 2018-07-25 11:30:51 -04:00
manongjohn
71163fbd73 Merge OT master changes with conflicts resolved 2018-07-24 23:53:23 -04:00
manongjohn
d6e3cc2282 Schematic UI Update (#2034)
* Schematic UI update
2018-07-24 16:52:45 +09:00
manongjohn
6af3895f01 Fix stylus behavior with touch controls 2018-07-22 02:42:19 -04:00
manongjohn
188c309fd1 Travis build error fix 2018-07-20 08:14:54 -04:00
manongjohn
a99cb64467 Schematic navigation enhancement 2018-07-20 06:15:22 -04:00
shun-iwasawa
acfe755bb9 convert old level files to tlv (#2126) 2018-07-12 15:04:49 +09:00
manongjohn
a21b060921 Timeline UI Update (#1990)
* Timeline Display Updates and other fixes
2018-06-20 12:09:22 +09:00
shun-iwasawa
42cc6432f8 fix crash on save curve (#2044) 2018-06-08 14:53:28 +09:00
shun-iwasawa
e87e0815f7 Make More UI Texts Translatable (#2026)
* make ui texts translatable

* add more translatable texts

* load translate file for default commands
2018-06-04 12:18:43 +09:00
Jeremy Bullock
0a2e55d2c4 Reduce Footprint of Style Editor (#1622) 2018-05-24 15:59:57 +09:00
manongjohn
c43ee65303 Timeline column creation fix and changes (#1958) 2018-05-17 13:28:03 +09:00
Jeremy Bullock
4ce9539416 Function Editor Display Options (#1649)
* Function Editor Display Options
2018-03-22 16:32:19 +09:00
shun-iwasawa
59484bd446 edit all (#1870) 2018-03-21 17:23:25 -06:00
shun-iwasawa
133733bb6c enable to skip version check (#1824) 2018-03-14 16:58:55 +09:00
shun-iwasawa
388550d11d fix 3dlut crash (#1865)
close #1862
2018-03-14 15:32:28 +09:00