Commit Graph
58 Commits
Author SHA1 Message Date
Mike-Solar 21d5ed5f59 完善测试 2026-01-05 04:02:05 +08:00
Mike Solar 6fdfd03ffd update: update copyright 2025-08-05 17:12:49 +08:00
Mike Solar 74f73ab3be change: change code style to Linux style except indent. 2025-08-03 03:09:40 +08:00
itsmattkc 7ec8a4dd7e serializer: ensure backwards compatibility 2023-02-26 15:42:54 -08:00
itsmattkc 46d15396a6 Merge branch 'track-redux' into move-serialization 2023-02-23 11:09:45 -08:00
itsmattkc 48a7172ea3 timeline: fixed undo issue with slide tool
Fixes #2132
2023-02-21 18:22:23 -08:00
itsmattkc 028651f9fb moved serialization 2023-02-21 14:26:34 -08:00
itsmattkc 11e4e051c3 move undo files around for better organization 2023-02-20 16:09:22 -08:00
itsmattkc dd9c52ab59 start moving core frameworks to external libraries 2023-01-19 09:51:47 -08:00
itsmattkc 02ee079bde timelinemarker: fixed issue with undoing resized markers 2022-09-16 11:28:03 -07:00
itsmattkc 571be3d28d timeline: added thumbnail modes that affect how much is rendered 2022-09-06 16:06:26 -07:00
itsmattkc 46be693b3e timeline: show marker text even on markers without range 2022-07-19 11:21:06 -07:00
itsmattkc 079d6beff2 timeline: separate markers and workarea 2022-06-27 23:39:31 -07:00
itsmattkc 7c12b6dc16 updates for C++17 2022-05-11 10:50:47 -07:00
itsmattkc 4b366a9b73 update copyright year to 2022 2022-05-10 10:38:56 -07:00
itsmattkc 0f99d8a662 timeruler: add ability to resize markers and workarea 2022-05-09 17:53:21 -07:00
itsmattkc 91b761693b code: use config macro
Macro is much easier to use and more readable
2022-05-04 09:50:34 -07:00
itsmattkc 5441f2f9a4 markeraddcommand: removed unused members 2022-05-02 00:35:43 -07:00
itsmattkc 059331c295 markerremovecommand: removed unused members 2022-05-02 00:26:11 -07:00
itsmattkc e6d4fe43de reworked and vastly improved snapping subsystem 2022-05-02 00:01:49 -07:00
itsmattkc f7396de121 markers: reimplemented copy/paste 2022-05-01 22:33:58 -07:00
itsmattkc 6a0b5856c9 various: extended marker and timeline functionality 2022-05-01 21:17:22 -07:00
itsmattkc cdcd83c09a ported seekablewidget to timebasedview
Cuts down on a lot of code duplication and opens up usage of the new TimelineViewSelectionManager framework
2022-05-01 15:45:20 -07:00
Thomas Wilshaw fed62246e6 Move marker load/save code to Serializer and fix build issues. Copy/paste not working 2022-01-30 13:36:11 +00:00
ThomasWilshaw 02b9a38737 Merge branch 'master' into marker 2022-01-28 22:30:29 +00:00
itsmattkc 4ecce20c35 start implementing serializers 2022-01-12 08:48:31 -08:00
Thomas Wilshaw c8552ad184 Make moving a marker undoable 2021-10-22 22:15:56 +01:00
Thomas Wilshaw 87b66e0cbb Make renaming markers undoable 2021-10-22 22:15:56 +01:00
Thomas Wilshaw 374b97b6a5 Add default marker color to config 2021-10-22 22:15:53 +01:00
Thomas Wilshaw 76e55a857f Make markers copy/paste-able 2021-10-22 22:15:52 +01:00
Thomas Wilshaw d8101869b9 Redo marker selection code 2021-10-22 22:15:51 +01:00
Thomas Wilshaw ca807b7b66 Marker color is saved to .ove file 2021-10-22 22:15:50 +01:00
Thomas Wilshaw 575ce39696 Move color to TimelineMarker and make sure all instances of a marker update on color change 2021-10-22 22:15:50 +01:00
itsmattkc 618ecacccd use highlight instead
I think it should be highlight
2021-08-16 17:51:20 -07:00
Pablo Gil 6d9ba1ed7f make PlayHead stylable, using Link color which looks better to me (Highlight color might work as well) 2021-08-16 17:45:45 +02:00
itsmattkc 597f35bd00 marker: actually add marker after loading it
Fixes #1632
2021-05-16 10:36:52 +10:00
itsmattkc 77d4b18a60 updated copyright year for 2021 [skip ci] 2021-04-17 18:56:50 +10:00
itsmattkc f7883bd02c began some rewrites to timeline drawing 2021-01-14 10:30:20 +11:00
itsmattkc 8f729203fc some timeline refactoring, preparing for rewrites 2021-01-09 11:41:33 +11:00
itsmattkc 181235f6ce began new infrastructure
Yep, this is another one of my "famous" sweeping rewrites. Expect things to break.

Goals for this are:
- Greatly simplify node connections (particularly with arrays) so the code requires less maintenance/is more stable
- Redesign node structure to address issues where UI would stall for lengthy periods of time
- Less reliance on shared ptrs/greater reliance on QObject system for inheritance/memory management
- General code cleanup and improvements
2021-01-05 11:20:38 +11:00
itsmattkc 75d4cd899b use hardcoded namespace
The macro defined namespaces confused the hell out of lupdate and more or less broke translations permanently. Looks like the only way we can do it is to have a hardcoded namespace, which goes against my instinct, but honestly how likely is it that we'll change the namespace anyway (I guess forks might want to do it, but that's their problem ;) )
2020-11-17 20:24:42 +11:00
itsmattkc d241090a9f finally updated the copyright year 2020-11-17 20:13:22 +11:00
itsmattkc 81c98e1026 timeline: made markers undoable 2020-11-16 08:58:51 +11:00
itsmattkc 917738d1de Merge branch 'master' into otio 2020-10-22 20:26:16 +11:00
itsmattkc db8d321fa7 project: improved loading and footage importing 2020-10-19 14:41:01 +11:00
itsmattkc 2fb7066155 nodes: allow stalling graph signals until an operation is over 2020-10-02 13:25:49 +10:00
itsmattkc 86b66004b0 ui: removed last of the widget proxies 2020-07-23 23:11:00 +10:00
itsmattkc 023ded1fb5 timeline: overhauled pointer tool again
Allows dynamic switching between pointer/roll/slide since occasionally this
behavior is interchangeable. Fixes a lot of transition behavior (but not
all of it).
2020-07-23 18:37:57 +10:00
itsmattkc b28413a2af timelineworkarea: fixed bug where loaded projects would always have an enabled workarea 2020-06-12 23:25:44 +10:00
itsmattkc dc57e8cffe timelineworkarea: initialize enabled value to false
I'm honestly surprised we made it this far without this being a problem.
2020-06-01 04:46:10 +10:00