aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed Scaling BugsDH42017-05-272-11/+11
* Added automatic scaling of Image and bars. Set title x/y position, and font s...DH42017-05-274-25/+35
* Removed hardcoded parameters. Defaults loaded at runtime.DH42017-05-263-10/+237
* Merge branch 'tassaron2-master'Martin Kaistra2017-05-255-27/+195
|\
| * improved color button ui xmltassaron2017-05-251-73/+85
| * rm unused variabletassaron2017-05-231-5/+3
| * rm duplicate codetassaron2017-05-231-15/+5
| * select colors more easily using QColorDialogtassaron2017-05-232-2/+47
| * colors are configurable in the GUItassaron2017-05-223-18/+100
| * text and visualization colour can be changed using commandlinetassaron2017-05-224-21/+62
| * make sure tempfiles get deletedtassaron2017-05-221-0/+1
| * rm line that makes atexit raise an errortassaron2017-05-221-1/+0
* | Merge branch 'feature-hdpi'Martin Kaistra2017-05-253-10/+108
|\ \ | |/ |/|
| * try fixing problems with high dpi screens, font size for video in pixelsMartin Kaistra2017-05-233-10/+108
|/
* Merge branch 'feature-commandline'Martin Kaistra2017-05-221-6/+95
|\
| * add command line options for font size, alignment, positionMartin Kaistra2017-05-221-4/+24
| * Merge branch 'master' into feature-commandlineMartin Kaistra2017-05-225-29/+104
| |\ | |/ |/|
* | Merge pull request #13 from tassaron2/mastermartin2017-05-225-29/+104
|\ \
| * | more loading feedbacktassaron2017-05-213-6/+18
| * | fixed preview not updating when changing between two videostassaron2017-05-211-1/+1
| * | added back in spaces deleted by my editortassaron2017-05-182-6/+5
| * | added back in spaces deleted by my editortassaron2017-05-181-10/+10
| * | added ability to use an mp4 as the backgroundtassaron2017-05-184-34/+98
|/ /
| * added font parameter, default values for settings, writing of settings file a...Martin Kaistra2017-04-251-7/+16
| * do not require X server for command line modeMartin Kaistra2017-04-251-1/+1