Commit Graph

28 Commits

Author SHA1 Message Date
Jonathan Thomas
a3ead041e0 Fixing caption regex to support numeric-only captions 2023-05-18 17:39:42 -05:00
Jonathan Thomas
89714b67b3 Small refactor to ensure that audio files have no image data - and allow videos below them to show through... 2023-04-16 01:50:11 -05:00
Jonathan Thomas
c34fa59b8f Switching Caption effect from font "Points" to "Pixels", so fonts are scaled correctly in High DPI environments. 2023-03-27 00:24:09 -05:00
Jonathan Thomas
9daf04f14e Take 2: Adjust caption scaling logic, to keep different resolution projects from having dramatically different font sizes. More debug code for Windows. 2023-03-26 23:22:12 -05:00
Jonathan Thomas
7095e4f8aa Adjust caption scaling logic, to keep different resolution projects from having dramatically different font sizes 2023-03-26 17:36:26 -05:00
Jonathan Thomas
c250151c33 Adjust Caption margins and fix unit tests, which have changed the text position. Adding Debug output to unit test for Windows troubleshooting. 2023-03-25 18:10:33 -05:00
Jonathan Thomas
301279aca4 Fix Caption font size to no longer scale with preview window scale - and instead scale it with the screen devicePixelRatio (to support High DPI screens). Also change the default font size to a little smaller, and wider margins 2023-03-24 22:57:14 -05:00
Jonathan Thomas
450af52f64 WIP: Experimental Unit Tests without Display (#900)
* Experimental test for unit tests without display

* Ignore unit tests running on an invalid QT Platform (i.e. offscreen - running as a test on GitHub)

* Fix whitespace on Caption effect

* Check for env variable for QT_QPA_PLATFORM == offscreen, and ignore Caption unit tests (for GitHub checks)
2023-02-14 01:44:38 -06:00
Jonathan Thomas
06c140c23c Improvement to Caption effect, including Caption unit-tests, and the following fixes:
- improved regex, which now detects lines without blank lines separating them, and detects captions that start with numbers
- line wrapping fixed for languages that don't use spaces
- forced line wrapping of long strings of characters
2023-02-10 15:14:10 -06:00
jackson
c023d29bed Allow intentional line breaks 2022-09-22 01:30:06 -05:00
Jonathan Thomas
fd1043be5a Fixing many caption related issues:
- background color now sticks to the text
- background border now scales correctly (at different resolutions)
- background padding now scales correctly
- stroke size now scales correctly
- margins are now defaulted to 15% on left/right
- text caption area now centers between available left/right margins
- background color can now be faded in and out, animated
- new property: line_spacing, a % from 1.0 (100%) to affect how much space are between lines
- Use each font's default lineSpacing, instead of a fixed distance between lines. This property can be adjusted with the new line_spacing keyframe.
2022-08-23 23:21:38 -05:00
Jonathan Thomas
f81f620c2a Merge pull request #732 from ferdnyc/crop-qpainter
Rewrite Crop effect using QPainter
2021-10-29 13:17:38 -05:00
Frank Dana
59138ea3e4 Adopt license management via Reuse project/tool (#711)
* reuse-managed license/copyright headers

reuse is a tool for compliance with the REUSE recommendations. See
<https://reuse.software/> for more information, and
<https://reuse.readthedocs.io/> for the online documentation.

* Set jsoncpp license
* Add MIT license for Decklink sources
* Explicitly license examples/
  - Add headers to source files
  - Change blanket licensing in .reuse/dep5 to only cover binary media
  - Import CC-BY-3.0 license and assign to sintel_trailer
2021-10-16 01:26:26 -04:00
Frank Dana
90a726a6dd Merge branch 'develop' into crop-qpainter 2021-09-27 00:42:00 -04:00
Jonathan Thomas
c128b6caf1 Protecting a caption effect with no Clip (i.e. effect added directly to timeline) 2021-09-22 16:09:20 -05:00
FeRD (Frank Dana)
42e7049e6d Cleanup includes to reflect actual dependencies 2021-09-18 08:37:22 -04:00
Brenno
466755e526 Merge remote-tracking branch 'origin/develop' into effect-parenting 2021-05-11 12:44:38 -03:00
Frank Dana
6a004ed919 Fix counting of points for color effects (#666) 2021-05-06 14:27:52 -04:00
Brenno
013a61bab9 Renamed "Parent Effect ID" to "Parent" 2021-03-26 21:10:10 -03:00
Brenno
67895f7c23 Added support to set an effect's properties by it's parent effect 2021-02-04 16:11:27 -03:00
Frank Dana
dbaac4debd Merge branch 'develop' into frac-python-types 2021-01-27 03:50:45 -05:00
FeRD (Frank Dana)
2f3615f706 Move Exceptions.h includes to .cpp files 2021-01-26 10:52:04 -05:00
FeRD (Frank Dana)
fe391e9240 various: Tidy up some includes 2020-11-21 15:19:08 -05:00
Jonathan Thomas
a3c20c8f44 Fixed a few codacy issues 2020-10-27 02:50:02 -05:00
Jonathan Thomas
54a070438a - Added default caption value, for demonstration purposes (to help users see a valid example)
- Append some newlines onto the end of any caption text... needed by the regex for some reason
- Updated font name and caption text to be a new type (font and caption), and we have corresponding UI changes for those on openshot-qt
2020-10-22 01:32:33 -05:00