Commit Graph
111 Commits
Author SHA1 Message Date
itsmattkc 576ea8e81f refactored copy/paste code for new serializers
Vastly improves code quality and reusability
2022-01-12 16:34:40 -08:00
itsmattkc 4ecce20c35 start implementing serializers 2022-01-12 08:48:31 -08:00
itsmattkc 8373a7ea96 loadotio: minor UI tweaks 2022-01-08 11:57:30 -08:00
itsmattkc 9264a2f856 Merge pull request #1330 from ThomasWilshaw/OTIO_load
OTIO load
2022-01-07 19:35:38 -08:00
Thomas Wilshaw da00d94b60 Fix string creation 2022-01-07 01:24:29 +00:00
Thomas Wilshaw 764c7bb088 Add tr to string and fix variable name 2022-01-07 01:20:38 +00:00
Thomas Wilshaw 5624b03e65 Merge branch 'OTIO_load' of https://github.com/ThomasWilshaw/olive into OTIO_load 2022-01-07 00:03:34 +00:00
Thomas Wilshaw 836903cbe9 Fix PR comments 2022-01-07 00:02:46 +00:00
itsmattkc 3960f54e9c code: moved project version related variables to project class 2022-01-06 12:50:40 -08:00
ThomasWilshaw b865bfa963 Merge branch 'master' into OTIO_load 2022-01-06 13:56:08 +00:00
itsmattkc 38372791f6 Merge pull request #1806 from ThomasWilshaw/otio_save_track_length
saveotio: Make sure all tracks are the same length
2022-01-03 13:16:05 -08:00
itsmattkc 9d5ec1e60f Merge branch 'node-view-show-ctx' 2022-01-02 12:15:55 -08:00
Thomas Wilshaw b6e6b89461 saveotio: Make sure all tracks are the same length 2021-12-19 16:38:29 +00:00
itsmattkc ab42396c26 Merge pull request #1797 from ThomasWilshaw/otio_save_fix
saveotio: Fix external reference available media
2021-12-10 19:21:45 -08:00
Thomas Wilshaw b2b28344f4 saveotio: Use correct frame rates
available_range is the total length of the source clip and is stored
using the same frame rate as the source clip.

source_range is the length of the clip in the timeline and so is
stored using the sequence frame rate.
2021-12-10 22:25:42 +00:00
Thomas Wilshaw dcaf34c69d saveotio: Use qIsNan rather than comparison 2021-12-10 17:34:51 +00:00
Thomas Wilshaw 516c5cb3b1 saveotio: Use built in function and check for NaN 2021-12-10 16:46:21 +00:00
itsmattkc 1828c2fd73 otio: update to be v0.14 compliant 2021-12-01 15:41:05 -08:00
Thomas Wilshaw cb0ebb24a4 saveotio: Fix external reference available media 2021-11-25 13:18:01 +00:00
itsmattkc a6af473f53 reimplemented node positioning and deleting 2021-11-17 12:09:41 -08:00
Thomas Wilshaw 90a0077c02 Fix uninitialized memory build error
Join Sequences and timelines together in a QMap for simpler code.
2021-11-15 15:10:26 +00:00
Thomas Wilshaw dc11358b85 loadotio: Update loading bar 2021-11-09 14:50:34 +00:00
Thomas Wilshaw 04a0b6024e otioload: Add simple dialog to change settings
Adds a table of sequences in the OTIO file and allows the settings to
be changed. The dialog takes a list of sequences and relies on each
OTIO timeline having a unique name.

The dialog has to be called from the main thread so there is a wrapper
function in Core.
2021-11-09 14:44:51 +00:00
itsmattkc a77166c833 fixed otio issue 2021-09-20 21:12:44 -07:00
itsmattkc cb5d776dab Merge pull request #1562 from ThomasWilshaw/otio_merge_fixes
Fixes for OTIO merges
2021-08-24 19:26:35 -07:00
Thomas Wilshaw 64a3cb5c84 Replace undo commands with non undoable functions. 2021-08-17 13:13:02 +01:00
itsmattkc 9dad2ef104 transitiontool: updated 2021-08-16 21:28:13 -07:00
Thomas Wilshaw 850b75fe24 Transitiosn and gaps are now added. Also removed unnecessary code 2021-08-07 15:06:50 +01:00
Thomas Wilshaw 1d2341245b Correctly add footage nodes and setup contexts. 2021-08-07 14:30:15 +01:00
itsmattkc 6995ffe015 reworked timeline elements 2021-08-01 11:05:18 -07:00
Thomas Wilshaw 2bdd5a3707 Update to master 2021-07-28 15:52:24 +01:00
Thomas Wilshaw c86b7f6185 Make sure Olive doesn't overwrite OTIO files. 2021-07-28 15:15:01 +01:00
Thomas Wilshaw 332351d1d9 Move FolderAddChild to correct place to avoid duplicates 2021-07-28 15:15:01 +01:00
Thomas Wilshaw 0154cfc1c2 Place footage into its own folder 2021-07-28 15:15:00 +01:00
Thomas Wilshaw 79b9d0b26b Fix shadow variable. 2021-07-28 15:14:59 +01:00
Thomas Wilshaw 5b2d889a4c Add footage to root folder and set labels correctly. 2021-07-28 15:14:59 +01:00
itsmattkc 52c5617159 undo: wrapped redo/undo functions to ensure prepare is called 2021-07-17 00:14:24 -07:00
itsmattkc c41047ab02 timeline: reorganized undo commands
Split commands between several files rather than having them all in two monolithic ones.
2021-07-16 01:38:20 -07:00
itsmattkc e2bbff5078 bump project version 2021-05-28 17:57:38 +10:00
itsmattkc 269fa6d905 remove block enum
Replaced with dynamic casts.
2021-04-22 11:50:24 +10:00
itsmattkc 77d4b18a60 updated copyright year for 2021 [skip ci] 2021-04-17 18:56:50 +10:00
itsmattkc 2798737c19 import: don't check for image sequences if there are no video params 2021-04-13 15:45:47 +10:00
Simran fca485bd69 Fix plural handling for translations (#1424)
* .arg() doesn't handle plurals, replace %1 with %n and pass number to tr(), but only if there is an accompanying word for that we want singular/plural translations and only for whole numbers.

* Qt's translation methods only accept integers and we don't know what grammatical number form would be correct for floating-point numbers in different languages anyway.

* Add optional 2nd argument to SliderBase::SetFormat() to activate deferred plural handling:
  SetFormat(QT_TRANSLATE_N_NOOP("olive::SliderBase", "%n unit(s)"), true)

* Generate en_US.ts with lupdate's -pluralonly option. Only source strings that require plural handling need to be translated (as long as the source language is American English).
2021-04-13 00:58:46 +02:00
itsmattkc 72669761a7 project: fix bug importing folders 2021-04-10 13:22:42 +10:00
itsmattkc b22c2f48ff Merge branch 'otio_improvments' of https://github.com/ThomasWilshaw/olive into ThomasWilshaw-otio_improvments 2021-04-10 11:07:51 +10:00
itsmattkc d7557f8e74 Merge branch 'otio_transition' of https://github.com/ThomasWilshaw/olive into ThomasWilshaw-otio_transition 2021-04-10 10:55:49 +10:00
itsmattkc ff9e9eb90b fixed qt assert when importing files 2021-04-08 12:42:09 +10:00
itsmattkc cb75e37e77 moved several files around
Mostly moved classes that became node derivatives into the node/ folder.
2021-04-08 12:15:59 +10:00
itsmattkc 898ea25e89 finished merge of viewer and footage 2021-04-06 13:08:56 +10:00
itsmattkc 4066fcba90 began merging footage and viewer 2021-04-05 16:41:37 +10:00