Commit Graph

1174 Commits

Author SHA1 Message Date
FeRD (Frank Dana)
acc2706484 Remove nonexistent example from cmake build 2019-08-13 17:26:06 -04:00
FeRD (Frank Dana)
8ab535fc96 Update ExampleHtml.cpp for QGuiApplication 2019-08-13 17:21:15 -04:00
FeRD (Frank Dana)
31ffe04ecb Merge branch 'qt-text-html-readers' of github.com:jeffski/libopenshot into pr-305 2019-08-13 12:59:35 -04:00
Jeff Shillitto
ada13ddebd Disable undo/redo stack 2019-08-13 22:17:49 +10:00
Jeff Shillitto
78f370ee14 Add ability to apply style sheet/css to format HTML 2019-08-13 22:11:55 +10:00
Jeff Shillitto
c8f2c08d34 Add authors to docs 2019-08-13 21:24:42 +10:00
Jeff Shillitto
745225ad62 Rename variable to font_size. Add docs for QApplication 2019-08-13 21:18:55 +10:00
FeRD (Frank Dana)
c7457e51d1 Build example executables correctly 2019-08-12 11:55:30 -04:00
FeRD (Frank Dana)
b2942f4125 ExampleHtml.cpp updates 2019-08-12 11:54:13 -04:00
FeRD (Frank Dana)
140b5fdad3 Add src/examples/ExampleHtml.cpp test program 2019-08-12 09:42:44 -04:00
FeRD (Frank Dana)
b90a83dd4c Fix documentation-comment formatting, for Doxygen 2019-08-12 09:39:26 -04:00
FeRD (Frank Dana)
0b3207dee7 Merge branch 'develop' into pr-305 2019-08-12 09:36:13 -04:00
Frank Dana
780d1ea630 Merge pull request #308 from SuslikV/patch-7
Disable debug logger on close
2019-08-12 07:48:30 -04:00
SuslikV
dfbcb4730b Disable debug logger on close
The logger can be closed from the external thread (openshot-qt), while
same logger instance is still in use in libopenshot.

This change prevents crash on attempts to use debug logger if it was
closed.

Co-authored-by: Frank Dana <ferdnyc@users.noreply.github.com>
2019-08-12 14:09:26 +03:00
Jeff Shillitto
482ad6b14c Tidy and remove duplicate include 2019-08-11 22:58:15 +10:00
Jeff Shillitto
3681121d81 Remove std namespace usage 2019-08-11 22:54:49 +10:00
Jeff Shillitto
dbd80926b2 General tidy up and code quality, consistency update 2019-08-11 22:06:34 +10:00
Frank Dana
4bb54b088f Merge pull request #301 from SuslikV/patch-6
Fix indentation in FFmpegUtilities.h
2019-08-10 11:56:12 -04:00
Frank Dana
9e8ce17d39 Merge pull request #297 from ferdnyc/hw-accel-doc
Update table in HW-ACCEL.md for Doxygen
2019-08-10 11:36:56 -04:00
SuslikV
59fe417141 Unify indentation of the code strings 2019-08-08 16:46:07 +03:00
Frank Dana
e95d18476c Merge pull request #293 from ferdnyc/zmq-cleanup
Remove "dummy" args from ZmqLogger stragglers
2019-08-06 22:39:13 -04:00
Frank Dana
05c21ae2d5 Merge pull request #298 from ferdnyc/fix-ffmpeg-filename-set
Fix truncated output filenames in FFmpegWriter
2019-08-06 13:26:00 -04:00
FeRD (Frank Dana)
5fb9755353 Fix truncated output filenames in FFmpegWriter 2019-08-06 11:59:55 -04:00
FeRD (Frank Dana)
fc76462292 Update table in HW-ACCEL.md for Doxygen
By using actual Unicode characters for the various ✔️ and  marks
in the table, Doxygen will format it properly.
Also:
- Changed to superscripted numerals, for the various callouts
- Reformatted notes into a corresponding ordered list
- Added invisible spaces after the marks without a callout, to
  balance centering
- Added center-alignment markers to appropriate table columns
2019-08-05 20:19:50 -04:00
FeRD (Frank Dana)
c77f009038 Remove "dummy" args from ZmqLogger stragglers
I somehow missed a few calls, in #266.
2019-08-04 16:06:54 -04:00