Commit Graph

33 Commits

Author SHA1 Message Date
Michael Pfaff fc97dcb334 Allow .jpeg files 2020-01-10 21:10:35 -05:00
Michael Pfaff b0d7c22c9e Resolves #1
Update to use PySide2 & Qt5
2019-12-05 12:27:26 -05:00
Martin Kaistra 5487319dc1 Merge branch 'tassaron2-master' 2017-05-25 18:43:21 +02:00
tassaron a9ddb86e53 rm unused variable 2017-05-23 20:03:33 -04:00
tassaron 8ddbe78128 rm duplicate code 2017-05-23 18:54:31 -04:00
tassaron a251be0cd4 select colors more easily using QColorDialog 2017-05-23 18:19:55 -04:00
Martin Kaistra 025a110005 try fixing problems with high dpi screens, font size for video in pixels 2017-05-23 21:24:58 +02:00
tassaron 431b9f6304 colors are configurable in the GUI
any invalid RGB tuple entered will result in white
2017-05-22 22:25:38 -04:00
tassaron 07644f0348 text and visualization colour can be changed using commandline 2017-05-22 19:42:32 -04:00
tassaron 4426b0e905 rm line that makes atexit raise an error
I don't notice any difference in behaviour without this line
2017-05-22 16:46:59 -04:00
Martin Kaistra 7a6a800714 add command line options for font size, alignment, position 2017-05-22 11:06:13 +02:00
Martin Kaistra f63c1c382d Merge branch 'master' into feature-commandline 2017-05-22 10:50:18 +02:00
tassaron e771992195 more loading feedback 2017-05-21 22:44:48 -04:00
tassaron 898ac591e3 added back in spaces deleted by my editor 2017-05-18 19:48:52 -04:00
tassaron ff818836dd added ability to use an mp4 as the background
might not be the best way to do this (dumping all the video frames to a temp location), but it works for clips of a few minutes or less
2017-05-18 19:14:27 -04:00
Martin Kaistra 03f6dcdc53 added font parameter, default values for settings, writing of settings file at clean up 2017-04-25 15:48:18 +02:00
Martin Kaistra 1a361388d0 do not require X server for command line mode 2017-04-25 10:28:04 +02:00
Martin Kaistra b74c267cf2 add new experimental command line mode 2017-04-24 15:53:59 +02:00
Martin Kaistra 23ba08397f Connect drawPreview events after input elements have values 2017-04-22 11:04:34 +02:00
Maximilian Siess 4aef5bfdb7 changed differentiater of text alignment from string to int 2017-04-21 01:00:17 +02:00
Maximilian Siess 81a20cd2e3 clean up 2017-04-20 20:21:11 +02:00
Maximilian Siess ca789ce766 all options are saved to and loaded from settings.ini 2017-04-20 19:48:51 +02:00
Maximilian Siess a170996259 added font size and text position to video thread 2017-04-20 19:25:34 +02:00
Maximilian Siess 8423d95820 added font size of text in preview 2017-04-20 19:01:19 +02:00
Maximilian Siess f639760ffc added x/y offset of text in preview 2017-04-20 18:47:14 +02:00
Maximilian Siess 153ba91231 added fontsize and position option to UI 2017-04-20 18:26:54 +02:00
Maximilian Siess ec502ce7e5 Matched the label to the naming scheme 2017-04-18 13:56:31 +02:00
Maximilian Siess 5d796c76b7 Alignment options added to render task 2017-04-18 13:46:24 +02:00
Maximilian Siess c772bf5583 Added text alignment option 2017-04-18 13:35:29 +02:00
Martin Kaistra 38cfae0b4e add setup.py, automatic discovery for avconv/ffmpeg, add installation help to readme 2015-03-05 15:58:45 +01:00
Martin Kaistra f08b23f261 don't terminate ffmpeg too early, fixes problems with windows. also: use matroska container instead of mp4 2015-03-04 11:54:29 +01:00
Martin Kaistra 8928d0345b move video creation to its own thread 2015-03-03 20:11:55 +01:00
Martin Kaistra 5e0ba19538 first commit 2015-03-02 22:47:52 +01:00