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
itsmattkc
9fad1efe1b
wrap otio classes in compiler definition
2021-04-02 15:29:17 +11:00
itsmattkc
0ee98a47ea
project: implemented autorecovery core
...
Not done yet, but nearly.
2021-04-01 13:10:43 +11:00
itsmattkc
fd6319b837
fixed regression from switching folder from outputs to inputs
2021-03-14 21:51:47 +11:00
itsmattkc
500fb58d49
arranged items so they are inputs of folder rather than outputs
2021-03-12 12:22:19 +11:00
itsmattkc
332c120c1f
initialize project version and fail if couldn't find
2021-02-21 09:53:02 +11:00
itsmattkc
e0e4e42096
corrected otio files
2021-02-18 13:21:16 +11:00
itsmattkc
4827782331
moved sequence params into node graph too
...
Reduces code by reusing more of the existing node infrastructure
to synchronize sequence parameters the render backend.
2021-02-18 13:20:23 +11:00
itsmattkc
d7c5ac4b44
implement entire project in nodes
...
Project items are now represented directly in nodes opening up more versatility and possibilities. This is the first iteration of this and will be buggy. Need to test thoroughly.
2021-02-15 21:31:57 +11:00
itsmattkc
d1a3e22eaa
fixed linux compilation issues
2021-01-31 10:39:14 +11:00
itsmattkc
ad4b83a098
new undo system
...
Also enables undoing when working with node input arrays
2021-01-29 16:10:34 +11:00
itsmattkc
88d1b86d11
bumped project version
2021-01-22 17:06:36 +11:00
itsmattkc
7849d6f3ff
corrections for non shared ptrs in OTIO code
2020-12-16 14:32:18 +11:00
itsmattkc
6cb6407bd8
don't use shared ptrs on streams
2020-12-16 13:46:19 +11:00
itsmattkc
e12013e2fb
don't use shared ptrs for project items
2020-12-16 10:28:43 +11:00
Thomas Wilshaw
0cf640fb09
Suppress unused variable warning.
2020-12-04 19:20:42 +00:00
ThomasWilshaw
a937238bd0
Merge branch 'master' into otio_improvments
2020-12-04 16:08:38 +00:00
itsmattkc
f8ceefff6c
don't use shared ptr on projects
...
Really unnecessary
2020-11-27 14:24:02 +11:00
itsmattkc
992b6eb952
added plural forms to translatable strings
...
Fixes #1421
2020-11-27 13:04:49 +11:00
ThomasWilshaw
a30d86f411
Merge branch 'master' into otio_transition
2020-11-18 18:27:30 +00:00
itsmattkc
5ff234de92
fixed uninitialized variable
2020-11-18 14:10:56 +11:00
itsmattkc
b3c3fe0fc8
merged video and audio nodes into a single media node
...
They performed exactly the same function so I don't think we need the clutter.
Also bumped the project version, but old projects are automatically converted.
2020-11-18 13:48:14 +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
Thomas Wilshaw
8433e4093a
Cleanup
2020-11-16 16:57:08 +00:00
itsmattkc