Commit Graph

976 Commits

Author SHA1 Message Date
Jeff Shillitto
5a08afdb3f Set info.vcodec to QImage 2019-08-14 22:18:26 +10:00
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)
5b4bfa8e41 Remove mentions of nonexistent InitFileInfo() 2019-08-12 12:00:18 -04: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
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
FeRD (Frank Dana)
c4126aef2c Bindings: Apply #defines for optional libs
The resetting of `CMAKE_SWIG_FLAGS` to the empty string in the bindings'
CMakeLists.txt files was clearing away the definitions for things like
`USE_IMAGEMAGICK` and `USE_BLACKMAGIC`, causing the bindings to be built
_without_ those classes even if they're available in the library.
2019-08-11 12:49:42 -04: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
FeRD (Frank Dana)
141e6ba61e Use std::stoll to convert JSON values 2019-08-10 11:31:08 -04:00
FeRD (Frank Dana)
76fc1ef571 QtImageReader: Safer ReSVG file extension checks
This changes the type of the private `path` variable to QString
internally (which we were converting it to for a bunch of operations
anyway), and uses QString's more robust string-manipulation and
comparison methods to ensure that only filenames that _end in_ an
.svg/.svgz extension (case-insensitively) are recognized as SVG files.

Previously, a filename such as "Title.svg.png" would be interpreted as
an SVG file.

The change in QString type is purely internal, all of the class's
interfaces remain the same, and accept `std::string path`. We simply
convert it to/from QString at opposite places in the code, now.
2019-08-09 20:50:28 -04: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
FeRD (Frank Dana)
5fb9755353 Fix truncated output filenames in FFmpegWriter 2019-08-06 11:59:55 -04:00
FeRD (Frank Dana)
066e2558ee AudioResampler: Add juce:: prefixing 2019-08-05 03:52:15 -04:00
FeRD (Frank Dana)
9ba18d678f std:: prefixing for Example.cpp 2019-08-05 02:54:59 -04:00
FeRD (Frank Dana)
201a59ae98 Merge branch 'std-strings' into std-prefixes 2019-08-05 02:30:15 -04:00