diff -Nru shotcut-16.07.01/debian/changelog shotcut-17.01.01/debian/changelog --- shotcut-16.07.01/debian/changelog 2016-07-02 19:29:20.000000000 +0000 +++ shotcut-17.01.01/debian/changelog 2017-01-07 09:41:33.000000000 +0000 @@ -1,3 +1,39 @@ +shotcut (17.01.01-1) xenial; urgency=medium + + * New release: 17.01.01 + + -- Harald Hvaal Sat, 07 Jan 2017 10:40:59 +0100 + +shotcut (16.12.03-1) xenial; urgency=medium + + * New elease: 16.12.03 + + -- Harald Hvaal Sun, 04 Dec 2016 11:35:13 +0100 + +shotcut (16.11.02-1) xenial; urgency=medium + + * New release: 16.11.02 + + -- Harald Hvaal Sat, 05 Nov 2016 18:01:02 +0100 + +shotcut (16.10.01-1) xenial; urgency=medium + + * New release: 16.10.01 + + -- Harald Hvaal Sat, 08 Oct 2016 08:27:52 +0200 + +shotcut (16.09.01-1) xenial; urgency=medium + + * New release: 16.09.01 + + -- Harald Hvaal Sun, 04 Sep 2016 17:03:01 +0200 + +shotcut (16.08.02-1) xenial; urgency=medium + + * New release: 16.08.02 + + -- Harald Hvaal Thu, 04 Aug 2016 06:55:29 +0200 + shotcut (16.07.01-1) xenial; urgency=medium * New release: 16.07.01 Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/bin/ffmpeg and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/bin/ffmpeg differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/bin/ffplay and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/bin/ffplay differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/bin/ffprobe and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/bin/ffprobe differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/bin/melt and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/bin/melt differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/bin/qmelt and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/bin/qmelt differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/bin/shotcut and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/bin/shotcut differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/3dflippo.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/3dflippo.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/addition_alpha.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/addition_alpha.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/addition.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/addition.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/alpha0ps.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/alpha0ps.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/alphaatop.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/alphaatop.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/alphagrad.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/alphagrad.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/alphainjection.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/alphainjection.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/alphain.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/alphain.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/alphaout.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/alphaout.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/alphaover.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/alphaover.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/alphaspot.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/alphaspot.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/alphaxor.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/alphaxor.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/balanc0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/balanc0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/baltan.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/baltan.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/bgsubtract0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/bgsubtract0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/blend.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/blend.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/bluescreen0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/bluescreen0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/brightness.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/brightness.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/B.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/B.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/burn.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/burn.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/bw0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/bw0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/c0rners.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/c0rners.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/cairoaffineblend.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/cairoaffineblend.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/cairoblend.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/cairoblend.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/cairogradient.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/cairogradient.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/cairoimagegrid.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/cairoimagegrid.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/cartoon.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/cartoon.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/cluster.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/cluster.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/colgate.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/colgate.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/coloradj_RGB.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/coloradj_RGB.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/colordistance.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/colordistance.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/colorhalftone.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/colorhalftone.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/colorize.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/colorize.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/color_only.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/color_only.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/colortap.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/colortap.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/composition.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/composition.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/contrast0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/contrast0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/curves.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/curves.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/d90stairsteppingfix.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/d90stairsteppingfix.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/darken.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/darken.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/defish0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/defish0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/delay0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/delay0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/delaygrab.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/delaygrab.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/difference.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/difference.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/distort0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/distort0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/dither.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/dither.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/divide.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/divide.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/dodge.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/dodge.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/edgeglow.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/edgeglow.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/emboss.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/emboss.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/equaliz0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/equaliz0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/flippo.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/flippo.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/gamma.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/gamma.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/glitch0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/glitch0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/glow.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/glow.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/grain_extract.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/grain_extract.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/grain_merge.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/grain_merge.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/G.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/G.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/hardlight.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/hardlight.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/hqdn3d.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/hqdn3d.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/hueshift0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/hueshift0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/hue.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/hue.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/IIRblur.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/IIRblur.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/invert0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/invert0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/ising0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/ising0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/keyspillm0pup.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/keyspillm0pup.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/lenscorrection.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/lenscorrection.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/letterb0xed.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/letterb0xed.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/levels.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/levels.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/lighten.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/lighten.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/lightgraffiti.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/lightgraffiti.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/lissajous0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/lissajous0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/luminance.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/luminance.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/mask0mate.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/mask0mate.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/medians.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/medians.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/multiply.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/multiply.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/ndvi.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/ndvi.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/nervous.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/nervous.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/nois0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/nois0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/nosync0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/nosync0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/onecol0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/onecol0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/overlay.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/overlay.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/partik0l.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/partik0l.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/perspective.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/perspective.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/pixeliz0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/pixeliz0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/plasma.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/plasma.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/posterize.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/posterize.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/pr0be.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/pr0be.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/pr0file.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/pr0file.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/primaries.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/primaries.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/rgbnoise.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/rgbnoise.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/rgbparade.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/rgbparade.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/RGB.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/RGB.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/rgbsplit0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/rgbsplit0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/R.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/R.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/saturat0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/saturat0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/saturation.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/saturation.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/scale0tilt.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/scale0tilt.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/scanline0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/scanline0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/screen.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/screen.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/select0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/select0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/sharpness.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/sharpness.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/sigmoidaltransfer.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/sigmoidaltransfer.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/sobel.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/sobel.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/softglow.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/softglow.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/softlight.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/softlight.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/sopsat.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/sopsat.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/spillsupress.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/spillsupress.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/squareblur.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/squareblur.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/subtract.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/subtract.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/tehroxx0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/tehroxx0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/test_pat_B.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/test_pat_B.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/test_pat_C.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/test_pat_C.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/test_pat_G.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/test_pat_G.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/test_pat_I.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/test_pat_I.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/test_pat_L.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/test_pat_L.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/test_pat_R.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/test_pat_R.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/threelay0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/threelay0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/three_point_balance.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/three_point_balance.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/threshold0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/threshold0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/timeout.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/timeout.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/tint0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/tint0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/transparency.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/transparency.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/twolay0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/twolay0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/uvmap.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/uvmap.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/value.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/value.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/vectorscope.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/vectorscope.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/vertigo.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/vertigo.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/vignette.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/vignette.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/frei0r-1/xfade0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/frei0r-1/xfade0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavcodec.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavcodec.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavcodec.so.57 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavcodec.so.57 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavcodec.so.57.24.102 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavcodec.so.57.24.102 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavdevice.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavdevice.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavdevice.so.57 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavdevice.so.57 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavdevice.so.57.0.101 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavdevice.so.57.0.101 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavfilter.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavfilter.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavfilter.so.6 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavfilter.so.6 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavfilter.so.6.31.100 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavfilter.so.6.31.100 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavformat.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavformat.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavformat.so.57 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavformat.so.57 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavformat.so.57.25.100 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavformat.so.57.25.100 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavutil.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavutil.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavutil.so.55 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavutil.so.55 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libavutil.so.55.17.103 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libavutil.so.55.17.103 differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/libepoxy.la shotcut-17.01.01/Shotcut.app/lib/libepoxy.la --- shotcut-16.07.01/Shotcut.app/lib/libepoxy.la 2016-07-01 09:04:38.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/libepoxy.la 2017-01-02 10:07:00.000000000 +0000 @@ -1,5 +1,5 @@ # libepoxy.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11 +# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -38,4 +38,4 @@ dlpreopen='' # Directory that this library needs to be installed in: -libdir='/root/BuildAgent/work/ef55b932ce3c3e94/shotcut/Shotcut/Shotcut.app/lib' +libdir='/root/shotcut/shotcut/Shotcut/Shotcut.app/lib' Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libepoxy.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libepoxy.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libepoxy.so.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libepoxy.so.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libepoxy.so.0.0.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libepoxy.so.0.0.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libexif.so.12 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libexif.so.12 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libfftw3.so.3 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libfftw3.so.3 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libgsm.so.1 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libgsm.so.1 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libicudata.so.52 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libicudata.so.52 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libicudata.so.54 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libicudata.so.54 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libicudata.so.54.1 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libicudata.so.54.1 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libicui18n.so.52 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libicui18n.so.52 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libicui18n.so.54 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libicui18n.so.54 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libicui18n.so.54.1 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libicui18n.so.54.1 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libicuuc.so.52 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libicuuc.so.52 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libicuuc.so.54 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libicuuc.so.54 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libicuuc.so.54.1 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libicuuc.so.54.1 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmlt.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmlt.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmlt++.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmlt++.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmlt++.so.3 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmlt++.so.3 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmlt.so.6 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmlt.so.6 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmlt.so.6.3.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmlt.so.6.3.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmlt++.so.6.3.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmlt++.so.6.3.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmlt.so.6.5.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmlt.so.6.5.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmlt++.so.6.5.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmlt++.so.6.5.0 differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/libmovit.la shotcut-17.01.01/Shotcut.app/lib/libmovit.la --- shotcut-16.07.01/Shotcut.app/lib/libmovit.la 2016-07-01 09:07:38.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/libmovit.la 2017-01-02 10:10:00.000000000 +0000 @@ -1,5 +1,5 @@ # libmovit.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11 +# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -17,7 +17,7 @@ inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs=' -L/root/BuildAgent/work/ef55b932ce3c3e94/shotcut/Shotcut/Shotcut.app/lib /root/BuildAgent/work/ef55b932ce3c3e94/shotcut/Shotcut/Shotcut.app/lib/libepoxy.la -ldl -lfftw3 -lpthread' +dependency_libs=' -L/root/shotcut/shotcut/Shotcut/Shotcut.app/lib /root/shotcut/shotcut/Shotcut/Shotcut.app/lib/libepoxy.la -ldl -lfftw3 -lpthread' # Names of additional weak libraries provided by this library weak_library_names='' @@ -38,4 +38,4 @@ dlpreopen='' # Directory that this library needs to be installed in: -libdir='/root/BuildAgent/work/ef55b932ce3c3e94/shotcut/Shotcut/Shotcut.app/lib' +libdir='/root/shotcut/shotcut/Shotcut/Shotcut.app/lib' Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmovit.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmovit.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmovit.so.2 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmovit.so.2 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmovit.so.2.0.3 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmovit.so.2.0.3 differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/libmp3lame.la shotcut-17.01.01/Shotcut.app/lib/libmp3lame.la --- shotcut-16.07.01/Shotcut.app/lib/libmp3lame.la 2016-07-01 08:42:57.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/libmp3lame.la 2017-01-02 09:46:01.000000000 +0000 @@ -38,4 +38,4 @@ dlpreopen='' # Directory that this library needs to be installed in: -libdir='/root/BuildAgent/work/ef55b932ce3c3e94/shotcut/Shotcut/Shotcut.app/lib' +libdir='/root/shotcut/shotcut/Shotcut/Shotcut.app/lib' Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmp3lame.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmp3lame.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmp3lame.so.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmp3lame.so.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libmp3lame.so.0.0.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libmp3lame.so.0.0.0 differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/libopus.la shotcut-17.01.01/Shotcut.app/lib/libopus.la --- shotcut-16.07.01/Shotcut.app/lib/libopus.la 2016-07-01 08:42:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/libopus.la 2017-01-02 09:45:05.000000000 +0000 @@ -1,5 +1,5 @@ # libopus.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11 +# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -8,7 +8,7 @@ dlname='libopus.so.0' # Names of this library. -library_names='libopus.so.0.5.2 libopus.so.0 libopus.so' +library_names='libopus.so.0.5.3 libopus.so.0 libopus.so' # The name of the static archive. old_library='libopus.a' @@ -25,7 +25,7 @@ # Version information for libopus. current=5 age=5 -revision=2 +revision=3 # Is this an already installed library? installed=yes @@ -38,4 +38,4 @@ dlpreopen='' # Directory that this library needs to be installed in: -libdir='/root/BuildAgent/work/ef55b932ce3c3e94/shotcut/Shotcut/Shotcut.app/lib' +libdir='/root/shotcut/shotcut/Shotcut/Shotcut.app/lib' Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libopus.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libopus.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libopus.so.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libopus.so.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libopus.so.0.5.2 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libopus.so.0.5.2 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libopus.so.0.5.3 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libopus.so.0.5.3 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libpng12.so.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libpng12.so.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libpostproc.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libpostproc.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libpostproc.so.54 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libpostproc.so.54 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libpostproc.so.54.0.100 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libpostproc.so.54.0.100 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Concurrent.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Concurrent.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Core.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Core.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5DBus.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5DBus.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Declarative.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Declarative.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Gui.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Gui.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Multimedia.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Multimedia.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5MultimediaWidgets.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5MultimediaWidgets.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Network.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Network.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5OpenGL.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5OpenGL.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Positioning.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Positioning.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5PrintSupport.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5PrintSupport.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Qml.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Qml.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Quick.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Quick.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5QuickWidgets.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5QuickWidgets.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Script.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Script.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Sensors.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Sensors.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Sql.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Sql.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Svg.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Svg.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5WebChannel.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5WebChannel.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5WebKit.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5WebKit.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5WebKitWidgets.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5WebKitWidgets.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5WebSockets.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5WebSockets.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Widgets.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Widgets.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5X11Extras.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5X11Extras.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5XcbQpa.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5XcbQpa.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5XmlPatterns.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5XmlPatterns.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libQt5Xml.so.5 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libQt5Xml.so.5 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libsox.so.2 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libsox.so.2 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libswresample.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libswresample.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libswresample.so.2 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libswresample.so.2 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libswresample.so.2.0.101 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libswresample.so.2.0.101 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libswscale.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libswscale.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libswscale.so.4 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libswscale.so.4 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libswscale.so.4.0.100 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libswscale.so.4.0.100 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libvidstab.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libvidstab.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libvidstab.so.1.1 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libvidstab.so.1.1 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libvpx.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libvpx.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libvpx.so.3 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libvpx.so.3 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libvpx.so.3.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libvpx.so.3.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libvpx.so.3.0.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libvpx.so.3.0.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libvpx.so.4 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libvpx.so.4 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libvpx.so.4.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libvpx.so.4.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libvpx.so.4.0.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libvpx.so.4.0.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libwebvfx.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libwebvfx.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libwebvfx.so.1 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libwebvfx.so.1 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libwebvfx.so.1.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libwebvfx.so.1.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libwebvfx.so.1.0.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libwebvfx.so.1.0.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libx264.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libx264.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libx264.so.148 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libx264.so.148 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libx265.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libx265.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libx265.so.102 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libx265.so.102 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libx265.so.79 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libx265.so.79 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libxkbcommon.so.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libxkbcommon.so.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/libxkbcommon-x11.so.0 and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/libxkbcommon-x11.so.0 differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltavformat.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltavformat.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltcore.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltcore.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltdecklink.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltdecklink.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltfrei0r.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltfrei0r.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltgtk2.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltgtk2.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltjackrack.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltjackrack.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltkdenlive.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltkdenlive.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltlinsys.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltlinsys.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltmotion_est.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltmotion_est.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltnormalize.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltnormalize.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltoldfilm.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltoldfilm.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltopengl.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltopengl.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltplusgpl.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltplusgpl.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltplus.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltplus.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltqt.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltqt.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltresample.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltresample.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltrtaudio.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltrtaudio.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltsdl.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltsdl.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltsox.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltsox.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltvideostab.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltvideostab.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltvidstab.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltvidstab.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltvmfx.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltvmfx.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltwebvfx.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltwebvfx.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltxine.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltxine.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/mlt/libmltxml.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/mlt/libmltxml.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/builtins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/builtins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/builtins.qmltypes 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/builtins.qmltypes 2016-06-16 09:26:11.000000000 +0000 @@ -0,0 +1,1605 @@ +import QtQuick.tooling 1.2 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. +// +// This file was auto-generated by: +// 'qmlplugindump -nonrelocatable -builtins' + +Module { + dependencies: [] + Component { + name: "Qt" + Enum { + name: "GlobalColor" + values: { + "color0": 0, + "color1": 1, + "black": 2, + "white": 3, + "darkGray": 4, + "gray": 5, + "lightGray": 6, + "red": 7, + "green": 8, + "blue": 9, + "cyan": 10, + "magenta": 11, + "yellow": 12, + "darkRed": 13, + "darkGreen": 14, + "darkBlue": 15, + "darkCyan": 16, + "darkMagenta": 17, + "darkYellow": 18, + "transparent": 19 + } + } + Enum { + name: "KeyboardModifiers" + values: { + "NoModifier": 0, + "ShiftModifier": 33554432, + "ControlModifier": 67108864, + "AltModifier": 134217728, + "MetaModifier": 268435456, + "KeypadModifier": 536870912, + "GroupSwitchModifier": 1073741824, + "KeyboardModifierMask": -33554432 + } + } + Enum { + name: "MouseButtons" + values: { + "NoButton": 0, + "LeftButton": 1, + "RightButton": 2, + "MidButton": 4, + "MiddleButton": 4, + "BackButton": 8, + "XButton1": 8, + "ExtraButton1": 8, + "ForwardButton": 16, + "XButton2": 16, + "ExtraButton2": 16, + "TaskButton": 32, + "ExtraButton3": 32, + "ExtraButton4": 64, + "ExtraButton5": 128, + "ExtraButton6": 256, + "ExtraButton7": 512, + "ExtraButton8": 1024, + "ExtraButton9": 2048, + "ExtraButton10": 4096, + "ExtraButton11": 8192, + "ExtraButton12": 16384, + "ExtraButton13": 32768, + "ExtraButton14": 65536, + "ExtraButton15": 131072, + "ExtraButton16": 262144, + "ExtraButton17": 524288, + "ExtraButton18": 1048576, + "ExtraButton19": 2097152, + "ExtraButton20": 4194304, + "ExtraButton21": 8388608, + "ExtraButton22": 16777216, + "ExtraButton23": 33554432, + "ExtraButton24": 67108864, + "AllButtons": 134217727, + "MaxMouseButton": 67108864, + "MouseButtonMask": -1 + } + } + Enum { + name: "Orientation" + values: { + "Horizontal": 1, + "Vertical": 2 + } + } + Enum { + name: "Orientations" + values: { + "Horizontal": 1, + "Vertical": 2 + } + } + Enum { + name: "FocusPolicy" + values: { + "NoFocus": 0, + "TabFocus": 1, + "ClickFocus": 2, + "StrongFocus": 11, + "WheelFocus": 15 + } + } + Enum { + name: "TabFocusBehavior" + values: { + "NoTabFocus": 0, + "TabFocusTextControls": 1, + "TabFocusListControls": 2, + "TabFocusAllControls": 255 + } + } + Enum { + name: "SortOrder" + values: { + "AscendingOrder": 0, + "DescendingOrder": 1 + } + } + Enum { + name: "Alignment" + values: { + "AlignLeft": 1, + "AlignLeading": 1, + "AlignRight": 2, + "AlignTrailing": 2, + "AlignHCenter": 4, + "AlignJustify": 8, + "AlignAbsolute": 16, + "AlignHorizontal_Mask": 31, + "AlignTop": 32, + "AlignBottom": 64, + "AlignVCenter": 128, + "AlignBaseline": 256, + "AlignVertical_Mask": 480, + "AlignCenter": 132 + } + } + Enum { + name: "TextElideMode" + values: { + "ElideLeft": 0, + "ElideRight": 1, + "ElideMiddle": 2, + "ElideNone": 3 + } + } + Enum { + name: "WindowType" + values: { + "Widget": 0, + "Window": 1, + "Dialog": 3, + "Sheet": 5, + "Drawer": 7, + "Popup": 9, + "Tool": 11, + "ToolTip": 13, + "SplashScreen": 15, + "Desktop": 17, + "SubWindow": 18, + "ForeignWindow": 33, + "CoverWindow": 65, + "WindowType_Mask": 255, + "MSWindowsFixedSizeDialogHint": 256, + "MSWindowsOwnDC": 512, + "BypassWindowManagerHint": 1024, + "X11BypassWindowManagerHint": 1024, + "FramelessWindowHint": 2048, + "WindowTitleHint": 4096, + "WindowSystemMenuHint": 8192, + "WindowMinimizeButtonHint": 16384, + "WindowMaximizeButtonHint": 32768, + "WindowMinMaxButtonsHint": 49152, + "WindowContextHelpButtonHint": 65536, + "WindowShadeButtonHint": 131072, + "WindowStaysOnTopHint": 262144, + "WindowTransparentForInput": 524288, + "WindowOverridesSystemGestures": 1048576, + "WindowDoesNotAcceptFocus": 2097152, + "MaximizeUsingFullscreenGeometryHint": 4194304, + "CustomizeWindowHint": 33554432, + "WindowStaysOnBottomHint": 67108864, + "WindowCloseButtonHint": 134217728, + "MacWindowToolBarButtonHint": 268435456, + "BypassGraphicsProxyWidget": 536870912, + "NoDropShadowWindowHint": 1073741824, + "WindowFullscreenButtonHint": -2147483648, + "WindowOkButtonHint": 524288, + "WindowCancelButtonHint": 1048576 + } + } + Enum { + name: "WindowFlags" + values: { + "Widget": 0, + "Window": 1, + "Dialog": 3, + "Sheet": 5, + "Drawer": 7, + "Popup": 9, + "Tool": 11, + "ToolTip": 13, + "SplashScreen": 15, + "Desktop": 17, + "SubWindow": 18, + "ForeignWindow": 33, + "CoverWindow": 65, + "WindowType_Mask": 255, + "MSWindowsFixedSizeDialogHint": 256, + "MSWindowsOwnDC": 512, + "BypassWindowManagerHint": 1024, + "X11BypassWindowManagerHint": 1024, + "FramelessWindowHint": 2048, + "WindowTitleHint": 4096, + "WindowSystemMenuHint": 8192, + "WindowMinimizeButtonHint": 16384, + "WindowMaximizeButtonHint": 32768, + "WindowMinMaxButtonsHint": 49152, + "WindowContextHelpButtonHint": 65536, + "WindowShadeButtonHint": 131072, + "WindowStaysOnTopHint": 262144, + "WindowTransparentForInput": 524288, + "WindowOverridesSystemGestures": 1048576, + "WindowDoesNotAcceptFocus": 2097152, + "MaximizeUsingFullscreenGeometryHint": 4194304, + "CustomizeWindowHint": 33554432, + "WindowStaysOnBottomHint": 67108864, + "WindowCloseButtonHint": 134217728, + "MacWindowToolBarButtonHint": 268435456, + "BypassGraphicsProxyWidget": 536870912, + "NoDropShadowWindowHint": 1073741824, + "WindowFullscreenButtonHint": -2147483648, + "WindowOkButtonHint": 524288, + "WindowCancelButtonHint": 1048576 + } + } + Enum { + name: "WindowState" + values: { + "WindowNoState": 0, + "WindowMinimized": 1, + "WindowMaximized": 2, + "WindowFullScreen": 4, + "WindowActive": 8 + } + } + Enum { + name: "WindowStates" + values: { + "WindowNoState": 0, + "WindowMinimized": 1, + "WindowMaximized": 2, + "WindowFullScreen": 4, + "WindowActive": 8 + } + } + Enum { + name: "ApplicationState" + values: { + "ApplicationSuspended": 0, + "ApplicationHidden": 1, + "ApplicationInactive": 2, + "ApplicationActive": 4 + } + } + Enum { + name: "ScreenOrientation" + values: { + "PrimaryOrientation": 0, + "PortraitOrientation": 1, + "LandscapeOrientation": 2, + "InvertedPortraitOrientation": 4, + "InvertedLandscapeOrientation": 8 + } + } + Enum { + name: "ScreenOrientations" + values: { + "PrimaryOrientation": 0, + "PortraitOrientation": 1, + "LandscapeOrientation": 2, + "InvertedPortraitOrientation": 4, + "InvertedLandscapeOrientation": 8 + } + } + Enum { + name: "WidgetAttribute" + values: { + "WA_Disabled": 0, + "WA_UnderMouse": 1, + "WA_MouseTracking": 2, + "WA_ContentsPropagated": 3, + "WA_OpaquePaintEvent": 4, + "WA_NoBackground": 4, + "WA_StaticContents": 5, + "WA_LaidOut": 7, + "WA_PaintOnScreen": 8, + "WA_NoSystemBackground": 9, + "WA_UpdatesDisabled": 10, + "WA_Mapped": 11, + "WA_MacNoClickThrough": 12, + "WA_InputMethodEnabled": 14, + "WA_WState_Visible": 15, + "WA_WState_Hidden": 16, + "WA_ForceDisabled": 32, + "WA_KeyCompression": 33, + "WA_PendingMoveEvent": 34, + "WA_PendingResizeEvent": 35, + "WA_SetPalette": 36, + "WA_SetFont": 37, + "WA_SetCursor": 38, + "WA_NoChildEventsFromChildren": 39, + "WA_WindowModified": 41, + "WA_Resized": 42, + "WA_Moved": 43, + "WA_PendingUpdate": 44, + "WA_InvalidSize": 45, + "WA_MacBrushedMetal": 46, + "WA_MacMetalStyle": 46, + "WA_CustomWhatsThis": 47, + "WA_LayoutOnEntireRect": 48, + "WA_OutsideWSRange": 49, + "WA_GrabbedShortcut": 50, + "WA_TransparentForMouseEvents": 51, + "WA_PaintUnclipped": 52, + "WA_SetWindowIcon": 53, + "WA_NoMouseReplay": 54, + "WA_DeleteOnClose": 55, + "WA_RightToLeft": 56, + "WA_SetLayoutDirection": 57, + "WA_NoChildEventsForParent": 58, + "WA_ForceUpdatesDisabled": 59, + "WA_WState_Created": 60, + "WA_WState_CompressKeys": 61, + "WA_WState_InPaintEvent": 62, + "WA_WState_Reparented": 63, + "WA_WState_ConfigPending": 64, + "WA_WState_Polished": 66, + "WA_WState_DND": 67, + "WA_WState_OwnSizePolicy": 68, + "WA_WState_ExplicitShowHide": 69, + "WA_ShowModal": 70, + "WA_MouseNoMask": 71, + "WA_GroupLeader": 72, + "WA_NoMousePropagation": 73, + "WA_Hover": 74, + "WA_InputMethodTransparent": 75, + "WA_QuitOnClose": 76, + "WA_KeyboardFocusChange": 77, + "WA_AcceptDrops": 78, + "WA_DropSiteRegistered": 79, + "WA_ForceAcceptDrops": 79, + "WA_WindowPropagation": 80, + "WA_NoX11EventCompression": 81, + "WA_TintedBackground": 82, + "WA_X11OpenGLOverlay": 83, + "WA_AlwaysShowToolTips": 84, + "WA_MacOpaqueSizeGrip": 85, + "WA_SetStyle": 86, + "WA_SetLocale": 87, + "WA_MacShowFocusRect": 88, + "WA_MacNormalSize": 89, + "WA_MacSmallSize": 90, + "WA_MacMiniSize": 91, + "WA_LayoutUsesWidgetRect": 92, + "WA_StyledBackground": 93, + "WA_MSWindowsUseDirect3D": 94, + "WA_CanHostQMdiSubWindowTitleBar": 95, + "WA_MacAlwaysShowToolWindow": 96, + "WA_StyleSheet": 97, + "WA_ShowWithoutActivating": 98, + "WA_X11BypassTransientForHint": 99, + "WA_NativeWindow": 100, + "WA_DontCreateNativeAncestors": 101, + "WA_MacVariableSize": 102, + "WA_DontShowOnScreen": 103, + "WA_X11NetWmWindowTypeDesktop": 104, + "WA_X11NetWmWindowTypeDock": 105, + "WA_X11NetWmWindowTypeToolBar": 106, + "WA_X11NetWmWindowTypeMenu": 107, + "WA_X11NetWmWindowTypeUtility": 108, + "WA_X11NetWmWindowTypeSplash": 109, + "WA_X11NetWmWindowTypeDialog": 110, + "WA_X11NetWmWindowTypeDropDownMenu": 111, + "WA_X11NetWmWindowTypePopupMenu": 112, + "WA_X11NetWmWindowTypeToolTip": 113, + "WA_X11NetWmWindowTypeNotification": 114, + "WA_X11NetWmWindowTypeCombo": 115, + "WA_X11NetWmWindowTypeDND": 116, + "WA_MacFrameworkScaled": 117, + "WA_SetWindowModality": 118, + "WA_WState_WindowOpacitySet": 119, + "WA_TranslucentBackground": 120, + "WA_AcceptTouchEvents": 121, + "WA_WState_AcceptedTouchBeginEvent": 122, + "WA_TouchPadAcceptSingleTouchEvents": 123, + "WA_X11DoNotAcceptFocus": 126, + "WA_MacNoShadow": 127, + "WA_AlwaysStackOnTop": 128, + "WA_AttributeCount": 129 + } + } + Enum { + name: "ApplicationAttribute" + values: { + "AA_ImmediateWidgetCreation": 0, + "AA_MSWindowsUseDirect3DByDefault": 1, + "AA_DontShowIconsInMenus": 2, + "AA_NativeWindows": 3, + "AA_DontCreateNativeWidgetSiblings": 4, + "AA_MacPluginApplication": 5, + "AA_DontUseNativeMenuBar": 6, + "AA_MacDontSwapCtrlAndMeta": 7, + "AA_Use96Dpi": 8, + "AA_X11InitThreads": 10, + "AA_SynthesizeTouchForUnhandledMouseEvents": 11, + "AA_SynthesizeMouseForUnhandledTouchEvents": 12, + "AA_UseHighDpiPixmaps": 13, + "AA_ForceRasterWidgets": 14, + "AA_UseDesktopOpenGL": 15, + "AA_UseOpenGLES": 16, + "AA_UseSoftwareOpenGL": 17, + "AA_ShareOpenGLContexts": 18, + "AA_SetPalette": 19, + "AA_EnableHighDpiScaling": 20, + "AA_DisableHighDpiScaling": 21, + "AA_AttributeCount": 22 + } + } + Enum { + name: "ImageConversionFlags" + values: { + "ColorMode_Mask": 3, + "AutoColor": 0, + "ColorOnly": 3, + "MonoOnly": 2, + "AlphaDither_Mask": 12, + "ThresholdAlphaDither": 0, + "OrderedAlphaDither": 4, + "DiffuseAlphaDither": 8, + "NoAlpha": 12, + "Dither_Mask": 48, + "DiffuseDither": 0, + "OrderedDither": 16, + "ThresholdDither": 32, + "DitherMode_Mask": 192, + "AutoDither": 0, + "PreferDither": 64, + "AvoidDither": 128, + "NoOpaqueDetection": 256, + "NoFormatConversion": 512 + } + } + Enum { + name: "BGMode" + values: { + "TransparentMode": 0, + "OpaqueMode": 1 + } + } + Enum { + name: "Key" + values: { + "Key_Escape": 16777216, + "Key_Tab": 16777217, + "Key_Backtab": 16777218, + "Key_Backspace": 16777219, + "Key_Return": 16777220, + "Key_Enter": 16777221, + "Key_Insert": 16777222, + "Key_Delete": 16777223, + "Key_Pause": 16777224, + "Key_Print": 16777225, + "Key_SysReq": 16777226, + "Key_Clear": 16777227, + "Key_Home": 16777232, + "Key_End": 16777233, + "Key_Left": 16777234, + "Key_Up": 16777235, + "Key_Right": 16777236, + "Key_Down": 16777237, + "Key_PageUp": 16777238, + "Key_PageDown": 16777239, + "Key_Shift": 16777248, + "Key_Control": 16777249, + "Key_Meta": 16777250, + "Key_Alt": 16777251, + "Key_CapsLock": 16777252, + "Key_NumLock": 16777253, + "Key_ScrollLock": 16777254, + "Key_F1": 16777264, + "Key_F2": 16777265, + "Key_F3": 16777266, + "Key_F4": 16777267, + "Key_F5": 16777268, + "Key_F6": 16777269, + "Key_F7": 16777270, + "Key_F8": 16777271, + "Key_F9": 16777272, + "Key_F10": 16777273, + "Key_F11": 16777274, + "Key_F12": 16777275, + "Key_F13": 16777276, + "Key_F14": 16777277, + "Key_F15": 16777278, + "Key_F16": 16777279, + "Key_F17": 16777280, + "Key_F18": 16777281, + "Key_F19": 16777282, + "Key_F20": 16777283, + "Key_F21": 16777284, + "Key_F22": 16777285, + "Key_F23": 16777286, + "Key_F24": 16777287, + "Key_F25": 16777288, + "Key_F26": 16777289, + "Key_F27": 16777290, + "Key_F28": 16777291, + "Key_F29": 16777292, + "Key_F30": 16777293, + "Key_F31": 16777294, + "Key_F32": 16777295, + "Key_F33": 16777296, + "Key_F34": 16777297, + "Key_F35": 16777298, + "Key_Super_L": 16777299, + "Key_Super_R": 16777300, + "Key_Menu": 16777301, + "Key_Hyper_L": 16777302, + "Key_Hyper_R": 16777303, + "Key_Help": 16777304, + "Key_Direction_L": 16777305, + "Key_Direction_R": 16777312, + "Key_Space": 32, + "Key_Any": 32, + "Key_Exclam": 33, + "Key_QuoteDbl": 34, + "Key_NumberSign": 35, + "Key_Dollar": 36, + "Key_Percent": 37, + "Key_Ampersand": 38, + "Key_Apostrophe": 39, + "Key_ParenLeft": 40, + "Key_ParenRight": 41, + "Key_Asterisk": 42, + "Key_Plus": 43, + "Key_Comma": 44, + "Key_Minus": 45, + "Key_Period": 46, + "Key_Slash": 47, + "Key_0": 48, + "Key_1": 49, + "Key_2": 50, + "Key_3": 51, + "Key_4": 52, + "Key_5": 53, + "Key_6": 54, + "Key_7": 55, + "Key_8": 56, + "Key_9": 57, + "Key_Colon": 58, + "Key_Semicolon": 59, + "Key_Less": 60, + "Key_Equal": 61, + "Key_Greater": 62, + "Key_Question": 63, + "Key_At": 64, + "Key_A": 65, + "Key_B": 66, + "Key_C": 67, + "Key_D": 68, + "Key_E": 69, + "Key_F": 70, + "Key_G": 71, + "Key_H": 72, + "Key_I": 73, + "Key_J": 74, + "Key_K": 75, + "Key_L": 76, + "Key_M": 77, + "Key_N": 78, + "Key_O": 79, + "Key_P": 80, + "Key_Q": 81, + "Key_R": 82, + "Key_S": 83, + "Key_T": 84, + "Key_U": 85, + "Key_V": 86, + "Key_W": 87, + "Key_X": 88, + "Key_Y": 89, + "Key_Z": 90, + "Key_BracketLeft": 91, + "Key_Backslash": 92, + "Key_BracketRight": 93, + "Key_AsciiCircum": 94, + "Key_Underscore": 95, + "Key_QuoteLeft": 96, + "Key_BraceLeft": 123, + "Key_Bar": 124, + "Key_BraceRight": 125, + "Key_AsciiTilde": 126, + "Key_nobreakspace": 160, + "Key_exclamdown": 161, + "Key_cent": 162, + "Key_sterling": 163, + "Key_currency": 164, + "Key_yen": 165, + "Key_brokenbar": 166, + "Key_section": 167, + "Key_diaeresis": 168, + "Key_copyright": 169, + "Key_ordfeminine": 170, + "Key_guillemotleft": 171, + "Key_notsign": 172, + "Key_hyphen": 173, + "Key_registered": 174, + "Key_macron": 175, + "Key_degree": 176, + "Key_plusminus": 177, + "Key_twosuperior": 178, + "Key_threesuperior": 179, + "Key_acute": 180, + "Key_mu": 181, + "Key_paragraph": 182, + "Key_periodcentered": 183, + "Key_cedilla": 184, + "Key_onesuperior": 185, + "Key_masculine": 186, + "Key_guillemotright": 187, + "Key_onequarter": 188, + "Key_onehalf": 189, + "Key_threequarters": 190, + "Key_questiondown": 191, + "Key_Agrave": 192, + "Key_Aacute": 193, + "Key_Acircumflex": 194, + "Key_Atilde": 195, + "Key_Adiaeresis": 196, + "Key_Aring": 197, + "Key_AE": 198, + "Key_Ccedilla": 199, + "Key_Egrave": 200, + "Key_Eacute": 201, + "Key_Ecircumflex": 202, + "Key_Ediaeresis": 203, + "Key_Igrave": 204, + "Key_Iacute": 205, + "Key_Icircumflex": 206, + "Key_Idiaeresis": 207, + "Key_ETH": 208, + "Key_Ntilde": 209, + "Key_Ograve": 210, + "Key_Oacute": 211, + "Key_Ocircumflex": 212, + "Key_Otilde": 213, + "Key_Odiaeresis": 214, + "Key_multiply": 215, + "Key_Ooblique": 216, + "Key_Ugrave": 217, + "Key_Uacute": 218, + "Key_Ucircumflex": 219, + "Key_Udiaeresis": 220, + "Key_Yacute": 221, + "Key_THORN": 222, + "Key_ssharp": 223, + "Key_division": 247, + "Key_ydiaeresis": 255, + "Key_AltGr": 16781571, + "Key_Multi_key": 16781600, + "Key_Codeinput": 16781623, + "Key_SingleCandidate": 16781628, + "Key_MultipleCandidate": 16781629, + "Key_PreviousCandidate": 16781630, + "Key_Mode_switch": 16781694, + "Key_Kanji": 16781601, + "Key_Muhenkan": 16781602, + "Key_Henkan": 16781603, + "Key_Romaji": 16781604, + "Key_Hiragana": 16781605, + "Key_Katakana": 16781606, + "Key_Hiragana_Katakana": 16781607, + "Key_Zenkaku": 16781608, + "Key_Hankaku": 16781609, + "Key_Zenkaku_Hankaku": 16781610, + "Key_Touroku": 16781611, + "Key_Massyo": 16781612, + "Key_Kana_Lock": 16781613, + "Key_Kana_Shift": 16781614, + "Key_Eisu_Shift": 16781615, + "Key_Eisu_toggle": 16781616, + "Key_Hangul": 16781617, + "Key_Hangul_Start": 16781618, + "Key_Hangul_End": 16781619, + "Key_Hangul_Hanja": 16781620, + "Key_Hangul_Jamo": 16781621, + "Key_Hangul_Romaja": 16781622, + "Key_Hangul_Jeonja": 16781624, + "Key_Hangul_Banja": 16781625, + "Key_Hangul_PreHanja": 16781626, + "Key_Hangul_PostHanja": 16781627, + "Key_Hangul_Special": 16781631, + "Key_Dead_Grave": 16781904, + "Key_Dead_Acute": 16781905, + "Key_Dead_Circumflex": 16781906, + "Key_Dead_Tilde": 16781907, + "Key_Dead_Macron": 16781908, + "Key_Dead_Breve": 16781909, + "Key_Dead_Abovedot": 16781910, + "Key_Dead_Diaeresis": 16781911, + "Key_Dead_Abovering": 16781912, + "Key_Dead_Doubleacute": 16781913, + "Key_Dead_Caron": 16781914, + "Key_Dead_Cedilla": 16781915, + "Key_Dead_Ogonek": 16781916, + "Key_Dead_Iota": 16781917, + "Key_Dead_Voiced_Sound": 16781918, + "Key_Dead_Semivoiced_Sound": 16781919, + "Key_Dead_Belowdot": 16781920, + "Key_Dead_Hook": 16781921, + "Key_Dead_Horn": 16781922, + "Key_Back": 16777313, + "Key_Forward": 16777314, + "Key_Stop": 16777315, + "Key_Refresh": 16777316, + "Key_VolumeDown": 16777328, + "Key_VolumeMute": 16777329, + "Key_VolumeUp": 16777330, + "Key_BassBoost": 16777331, + "Key_BassUp": 16777332, + "Key_BassDown": 16777333, + "Key_TrebleUp": 16777334, + "Key_TrebleDown": 16777335, + "Key_MediaPlay": 16777344, + "Key_MediaStop": 16777345, + "Key_MediaPrevious": 16777346, + "Key_MediaNext": 16777347, + "Key_MediaRecord": 16777348, + "Key_MediaPause": 16777349, + "Key_MediaTogglePlayPause": 16777350, + "Key_HomePage": 16777360, + "Key_Favorites": 16777361, + "Key_Search": 16777362, + "Key_Standby": 16777363, + "Key_OpenUrl": 16777364, + "Key_LaunchMail": 16777376, + "Key_LaunchMedia": 16777377, + "Key_Launch0": 16777378, + "Key_Launch1": 16777379, + "Key_Launch2": 16777380, + "Key_Launch3": 16777381, + "Key_Launch4": 16777382, + "Key_Launch5": 16777383, + "Key_Launch6": 16777384, + "Key_Launch7": 16777385, + "Key_Launch8": 16777386, + "Key_Launch9": 16777387, + "Key_LaunchA": 16777388, + "Key_LaunchB": 16777389, + "Key_LaunchC": 16777390, + "Key_LaunchD": 16777391, + "Key_LaunchE": 16777392, + "Key_LaunchF": 16777393, + "Key_MonBrightnessUp": 16777394, + "Key_MonBrightnessDown": 16777395, + "Key_KeyboardLightOnOff": 16777396, + "Key_KeyboardBrightnessUp": 16777397, + "Key_KeyboardBrightnessDown": 16777398, + "Key_PowerOff": 16777399, + "Key_WakeUp": 16777400, + "Key_Eject": 16777401, + "Key_ScreenSaver": 16777402, + "Key_WWW": 16777403, + "Key_Memo": 16777404, + "Key_LightBulb": 16777405, + "Key_Shop": 16777406, + "Key_History": 16777407, + "Key_AddFavorite": 16777408, + "Key_HotLinks": 16777409, + "Key_BrightnessAdjust": 16777410, + "Key_Finance": 16777411, + "Key_Community": 16777412, + "Key_AudioRewind": 16777413, + "Key_BackForward": 16777414, + "Key_ApplicationLeft": 16777415, + "Key_ApplicationRight": 16777416, + "Key_Book": 16777417, + "Key_CD": 16777418, + "Key_Calculator": 16777419, + "Key_ToDoList": 16777420, + "Key_ClearGrab": 16777421, + "Key_Close": 16777422, + "Key_Copy": 16777423, + "Key_Cut": 16777424, + "Key_Display": 16777425, + "Key_DOS": 16777426, + "Key_Documents": 16777427, + "Key_Excel": 16777428, + "Key_Explorer": 16777429, + "Key_Game": 16777430, + "Key_Go": 16777431, + "Key_iTouch": 16777432, + "Key_LogOff": 16777433, + "Key_Market": 16777434, + "Key_Meeting": 16777435, + "Key_MenuKB": 16777436, + "Key_MenuPB": 16777437, + "Key_MySites": 16777438, + "Key_News": 16777439, + "Key_OfficeHome": 16777440, + "Key_Option": 16777441, + "Key_Paste": 16777442, + "Key_Phone": 16777443, + "Key_Calendar": 16777444, + "Key_Reply": 16777445, + "Key_Reload": 16777446, + "Key_RotateWindows": 16777447, + "Key_RotationPB": 16777448, + "Key_RotationKB": 16777449, + "Key_Save": 16777450, + "Key_Send": 16777451, + "Key_Spell": 16777452, + "Key_SplitScreen": 16777453, + "Key_Support": 16777454, + "Key_TaskPane": 16777455, + "Key_Terminal": 16777456, + "Key_Tools": 16777457, + "Key_Travel": 16777458, + "Key_Video": 16777459, + "Key_Word": 16777460, + "Key_Xfer": 16777461, + "Key_ZoomIn": 16777462, + "Key_ZoomOut": 16777463, + "Key_Away": 16777464, + "Key_Messenger": 16777465, + "Key_WebCam": 16777466, + "Key_MailForward": 16777467, + "Key_Pictures": 16777468, + "Key_Music": 16777469, + "Key_Battery": 16777470, + "Key_Bluetooth": 16777471, + "Key_WLAN": 16777472, + "Key_UWB": 16777473, + "Key_AudioForward": 16777474, + "Key_AudioRepeat": 16777475, + "Key_AudioRandomPlay": 16777476, + "Key_Subtitle": 16777477, + "Key_AudioCycleTrack": 16777478, + "Key_Time": 16777479, + "Key_Hibernate": 16777480, + "Key_View": 16777481, + "Key_TopMenu": 16777482, + "Key_PowerDown": 16777483, + "Key_Suspend": 16777484, + "Key_ContrastAdjust": 16777485, + "Key_LaunchG": 16777486, + "Key_LaunchH": 16777487, + "Key_TouchpadToggle": 16777488, + "Key_TouchpadOn": 16777489, + "Key_TouchpadOff": 16777490, + "Key_MicMute": 16777491, + "Key_Red": 16777492, + "Key_Green": 16777493, + "Key_Yellow": 16777494, + "Key_Blue": 16777495, + "Key_ChannelUp": 16777496, + "Key_ChannelDown": 16777497, + "Key_Guide": 16777498, + "Key_Info": 16777499, + "Key_Settings": 16777500, + "Key_MicVolumeUp": 16777501, + "Key_MicVolumeDown": 16777502, + "Key_New": 16777504, + "Key_Open": 16777505, + "Key_Find": 16777506, + "Key_Undo": 16777507, + "Key_Redo": 16777508, + "Key_MediaLast": 16842751, + "Key_Select": 16842752, + "Key_Yes": 16842753, + "Key_No": 16842754, + "Key_Cancel": 16908289, + "Key_Printer": 16908290, + "Key_Execute": 16908291, + "Key_Sleep": 16908292, + "Key_Play": 16908293, + "Key_Zoom": 16908294, + "Key_Exit": 16908298, + "Key_Context1": 17825792, + "Key_Context2": 17825793, + "Key_Context3": 17825794, + "Key_Context4": 17825795, + "Key_Call": 17825796, + "Key_Hangup": 17825797, + "Key_Flip": 17825798, + "Key_ToggleCallHangup": 17825799, + "Key_VoiceDial": 17825800, + "Key_LastNumberRedial": 17825801, + "Key_Camera": 17825824, + "Key_CameraFocus": 17825825, + "Key_unknown": 33554431 + } + } + Enum { + name: "ArrowType" + values: { + "NoArrow": 0, + "UpArrow": 1, + "DownArrow": 2, + "LeftArrow": 3, + "RightArrow": 4 + } + } + Enum { + name: "PenStyle" + values: { + "NoPen": 0, + "SolidLine": 1, + "DashLine": 2, + "DotLine": 3, + "DashDotLine": 4, + "DashDotDotLine": 5, + "CustomDashLine": 6 + } + } + Enum { + name: "PenCapStyle" + values: { + "FlatCap": 0, + "SquareCap": 16, + "RoundCap": 32, + "MPenCapStyle": 48 + } + } + Enum { + name: "PenJoinStyle" + values: { + "MiterJoin": 0, + "BevelJoin": 64, + "RoundJoin": 128, + "SvgMiterJoin": 256, + "MPenJoinStyle": 448 + } + } + Enum { + name: "BrushStyle" + values: { + "NoBrush": 0, + "SolidPattern": 1, + "Dense1Pattern": 2, + "Dense2Pattern": 3, + "Dense3Pattern": 4, + "Dense4Pattern": 5, + "Dense5Pattern": 6, + "Dense6Pattern": 7, + "Dense7Pattern": 8, + "HorPattern": 9, + "VerPattern": 10, + "CrossPattern": 11, + "BDiagPattern": 12, + "FDiagPattern": 13, + "DiagCrossPattern": 14, + "LinearGradientPattern": 15, + "RadialGradientPattern": 16, + "ConicalGradientPattern": 17, + "TexturePattern": 24 + } + } + Enum { + name: "SizeMode" + values: { + "AbsoluteSize": 0, + "RelativeSize": 1 + } + } + Enum { + name: "CursorShape" + values: { + "ArrowCursor": 0, + "UpArrowCursor": 1, + "CrossCursor": 2, + "WaitCursor": 3, + "IBeamCursor": 4, + "SizeVerCursor": 5, + "SizeHorCursor": 6, + "SizeBDiagCursor": 7, + "SizeFDiagCursor": 8, + "SizeAllCursor": 9, + "BlankCursor": 10, + "SplitVCursor": 11, + "SplitHCursor": 12, + "PointingHandCursor": 13, + "ForbiddenCursor": 14, + "WhatsThisCursor": 15, + "BusyCursor": 16, + "OpenHandCursor": 17, + "ClosedHandCursor": 18, + "DragCopyCursor": 19, + "DragMoveCursor": 20, + "DragLinkCursor": 21, + "LastCursor": 21, + "BitmapCursor": 24, + "CustomCursor": 25 + } + } + Enum { + name: "TextFormat" + values: { + "PlainText": 0, + "RichText": 1, + "AutoText": 2 + } + } + Enum { + name: "AspectRatioMode" + values: { + "IgnoreAspectRatio": 0, + "KeepAspectRatio": 1, + "KeepAspectRatioByExpanding": 2 + } + } + Enum { + name: "DockWidgetArea" + values: { + "LeftDockWidgetArea": 1, + "RightDockWidgetArea": 2, + "TopDockWidgetArea": 4, + "BottomDockWidgetArea": 8, + "DockWidgetArea_Mask": 15, + "AllDockWidgetAreas": 15, + "NoDockWidgetArea": 0 + } + } + Enum { + name: "DockWidgetAreas" + values: { + "LeftDockWidgetArea": 1, + "RightDockWidgetArea": 2, + "TopDockWidgetArea": 4, + "BottomDockWidgetArea": 8, + "DockWidgetArea_Mask": 15, + "AllDockWidgetAreas": 15, + "NoDockWidgetArea": 0 + } + } + Enum { + name: "ToolBarArea" + values: { + "LeftToolBarArea": 1, + "RightToolBarArea": 2, + "TopToolBarArea": 4, + "BottomToolBarArea": 8, + "ToolBarArea_Mask": 15, + "AllToolBarAreas": 15, + "NoToolBarArea": 0 + } + } + Enum { + name: "ToolBarAreas" + values: { + "LeftToolBarArea": 1, + "RightToolBarArea": 2, + "TopToolBarArea": 4, + "BottomToolBarArea": 8, + "ToolBarArea_Mask": 15, + "AllToolBarAreas": 15, + "NoToolBarArea": 0 + } + } + Enum { + name: "DateFormat" + values: { + "TextDate": 0, + "ISODate": 1, + "SystemLocaleDate": 2, + "LocalDate": 2, + "LocaleDate": 3, + "SystemLocaleShortDate": 4, + "SystemLocaleLongDate": 5, + "DefaultLocaleShortDate": 6, + "DefaultLocaleLongDate": 7, + "RFC2822Date": 8 + } + } + Enum { + name: "TimeSpec" + values: { + "LocalTime": 0, + "UTC": 1, + "OffsetFromUTC": 2, + "TimeZone": 3 + } + } + Enum { + name: "DayOfWeek" + values: { + "Monday": 1, + "Tuesday": 2, + "Wednesday": 3, + "Thursday": 4, + "Friday": 5, + "Saturday": 6, + "Sunday": 7 + } + } + Enum { + name: "ScrollBarPolicy" + values: { + "ScrollBarAsNeeded": 0, + "ScrollBarAlwaysOff": 1, + "ScrollBarAlwaysOn": 2 + } + } + Enum { + name: "CaseSensitivity" + values: { + "CaseInsensitive": 0, + "CaseSensitive": 1 + } + } + Enum { + name: "Corner" + values: { + "TopLeftCorner": 0, + "TopRightCorner": 1, + "BottomLeftCorner": 2, + "BottomRightCorner": 3 + } + } + Enum { + name: "Edge" + values: { + "TopEdge": 1, + "LeftEdge": 2, + "RightEdge": 4, + "BottomEdge": 8 + } + } + Enum { + name: "Edges" + values: { + "TopEdge": 1, + "LeftEdge": 2, + "RightEdge": 4, + "BottomEdge": 8 + } + } + Enum { + name: "ConnectionType" + values: { + "AutoConnection": 0, + "DirectConnection": 1, + "QueuedConnection": 2, + "BlockingQueuedConnection": 3, + "UniqueConnection": 128 + } + } + Enum { + name: "ShortcutContext" + values: { + "WidgetShortcut": 0, + "WindowShortcut": 1, + "ApplicationShortcut": 2, + "WidgetWithChildrenShortcut": 3 + } + } + Enum { + name: "FillRule" + values: { + "OddEvenFill": 0, + "WindingFill": 1 + } + } + Enum { + name: "MaskMode" + values: { + "MaskInColor": 0, + "MaskOutColor": 1 + } + } + Enum { + name: "ClipOperation" + values: { + "NoClip": 0, + "ReplaceClip": 1, + "IntersectClip": 2 + } + } + Enum { + name: "ItemSelectionMode" + values: { + "ContainsItemShape": 0, + "IntersectsItemShape": 1, + "ContainsItemBoundingRect": 2, + "IntersectsItemBoundingRect": 3 + } + } + Enum { + name: "ItemSelectionOperation" + values: { + "ReplaceSelection": 0, + "AddToSelection": 1 + } + } + Enum { + name: "TransformationMode" + values: { + "FastTransformation": 0, + "SmoothTransformation": 1 + } + } + Enum { + name: "Axis" + values: { + "XAxis": 0, + "YAxis": 1, + "ZAxis": 2 + } + } + Enum { + name: "FocusReason" + values: { + "MouseFocusReason": 0, + "TabFocusReason": 1, + "BacktabFocusReason": 2, + "ActiveWindowFocusReason": 3, + "PopupFocusReason": 4, + "ShortcutFocusReason": 5, + "MenuBarFocusReason": 6, + "OtherFocusReason": 7, + "NoFocusReason": 8 + } + } + Enum { + name: "ContextMenuPolicy" + values: { + "NoContextMenu": 0, + "DefaultContextMenu": 1, + "ActionsContextMenu": 2, + "CustomContextMenu": 3, + "PreventContextMenu": 4 + } + } + Enum { + name: "InputMethodQuery" + values: { + "ImEnabled": 1, + "ImCursorRectangle": 2, + "ImMicroFocus": 2, + "ImFont": 4, + "ImCursorPosition": 8, + "ImSurroundingText": 16, + "ImCurrentSelection": 32, + "ImMaximumTextLength": 64, + "ImAnchorPosition": 128, + "ImHints": 256, + "ImPreferredLanguage": 512, + "ImAbsolutePosition": 1024, + "ImTextBeforeCursor": 2048, + "ImTextAfterCursor": 4096, + "ImEnterKeyType": 8192, + "ImPlatformData": -2147483648, + "ImQueryInput": 186, + "ImQueryAll": -1 + } + } + Enum { + name: "InputMethodQueries" + values: { + "ImEnabled": 1, + "ImCursorRectangle": 2, + "ImMicroFocus": 2, + "ImFont": 4, + "ImCursorPosition": 8, + "ImSurroundingText": 16, + "ImCurrentSelection": 32, + "ImMaximumTextLength": 64, + "ImAnchorPosition": 128, + "ImHints": 256, + "ImPreferredLanguage": 512, + "ImAbsolutePosition": 1024, + "ImTextBeforeCursor": 2048, + "ImTextAfterCursor": 4096, + "ImEnterKeyType": 8192, + "ImPlatformData": -2147483648, + "ImQueryInput": 186, + "ImQueryAll": -1 + } + } + Enum { + name: "InputMethodHint" + values: { + "ImhNone": 0, + "ImhHiddenText": 1, + "ImhSensitiveData": 2, + "ImhNoAutoUppercase": 4, + "ImhPreferNumbers": 8, + "ImhPreferUppercase": 16, + "ImhPreferLowercase": 32, + "ImhNoPredictiveText": 64, + "ImhDate": 128, + "ImhTime": 256, + "ImhPreferLatin": 512, + "ImhMultiLine": 1024, + "ImhDigitsOnly": 65536, + "ImhFormattedNumbersOnly": 131072, + "ImhUppercaseOnly": 262144, + "ImhLowercaseOnly": 524288, + "ImhDialableCharactersOnly": 1048576, + "ImhEmailCharactersOnly": 2097152, + "ImhUrlCharactersOnly": 4194304, + "ImhLatinOnly": 8388608, + "ImhExclusiveInputMask": -65536 + } + } + Enum { + name: "InputMethodHints" + values: { + "ImhNone": 0, + "ImhHiddenText": 1, + "ImhSensitiveData": 2, + "ImhNoAutoUppercase": 4, + "ImhPreferNumbers": 8, + "ImhPreferUppercase": 16, + "ImhPreferLowercase": 32, + "ImhNoPredictiveText": 64, + "ImhDate": 128, + "ImhTime": 256, + "ImhPreferLatin": 512, + "ImhMultiLine": 1024, + "ImhDigitsOnly": 65536, + "ImhFormattedNumbersOnly": 131072, + "ImhUppercaseOnly": 262144, + "ImhLowercaseOnly": 524288, + "ImhDialableCharactersOnly": 1048576, + "ImhEmailCharactersOnly": 2097152, + "ImhUrlCharactersOnly": 4194304, + "ImhLatinOnly": 8388608, + "ImhExclusiveInputMask": -65536 + } + } + Enum { + name: "EnterKeyType" + values: { + "EnterKeyDefault": 0, + "EnterKeyReturn": 1, + "EnterKeyDone": 2, + "EnterKeyGo": 3, + "EnterKeySend": 4, + "EnterKeySearch": 5, + "EnterKeyNext": 6, + "EnterKeyPrevious": 7 + } + } + Enum { + name: "ToolButtonStyle" + values: { + "ToolButtonIconOnly": 0, + "ToolButtonTextOnly": 1, + "ToolButtonTextBesideIcon": 2, + "ToolButtonTextUnderIcon": 3, + "ToolButtonFollowStyle": 4 + } + } + Enum { + name: "LayoutDirection" + values: { + "LeftToRight": 0, + "RightToLeft": 1, + "LayoutDirectionAuto": 2 + } + } + Enum { + name: "DropAction" + values: { + "CopyAction": 1, + "MoveAction": 2, + "LinkAction": 4, + "ActionMask": 255, + "TargetMoveAction": 32770, + "IgnoreAction": 0 + } + } + Enum { + name: "DropActions" + values: { + "CopyAction": 1, + "MoveAction": 2, + "LinkAction": 4, + "ActionMask": 255, + "TargetMoveAction": 32770, + "IgnoreAction": 0 + } + } + Enum { + name: "CheckState" + values: { + "Unchecked": 0, + "PartiallyChecked": 1, + "Checked": 2 + } + } + Enum { + name: "ItemDataRole" + values: { + "DisplayRole": 0, + "DecorationRole": 1, + "EditRole": 2, + "ToolTipRole": 3, + "StatusTipRole": 4, + "WhatsThisRole": 5, + "FontRole": 6, + "TextAlignmentRole": 7, + "BackgroundColorRole": 8, + "BackgroundRole": 8, + "TextColorRole": 9, + "ForegroundRole": 9, + "CheckStateRole": 10, + "AccessibleTextRole": 11, + "AccessibleDescriptionRole": 12, + "SizeHintRole": 13, + "InitialSortOrderRole": 14, + "DisplayPropertyRole": 27, + "DecorationPropertyRole": 28, + "ToolTipPropertyRole": 29, + "StatusTipPropertyRole": 30, + "WhatsThisPropertyRole": 31, + "UserRole": 256 + } + } + Enum { + name: "ItemFlags" + values: { + "NoItemFlags": 0, + "ItemIsSelectable": 1, + "ItemIsEditable": 2, + "ItemIsDragEnabled": 4, + "ItemIsDropEnabled": 8, + "ItemIsUserCheckable": 16, + "ItemIsEnabled": 32, + "ItemIsAutoTristate": 64, + "ItemIsTristate": 64, + "ItemNeverHasChildren": 128, + "ItemIsUserTristate": 256 + } + } + Enum { + name: "MatchFlags" + values: { + "MatchExactly": 0, + "MatchContains": 1, + "MatchStartsWith": 2, + "MatchEndsWith": 3, + "MatchRegExp": 4, + "MatchWildcard": 5, + "MatchFixedString": 8, + "MatchCaseSensitive": 16, + "MatchWrap": 32, + "MatchRecursive": 64 + } + } + Enum { + name: "WindowModality" + values: { + "NonModal": 0, + "WindowModal": 1, + "ApplicationModal": 2 + } + } + Enum { + name: "TextInteractionFlag" + values: { + "NoTextInteraction": 0, + "TextSelectableByMouse": 1, + "TextSelectableByKeyboard": 2, + "LinksAccessibleByMouse": 4, + "LinksAccessibleByKeyboard": 8, + "TextEditable": 16, + "TextEditorInteraction": 19, + "TextBrowserInteraction": 13 + } + } + Enum { + name: "TextInteractionFlags" + values: { + "NoTextInteraction": 0, + "TextSelectableByMouse": 1, + "TextSelectableByKeyboard": 2, + "LinksAccessibleByMouse": 4, + "LinksAccessibleByKeyboard": 8, + "TextEditable": 16, + "TextEditorInteraction": 19, + "TextBrowserInteraction": 13 + } + } + Enum { + name: "SizeHint" + values: { + "MinimumSize": 0, + "PreferredSize": 1, + "MaximumSize": 2, + "MinimumDescent": 3, + "NSizeHints": 4 + } + } + Enum { + name: "TouchPointStates" + values: { + "TouchPointPressed": 1, + "TouchPointMoved": 2, + "TouchPointStationary": 4, + "TouchPointReleased": 8 + } + } + Enum { + name: "GestureState" + values: { + "NoGesture": 0, + "GestureStarted": 1, + "GestureUpdated": 2, + "GestureFinished": 3, + "GestureCanceled": 4 + } + } + Enum { + name: "GestureType" + values: { + "TapGesture": 1, + "TapAndHoldGesture": 2, + "PanGesture": 3, + "PinchGesture": 4, + "SwipeGesture": 5, + "CustomGesture": 256, + "LastGestureType": -1 + } + } + Enum { + name: "NativeGestureType" + values: { + "BeginNativeGesture": 0, + "EndNativeGesture": 1, + "PanNativeGesture": 2, + "ZoomNativeGesture": 3, + "SmartZoomNativeGesture": 4, + "RotateNativeGesture": 5, + "SwipeNativeGesture": 6 + } + } + Enum { + name: "CursorMoveStyle" + values: { + "LogicalMoveStyle": 0, + "VisualMoveStyle": 1 + } + } + Enum { + name: "TimerType" + values: { + "PreciseTimer": 0, + "CoarseTimer": 1, + "VeryCoarseTimer": 2 + } + } + Enum { + name: "ScrollPhase" + values: { + "ScrollBegin": 1, + "ScrollUpdate": 2, + "ScrollEnd": 3 + } + } + Enum { + name: "MouseEventSource" + values: { + "MouseEventNotSynthesized": 0, + "MouseEventSynthesizedBySystem": 1, + "MouseEventSynthesizedByQt": 2, + "MouseEventSynthesizedByApplication": 3 + } + } + Enum { + name: "MouseEventFlag" + values: { + "MouseEventCreatedDoubleClick": 1, + "MouseEventFlagMask": 255 + } + } + } + Component { name: "QEasingCurve"; prototype: "QQmlEasingValueType" } +} Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Enginio/libenginioplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Enginio/libenginioplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Enginio/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/Enginio/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/Enginio/plugins.qmltypes 2015-06-26 09:55:11.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Enginio/plugins.qmltypes 1970-01-01 00:00:00.000000000 +0000 @@ -1,360 +0,0 @@ -import QtQuick.tooling 1.1 - -// This file describes the plugin-supplied types contained in the library. -// It is used for QML tooling purposes only. -// -// This file was auto-generated by: -// 'qmlplugindump -notrelocatable Enginio 1.0' - -Module { - Component { - name: "Enginio" - exports: ["Enginio/Enginio 1.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - Enum { - name: "AuthenticationState" - values: { - "NotAuthenticated": 0, - "Authenticating": 1, - "Authenticated": 2, - "AuthenticationFailure": 3 - } - } - Enum { - name: "Operation" - values: { - "ObjectOperation": 0, - "AccessControlOperation": 1, - "UserOperation": 2, - "UsergroupOperation": 3, - "UsergroupMembersOperation": 4, - "FileOperation": 5, - "SessionOperation": 6, - "SearchOperation": 7, - "FileChunkUploadOperation": 8, - "FileGetDownloadUrlOperation": 9 - } - } - Enum { - name: "Role" - values: { - "InvalidRole": -1, - "SyncedRole": 257, - "CreatedAtRole": 258, - "UpdatedAtRole": 259, - "IdRole": 260, - "ObjectTypeRole": 261, - "CustomPropertyRole": 266 - } - } - Enum { - name: "ErrorType" - values: { - "NoError": 0, - "NetworkError": 1, - "BackendError": 2 - } - } - } - Component { - name: "EnginioBaseModel" - prototype: "QAbstractListModel" - exports: ["Enginio/EnginioBaseModel 1.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - } - Component { - name: "EnginioClientConnection" - prototype: "QObject" - exports: ["Enginio/EnginioClientConnection 1.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - Property { name: "backendId"; type: "QByteArray" } - Property { name: "serviceUrl"; type: "QUrl" } - Property { name: "identity"; type: "EnginioIdentity"; isPointer: true } - Property { name: "authenticationState"; type: "Enginio::AuthenticationState"; isReadonly: true } - Signal { - name: "backendIdChanged" - Parameter { name: "backendId"; type: "QByteArray" } - } - Signal { - name: "serviceUrlChanged" - Parameter { name: "url"; type: "QUrl" } - } - Signal { - name: "authenticationStateChanged" - Parameter { name: "state"; type: "Enginio::AuthenticationState" } - } - Signal { - name: "identityChanged" - Parameter { name: "identity"; type: "EnginioIdentity"; isPointer: true } - } - } - Component { - name: "EnginioIdentity" - prototype: "QObject" - exports: ["Enginio/EnginioIdentity 1.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - Signal { name: "dataChanged" } - Signal { name: "aboutToDestroy" } - } - Component { - name: "EnginioOAuth2Authentication" - prototype: "EnginioIdentity" - exports: ["Enginio/EnginioOAuth2Authentication 1.0"] - exportMetaObjectRevisions: [0] - Property { name: "user"; type: "string" } - Property { name: "password"; type: "string" } - Signal { - name: "userChanged" - Parameter { name: "user"; type: "string" } - } - Signal { - name: "passwordChanged" - Parameter { name: "password"; type: "string" } - } - Method { - name: "setUser" - Parameter { name: "user"; type: "string" } - } - Method { - name: "setPassword" - Parameter { name: "password"; type: "string" } - } - } - Component { - name: "EnginioQmlClient" - prototype: "EnginioClientConnection" - exports: ["Enginio/EnginioClient 1.0"] - exportMetaObjectRevisions: [0] - Signal { - name: "sessionAuthenticated" - Parameter { name: "reply"; type: "QJSValue" } - } - Signal { - name: "sessionAuthenticationError" - Parameter { name: "reply"; type: "QJSValue" } - } - Signal { name: "sessionTerminated" } - Signal { - name: "finished" - Parameter { name: "reply"; type: "QJSValue" } - } - Signal { - name: "error" - Parameter { name: "reply"; type: "QJSValue" } - } - Method { - name: "fullTextSearch" - type: "EnginioQmlReply*" - Parameter { name: "query"; type: "QJSValue" } - } - Method { - name: "query" - type: "EnginioQmlReply*" - Parameter { name: "query"; type: "QJSValue" } - Parameter { name: "operation"; type: "Enginio::Operation" } - } - Method { - name: "query" - type: "EnginioQmlReply*" - Parameter { name: "query"; type: "QJSValue" } - } - Method { - name: "create" - type: "EnginioQmlReply*" - Parameter { name: "object"; type: "QJSValue" } - Parameter { name: "operation"; type: "Enginio::Operation" } - } - Method { - name: "create" - type: "EnginioQmlReply*" - Parameter { name: "object"; type: "QJSValue" } - } - Method { - name: "update" - type: "EnginioQmlReply*" - Parameter { name: "object"; type: "QJSValue" } - Parameter { name: "operation"; type: "Enginio::Operation" } - } - Method { - name: "update" - type: "EnginioQmlReply*" - Parameter { name: "object"; type: "QJSValue" } - } - Method { - name: "remove" - type: "EnginioQmlReply*" - Parameter { name: "object"; type: "QJSValue" } - Parameter { name: "operation"; type: "Enginio::Operation" } - } - Method { - name: "remove" - type: "EnginioQmlReply*" - Parameter { name: "object"; type: "QJSValue" } - } - Method { - name: "downloadUrl" - type: "EnginioQmlReply*" - Parameter { name: "object"; type: "QJSValue" } - } - Method { - name: "uploadFile" - type: "EnginioQmlReply*" - Parameter { name: "object"; type: "QJSValue" } - Parameter { name: "url"; type: "QUrl" } - } - } - Component { - name: "EnginioQmlModel" - prototype: "EnginioBaseModel" - exports: ["Enginio/EnginioModel 1.0"] - exportMetaObjectRevisions: [0] - Property { name: "client"; type: "EnginioQmlClient"; isPointer: true } - Property { name: "query"; type: "QJSValue" } - Property { name: "operation"; type: "Enginio::Operation" } - Property { name: "rowCount"; type: "int"; isReadonly: true } - Signal { - name: "queryChanged" - Parameter { name: "query"; type: "QJSValue" } - } - Signal { - name: "clientChanged" - Parameter { name: "client"; type: "EnginioQmlClient"; isPointer: true } - } - Signal { - name: "operationChanged" - Parameter { name: "operation"; type: "Enginio::Operation" } - } - Method { - name: "append" - type: "EnginioQmlReply*" - Parameter { name: "value"; type: "QJSValue" } - } - Method { - name: "remove" - type: "EnginioQmlReply*" - Parameter { name: "row"; type: "int" } - } - Method { - name: "setProperty" - type: "EnginioQmlReply*" - Parameter { name: "row"; type: "int" } - Parameter { name: "role"; type: "string" } - Parameter { name: "value"; type: "QVariant" } - } - } - Component { - name: "EnginioQmlReply" - prototype: "EnginioReplyState" - exports: ["Enginio/EnginioReply 1.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - Property { name: "data"; type: "QJSValue"; isReadonly: true } - Property { name: "isError"; type: "bool"; isReadonly: true } - Property { name: "isFinished"; type: "bool"; isReadonly: true } - Signal { - name: "finished" - Parameter { name: "reply"; type: "QJSValue" } - } - } - Component { - name: "EnginioReplyState" - prototype: "QObject" - exports: ["Enginio/EnginioReplyState 1.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - Property { name: "errorType"; type: "Enginio::ErrorType"; isReadonly: true } - Property { name: "networkError"; type: "QNetworkReply::NetworkError"; isReadonly: true } - Property { name: "errorString"; type: "string"; isReadonly: true } - Property { name: "backendStatus"; type: "int"; isReadonly: true } - Property { name: "requestId"; type: "string"; isReadonly: true } - Signal { name: "dataChanged" } - Signal { - name: "progress" - Parameter { name: "bytesSent"; type: "qlonglong" } - Parameter { name: "bytesTotal"; type: "qlonglong" } - } - Method { name: "dumpDebugInfo" } - } - Component { - name: "QIODevice" - prototype: "QObject" - Signal { name: "readyRead" } - Signal { - name: "bytesWritten" - Parameter { name: "bytes"; type: "qlonglong" } - } - Signal { name: "aboutToClose" } - Signal { name: "readChannelFinished" } - } - Component { - name: "QNetworkReply" - prototype: "QIODevice" - exports: ["Enginio/QNetworkReply 1.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - Enum { - name: "NetworkError" - values: { - "NoError": 0, - "ConnectionRefusedError": 1, - "RemoteHostClosedError": 2, - "HostNotFoundError": 3, - "TimeoutError": 4, - "OperationCanceledError": 5, - "SslHandshakeFailedError": 6, - "TemporaryNetworkFailureError": 7, - "NetworkSessionFailedError": 8, - "BackgroundRequestNotAllowedError": 9, - "UnknownNetworkError": 99, - "ProxyConnectionRefusedError": 101, - "ProxyConnectionClosedError": 102, - "ProxyNotFoundError": 103, - "ProxyTimeoutError": 104, - "ProxyAuthenticationRequiredError": 105, - "UnknownProxyError": 199, - "ContentAccessDenied": 201, - "ContentOperationNotPermittedError": 202, - "ContentNotFoundError": 203, - "AuthenticationRequiredError": 204, - "ContentReSendError": 205, - "ContentConflictError": 206, - "ContentGoneError": 207, - "UnknownContentError": 299, - "ProtocolUnknownError": 301, - "ProtocolInvalidOperationError": 302, - "ProtocolFailure": 399, - "InternalServerError": 401, - "OperationNotImplementedError": 402, - "ServiceUnavailableError": 403, - "UnknownServerError": 499 - } - } - Signal { name: "metaDataChanged" } - Signal { name: "finished" } - Signal { - name: "error" - Parameter { type: "QNetworkReply::NetworkError" } - } - Signal { name: "encrypted" } - Signal { - name: "sslErrors" - Parameter { name: "errors"; type: "QList" } - } - Signal { - name: "uploadProgress" - Parameter { name: "bytesSent"; type: "qlonglong" } - Parameter { name: "bytesTotal"; type: "qlonglong" } - } - Signal { - name: "downloadProgress" - Parameter { name: "bytesReceived"; type: "qlonglong" } - Parameter { name: "bytesTotal"; type: "qlonglong" } - } - Method { name: "abort" } - Method { name: "ignoreSslErrors" } - } -} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Enginio/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/Enginio/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/Enginio/qmldir 2015-06-26 09:55:11.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Enginio/qmldir 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -module Enginio -plugin enginioplugin -typeinfo plugins.qmltypes -classname EnginioPlugin - diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/calendar/DayOfWeekRow.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/calendar/DayOfWeekRow.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/calendar/DayOfWeekRow.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/calendar/DayOfWeekRow.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.calendar 1.0 + +AbstractDayOfWeekRow { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + + spacing: 6 + topPadding: 6 + bottomPadding: 6 + font.bold: true + + //! [delegate] + delegate: Text { + text: model.shortName + font: control.font + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + //! [delegate] + + //! [contentItem] + contentItem: Row { + spacing: control.spacing + Repeater { + model: control.source + delegate: control.delegate + } + } + //! [contentItem] +} Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/calendar/libqtlabscalendarplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/calendar/libqtlabscalendarplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/calendar/MonthGrid.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/calendar/MonthGrid.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/calendar/MonthGrid.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/calendar/MonthGrid.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.calendar 1.0 + +AbstractMonthGrid { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + + spacing: 6 + + //! [delegate] + delegate: Text { + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + opacity: model.month === control.month ? 1 : 0 + text: model.day + font: control.font + } + //! [delegate] + + //! [contentItem] + contentItem: Grid { + rows: 6 + columns: 7 + rowSpacing: control.spacing + columnSpacing: control.spacing + + Repeater { + model: control.source + delegate: control.delegate + } + } + //! [contentItem] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/calendar/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/calendar/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/calendar/plugins.qmltypes 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/calendar/plugins.qmltypes 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,133 @@ +import QtQuick.tooling 1.2 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. +// +// This file was auto-generated by: +// 'qmlplugindump -nonrelocatable Qt.labs.calendar 1.0' + +Module { + dependencies: ["QtQuick 2.6"] + Component { + name: "QQuickCalendar" + prototype: "QObject" + exports: ["Qt.labs.calendar/Calendar 1.0"] + isCreatable: false + isSingleton: true + exportMetaObjectRevisions: [0] + Enum { + name: "Month" + values: { + "January": 0, + "February": 1, + "March": 2, + "April": 3, + "May": 4, + "June": 5, + "July": 6, + "August": 7, + "September": 8, + "October": 9, + "November": 10, + "December": 11 + } + } + } + Component { + name: "QQuickCalendarModel" + prototype: "QAbstractListModel" + exports: ["Qt.labs.calendar/CalendarModel 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "from"; type: "QDate" } + Property { name: "to"; type: "QDate" } + Property { name: "count"; type: "int"; isReadonly: true } + Method { + name: "monthAt" + type: "int" + Parameter { name: "index"; type: "int" } + } + Method { + name: "yearAt" + type: "int" + Parameter { name: "index"; type: "int" } + } + Method { + name: "indexOf" + type: "int" + Parameter { name: "date"; type: "QDate" } + } + Method { + name: "indexOf" + type: "int" + Parameter { name: "year"; type: "int" } + Parameter { name: "month"; type: "int" } + } + } + Component { + name: "QQuickControl" + defaultProperty: "data" + prototype: "QQuickItem" + Property { name: "font"; type: "QFont" } + Property { name: "availableWidth"; type: "double"; isReadonly: true } + Property { name: "availableHeight"; type: "double"; isReadonly: true } + Property { name: "padding"; type: "double" } + Property { name: "topPadding"; type: "double" } + Property { name: "leftPadding"; type: "double" } + Property { name: "rightPadding"; type: "double" } + Property { name: "bottomPadding"; type: "double" } + Property { name: "spacing"; type: "double" } + Property { name: "locale"; type: "QLocale" } + Property { name: "mirrored"; type: "bool"; isReadonly: true } + Property { name: "focusReason"; type: "Qt::FocusReason" } + Property { name: "background"; type: "QQuickItem"; isPointer: true } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + } + Component { + name: "QQuickDayOfWeekRow" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.calendar/AbstractDayOfWeekRow 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "source"; type: "QVariant" } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + } + Component { + name: "QQuickMonthGrid" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.calendar/AbstractMonthGrid 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "month"; type: "int" } + Property { name: "year"; type: "int" } + Property { name: "source"; type: "QVariant" } + Property { name: "title"; type: "string" } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Signal { + name: "pressed" + Parameter { name: "date"; type: "QDate" } + } + Signal { + name: "released" + Parameter { name: "date"; type: "QDate" } + } + Signal { + name: "clicked" + Parameter { name: "date"; type: "QDate" } + } + Signal { + name: "pressAndHold" + Parameter { name: "date"; type: "QDate" } + } + } + Component { + name: "QQuickWeekNumberColumn" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.calendar/AbstractWeekNumberColumn 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "month"; type: "int" } + Property { name: "year"; type: "int" } + Property { name: "source"; type: "QVariant" } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/calendar/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/calendar/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/calendar/qmldir 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/calendar/qmldir 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,6 @@ +module Qt.labs.calendar +plugin qtlabscalendarplugin +classname QtLabsCalendarPlugin +DayOfWeekRow 1.0 DayOfWeekRow.qml +MonthGrid 1.0 MonthGrid.qml +WeekNumberColumn 1.0 WeekNumberColumn.qml diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/calendar/WeekNumberColumn.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/calendar/WeekNumberColumn.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/calendar/WeekNumberColumn.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/calendar/WeekNumberColumn.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Calendar module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.calendar 1.0 + +AbstractWeekNumberColumn { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + + spacing: 6 + leftPadding: 6 + rightPadding: 6 + font.bold: true + + //! [delegate] + delegate: Text { + text: model.weekNumber + font: control.font + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + //! [delegate] + + //! [contentItem] + contentItem: Column { + spacing: control.spacing + Repeater { + model: control.source + delegate: control.delegate + } + } + //! [contentItem] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ApplicationWindow.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ApplicationWindow.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ApplicationWindow.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ApplicationWindow.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import QtQuick.Window 2.2 +import Qt.labs.templates 1.0 as T + +T.ApplicationWindow { + id: window + + color: "#ffffff" + + overlay.background: Rectangle { + color: "#7f28282a" + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/BusyIndicator.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/BusyIndicator.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/BusyIndicator.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/BusyIndicator.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 +import Qt.labs.controls.impl 1.0 +import Qt.labs.templates 1.0 as T + +T.BusyIndicator { + id: control + + implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding + implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding + + padding: 6 + + //! [contentItem] + contentItem: BusyRing { + id: ring + implicitWidth: 48 + implicitHeight: 48 + opacity: control.running ? 1 : 0 + + Behavior on opacity { OpacityAnimator { duration: 250 } } + + BusyRingAnimator { + target: ring + running: control.visible && control.running + } + } + //! [contentItem] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Button.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Button.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Button.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Button.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.Button { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + label ? label.implicitHeight + topPadding + bottomPadding : 0) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 6 + leftPadding: 8 + rightPadding: 8 + + //! [label] + label: Text { + x: control.leftPadding + y: control.topPadding + width: control.availableWidth + height: control.availableHeight + text: control.text + font: control.font + opacity: enabled || highlighted ? 1 : 0.3 + color: control.highlighted ? "#ffffff" : (control.pressed ? "#26282a" : "#353637") + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } + //! [label] + + //! [background] + background: Rectangle { + implicitWidth: 100 + implicitHeight: 40 + opacity: enabled ? 1 : 0.3 + color: control.pressed ? (control.highlighted ? "#585a5c" : "#e4e4e4") : (control.highlighted ? "#353637" : "#f6f6f6") + border.color: control.pressed ? "#26282a" : "#353637" + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/CheckBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/CheckBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/CheckBox.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/CheckBox.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,100 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.CheckBox { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (label ? label.implicitWidth : 0) + + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(label ? label.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 6 + spacing: 6 + opacity: enabled ? 1 : 0.2 + + //! [indicator] + indicator: Rectangle { + implicitWidth: 28 + implicitHeight: 28 + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + + color: control.enabled ? (control.pressed ? "#e4e4e4" : "#f6f6f6") : "#353637" + border.color: control.enabled ? (control.pressed ? "#26282a" : "#353637") : "transparent" + + Image { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + source: "qrc:/qt-project.org/imports/Qt/labs/controls/images/check.png" + visible: control.checkState === Qt.Checked + } + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 16 + height: 3 + color: "#353637" + visible: control.checkState === Qt.PartiallyChecked + } + } + //! [indicator] + + //! [label] + label: Text { + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.spacing) + y: control.topPadding + width: control.availableWidth - indicator.width - control.spacing + height: control.availableHeight + + text: control.text + font: control.font + color: control.pressed ? "#26282a" : "#353637" + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ComboBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ComboBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ComboBox.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ComboBox.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,128 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import QtQuick.Window 2.2 +import Qt.labs.templates 1.0 as T + +T.ComboBox { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset + + spacing: 8 + padding: 6 + leftPadding: 8 + rightPadding: 8 + + //! [delegate] + delegate: ItemDelegate { + width: control.width + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData + checkable: true + autoExclusive: true + checked: control.currentIndex === index + highlighted: control.highlightedIndex === index + pressed: highlighted && control.pressed + } + //! [delegate] + + //! [contentItem] + contentItem: Text { + text: control.displayText + font: control.font + color: "#ffffff" + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + rightPadding: 18 + control.spacing + } + //! [contentItem] + + //! [background] + background: Item { + implicitWidth: 120 + implicitHeight: 40 + + Rectangle { + width: parent.width + height: parent.height + opacity: control.enabled ? 1.0 : 0.2 + color: control.pressed || popup.visible ? "#585A5C" : "#353637" + } + + Image { + x: parent.width - width - control.rightPadding + y: (parent.height - height) / 2 + source: "qrc:/qt-project.org/imports/Qt/labs/controls/images/drop-indicator.png" + } + } + //! [background] + + //! [popup] + popup: T.Popup { + y: control.height - 1 + implicitWidth: control.width + implicitHeight: listview.contentHeight + topMargin: 6 + bottomMargin: 6 + + contentItem: ListView { + id: listview + clip: true + model: control.popup.visible ? control.delegateModel : null + currentIndex: control.highlightedIndex + + Rectangle { + z: 10 + parent: listview + width: listview.width + height: listview.height + border.color: "#353637" + color: "transparent" + } + + T.ScrollIndicator.vertical: ScrollIndicator { } + } + + background: Rectangle { } + } + //! [popup] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/BusyIndicatorSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/BusyIndicatorSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/BusyIndicatorSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/BusyIndicatorSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,70 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + Section { + width: parent.width + caption: qsTr("Busy Indicator") + + SectionLayout { + Label { + text: qsTr("Running") + tooltip: qsTr("Whether the busy indicator is currently indicating activity.") + } + SecondColumnLayout { + CheckBox { + text: backendValues.running.valueToString + backendValue: backendValues.running + Layout.fillWidth: true + } + } + } + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ButtonSection.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ButtonSection.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ButtonSection.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ButtonSection.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,117 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Section { + id: section + + SectionLayout { + Label { + text: qsTr("Text") + tooltip: qsTr("The text displayed on the %1.").arg(section.caption.toLowerCase()) + } + SecondColumnLayout { + LineEdit { + backendValue: backendValues.text + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Highlighted") + tooltip: qsTr("Whether the %1 is highlighted.").arg(section.caption.toLowerCase()) + } + SecondColumnLayout { + CheckBox { + text: backendValues.highlighted.valueToString + backendValue: backendValues.highlighted + Layout.fillWidth: true + } + } + + Label { + visible: checkable + text: qsTr("Checkable") + tooltip: qsTr("Whether the %1 is checkable.").arg(section.caption.toLowerCase()) + } + SecondColumnLayout { + CheckBox { + text: backendValues.checkable.valueToString + backendValue: backendValues.checkable + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Checked") + tooltip: qsTr("Whether the %1 is checked.").arg(section.caption.toLowerCase()) + } + SecondColumnLayout { + CheckBox { + text: backendValues.checked.valueToString + backendValue: backendValues.checked + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Exclusive") + tooltip: qsTr("Whether the %1 is exclusive.").arg(section.caption.toLowerCase()) + } + SecondColumnLayout { + CheckBox { + text: backendValues.autoExclusive.valueToString + backendValue: backendValues.autoExclusive + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Repeat") + tooltip: qsTr("Whether the %1 repeats while pressed and held down.").arg(section.caption.toLowerCase()) + } + SecondColumnLayout { + CheckBox { + text: backendValues.autoRepeat.valueToString + backendValue: backendValues.autoRepeat + Layout.fillWidth: true + } + } + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ButtonSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ButtonSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ButtonSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ButtonSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + ButtonSection { + caption: qsTr("Button") + width: parent.width + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/CheckBoxSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/CheckBoxSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/CheckBoxSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/CheckBoxSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + ButtonSection { + caption: qsTr("Check Box") + width: parent.width + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ComboBoxSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ComboBoxSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ComboBoxSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ComboBoxSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + Section { + width: parent.width + caption: qsTr("Combo Box") + + SectionLayout { + Label { + text: qsTr("Text Role") + tooltip: qsTr("The model role used for displaying text.") + } + SecondColumnLayout { + LineEdit { + backendValue: backendValues.textRole + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Current") + tooltip: qsTr("The index of the current item.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 0 + backendValue: backendValues.currentIndex + Layout.fillWidth: true + } + } + } + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ControlSection.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ControlSection.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ControlSection.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ControlSection.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Section { + caption: qsTr("Control") + + SectionLayout { + Label { + text: qsTr("Enabled") + tooltip: qsTr("Whether the control is enabled.") + } + SecondColumnLayout { + CheckBox { + text: backendValues.enabled.valueToString + backendValue: backendValues.enabled + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Spacing") + tooltip: qsTr("Spacing between internal elements of the control.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 0 + backendValue: backendValues.spacing + Layout.fillWidth: true + } + } + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ControlSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ControlSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ControlSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ControlSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/DialSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/DialSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/DialSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/DialSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,114 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.1 + +Column { + width: parent.width + + Section { + width: parent.width + caption: qsTr("Dial") + + SectionLayout { + Label { + text: qsTr("Value") + tooltip: qsTr("The current value of the dial.") + } + SecondColumnLayout { + SpinBox { + minimumValue: Math.min(backendValues.from.value, backendValues.to.value) + maximumValue: Math.max(backendValues.from.value, backendValues.to.value) + decimals: 2 + backendValue: backendValues.value + Layout.fillWidth: true + } + } + + Label { + text: qsTr("From") + tooltip: qsTr("The starting value of the dial range.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 2 + backendValue: backendValues.from + Layout.fillWidth: true + } + } + + Label { + text: qsTr("To") + tooltip: qsTr("The ending value of the dial range.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 2 + backendValue: backendValues.to + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Step Size") + tooltip: qsTr("The step size of the dial.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 2 + backendValue: backendValues.stepSize + Layout.fillWidth: true + } + } + } + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/FrameSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/FrameSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/FrameSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/FrameSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/GroupBoxSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/GroupBoxSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/GroupBoxSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/GroupBoxSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + Section { + width: parent.width + caption: qsTr("Group Box") + + SectionLayout { + Label { + text: qsTr("Title") + tooltip: qsTr("The title of the group box.") + } + SecondColumnLayout { + LineEdit { + backendValue: backendValues.title + Layout.fillWidth: true + } + } + } + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/busyindicator-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/busyindicator-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/busyindicator-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/busyindicator-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/busyindicator-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/busyindicator-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/busyindicator-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/busyindicator-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/button-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/button-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/button-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/button-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/button-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/button-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/button-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/button-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/checkbox-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/checkbox-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/checkbox-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/checkbox-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/checkbox-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/checkbox-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/checkbox-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/checkbox-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/combobox-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/combobox-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/combobox-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/combobox-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/combobox-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/combobox-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/combobox-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/combobox-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/dial-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/dial-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/dial-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/dial-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/dial-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/dial-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/dial-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/dial-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/frame-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/frame-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/frame-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/frame-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/frame-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/frame-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/frame-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/frame-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/groupbox-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/groupbox-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/groupbox-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/groupbox-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/groupbox-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/groupbox-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/groupbox-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/groupbox-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/itemdelegate-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/itemdelegate-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/itemdelegate-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/itemdelegate-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/itemdelegate-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/itemdelegate-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/itemdelegate-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/itemdelegate-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/label-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/label-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/label-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/label-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/label-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/label-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/label-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/label-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pageindicator-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pageindicator-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pageindicator-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pageindicator-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pageindicator-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pageindicator-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pageindicator-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pageindicator-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pane-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pane-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pane-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pane-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pane-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pane-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pane-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/pane-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/placeholder-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/placeholder-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/placeholder-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/placeholder-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/placeholder-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/placeholder-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/placeholder-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/placeholder-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/progressbar-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/progressbar-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/progressbar-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/progressbar-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/progressbar-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/progressbar-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/progressbar-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/progressbar-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/radiobutton-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/radiobutton-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/radiobutton-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/radiobutton-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/radiobutton-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/radiobutton-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/radiobutton-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/radiobutton-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/slider-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/slider-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/slider-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/slider-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/slider-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/slider-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/slider-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/slider-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/spinbox-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/spinbox-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/spinbox-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/spinbox-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/spinbox-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/spinbox-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/spinbox-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/spinbox-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/switch-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/switch-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/switch-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/switch-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/switch-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/switch-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/switch-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/switch-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textarea-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textarea-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textarea-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textarea-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textarea-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textarea-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textarea-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textarea-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textfield-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textfield-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textfield-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textfield-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textfield-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textfield-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textfield-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/textfield-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbar-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbar-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbar-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbar-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbar-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbar-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbar-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbar-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbutton-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbutton-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbutton-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbutton-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbutton-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbutton-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbutton-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/toolbutton-icon.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/tumbler-icon16@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/tumbler-icon16@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/tumbler-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/tumbler-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/tumbler-icon@2x.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/tumbler-icon@2x.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/tumbler-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/images/tumbler-icon.png differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ItemDelegateSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ItemDelegateSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ItemDelegateSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ItemDelegateSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + ButtonSection { + caption: qsTr("Item Delegate") + width: parent.width + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/LabelSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/LabelSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/LabelSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/LabelSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + StandardTextSection { + width: parent.width + showIsWrapping: true + showFormatProperty: true + showVerticalAlignment: true + } + + FontSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/PaddingSection.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/PaddingSection.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/PaddingSection.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/PaddingSection.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,101 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Section { + caption: qsTr("Padding") + + SectionLayout { + Label { + text: qsTr("Top") + tooltip: qsTr("Padding between the content and the top edge of the control.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 0 + backendValue: backendValues.topPadding + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Left") + tooltip: qsTr("Padding between the content and the left edge of the control.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 0 + backendValue: backendValues.leftPadding + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Right") + tooltip: qsTr("Padding between the content and the right edge of the control.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 0 + backendValue: backendValues.rightPadding + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Bottom") + tooltip: qsTr("Padding between the content and the bottom edge of the control.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 0 + backendValue: backendValues.bottomPadding + Layout.fillWidth: true + } + } + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/PageIndicatorSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/PageIndicatorSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/PageIndicatorSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/PageIndicatorSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + Section { + width: parent.width + caption: qsTr("Indicator") + + SectionLayout { + Label { + text: qsTr("Count") + tooltip: qsTr("The number of pages.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 0 + backendValue: backendValues.count + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Current") + tooltip: qsTr("The index of the current page.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 0 + backendValue: backendValues.currentIndex + Layout.fillWidth: true + } + } + } + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/PaneSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/PaneSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/PaneSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/PaneSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ProgressBarSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ProgressBarSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ProgressBarSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ProgressBarSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,112 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + Section { + width: parent.width + caption: qsTr("Progress Bar") + + SectionLayout { + Label { + text: qsTr("Indeterminate") + tooltip: qsTr("Whether the progress is indeterminate.") + } + SecondColumnLayout { + CheckBox { + text: backendValues.indeterminate.valueToString + backendValue: backendValues.indeterminate + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Value") + tooltip: qsTr("The current value of the progress.") + } + SecondColumnLayout { + SpinBox { + minimumValue: Math.min(backendValues.from.value, backendValues.to.value) + maximumValue: Math.max(backendValues.from.value, backendValues.to.value) + decimals: 2 + backendValue: backendValues.value + Layout.fillWidth: true + } + } + + Label { + text: qsTr("From") + tooltip: qsTr("The starting value for the progress.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 2 + backendValue: backendValues.from + Layout.fillWidth: true + } + } + + Label { + text: qsTr("To") + tooltip: qsTr("The ending value for the progress.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 2 + backendValue: backendValues.to + Layout.fillWidth: true + } + } + } + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/qtlabscontrols.metainfo shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/qtlabscontrols.metainfo --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/qtlabscontrols.metainfo 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/qtlabscontrols.metainfo 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,310 @@ +MetaInfo { + Type { + name: "Qt.labs.controls.BusyIndicator" + icon: "images/busyindicator-icon16.png" + + ItemLibraryEntry { + name: "Busy Indicator" + category: "Qt Labs - Controls" + libraryIcon: "images/busyindicator-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + } + } + + Type { + name: "Qt.labs.controls.Button" + icon: "images/button-icon16.png" + + ItemLibraryEntry { + name: "Button" + category: "Qt Labs - Controls" + libraryIcon: "images/button-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr(\"Button\")" } + } + } + + Type { + name: "Qt.labs.controls.CheckBox" + icon: "images/checkbox-icon16.png" + + ItemLibraryEntry { + name: "Check Box" + category: "Qt Labs - Controls" + libraryIcon: "images/checkbox-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr(\"Check Box\")" } + } + } + + Type { + name: "Qt.labs.controls.ComboBox" + icon: "images/combobox-icon16.png" + + ItemLibraryEntry { + name: "Combo Box" + category: "Qt Labs - Controls" + libraryIcon: "images/combobox-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + } + } + + Type { + name: "Qt.labs.controls.Dial" + icon: "images/dial-icon16.png" + + ItemLibraryEntry { + name: "Dial" + category: "Qt Labs - Controls" + libraryIcon: "images/dial-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + } + } + + Type { + name: "Qt.labs.controls.Frame" + icon: "images/frame-icon16.png" + + ItemLibraryEntry { + name: "Frame" + category: "Qt Labs - Controls" + libraryIcon: "images/frame-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } + + Type { + name: "Qt.labs.controls.GroupBox" + icon: "images/groupbox-icon16.png" + + ItemLibraryEntry { + name: "Group Box" + category: "Qt Labs - Controls" + libraryIcon: "images/groupbox-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + Property { name: "title"; type: "binding"; value: "qsTr(\"Group Box\")" } + } + } + + Type { + name: "Qt.labs.controls.ItemDelegate" + icon: "images/itemdelegate-icon16.png" + + ItemLibraryEntry { + name: "Item Delegate" + category: "Qt Labs - Controls" + libraryIcon: "images/itemdelegate-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr(\"Item Delegate\")" } + } + } + + Type { + name: "Qt.labs.controls.Label" + icon: "images/label-icon16.png" + + ItemLibraryEntry { + name: "Label" + category: "Qt Labs - Controls" + libraryIcon: "images/label-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr(\"Label\")" } + } + } + + Type { + name: "Qt.labs.controls.PageIndicator" + icon: "images/pageindicator-icon16.png" + + ItemLibraryEntry { + name: "Page Indicator" + category: "Qt Labs - Controls" + libraryIcon: "images/pageindicator-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "count"; type: "int"; value: 3 } + } + } + + Type { + name: "Qt.labs.controls.Pane" + icon: "images/pane-icon16.png" + + ItemLibraryEntry { + name: "Pane" + category: "Qt Labs - Controls" + libraryIcon: "images/pane-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } + + Type { + name: "Qt.labs.controls.ProgressBar" + icon: "images/progressbar-icon16.png" + + ItemLibraryEntry { + name: "Progress Bar" + category: "Qt Labs - Controls" + libraryIcon: "images/progressbar-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "value"; type: "real"; value: 0.5 } + } + } + + Type { + name: "Qt.labs.controls.RadioButton" + icon: "images/radiobutton-icon16.png" + + ItemLibraryEntry { + name: "Radio Button" + category: "Qt Labs - Controls" + libraryIcon: "images/radiobutton-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr(\"Radio Button\")" } + } + } + + Type { + name: "Qt.labs.controls.Slider" + icon: "images/slider-icon16.png" + + ItemLibraryEntry { + name: "Slider" + category: "Qt Labs - Controls" + libraryIcon: "images/slider-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "value"; type: "real"; value: 0.5 } + } + } + + Type { + name: "Qt.labs.controls.SpinBox" + icon: "images/spinbox-icon16.png" + + ItemLibraryEntry { + name: "Spin Box" + category: "Qt Labs - Controls" + libraryIcon: "images/spinbox-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + } + } + + Type { + name: "Qt.labs.controls.Switch" + icon: "images/switch-icon16.png" + + ItemLibraryEntry { + name: "Switch" + category: "Qt Labs - Controls" + libraryIcon: "images/switch-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr(\"Switch\")" } + } + } + + Type { + name: "Qt.labs.controls.TextArea" + icon: "images/textarea-icon16.png" + + ItemLibraryEntry { + name: "Text Area" + category: "Qt Labs - Controls" + libraryIcon: "images/textarea-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr(\"Text Area\")" } + } + } + + Type { + name: "Qt.labs.controls.TextField" + icon: "images/textfield-icon16.png" + + ItemLibraryEntry { + name: "Text Field" + category: "Qt Labs - Controls" + libraryIcon: "images/textfield-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr(\"Text Field\")" } + } + } + + Type { + name: "Qt.labs.controls.ToolButton" + icon: "images/toolbutton-icon16.png" + + ItemLibraryEntry { + name: "Tool Button" + category: "Qt Labs - Controls" + libraryIcon: "images/toolbutton-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr(\"Tool Button\")" } + } + } + + Type { + name: "Qt.labs.controls.ToolBar" + icon: "images/toolbar-icon16.png" + + ItemLibraryEntry { + name: "Tool Bar" + category: "Qt Labs - Controls" + libraryIcon: "images/toolbar-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + + Property { name: "width"; type: "int"; value: 360 } + } + } + + Type { + name: "Qt.labs.controls.Tumbler" + icon: "images/tumbler-icon16.png" + + ItemLibraryEntry { + name: "Tumbler" + category: "Qt Labs - Controls" + libraryIcon: "images/tumbler-icon.png" + version: "1.0" + requiredImport: "Qt.labs.controls" + } + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/RadioButtonSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/RadioButtonSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/RadioButtonSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/RadioButtonSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + ButtonSection { + caption: qsTr("Radio Button") + width: parent.width + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/SliderSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/SliderSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/SliderSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/SliderSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,127 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.1 + +Column { + width: parent.width + + Section { + width: parent.width + caption: qsTr("Slider") + + SectionLayout { + Label { + text: qsTr("Value") + tooltip: qsTr("The current value of the slider.") + } + SecondColumnLayout { + SpinBox { + minimumValue: Math.min(backendValues.from.value, backendValues.to.value) + maximumValue: Math.max(backendValues.from.value, backendValues.to.value) + decimals: 2 + backendValue: backendValues.value + Layout.fillWidth: true + } + } + + Label { + text: qsTr("From") + tooltip: qsTr("The starting value of the slider range.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 2 + backendValue: backendValues.from + Layout.fillWidth: true + } + } + + Label { + text: qsTr("To") + tooltip: qsTr("The ending value of the slider range.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 2 + backendValue: backendValues.to + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Step Size") + tooltip: qsTr("The step size of the slider.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 2 + backendValue: backendValues.stepSize + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Orientation") + tooltip: qsTr("The orientation of the slider.") + } + SecondColumnLayout { + ComboBox { + backendValue: backendValues.orientation + model: [ "Horizontal", "Vertical" ] + scope: "Qt" + Layout.fillWidth: true + } + } + } + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/SpinBoxSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/SpinBoxSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/SpinBoxSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/SpinBoxSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,114 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.1 + +Column { + width: parent.width + + Section { + width: parent.width + caption: qsTr("Spin Box") + + SectionLayout { + Label { + text: qsTr("Value") + tooltip: qsTr("The current value of the spinbox.") + } + SecondColumnLayout { + SpinBox { + minimumValue: Math.min(backendValues.from.value, backendValues.to.value) + maximumValue: Math.max(backendValues.from.value, backendValues.to.value) + decimals: 2 + backendValue: backendValues.value + Layout.fillWidth: true + } + } + + Label { + text: qsTr("From") + tooltip: qsTr("The starting value of the spinbox range.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 2 + backendValue: backendValues.from + Layout.fillWidth: true + } + } + + Label { + text: qsTr("To") + tooltip: qsTr("The ending value of the spinbox range.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 2 + backendValue: backendValues.to + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Step Size") + tooltip: qsTr("The step size of the spinbox.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 2 + backendValue: backendValues.stepSize + Layout.fillWidth: true + } + } + } + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/SwitchSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/SwitchSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/SwitchSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/SwitchSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + ButtonSection { + caption: qsTr("Switch") + width: parent.width + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/TextAreaSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/TextAreaSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/TextAreaSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/TextAreaSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + StandardTextSection { + width: parent.width + showIsWrapping: true + showFormatProperty: true + showVerticalAlignment: true + } + + FontSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/TextFieldSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/TextFieldSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/TextFieldSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/TextFieldSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + StandardTextSection { + width: parent.width + } + + FontSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ToolBarSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ToolBarSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ToolBarSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ToolBarSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ToolButtonSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ToolButtonSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ToolButtonSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/ToolButtonSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + ButtonSection { + caption: qsTr("Tool Button") + width: parent.width + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/TumblerSpecifics.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/TumblerSpecifics.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/TumblerSpecifics.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/designer/TumblerSpecifics.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +Column { + width: parent.width + + Section { + width: parent.width + caption: qsTr("Tumbler") + + SectionLayout { + Label { + text: qsTr("Visible Count") + tooltip: qsTr("The count of visible items.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 0 + backendValue: backendValues.visibleItemCount + Layout.fillWidth: true + } + } + + Label { + text: qsTr("Current") + tooltip: qsTr("The index of the current item.") + } + SecondColumnLayout { + SpinBox { + maximumValue: 9999999 + minimumValue: -9999999 + decimals: 0 + backendValue: backendValues.currentIndex + Layout.fillWidth: true + } + } + } + } + + ControlSection { + width: parent.width + } + + PaddingSection { + width: parent.width + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Dial.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Dial.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Dial.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Dial.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.Dial { + id: control + + implicitWidth: 184 + implicitHeight: 184 + + //! [background] + background: Rectangle { + x: control.width / 2 - width / 2 + y: control.height / 2 - height / 2 + width: Math.max(64, Math.min(control.width, control.height)) + height: Math.max(64, Math.min(control.width, control.height)) + radius: width / 2 + border.color: "#353637" + } + //! [background] + + //! [handle] + handle: Image { + id: handleItem + x: background.x + background.width / 2 - handle.width / 2 + y: background.y + background.height / 2 - handle.height / 2 + width: 14 + height: 10 + source: "qrc:/qt-project.org/imports/Qt/labs/controls/images/dial-indicator.png" + antialiasing: true + transform: [ + Translate { + y: -background.height * 0.4 + handle.height / 2 + }, + Rotation { + angle: control.angle + origin.x: handle.width / 2 + origin.y: handle.height / 2 + } + ] + } + //! [handle] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Drawer.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Drawer.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Drawer.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Drawer.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import QtQuick.Window 2.2 +import Qt.labs.templates 1.0 as T + +T.Drawer { + id: control + + parent: T.ApplicationWindow.overlay || Window.contentItem + width: parent ? parent.width : 0 // TODO: Window.width + height: parent ? parent.height : 0 // TODO: Window.height + + // TODO: make this a proper transition + animation: SmoothedAnimation { + velocity: 5 + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Frame.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Frame.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Frame.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Frame.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.Frame { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + padding: 6 + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [frame] + frame: Rectangle { + width: parent.width + height: parent.height + + color: "transparent" + border.color: "#bdbebf" + } + //! [frame] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/GroupBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/GroupBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/GroupBox.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/GroupBox.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.GroupBox { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.implicitWidth + leftPadding + rightPadding : 0, + contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + spacing: 6 + padding: 6 + topPadding: 6 + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [label] + label: Text { + x: control.leftPadding + width: control.availableWidth + + text: control.title + font: control.font + color: control.enabled ? "#353637" : "#bdbebf" + elide: Text.ElideRight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] + + //! [frame] + frame: Rectangle { + y: control.topPadding - control.padding + width: parent.width + height: parent.height - control.topPadding + control.padding + + color: "transparent" + border.color: "#bdbebf" + } + //! [frame] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ItemDelegate.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ItemDelegate.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ItemDelegate.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ItemDelegate.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,90 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.ItemDelegate { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (label ? label.implicitWidth : 0) + + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(label ? label.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 12 + spacing: 12 + + //! [label] + label: Text { + x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding + y: control.topPadding + width: control.availableWidth - (control.checkable ? indicator.width + control.spacing : 0) + height: control.availableHeight + + text: control.text + font: control.font + color: control.enabled ? "#26282a" : "#bdbebf" + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] + + //! [indicator] + indicator: Image { + x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding + y: control.topPadding + (control.availableHeight - height) / 2 + + visible: control.checked + source: control.checkable ? "qrc:/qt-project.org/imports/Qt/labs/controls/images/check.png" : "" + } + //! [indicator] + + //! [background] + background: Rectangle { + implicitWidth: 100 + implicitHeight: 40 + visible: control.pressed || control.highlighted + color: control.pressed ? "#bdbebf" : "#eeeeee" + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Label.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Label.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Label.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Label.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.Label { + id: control + + color: "#26282a" + linkColor: "#45a7d7" // TODO +} Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/libqtlabscontrolsplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/libqtlabscontrolsplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ApplicationWindow.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ApplicationWindow.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ApplicationWindow.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ApplicationWindow.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import QtQuick.Window 2.2 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.ApplicationWindow { + id: window + + color: Material.backgroundColor + + overlay.background: Rectangle { + color: window.Material.backgroundDimColor + Behavior on opacity { NumberAnimation { duration: 150 } } + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/BusyIndicator.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/BusyIndicator.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/BusyIndicator.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/BusyIndicator.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,72 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 +import Qt.labs.controls.material.impl 1.0 + +T.BusyIndicator { + id: control + + implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding + implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding + + padding: 6 + + //! [contentItem] + contentItem: ProgressRing { + id: ring + x: control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + implicitWidth: 48 + implicitHeight: 48 + width: size + height: size + opacity: control.running ? 1 : 0 + color: control.Material.accentColor + + readonly property real size: Math.min(control.availableWidth, control.availableHeight) + + Behavior on opacity { OpacityAnimator { duration: 250 } } + + RingAnimator { + target: ring + running: control.visible && control.running + } + } + //! [contentItem] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Button.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Button.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Button.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Button.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,111 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 +import QtGraphicalEffects 1.0 + +T.Button { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + label ? label.implicitHeight + topPadding + bottomPadding : 0) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + // external vertical padding is 6 (to increase touch area) + padding: 12 + leftPadding: 8 + rightPadding: 8 + + //! [label] + label: Text { + x: control.leftPadding + y: control.topPadding + width: control.availableWidth + height: control.availableHeight + + text: control.text + font: control.font + color: !control.enabled ? control.Material.hintTextColor : + control.highlighted ? control.Material.primaryHighlightedTextColor : control.Material.primaryTextColor + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } + //! [label] + + //! [background] + background: Rectangle { + implicitWidth: 64 + implicitHeight: 48 + + // external vertical padding is 6 (to increase touch area) + y: 6 + width: parent.width + height: parent.height - 12 + radius: 2 + color: !control.enabled ? (control.highlighted ? control.Material.raisedHighlightedButtonDisabledColor : control.Material.raisedButtonDisabledColor) : + (control.pressed ? (control.highlighted ? control.Material.raisedHighlightedButtonPressColor : control.Material.raisedButtonPressColor) : + (control.activeFocus ? (control.highlighted ? control.Material.raisedHighlightedButtonHoverColor : control.Material.raisedButtonHoverColor) : + (control.highlighted ? control.Material.raisedHighlightedButtonColor : control.Material.raisedButtonColor))) + + Behavior on color { + ColorAnimation { + duration: 400 + } + } + + Rectangle { + width: parent.width + height: parent.height + radius: parent.radius + visible: control.activeFocus + color: control.Material.checkBoxUncheckedRippleColor + } + + layer.enabled: control.enabled + layer.effect: DropShadow { + verticalOffset: 1 + color: control.Material.dropShadowColor + samples: control.pressed ? 15 : 9 + spread: 0.5 + } + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/CheckBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/CheckBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/CheckBox.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/CheckBox.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,162 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.CheckBox { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (label ? label.implicitWidth : 0) + + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(label ? label.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + spacing: 8 + topPadding: 14 + leftPadding: 8 + rightPadding: 8 + bottomPadding: 14 + + //! [indicator] + indicator: Rectangle { + id: indicatorItem + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + implicitWidth: 20 + implicitHeight: 20 + color: "transparent" + border.color: control.checked && control.enabled ? control.Material.accentColor : control.Material.secondaryTextColor + border.width: control.checked ? width / 2 : 2 + radius: 2 + + Behavior on border.width { + NumberAnimation { + duration: 100 + easing.type: Easing.OutCubic + } + } + + Behavior on border.color { + ColorAnimation { + duration: 100 + easing.type: Easing.OutCubic + } + } + + Ripple { + width: parent.width + height: width + control: control + colored: control.checked + opacity: control.pressed || control.activeFocus ? 1 : 0 + } + + // TODO: This needs to be transparent + Image { + id: checkImage + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 16 + height: 16 + source: "qrc:/qt-project.org/imports/Qt/labs/controls/material/images/check.png" + fillMode: Image.PreserveAspectFit + + scale: control.checkState === Qt.Checked ? 1 : 0 + Behavior on scale { NumberAnimation { duration: 100 } } + } + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 12 + height: 3 + visible: control.checkState === Qt.PartiallyChecked + } + + states: [ + State { + name: "checked" + when: control.checkState === Qt.Checked + }, + State { + name: "partiallychecked" + when: control.checkState === Qt.PartiallyChecked + } + ] + + transitions: Transition { + SequentialAnimation { + NumberAnimation { + target: indicatorItem + property: "scale" + // Go down 2 pixels in size. + to: 1 - 2 / indicatorItem.width + duration: 120 + } + NumberAnimation { + target: indicatorItem + property: "scale" + to: 1 + duration: 120 + } + } + } + } + //! [indicator] + + //! [label] + label: Text { + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.spacing) + y: control.topPadding + width: control.availableWidth - indicator.width - control.spacing + height: control.availableHeight + + text: control.text + font: control.font + color: control.enabled ? control.Material.primaryTextColor : control.Material.hintTextColor + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ComboBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ComboBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ComboBox.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ComboBox.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,163 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import QtQuick.Window 2.2 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 +import QtGraphicalEffects 1.0 + +T.ComboBox { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset + + spacing: 6 + padding: 12 + + //! [delegate] + delegate: MenuItem { + width: control.width + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData + highlighted: control.highlightedIndex === index + pressed: highlighted && control.pressed + } + //! [delegate] + + //! [contentItem] + contentItem: Text { + text: control.displayText + font: control.font + color: control.enabled ? control.Material.primaryTextColor : control.Material.hintTextColor + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + rightPadding: 14 + control.spacing + } + //! [contentItem] + + //! [background] + background: Rectangle { + implicitWidth: 120 + implicitHeight: 32 + + radius: 2 + color: control.Material.dialogColor + + Behavior on color { + ColorAnimation { + duration: 400 + } + } + + layer.enabled: control.enabled + layer.effect: DropShadow { + verticalOffset: 1 + color: control.Material.dropShadowColor + samples: control.pressed ? 15 : 9 + spread: 0.5 + } + + Image { + x: parent.width - width - control.rightPadding + y: (parent.height - height) / 2 + opacity: !control.enabled ? 0.5 : 1.0 + source: "qrc:/qt-project.org/imports/Qt/labs/controls/material/images/drop-indicator.png" + } + + Rectangle { + width: parent.width + height: parent.height + radius: parent.radius + visible: control.activeFocus + color: control.Material.checkBoxUncheckedRippleColor + } + } + //! [background] + + //! [popup] + popup: T.Popup { + y: control.height + implicitWidth: control.width + implicitHeight: listview.contentHeight + transformOrigin: Item.Top + topMargin: 12 + bottomMargin: 12 + + Material.theme: control.Material.theme + Material.accent: control.Material.accent + Material.primary: control.Material.primary + + enter: Transition { + // grow_fade_in + NumberAnimation { property: "scale"; from: 0.9; to: 1.0; easing.type: Easing.OutQuint; duration: 220 } + NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; easing.type: Easing.OutCubic; duration: 150 } + } + + exit: Transition { + // shrink_fade_out + NumberAnimation { property: "scale"; from: 1.0; to: 0.9; easing.type: Easing.OutQuint; duration: 220 } + NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; easing.type: Easing.OutCubic; duration: 150 } + } + + contentItem: ListView { + id: listview + clip: true + model: control.popup.visible ? control.delegateModel : null + currentIndex: control.highlightedIndex + + T.ScrollIndicator.vertical: ScrollIndicator { } + } + + background: Rectangle { + radius: 3 + color: control.Material.dialogColor + + layer.enabled: control.enabled + layer.effect: DropShadow { + verticalOffset: 1 + color: control.Material.dropShadowColor + samples: 15 + spread: 0.5 + } + } + } + //! [popup] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Dial.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Dial.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Dial.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Dial.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.Dial { + id: control + + implicitWidth: 100 + implicitHeight: 100 + + //! [background] + background: Rectangle { + x: control.width / 2 - width / 2 + y: control.height / 2 - height / 2 + width: Math.max(64, Math.min(control.width, control.height)) + height: Math.max(64, Math.min(control.width, control.height)) + color: "transparent" + radius: width / 2 + + border.color: control.enabled ? control.Material.accentColor : control.Material.hintTextColor + } + //! [background] + + //! [handle] + handle: Rectangle { + id: handleItem + + x: background.x + background.width / 2 - handle.width / 2 + y: background.y + background.height / 2 - handle.height / 2 + transform: [ + Translate { + y: -background.height * 0.4 + handle.height / 2 + }, + Rotation { + angle: control.angle + origin.x: handle.width / 2 + origin.y: handle.height / 2 + } + ] + implicitWidth: 14 + implicitHeight: 14 + radius: width / 2 + color: control.enabled ? control.Material.accentColor : control.Material.hintTextColor + } + //! [handle] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Drawer.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Drawer.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Drawer.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Drawer.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import QtQuick.Window 2.2 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.Drawer { + id: control + + parent: T.ApplicationWindow.overlay || Window.contentItem + width: parent ? parent.width : 0 // TODO: Window.width + height: parent ? parent.height : 0 // TODO: Window.height + + // TODO: make this a proper transition + animation: SmoothedAnimation { + velocity: 5 + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Frame.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Frame.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Frame.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Frame.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.Frame { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + padding: 6 + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [frame] + frame: Rectangle { + width: parent.width + height: parent.height + + radius: 3 + color: "transparent" + border.color: control.Material.frameColor + } + //! [frame] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/GroupBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/GroupBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/GroupBox.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/GroupBox.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.GroupBox { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.implicitWidth + leftPadding + rightPadding : 0, + contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + spacing: 6 + padding: 6 + topPadding: 6 + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) + + //! [contentItem] + contentItem: Item {} + //! [contentItem] + + //! [label] + label: Text { + x: control.leftPadding + width: control.availableWidth + + text: control.title + font: control.font + color: control.enabled ? control.Material.primaryTextColor : control.Material.hintTextColor + elide: Text.ElideRight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] + + //! [frame] + frame: Rectangle { + y: control.topPadding - control.padding + width: parent.width + height: parent.height - control.topPadding + control.padding + + radius: 3 + color: "transparent" + border.color: control.Material.frameColor + } + //! [frame] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ItemDelegate.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ItemDelegate.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ItemDelegate.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ItemDelegate.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,154 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.ItemDelegate { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (label ? label.implicitWidth : 0) + + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(label ? label.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 16 + spacing: 16 + + //! [indicator] + indicator: Rectangle { + id: indicatorItem + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + implicitWidth: 20 + implicitHeight: 20 + color: "transparent" + border.color: control.checked ? control.Material.accentColor : control.Material.secondaryTextColor + border.width: control.checked ? width / 2 : 2 + radius: 2 + + visible: control.checkable + + Behavior on border.width { + NumberAnimation { + duration: 100 + easing.type: Easing.OutCubic + } + } + + Behavior on border.color { + ColorAnimation { + duration: 100 + easing.type: Easing.OutCubic + } + } + + Ripple { + width: parent.width + height: width + control: control + colored: control.checked + opacity: control.pressed ? 1 : 0 + } + + // TODO: This needs to be transparent + Image { + id: checkImage + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 16 + height: 16 + source: "qrc:/qt-project.org/imports/Qt/labs/controls/material/images/check.png" + fillMode: Image.PreserveAspectFit + + scale: control.checked ? 1 : 0 + Behavior on scale { NumberAnimation { duration: 100 } } + } + + states: State { + name: "checked" + when: control.checked + } + + transitions: Transition { + SequentialAnimation { + NumberAnimation { + target: indicatorItem + property: "scale" + // Go down 2 pixels in size. + to: 1 - 2 / indicatorItem.width + duration: 120 + } + NumberAnimation { + target: indicatorItem + property: "scale" + to: 1 + duration: 120 + } + } + } + } + //! [indicator] + + //! [label] + label: Text { + x: control.mirrored || !control.checkable ? control.leftPadding : (indicator.x + indicator.width + control.spacing) + y: control.topPadding + width: control.availableWidth - (control.checkable ? indicator.width + control.spacing : 0) + height: control.availableHeight + + text: control.text + font: control.font + color: control.enabled ? control.Material.primaryTextColor : control.Material.hintTextColor + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] + + //! [background] + background: Rectangle { + visible: control.pressed || control.highlighted + color: control.pressed ? control.Material.flatButtonPressColor : control.Material.listHighlightColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Label.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Label.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Label.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Label.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.Label { + id: control + + color: Material.primaryTextColor + linkColor: Material.accentColor +} Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/libqtlabsmaterialstyleplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/libqtlabsmaterialstyleplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/MenuItem.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/MenuItem.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/MenuItem.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/MenuItem.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,155 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.MenuItem { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (label ? label.implicitWidth : 0) + + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(label ? label.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 16 + spacing: 16 + + //! [indicator] + indicator: Rectangle { + id: indicatorItem + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + implicitWidth: 20 + implicitHeight: 20 + color: "transparent" + border.color: control.checked ? control.Material.accentColor : control.Material.secondaryTextColor + border.width: control.checked ? width / 2 : 2 + radius: 2 + + visible: control.checkable + + Behavior on border.width { + NumberAnimation { + duration: 100 + easing.type: Easing.OutCubic + } + } + + Behavior on border.color { + ColorAnimation { + duration: 100 + easing.type: Easing.OutCubic + } + } + + Ripple { + width: parent.width + height: width + control: control + colored: control.checked + opacity: control.pressed ? 1 : 0 + } + + // TODO: This needs to be transparent + Image { + id: checkImage + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 16 + height: 16 + source: "qrc:/qt-project.org/imports/Qt/labs/controls/material/images/check.png" + fillMode: Image.PreserveAspectFit + + scale: control.checked ? 1 : 0 + Behavior on scale { NumberAnimation { duration: 100 } } + } + + states: State { + name: "checked" + when: control.checked + } + + transitions: Transition { + SequentialAnimation { + NumberAnimation { + target: indicatorItem + property: "scale" + // Go down 2 pixels in size. + to: 1 - 2 / indicatorItem.width + duration: 120 + } + NumberAnimation { + target: indicatorItem + property: "scale" + to: 1 + duration: 120 + } + } + } + } + //! [indicator] + + //! [label] + label: Text { + x: control.mirrored || !control.checkable ? control.leftPadding : (indicator.x + indicator.width + control.spacing) + y: control.topPadding + width: control.availableWidth - (control.checkable ? indicator.width + control.spacing : 0) + height: control.availableHeight + + text: control.text + font: control.font + color: control.enabled ? control.Material.primaryTextColor : control.Material.hintTextColor + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] + + //! [background] + background: Rectangle { + implicitWidth: 200 + visible: control.pressed || control.highlighted + color: control.pressed ? control.Material.flatButtonPressColor : control.Material.listHighlightColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Menu.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Menu.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Menu.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Menu.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,97 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 +import QtGraphicalEffects 1.0 + +T.Menu { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.min(background ? background.implicitHeight : 0, + contentItem ? contentItem.implicitHeight + topPadding + bottomPadding : 0) + + transformOrigin: Item.Top + + enter: Transition { + // grow_fade_in + NumberAnimation { property: "scale"; from: 0.9; to: 1.0; easing.type: Easing.OutQuint; duration: 220 } + NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; easing.type: Easing.OutCubic; duration: 150 } + } + + exit: Transition { + // shrink_fade_out + NumberAnimation { property: "scale"; from: 1.0; to: 0.9; easing.type: Easing.OutQuint; duration: 220 } + NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; easing.type: Easing.OutCubic; duration: 150 } + } + + //! [contentItem] + contentItem: ListView { + implicitHeight: contentHeight + + model: control.contentModel + // TODO: improve this? + interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false + clip: true + keyNavigationWraps: false + currentIndex: -1 + + ScrollIndicator.vertical: ScrollIndicator {} + } + //! [contentItem] + + //! [background] + background: Rectangle { + implicitWidth: 200 + implicitHeight: 200 + + radius: 3 + color: control.Material.dialogColor + + layer.enabled: true + layer.effect: DropShadow { + verticalOffset: 1 + color: control.Material.dropShadowColor + samples: 15 + spread: 0.5 + } + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/PageIndicator.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/PageIndicator.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/PageIndicator.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/PageIndicator.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,75 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.PageIndicator { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + + padding: 6 + spacing: 6 + + //! [delegate] + delegate: Rectangle { + implicitWidth: 8 + implicitHeight: 8 + + radius: width / 2 + color: control.Material.primaryTextColor + + opacity: index === currentIndex ? 0.95 : pressed ? 0.7 : 0.45 + Behavior on opacity { OpacityAnimator { duration: 100 } } + } + //! [delegate] + + //! [contentItem] + contentItem: Row { + spacing: control.spacing + + Repeater { + model: control.count + delegate: control.delegate + } + } + //! [contentItem] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Page.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Page.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Page.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Page.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.Page { + id: control + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [background] + background: Rectangle { + color: control.Material.backgroundColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Pane.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Pane.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Pane.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Pane.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.Pane { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + padding: 6 + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [background] + background: Rectangle { + color: control.Material.backgroundColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Popup.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Popup.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Popup.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Popup.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import QtGraphicalEffects 1.0 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.Popup { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentWidth > 0 ? contentHeight + topPadding + bottomPadding : 0) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + padding: 6 + + enter: Transition { + // grow_fade_in + NumberAnimation { property: "scale"; from: 0.9; to: 1.0; easing.type: Easing.OutQuint; duration: 220 } + NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; easing.type: Easing.OutCubic; duration: 150 } + } + + exit: Transition { + // shrink_fade_out + NumberAnimation { property: "scale"; from: 1.0; to: 0.9; easing.type: Easing.OutQuint; duration: 220 } + NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; easing.type: Easing.OutCubic; duration: 150 } + } + + contentItem: Item { } + + background: Rectangle { + radius: 3 + color: control.Material.dialogColor + + layer.enabled: true + layer.effect: DropShadow { + verticalOffset: 1 + color: control.Material.dropShadowColor + samples: 15 + spread: 0.5 + } + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ProgressBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ProgressBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ProgressBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ProgressBar.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 +import Qt.labs.controls.material.impl 1.0 + +T.ProgressBar { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + indicator ? indicator.implicitWidth : 0) + leftPadding + rightPadding + implicitHeight: Math.max(background ? background.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding + + //! [indicator] + indicator: ProgressStrip { + id: strip + x: control.leftPadding + y: control.topPadding + (control.availableHeight - height) / 2 + width: control.availableWidth + height: 4 + + scale: control.mirrored ? -1 : 1 + indeterminate: control.indeterminate + color: control.Material.accentColor + progress: control.position + + StripAnimator { + target: strip + running: control.visible && control.indeterminate + } + } + //! [indicator] + + //! [background] + background: Rectangle { + implicitWidth: 200 + implicitHeight: 4 + x: control.leftPadding + y: control.topPadding + (control.availableHeight - height) / 2 + width: control.availableWidth + height: 4 + + color: Qt.rgba(control.Material.accentColor.r, control.Material.accentColor.g, control.Material.accentColor.b, 0.25) + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/qmldir 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/qmldir 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,5 @@ +module Qt.labs.controls.material +plugin qtlabsmaterialstyleplugin +classname QtLabsMaterialStylePlugin +depends Qt.labs.controls 1.0 +depends QtGraphicalEffects 1.0 diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/RadioButton.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/RadioButton.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/RadioButton.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/RadioButton.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,106 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.RadioButton { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (label ? label.implicitWidth : 0) + + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(label ? label.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + spacing: 8 + topPadding: 14 + leftPadding: 8 + rightPadding: 8 + bottomPadding: 14 + + //! [indicator] + indicator: Rectangle { + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + implicitWidth: 20 + implicitHeight: 20 + radius: width / 2 + border.width: 2 + border.color: control.checked || control.pressed ? control.Material.accentColor : control.Material.secondaryTextColor + color: "transparent" + + Ripple { + width: parent.width + height: width + control: control + colored: control.checked + opacity: control.pressed || control.activeFocus ? 1 : 0 + } + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 10 + height: 10 + radius: width / 2 + color: parent.border.color + visible: control.checked || control.pressed + } + } + //! [indicator] + + //! [label] + label: Text { + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.spacing) + y: control.topPadding + width: control.availableWidth - indicator.width - control.spacing + height: control.availableHeight + + text: control.text + font: control.font + color: control.enabled ? control.Material.primaryTextColor : control.Material.hintTextColor + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/RangeSlider.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/RangeSlider.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/RangeSlider.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/RangeSlider.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,98 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.RangeSlider { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + Math.max(track ? track.implicitWidth : 0, + first.handle ? first.handle.implicitWidth : 0, + second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(track ? track.implicitHeight : 0, + first.handle ? first.handle.implicitHeight : 0, + second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) + + padding: 6 + + //! [firstHandle] + first.handle: SliderHandle { + x: control.leftPadding + (horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) + value: first.value + handleHasFocus: activeFocus + handlePressed: first.pressed + } + //! [firstHandle] + + //! [secondHandle] + second.handle: SliderHandle { + x: control.leftPadding + (horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) + value: second.value + handleHasFocus: activeFocus + handlePressed: second.pressed + } + //! [secondHandle] + + //! [track] + track: Rectangle { + x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) + implicitWidth: horizontal ? 200 : 1 + implicitHeight: horizontal ? 1 : 200 + width: horizontal ? control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.availableHeight + color: control.Material.primaryTextColor + scale: horizontal && control.mirrored ? -1 : 1 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + + Rectangle { + x: parent.horizontal ? control.first.position * parent.width : -1 + y: parent.horizontal ? -1 : control.second.visualPosition * parent.height + 3 + width: parent.horizontal ? control.second.position * parent.width - control.first.position * parent.width - 3 : 3 + height: parent.horizontal ? 3 : control.second.position * parent.height - control.first.position * parent.height - 3 + + color: control.Material.accentColor + } + } + //! [track] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Ripple.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Ripple.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Ripple.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Ripple.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls.material 1.0 + +Rectangle { + property Item control + property bool colored: false + + radius: width / 2 + scale: 2.5 + color: colored ? control.Material.checkBoxCheckedRippleColor : control.Material.checkBoxUncheckedRippleColor + + Behavior on opacity { + NumberAnimation {} + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ScrollBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ScrollBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ScrollBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ScrollBar.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.ScrollBar { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + handle.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + handle.implicitHeight + topPadding + bottomPadding) + + padding: 2 + + //! [handle] + handle: Rectangle { + id: handle + + implicitWidth: 4 + implicitHeight: 4 + + color: control.pressed ? control.Material.scrollBarPressedColor : control.Material.scrollBarColor + visible: control.size < 1.0 + opacity: 0.0 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + x: control.leftPadding + (horizontal ? control.position * control.availableWidth : 0) + y: control.topPadding + (horizontal ? 0 : control.position * control.availableHeight) + width: horizontal ? control.size * control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.size * control.availableHeight + + states: State { + name: "active" + when: control.active + PropertyChanges { target: handle; opacity: 0.75 } + } + + transitions: Transition { + from: "active" + SequentialAnimation { + PauseAnimation { duration: 450 } + NumberAnimation { target: handle; duration: 200; property: "opacity"; to: 0.0 } + } + } + } + //! [handle] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ScrollIndicator.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ScrollIndicator.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ScrollIndicator.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ScrollIndicator.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.ScrollIndicator { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + indicator.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + indicator.implicitHeight + topPadding + bottomPadding) + + padding: 2 + + //! [indicator] + indicator: Rectangle { + id: indicator + + implicitWidth: 4 + implicitHeight: 4 + + color: control.Material.scrollBarColor + visible: control.size < 1.0 + opacity: 0.0 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + x: control.leftPadding + (horizontal ? control.position * control.width : 0) + y: control.topPadding + (horizontal ? 0 : control.position * control.height) + width: horizontal ? control.size * control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.size * control.availableHeight + + states: State { + name: "active" + when: control.active + PropertyChanges { target: indicator; opacity: 0.75 } + } + + transitions: [ + Transition { + from: "active" + SequentialAnimation { + PauseAnimation { duration: 450 } + NumberAnimation { target: indicator; duration: 200; property: "opacity"; to: 0.0 } + } + } + ] + } + //! [indicator] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/SliderHandle.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/SliderHandle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/SliderHandle.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/SliderHandle.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls.material 1.0 + +Item { + id: root + implicitWidth: initialSize + implicitHeight: initialSize + + property real value: 0 + property bool handleHasFocus: false + property bool handlePressed: false + readonly property int initialSize: 13 + readonly property bool horizontal: control.orientation === Qt.Horizontal + readonly property var control: parent + + Rectangle { + id: handleRect + width: parent.width + height: parent.height + radius: width / 2 + color: root.control.Material.accentColor + scale: root.handlePressed ? 1.5 : 1 + + Behavior on scale { + NumberAnimation { + duration: 250 + } + } + } + + Ripple { + width: parent.width + height: width + control: root.control + colored: true + opacity: root.handleHasFocus && !root.handlePressed ? 1 : 0 + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Slider.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Slider.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Slider.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Slider.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.Slider { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + Math.max(track ? track.implicitWidth : 0, + handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(track ? track.implicitHeight : 0, + handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) + + padding: 6 + + //! [handle] + handle: SliderHandle { + x: control.leftPadding + (horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) + value: control.value + handleHasFocus: control.activeFocus + handlePressed: control.pressed + } + //! [handle] + + //! [track] + track: Rectangle { + x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) + implicitWidth: horizontal ? 200 : 1 + implicitHeight: horizontal ? 1 : 200 + width: horizontal ? control.availableWidth : implicitWidth + height: horizontal ? 1 : control.position * implicitHeight - 4 + color: control.Material.primaryTextColor + scale: horizontal && control.mirrored ? -1 : 1 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + + Rectangle { + x: 0 + y: parent.horizontal ? -1 : control.visualPosition * parent.height + 3 + width: parent.horizontal ? control.position * parent.width : 3 + height: parent.horizontal ? 3 : control.availableHeight + + color: control.Material.accentColor + } + } + //! [track] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/SpinBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/SpinBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/SpinBox.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/SpinBox.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,169 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import QtGraphicalEffects 1.0 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.SpinBox { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + 2 * padding + + (up.indicator ? up.indicator.implicitWidth : 0) + + (down.indicator ? down.indicator.implicitWidth : 0)) + implicitHeight: Math.max(contentItem.implicitHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, + up.indicator ? up.indicator.implicitHeight : 0, + down.indicator ? down.indicator.implicitHeight : 0) + baselineOffset: contentItem.y + contentItem.baselineOffset + + padding: 6 + leftPadding: 6 + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) + rightPadding: 6 + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0)) + + //! [validator] + validator: IntValidator { + locale: control.locale.name + bottom: Math.min(control.from, control.to) + top: Math.max(control.from, control.to) + } + //! [validator] + + //! [contentItem] + contentItem: TextInput { + text: control.textFromValue(control.value, control.locale) + + font: control.font + color: control.Material.primaryTextColor + selectionColor: control.Material.textSelectionColor + selectedTextColor: control.Material.primaryTextColor + horizontalAlignment: Qt.AlignHCenter + verticalAlignment: Qt.AlignVCenter + cursorDelegate: Rectangle { + id: cursor + color: control.Material.accentColor + width: 2 + visible: control.activeFocus && contentItem.selectionStart === contentItem.selectionEnd + + Connections { + target: contentItem + onCursorPositionChanged: { + // keep a moving cursor visible + cursor.opacity = 1 + timer.restart() + } + } + + Timer { + id: timer + running: control.activeFocus + repeat: true + interval: Qt.styleHints.cursorFlashTime + onTriggered: cursor.opacity = !cursor.opacity ? 1 : 0 + // force the cursor visible when gaining focus + onRunningChanged: cursor.opacity = 1 + } + } + + validator: control.validator + inputMethodHints: Qt.ImhFormattedNumbersOnly + } + //! [contentItem] + + //! [up.indicator] + up.indicator: Rectangle { + x: control.mirrored ? 0 : parent.width - width + implicitWidth: 26 + height: parent.height + radius: 3 + color: Qt.tint(Qt.tint(control.Material.raisedButtonColor, + control.activeFocus ? control.Material.raisedButtonHoverColor : "transparent"), + control.up.pressed ? control.Material.raisedButtonPressColor: "transparent") + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: Math.min(parent.width / 3, parent.width / 3) + height: 2 + color: control.Material.primaryTextColor + } + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 2 + height: Math.min(parent.width / 3, parent.width / 3) + color: control.Material.primaryTextColor + } + } + //! [up.indicator] + + //! [down.indicator] + down.indicator: Rectangle { + x: control.mirrored ? parent.width - width : 0 + implicitWidth: 26 + height: parent.height + radius: 3 + color: Qt.tint(Qt.tint(control.Material.raisedButtonColor, + control.activeFocus ? control.Material.raisedButtonHoverColor : "transparent"), + control.down.pressed ? control.Material.raisedButtonPressColor : "transparent") + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: parent.width / 3 + height: 2 + color: control.Material.primaryTextColor + } + } + //! [down.indicator] + + //! [background] + background: Item { + implicitWidth: 100 + implicitHeight: 26 + + Rectangle { + x: parent.width / 2 - width / 2 + y: parent.y + parent.height - height + width: control.availableWidth + height: control.activeFocus ? 2 : 1 + color: control.activeFocus ? control.Material.accentColor : control.Material.hintTextColor + } + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/StackView.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/StackView.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/StackView.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/StackView.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,90 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.4 +import Qt.labs.templates 1.0 as T + +T.StackView { + id: root + + //! [popEnter] + popEnter: Transition { + // slide_in_left + NumberAnimation { property: "x"; from: (root.mirrored ? -0.5 : 0.5) * -root.width; to: 0; duration: 200; easing.type: Easing.OutCubic } + NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 200; easing.type: Easing.OutCubic } + } + //! [popEnter] + + //! [popExit] + popExit: Transition { + // slide_out_right + NumberAnimation { property: "x"; from: 0; to: (root.mirrored ? -0.5 : 0.5) * root.width; duration: 200; easing.type: Easing.OutCubic } + NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 200; easing.type: Easing.OutCubic } + } + //! [popExit] + + //! [pushEnter] + pushEnter: Transition { + // slide_in_right + NumberAnimation { property: "x"; from: (root.mirrored ? -0.5 : 0.5) * root.width; to: 0; duration: 200; easing.type: Easing.OutCubic } + NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 200; easing.type: Easing.OutCubic } + } + //! [pushEnter] + + //! [pushExit] + pushExit: Transition { + // slide_out_left + NumberAnimation { property: "x"; from: 0; to: (root.mirrored ? -0.5 : 0.5) * -root.width; duration: 200; easing.type: Easing.OutCubic } + NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 200; easing.type: Easing.OutCubic } + } + //! [pushExit] + + //! [replaceEnter] + replaceEnter: Transition { + // slide_in_right + NumberAnimation { property: "x"; from: (root.mirrored ? -0.5 : 0.5) * root.width; to: 0; duration: 200; easing.type: Easing.OutCubic } + NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 200; easing.type: Easing.OutCubic } + } + //! [replaceEnter] + + //! [replaceExit] + replaceExit: Transition { + // slide_out_left + NumberAnimation { property: "x"; from: 0; to: (root.mirrored ? -0.5 : 0.5) * -root.width; duration: 200; easing.type: Easing.OutCubic } + NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 200; easing.type: Easing.OutCubic } + } + //! [replaceExit] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/SwipeView.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/SwipeView.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/SwipeView.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/SwipeView.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.SwipeView { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + + //! [contentItem] + contentItem: ListView { + model: control.contentModel + currentIndex: control.currentIndex + + spacing: control.spacing + orientation: Qt.Horizontal + snapMode: ListView.SnapOneItem + boundsBehavior: Flickable.StopAtBounds + + highlightRangeMode: ListView.StrictlyEnforceRange + preferredHighlightBegin: 0 + preferredHighlightEnd: 0 + highlightMoveDuration: 250 + } + //! [contentItem] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Switch.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Switch.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Switch.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Switch.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,126 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls.material 1.0 +import Qt.labs.templates 1.0 as T +import QtGraphicalEffects 1.0 + +T.Switch { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (label ? label.implicitWidth : 0) + + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(label ? label.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 8 + spacing: 8 + + //! [indicator] + indicator: Item { + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + implicitWidth: 38 + implicitHeight: 32 + + Ripple { + x: handle.x + handle.width / 2 - width / 2 + y: handle.y + handle.height / 2 - height / 2 + width: handle.width + height: width + control: control + colored: control.checked + opacity: control.pressed || control.activeFocus ? 1 : 0 + } + + Rectangle { + width: parent.width + height: 14 + radius: height / 2 + y: parent.height / 2 - height / 2 + color: control.enabled ? (control.checked ? control.Material.switchCheckedTrackColor : control.Material.switchUncheckedTrackColor) + : control.Material.switchDisabledTrackColor + } + + Rectangle { + id: handle + x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2))) + y: (parent.height - height) / 2 + width: 20 + height: 20 + radius: width / 2 + color: control.enabled ? (control.checked ? control.Material.switchCheckedHandleColor : control.Material.switchUncheckedHandleColor) + : control.Material.switchDisabledHandleColor + + Behavior on x { + enabled: !control.pressed + SmoothedAnimation { + duration: 300 + } + } + + layer.enabled: true + layer.effect: DropShadow { + verticalOffset: 1 + color: control.Material.dropShadowColor + spread: 0.3 + } + } + } + //! [indicator] + + //! [label] + label: Text { + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.spacing) + y: control.topPadding + width: control.availableWidth - indicator.width - control.spacing + height: control.availableHeight + + text: control.text + font: control.font + color: control.enabled ? control.Material.primaryTextColor : control.Material.hintTextColor + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TabBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TabBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TabBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TabBar.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.TabBar { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + + spacing: 1 + + //! [contentItem] + contentItem: ListView { + implicitWidth: contentWidth + implicitHeight: 48 + + model: control.contentModel + currentIndex: control.currentIndex + + spacing: control.spacing + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + snapMode: ListView.SnapToItem + + highlightMoveDuration: 250 + highlightResizeDuration: 0 + highlightFollowsCurrentItem: true + highlight: Item { + z: 2 + Rectangle { + height: 2 + width: parent.width + y: parent.height - height + color: control.Material.accentColor + } + } + } + //! [contentItem] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TabButton.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TabButton.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TabButton.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TabButton.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.TabButton { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.contentWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + label ? label.contentHeight + topPadding + bottomPadding : 0) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 12 + + //! [label] + label: Text { + x: control.leftPadding + y: control.topPadding + width: control.availableWidth + height: control.availableHeight + + text: control.text + font: control.font + elide: Text.ElideRight + color: !control.enabled ? control.Material.hintTextColor : control.pressed || control.checked ? control.Material.accentColor : control.Material.primaryTextColor + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + //! [label] + + //! [background] + background: Item { + implicitHeight: 48 + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TextArea.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TextArea.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TextArea.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TextArea.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.TextArea { + id: control + + implicitWidth: Math.max(contentWidth + leftPadding + rightPadding, + background ? background.implicitWidth : 0, + placeholder.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(contentHeight + 1 + topPadding + bottomPadding, + background ? background.implicitHeight : 0, + placeholder.implicitHeight + 1 + topPadding + bottomPadding) + + topPadding: 8 + bottomPadding: 16 + + color: enabled ? Material.primaryTextColor : Material.hintTextColor + selectionColor: Material.accentColor + selectedTextColor: Material.primaryHighlightedTextColor + cursorDelegate: Rectangle { + id: cursor + color: control.Material.accentColor + width: 2 + visible: control.activeFocus && control.selectionStart === control.selectionEnd + + Connections { + target: control + onCursorPositionChanged: { + // keep a moving cursor visible + cursor.opacity = 1 + timer.restart() + } + } + + Timer { + id: timer + running: control.activeFocus + repeat: true + interval: Qt.styleHints.cursorFlashTime + onTriggered: cursor.opacity = !cursor.opacity ? 1 : 0 + // force the cursor visible when gaining focus + onRunningChanged: cursor.opacity = 1 + } + } + + //! [placeholder] + Text { + id: placeholder + x: control.leftPadding + y: control.topPadding + width: control.width - (control.leftPadding + control.rightPadding) + height: control.height - (control.topPadding + control.bottomPadding) + text: control.placeholderText + font: control.font + color: control.Material.hintTextColor + horizontalAlignment: control.horizontalAlignment + verticalAlignment: control.verticalAlignment + elide: Text.ElideRight + visible: !control.length && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + } + //! [placeholder] + + //! [background] + background: Rectangle { + y: control.height - height - control.bottomPadding / 2 + implicitWidth: 120 + height: control.activeFocus ? 2 : 1 + color: control.activeFocus ? control.Material.accentColor : control.Material.hintTextColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TextField.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TextField.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TextField.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/TextField.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.TextField { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + placeholder.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + placeholder.implicitHeight + 1 + topPadding + bottomPadding) + + topPadding: 8 + bottomPadding: 16 + + color: enabled ? Material.primaryTextColor : Material.hintTextColor + selectionColor: Material.accentColor + selectedTextColor: Material.primaryHighlightedTextColor + verticalAlignment: TextInput.AlignVCenter + cursorDelegate: Rectangle { + id: cursor + color: control.Material.accentColor + width: 2 + visible: control.activeFocus && control.selectionStart === control.selectionEnd + + Connections { + target: control + onCursorPositionChanged: { + // keep a moving cursor visible + cursor.opacity = 1 + timer.restart() + } + } + + Timer { + id: timer + running: control.activeFocus + repeat: true + interval: Qt.styleHints.cursorFlashTime + onTriggered: cursor.opacity = !cursor.opacity ? 1 : 0 + // force the cursor visible when gaining focus + onRunningChanged: cursor.opacity = 1 + } + } + + //! [placeholder] + Text { + id: placeholder + x: control.leftPadding + y: control.topPadding + width: control.width - (control.leftPadding + control.rightPadding) + height: control.height - (control.topPadding + control.bottomPadding) + text: control.placeholderText + font: control.font + color: control.Material.hintTextColor + horizontalAlignment: control.horizontalAlignment + verticalAlignment: control.verticalAlignment + elide: Text.ElideRight + visible: !control.displayText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + + } + //! [placeholder] + + //! [background] + background: Rectangle { + y: control.height - height - control.bottomPadding / 2 + implicitWidth: 120 + height: control.activeFocus ? 2 : 1 + color: control.activeFocus ? control.Material.accentColor : control.Material.hintTextColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ToolBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ToolBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ToolBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ToolBar.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.ToolBar { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [background] + background: Rectangle { + implicitHeight: 48 + color: control.Material.primaryColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ToolButton.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ToolButton.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ToolButton.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/ToolButton.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.ToolButton { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + label ? label.implicitHeight + topPadding + bottomPadding : 0) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 6 + + //! [label] + label: Text { + x: control.leftPadding + y: control.topPadding + width: control.availableWidth + height: control.availableHeight + + text: control.text + font: control.font + color: control.enabled ? control.Material.primaryTextColor : control.Material.hintTextColor + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + //! [label] + + //! [background] + background: Rectangle { + implicitWidth: 48 + implicitHeight: 48 + + color: control.pressed ? control.Material.flatButtonPressColor : control.Material.flatButtonFocusColor + visible: control.enabled && (control.pressed || control.activeFocus || control.checked || control.highlighted) + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Tumbler.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Tumbler.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Tumbler.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/material/Tumbler.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 + +T.Tumbler { + id: control + implicitWidth: 60 + implicitHeight: 200 + + //! [delegate] + delegate: Text { + id: label + text: modelData + color: control.Material.primaryTextColor + font: control.font + opacity: 0.4 + Math.max(0, 1 - Math.abs(Tumbler.displacement)) * 0.6 + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + //! [delegate] + + //! [contentItem] + contentItem: PathView { + id: pathView + model: control.model + delegate: control.delegate + clip: true + pathItemCount: control.visibleItemCount + 1 + preferredHighlightBegin: 0.5 + preferredHighlightEnd: 0.5 + dragMargin: width / 2 + + path: Path { + startX: pathView.width / 2 + startY: -pathView.delegateHeight / 2 + PathLine { + x: pathView.width / 2 + y: pathView.pathItemCount * pathView.delegateHeight - pathView.delegateHeight / 2 + } + } + + property real delegateHeight: control.availableHeight / control.visibleItemCount + } + //! [contentItem] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/MenuItem.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/MenuItem.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/MenuItem.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/MenuItem.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,93 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.MenuItem { + id: control + + implicitWidth: background ? background.implicitWidth + : (label ? label.implicitWidth : 0) + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding + implicitHeight: background ? background.implicitHeight + : (label ? label.implicitHeight : 0) + (indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 6 + + //! [label] + label: Text { + x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding + y: control.topPadding + width: control.availableWidth - (control.checkable ? indicator.width + control.spacing : 0) + height: control.availableHeight + + text: control.text + font: control.font + color: control.enabled ? "#26282a" : "#bdbebf" + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] + + //! [indicator] + indicator: Image { + x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding + y: control.topPadding + (control.availableHeight - height) / 2 + + visible: control.checked + source: control.checkable ? "qrc:/qt-project.org/imports/Qt/labs/controls/images/check.png" : "" + } + //! [indicator] + + //! [background] + background: Item { + implicitWidth: 200 + implicitHeight: 40 + + Rectangle { + x: 1 + y: 1 + width: parent.width - 2 + height: parent.height - 2 + color: control.activeFocus || control.pressed ? "#eeeeee" : "transparent" + } + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Menu.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Menu.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Menu.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Menu.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 +import Qt.labs.templates 1.0 as T + +T.Menu { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.min(background ? background.implicitHeight : 0, + contentItem ? contentItem.implicitHeight + topPadding + bottomPadding : 0) + + //! [contentItem] + contentItem: ListView { + implicitHeight: contentHeight + model: control.contentModel + // TODO: improve this? + interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false + clip: true + keyNavigationWraps: false + currentIndex: -1 + + ScrollIndicator.vertical: ScrollIndicator {} + } + //! [contentItem] + + //! [background] + background: Rectangle { + implicitWidth: 200 + implicitHeight: 200 + color: "#ffffff" + border.color: "#353637" + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/PageIndicator.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/PageIndicator.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/PageIndicator.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/PageIndicator.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.PageIndicator { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + + padding: 6 + spacing: 6 + + //! [delegate] + delegate: Rectangle { + implicitWidth: 8 + implicitHeight: 8 + + radius: width / 2 + color: "#28282a" // TODO + + opacity: index === currentIndex ? 0.95 : pressed ? 0.7 : 0.45 + Behavior on opacity { OpacityAnimator { duration: 100 } } + } + //! [delegate] + + //! [contentItem] + contentItem: Row { + spacing: control.spacing + + Repeater { + model: control.count + delegate: control.delegate + } + } + //! [contentItem] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Page.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Page.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Page.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Page.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.Page { + id: control + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [background] + background: Rectangle { + color: "#ffffff" + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Pane.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Pane.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Pane.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Pane.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.Pane { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + padding: 6 + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [background] + background: Rectangle { + color: "#ffffff" + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/plugins.qmltypes 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/plugins.qmltypes 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,2004 @@ +import QtQuick.tooling 1.2 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. +// +// This file was auto-generated by: +// 'qmlplugindump -nonrelocatable Qt.labs.controls 1.0' + +Module { + dependencies: [ + "Qt.labs.templates 1.0", + "QtGraphicalEffects 1.0", + "QtGraphicalEffects.private 1.0", + "QtQuick 2.6", + "QtQuick.Window 2.2" + ] + Component { + name: "QQuickAbstractButton" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/AbstractButton 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "text"; type: "string" } + Property { name: "pressed"; type: "bool" } + Property { name: "checked"; type: "bool" } + Property { name: "checkable"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "autoExclusive"; type: "bool" } + Property { name: "autoRepeat"; type: "bool" } + Property { name: "indicator"; type: "QQuickItem"; isPointer: true } + Property { name: "label"; type: "QQuickItem"; isPointer: true } + Signal { name: "pressed" } + Signal { name: "released" } + Signal { name: "canceled" } + Signal { name: "clicked" } + Signal { name: "pressAndHold" } + Signal { name: "doubleClicked" } + Method { name: "toggle" } + } + // + // Manually added to work around QtC limitations: + // + Component { + name: "QQuickWindowQmlImpl" + defaultProperty: "data" + prototype: "QQuickWindow" + exports: ["QtQuick.Window/Window 2.1", "QtQuick.Window/Window 2.2"] + exportMetaObjectRevisions: [0, 1] + attachedType: "QQuickWindowAttached" + Property { name: "visible"; type: "bool" } + Property { name: "visibility"; type: "Visibility" } + Signal { + name: "visibleChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "visibilityChanged" + Parameter { name: "visibility"; type: "QWindow::Visibility" } + } + } + Component { + name: "QQuickWindow" + defaultProperty: "data" + prototype: "QWindow" + exports: [ + "QtQuick.Window/Window 2.0", + "QtQuick.Window/Window 2.1", + "QtQuick.Window/Window 2.2" + ] + exportMetaObjectRevisions: [0, 1, 2] + Enum { + name: "SceneGraphError" + values: { + "ContextNotAvailable": 1 + } + } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "color"; type: "QColor" } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { + name: "activeFocusItem" + revision: 1 + type: "QQuickItem" + isReadonly: true + isPointer: true + } + Signal { name: "frameSwapped" } + Signal { + name: "openglContextCreated" + revision: 2 + Parameter { name: "context"; type: "QOpenGLContext"; isPointer: true } + } + Signal { name: "sceneGraphInitialized" } + Signal { name: "sceneGraphInvalidated" } + Signal { name: "beforeSynchronizing" } + Signal { name: "afterSynchronizing"; revision: 2 } + Signal { name: "beforeRendering" } + Signal { name: "afterRendering" } + Signal { name: "afterAnimating"; revision: 2 } + Signal { name: "sceneGraphAboutToStop"; revision: 2 } + Signal { + name: "closing" + revision: 1 + Parameter { name: "close"; type: "QQuickCloseEvent"; isPointer: true } + } + Signal { + name: "colorChanged" + Parameter { type: "QColor" } + } + Signal { name: "activeFocusItemChanged"; revision: 1 } + Signal { + name: "sceneGraphError" + revision: 2 + Parameter { name: "error"; type: "QQuickWindow::SceneGraphError" } + Parameter { name: "message"; type: "string" } + } + Method { name: "update" } + Method { name: "releaseResources" } + } + Component { + name: "QQuickApplicationWindow" + defaultProperty: "data" + prototype: "QQuickWindowQmlImpl" + exports: ["Qt.labs.templates/ApplicationWindow 1.0"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickApplicationWindowAttached" + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "activeFocusControl"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "header"; type: "QQuickItem"; isPointer: true } + Property { name: "footer"; type: "QQuickItem"; isPointer: true } + Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } + Property { name: "font"; type: "QFont" } + Property { name: "locale"; type: "QLocale" } + } + Component { + name: "QWindow" + prototype: "QObject" + Enum { + name: "Visibility" + values: { + "Hidden": 0, + "AutomaticVisibility": 1, + "Windowed": 2, + "Minimized": 3, + "Maximized": 4, + "FullScreen": 5 + } + } + Property { name: "title"; type: "string" } + Property { name: "modality"; type: "Qt::WindowModality" } + Property { name: "flags"; type: "Qt::WindowFlags" } + Property { name: "x"; type: "int" } + Property { name: "y"; type: "int" } + Property { name: "width"; type: "int" } + Property { name: "height"; type: "int" } + Property { name: "minimumWidth"; type: "int" } + Property { name: "minimumHeight"; type: "int" } + Property { name: "maximumWidth"; type: "int" } + Property { name: "maximumHeight"; type: "int" } + Property { name: "visible"; type: "bool" } + Property { name: "active"; revision: 1; type: "bool"; isReadonly: true } + Property { name: "visibility"; revision: 1; type: "Visibility" } + Property { name: "contentOrientation"; type: "Qt::ScreenOrientation" } + Property { name: "opacity"; revision: 1; type: "double" } + Signal { + name: "screenChanged" + Parameter { name: "screen"; type: "QScreen"; isPointer: true } + } + Signal { + name: "modalityChanged" + Parameter { name: "modality"; type: "Qt::WindowModality" } + } + Signal { + name: "windowStateChanged" + Parameter { name: "windowState"; type: "Qt::WindowState" } + } + Signal { + name: "windowTitleChanged" + revision: 2 + Parameter { name: "title"; type: "string" } + } + Signal { + name: "xChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "yChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "widthChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "heightChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "minimumWidthChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "minimumHeightChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "maximumWidthChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "maximumHeightChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "visibleChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "visibilityChanged" + revision: 1 + Parameter { name: "visibility"; type: "QWindow::Visibility" } + } + Signal { name: "activeChanged"; revision: 1 } + Signal { + name: "contentOrientationChanged" + Parameter { name: "orientation"; type: "Qt::ScreenOrientation" } + } + Signal { + name: "focusObjectChanged" + Parameter { name: "object"; type: "QObject"; isPointer: true } + } + Signal { + name: "opacityChanged" + revision: 1 + Parameter { name: "opacity"; type: "double" } + } + Method { name: "requestActivate"; revision: 1 } + Method { + name: "setVisible" + Parameter { name: "visible"; type: "bool" } + } + Method { name: "show" } + Method { name: "hide" } + Method { name: "showMinimized" } + Method { name: "showMaximized" } + Method { name: "showFullScreen" } + Method { name: "showNormal" } + Method { name: "close"; type: "bool" } + Method { name: "raise" } + Method { name: "lower" } + Method { + name: "setTitle" + Parameter { type: "string" } + } + Method { + name: "setX" + Parameter { name: "arg"; type: "int" } + } + Method { + name: "setY" + Parameter { name: "arg"; type: "int" } + } + Method { + name: "setWidth" + Parameter { name: "arg"; type: "int" } + } + Method { + name: "setHeight" + Parameter { name: "arg"; type: "int" } + } + Method { + name: "setMinimumWidth" + Parameter { name: "w"; type: "int" } + } + Method { + name: "setMinimumHeight" + Parameter { name: "h"; type: "int" } + } + Method { + name: "setMaximumWidth" + Parameter { name: "w"; type: "int" } + } + Method { + name: "setMaximumHeight" + Parameter { name: "h"; type: "int" } + } + Method { + name: "alert" + revision: 1 + Parameter { name: "msec"; type: "int" } + } + Method { name: "requestUpdate"; revision: 3 } + } + Component { + name: "QQuickApplicationWindowAttached" + prototype: "QObject" + Property { name: "window"; type: "QQuickApplicationWindow"; isReadonly: true; isPointer: true } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "activeFocusControl"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "header"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "footer"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } + } + Component { + name: "QQuickBusyIndicator" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/BusyIndicator 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "running"; type: "bool" } + } + Component { + name: "QQuickButton" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/Button 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickCheckBox" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/CheckBox 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "tristate"; type: "bool" } + Property { name: "checkState"; type: "Qt::CheckState" } + } + Component { + name: "QQuickComboBox" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/ComboBox 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "model"; type: "QVariant" } + Property { name: "delegateModel"; type: "QQmlInstanceModel"; isReadonly: true; isPointer: true } + Property { name: "pressed"; type: "bool" } + Property { name: "highlightedIndex"; type: "int"; isReadonly: true } + Property { name: "currentIndex"; type: "int" } + Property { name: "currentText"; type: "string"; isReadonly: true } + Property { name: "displayText"; type: "string" } + Property { name: "textRole"; type: "string" } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popup"; type: "QQuickPopup"; isPointer: true } + Signal { + name: "activated" + Parameter { name: "index"; type: "int" } + } + Signal { + name: "highlighted" + Parameter { name: "index"; type: "int" } + } + Method { + name: "textAt" + type: "string" + Parameter { name: "index"; type: "int" } + } + Method { + name: "find" + type: "int" + Parameter { name: "text"; type: "string" } + Parameter { name: "flags"; type: "Qt::MatchFlags" } + } + Method { + name: "find" + type: "int" + Parameter { name: "text"; type: "string" } + } + } + Component { + name: "QQuickContainer" + defaultProperty: "contentData" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Container 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "contentModel"; type: "QVariant"; isReadonly: true } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + Property { name: "currentIndex"; type: "int" } + Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Method { + name: "setCurrentIndex" + Parameter { name: "index"; type: "int" } + } + Method { + name: "itemAt" + type: "QQuickItem*" + Parameter { name: "index"; type: "int" } + } + Method { + name: "addItem" + Parameter { name: "item"; type: "QQuickItem"; isPointer: true } + } + Method { + name: "insertItem" + Parameter { name: "index"; type: "int" } + Parameter { name: "item"; type: "QQuickItem"; isPointer: true } + } + Method { + name: "moveItem" + Parameter { name: "from"; type: "int" } + Parameter { name: "to"; type: "int" } + } + Method { + name: "removeItem" + Parameter { name: "index"; type: "int" } + } + } + Component { + name: "QQuickControl" + defaultProperty: "data" + prototype: "QQuickItem" + exports: ["Qt.labs.templates/Control 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "font"; type: "QFont" } + Property { name: "availableWidth"; type: "double"; isReadonly: true } + Property { name: "availableHeight"; type: "double"; isReadonly: true } + Property { name: "padding"; type: "double" } + Property { name: "topPadding"; type: "double" } + Property { name: "leftPadding"; type: "double" } + Property { name: "rightPadding"; type: "double" } + Property { name: "bottomPadding"; type: "double" } + Property { name: "spacing"; type: "double" } + Property { name: "locale"; type: "QLocale" } + Property { name: "mirrored"; type: "bool"; isReadonly: true } + Property { name: "focusReason"; type: "Qt::FocusReason" } + Property { name: "background"; type: "QQuickItem"; isPointer: true } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + } + Component { + name: "QQuickDial" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Dial 1.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "SnapMode" + values: { + "NoSnap": 0, + "SnapAlways": 1, + "SnapOnRelease": 2 + } + } + Property { name: "from"; type: "double" } + Property { name: "to"; type: "double" } + Property { name: "value"; type: "double" } + Property { name: "position"; type: "double"; isReadonly: true } + Property { name: "angle"; type: "double"; isReadonly: true } + Property { name: "stepSize"; type: "double" } + Property { name: "snapMode"; type: "SnapMode" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "handle"; type: "QQuickItem"; isPointer: true } + Method { name: "increase" } + Method { name: "decrease" } + } + Component { + name: "QQuickDrawer" + defaultProperty: "contentItem" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Drawer 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "edge"; type: "Qt::Edge" } + Property { name: "position"; type: "double" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "animation"; type: "QQuickPropertyAnimation"; isPointer: true } + Signal { name: "clicked" } + Method { name: "open" } + Method { name: "close" } + } + Component { + name: "QQuickFrame" + defaultProperty: "contentData" + prototype: "QQuickPane" + exports: ["Qt.labs.templates/Frame 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "frame"; type: "QQuickItem"; isPointer: true } + } + Component { + name: "QQuickGroupBox" + defaultProperty: "contentData" + prototype: "QQuickFrame" + exports: ["Qt.labs.templates/GroupBox 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "title"; type: "string" } + Property { name: "label"; type: "QQuickItem"; isPointer: true } + } + Component { + name: "QQuickImplicitSizeItem" + defaultProperty: "data" + prototype: "QQuickItem" + Property { name: "implicitWidth"; type: "double"; isReadonly: true } + Property { name: "implicitHeight"; type: "double"; isReadonly: true } + Signal { name: "implicitWidthChanged2"; revision: 1 } + Signal { name: "implicitHeightChanged2"; revision: 1 } + } + Component { + name: "QQuickItemDelegate" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/ItemDelegate 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickLabel" + defaultProperty: "data" + prototype: "QQuickText" + exports: ["Qt.labs.templates/Label 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "font"; type: "QFont" } + Property { name: "background"; type: "QQuickItem"; isPointer: true } + } + Component { + name: "QQuickMenu" + defaultProperty: "contentData" + prototype: "QQuickPopup" + exports: ["Qt.labs.templates/Menu 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "contentModel"; type: "QVariant"; isReadonly: true } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "title"; type: "string" } + Method { + name: "itemAt" + type: "QQuickItem*" + Parameter { name: "index"; type: "int" } + } + Method { + name: "addItem" + Parameter { name: "item"; type: "QQuickItem"; isPointer: true } + } + Method { + name: "insertItem" + Parameter { name: "index"; type: "int" } + Parameter { name: "item"; type: "QQuickItem"; isPointer: true } + } + Method { + name: "moveItem" + Parameter { name: "from"; type: "int" } + Parameter { name: "to"; type: "int" } + } + Method { + name: "removeItem" + Parameter { name: "index"; type: "int" } + } + } + Component { + name: "QQuickMenuItem" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/MenuItem 1.0"] + exportMetaObjectRevisions: [0] + Signal { name: "triggered" } + } + Component { + name: "QQuickOverlay" + defaultProperty: "data" + prototype: "QQuickItem" + Property { name: "background"; type: "QQuickItem"; isPointer: true } + Signal { name: "pressed" } + Signal { name: "released" } + } + Component { + name: "QQuickPage" + defaultProperty: "contentData" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Page 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "header"; type: "QQuickItem"; isPointer: true } + Property { name: "footer"; type: "QQuickItem"; isPointer: true } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + } + Component { + name: "QQuickPageIndicator" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/PageIndicator 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "count"; type: "int" } + Property { name: "currentIndex"; type: "int" } + Property { name: "interactive"; type: "bool" } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + } + Component { + name: "QQuickPane" + defaultProperty: "contentData" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Pane 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "contentWidth"; type: "double" } + Property { name: "contentHeight"; type: "double" } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + } + Component { + name: "QQuickPopup" + defaultProperty: "contentData" + prototype: "QObject" + exports: ["Qt.labs.templates/Popup 1.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "ClosePolicy" + values: { + "NoAutoClose": 0, + "OnPressOutside": 1, + "OnPressOutsideParent": 2, + "OnReleaseOutside": 4, + "OnReleaseOutsideParent": 8, + "OnEscape": 16 + } + } + Enum { + name: "TransformOrigin" + values: { + "TopLeft": 0, + "Top": 1, + "TopRight": 2, + "Left": 3, + "Center": 4, + "Right": 5, + "BottomLeft": 6, + "Bottom": 7, + "BottomRight": 8 + } + } + Property { name: "x"; type: "double" } + Property { name: "y"; type: "double" } + Property { name: "z"; type: "double" } + Property { name: "width"; type: "double" } + Property { name: "height"; type: "double" } + Property { name: "implicitWidth"; type: "double" } + Property { name: "implicitHeight"; type: "double" } + Property { name: "contentWidth"; type: "double" } + Property { name: "contentHeight"; type: "double" } + Property { name: "availableWidth"; type: "double"; isReadonly: true } + Property { name: "availableHeight"; type: "double"; isReadonly: true } + Property { name: "margins"; type: "double" } + Property { name: "topMargin"; type: "double" } + Property { name: "leftMargin"; type: "double" } + Property { name: "rightMargin"; type: "double" } + Property { name: "bottomMargin"; type: "double" } + Property { name: "padding"; type: "double" } + Property { name: "topPadding"; type: "double" } + Property { name: "leftPadding"; type: "double" } + Property { name: "rightPadding"; type: "double" } + Property { name: "bottomPadding"; type: "double" } + Property { name: "parent"; type: "QQuickItem"; isPointer: true } + Property { name: "background"; type: "QQuickItem"; isPointer: true } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + Property { name: "clip"; type: "bool" } + Property { name: "focus"; type: "bool" } + Property { name: "activeFocus"; type: "bool"; isReadonly: true } + Property { name: "modal"; type: "bool" } + Property { name: "visible"; type: "bool" } + Property { name: "opacity"; type: "double" } + Property { name: "scale"; type: "double" } + Property { name: "closePolicy"; type: "ClosePolicy" } + Property { name: "transformOrigin"; type: "TransformOrigin" } + Property { name: "enter"; type: "QQuickTransition"; isPointer: true } + Property { name: "exit"; type: "QQuickTransition"; isPointer: true } + Signal { name: "aboutToShow" } + Signal { name: "aboutToHide" } + Method { name: "open" } + Method { name: "close" } + } + Component { + name: "QQuickProgressBar" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/ProgressBar 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "from"; type: "double" } + Property { name: "to"; type: "double" } + Property { name: "value"; type: "double" } + Property { name: "position"; type: "double"; isReadonly: true } + Property { name: "visualPosition"; type: "double"; isReadonly: true } + Property { name: "indeterminate"; type: "bool" } + Property { name: "indicator"; type: "QQuickItem"; isPointer: true } + } + Component { + name: "QQuickRadioButton" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/RadioButton 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickRangeSlider" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/RangeSlider 1.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "SnapMode" + values: { + "NoSnap": 0, + "SnapAlways": 1, + "SnapOnRelease": 2 + } + } + Property { name: "from"; type: "double" } + Property { name: "to"; type: "double" } + Property { name: "first"; type: "QQuickRangeSliderNode"; isReadonly: true; isPointer: true } + Property { name: "second"; type: "QQuickRangeSliderNode"; isReadonly: true; isPointer: true } + Property { name: "stepSize"; type: "double" } + Property { name: "snapMode"; type: "SnapMode" } + Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "track"; type: "QQuickItem"; isPointer: true } + Method { + name: "setValues" + Parameter { name: "firstValue"; type: "double" } + Parameter { name: "secondValue"; type: "double" } + } + } + Component { + name: "QQuickRangeSliderNode" + prototype: "QObject" + Property { name: "value"; type: "double" } + Property { name: "position"; type: "double"; isReadonly: true } + Property { name: "visualPosition"; type: "double"; isReadonly: true } + Property { name: "handle"; type: "QQuickItem"; isPointer: true } + Property { name: "pressed"; type: "bool" } + Method { name: "increase" } + Method { name: "decrease" } + } + Component { + name: "QQuickScrollBar" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/ScrollBar 1.0"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickScrollBarAttached" + Property { name: "size"; type: "double" } + Property { name: "position"; type: "double" } + Property { name: "active"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "handle"; type: "QQuickItem"; isPointer: true } + Method { + name: "setSize" + Parameter { name: "size"; type: "double" } + } + Method { + name: "setPosition" + Parameter { name: "position"; type: "double" } + } + } + Component { + name: "QQuickScrollBarAttached" + prototype: "QObject" + Property { name: "horizontal"; type: "QQuickScrollBar"; isPointer: true } + Property { name: "vertical"; type: "QQuickScrollBar"; isPointer: true } + } + Component { + name: "QQuickScrollIndicator" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/ScrollIndicator 1.0"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickScrollIndicatorAttached" + Property { name: "size"; type: "double" } + Property { name: "position"; type: "double" } + Property { name: "active"; type: "bool" } + Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "indicator"; type: "QQuickItem"; isPointer: true } + Method { + name: "setSize" + Parameter { name: "size"; type: "double" } + } + Method { + name: "setPosition" + Parameter { name: "position"; type: "double" } + } + } + Component { + name: "QQuickScrollIndicatorAttached" + prototype: "QObject" + Property { name: "horizontal"; type: "QQuickScrollIndicator"; isPointer: true } + Property { name: "vertical"; type: "QQuickScrollIndicator"; isPointer: true } + } + Component { + name: "QQuickSlider" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Slider 1.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "SnapMode" + values: { + "NoSnap": 0, + "SnapAlways": 1, + "SnapOnRelease": 2 + } + } + Property { name: "from"; type: "double" } + Property { name: "to"; type: "double" } + Property { name: "value"; type: "double" } + Property { name: "position"; type: "double"; isReadonly: true } + Property { name: "visualPosition"; type: "double"; isReadonly: true } + Property { name: "stepSize"; type: "double" } + Property { name: "snapMode"; type: "SnapMode" } + Property { name: "pressed"; type: "bool" } + Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "handle"; type: "QQuickItem"; isPointer: true } + Property { name: "track"; type: "QQuickItem"; isPointer: true } + Method { name: "increase" } + Method { name: "decrease" } + } + Component { + name: "QQuickSpinBox" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/SpinBox 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "from"; type: "int" } + Property { name: "to"; type: "int" } + Property { name: "value"; type: "int" } + Property { name: "stepSize"; type: "int" } + Property { name: "validator"; type: "QValidator"; isPointer: true } + Property { name: "textFromValue"; type: "QJSValue" } + Property { name: "valueFromText"; type: "QJSValue" } + Property { name: "up"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true } + Property { name: "down"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true } + Method { name: "increase" } + Method { name: "decrease" } + } + Component { + name: "QQuickSpinButton" + prototype: "QObject" + Property { name: "pressed"; type: "bool" } + Property { name: "indicator"; type: "QQuickItem"; isPointer: true } + } + Component { + name: "QQuickStackAttached" + prototype: "QObject" + Property { name: "index"; type: "int"; isReadonly: true } + Property { name: "view"; type: "QQuickStackView"; isReadonly: true; isPointer: true } + Property { name: "status"; type: "QQuickStackView::Status"; isReadonly: true } + } + Component { + name: "QQuickStackView" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/StackView 1.0"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickStackAttached" + Enum { + name: "Status" + values: { + "Inactive": 0, + "Deactivating": 1, + "Activating": 2, + "Active": 3 + } + } + Enum { + name: "LoadBehavior" + values: { + "DontLoad": 0, + "ForceLoad": 1 + } + } + Enum { + name: "Operation" + values: { + "Transition": 0, + "Immediate": 1 + } + } + Property { name: "busy"; type: "bool"; isReadonly: true } + Property { name: "depth"; type: "int"; isReadonly: true } + Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "initialItem"; type: "QVariant" } + Property { name: "popEnter"; type: "QQuickTransition"; isPointer: true } + Property { name: "popExit"; type: "QQuickTransition"; isPointer: true } + Property { name: "pushEnter"; type: "QQuickTransition"; isPointer: true } + Property { name: "pushExit"; type: "QQuickTransition"; isPointer: true } + Property { name: "replaceEnter"; type: "QQuickTransition"; isPointer: true } + Property { name: "replaceExit"; type: "QQuickTransition"; isPointer: true } + Method { name: "clear" } + Method { + name: "get" + type: "QQuickItem*" + Parameter { name: "index"; type: "int" } + Parameter { name: "behavior"; type: "LoadBehavior" } + } + Method { + name: "get" + type: "QQuickItem*" + Parameter { name: "index"; type: "int" } + } + Method { + name: "find" + type: "QQuickItem*" + Parameter { name: "callback"; type: "QJSValue" } + Parameter { name: "behavior"; type: "LoadBehavior" } + } + Method { + name: "find" + type: "QQuickItem*" + Parameter { name: "callback"; type: "QJSValue" } + } + Method { + name: "push" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "pop" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "replace" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + } + Component { + name: "QQuickSwipeView" + defaultProperty: "contentData" + prototype: "QQuickContainer" + exports: ["Qt.labs.templates/SwipeView 1.0"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickSwipeViewAttached" + } + Component { + name: "QQuickSwipeViewAttached" + prototype: "QObject" + Property { name: "index"; type: "int"; isReadonly: true } + Property { name: "isCurrentItem"; type: "bool"; isReadonly: true } + Property { name: "view"; type: "QQuickSwipeView"; isReadonly: true; isPointer: true } + } + Component { + name: "QQuickSwitch" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/Switch 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "position"; type: "double" } + Property { name: "visualPosition"; type: "double"; isReadonly: true } + } + Component { + name: "QQuickTabBar" + defaultProperty: "contentData" + prototype: "QQuickContainer" + exports: ["Qt.labs.templates/TabBar 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickTabButton" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/TabButton 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickText" + defaultProperty: "data" + prototype: "QQuickImplicitSizeItem" + Enum { + name: "HAlignment" + values: { + "AlignLeft": 1, + "AlignRight": 2, + "AlignHCenter": 4, + "AlignJustify": 8 + } + } + Enum { + name: "VAlignment" + values: { + "AlignTop": 32, + "AlignBottom": 64, + "AlignVCenter": 128 + } + } + Enum { + name: "TextStyle" + values: { + "Normal": 0, + "Outline": 1, + "Raised": 2, + "Sunken": 3 + } + } + Enum { + name: "TextFormat" + values: { + "PlainText": 0, + "RichText": 1, + "AutoText": 2, + "StyledText": 4 + } + } + Enum { + name: "TextElideMode" + values: { + "ElideLeft": 0, + "ElideRight": 1, + "ElideMiddle": 2, + "ElideNone": 3 + } + } + Enum { + name: "WrapMode" + values: { + "NoWrap": 0, + "WordWrap": 1, + "WrapAnywhere": 3, + "WrapAtWordBoundaryOrAnywhere": 4, + "Wrap": 4 + } + } + Enum { + name: "RenderType" + values: { + "QtRendering": 0, + "NativeRendering": 1 + } + } + Enum { + name: "LineHeightMode" + values: { + "ProportionalHeight": 0, + "FixedHeight": 1 + } + } + Enum { + name: "FontSizeMode" + values: { + "FixedSize": 0, + "HorizontalFit": 1, + "VerticalFit": 2, + "Fit": 3 + } + } + Property { name: "text"; type: "string" } + Property { name: "font"; type: "QFont" } + Property { name: "color"; type: "QColor" } + Property { name: "linkColor"; type: "QColor" } + Property { name: "style"; type: "TextStyle" } + Property { name: "styleColor"; type: "QColor" } + Property { name: "horizontalAlignment"; type: "HAlignment" } + Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true } + Property { name: "verticalAlignment"; type: "VAlignment" } + Property { name: "wrapMode"; type: "WrapMode" } + Property { name: "lineCount"; type: "int"; isReadonly: true } + Property { name: "truncated"; type: "bool"; isReadonly: true } + Property { name: "maximumLineCount"; type: "int" } + Property { name: "textFormat"; type: "TextFormat" } + Property { name: "elide"; type: "TextElideMode" } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "contentHeight"; type: "double"; isReadonly: true } + Property { name: "paintedWidth"; type: "double"; isReadonly: true } + Property { name: "paintedHeight"; type: "double"; isReadonly: true } + Property { name: "lineHeight"; type: "double" } + Property { name: "lineHeightMode"; type: "LineHeightMode" } + Property { name: "baseUrl"; type: "QUrl" } + Property { name: "minimumPixelSize"; type: "int" } + Property { name: "minimumPointSize"; type: "int" } + Property { name: "fontSizeMode"; type: "FontSizeMode" } + Property { name: "renderType"; type: "RenderType" } + Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true } + Property { name: "padding"; revision: 6; type: "double" } + Property { name: "topPadding"; revision: 6; type: "double" } + Property { name: "leftPadding"; revision: 6; type: "double" } + Property { name: "rightPadding"; revision: 6; type: "double" } + Property { name: "bottomPadding"; revision: 6; type: "double" } + Signal { + name: "textChanged" + Parameter { name: "text"; type: "string" } + } + Signal { + name: "linkActivated" + Parameter { name: "link"; type: "string" } + } + Signal { + name: "linkHovered" + revision: 2 + Parameter { name: "link"; type: "string" } + } + Signal { + name: "fontChanged" + Parameter { name: "font"; type: "QFont" } + } + Signal { + name: "styleChanged" + Parameter { name: "style"; type: "TextStyle" } + } + Signal { + name: "horizontalAlignmentChanged" + Parameter { name: "alignment"; type: "HAlignment" } + } + Signal { + name: "verticalAlignmentChanged" + Parameter { name: "alignment"; type: "VAlignment" } + } + Signal { + name: "textFormatChanged" + Parameter { name: "textFormat"; type: "TextFormat" } + } + Signal { + name: "elideModeChanged" + Parameter { name: "mode"; type: "TextElideMode" } + } + Signal { name: "contentSizeChanged" } + Signal { + name: "lineHeightChanged" + Parameter { name: "lineHeight"; type: "double" } + } + Signal { + name: "lineHeightModeChanged" + Parameter { name: "mode"; type: "LineHeightMode" } + } + Signal { + name: "lineLaidOut" + Parameter { name: "line"; type: "QQuickTextLine"; isPointer: true } + } + Signal { name: "paddingChanged"; revision: 6 } + Signal { name: "topPaddingChanged"; revision: 6 } + Signal { name: "leftPaddingChanged"; revision: 6 } + Signal { name: "rightPaddingChanged"; revision: 6 } + Signal { name: "bottomPaddingChanged"; revision: 6 } + Method { name: "doLayout" } + Method { + name: "linkAt" + revision: 3 + type: "string" + Parameter { name: "x"; type: "double" } + Parameter { name: "y"; type: "double" } + } + } + Component { + name: "QQuickTextArea" + defaultProperty: "data" + prototype: "QQuickTextEdit" + exports: ["Qt.labs.templates/TextArea 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "font"; type: "QFont" } + Property { name: "implicitWidth"; type: "double" } + Property { name: "implicitHeight"; type: "double" } + Property { name: "background"; type: "QQuickItem"; isPointer: true } + Property { name: "placeholderText"; type: "string" } + Property { name: "focusReason"; type: "Qt::FocusReason" } + Signal { + name: "pressAndHold" + Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } + } + } + Component { + name: "QQuickTextEdit" + defaultProperty: "data" + prototype: "QQuickImplicitSizeItem" + Enum { + name: "HAlignment" + values: { + "AlignLeft": 1, + "AlignRight": 2, + "AlignHCenter": 4, + "AlignJustify": 8 + } + } + Enum { + name: "VAlignment" + values: { + "AlignTop": 32, + "AlignBottom": 64, + "AlignVCenter": 128 + } + } + Enum { + name: "TextFormat" + values: { + "PlainText": 0, + "RichText": 1, + "AutoText": 2 + } + } + Enum { + name: "WrapMode" + values: { + "NoWrap": 0, + "WordWrap": 1, + "WrapAnywhere": 3, + "WrapAtWordBoundaryOrAnywhere": 4, + "Wrap": 4 + } + } + Enum { + name: "SelectionMode" + values: { + "SelectCharacters": 0, + "SelectWords": 1 + } + } + Enum { + name: "RenderType" + values: { + "QtRendering": 0, + "NativeRendering": 1 + } + } + Property { name: "text"; type: "string" } + Property { name: "color"; type: "QColor" } + Property { name: "selectionColor"; type: "QColor" } + Property { name: "selectedTextColor"; type: "QColor" } + Property { name: "font"; type: "QFont" } + Property { name: "horizontalAlignment"; type: "HAlignment" } + Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true } + Property { name: "verticalAlignment"; type: "VAlignment" } + Property { name: "wrapMode"; type: "WrapMode" } + Property { name: "lineCount"; type: "int"; isReadonly: true } + Property { name: "length"; type: "int"; isReadonly: true } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "contentHeight"; type: "double"; isReadonly: true } + Property { name: "paintedWidth"; type: "double"; isReadonly: true } + Property { name: "paintedHeight"; type: "double"; isReadonly: true } + Property { name: "textFormat"; type: "TextFormat" } + Property { name: "readOnly"; type: "bool" } + Property { name: "cursorVisible"; type: "bool" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } + Property { name: "cursorDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionStart"; type: "int"; isReadonly: true } + Property { name: "selectionEnd"; type: "int"; isReadonly: true } + Property { name: "selectedText"; type: "string"; isReadonly: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "persistentSelection"; type: "bool" } + Property { name: "textMargin"; type: "double" } + Property { name: "inputMethodHints"; type: "Qt::InputMethodHints" } + Property { name: "selectByKeyboard"; revision: 1; type: "bool" } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "mouseSelectionMode"; type: "SelectionMode" } + Property { name: "canPaste"; type: "bool"; isReadonly: true } + Property { name: "canUndo"; type: "bool"; isReadonly: true } + Property { name: "canRedo"; type: "bool"; isReadonly: true } + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "baseUrl"; type: "QUrl" } + Property { name: "renderType"; type: "RenderType" } + Property { + name: "textDocument" + revision: 1 + type: "QQuickTextDocument" + isReadonly: true + isPointer: true + } + Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true } + Property { name: "padding"; revision: 6; type: "double" } + Property { name: "topPadding"; revision: 6; type: "double" } + Property { name: "leftPadding"; revision: 6; type: "double" } + Property { name: "rightPadding"; revision: 6; type: "double" } + Property { name: "bottomPadding"; revision: 6; type: "double" } + Signal { name: "contentSizeChanged" } + Signal { + name: "colorChanged" + Parameter { name: "color"; type: "QColor" } + } + Signal { + name: "selectionColorChanged" + Parameter { name: "color"; type: "QColor" } + } + Signal { + name: "selectedTextColorChanged" + Parameter { name: "color"; type: "QColor" } + } + Signal { + name: "fontChanged" + Parameter { name: "font"; type: "QFont" } + } + Signal { + name: "horizontalAlignmentChanged" + Parameter { name: "alignment"; type: "QQuickTextEdit::HAlignment" } + } + Signal { + name: "verticalAlignmentChanged" + Parameter { name: "alignment"; type: "QQuickTextEdit::VAlignment" } + } + Signal { + name: "textFormatChanged" + Parameter { name: "textFormat"; type: "QQuickTextEdit::TextFormat" } + } + Signal { + name: "readOnlyChanged" + Parameter { name: "isReadOnly"; type: "bool" } + } + Signal { + name: "cursorVisibleChanged" + Parameter { name: "isCursorVisible"; type: "bool" } + } + Signal { + name: "activeFocusOnPressChanged" + Parameter { name: "activeFocusOnPressed"; type: "bool" } + } + Signal { + name: "persistentSelectionChanged" + Parameter { name: "isPersistentSelection"; type: "bool" } + } + Signal { + name: "textMarginChanged" + Parameter { name: "textMargin"; type: "double" } + } + Signal { + name: "selectByKeyboardChanged" + revision: 1 + Parameter { name: "selectByKeyboard"; type: "bool" } + } + Signal { + name: "selectByMouseChanged" + Parameter { name: "selectByMouse"; type: "bool" } + } + Signal { + name: "mouseSelectionModeChanged" + Parameter { name: "mode"; type: "QQuickTextEdit::SelectionMode" } + } + Signal { + name: "linkActivated" + Parameter { name: "link"; type: "string" } + } + Signal { + name: "linkHovered" + revision: 2 + Parameter { name: "link"; type: "string" } + } + Signal { name: "editingFinished"; revision: 6 } + Signal { name: "paddingChanged"; revision: 6 } + Signal { name: "topPaddingChanged"; revision: 6 } + Signal { name: "leftPaddingChanged"; revision: 6 } + Signal { name: "rightPaddingChanged"; revision: 6 } + Signal { name: "bottomPaddingChanged"; revision: 6 } + Method { name: "selectAll" } + Method { name: "selectWord" } + Method { + name: "select" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { name: "deselect" } + Method { + name: "isRightToLeft" + type: "bool" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { name: "cut" } + Method { name: "copy" } + Method { name: "paste" } + Method { name: "undo" } + Method { name: "redo" } + Method { + name: "insert" + Parameter { name: "position"; type: "int" } + Parameter { name: "text"; type: "string" } + } + Method { + name: "remove" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { + name: "append" + revision: 2 + Parameter { name: "text"; type: "string" } + } + Method { + name: "inputMethodQuery" + revision: 4 + type: "QVariant" + Parameter { name: "query"; type: "Qt::InputMethodQuery" } + Parameter { name: "argument"; type: "QVariant" } + } + Method { + name: "positionToRectangle" + type: "QRectF" + Parameter { type: "int" } + } + Method { + name: "positionAt" + type: "int" + Parameter { name: "x"; type: "double" } + Parameter { name: "y"; type: "double" } + } + Method { + name: "moveCursorSelection" + Parameter { name: "pos"; type: "int" } + } + Method { + name: "moveCursorSelection" + Parameter { name: "pos"; type: "int" } + Parameter { name: "mode"; type: "SelectionMode" } + } + Method { + name: "getText" + type: "string" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { + name: "getFormattedText" + type: "string" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { + name: "linkAt" + revision: 3 + type: "string" + Parameter { name: "x"; type: "double" } + Parameter { name: "y"; type: "double" } + } + } + Component { + name: "QQuickTextField" + defaultProperty: "data" + prototype: "QQuickTextInput" + exports: ["Qt.labs.templates/TextField 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "font"; type: "QFont" } + Property { name: "implicitWidth"; type: "double" } + Property { name: "implicitHeight"; type: "double" } + Property { name: "background"; type: "QQuickItem"; isPointer: true } + Property { name: "placeholderText"; type: "string" } + Property { name: "focusReason"; type: "Qt::FocusReason" } + Signal { + name: "pressAndHold" + Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true } + } + } + Component { + name: "QQuickTextInput" + defaultProperty: "data" + prototype: "QQuickImplicitSizeItem" + Enum { + name: "EchoMode" + values: { + "Normal": 0, + "NoEcho": 1, + "Password": 2, + "PasswordEchoOnEdit": 3 + } + } + Enum { + name: "HAlignment" + values: { + "AlignLeft": 1, + "AlignRight": 2, + "AlignHCenter": 4 + } + } + Enum { + name: "VAlignment" + values: { + "AlignTop": 32, + "AlignBottom": 64, + "AlignVCenter": 128 + } + } + Enum { + name: "WrapMode" + values: { + "NoWrap": 0, + "WordWrap": 1, + "WrapAnywhere": 3, + "WrapAtWordBoundaryOrAnywhere": 4, + "Wrap": 4 + } + } + Enum { + name: "SelectionMode" + values: { + "SelectCharacters": 0, + "SelectWords": 1 + } + } + Enum { + name: "CursorPosition" + values: { + "CursorBetweenCharacters": 0, + "CursorOnCharacter": 1 + } + } + Enum { + name: "RenderType" + values: { + "QtRendering": 0, + "NativeRendering": 1 + } + } + Property { name: "text"; type: "string" } + Property { name: "length"; type: "int"; isReadonly: true } + Property { name: "color"; type: "QColor" } + Property { name: "selectionColor"; type: "QColor" } + Property { name: "selectedTextColor"; type: "QColor" } + Property { name: "font"; type: "QFont" } + Property { name: "horizontalAlignment"; type: "HAlignment" } + Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true } + Property { name: "verticalAlignment"; type: "VAlignment" } + Property { name: "wrapMode"; type: "WrapMode" } + Property { name: "readOnly"; type: "bool" } + Property { name: "cursorVisible"; type: "bool" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } + Property { name: "cursorDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionStart"; type: "int"; isReadonly: true } + Property { name: "selectionEnd"; type: "int"; isReadonly: true } + Property { name: "selectedText"; type: "string"; isReadonly: true } + Property { name: "maximumLength"; type: "int" } + Property { name: "validator"; type: "QValidator"; isPointer: true } + Property { name: "inputMask"; type: "string" } + Property { name: "inputMethodHints"; type: "Qt::InputMethodHints" } + Property { name: "acceptableInput"; type: "bool"; isReadonly: true } + Property { name: "echoMode"; type: "EchoMode" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "passwordCharacter"; type: "string" } + Property { name: "passwordMaskDelay"; revision: 3; type: "int" } + Property { name: "displayText"; type: "string"; isReadonly: true } + Property { name: "autoScroll"; type: "bool" } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "mouseSelectionMode"; type: "SelectionMode" } + Property { name: "persistentSelection"; type: "bool" } + Property { name: "canPaste"; type: "bool"; isReadonly: true } + Property { name: "canUndo"; type: "bool"; isReadonly: true } + Property { name: "canRedo"; type: "bool"; isReadonly: true } + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "contentHeight"; type: "double"; isReadonly: true } + Property { name: "renderType"; type: "RenderType" } + Property { name: "padding"; revision: 6; type: "double" } + Property { name: "topPadding"; revision: 6; type: "double" } + Property { name: "leftPadding"; revision: 6; type: "double" } + Property { name: "rightPadding"; revision: 6; type: "double" } + Property { name: "bottomPadding"; revision: 6; type: "double" } + Signal { name: "accepted" } + Signal { name: "editingFinished"; revision: 2 } + Signal { + name: "fontChanged" + Parameter { name: "font"; type: "QFont" } + } + Signal { + name: "horizontalAlignmentChanged" + Parameter { name: "alignment"; type: "HAlignment" } + } + Signal { + name: "verticalAlignmentChanged" + Parameter { name: "alignment"; type: "VAlignment" } + } + Signal { + name: "readOnlyChanged" + Parameter { name: "isReadOnly"; type: "bool" } + } + Signal { + name: "cursorVisibleChanged" + Parameter { name: "isCursorVisible"; type: "bool" } + } + Signal { + name: "maximumLengthChanged" + Parameter { name: "maximumLength"; type: "int" } + } + Signal { + name: "inputMaskChanged" + Parameter { name: "inputMask"; type: "string" } + } + Signal { + name: "echoModeChanged" + Parameter { name: "echoMode"; type: "EchoMode" } + } + Signal { + name: "passwordMaskDelayChanged" + revision: 3 + Parameter { name: "delay"; type: "int" } + } + Signal { + name: "activeFocusOnPressChanged" + Parameter { name: "activeFocusOnPress"; type: "bool" } + } + Signal { + name: "autoScrollChanged" + Parameter { name: "autoScroll"; type: "bool" } + } + Signal { + name: "selectByMouseChanged" + Parameter { name: "selectByMouse"; type: "bool" } + } + Signal { + name: "mouseSelectionModeChanged" + Parameter { name: "mode"; type: "SelectionMode" } + } + Signal { name: "contentSizeChanged" } + Signal { name: "paddingChanged"; revision: 6 } + Signal { name: "topPaddingChanged"; revision: 6 } + Signal { name: "leftPaddingChanged"; revision: 6 } + Signal { name: "rightPaddingChanged"; revision: 6 } + Signal { name: "bottomPaddingChanged"; revision: 6 } + Method { name: "selectAll" } + Method { name: "selectWord" } + Method { + name: "select" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { name: "deselect" } + Method { + name: "isRightToLeft" + type: "bool" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { name: "cut" } + Method { name: "copy" } + Method { name: "paste" } + Method { name: "undo" } + Method { name: "redo" } + Method { + name: "insert" + Parameter { name: "position"; type: "int" } + Parameter { name: "text"; type: "string" } + } + Method { + name: "remove" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { + name: "ensureVisible" + revision: 3 + Parameter { name: "position"; type: "int" } + } + Method { + name: "positionAt" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "positionToRectangle" + type: "QRectF" + Parameter { name: "pos"; type: "int" } + } + Method { + name: "moveCursorSelection" + Parameter { name: "pos"; type: "int" } + } + Method { + name: "moveCursorSelection" + Parameter { name: "pos"; type: "int" } + Parameter { name: "mode"; type: "SelectionMode" } + } + Method { + name: "inputMethodQuery" + revision: 3 + type: "QVariant" + Parameter { name: "query"; type: "Qt::InputMethodQuery" } + Parameter { name: "argument"; type: "QVariant" } + } + Method { + name: "getText" + type: "string" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + } + Component { + name: "QQuickToolBar" + defaultProperty: "contentData" + prototype: "QQuickFrame" + exports: ["Qt.labs.templates/ToolBar 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickToolButton" + defaultProperty: "data" + prototype: "QQuickButton" + exports: ["Qt.labs.templates/ToolButton 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickTumbler" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Tumbler 1.0"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickTumblerAttached" + Property { name: "model"; type: "QVariant" } + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "currentIndex"; type: "int" } + Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "visibleItemCount"; type: "int" } + } + Component { + name: "QQuickTumblerAttached" + prototype: "QObject" + Property { name: "tumbler"; type: "QQuickTumbler"; isReadonly: true; isPointer: true } + Property { name: "displacement"; type: "double"; isReadonly: true } + } + Component { + name: "QQuickBusyIndicatorRing" + defaultProperty: "data" + prototype: "QQuickItem" + exports: ["Qt.labs.controls.impl/BusyRing 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickButtonGroup" + prototype: "QObject" + exports: ["Qt.labs.controls/ButtonGroup 1.0"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickButtonGroupAttached" + Property { name: "checkedButton"; type: "QQuickAbstractButton"; isPointer: true } + Property { name: "buttons"; type: "QQuickAbstractButton"; isList: true; isReadonly: true } + Method { + name: "addButton" + Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true } + } + Method { + name: "removeButton" + Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true } + } + } + Component { + name: "QQuickButtonGroupAttached" + prototype: "QObject" + Property { name: "group"; type: "QQuickButtonGroup"; isPointer: true } + } + Component { + name: "QQuickProgressStrip" + defaultProperty: "data" + prototype: "QQuickItem" + exports: ["Qt.labs.controls.impl/ProgressStrip 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "indeterminate"; type: "bool" } + Property { name: "progress"; type: "double" } + } + Component { + prototype: "QQuickApplicationWindow" + name: "Qt.labs.controls/ApplicationWindow 1.0" + exports: ["Qt.labs.controls/ApplicationWindow 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickBusyIndicator" + name: "Qt.labs.controls/BusyIndicator 1.0" + exports: ["Qt.labs.controls/BusyIndicator 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickButton" + name: "Qt.labs.controls/Button 1.0" + exports: ["Qt.labs.controls/Button 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickCheckBox" + name: "Qt.labs.controls/CheckBox 1.0" + exports: ["Qt.labs.controls/CheckBox 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickComboBox" + name: "Qt.labs.controls/ComboBox 1.0" + exports: ["Qt.labs.controls/ComboBox 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickDial" + name: "Qt.labs.controls/Dial 1.0" + exports: ["Qt.labs.controls/Dial 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickDrawer" + name: "Qt.labs.controls/Drawer 1.0" + exports: ["Qt.labs.controls/Drawer 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "contentItem" + } + Component { + prototype: "QQuickFrame" + name: "Qt.labs.controls/Frame 1.0" + exports: ["Qt.labs.controls/Frame 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "contentData" + } + Component { + prototype: "QQuickGroupBox" + name: "Qt.labs.controls/GroupBox 1.0" + exports: ["Qt.labs.controls/GroupBox 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "contentData" + } + Component { + prototype: "QQuickItemDelegate" + name: "Qt.labs.controls/ItemDelegate 1.0" + exports: ["Qt.labs.controls/ItemDelegate 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickLabel" + name: "Qt.labs.controls/Label 1.0" + exports: ["Qt.labs.controls/Label 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickMenu" + name: "Qt.labs.controls/Menu 1.0" + exports: ["Qt.labs.controls/Menu 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "contentData" + } + Component { + prototype: "QQuickMenuItem" + name: "Qt.labs.controls/MenuItem 1.0" + exports: ["Qt.labs.controls/MenuItem 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickPage" + name: "Qt.labs.controls/Page 1.0" + exports: ["Qt.labs.controls/Page 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "contentData" + } + Component { + prototype: "QQuickPageIndicator" + name: "Qt.labs.controls/PageIndicator 1.0" + exports: ["Qt.labs.controls/PageIndicator 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickFrame" + name: "Qt.labs.controls/Pane 1.0" + exports: ["Qt.labs.controls/Pane 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "contentData" + } + Component { + prototype: "QQuickPopup" + name: "Qt.labs.controls/Popup 1.0" + exports: ["Qt.labs.controls/Popup 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "contentData" + } + Component { + prototype: "QQuickProgressBar" + name: "Qt.labs.controls/ProgressBar 1.0" + exports: ["Qt.labs.controls/ProgressBar 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickRadioButton" + name: "Qt.labs.controls/RadioButton 1.0" + exports: ["Qt.labs.controls/RadioButton 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickRangeSlider" + name: "Qt.labs.controls/RangeSlider 1.0" + exports: ["Qt.labs.controls/RangeSlider 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickScrollBar" + name: "Qt.labs.controls/ScrollBar 1.0" + exports: ["Qt.labs.controls/ScrollBar 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickScrollIndicator" + name: "Qt.labs.controls/ScrollIndicator 1.0" + exports: ["Qt.labs.controls/ScrollIndicator 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickSlider" + name: "Qt.labs.controls/Slider 1.0" + exports: ["Qt.labs.controls/Slider 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickSpinBox" + name: "Qt.labs.controls/SpinBox 1.0" + exports: ["Qt.labs.controls/SpinBox 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickStackView" + name: "Qt.labs.controls/StackView 1.0" + exports: ["Qt.labs.controls/StackView 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickSwipeView" + name: "Qt.labs.controls/SwipeView 1.0" + exports: ["Qt.labs.controls/SwipeView 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "contentData" + } + Component { + prototype: "QQuickSwitch" + name: "Qt.labs.controls/Switch 1.0" + exports: ["Qt.labs.controls/Switch 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickTabBar" + name: "Qt.labs.controls/TabBar 1.0" + exports: ["Qt.labs.controls/TabBar 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "contentData" + } + Component { + prototype: "QQuickTabButton" + name: "Qt.labs.controls/TabButton 1.0" + exports: ["Qt.labs.controls/TabButton 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickTextArea" + name: "Qt.labs.controls/TextArea 1.0" + exports: ["Qt.labs.controls/TextArea 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickTextField" + name: "Qt.labs.controls/TextField 1.0" + exports: ["Qt.labs.controls/TextField 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickToolBar" + name: "Qt.labs.controls/ToolBar 1.0" + exports: ["Qt.labs.controls/ToolBar 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "contentData" + } + Component { + prototype: "QQuickToolButton" + name: "Qt.labs.controls/ToolButton 1.0" + exports: ["Qt.labs.controls/ToolButton 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickTumbler" + name: "Qt.labs.controls/Tumbler 1.0" + exports: ["Qt.labs.controls/Tumbler 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Popup.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Popup.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Popup.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Popup.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.Popup { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentWidth > 0 ? contentHeight + topPadding + bottomPadding : 0) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + padding: 6 + + contentItem: Item { } + + background: Rectangle { + border.color: "#353637" + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ProgressBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ProgressBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ProgressBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ProgressBar.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.impl 1.0 + +T.ProgressBar { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + indicator ? indicator.implicitWidth : 0) + leftPadding + rightPadding + implicitHeight: Math.max(background ? background.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding + + //! [indicator] + indicator: ProgressStrip { + id: strip + x: control.leftPadding + y: control.topPadding + (control.availableHeight - height) / 2 + width: control.availableWidth + height: 6 + scale: control.mirrored ? -1 : 1 + progress: control.position + indeterminate: control.indeterminate + + ProgressStripAnimator { + target: strip + running: control.visible && control.indeterminate + } + } + //! [indicator] + + //! [background] + background: Rectangle { + implicitWidth: 200 + implicitHeight: 6 + x: control.leftPadding + y: control.topPadding + (control.availableHeight - height) / 2 + width: control.availableWidth + height: 6 + + color: "#e4e4e4" + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/qmldir 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/qmldir 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,5 @@ +module Qt.labs.controls +plugin qtlabscontrolsplugin +classname QtLabsControlsPlugin +depends Qt.labs.templates 1.0 +designersupported diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/RadioButton.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/RadioButton.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/RadioButton.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/RadioButton.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,97 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 +import Qt.labs.templates 1.0 as T + +T.RadioButton { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (label ? label.implicitWidth : 0) + + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(label ? label.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 6 + spacing: 6 + opacity: enabled ? 1 : 0.2 + + //! [indicator] + indicator: Rectangle { + implicitWidth: 28 + implicitHeight: 28 + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + + radius: width / 2 + border.width: 1 + border.color: (control.pressed ? "#26282a" : "#353637") + color: control.pressed ? "#e4e4e4" : "#f6f6f6" + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 20 + height: 20 + radius: width / 2 + color: control.pressed ? "#26282a" : "#353637" + visible: control.checked + } + } + //! [indicator] + + //! [label] + label: Text { + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.spacing) + y: control.topPadding + width: control.availableWidth - indicator.width - control.spacing + height: control.availableHeight + + text: control.text + font: control.font + color: control.pressed ? "#26282a" : "#353637" + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/RangeSlider.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/RangeSlider.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/RangeSlider.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/RangeSlider.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,100 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.RangeSlider { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + Math.max(track ? track.implicitWidth : 0, + first.handle ? first.handle.implicitWidth : 0, + second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(track ? track.implicitHeight : 0, + first.handle ? first.handle.implicitHeight : 0, + second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) + + padding: 6 + + //! [firstHandle] + first.handle: Rectangle { + x: control.leftPadding + (horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) + implicitWidth: 28 + implicitHeight: 28 + radius: width / 2 + border.width: activeFocus ? 2 : 1 + border.color: "#353637" + color: first.pressed ? "#bdbebf" : "#ffffff" + + readonly property bool horizontal: control.orientation === Qt.Horizontal + } + //! [firstHandle] + + //! [secondHandle] + second.handle: Rectangle { + x: control.leftPadding + (horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) + implicitWidth: 28 + implicitHeight: 28 + radius: width / 2 + border.width: activeFocus ? 2 : 1 + border.color: "#353637" + color: second.pressed ? "#bdbebf" : "#ffffff" + + readonly property bool horizontal: control.orientation === Qt.Horizontal + } + //! [secondHandle] + + //! [track] + track: Rectangle { + x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) + implicitWidth: horizontal ? 200 : 6 + implicitHeight: horizontal ? 6 : 200 + width: horizontal ? control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.availableHeight + radius: 3 + border.color: "#353637" + color: "#ffffff" + scale: horizontal && control.mirrored ? -1 : 1 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + } + //! [track] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ScrollBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ScrollBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ScrollBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ScrollBar.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.ScrollBar { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + handle.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + handle.implicitHeight + topPadding + bottomPadding) + + padding: 2 + + //! [handle] + handle: Rectangle { + id: handle + + implicitWidth: 6 + implicitHeight: 6 + + radius: width / 2 + color: control.pressed ? "#28282a" : "#bdbebf" + visible: control.size < 1.0 + opacity: 0.0 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + x: control.leftPadding + (horizontal ? control.position * control.availableWidth : 0) + y: control.topPadding + (horizontal ? 0 : control.position * control.availableHeight) + width: horizontal ? control.size * control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.size * control.availableHeight + + states: State { + name: "active" + when: control.active + PropertyChanges { target: handle; opacity: 0.75 } + } + + transitions: Transition { + from: "active" + SequentialAnimation { + PauseAnimation { duration: 450 } + NumberAnimation { target: handle; duration: 200; property: "opacity"; to: 0.0 } + } + } + } + //! [handle] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ScrollIndicator.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ScrollIndicator.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ScrollIndicator.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ScrollIndicator.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.ScrollIndicator { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + indicator.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + indicator.implicitHeight + topPadding + bottomPadding) + + padding: 2 + + //! [indicator] + indicator: Rectangle { + id: indicator + + implicitWidth: 2 + implicitHeight: 2 + + color: "#bdbebf" + visible: control.size < 1.0 + opacity: 0.0 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + x: control.leftPadding + (horizontal ? control.position * control.width : 0) + y: control.topPadding + (horizontal ? 0 : control.position * control.height) + width: horizontal ? control.size * control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.size * control.availableHeight + + states: State { + name: "active" + when: control.active + PropertyChanges { target: indicator; opacity: 0.75 } + } + + transitions: [ + Transition { + from: "active" + SequentialAnimation { + PauseAnimation { duration: 450 } + NumberAnimation { target: indicator; duration: 200; property: "opacity"; to: 0.0 } + } + } + ] + } + //! [indicator] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Slider.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Slider.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Slider.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Slider.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.Slider { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + Math.max(track ? track.implicitWidth : 0, + handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(track ? track.implicitHeight : 0, + handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) + + padding: 6 + + //! [handle] + handle: Rectangle { + x: control.leftPadding + (horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) + implicitWidth: 28 + implicitHeight: 28 + radius: width / 2 + border.color: "#353637" + color: control.pressed ? "#bdbebf" : "#f6f6f6" + + readonly property bool horizontal: control.orientation === Qt.Horizontal + } + //! [handle] + + //! [track] + track: Rectangle { + x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) + implicitWidth: horizontal ? 200 : 6 + implicitHeight: horizontal ? 6 : 200 + width: horizontal ? control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.availableHeight + radius: 3 + border.color: "#353637" + color: "#ffffff" + scale: horizontal && control.mirrored ? -1 : 1 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + } + //! [track] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/SpinBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/SpinBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/SpinBox.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/SpinBox.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,133 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.SpinBox { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + 2 * padding + + (up.indicator ? up.indicator.implicitWidth : 0) + + (down.indicator ? down.indicator.implicitWidth : 0)) + implicitHeight: Math.max(contentItem.implicitHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, + up.indicator ? up.indicator.implicitHeight : 0, + down.indicator ? down.indicator.implicitHeight : 0) + baselineOffset: contentItem.y + contentItem.baselineOffset + + padding: 6 + leftPadding: 6 + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) + rightPadding: 6 + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0)) + opacity: control.enabled ? 1 : 0.3 + + //! [validator] + validator: IntValidator { + locale: control.locale.name + bottom: Math.min(control.from, control.to) + top: Math.max(control.from, control.to) + } + //! [validator] + + //! [contentItem] + contentItem: TextInput { + text: control.textFromValue(control.value, control.locale) + + font: control.font + color: "#353637" + selectionColor: "#fddd5c" + selectedTextColor: color + horizontalAlignment: Qt.AlignHCenter + verticalAlignment: Qt.AlignVCenter + + validator: control.validator + inputMethodHints: Qt.ImhFormattedNumbersOnly + } + //! [contentItem] + + //! [up.indicator] + up.indicator: Rectangle { + x: control.mirrored ? 0 : parent.width - width + height: parent.height + implicitWidth: 40 + implicitHeight: 40 + color: up.pressed ? "#e4e4e4" : "#f6f6f6" + border.color: control.enabled ? "#353637" : "#bdbebf" + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: parent.width / 3 + height: 2 + color: control.enabled ? "#353637" : "#bdbebf" + } + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 2 + height: parent.width / 3 + color: control.enabled ? "#353637" : "#bdbebf" + } + } + //! [up.indicator] + + //! [down.indicator] + down.indicator: Rectangle { + x: control.mirrored ? parent.width - width : 0 + height: parent.height + implicitWidth: 40 + implicitHeight: 40 + color: down.pressed ? "#e4e4e4" : "#f6f6f6" + border.color: control.enabled ? "#353637" : "#bdbebf" + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: parent.width / 3 + height: 2 + color: control.enabled ? "#353637" : "#bdbebf" + } + } + //! [down.indicator] + + //! [background] + background: Rectangle { + implicitWidth: 140 + border.color: "#bdbebf" + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/StackView.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/StackView.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/StackView.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/StackView.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.4 +import Qt.labs.controls 1.0 +import Qt.labs.templates 1.0 as T + +T.StackView { + id: root + + //! [popEnter] + popEnter: Transition { + XAnimator { from: (root.mirrored ? -1 : 1) * -root.width; to: 0; duration: 400; easing.type: Easing.OutCubic } + } + //! [popEnter] + + //! [popExit] + popExit: Transition { + XAnimator { from: 0; to: (root.mirrored ? -1 : 1) * root.width; duration: 400; easing.type: Easing.OutCubic } + } + //! [popExit] + + //! [pushEnter] + pushEnter: Transition { + XAnimator { from: (root.mirrored ? -1 : 1) * root.width; to: 0; duration: 400; easing.type: Easing.OutCubic } + } + //! [pushEnter] + + //! [pushExit] + pushExit: Transition { + XAnimator { from: 0; to: (root.mirrored ? -1 : 1) * -root.width; duration: 400; easing.type: Easing.OutCubic } + } + //! [pushExit] + + //! [replaceEnter] + replaceEnter: Transition { + XAnimator { from: (root.mirrored ? -1 : 1) * root.width; to: 0; duration: 400; easing.type: Easing.OutCubic } + } + //! [replaceEnter] + + //! [replaceExit] + replaceExit: Transition { + XAnimator { from: 0; to: (root.mirrored ? -1 : 1) * -root.width; duration: 400; easing.type: Easing.OutCubic } + } + //! [replaceExit] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/SwipeView.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/SwipeView.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/SwipeView.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/SwipeView.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 +import Qt.labs.templates 1.0 as T + +T.SwipeView { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + + Accessible.role: Accessible.PageTabList + + //! [contentItem] + contentItem: ListView { + model: control.contentModel + currentIndex: control.currentIndex + + spacing: control.spacing + orientation: Qt.Horizontal + snapMode: ListView.SnapOneItem + boundsBehavior: Flickable.StopAtBounds + + highlightRangeMode: ListView.StrictlyEnforceRange + preferredHighlightBegin: 0 + preferredHighlightEnd: 0 + highlightMoveDuration: 250 + } + //! [contentItem] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Switch.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Switch.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Switch.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Switch.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,106 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.Switch { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (label ? label.implicitWidth : 0) + + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(label ? label.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 6 + spacing: 6 + + //! [indicator] + indicator: Item { + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + implicitWidth: 56 + implicitHeight: 28 + + Rectangle { + y: parent.height / 2 - height / 2 + width: 56 + height: 16 + radius: 8 + border.width: 1 + color: control.checked ? "#353637" : "transparent" + border.color: control.checked ? "transparent" : "#353637" + } + + Rectangle { + x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2))) + y: (parent.height - height) / 2 + width: 28 + height: 28 + radius: 16 + color: control.pressed ? "#e4e4e4" : "#f6f6f6" + border.width: 1 + border.color: control.pressed ? "#26282a" : "#353637" + + Behavior on x { + enabled: !control.pressed + SmoothedAnimation { velocity: 200 } + } + } + } + //! [indicator] + + //! [label] + label: Text { + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.spacing) + y: control.topPadding + width: control.availableWidth - indicator.width - control.spacing + height: control.availableHeight + + text: control.text + font: control.font + color: control.enabled ? "#26282a" : "#bdbebf" + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/TabBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/TabBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/TabBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/TabBar.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,68 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.TabBar { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + + spacing: 1 + + //! [contentItem] + contentItem: ListView { + implicitWidth: contentWidth + implicitHeight: 40 + + model: control.contentModel + currentIndex: control.currentIndex + + spacing: control.spacing + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + snapMode: ListView.SnapToItem + } + //! [contentItem] + + //! [background] + background: Rectangle { } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/TabButton.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/TabButton.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/TabButton.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/TabButton.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.TabButton { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.contentWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + label ? label.contentHeight + topPadding + bottomPadding : 0) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 6 + + //! [label] + label: Text { + x: control.leftPadding + y: control.topPadding + width: control.availableWidth + height: control.availableHeight + + text: control.text + font: control.font + elide: Text.ElideRight + opacity: enabled ? 1 : 0.3 + color: !control.checked ? "#ffffff" : control.pressed ? "#26282a" : "#353637" + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + //! [label] + + //! [background] + background: Rectangle { + implicitHeight: 40 + color: control.pressed ? (control.checked ? "#e4e4e4" : "#585a5c") : (control.checked ? "transparent" : "#353637") + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/TextArea.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/TextArea.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/TextArea.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/TextArea.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.TextArea { + id: control + + implicitWidth: Math.max(contentWidth + leftPadding + rightPadding, + background ? background.implicitWidth : 0, + placeholder.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, + placeholder.implicitHeight + topPadding + bottomPadding) + + padding: 6 + leftPadding: 10 + + opacity: enabled ? 1 : 0.2 + color: "#353637" + selectionColor: "#fddd5c" + selectedTextColor: color + + Text { + id: placeholder + x: control.leftPadding + y: control.topPadding + width: control.width - (control.leftPadding + control.rightPadding) + height: control.height - (control.topPadding + control.bottomPadding) + + text: control.placeholderText + font: control.font + color: "#c2c2c2" + horizontalAlignment: control.horizontalAlignment + verticalAlignment: control.verticalAlignment + visible: !control.length && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + elide: Text.ElideRight + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/TextField.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/TextField.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/TextField.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/TextField.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.TextField { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + placeholder.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + placeholder.implicitHeight + topPadding + bottomPadding) + + padding: 6 + leftPadding: 10 + + opacity: enabled ? 1 : 0.2 + color: "#353637" + selectionColor: "#fddd5c" + selectedTextColor: color + verticalAlignment: TextInput.AlignVCenter + + Text { + id: placeholder + x: control.leftPadding + y: control.topPadding + width: control.width - (control.leftPadding + control.rightPadding) + height: control.height - (control.topPadding + control.bottomPadding) + + text: control.placeholderText + font: control.font + color: "#bdbebf" + horizontalAlignment: control.horizontalAlignment + verticalAlignment: control.verticalAlignment + visible: !control.displayText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + elide: Text.ElideRight + } + + //! [background] + background: Rectangle { + implicitWidth: 200 + implicitHeight: 40 +// border.width: control.activeFocus ? 2 : 1 + color: control.enabled ? "transparent" : "#353637" + border.color: control.enabled ? "#bdbebf" : "transparent" + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ToolBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ToolBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ToolBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ToolBar.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,59 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.ToolBar { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [background] + background: Rectangle { + implicitHeight: 40 + color: "#eeeeee" + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ToolButton.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ToolButton.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/ToolButton.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/ToolButton.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T + +T.ToolButton { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + label ? label.implicitHeight + topPadding + bottomPadding : 0) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 6 + + //! [label] + label: Text { + x: control.leftPadding + y: control.topPadding + width: control.availableWidth + height: control.availableHeight + + text: control.text + font: control.font + color: control.enabled ? "#26282a" : "#c2c2c2" + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + //! [label] + + //! [background] + background: Rectangle { + implicitWidth: 40 + implicitHeight: 40 + + color: Qt.darker("#33333333", control.enabled && (control.checked || control.highlighted) ? 1.5 : 1.0) + opacity: control.pressed ? 1.0 : control.enabled && (control.checked || control.highlighted) ? 0.5 : 0 + visible: control.pressed || (control.enabled && (control.checked || control.highlighted)) + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Tumbler.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Tumbler.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/Tumbler.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/Tumbler.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 +import Qt.labs.templates 1.0 as T + +T.Tumbler { + id: control + implicitWidth: 60 + implicitHeight: 200 + + //! [delegate] + delegate: Text { + id: label + text: modelData + color: "#666666" + font: control.font + opacity: 0.4 + Math.max(0, 1 - Math.abs(Tumbler.displacement)) * 0.6 + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + //! [delegate] + + //! [contentItem] + contentItem: PathView { + id: pathView + model: control.model + delegate: control.delegate + clip: true + pathItemCount: control.visibleItemCount + 1 + preferredHighlightBegin: 0.5 + preferredHighlightEnd: 0.5 + dragMargin: width / 2 + + path: Path { + startX: pathView.width / 2 + startY: -pathView.delegateHeight / 2 + PathLine { + x: pathView.width / 2 + y: pathView.pathItemCount * pathView.delegateHeight - pathView.delegateHeight / 2 + } + } + + property real delegateHeight: control.availableHeight / control.visibleItemCount + } + //! [contentItem] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ApplicationWindow.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ApplicationWindow.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ApplicationWindow.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ApplicationWindow.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 +import Qt.labs.controls.universal.impl 1.0 + +T.ApplicationWindow { + id: window + + color: Universal.altHighColor + + overlay.background: Rectangle { + color: window.Universal.baseLowColor + } + + FocusRectangle { + parent: window.activeFocusControl + width: parent ? parent.width : 0 + height: parent ? parent.height : 0 + visible: parent && !!parent.useSystemFocusVisuals + && (parent.focusReason === Qt.TabFocusReason || parent.focusReason === Qt.BacktabFocusReason) + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/BusyIndicator.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/BusyIndicator.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/BusyIndicator.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/BusyIndicator.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 +import Qt.labs.controls.universal.impl 1.0 + +T.BusyIndicator { + id: control + + implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding + implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding + + //! [contentItem] + contentItem: ProgressRing { + id: ring + + implicitWidth: 20 + implicitHeight: 20 + + readonly property real size: Math.min(control.availableWidth, control.availableHeight) + + count: size < 60 ? 5 : 6 // "Small" vs. "Large" + color: control.Universal.accent + + ProgressRingAnimator { + target: ring + running: control.visible && control.running + } + } + //! [contentItem] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Button.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Button.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Button.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Button.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.Button { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + label ? label.implicitHeight + topPadding + bottomPadding : 0) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + topPadding: 4 + leftPadding: 8 + rightPadding: 8 + bottomPadding: 4 + + property bool useSystemFocusVisuals: true + + //! [label] + label: Text { + x: control.leftPadding + y: control.topPadding + width: control.availableWidth + height: control.availableHeight + + text: control.text + font: control.font + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + + color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor + } + //! [label] + + //! [background] + background: Rectangle { + implicitWidth: 32 + implicitHeight: 32 + + color: control.pressed ? control.Universal.baseMediumLowColor : + control.enabled && (control.highlighted || control.checked) ? control.Universal.accent : + control.Universal.baseLowColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/CheckBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/CheckBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/CheckBox.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/CheckBox.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,112 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.CheckBox { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (label ? label.implicitWidth : 0) + + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(label ? label.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 6 + spacing: 8 + + property bool useSystemFocusVisuals: true + + //! [indicator] + indicator: Rectangle { + id: normalRectangle + implicitWidth: 20 + implicitHeight: 20 + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + + color: !control.enabled ? "transparent" : + control.pressed && control.checkState !== Qt.PartiallyChecked ? control.Universal.baseMediumColor : + control.checkState === Qt.Checked ? control.Universal.accent : "transparent" + border.color: !control.enabled ? control.Universal.baseLowColor : + control.pressed ? control.Universal.baseMediumColor : + control.checked ? control.Universal.accent : control.Universal.baseMediumHighColor + border.width: 2 // CheckBoxBorderThemeThickness + + Image { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + + visible: control.checkState === Qt.Checked + source: "image://universal/checkmark/" + (!control.enabled ? control.Universal.baseLowColor : control.Universal.chromeWhiteColor) + } + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: parent.width / 2 + height: parent.height / 2 + + visible: control.checkState === Qt.PartiallyChecked + color: !control.enabled ? control.Universal.baseLowColor : + control.pressed ? control.Universal.baseMediumColor : control.Universal.baseMediumHighColor + } + } + //! [indicator] + + //! [label] + label: Text { + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.spacing) + y: control.topPadding + width: control.availableWidth - indicator.width - control.spacing + height: control.availableHeight + + text: control.text + font: control.font + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + + color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor + } + //! [label] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ComboBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ComboBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ComboBox.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ComboBox.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,135 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import QtQuick.Window 2.2 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.ComboBox { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset + + spacing: 10 + topPadding: 5 + leftPadding: 12 + rightPadding: 10 + bottomPadding: 7 + + //! [delegate] + delegate: ItemDelegate { + width: control.width + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData + highlighted: control.highlightedIndex === index + pressed: highlighted && control.pressed + } + //! [delegate] + + //! [contentItem] + contentItem: Text { + text: control.displayText + font: control.font + color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + rightPadding: 12 + control.spacing + } + //! [contentItem] + + //! [background] + background: Rectangle { + implicitWidth: 120 + implicitHeight: 32 + + border.width: 2 // ComboBoxBorderThemeThickness + border.color: !control.enabled ? control.Universal.baseLowColor : + control.pressed || popup.visible ? control.Universal.baseMediumLowColor : control.Universal.baseMediumLowColor + color: !control.enabled ? control.Universal.baseLowColor : + control.pressed || popup.visible ? control.Universal.listMediumColor : control.Universal.altMediumLowColor + + Rectangle { + x: 2 + y: 2 + width: parent.width - 4 + height: parent.height - 4 + + visible: control.activeFocus && (control.focusReason === Qt.TabFocusReason || control.focusReason === Qt.BacktabFocusReason) + color: control.Universal.accent + opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6 + } + + Image { + id: checkmark + x: parent.width - width - control.rightPadding + y: (parent.height - height) / 2 + source: "image://universal/downarrow/" + (!control.enabled ? control.Universal.baseLowColor : control.Universal.baseMediumHighColor) + } + } + //! [background] + + //! [popup] + popup: T.Popup { + implicitWidth: control.width + implicitHeight: Math.min(396, listview.contentHeight) + topMargin: 8 + bottomMargin: 8 + + Universal.theme: control.Universal.theme + Universal.accent: control.Universal.accent + + contentItem: ListView { + id: listview + clip: true + model: control.popup.visible ? control.delegateModel : null + currentIndex: control.highlightedIndex + + T.ScrollIndicator.vertical: ScrollIndicator { } + } + + background: Rectangle { + color: control.Universal.chromeMediumLowColor + border.color: control.Universal.chromeHighColor + border.width: 1 // FlyoutBorderThemeThickness + } + } + //! [popup] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Dial.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Dial.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Dial.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Dial.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.Dial { + id: control + + implicitWidth: 100 + implicitHeight: 100 + + //! [background] + background: Rectangle { + x: control.width / 2 - width / 2 + y: control.height / 2 - height / 2 + width: Math.max(64, Math.min(control.width, control.height)) + height: Math.max(64, Math.min(control.width, control.height)) + radius: width / 2 + color: "transparent" + border.color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseMediumColor + border.width: 2 + } + //! [background] + + //! [handle] + handle: Rectangle { + implicitWidth: 20 + implicitHeight: 20 + + x: background.x + background.width / 2 - handle.width / 2 + y: background.y + background.height / 2 - handle.height / 2 + + radius: width / 2 + color: !control.enabled ? control.Universal.baseLowColor : + control.pressed ? control.Universal.baseMediumColor : control.Universal.baseMediumHighColor + + transform: [ + Translate { + y: -background.height * 0.4 + handle.height / 2 + }, + Rotation { + angle: control.angle + origin.x: handle.width / 2 + origin.y: handle.height / 2 + } + ] + } + //! [handle] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Frame.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Frame.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Frame.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Frame.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.Frame { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + padding: 12 + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [frame] + frame: Rectangle { + width: parent.width + height: parent.height + + color: "transparent" + border.color: control.Universal.chromeDisabledLowColor + } + //! [frame] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/GroupBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/GroupBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/GroupBox.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/GroupBox.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.GroupBox { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.implicitWidth + leftPadding + rightPadding : 0, + contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + spacing: 12 + padding: 12 + topPadding: 12 + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [label] + label: Text { + x: control.leftPadding + width: control.availableWidth + + text: control.title + font: control.font + color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor + elide: Text.ElideRight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] + + //! [frame] + frame: Rectangle { + y: control.topPadding - control.padding + width: parent.width + height: parent.height - control.topPadding + control.padding + + color: "transparent" + border.color: control.Universal.chromeDisabledLowColor + } + //! [frame] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ItemDelegate.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ItemDelegate.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ItemDelegate.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ItemDelegate.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,102 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.ItemDelegate { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (label ? label.implicitWidth : 0) + + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(label ? label.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + spacing: 12 + + topPadding: 11 + leftPadding: 12 + rightPadding: 12 + bottomPadding: 13 + + //! [indicator] + indicator: Image { + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + + visible: control.checked + source: !control.checkable ? "" : "image://universal/checkmark/" + (!control.enabled ? control.Universal.baseLowColor : control.pressed ? control.Universal.baseHighColor : control.Universal.baseMediumHighColor) + } + //! [indicator] + + //! [label] + label: Text { + x: control.mirrored || !control.checkable ? control.leftPadding : (indicator.x + indicator.width + control.spacing) + y: control.topPadding + width: control.availableWidth - (control.checkable ? indicator.width + control.spacing : 0) + height: control.availableHeight + + text: control.text + font: control.font + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + + color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor + } + //! [label] + + //! [background] + background: Rectangle { + visible: control.pressed || control.highlighted || control.activeFocus + color: control.pressed ? control.Universal.listMediumColor : control.Universal.altMediumLowColor + Rectangle { + width: parent.width + height: parent.height + visible: control.activeFocus || control.highlighted + color: control.Universal.accent + opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6 + } + + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Label.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Label.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Label.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Label.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.Label { + id: control + + color: !control.enabled ? Universal.baseLowColor : Universal.baseHighColor + linkColor: Universal.accent +} Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/libqtlabsuniversalstyleplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/libqtlabsuniversalstyleplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/MenuItem.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/MenuItem.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/MenuItem.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/MenuItem.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,103 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.MenuItem { + id: control + + implicitWidth: background ? background.implicitWidth + : (label ? label.implicitWidth : 0) + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding + implicitHeight: background ? background.implicitHeight + : (label ? label.implicitHeight : 0) + (indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding + baselineOffset: label ? label.y + label.baselineOffset : 0 + + topPadding: 11 + leftPadding: 12 + rightPadding: 12 + bottomPadding: 13 + spacing: 12 + + //! [label] + label: Text { + x: control.mirrored || !control.checkable ? control.leftPadding : (indicator.x + indicator.width + control.spacing) + y: control.topPadding + width: control.availableWidth - (control.checkable ? indicator.width + control.spacing : 0) + height: control.availableHeight + + text: control.text + font: control.font + color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + } + //! [label] + + //! [indicator] + indicator: Image { + x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + + visible: control.checked + source: !control.checkable ? "" : "image://universal/checkmark/" + (!control.enabled ? control.Universal.baseLowColor : control.pressed ? control.Universal.baseHighColor : control.Universal.baseMediumHighColor) + } + //! [indicator] + + //! [background] + background: Rectangle { + implicitWidth: 200 + implicitHeight: 40 + + color: !control.enabled ? control.Universal.baseLowColor : + control.pressed ? control.Universal.listMediumColor : control.Universal.altMediumLowColor + + Rectangle { + x: 1; y: 1 + width: parent.width - 2 + height: parent.height - 2 + + visible: control.activeFocus + color: control.Universal.accent + opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6 + } + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Menu.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Menu.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Menu.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Menu.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.Menu { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.min(background ? background.implicitHeight : 0, + contentItem ? contentItem.implicitHeight + topPadding + bottomPadding : 0) + + //! [contentItem] + contentItem: ListView { + implicitHeight: contentHeight + model: control.contentModel + // TODO: improve this? + interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false + clip: true + keyNavigationWraps: false + currentIndex: -1 + + ScrollIndicator.vertical: ScrollIndicator {} + } + //! [contentItem] + + //! [background] + background: Rectangle { + implicitWidth: 200 + implicitHeight: 200 + color: control.Universal.chromeMediumLowColor + border.color: control.Universal.chromeHighColor + border.width: 1 // FlyoutBorderThemeThickness + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/PageIndicator.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/PageIndicator.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/PageIndicator.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/PageIndicator.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.PageIndicator { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + + padding: 6 + spacing: 7 + + //! [delegate] + delegate: Rectangle { + implicitWidth: 5 + implicitHeight: 5 + + radius: width / 2 + color: index === control.currentIndex ? control.Universal.baseMediumHighColor : + pressed ? control.Universal.baseMediumLowColor : control.Universal.baseLowColor + } + //! [delegate] + + //! [contentItem] + contentItem: Row { + spacing: control.spacing + + Repeater { + model: control.count + delegate: control.delegate + } + } + //! [contentItem] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Page.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Page.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Page.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Page.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.Page { + id: control + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [background] + background: Rectangle { + color: control.Universal.altHighColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Pane.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Pane.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Pane.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Pane.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.Pane { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + padding: 12 + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [background] + background: Rectangle { + color: control.Universal.altHighColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Popup.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Popup.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Popup.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Popup.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.Popup { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentWidth > 0 ? contentHeight + topPadding + bottomPadding : 0) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + padding: 12 + + contentItem: Item { } + + background: Rectangle { + color: control.Universal.chromeMediumLowColor + border.color: control.Universal.chromeHighColor + border.width: 1 // FlyoutBorderThemeThickness + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ProgressBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ProgressBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ProgressBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ProgressBar.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 +import Qt.labs.controls.universal.impl 1.0 + +T.ProgressBar { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + indicator ? indicator.implicitWidth : 0) + leftPadding + rightPadding + implicitHeight: Math.max(background ? background.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding + + //! [indicator] + indicator: Rectangle { + x: control.leftPadding + y: control.topPadding + (control.availableHeight - height) / 2 + width: control.indeterminate ? 0 : control.position * control.availableWidth + height: 10 + + scale: control.mirrored ? -1 : 1 + color: control.Universal.accent + + ProgressStrip { + id: strip + + width: control.availableWidth + height: control.availableHeight + + clip: control.indeterminate + visible: control.indeterminate + color: control.Universal.accent + + ProgressStripAnimator { + target: strip + running: strip.visible + } + } + } + //! [indicator] + + //! [background] + background: Rectangle { + implicitWidth: 100 + implicitHeight: 10 + + x: control.leftPadding + y: control.topPadding + (control.availableHeight - height) / 2 + width: control.availableWidth + height: 10 + + visible: !control.indeterminate + color: control.Universal.baseLowColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/qmldir 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/qmldir 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,4 @@ +module Qt.labs.controls.universal +plugin qtlabsuniversalstyleplugin +classname QtLabsUniversalStylePlugin +depends Qt.labs.controls 1.0 diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/RadioButton.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/RadioButton.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/RadioButton.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/RadioButton.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,118 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.RadioButton { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (label ? label.implicitWidth : 0) + + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(label ? label.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 6 + spacing: 8 + + property bool useSystemFocusVisuals: true + + //! [indicator] + indicator: Rectangle { + id: outerEllipse + implicitWidth: 20 + implicitHeight: 20 + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + + radius: width / 2 + color: "transparent" + border.width: 2 // RadioButtonBorderThemeThickness + border.color: control.checked ? "transparent" : + !control.enabled ? control.Universal.baseLowColor : + control.pressed ? control.Universal.baseMediumColor : control.Universal.baseMediumHighColor + + Rectangle { + id: checkOuterEllipse + width: parent.width + height: parent.height + + radius: width / 2 + opacity: control.checked ? 1 : 0 + color: "transparent" + border.width: 2 // RadioButtonBorderThemeThickness + border.color: !control.enabled ? control.Universal.baseLowColor : + control.pressed ? control.Universal.baseMediumColor : control.Universal.accent + } + + Rectangle { + id: checkGlyph + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: parent.width / 2 + height: parent.height / 2 + + radius: width / 2 + opacity: control.checked ? 1 : 0 + color: !control.enabled ? control.Universal.baseLowColor : + control.pressed ? control.Universal.baseMediumColor : control.Universal.baseMediumHighColor + } + } + //! [indicator] + + //! [label] + label: Text { + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.spacing) + y: control.topPadding + width: control.availableWidth - indicator.width - control.spacing + height: control.availableHeight + + text: control.text + font: control.font + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + + color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor + } + //! [label] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/RangeSlider.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/RangeSlider.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/RangeSlider.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/RangeSlider.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,118 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.RangeSlider { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + Math.max(track ? track.implicitWidth : 0, + first.handle ? first.handle.implicitWidth : 0, + second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(track ? track.implicitHeight : 0, + first.handle ? first.handle.implicitHeight : 0, + second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) + + padding: 6 + + //! [firstHandle] + first.handle: Rectangle { + implicitWidth: horizontal ? 8 : 24 + implicitHeight: horizontal ? 24 : 8 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + + x: control.leftPadding + (horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) + + radius: 4 + color: control.first.pressed ? control.Universal.chromeHighColor : control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor + } + //! [firstHandle] + + //! [secondHandle] + second.handle: Rectangle { + implicitWidth: horizontal ? 8 : 24 + implicitHeight: horizontal ? 24 : 8 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + + x: control.leftPadding + (horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) + + radius: 4 + color: control.second.pressed ? control.Universal.chromeHighColor : control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor + } + //! [secondHandle] + + //! [track] + track: Item { + implicitWidth: horizontal ? 200 : 18 + implicitHeight: horizontal ? 18 : 200 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + + x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) + width: horizontal ? control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.availableHeight + + scale: horizontal && control.mirrored ? -1 : 1 + + Rectangle { + x: parent.horizontal ? 0 : (parent.width - width) / 2 + y: parent.horizontal ? (parent.height - height) / 2 : 0 + width: parent.horizontal ? parent.width : 2 // SliderTrackThemeHeight + height: !parent.horizontal ? parent.height : 2 // SliderTrackThemeHeight + + color: control.enabled ? control.Universal.baseMediumLowColor : control.Universal.chromeDisabledHighColor + } + + Rectangle { + x: parent.horizontal ? control.first.position * parent.width : 0 + y: parent.horizontal ? (parent.height - height) / 2 : control.second.visualPosition * parent.height + width: parent.horizontal ? control.second.position * parent.width - control.first.position * parent.width : 2 // SliderTrackThemeHeight + height: !parent.horizontal ? control.second.position * parent.height - control.first.position * parent.height : 2 // SliderTrackThemeHeight + + color: control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor + } + } + //! [track] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ScrollBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ScrollBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ScrollBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ScrollBar.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.ScrollBar { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + handle.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + handle.implicitHeight + topPadding + bottomPadding) + + // TODO: arrows + + //! [handle] + handle: Rectangle { + implicitWidth: 12 + implicitHeight: 12 + + color: control.pressed ? control.Universal.baseMediumColor : control.Universal.chromeHighColor + visible: control.size < 1.0 + opacity: 0.0 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + x: control.leftPadding + (horizontal ? control.position * control.availableWidth : 0) + y: control.topPadding + (horizontal ? 0 : control.position * control.availableHeight) + width: horizontal ? control.size * control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.size * control.availableHeight + } + //! [handle] + + //! [background] + background: Rectangle { + implicitWidth: 12 + implicitHeight: 12 + + color: control.Universal.chromeLowColor + visible: control.size < 1.0 + opacity: 0.0 + } + //! [background] + + states: [ + State { + name: "active" + when: control.active + } + ] + + transitions: [ + Transition { + to: "active" + NumberAnimation { targets: [handle, background]; property: "opacity"; to: 1.0 } + }, + Transition { + from: "active" + SequentialAnimation { + PauseAnimation { duration: 3000 } + NumberAnimation { targets: [handle, background]; property: "opacity"; to: 0.0 } + } + } + ] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ScrollIndicator.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ScrollIndicator.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ScrollIndicator.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ScrollIndicator.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.ScrollIndicator { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + indicator.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + indicator.implicitHeight + topPadding + bottomPadding) + + //! [indicator] + indicator: Rectangle { + implicitWidth: 6 + implicitHeight: 6 + + color: control.Universal.baseMediumLowColor + visible: control.size < 1.0 + opacity: 0.0 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + x: control.leftPadding + (horizontal ? control.position * control.width : 0) + y: control.topPadding + (horizontal ? 0 : control.position * control.height) + width: horizontal ? control.size * control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.size * control.availableHeight + + states: [ + State { + name: "active" + when: control.active + } + ] + + transitions: [ + Transition { + to: "active" + NumberAnimation { target: indicator; property: "opacity"; to: 1.0 } + }, + Transition { + from: "active" + SequentialAnimation { + PauseAnimation { duration: 5000 } + NumberAnimation { target: indicator; property: "opacity"; to: 0.0 } + } + } + ] + } + //! [indicator] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Slider.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Slider.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Slider.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Slider.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,103 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.Slider { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + Math.max(track ? track.implicitWidth : 0, + handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(track ? track.implicitHeight : 0, + handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) + + padding: 6 + + property bool useSystemFocusVisuals: true + + //! [handle] + handle: Rectangle { + implicitWidth: horizontal ? 8 : 24 + implicitHeight: horizontal ? 24 : 8 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + + x: control.leftPadding + (horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) + + radius: 4 + color: control.pressed ? control.Universal.chromeHighColor : control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor + } + //! [handle] + + //! [track] + track: Item { + implicitWidth: horizontal ? 200 : 18 + implicitHeight: horizontal ? 18 : 200 + + readonly property bool horizontal: control.orientation === Qt.Horizontal + + x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) + width: horizontal ? control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.availableHeight + + scale: horizontal && control.mirrored ? -1 : 1 + + Rectangle { + x: parent.horizontal ? 0 : (parent.width - width) / 2 + y: parent.horizontal ? (parent.height - height) / 2 : 0 + width: parent.horizontal ? parent.width : 2 // SliderTrackThemeHeight + height: !parent.horizontal ? parent.height : 2 // SliderTrackThemeHeight + + color: control.enabled ? control.Universal.baseMediumLowColor : control.Universal.chromeDisabledHighColor + } + + Rectangle { + x: parent.horizontal ? 0 : (parent.width - width) / 2 + y: parent.horizontal ? (parent.height - height) / 2 : control.visualPosition * parent.height + width: parent.horizontal ? control.position * parent.width : 2 // SliderTrackThemeHeight + height: !parent.horizontal ? control.position * parent.height : 2 // SliderTrackThemeHeight + + color: control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor + } + } + //! [track] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/SpinBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/SpinBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/SpinBox.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/SpinBox.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,150 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.SpinBox { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + 16 + + (up.indicator ? up.indicator.implicitWidth : 0) + + (down.indicator ? down.indicator.implicitWidth : 0)) + implicitHeight: Math.max(contentItem.implicitHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, + up.indicator ? up.indicator.implicitHeight : 0, + down.indicator ? down.indicator.implicitHeight : 0) + baselineOffset: contentItem.y + contentItem.baselineOffset + + // TextControlThemePadding + 2 (border) + topPadding: 5 + bottomPadding: 7 + leftPadding: 12 + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) + rightPadding: 8 + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0)) + + Universal.theme: activeFocus ? Universal.Light : undefined + + //! [validator] + validator: IntValidator { + locale: control.locale.name + bottom: Math.min(control.from, control.to) + top: Math.max(control.from, control.to) + } + //! [validator] + + //! [contentItem] + contentItem: TextInput { + text: control.textFromValue(control.value, control.locale) + + font: control.font + color: !enabled ? control.Universal.chromeDisabledLowColor : + activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor + selectionColor: control.Universal.accent + selectedTextColor: control.Universal.chromeWhiteColor + horizontalAlignment: Qt.AlignHCenter + verticalAlignment: TextInput.AlignVCenter + + validator: control.validator + inputMethodHints: Qt.ImhFormattedNumbersOnly + } + //! [contentItem] + + //! [up.indicator] + up.indicator: Item { + implicitWidth: 28 + height: parent.height + 4 + y: -2 + x: control.mirrored ? 0 : parent.width - width + + Rectangle { + x: 2; y: 4 + width: parent.width - 4 + height: parent.height - 8 + color: !control.up.pressed ? "transparent" : + control.activeFocus ? control.Universal.accent + : control.Universal.chromeDisabledLowColor + } + + Image { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + source: "image://universal/" + (control.mirrored ? "left" : "right") + "arrow/" + + (!control.enabled ? control.Universal.chromeDisabledLowColor : + control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor) + } + } + //! [up.indicator] + + //! [down.indicator] + down.indicator: Item { + implicitWidth: 28 + height: parent.height + 4 + y: -2 + x: control.mirrored ? parent.width - width : 0 + + Rectangle { + x: 2; y: 4 + width: parent.width - 4 + height: parent.height - 8 + color: !control.down.pressed ? "transparent" : + control.activeFocus ? control.Universal.accent + : control.Universal.chromeDisabledLowColor + } + + Image { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + source: "image://universal/" + (control.mirrored ? "right" : "left") + "arrow/" + + (!control.enabled ? control.Universal.chromeDisabledLowColor : + control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor) + } + } + //! [down.indicator] + + //! [background] + background: Rectangle { + implicitWidth: 60 + 28 // TextControlThemeMinWidth - 4 (border) + implicitHeight: 28 // TextControlThemeMinHeight - 4 (border) + + border.width: 2 // TextControlBorderThemeThickness + border.color: !control.enabled ? control.Universal.baseLowColor : + control.activeFocus ? control.Universal.accent : control.Universal.chromeDisabledLowColor + color: control.enabled ? control.Universal.altHighColor : control.Universal.baseLowColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/StackView.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/StackView.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/StackView.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/StackView.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,88 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.StackView { + id: root + + //! [popEnter] + popEnter: Transition { + ParallelAnimation { + NumberAnimation { property: "opacity"; from: 0; to: 1; duration: 200; easing.type: Easing.InQuint } + NumberAnimation { property: "x"; from: (root.mirrored ? -0.3 : 0.3) * -root.width; to: 0; duration: 400; easing.type: Easing.OutCubic } + } + } + //! [popEnter] + + //! [popExit] + popExit: Transition { + NumberAnimation { property: "opacity"; from: 1; to: 0; duration: 200; easing.type: Easing.OutQuint } + } + //! [popExit] + + //! [pushEnter] + pushEnter: Transition { + ParallelAnimation { + NumberAnimation { property: "opacity"; from: 0; to: 1; duration: 200; easing.type: Easing.InQuint } + NumberAnimation { property: "x"; from: (root.mirrored ? -0.3 : 0.3) * root.width; to: 0; duration: 400; easing.type: Easing.OutCubic } + } + } + //! [pushEnter] + + //! [pushExit] + pushExit: Transition { + NumberAnimation { property: "opacity"; from: 1; to: 0; duration: 200; easing.type: Easing.OutQuint } + } + //! [pushExit] + + //! [replaceEnter] + replaceEnter: Transition { + ParallelAnimation { + NumberAnimation { property: "opacity"; from: 0; to: 1; duration: 200; easing.type: Easing.InQuint } + NumberAnimation { property: "x"; from: (root.mirrored ? -0.3 : 0.3) * root.width; to: 0; duration: 400; easing.type: Easing.OutCubic } + } + } + //! [replaceEnter] + + //! [replaceExit] + replaceExit: Transition { + NumberAnimation { property: "opacity"; from: 1; to: 0; duration: 200; easing.type: Easing.OutQuint } + } + //! [replaceExit] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Switch.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Switch.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Switch.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Switch.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,110 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.Switch { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (label ? label.implicitWidth : 0) + + (indicator ? indicator.implicitWidth : 0) + + (label && indicator ? spacing : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(label ? label.implicitHeight : 0, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 5 + spacing: 8 + + property bool useSystemFocusVisuals: true + + //! [indicator] + indicator: Rectangle { + implicitWidth: 44 + implicitHeight: 20 + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + y: control.topPadding + (control.availableHeight - height) / 2 + + radius: 10 + color: !control.enabled ? "transparent" : + control.pressed ? control.Universal.baseMediumColor : + control.checked ? control.Universal.accent : "transparent" + border.color: !control.enabled ? control.Universal.baseLowColor : + control.checked && !control.pressed ? control.Universal.accent : control.Universal.baseMediumColor + border.width: 2 + + Rectangle { + width: 10 + height: 10 + radius: 5 + + color: !control.enabled ? control.Universal.baseLowColor : + control.pressed || control.checked ? control.Universal.chromeWhiteColor : control.Universal.baseMediumHighColor + + x: Math.max(5, Math.min(parent.width - width - 5, + control.visualPosition * parent.width - (width / 2))) + y: (parent.height - height) / 2 + + Behavior on x { + enabled: !control.pressed + SmoothedAnimation { velocity: 200 } + } + } + } + //! [indicator] + + //! [label] + label: Text { + x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.spacing) + y: control.topPadding + width: control.availableWidth - indicator.width - control.spacing + height: control.availableHeight + + text: control.text + font: control.font + elide: Text.ElideRight + visible: control.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + + color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor + } + //! [label] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TabBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TabBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TabBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TabBar.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.TabBar { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + + //! [contentItem] + contentItem: PathView { + implicitWidth: 200 + implicitHeight: 48 + + model: control.contentModel + currentIndex: control.currentIndex + + interactive: false + snapMode: PathView.SnapToItem + highlightMoveDuration: 100 + + path: Path { + startX: control.count ? control.availableWidth / control.count / 2 : 0 + startY: control.availableHeight / 2 + PathLine { + x: control.count ? control.availableWidth + (control.availableWidth / control.count / 2) : 0 + y: control.availableHeight / 2 + } + } + } + //! [contentItem] + + //! [background] + background: Rectangle { + implicitWidth: 200 + implicitHeight: 48 + color: control.Universal.altHighColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TabButton.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TabButton.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TabButton.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TabButton.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.TabButton { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + label ? label.implicitHeight + topPadding + bottomPadding : 0) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 12 // PivotItemMargin + + //! [label] + label: Text { + x: control.leftPadding + y: control.topPadding + width: control.availableWidth + height: control.availableHeight + + text: control.text + font: control.font + elide: Text.ElideRight + color: control.checked || control.pressed ? control.Universal.baseHighColor : control.Universal.baseLowColor + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + //! [label] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TextArea.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TextArea.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TextArea.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TextArea.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.TextArea { + id: control + + implicitWidth: Math.max(contentWidth + leftPadding + rightPadding, + background ? background.implicitWidth : 0, + placeholder.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, + placeholder.implicitHeight + topPadding + bottomPadding) + + // TextControlThemePadding + 2 (border) + topPadding: 5 + leftPadding: 12 + rightPadding: 8 + bottomPadding: 7 + + Universal.theme: activeFocus ? Universal.Light : undefined + + color: !enabled ? Universal.chromeDisabledLowColor : + activeFocus ? Universal.chromeBlackHighColor : Universal.baseHighColor + selectionColor: Universal.accent + selectedTextColor: Universal.chromeWhiteColor + + Text { + id: placeholder + x: control.leftPadding + y: control.topPadding + width: control.width - (control.leftPadding + control.rightPadding) + height: control.height - (control.topPadding + control.bottomPadding) + + text: control.placeholderText + font: control.font + color: !control.enabled ? control.Universal.chromeDisabledLowColor : + control.activeFocus ? control.Universal.chromeBlackMediumLowColor : control.Universal.baseMediumColor + visible: !control.length && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + horizontalAlignment: control.horizontalAlignment + verticalAlignment: control.verticalAlignment + elide: Text.ElideRight + } + + //! [background] + background: Rectangle { + implicitWidth: 60 // TextControlThemeMinWidth - 4 (border) + implicitHeight: 28 // TextControlThemeMinHeight - 4 (border) + + border.width: 2 // TextControlBorderThemeThickness + border.color: !control.enabled ? control.Universal.baseLowColor : + control.activeFocus ? control.Universal.accent : control.Universal.chromeDisabledLowColor + color: control.enabled ? control.Universal.altHighColor : control.Universal.baseLowColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TextField.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TextField.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TextField.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/TextField.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,93 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.TextField { + id: control + + implicitWidth: Math.max(contentWidth + leftPadding + rightPadding, + background ? background.implicitWidth : 0, + placeholder.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, + placeholder.implicitHeight + topPadding + bottomPadding) + + // TextControlThemePadding + 2 (border) + topPadding: 5 + leftPadding: 12 + rightPadding: 8 + bottomPadding: 7 + + Universal.theme: activeFocus ? Universal.Light : undefined + + color: !enabled ? Universal.chromeDisabledLowColor : + activeFocus ? Universal.chromeBlackHighColor : Universal.baseHighColor + selectionColor: Universal.accent + selectedTextColor: Universal.chromeWhiteColor + verticalAlignment: TextInput.AlignVCenter + + Text { + id: placeholder + x: control.leftPadding + y: control.topPadding + width: control.width - (control.leftPadding + control.rightPadding) + height: control.height - (control.topPadding + control.bottomPadding) + + text: control.placeholderText + font: control.font + color: !control.enabled ? control.Universal.chromeDisabledLowColor : + control.activeFocus ? control.Universal.chromeBlackMediumLowColor : control.Universal.baseMediumColor + visible: !control.displayText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + horizontalAlignment: control.horizontalAlignment + verticalAlignment: control.verticalAlignment + elide: Text.ElideRight + } + + //! [background] + background: Rectangle { + implicitWidth: 60 // TextControlThemeMinWidth - 4 (border) + implicitHeight: 28 // TextControlThemeMinHeight - 4 (border) + + border.width: 2 // TextControlBorderThemeThickness + border.color: !control.enabled ? control.Universal.baseLowColor : + control.activeFocus ? control.Universal.accent : control.Universal.chromeDisabledLowColor + color: control.enabled ? control.Universal.altHighColor : control.Universal.baseLowColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ToolBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ToolBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ToolBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ToolBar.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.ToolBar { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) + + //! [contentItem] + contentItem: Item { } + //! [contentItem] + + //! [background] + background: Rectangle { + implicitHeight: 48 // AppBarThemeCompactHeight + color: control.Universal.chromeMediumColor + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ToolButton.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ToolButton.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ToolButton.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/ToolButton.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 + +T.ToolButton { + id: control + + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + label ? label.implicitHeight + topPadding + bottomPadding : 0) + baselineOffset: label ? label.y + label.baselineOffset : 0 + + padding: 6 + + property bool useSystemFocusVisuals: true + + //! [label] + label: Text { + x: control.leftPadding + y: control.topPadding + width: control.availableWidth + height: control.availableHeight + + text: control.text + font: control.font + color: control.enabled ? control.Universal.baseHighColor : control.Universal.baseLowColor + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + //! [label] + + //! [background] + background: Rectangle { + implicitWidth: 68 + implicitHeight: 48 // AppBarThemeCompactHeight + + color: control.pressed ? control.Universal.listMediumColor : + control.enabled && (control.highlighted || control.checked) ? control.Universal.accent : "transparent" + } + //! [background] +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Tumbler.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Tumbler.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Tumbler.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/controls/universal/Tumbler.qml 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.templates 1.0 as T +import Qt.labs.controls.universal 1.0 +import Qt.labs.controls 1.0 + +T.Tumbler { + id: control + + implicitWidth: 60 + implicitHeight: 200 + + //! [delegate] + delegate: Text { + text: modelData + color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor + font: control.font + opacity: 0.4 + Math.max(0, 1 - Math.abs(Tumbler.displacement)) * 0.6 + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + //! [delegate] + + //! [contentItem] + contentItem: PathView { + id: pathView + model: control.model + delegate: control.delegate + clip: true + pathItemCount: control.visibleItemCount + 1 + preferredHighlightBegin: 0.5 + preferredHighlightEnd: 0.5 + dragMargin: width / 2 + + path: Path { + startX: pathView.width / 2 + startY: -pathView.delegateHeight / 2 + PathLine { + x: pathView.width / 2 + y: pathView.pathItemCount * pathView.delegateHeight - pathView.delegateHeight / 2 + } + } + + property real delegateHeight: control.availableHeight / control.visibleItemCount + } + //! [contentItem] +} Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/folderlistmodel/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/folderlistmodel/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/folderlistmodel/plugins.qmltypes 2015-06-30 10:17:19.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/folderlistmodel/plugins.qmltypes 2016-06-16 09:26:11.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. @@ -7,6 +7,272 @@ // 'qmlplugindump -nonrelocatable Qt.labs.folderlistmodel 2.1' Module { + dependencies: [] + Component { + name: "QAbstractItemModel" + prototype: "QObject" + Enum { + name: "LayoutChangeHint" + values: { + "NoLayoutChangeHint": 0, + "VerticalSortHint": 1, + "HorizontalSortHint": 2 + } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + Parameter { name: "roles"; type: "QVector" } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + } + Signal { + name: "headerDataChanged" + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList" } + } + Signal { name: "layoutChanged" } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList" } + } + Signal { name: "layoutAboutToBeChanged" } + Signal { + name: "rowsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { name: "modelAboutToBeReset" } + Signal { name: "modelReset" } + Signal { + name: "rowsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationRow"; type: "int" } + } + Signal { + name: "rowsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "row"; type: "int" } + } + Signal { + name: "columnsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationColumn"; type: "int" } + } + Signal { + name: "columnsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "column"; type: "int" } + } + Method { name: "submit"; type: "bool" } + Method { name: "revert" } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "parent" + type: "QModelIndex" + Parameter { name: "child"; type: "QModelIndex" } + } + Method { + name: "sibling" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "idx"; type: "QModelIndex" } + } + Method { + name: "rowCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "rowCount"; type: "int" } + Method { + name: "columnCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "columnCount"; type: "int" } + Method { + name: "hasChildren" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "hasChildren"; type: "bool" } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + } + Method { + name: "fetchMore" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "canFetchMore" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "flags" + type: "Qt::ItemFlags" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + Parameter { name: "flags"; type: "Qt::MatchFlags" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + } + } + Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" } Component { name: "QQuickFolderListModel" prototype: "QAbstractListModel" @@ -52,5 +318,10 @@ Parameter { name: "idx"; type: "int" } Parameter { name: "property"; type: "string" } } + Method { + name: "indexOf" + type: "int" + Parameter { name: "file"; type: "QUrl" } + } } } Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/settings/libqmlsettingsplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/settings/libqmlsettingsplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/settings/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/settings/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/settings/plugins.qmltypes 2015-06-30 10:17:20.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/settings/plugins.qmltypes 2016-06-16 09:26:11.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. @@ -7,6 +7,7 @@ // 'qmlplugindump -nonrelocatable Qt.labs.settings 1.0' Module { + dependencies: [] Component { name: "QQmlSettings" prototype: "QObject" Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/templates/libqtlabstemplatesplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/templates/libqtlabstemplatesplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/templates/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/templates/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/templates/plugins.qmltypes 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/templates/plugins.qmltypes 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,1449 @@ +import QtQuick.tooling 1.2 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. +// +// This file was auto-generated by: +// 'qmlplugindump -nonrelocatable Qt.labs.templates 1.0' + +Module { + dependencies: ["QtQuick.Window 2.2"] + Component { + name: "QQuickAbstractButton" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/AbstractButton 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "text"; type: "string" } + Property { name: "pressed"; type: "bool" } + Property { name: "checked"; type: "bool" } + Property { name: "checkable"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "autoExclusive"; type: "bool" } + Property { name: "autoRepeat"; type: "bool" } + Property { name: "indicator"; type: "QQuickItem"; isPointer: true } + Property { name: "label"; type: "QQuickItem"; isPointer: true } + Signal { name: "pressed" } + Signal { name: "released" } + Signal { name: "canceled" } + Signal { name: "clicked" } + Signal { name: "pressAndHold" } + Signal { name: "doubleClicked" } + Method { name: "toggle" } + } + Component { + name: "QQuickApplicationWindow" + defaultProperty: "data" + prototype: "QQuickWindowQmlImpl" + exports: ["Qt.labs.templates/ApplicationWindow 1.0"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickApplicationWindowAttached" + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "activeFocusControl"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "header"; type: "QQuickItem"; isPointer: true } + Property { name: "footer"; type: "QQuickItem"; isPointer: true } + Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } + Property { name: "font"; type: "QFont" } + Property { name: "locale"; type: "QLocale" } + } + Component { + name: "QQuickApplicationWindowAttached" + prototype: "QObject" + Property { name: "window"; type: "QQuickApplicationWindow"; isReadonly: true; isPointer: true } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "activeFocusControl"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "header"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "footer"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } + } + Component { + name: "QQuickBusyIndicator" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/BusyIndicator 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "running"; type: "bool" } + } + Component { + name: "QQuickButton" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/Button 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickCheckBox" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/CheckBox 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "tristate"; type: "bool" } + Property { name: "checkState"; type: "Qt::CheckState" } + } + Component { + name: "QQuickComboBox" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/ComboBox 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "model"; type: "QVariant" } + Property { name: "delegateModel"; type: "QQmlInstanceModel"; isReadonly: true; isPointer: true } + Property { name: "pressed"; type: "bool" } + Property { name: "highlightedIndex"; type: "int"; isReadonly: true } + Property { name: "currentIndex"; type: "int" } + Property { name: "currentText"; type: "string"; isReadonly: true } + Property { name: "displayText"; type: "string" } + Property { name: "textRole"; type: "string" } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popup"; type: "QQuickPopup"; isPointer: true } + Signal { + name: "activated" + Parameter { name: "index"; type: "int" } + } + Signal { + name: "highlighted" + Parameter { name: "index"; type: "int" } + } + Method { + name: "textAt" + type: "string" + Parameter { name: "index"; type: "int" } + } + Method { + name: "find" + type: "int" + Parameter { name: "text"; type: "string" } + Parameter { name: "flags"; type: "Qt::MatchFlags" } + } + Method { + name: "find" + type: "int" + Parameter { name: "text"; type: "string" } + } + } + Component { + name: "QQuickContainer" + defaultProperty: "contentData" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Container 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "contentModel"; type: "QVariant"; isReadonly: true } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + Property { name: "currentIndex"; type: "int" } + Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Method { + name: "setCurrentIndex" + Parameter { name: "index"; type: "int" } + } + Method { + name: "itemAt" + type: "QQuickItem*" + Parameter { name: "index"; type: "int" } + } + Method { + name: "addItem" + Parameter { name: "item"; type: "QQuickItem"; isPointer: true } + } + Method { + name: "insertItem" + Parameter { name: "index"; type: "int" } + Parameter { name: "item"; type: "QQuickItem"; isPointer: true } + } + Method { + name: "moveItem" + Parameter { name: "from"; type: "int" } + Parameter { name: "to"; type: "int" } + } + Method { + name: "removeItem" + Parameter { name: "index"; type: "int" } + } + } + Component { + name: "QQuickControl" + defaultProperty: "data" + prototype: "QQuickItem" + exports: ["Qt.labs.templates/Control 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "font"; type: "QFont" } + Property { name: "availableWidth"; type: "double"; isReadonly: true } + Property { name: "availableHeight"; type: "double"; isReadonly: true } + Property { name: "padding"; type: "double" } + Property { name: "topPadding"; type: "double" } + Property { name: "leftPadding"; type: "double" } + Property { name: "rightPadding"; type: "double" } + Property { name: "bottomPadding"; type: "double" } + Property { name: "spacing"; type: "double" } + Property { name: "locale"; type: "QLocale" } + Property { name: "mirrored"; type: "bool"; isReadonly: true } + Property { name: "focusReason"; type: "Qt::FocusReason" } + Property { name: "background"; type: "QQuickItem"; isPointer: true } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + } + Component { + name: "QQuickDial" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Dial 1.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "SnapMode" + values: { + "NoSnap": 0, + "SnapAlways": 1, + "SnapOnRelease": 2 + } + } + Property { name: "from"; type: "double" } + Property { name: "to"; type: "double" } + Property { name: "value"; type: "double" } + Property { name: "position"; type: "double"; isReadonly: true } + Property { name: "angle"; type: "double"; isReadonly: true } + Property { name: "stepSize"; type: "double" } + Property { name: "snapMode"; type: "SnapMode" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "handle"; type: "QQuickItem"; isPointer: true } + Method { name: "increase" } + Method { name: "decrease" } + } + Component { + name: "QQuickDrawer" + defaultProperty: "contentItem" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Drawer 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "edge"; type: "Qt::Edge" } + Property { name: "position"; type: "double" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "animation"; type: "QQuickPropertyAnimation"; isPointer: true } + Signal { name: "clicked" } + Method { name: "open" } + Method { name: "close" } + } + Component { + name: "QQuickFrame" + defaultProperty: "contentData" + prototype: "QQuickPane" + exports: ["Qt.labs.templates/Frame 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "frame"; type: "QQuickItem"; isPointer: true } + } + Component { + name: "QQuickGroupBox" + defaultProperty: "contentData" + prototype: "QQuickFrame" + exports: ["Qt.labs.templates/GroupBox 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "title"; type: "string" } + Property { name: "label"; type: "QQuickItem"; isPointer: true } + } + Component { + name: "QQuickImplicitSizeItem" + defaultProperty: "data" + prototype: "QQuickItem" + Property { name: "implicitWidth"; type: "double"; isReadonly: true } + Property { name: "implicitHeight"; type: "double"; isReadonly: true } + Signal { name: "implicitWidthChanged2"; revision: 1 } + Signal { name: "implicitHeightChanged2"; revision: 1 } + } + Component { + name: "QQuickItemDelegate" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/ItemDelegate 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickLabel" + defaultProperty: "data" + prototype: "QQuickText" + exports: ["Qt.labs.templates/Label 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "font"; type: "QFont" } + Property { name: "background"; type: "QQuickItem"; isPointer: true } + } + Component { + name: "QQuickMenu" + defaultProperty: "contentData" + prototype: "QQuickPopup" + exports: ["Qt.labs.templates/Menu 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "contentModel"; type: "QVariant"; isReadonly: true } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "title"; type: "string" } + Method { + name: "itemAt" + type: "QQuickItem*" + Parameter { name: "index"; type: "int" } + } + Method { + name: "addItem" + Parameter { name: "item"; type: "QQuickItem"; isPointer: true } + } + Method { + name: "insertItem" + Parameter { name: "index"; type: "int" } + Parameter { name: "item"; type: "QQuickItem"; isPointer: true } + } + Method { + name: "moveItem" + Parameter { name: "from"; type: "int" } + Parameter { name: "to"; type: "int" } + } + Method { + name: "removeItem" + Parameter { name: "index"; type: "int" } + } + } + Component { + name: "QQuickMenuItem" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/MenuItem 1.0"] + exportMetaObjectRevisions: [0] + Signal { name: "triggered" } + } + Component { + name: "QQuickOverlay" + defaultProperty: "data" + prototype: "QQuickItem" + Property { name: "background"; type: "QQuickItem"; isPointer: true } + Signal { name: "pressed" } + Signal { name: "released" } + } + Component { + name: "QQuickPage" + defaultProperty: "contentData" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Page 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "header"; type: "QQuickItem"; isPointer: true } + Property { name: "footer"; type: "QQuickItem"; isPointer: true } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + } + Component { + name: "QQuickPageIndicator" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/PageIndicator 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "count"; type: "int" } + Property { name: "currentIndex"; type: "int" } + Property { name: "interactive"; type: "bool" } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + } + Component { + name: "QQuickPane" + defaultProperty: "contentData" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Pane 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "contentWidth"; type: "double" } + Property { name: "contentHeight"; type: "double" } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + } + Component { + name: "QQuickPopup" + defaultProperty: "contentData" + prototype: "QObject" + exports: ["Qt.labs.templates/Popup 1.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "ClosePolicy" + values: { + "NoAutoClose": 0, + "OnPressOutside": 1, + "OnPressOutsideParent": 2, + "OnReleaseOutside": 4, + "OnReleaseOutsideParent": 8, + "OnEscape": 16 + } + } + Enum { + name: "TransformOrigin" + values: { + "TopLeft": 0, + "Top": 1, + "TopRight": 2, + "Left": 3, + "Center": 4, + "Right": 5, + "BottomLeft": 6, + "Bottom": 7, + "BottomRight": 8 + } + } + Property { name: "x"; type: "double" } + Property { name: "y"; type: "double" } + Property { name: "z"; type: "double" } + Property { name: "width"; type: "double" } + Property { name: "height"; type: "double" } + Property { name: "implicitWidth"; type: "double" } + Property { name: "implicitHeight"; type: "double" } + Property { name: "contentWidth"; type: "double" } + Property { name: "contentHeight"; type: "double" } + Property { name: "availableWidth"; type: "double"; isReadonly: true } + Property { name: "availableHeight"; type: "double"; isReadonly: true } + Property { name: "margins"; type: "double" } + Property { name: "topMargin"; type: "double" } + Property { name: "leftMargin"; type: "double" } + Property { name: "rightMargin"; type: "double" } + Property { name: "bottomMargin"; type: "double" } + Property { name: "padding"; type: "double" } + Property { name: "topPadding"; type: "double" } + Property { name: "leftPadding"; type: "double" } + Property { name: "rightPadding"; type: "double" } + Property { name: "bottomPadding"; type: "double" } + Property { name: "parent"; type: "QQuickItem"; isPointer: true } + Property { name: "background"; type: "QQuickItem"; isPointer: true } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + Property { name: "clip"; type: "bool" } + Property { name: "focus"; type: "bool" } + Property { name: "activeFocus"; type: "bool"; isReadonly: true } + Property { name: "modal"; type: "bool" } + Property { name: "visible"; type: "bool" } + Property { name: "opacity"; type: "double" } + Property { name: "scale"; type: "double" } + Property { name: "closePolicy"; type: "ClosePolicy" } + Property { name: "transformOrigin"; type: "TransformOrigin" } + Property { name: "enter"; type: "QQuickTransition"; isPointer: true } + Property { name: "exit"; type: "QQuickTransition"; isPointer: true } + Signal { name: "aboutToShow" } + Signal { name: "aboutToHide" } + Method { name: "open" } + Method { name: "close" } + } + Component { + name: "QQuickProgressBar" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/ProgressBar 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "from"; type: "double" } + Property { name: "to"; type: "double" } + Property { name: "value"; type: "double" } + Property { name: "position"; type: "double"; isReadonly: true } + Property { name: "visualPosition"; type: "double"; isReadonly: true } + Property { name: "indeterminate"; type: "bool" } + Property { name: "indicator"; type: "QQuickItem"; isPointer: true } + } + Component { + name: "QQuickRadioButton" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/RadioButton 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickRangeSlider" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/RangeSlider 1.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "SnapMode" + values: { + "NoSnap": 0, + "SnapAlways": 1, + "SnapOnRelease": 2 + } + } + Property { name: "from"; type: "double" } + Property { name: "to"; type: "double" } + Property { name: "first"; type: "QQuickRangeSliderNode"; isReadonly: true; isPointer: true } + Property { name: "second"; type: "QQuickRangeSliderNode"; isReadonly: true; isPointer: true } + Property { name: "stepSize"; type: "double" } + Property { name: "snapMode"; type: "SnapMode" } + Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "track"; type: "QQuickItem"; isPointer: true } + Method { + name: "setValues" + Parameter { name: "firstValue"; type: "double" } + Parameter { name: "secondValue"; type: "double" } + } + } + Component { + name: "QQuickRangeSliderNode" + prototype: "QObject" + Property { name: "value"; type: "double" } + Property { name: "position"; type: "double"; isReadonly: true } + Property { name: "visualPosition"; type: "double"; isReadonly: true } + Property { name: "handle"; type: "QQuickItem"; isPointer: true } + Property { name: "pressed"; type: "bool" } + Method { name: "increase" } + Method { name: "decrease" } + } + Component { + name: "QQuickScrollBar" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/ScrollBar 1.0"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickScrollBarAttached" + Property { name: "size"; type: "double" } + Property { name: "position"; type: "double" } + Property { name: "active"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "handle"; type: "QQuickItem"; isPointer: true } + Method { + name: "setSize" + Parameter { name: "size"; type: "double" } + } + Method { + name: "setPosition" + Parameter { name: "position"; type: "double" } + } + } + Component { + name: "QQuickScrollBarAttached" + prototype: "QObject" + Property { name: "horizontal"; type: "QQuickScrollBar"; isPointer: true } + Property { name: "vertical"; type: "QQuickScrollBar"; isPointer: true } + } + Component { + name: "QQuickScrollIndicator" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/ScrollIndicator 1.0"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickScrollIndicatorAttached" + Property { name: "size"; type: "double" } + Property { name: "position"; type: "double" } + Property { name: "active"; type: "bool" } + Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "indicator"; type: "QQuickItem"; isPointer: true } + Method { + name: "setSize" + Parameter { name: "size"; type: "double" } + } + Method { + name: "setPosition" + Parameter { name: "position"; type: "double" } + } + } + Component { + name: "QQuickScrollIndicatorAttached" + prototype: "QObject" + Property { name: "horizontal"; type: "QQuickScrollIndicator"; isPointer: true } + Property { name: "vertical"; type: "QQuickScrollIndicator"; isPointer: true } + } + Component { + name: "QQuickSlider" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Slider 1.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "SnapMode" + values: { + "NoSnap": 0, + "SnapAlways": 1, + "SnapOnRelease": 2 + } + } + Property { name: "from"; type: "double" } + Property { name: "to"; type: "double" } + Property { name: "value"; type: "double" } + Property { name: "position"; type: "double"; isReadonly: true } + Property { name: "visualPosition"; type: "double"; isReadonly: true } + Property { name: "stepSize"; type: "double" } + Property { name: "snapMode"; type: "SnapMode" } + Property { name: "pressed"; type: "bool" } + Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "handle"; type: "QQuickItem"; isPointer: true } + Property { name: "track"; type: "QQuickItem"; isPointer: true } + Method { name: "increase" } + Method { name: "decrease" } + } + Component { + name: "QQuickSpinBox" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/SpinBox 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "from"; type: "int" } + Property { name: "to"; type: "int" } + Property { name: "value"; type: "int" } + Property { name: "stepSize"; type: "int" } + Property { name: "validator"; type: "QValidator"; isPointer: true } + Property { name: "textFromValue"; type: "QJSValue" } + Property { name: "valueFromText"; type: "QJSValue" } + Property { name: "up"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true } + Property { name: "down"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true } + Method { name: "increase" } + Method { name: "decrease" } + } + Component { + name: "QQuickSpinButton" + prototype: "QObject" + Property { name: "pressed"; type: "bool" } + Property { name: "indicator"; type: "QQuickItem"; isPointer: true } + } + Component { + name: "QQuickStackAttached" + prototype: "QObject" + Property { name: "index"; type: "int"; isReadonly: true } + Property { name: "view"; type: "QQuickStackView"; isReadonly: true; isPointer: true } + Property { name: "status"; type: "QQuickStackView::Status"; isReadonly: true } + } + Component { + name: "QQuickStackView" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/StackView 1.0"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickStackAttached" + Enum { + name: "Status" + values: { + "Inactive": 0, + "Deactivating": 1, + "Activating": 2, + "Active": 3 + } + } + Enum { + name: "LoadBehavior" + values: { + "DontLoad": 0, + "ForceLoad": 1 + } + } + Enum { + name: "Operation" + values: { + "Transition": 0, + "Immediate": 1 + } + } + Property { name: "busy"; type: "bool"; isReadonly: true } + Property { name: "depth"; type: "int"; isReadonly: true } + Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "initialItem"; type: "QVariant" } + Property { name: "popEnter"; type: "QQuickTransition"; isPointer: true } + Property { name: "popExit"; type: "QQuickTransition"; isPointer: true } + Property { name: "pushEnter"; type: "QQuickTransition"; isPointer: true } + Property { name: "pushExit"; type: "QQuickTransition"; isPointer: true } + Property { name: "replaceEnter"; type: "QQuickTransition"; isPointer: true } + Property { name: "replaceExit"; type: "QQuickTransition"; isPointer: true } + Method { name: "clear" } + Method { + name: "get" + type: "QQuickItem*" + Parameter { name: "index"; type: "int" } + Parameter { name: "behavior"; type: "LoadBehavior" } + } + Method { + name: "get" + type: "QQuickItem*" + Parameter { name: "index"; type: "int" } + } + Method { + name: "find" + type: "QQuickItem*" + Parameter { name: "callback"; type: "QJSValue" } + Parameter { name: "behavior"; type: "LoadBehavior" } + } + Method { + name: "find" + type: "QQuickItem*" + Parameter { name: "callback"; type: "QJSValue" } + } + Method { + name: "push" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "pop" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "replace" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + } + Component { + name: "QQuickSwipeView" + defaultProperty: "contentData" + prototype: "QQuickContainer" + exports: ["Qt.labs.templates/SwipeView 1.0"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickSwipeViewAttached" + } + Component { + name: "QQuickSwipeViewAttached" + prototype: "QObject" + Property { name: "index"; type: "int"; isReadonly: true } + Property { name: "isCurrentItem"; type: "bool"; isReadonly: true } + Property { name: "view"; type: "QQuickSwipeView"; isReadonly: true; isPointer: true } + } + Component { + name: "QQuickSwitch" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/Switch 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "position"; type: "double" } + Property { name: "visualPosition"; type: "double"; isReadonly: true } + } + Component { + name: "QQuickTabBar" + defaultProperty: "contentData" + prototype: "QQuickContainer" + exports: ["Qt.labs.templates/TabBar 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickTabButton" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["Qt.labs.templates/TabButton 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickText" + defaultProperty: "data" + prototype: "QQuickImplicitSizeItem" + Enum { + name: "HAlignment" + values: { + "AlignLeft": 1, + "AlignRight": 2, + "AlignHCenter": 4, + "AlignJustify": 8 + } + } + Enum { + name: "VAlignment" + values: { + "AlignTop": 32, + "AlignBottom": 64, + "AlignVCenter": 128 + } + } + Enum { + name: "TextStyle" + values: { + "Normal": 0, + "Outline": 1, + "Raised": 2, + "Sunken": 3 + } + } + Enum { + name: "TextFormat" + values: { + "PlainText": 0, + "RichText": 1, + "AutoText": 2, + "StyledText": 4 + } + } + Enum { + name: "TextElideMode" + values: { + "ElideLeft": 0, + "ElideRight": 1, + "ElideMiddle": 2, + "ElideNone": 3 + } + } + Enum { + name: "WrapMode" + values: { + "NoWrap": 0, + "WordWrap": 1, + "WrapAnywhere": 3, + "WrapAtWordBoundaryOrAnywhere": 4, + "Wrap": 4 + } + } + Enum { + name: "RenderType" + values: { + "QtRendering": 0, + "NativeRendering": 1 + } + } + Enum { + name: "LineHeightMode" + values: { + "ProportionalHeight": 0, + "FixedHeight": 1 + } + } + Enum { + name: "FontSizeMode" + values: { + "FixedSize": 0, + "HorizontalFit": 1, + "VerticalFit": 2, + "Fit": 3 + } + } + Property { name: "text"; type: "string" } + Property { name: "font"; type: "QFont" } + Property { name: "color"; type: "QColor" } + Property { name: "linkColor"; type: "QColor" } + Property { name: "style"; type: "TextStyle" } + Property { name: "styleColor"; type: "QColor" } + Property { name: "horizontalAlignment"; type: "HAlignment" } + Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true } + Property { name: "verticalAlignment"; type: "VAlignment" } + Property { name: "wrapMode"; type: "WrapMode" } + Property { name: "lineCount"; type: "int"; isReadonly: true } + Property { name: "truncated"; type: "bool"; isReadonly: true } + Property { name: "maximumLineCount"; type: "int" } + Property { name: "textFormat"; type: "TextFormat" } + Property { name: "elide"; type: "TextElideMode" } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "contentHeight"; type: "double"; isReadonly: true } + Property { name: "paintedWidth"; type: "double"; isReadonly: true } + Property { name: "paintedHeight"; type: "double"; isReadonly: true } + Property { name: "lineHeight"; type: "double" } + Property { name: "lineHeightMode"; type: "LineHeightMode" } + Property { name: "baseUrl"; type: "QUrl" } + Property { name: "minimumPixelSize"; type: "int" } + Property { name: "minimumPointSize"; type: "int" } + Property { name: "fontSizeMode"; type: "FontSizeMode" } + Property { name: "renderType"; type: "RenderType" } + Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true } + Property { name: "padding"; revision: 6; type: "double" } + Property { name: "topPadding"; revision: 6; type: "double" } + Property { name: "leftPadding"; revision: 6; type: "double" } + Property { name: "rightPadding"; revision: 6; type: "double" } + Property { name: "bottomPadding"; revision: 6; type: "double" } + Signal { + name: "textChanged" + Parameter { name: "text"; type: "string" } + } + Signal { + name: "linkActivated" + Parameter { name: "link"; type: "string" } + } + Signal { + name: "linkHovered" + revision: 2 + Parameter { name: "link"; type: "string" } + } + Signal { + name: "fontChanged" + Parameter { name: "font"; type: "QFont" } + } + Signal { + name: "styleChanged" + Parameter { name: "style"; type: "TextStyle" } + } + Signal { + name: "horizontalAlignmentChanged" + Parameter { name: "alignment"; type: "HAlignment" } + } + Signal { + name: "verticalAlignmentChanged" + Parameter { name: "alignment"; type: "VAlignment" } + } + Signal { + name: "textFormatChanged" + Parameter { name: "textFormat"; type: "TextFormat" } + } + Signal { + name: "elideModeChanged" + Parameter { name: "mode"; type: "TextElideMode" } + } + Signal { name: "contentSizeChanged" } + Signal { + name: "lineHeightChanged" + Parameter { name: "lineHeight"; type: "double" } + } + Signal { + name: "lineHeightModeChanged" + Parameter { name: "mode"; type: "LineHeightMode" } + } + Signal { + name: "lineLaidOut" + Parameter { name: "line"; type: "QQuickTextLine"; isPointer: true } + } + Signal { name: "paddingChanged"; revision: 6 } + Signal { name: "topPaddingChanged"; revision: 6 } + Signal { name: "leftPaddingChanged"; revision: 6 } + Signal { name: "rightPaddingChanged"; revision: 6 } + Signal { name: "bottomPaddingChanged"; revision: 6 } + Method { name: "doLayout" } + Method { + name: "linkAt" + revision: 3 + type: "string" + Parameter { name: "x"; type: "double" } + Parameter { name: "y"; type: "double" } + } + } + Component { + name: "QQuickTextArea" + defaultProperty: "data" + prototype: "QQuickTextEdit" + exports: ["Qt.labs.templates/TextArea 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "font"; type: "QFont" } + Property { name: "implicitWidth"; type: "double" } + Property { name: "implicitHeight"; type: "double" } + Property { name: "background"; type: "QQuickItem"; isPointer: true } + Property { name: "placeholderText"; type: "string" } + Property { name: "focusReason"; type: "Qt::FocusReason" } + Signal { + name: "pressAndHold" + Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } + } + } + Component { + name: "QQuickTextEdit" + defaultProperty: "data" + prototype: "QQuickImplicitSizeItem" + Enum { + name: "HAlignment" + values: { + "AlignLeft": 1, + "AlignRight": 2, + "AlignHCenter": 4, + "AlignJustify": 8 + } + } + Enum { + name: "VAlignment" + values: { + "AlignTop": 32, + "AlignBottom": 64, + "AlignVCenter": 128 + } + } + Enum { + name: "TextFormat" + values: { + "PlainText": 0, + "RichText": 1, + "AutoText": 2 + } + } + Enum { + name: "WrapMode" + values: { + "NoWrap": 0, + "WordWrap": 1, + "WrapAnywhere": 3, + "WrapAtWordBoundaryOrAnywhere": 4, + "Wrap": 4 + } + } + Enum { + name: "SelectionMode" + values: { + "SelectCharacters": 0, + "SelectWords": 1 + } + } + Enum { + name: "RenderType" + values: { + "QtRendering": 0, + "NativeRendering": 1 + } + } + Property { name: "text"; type: "string" } + Property { name: "color"; type: "QColor" } + Property { name: "selectionColor"; type: "QColor" } + Property { name: "selectedTextColor"; type: "QColor" } + Property { name: "font"; type: "QFont" } + Property { name: "horizontalAlignment"; type: "HAlignment" } + Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true } + Property { name: "verticalAlignment"; type: "VAlignment" } + Property { name: "wrapMode"; type: "WrapMode" } + Property { name: "lineCount"; type: "int"; isReadonly: true } + Property { name: "length"; type: "int"; isReadonly: true } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "contentHeight"; type: "double"; isReadonly: true } + Property { name: "paintedWidth"; type: "double"; isReadonly: true } + Property { name: "paintedHeight"; type: "double"; isReadonly: true } + Property { name: "textFormat"; type: "TextFormat" } + Property { name: "readOnly"; type: "bool" } + Property { name: "cursorVisible"; type: "bool" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } + Property { name: "cursorDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionStart"; type: "int"; isReadonly: true } + Property { name: "selectionEnd"; type: "int"; isReadonly: true } + Property { name: "selectedText"; type: "string"; isReadonly: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "persistentSelection"; type: "bool" } + Property { name: "textMargin"; type: "double" } + Property { name: "inputMethodHints"; type: "Qt::InputMethodHints" } + Property { name: "selectByKeyboard"; revision: 1; type: "bool" } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "mouseSelectionMode"; type: "SelectionMode" } + Property { name: "canPaste"; type: "bool"; isReadonly: true } + Property { name: "canUndo"; type: "bool"; isReadonly: true } + Property { name: "canRedo"; type: "bool"; isReadonly: true } + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "baseUrl"; type: "QUrl" } + Property { name: "renderType"; type: "RenderType" } + Property { + name: "textDocument" + revision: 1 + type: "QQuickTextDocument" + isReadonly: true + isPointer: true + } + Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true } + Property { name: "padding"; revision: 6; type: "double" } + Property { name: "topPadding"; revision: 6; type: "double" } + Property { name: "leftPadding"; revision: 6; type: "double" } + Property { name: "rightPadding"; revision: 6; type: "double" } + Property { name: "bottomPadding"; revision: 6; type: "double" } + Signal { name: "contentSizeChanged" } + Signal { + name: "colorChanged" + Parameter { name: "color"; type: "QColor" } + } + Signal { + name: "selectionColorChanged" + Parameter { name: "color"; type: "QColor" } + } + Signal { + name: "selectedTextColorChanged" + Parameter { name: "color"; type: "QColor" } + } + Signal { + name: "fontChanged" + Parameter { name: "font"; type: "QFont" } + } + Signal { + name: "horizontalAlignmentChanged" + Parameter { name: "alignment"; type: "QQuickTextEdit::HAlignment" } + } + Signal { + name: "verticalAlignmentChanged" + Parameter { name: "alignment"; type: "QQuickTextEdit::VAlignment" } + } + Signal { + name: "textFormatChanged" + Parameter { name: "textFormat"; type: "QQuickTextEdit::TextFormat" } + } + Signal { + name: "readOnlyChanged" + Parameter { name: "isReadOnly"; type: "bool" } + } + Signal { + name: "cursorVisibleChanged" + Parameter { name: "isCursorVisible"; type: "bool" } + } + Signal { + name: "activeFocusOnPressChanged" + Parameter { name: "activeFocusOnPressed"; type: "bool" } + } + Signal { + name: "persistentSelectionChanged" + Parameter { name: "isPersistentSelection"; type: "bool" } + } + Signal { + name: "textMarginChanged" + Parameter { name: "textMargin"; type: "double" } + } + Signal { + name: "selectByKeyboardChanged" + revision: 1 + Parameter { name: "selectByKeyboard"; type: "bool" } + } + Signal { + name: "selectByMouseChanged" + Parameter { name: "selectByMouse"; type: "bool" } + } + Signal { + name: "mouseSelectionModeChanged" + Parameter { name: "mode"; type: "QQuickTextEdit::SelectionMode" } + } + Signal { + name: "linkActivated" + Parameter { name: "link"; type: "string" } + } + Signal { + name: "linkHovered" + revision: 2 + Parameter { name: "link"; type: "string" } + } + Signal { name: "editingFinished"; revision: 6 } + Signal { name: "paddingChanged"; revision: 6 } + Signal { name: "topPaddingChanged"; revision: 6 } + Signal { name: "leftPaddingChanged"; revision: 6 } + Signal { name: "rightPaddingChanged"; revision: 6 } + Signal { name: "bottomPaddingChanged"; revision: 6 } + Method { name: "selectAll" } + Method { name: "selectWord" } + Method { + name: "select" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { name: "deselect" } + Method { + name: "isRightToLeft" + type: "bool" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { name: "cut" } + Method { name: "copy" } + Method { name: "paste" } + Method { name: "undo" } + Method { name: "redo" } + Method { + name: "insert" + Parameter { name: "position"; type: "int" } + Parameter { name: "text"; type: "string" } + } + Method { + name: "remove" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { + name: "append" + revision: 2 + Parameter { name: "text"; type: "string" } + } + Method { + name: "inputMethodQuery" + revision: 4 + type: "QVariant" + Parameter { name: "query"; type: "Qt::InputMethodQuery" } + Parameter { name: "argument"; type: "QVariant" } + } + Method { + name: "positionToRectangle" + type: "QRectF" + Parameter { type: "int" } + } + Method { + name: "positionAt" + type: "int" + Parameter { name: "x"; type: "double" } + Parameter { name: "y"; type: "double" } + } + Method { + name: "moveCursorSelection" + Parameter { name: "pos"; type: "int" } + } + Method { + name: "moveCursorSelection" + Parameter { name: "pos"; type: "int" } + Parameter { name: "mode"; type: "SelectionMode" } + } + Method { + name: "getText" + type: "string" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { + name: "getFormattedText" + type: "string" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { + name: "linkAt" + revision: 3 + type: "string" + Parameter { name: "x"; type: "double" } + Parameter { name: "y"; type: "double" } + } + } + Component { + name: "QQuickTextField" + defaultProperty: "data" + prototype: "QQuickTextInput" + exports: ["Qt.labs.templates/TextField 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "font"; type: "QFont" } + Property { name: "implicitWidth"; type: "double" } + Property { name: "implicitHeight"; type: "double" } + Property { name: "background"; type: "QQuickItem"; isPointer: true } + Property { name: "placeholderText"; type: "string" } + Property { name: "focusReason"; type: "Qt::FocusReason" } + Signal { + name: "pressAndHold" + Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true } + } + } + Component { + name: "QQuickTextInput" + defaultProperty: "data" + prototype: "QQuickImplicitSizeItem" + Enum { + name: "EchoMode" + values: { + "Normal": 0, + "NoEcho": 1, + "Password": 2, + "PasswordEchoOnEdit": 3 + } + } + Enum { + name: "HAlignment" + values: { + "AlignLeft": 1, + "AlignRight": 2, + "AlignHCenter": 4 + } + } + Enum { + name: "VAlignment" + values: { + "AlignTop": 32, + "AlignBottom": 64, + "AlignVCenter": 128 + } + } + Enum { + name: "WrapMode" + values: { + "NoWrap": 0, + "WordWrap": 1, + "WrapAnywhere": 3, + "WrapAtWordBoundaryOrAnywhere": 4, + "Wrap": 4 + } + } + Enum { + name: "SelectionMode" + values: { + "SelectCharacters": 0, + "SelectWords": 1 + } + } + Enum { + name: "CursorPosition" + values: { + "CursorBetweenCharacters": 0, + "CursorOnCharacter": 1 + } + } + Enum { + name: "RenderType" + values: { + "QtRendering": 0, + "NativeRendering": 1 + } + } + Property { name: "text"; type: "string" } + Property { name: "length"; type: "int"; isReadonly: true } + Property { name: "color"; type: "QColor" } + Property { name: "selectionColor"; type: "QColor" } + Property { name: "selectedTextColor"; type: "QColor" } + Property { name: "font"; type: "QFont" } + Property { name: "horizontalAlignment"; type: "HAlignment" } + Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true } + Property { name: "verticalAlignment"; type: "VAlignment" } + Property { name: "wrapMode"; type: "WrapMode" } + Property { name: "readOnly"; type: "bool" } + Property { name: "cursorVisible"; type: "bool" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } + Property { name: "cursorDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionStart"; type: "int"; isReadonly: true } + Property { name: "selectionEnd"; type: "int"; isReadonly: true } + Property { name: "selectedText"; type: "string"; isReadonly: true } + Property { name: "maximumLength"; type: "int" } + Property { name: "validator"; type: "QValidator"; isPointer: true } + Property { name: "inputMask"; type: "string" } + Property { name: "inputMethodHints"; type: "Qt::InputMethodHints" } + Property { name: "acceptableInput"; type: "bool"; isReadonly: true } + Property { name: "echoMode"; type: "EchoMode" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "passwordCharacter"; type: "string" } + Property { name: "passwordMaskDelay"; revision: 3; type: "int" } + Property { name: "displayText"; type: "string"; isReadonly: true } + Property { name: "autoScroll"; type: "bool" } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "mouseSelectionMode"; type: "SelectionMode" } + Property { name: "persistentSelection"; type: "bool" } + Property { name: "canPaste"; type: "bool"; isReadonly: true } + Property { name: "canUndo"; type: "bool"; isReadonly: true } + Property { name: "canRedo"; type: "bool"; isReadonly: true } + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "contentHeight"; type: "double"; isReadonly: true } + Property { name: "renderType"; type: "RenderType" } + Property { name: "padding"; revision: 6; type: "double" } + Property { name: "topPadding"; revision: 6; type: "double" } + Property { name: "leftPadding"; revision: 6; type: "double" } + Property { name: "rightPadding"; revision: 6; type: "double" } + Property { name: "bottomPadding"; revision: 6; type: "double" } + Signal { name: "accepted" } + Signal { name: "editingFinished"; revision: 2 } + Signal { + name: "fontChanged" + Parameter { name: "font"; type: "QFont" } + } + Signal { + name: "horizontalAlignmentChanged" + Parameter { name: "alignment"; type: "HAlignment" } + } + Signal { + name: "verticalAlignmentChanged" + Parameter { name: "alignment"; type: "VAlignment" } + } + Signal { + name: "readOnlyChanged" + Parameter { name: "isReadOnly"; type: "bool" } + } + Signal { + name: "cursorVisibleChanged" + Parameter { name: "isCursorVisible"; type: "bool" } + } + Signal { + name: "maximumLengthChanged" + Parameter { name: "maximumLength"; type: "int" } + } + Signal { + name: "inputMaskChanged" + Parameter { name: "inputMask"; type: "string" } + } + Signal { + name: "echoModeChanged" + Parameter { name: "echoMode"; type: "EchoMode" } + } + Signal { + name: "passwordMaskDelayChanged" + revision: 3 + Parameter { name: "delay"; type: "int" } + } + Signal { + name: "activeFocusOnPressChanged" + Parameter { name: "activeFocusOnPress"; type: "bool" } + } + Signal { + name: "autoScrollChanged" + Parameter { name: "autoScroll"; type: "bool" } + } + Signal { + name: "selectByMouseChanged" + Parameter { name: "selectByMouse"; type: "bool" } + } + Signal { + name: "mouseSelectionModeChanged" + Parameter { name: "mode"; type: "SelectionMode" } + } + Signal { name: "contentSizeChanged" } + Signal { name: "paddingChanged"; revision: 6 } + Signal { name: "topPaddingChanged"; revision: 6 } + Signal { name: "leftPaddingChanged"; revision: 6 } + Signal { name: "rightPaddingChanged"; revision: 6 } + Signal { name: "bottomPaddingChanged"; revision: 6 } + Method { name: "selectAll" } + Method { name: "selectWord" } + Method { + name: "select" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { name: "deselect" } + Method { + name: "isRightToLeft" + type: "bool" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { name: "cut" } + Method { name: "copy" } + Method { name: "paste" } + Method { name: "undo" } + Method { name: "redo" } + Method { + name: "insert" + Parameter { name: "position"; type: "int" } + Parameter { name: "text"; type: "string" } + } + Method { + name: "remove" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Method { + name: "ensureVisible" + revision: 3 + Parameter { name: "position"; type: "int" } + } + Method { + name: "positionAt" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "positionToRectangle" + type: "QRectF" + Parameter { name: "pos"; type: "int" } + } + Method { + name: "moveCursorSelection" + Parameter { name: "pos"; type: "int" } + } + Method { + name: "moveCursorSelection" + Parameter { name: "pos"; type: "int" } + Parameter { name: "mode"; type: "SelectionMode" } + } + Method { + name: "inputMethodQuery" + revision: 3 + type: "QVariant" + Parameter { name: "query"; type: "Qt::InputMethodQuery" } + Parameter { name: "argument"; type: "QVariant" } + } + Method { + name: "getText" + type: "string" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + } + Component { + name: "QQuickToolBar" + defaultProperty: "contentData" + prototype: "QQuickFrame" + exports: ["Qt.labs.templates/ToolBar 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickToolButton" + defaultProperty: "data" + prototype: "QQuickButton" + exports: ["Qt.labs.templates/ToolButton 1.0"] + exportMetaObjectRevisions: [0] + } + Component { + name: "QQuickTumbler" + defaultProperty: "data" + prototype: "QQuickControl" + exports: ["Qt.labs.templates/Tumbler 1.0"] + exportMetaObjectRevisions: [0] + attachedType: "QQuickTumblerAttached" + Property { name: "model"; type: "QVariant" } + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "currentIndex"; type: "int" } + Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "visibleItemCount"; type: "int" } + } + Component { + name: "QQuickTumblerAttached" + prototype: "QObject" + Property { name: "tumbler"; type: "QQuickTumbler"; isReadonly: true; isPointer: true } + Property { name: "displacement"; type: "double"; isReadonly: true } + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/templates/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/templates/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt/labs/templates/qmldir 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt/labs/templates/qmldir 2016-05-25 04:56:54.000000000 +0000 @@ -0,0 +1,4 @@ +module Qt.labs.templates +plugin qtlabstemplatesplugin +classname QtLabsTemplatesPlugin +depends QtQuick.Window 2.2 Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Core/libquick3dcoreplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Core/libquick3dcoreplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Core/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Core/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Core/qmldir 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Core/qmldir 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,3 @@ +module Qt3D.Core +plugin quick3dcoreplugin +classname Qt3DQuick3DCorePlugin Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Input/libquick3dinputplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Input/libquick3dinputplugin.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/libquick3dcoreplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/libquick3dcoreplugin.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Logic/libquick3dlogicplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Logic/libquick3dlogicplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Logic/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Logic/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Logic/qmldir 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Logic/qmldir 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,3 @@ +module Qt3D.Logic +plugin quick3dlogicplugin +classname Qt3DQuick3DLogicPlugin diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/qmldir 2015-06-26 09:55:54.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/qmldir 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -module Qt3D -plugin quick3dcoreplugin -classname Qt3DQuick3DCorePlugin diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/DiffuseMapMaterial.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/DiffuseMapMaterial.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/DiffuseMapMaterial.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/DiffuseMapMaterial.qml 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,120 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 + +Material { + id: root + + property color ambient: Qt.rgba( 0.05, 0.05, 0.05, 1.0 ) + property alias diffuse: diffuseTextureImage.source + property color specular: Qt.rgba( 0.01, 0.01, 0.01, 1.0 ) + property real shininess: 150.0 + property real textureScale: 1.0 + + parameters: [ + Parameter { name: "ka"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) }, + Parameter { + name: "diffuseTexture" + value: Texture2D { + id: diffuseTexture + minificationFilter: Texture.LinearMipMapLinear + magnificationFilter: Texture.Linear + wrapMode { + x: WrapMode.Repeat + y: WrapMode.Repeat + } + generateMipMaps: true + maximumAnisotropy: 16.0 + TextureImage { id: diffuseTextureImage; } + } + }, + Parameter { name: "ks"; value: Qt.vector3d(root.specular.r, root.specular.g, root.specular.b) }, + Parameter { name: "shininess"; value: root.shininess }, + Parameter { name: "texCoordScale"; value: textureScale } + ] + + effect: Effect { + ShaderProgram { + id: gl2Es2Shader + vertexShaderCode: loadSource("qrc:/shaders/es2/diffusemap.vert") + fragmentShaderCode: loadSource("qrc:/shaders/es2/diffusemap.frag") + } + + ShaderProgram { + id: gl3Shader + vertexShaderCode: loadSource("qrc:/shaders/gl3/diffusemap.vert") + fragmentShaderCode: loadSource("qrc:/shaders/gl3/diffusemap.frag") + } + + techniques: [ + // OpenGL 3.1 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.CoreProfile + majorVersion: 3 + minorVersion: 1 + } + renderPasses: RenderPass { shaderProgram: gl3Shader } + }, + + // OpenGL 2.1 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { shaderProgram: gl2Es2Shader } + }, + + // OpenGL ES 2 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGLES + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { shaderProgram: gl2Es2Shader } + } + ] + } +} + diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/DiffuseSpecularMapMaterial.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/DiffuseSpecularMapMaterial.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/DiffuseSpecularMapMaterial.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/DiffuseSpecularMapMaterial.qml 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,132 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 + +Material { + id: root + + property color ambient: Qt.rgba( 0.05, 0.05, 0.05, 1.0 ) + property alias diffuse: diffuseTextureImage.source + property alias specular: specularTextureImage.source + property real shininess: 150.0 + property real textureScale: 1.0 + + parameters: [ + Parameter { name: "ka"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) }, + Parameter { + name: "diffuseTexture" + value: Texture2D { + id: diffuseTexture + minificationFilter: Texture.LinearMipMapLinear + magnificationFilter: Texture.Linear + wrapMode { + x: WrapMode.Repeat + y: WrapMode.Repeat + } + generateMipMaps: true + maximumAnisotropy: 16.0 + TextureImage { id: diffuseTextureImage; } + } + }, + Parameter { name: "specularTexture"; + value: Texture2D { + id: specularTexture + minificationFilter: Texture.LinearMipMapLinear + magnificationFilter: Texture.Linear + wrapMode { + x: WrapMode.Repeat + y: WrapMode.Repeat + } + generateMipMaps: true + maximumAnisotropy: 16.0 + TextureImage { id: specularTextureImage; } + } + }, + Parameter { name: "shininess"; value: root.shininess }, + Parameter { name: "texCoordScale"; value: textureScale } + ] + + effect: Effect { + ShaderProgram { + id: gl2Es2Shader + vertexShaderCode: loadSource("qrc:/shaders/es2/diffusemap.vert") + fragmentShaderCode: loadSource("qrc:/shaders/es2/diffusespecularmap.frag") + } + + ShaderProgram { + id: gl3Shader + vertexShaderCode: loadSource("qrc:/shaders/gl3/diffusemap.vert") + fragmentShaderCode: loadSource("qrc:/shaders/gl3/diffusespecularmap.frag") + } + + techniques: [ + // OpenGL 3.1 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.CoreProfile + majorVersion: 3 + minorVersion: 1 + } + renderPasses: RenderPass { shaderProgram: gl3Shader } + }, + + // OpenGL 2.1 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { shaderProgram: gl2Es2Shader } + }, + + // OpenGL ES 2 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGLES + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { shaderProgram: gl2Es2Shader } + } + ] + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/ForwardRenderer.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/ForwardRenderer.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/ForwardRenderer.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/ForwardRenderer.qml 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 + +TechniqueFilter { + // Expose camera to allow user to choose which camera to use for rendering + property alias camera: cameraSelector.camera + property alias clearColor: viewport.clearColor + property alias viewportRect: viewport.rect + + // Select the forward rendering Technique of any used Effect + requires: [ Annotation { name: "renderingStyle"; value: "forward" } ] + + // Use the whole viewport + Viewport { + id: viewport + rect: Qt.rect(0.0, 0.0, 1.0, 1.0) + clearColor: "white" + + // Use the specified camera + CameraSelector { + id : cameraSelector + FrustumCulling { + ClearBuffer { + buffers : ClearBuffer.ColorDepthBuffer + } + } + } + } +} + diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/GoochMaterial.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/GoochMaterial.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/GoochMaterial.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/GoochMaterial.qml 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,115 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 + +Material { + id:root + property color diffuse: Qt.rgba( 0.0, 0.0, 0.0, 1.0 ) + property color specular: Qt.rgba( 0.0, 0.0, 0.0, 1.0 ) + property color coolColor: Qt.rgba( 0.0, 0.0, 0.4, 1.0 ) + property color warmColor: Qt.rgba( 0.4, 0.4, 0.0, 1.0 ) + property real alpha: 0.25 + property real beta: 0.5 + property real shininess: 100.0 + + ShaderProgram { + id: gl3GoochShader + vertexShaderCode: loadSource("qrc:/shaders/gl3/gooch.vert") + fragmentShaderCode: loadSource("qrc:/shaders/gl3/gooch.frag") + } + + ShaderProgram { + id: gl2es2GoochShader + vertexShaderCode: loadSource("qrc:/shaders/es2/gooch.vert") + fragmentShaderCode: loadSource("qrc:/shaders/es2/gooch.frag") + } + + effect: Effect { + parameters: [ + Parameter { name: "kd"; value: root.diffuse }, + Parameter { name: "ks"; value: root.specular }, + Parameter { name: "kblue"; value: root.coolColor }, + Parameter { name: "kyellow"; value: root.warmColor }, + Parameter { name: "alpha"; value: root.alpha }, + Parameter { name: "beta"; value: root.beta }, + Parameter { name: "shininess"; value: root.shininess } + ] + + techniques: [ + // GL 3 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.CoreProfile + majorVersion: 3 + minorVersion: 2 + } + renderPasses: RenderPass { + shaderProgram: gl3GoochShader + } + }, + + // GL 2 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2GoochShader + } + }, + + // ES 2 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGLES + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2GoochShader + } + } + ] + } +} + diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,138 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 + +Material { + id: root + + property color ambient: Qt.rgba( 0.05, 0.05, 0.05, 1.0 ) + property alias diffuse: diffuseTextureImage.source + property color specular: Qt.rgba( 0.01, 0.01, 0.01, 1.0 ) + property alias normal: normalTextureImage.source + property real shininess: 150.0 + property real textureScale: 1.0 + + parameters: [ + Parameter { name: "ka"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) }, + Parameter { + name: "diffuseTexture" + value: Texture2D { + id: diffuseTexture + minificationFilter: Texture.LinearMipMapLinear + magnificationFilter: Texture.Linear + wrapMode { + x: WrapMode.Repeat + y: WrapMode.Repeat + } + generateMipMaps: true + maximumAnisotropy: 16.0 + TextureImage { id: diffuseTextureImage; } + } + }, + Parameter { + name: "normalTexture" + value: Texture2D { + id: normalTexture + minificationFilter: Texture.Linear + magnificationFilter: Texture.Linear + wrapMode { + x: WrapMode.Repeat + y: WrapMode.Repeat + } + maximumAnisotropy: 16.0 + TextureImage { id: normalTextureImage; } + } + }, + Parameter { name: "ks"; value: Qt.vector3d(root.specular.r, root.specular.g, root.specular.b) }, + Parameter { name: "shininess"; value: root.shininess }, + Parameter { name: "texCoordScale"; value: textureScale } + ] + + effect: Effect { + ShaderProgram { + id: gl2Es2Shader + vertexShaderCode: loadSource("qrc:/shaders/es2/normaldiffusemap.vert") + fragmentShaderCode: loadSource("qrc:/shaders/es2/normaldiffusemapalpha.frag") + } + + ShaderProgram { + id: gl3Shader + vertexShaderCode: loadSource("qrc:/shaders/gl3/normaldiffusemap.vert") + fragmentShaderCode: loadSource("qrc:/shaders/gl3/normaldiffusemapalpha.frag") + } + + AlphaCoverage { id: alphaCoverageState } + DepthTest { id: depthTestState; func: DepthTest.Less } + + techniques: [ + // OpenGL 3.1 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.CoreProfile + majorVersion: 3 + minorVersion: 1 + } + renderPasses: RenderPass { shaderProgram: gl3Shader; renderStates: [alphaCoverageState, depthTestState] } + }, + + // OpenGL 2.1 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { shaderProgram: gl2Es2Shader; renderStates: [alphaCoverageState, depthTestState] } + }, + + // OpenGL ES 2 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGLES + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { shaderProgram: gl2Es2Shader; renderStates: [alphaCoverageState, depthTestState] } + } + ] + } +} + diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/NormalDiffuseMapMaterial.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/NormalDiffuseMapMaterial.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/NormalDiffuseMapMaterial.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/NormalDiffuseMapMaterial.qml 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,135 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 + +Material { + id: root + + property color ambient: Qt.rgba( 0.05, 0.05, 0.05, 1.0 ) + property alias diffuse: diffuseTextureImage.source + property color specular: Qt.rgba( 0.01, 0.01, 0.01, 1.0 ) + property alias normal: normalTextureImage.source + property real shininess: 150.0 + property real textureScale: 1.0 + + parameters: [ + Parameter { name: "ka"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) }, + Parameter { + name: "diffuseTexture" + value: Texture2D { + id: diffuseTexture + minificationFilter: Texture.LinearMipMapLinear + magnificationFilter: Texture.Linear + wrapMode { + x: WrapMode.Repeat + y: WrapMode.Repeat + } + generateMipMaps: true + maximumAnisotropy: 16.0 + TextureImage { id: diffuseTextureImage; } + } + }, + Parameter { + name: "normalTexture" + value: Texture2D { + id: normalTexture + minificationFilter: Texture.Linear + magnificationFilter: Texture.Linear + wrapMode { + x: WrapMode.Repeat + y: WrapMode.Repeat + } + maximumAnisotropy: 16.0 + TextureImage { id: normalTextureImage; } + } + }, + Parameter { name: "ks"; value: Qt.vector3d(root.specular.r, root.specular.g, root.specular.b) }, + Parameter { name: "shininess"; value: root.shininess }, + Parameter { name: "texCoordScale"; value: textureScale } + ] + + effect: Effect { + ShaderProgram { + id: gl2Es2Shader + vertexShaderCode: loadSource("qrc:/shaders/es2/normaldiffusemap.vert") + fragmentShaderCode: loadSource("qrc:/shaders/es2/normaldiffusemap.frag") + } + + ShaderProgram { + id: gl3Shader + vertexShaderCode: loadSource("qrc:/shaders/gl3/normaldiffusemap.vert") + fragmentShaderCode: loadSource("qrc:/shaders/gl3/normaldiffusemap.frag") + } + + techniques: [ + // OpenGL 3.1 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.CoreProfile + majorVersion: 3 + minorVersion: 1 + } + renderPasses: RenderPass { shaderProgram: gl3Shader } + }, + + // OpenGL 2.1 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { shaderProgram: gl2Es2Shader } + }, + + // OpenGL ES 2 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGLES + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { shaderProgram: gl2Es2Shader } + } + ] + } +} + diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,148 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 + +Material { + id: root + + property color ambient: Qt.rgba( 0.05, 0.05, 0.05, 1.0 ) + property alias diffuse: diffuseTextureImage.source + property alias specular: specularTextureImage.source + property alias normal: normalTextureImage.source + property real shininess: 150.0 + property real textureScale: 1.0 + + parameters: [ + Parameter { name: "ka"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) }, + Parameter { + name: "diffuseTexture" + value: Texture2D { + id: diffuseTexture + minificationFilter: Texture.LinearMipMapLinear + magnificationFilter: Texture.Linear + wrapMode { + x: WrapMode.Repeat + y: WrapMode.Repeat + } + generateMipMaps: true + maximumAnisotropy: 16.0 + TextureImage { id: diffuseTextureImage; } + } + }, + Parameter { name: "specularTexture"; + value: Texture2D { + id: specularTexture + minificationFilter: Texture.LinearMipMapLinear + magnificationFilter: Texture.Linear + wrapMode { + x: WrapMode.Repeat + y: WrapMode.Repeat + } + generateMipMaps: true + maximumAnisotropy: 16.0 + TextureImage { id: specularTextureImage; } + } + }, + Parameter { + name: "normalTexture" + value: Texture2D { + id: normalTexture + minificationFilter: Texture.Linear + magnificationFilter: Texture.Linear + wrapMode { + x: WrapMode.Repeat + y: WrapMode.Repeat + } + maximumAnisotropy: 16.0 + TextureImage { id: normalTextureImage; } + } + }, + Parameter { name: "shininess"; value: root.shininess }, + Parameter { name: "texCoordScale"; value: textureScale } + ] + + effect: Effect { + ShaderProgram { + id: gl2Es2Shader + vertexShaderCode: loadSource("qrc:/shaders/es2/normaldiffusemap.vert") + fragmentShaderCode: loadSource("qrc:/shaders/es2/normaldiffusespecularmap.frag") + } + + ShaderProgram { + id: gl3Shader + vertexShaderCode: loadSource("qrc:/shaders/gl3/normaldiffusemap.vert") + fragmentShaderCode: loadSource("qrc:/shaders/gl3/normaldiffusespecularmap.frag") + } + + techniques: [ + // OpenGL 3.1 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.CoreProfile + majorVersion: 3 + minorVersion: 1 + } + renderPasses: RenderPass { shaderProgram: gl3Shader } + }, + + // OpenGL 2.1 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { shaderProgram: gl2Es2Shader } + }, + + // OpenGL ES 2 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGLES + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { shaderProgram: gl2Es2Shader } + } + ] + } +} + diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/PerVertexColorMaterial.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/PerVertexColorMaterial.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/PerVertexColorMaterial.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/PerVertexColorMaterial.qml 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,98 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Lorenz Esch (TU Ilmenau). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 + +Material { + id:root + + ShaderProgram { + id: gl3PerVertexColorShader + vertexShaderCode: loadSource("qrc:/shaders/gl3/pervertexcolor.vert") + fragmentShaderCode: loadSource("qrc:/shaders/gl3/pervertexcolor.frag") + } + + ShaderProgram { + id: gl2es2PerVertexColorShader + vertexShaderCode: loadSource("qrc:/shaders/es2/pervertexcolor.vert") + fragmentShaderCode: loadSource("qrc:/shaders/es2/pervertexcolor.frag") + } + + effect: Effect { + techniques: [ + // GL 3 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.CoreProfile + majorVersion: 3 + minorVersion: 1 + } + renderPasses: RenderPass { + shaderProgram: gl3PerVertexColorShader + } + }, + + // GL 2 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2PerVertexColorShader + } + }, + + // ES 2 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGLES + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2PerVertexColorShader + } + } + ] + } +} + diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/PhongAlphaMaterial.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/PhongAlphaMaterial.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/PhongAlphaMaterial.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/PhongAlphaMaterial.qml 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,137 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Paul Lemire +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 + +Material { + id:root + property color ambient: Qt.rgba( 0.05, 0.05, 0.05, 1.0 ) + property color diffuse: Qt.rgba( 0.7, 0.7, 0.7, 1.0 ) + property color specular: Qt.rgba( 0.01, 0.01, 0.01, 1.0 ) + property real shininess: 150.0 + property real alpha: 0.5 + + + ShaderProgram { + id: gl3PhongAlphaShader + vertexShaderCode: loadSource("qrc:/shaders/gl3/phong.vert") + fragmentShaderCode: loadSource("qrc:/shaders/gl3/phongalpha.frag") + } + + ShaderProgram { + id: gl2es2PhongAlphaShader + vertexShaderCode: loadSource("qrc:/shaders/es2/phong.vert") + fragmentShaderCode: loadSource("qrc:/shaders/es2/phongalpha.frag") + } + + effect: Effect { + + parameters: [ + Parameter { name: "alpha"; value: root.alpha }, + Parameter { name: "ka"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) }, + Parameter { name: "kd"; value: Qt.vector3d(root.diffuse.r, root.diffuse.g, root.diffuse.b) }, + Parameter { name: "ks"; value: Qt.vector3d(root.specular.r, root.specular.g, root.specular.b) }, + Parameter { name: "shininess"; value: root.shininess } + ] + + techniques: [ + // GL 3 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.CoreProfile + majorVersion: 3 + minorVersion: 1 + } + renderPasses: RenderPass { + shaderProgram: gl3PhongAlphaShader + renderStates: [ + DepthMask { mask: false }, + BlendState { + srcRGB: BlendState.SrcAlpha + dstRGB: BlendState.OneMinusSrcAlpha + }, + BlendEquation {mode: BlendEquation.FuncAdd} + ] + } + }, + + // GL 2 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2PhongAlphaShader + renderStates: [ + DepthMask { mask: false }, + BlendState { + srcRGB: BlendState.SrcAlpha + dstRGB: BlendState.OneMinusSrcAlpha + }, + BlendEquation {mode: BlendEquation.FuncAdd} + ] + } + }, + + // ES 2 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGLES + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2PhongAlphaShader + renderStates: [ + DepthMask { mask: false }, + BlendState { + srcRGB: BlendState.SrcAlpha + dstRGB: BlendState.OneMinusSrcAlpha + }, + BlendEquation {mode: BlendEquation.FuncAdd} + ] + } + } + ] + } +} + diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/PhongMaterial.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/PhongMaterial.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/PhongMaterial.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/PhongMaterial.qml 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,111 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 + +Material { + id:root + property color ambient: Qt.rgba( 0.05, 0.05, 0.05, 1.0 ) + property color diffuse: Qt.rgba( 0.7, 0.7, 0.7, 1.0 ) + property color specular: Qt.rgba( 0.01, 0.01, 0.01, 1.0 ) + property real shininess: 150.0 + + + ShaderProgram { + id: gl3PhongShader + vertexShaderCode: loadSource("qrc:/shaders/gl3/phong.vert") + fragmentShaderCode: loadSource("qrc:/shaders/gl3/phong.frag") + } + + ShaderProgram { + id: gl2es2PhongShader + vertexShaderCode: loadSource("qrc:/shaders/es2/phong.vert") + fragmentShaderCode: loadSource("qrc:/shaders/es2/phong.frag") + } + + effect: Effect { + + parameters: [ + Parameter { name: "ka"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) }, + Parameter { name: "kd"; value: Qt.vector3d(root.diffuse.r, root.diffuse.g, root.diffuse.b) }, + Parameter { name: "ks"; value: Qt.vector3d(root.specular.r, root.specular.g, root.specular.b) }, + Parameter { name: "shininess"; value: root.shininess } + ] + + techniques: [ + // GL 3 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.CoreProfile + majorVersion: 3 + minorVersion: 1 + } + renderPasses: RenderPass { + shaderProgram: gl3PhongShader + } + }, + + // GL 2 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2PhongShader + } + }, + + // ES 2 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGLES + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2PhongShader + } + } + ] + } +} + diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/SkyboxEntity.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/SkyboxEntity.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/SkyboxEntity.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/SkyboxEntity.qml 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,144 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 + +Entity { + + property alias cameraPosition: transform.translation; + property string baseName: ""; + property string extension: ".png" + + property TextureCubeMap skyboxTexture: TextureCubeMap { + generateMipMaps: false + magnificationFilter: Texture.Linear + minificationFilter: Texture.Linear + wrapMode { + x: WrapMode.ClampToEdge + y: WrapMode.ClampToEdge + } + TextureImage { cubeMapFace: Texture.CubeMapPositiveX; source: baseName + "_posx" + extension } + TextureImage { cubeMapFace: Texture.CubeMapPositiveY; source: baseName + "_posy" + extension } + TextureImage { cubeMapFace: Texture.CubeMapPositiveZ; source: baseName + "_posz" + extension } + TextureImage { cubeMapFace: Texture.CubeMapNegativeX; source: baseName + "_negx" + extension } + TextureImage { cubeMapFace: Texture.CubeMapNegativeY; source: baseName + "_negy" + extension } + TextureImage { cubeMapFace: Texture.CubeMapNegativeZ; source: baseName + "_negz" + extension } + } + + ShaderProgram { + id: gl3SkyboxShader + vertexShaderCode: loadSource("qrc:/shaders/gl3/skybox.vert") + fragmentShaderCode: loadSource("qrc:/shaders/gl3/skybox.frag") + } + + ShaderProgram { + id: gl2es2SkyboxShader + vertexShaderCode: loadSource("qrc:/shaders/es2/skybox.vert") + fragmentShaderCode: loadSource("qrc:/shaders/es2/skybox.frag") + } + + CuboidMesh { + id: cuboidMesh + yzMeshResolution: Qt.size(2, 2) + xzMeshResolution: Qt.size(2, 2) + xyMeshResolution: Qt.size(2, 2) + } + + Transform { + id: transform + } + + Material { + id: skyboxMaterial + parameters: Parameter { name: "skyboxTexture"; value: skyboxTexture} + + effect: Effect { + techniques: [ + // GL3 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.CoreProfile + majorVersion: 3 + minorVersion: 1 + } + renderPasses: RenderPass { + shaderProgram: gl3SkyboxShader + renderStates: [ + // cull front faces + CullFace { mode: CullFace.Front }, + DepthTest { func: DepthTest.LessOrEqual } + ] + } + }, + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2SkyboxShader + renderStates: [ + CullFace { mode: CullFace.Front }, + DepthTest { func: DepthTest.LessOrEqual } + ] + } + }, + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGLES + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2SkyboxShader + renderStates: [ + CullFace { mode: CullFace.Front }, + DepthTest { func: DepthTest.LessOrEqual } + ] + } + } + ] + } + } + + components: [cuboidMesh, skyboxMaterial, transform] +} + diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/TextureMaterial.qml shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/TextureMaterial.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/TextureMaterial.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/defaults/qml/TextureMaterial.qml 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,112 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 + +Material { + id: root + property Texture2D texture: Texture2D {} + property alias textureOffset: texCoordOffset.offset + + ShaderProgram { + id: gl3Shader + vertexShaderCode: loadSource("qrc:/shaders/gl3/unlittexture.vert") + fragmentShaderCode: loadSource("qrc:/shaders/gl3/unlittexture.frag") + } + + ShaderProgram { + id: gl2es2Shader + vertexShaderCode: loadSource("qrc:/shaders/es2/unlittexture.vert") + fragmentShaderCode: loadSource("qrc:/shaders/es2/unlittexture.frag") + } + + effect: Effect { + parameters: [ + Parameter { + name: "diffuseTexture" + value: root.texture + }, + Parameter { + id: texCoordOffset + property vector2d offset: Qt.vector2d(0, 0) + name: "texCoordOffset" + value: offset + } + + ] + + techniques: [ + // OpenGL 3.1 + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + profile: GraphicsApiFilter.CoreProfile + majorVersion: 3 + minorVersion: 1 + } + renderPasses: RenderPass { + shaderProgram: gl3Shader + } + }, + + // GL 2 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGL + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2Shader + } + }, + + // ES 2 Technique + Technique { + graphicsApiFilter { + api: GraphicsApiFilter.OpenGLES + profile: GraphicsApiFilter.NoProfile + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2Shader + } + } + ] + } +} Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/libquick3drenderplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/libquick3drenderplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Render/qmldir 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Render/qmldir 2016-05-13 04:33:47.000000000 +0000 @@ -0,0 +1,3 @@ +module Qt3D.Render +plugin quick3drenderplugin +classname Qt3DQuick3DRenderPlugin Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Renderer/libquick3drendererplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Renderer/libquick3drendererplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Renderer/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Renderer/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/Qt3D/Renderer/qmldir 2015-06-26 09:55:53.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/Qt3D/Renderer/qmldir 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -module Qt3D.Renderer -plugin quick3drendererplugin -classname Qt3DQuick3DRendererPlugin Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtBluetooth/libdeclarative_bluetooth.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtBluetooth/libdeclarative_bluetooth.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtBluetooth/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtBluetooth/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtBluetooth/plugins.qmltypes 2015-06-26 09:53:38.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtBluetooth/plugins.qmltypes 2016-05-23 05:58:18.000000000 +0000 @@ -1,19 +1,20 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtBluetooth 5.5' +// 'qmlplugindump -nonrelocatable QtBluetooth 5.6' Module { + dependencies: ["QtQuick 2.0"] Component { name: "QDeclarativeBluetoothDiscoveryModel" prototype: "QAbstractListModel" exports: [ "QtBluetooth/BluetoothDiscoveryModel 5.0", "QtBluetooth/BluetoothDiscoveryModel 5.2", - "QtBluetooth/BluetoothDiscoveryModel 5.5" + "QtBluetooth/BluetoothDiscoveryModel 5.6" ] exportMetaObjectRevisions: [0, 0, 0] Enum { diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtCanvas3D/designer/default/Canvas3D.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtCanvas3D/designer/default/Canvas3D.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtCanvas3D/designer/default/Canvas3D.qml 2015-06-26 09:55:12.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtCanvas3D/designer/default/Canvas3D.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtCanvas3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtCanvas3D 1.0 - -Canvas3D { - id: canvas3d - anchors.fill: parent -} Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtCanvas3D/designer/images/canvas3d-icon16.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtCanvas3D/designer/images/canvas3d-icon16.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtCanvas3D/designer/images/canvas3d-icon.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtCanvas3D/designer/images/canvas3d-icon.png differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtCanvas3D/designer/qtcanvas3d.metainfo shotcut-17.01.01/Shotcut.app/lib/qml/QtCanvas3D/designer/qtcanvas3d.metainfo --- shotcut-16.07.01/Shotcut.app/lib/qml/QtCanvas3D/designer/qtcanvas3d.metainfo 2015-06-26 09:55:12.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtCanvas3D/designer/qtcanvas3d.metainfo 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -MetaInfo { - Type { - name: "QtCanvas3D.Canvas3D" - icon: "images/canvas3d-icon16.png" - - ItemLibraryEntry { - name: "Canvas3D" - category: "Qt Canvas 3D" - libraryIcon: "images/canvas3d-icon.png" - version: "1.0" - requiredImport: "QtCanvas3D" - - QmlSource { source: "default/Canvas3D.qml" } - } - } -} Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtCanvas3D/libqtcanvas3d.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtCanvas3D/libqtcanvas3d.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtCanvas3D/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtCanvas3D/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtCanvas3D/plugins.qmltypes 2015-06-26 09:55:12.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtCanvas3D/plugins.qmltypes 2016-05-12 10:12:46.000000000 +0000 @@ -4,7 +4,7 @@ // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtCanvas3D 1.0' +// 'qmlplugindump -nonrelocatable QtCanvas3D 1.1' Module { dependencies: [] @@ -166,14 +166,24 @@ name: "QtCanvas3D::Canvas" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtCanvas3D/Canvas3D 1.0"] - exportMetaObjectRevisions: [0] + exports: ["QtCanvas3D/Canvas3D 1.0", "QtCanvas3D/Canvas3D 1.1"] + exportMetaObjectRevisions: [0, 1] + Enum { + name: "RenderTarget" + values: { + "RenderTargetOffscreenBuffer": 0, + "RenderTargetBackground": 1, + "RenderTargetForeground": 2 + } + } Property { name: "context"; type: "CanvasContext"; isReadonly: true; isPointer: true } Property { name: "devicePixelRatio"; type: "float"; isReadonly: true } Property { name: "fps"; type: "uint"; isReadonly: true } Property { name: "pixelSize"; type: "QSize" } Property { name: "width"; type: "int" } Property { name: "height"; type: "int" } + Property { name: "renderTarget"; revision: 1; type: "RenderTarget" } + Property { name: "renderOnDemand"; revision: 1; type: "bool" } Signal { name: "needRender" } Signal { name: "devicePixelRatioChanged" @@ -191,6 +201,8 @@ name: "pixelSizeChanged" Parameter { name: "pixelSize"; type: "QSize" } } + Signal { name: "contextLost" } + Signal { name: "contextRestored" } Signal { name: "initializeGL" } Signal { name: "paintGL" } Signal { @@ -205,11 +217,9 @@ Parameter { name: "size"; type: "QSize" } Parameter { name: "devicePixelRatio"; type: "float" } } - Method { name: "ready" } - Method { name: "shutDown" } - Method { name: "renderNext" } - Method { name: "queueResizeGL" } - Method { name: "emitNeedRender" } + Method { name: "requestRender" } + Method { name: "frameTimeMs"; type: "int" } + Method { name: "frameSetupTimeMs"; revision: 1; type: "int" } Method { name: "getContext" type: "QJSValue" @@ -226,15 +236,20 @@ name: "QtCanvas3D::CanvasAbstractObject" prototype: "QObject" Property { name: "name"; type: "string" } + Property { name: "invalidated"; type: "bool"; isReadonly: true } Signal { name: "nameChanged" Parameter { name: "name"; type: "string" } } + Signal { + name: "invalidatedChanged" + Parameter { name: "invalidated"; type: "bool" } + } } Component { name: "QtCanvas3D::CanvasActiveInfo" prototype: "QObject" - exports: ["QtCanvas3D/CanvasActiveInfo3D 1.0"] + exports: ["QtCanvas3D/Canvas3DActiveInfo 1.0"] isCreatable: false exportMetaObjectRevisions: [0] Property { name: "size"; type: "int"; isReadonly: true } @@ -256,7 +271,7 @@ Component { name: "QtCanvas3D::CanvasBuffer" prototype: "QtCanvas3D::CanvasAbstractObject" - exports: ["QtCanvas3D/CanvasBuffer3D 1.0"] + exports: ["QtCanvas3D/Canvas3DBuffer 1.0"] isCreatable: false exportMetaObjectRevisions: [0] } @@ -1906,13 +1921,13 @@ } Method { name: "getShaderParameter" - type: "int" + type: "QJSValue" Parameter { name: "shader3D"; type: "QJSValue" } Parameter { name: "paramName"; type: "glEnums" } } Method { name: "getProgramParameter" - type: "QVariant" + type: "QJSValue" Parameter { name: "program"; type: "QJSValue" } Parameter { name: "paramName"; type: "glEnums" } } @@ -2124,7 +2139,7 @@ } Method { name: "getAttachedShaders" - type: "QVariantList" + type: "QJSValue" Parameter { name: "program"; type: "QJSValue" } } Method { @@ -2164,20 +2179,20 @@ } Method { name: "getFramebufferAttachmentParameter" - type: "int" + type: "QJSValue" Parameter { name: "target"; type: "glEnums" } Parameter { name: "attachment"; type: "glEnums" } Parameter { name: "pname"; type: "glEnums" } } Method { name: "getRenderbufferParameter" - type: "int" + type: "QJSValue" Parameter { name: "target"; type: "glEnums" } Parameter { name: "pname"; type: "glEnums" } } Method { name: "getTexParameter" - type: "QVariant" + type: "QJSValue" Parameter { name: "target"; type: "glEnums" } Parameter { name: "pname"; type: "glEnums" } } @@ -2203,7 +2218,7 @@ Component { name: "QtCanvas3D::CanvasContextAttributes" prototype: "QtCanvas3D::CanvasAbstractObject" - exports: ["QtCanvas3D/CanvasContextAttributes 1.0"] + exports: ["QtCanvas3D/Canvas3DContextAttributes 1.0"] exportMetaObjectRevisions: [0] Property { name: "alpha"; type: "bool" } Property { name: "depth"; type: "bool" } @@ -2249,7 +2264,7 @@ Component { name: "QtCanvas3D::CanvasFrameBuffer" prototype: "QtCanvas3D::CanvasAbstractObject" - exports: ["QtCanvas3D/CanvasFrameBuffer3D 1.0"] + exports: ["QtCanvas3D/Canvas3DFrameBuffer 1.0"] isCreatable: false exportMetaObjectRevisions: [0] } @@ -2298,28 +2313,28 @@ Component { name: "QtCanvas3D::CanvasProgram" prototype: "QtCanvas3D::CanvasAbstractObject" - exports: ["QtCanvas3D/CanvasProgram3D 1.0"] + exports: ["QtCanvas3D/Canvas3DProgram 1.0"] isCreatable: false exportMetaObjectRevisions: [0] } Component { name: "QtCanvas3D::CanvasRenderBuffer" prototype: "QtCanvas3D::CanvasAbstractObject" - exports: ["QtCanvas3D/CanvasRenderBuffer3D 1.0"] + exports: ["QtCanvas3D/Canvas3DRenderBuffer 1.0"] isCreatable: false exportMetaObjectRevisions: [0] } Component { name: "QtCanvas3D::CanvasShader" prototype: "QtCanvas3D::CanvasAbstractObject" - exports: ["QtCanvas3D/CanvasShader3D 1.0"] + exports: ["QtCanvas3D/Canvas3DShader 1.0"] isCreatable: false exportMetaObjectRevisions: [0] } Component { name: "QtCanvas3D::CanvasShaderPrecisionFormat" prototype: "QtCanvas3D::CanvasAbstractObject" - exports: ["QtCanvas3D/CanvasShaderPrecisionFormat3D 1.0"] + exports: ["QtCanvas3D/Canvas3DShaderPrecisionFormat 1.0"] isCreatable: false exportMetaObjectRevisions: [0] Property { name: "rangeMin"; type: "int"; isReadonly: true } @@ -2341,9 +2356,10 @@ Component { name: "QtCanvas3D::CanvasTexture" prototype: "QtCanvas3D::CanvasAbstractObject" - exports: ["QtCanvas3D/CanvasTexture3D 1.0"] + exports: ["QtCanvas3D/Canvas3DTexture 1.0"] isCreatable: false exportMetaObjectRevisions: [0] + Method { name: "handleItemDestroyed" } } Component { name: "QtCanvas3D::CanvasTextureImage" @@ -2421,9 +2437,25 @@ Method { name: "newTexImage"; type: "QJSValue" } } Component { + name: "QtCanvas3D::CanvasTextureProvider" + prototype: "QObject" + exports: ["QtCanvas3D/Canvas3DTextureProvider 1.1"] + isCreatable: false + exportMetaObjectRevisions: [0] + Signal { + name: "textureReady" + Parameter { name: "source"; type: "QQuickItem"; isPointer: true } + } + Method { + name: "createTextureFromSource" + type: "QJSValue" + Parameter { name: "source"; type: "QQuickItem"; isPointer: true } + } + } + Component { name: "QtCanvas3D::CanvasUniformLocation" prototype: "QtCanvas3D::CanvasAbstractObject" - exports: ["QtCanvas3D/CanvasUniformLocation3D 1.0"] + exports: ["QtCanvas3D/Canvas3DUniformLocation 1.0"] isCreatable: false exportMetaObjectRevisions: [0] } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/Blend.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/Blend.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/Blend.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/Blend.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype Blend diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/BrightnessContrast.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/BrightnessContrast.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/BrightnessContrast.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/BrightnessContrast.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype BrightnessContrast diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/Colorize.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/Colorize.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/Colorize.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/Colorize.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype Colorize @@ -53,10 +53,10 @@ of a grayscale image. Colorize uses the hue, saturation, and lightness (HSL) color space. You can specify a desired value for each property. You can shift all HSL values with the - \l{QtGraphicalEffects1::HueSaturation}{HueSaturation} effect. + \l{QtGraphicalEffects::HueSaturation}{HueSaturation} effect. Alternatively, you can use the - \l{QtGraphicalEffects1::ColorOverlay}{ColorOverlay} effect to colorize the + \l{QtGraphicalEffects::ColorOverlay}{ColorOverlay} effect to colorize the source item in the RGBA color space. \table diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/ColorOverlay.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/ColorOverlay.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/ColorOverlay.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/ColorOverlay.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype ColorOverlay diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/ConicalGradient.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/ConicalGradient.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/ConicalGradient.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/ConicalGradient.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype ConicalGradient @@ -118,8 +118,8 @@ property real angle: 0.0 /*! - \qmlproperty real QtGraphicalEffects1::ConicalGradient::horizontalOffset - \qmlproperty real QtGraphicalEffects1::ConicalGradient::verticalOffset + \qmlproperty real QtGraphicalEffects::ConicalGradient::horizontalOffset + \qmlproperty real QtGraphicalEffects::ConicalGradient::verticalOffset The horizontalOffset and verticalOffset properties define the offset in pixels for the center point of the gradient compared to the item center. @@ -206,41 +206,60 @@ \row \li \b {gradient:} \code Gradient { - GradientStop { position: 0.000 - color: Qt.rgba(1, 0, 0, 1) } - GradientStop { position: 0.167; - color: Qt.rgba(1, 1, 0, 1) } - GradientStop { position: 0.333; - color: Qt.rgba(0, 1, 0, 1) } - GradientStop { position: 0.500; - color: Qt.rgba(0, 1, 1, 1) } - GradientStop { position: 0.667; - color: Qt.rgba(0, 0, 1, 1) } - GradientStop { position: 0.833; - color: Qt.rgba(1, 0, 1, 1) } - GradientStop { position: 1.000; - color: Qt.rgba(1, 0, 0, 1) } + GradientStop { + position: 0.000 + color: Qt.rgba(1, 0, 0, 1) + } + GradientStop { + position: 0.167 + color: Qt.rgba(1, 1, 0, 1) + } + GradientStop { + position: 0.333 + color: Qt.rgba(0, 1, 0, 1) + } + GradientStop { + position: 0.500 + color: Qt.rgba(0, 1, 1, 1) + } + GradientStop { + position: 0.667 + color: Qt.rgba(0, 0, 1, 1) + } + GradientStop { + position: 0.833 + color: Qt.rgba(1, 0, 1, 1) + } + GradientStop { + position: 1.000 + color: Qt.rgba(1, 0, 0, 1) + } } \endcode \li \b {gradient:} \code Gradient { - GradientStop { position: 0.0 - color: "#F0F0F0" + GradientStop { + position: 0.0 + color: "#F0F0F0" } - GradientStop { position: 0.5 - color: "#000000" + GradientStop { + position: 0.5 + color: "#000000" } - GradientStop { position: 1.0 - color: "#F0F0F0" + GradientStop { + position: 1.0 + color: "#F0F0F0" } } \endcode \li \b {gradient:} \code Gradient { - GradientStop { position: 0.0 - color: "#00000000" + GradientStop { + position: 0.0 + color: "#00000000" } - GradientStop { position: 1.0 + GradientStop { + position: 1.0 color: "#FF000000" } } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/Desaturate.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/Desaturate.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/Desaturate.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/Desaturate.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype Desaturate diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/DirectionalBlur.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/DirectionalBlur.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/DirectionalBlur.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/DirectionalBlur.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype DirectionalBlur @@ -54,8 +54,8 @@ each pixel, therefore setting the direction to 0 and 180 provides the same result. - Other available motionblur effects are \l{QtGraphicalEffects1::ZoomBlur}{ZoomBlur} and - \l{QtGraphicalEffects1::RadialBlur}{RadialBlur}. + Other available motionblur effects are \l{QtGraphicalEffects::ZoomBlur}{ZoomBlur} and + \l{QtGraphicalEffects::RadialBlur}{RadialBlur}. \table \header diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/Displace.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/Displace.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/Displace.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/Displace.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype Displace diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/DropShadow.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/DropShadow.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/DropShadow.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/DropShadow.qml 2016-05-10 05:03:30.000000000 +0000 @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2015 Jolla Ltd, author: ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Graphical Effects module. @@ -39,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype DropShadow @@ -47,18 +48,14 @@ \since QtGraphicalEffects 1.0 \inherits QtQuick2::Item \ingroup qtgraphicaleffects-drop-shadow - \brief Generates a colorized and blurred shadow image of the - source and places it behind the original, giving the impression that - source item is raised from the background. - - By default the effect produces a high quality shadow image, thus the - rendering speed of the shadow might not be the highest possible. The - rendering speed is reduced especially if the shadow edges are heavily - softened. - - For use cases that require faster rendering speed and for which the highest - possible visual quality is not necessary, the - \l{DropShadow::fast}{fast} property can be set to \c true. + + \brief Generates a soft shadow behind the source item. + + The DropShadow effect blurs the alpha channel of the input, colorizes the + result and places it behind the source object to create a soft shadow. The + shadow's color can be changed using the \l {DropShadow::color}{color} + property. The location of the shadow can be changed with the \l + horizontalOffset and \l verticalOffset properties. \table \header @@ -69,6 +66,14 @@ \li \image DropShadow_butterfly.png \endtable + The soft shadow is created by blurring the image live using a gaussian + blur. Performing blur live is a costly operation. Fullscreen gaussian blur + with even a moderate number of samples will only run at 60 fps on highend + graphics hardware. + + When the source is static, the \l cached property can be set to allocate + another buffer to avoid performing the blur every time it is drawn. + \section1 Example The following example shows how to apply the effect. @@ -76,7 +81,12 @@ */ Item { - id: rootItem + id: root + + DropShadowBase { + id: dbs + anchors.fill: parent + } /*! This property defines the source item that is going to be used as the @@ -85,18 +95,26 @@ \note It is not supported to let the effect include itself, for instance by setting source to the effect's parent. */ - property variant source + property alias source: dbs.source /*! + \qmlproperty int DropShadow::radius + Radius defines the softness of the shadow. A larger radius causes the edges of the shadow to appear more blurry. - Depending on the radius value, value of the - \l{DropShadow::samples}{samples} should be set to sufficiently large to - ensure the visual quality. + The ideal blur is acheived by selecting \c samples and \c radius such + that \c {samples = 1 + radius * 2}, such as: + + \table + \header \li Radius \li Samples + \row \li 0 \e{(no blur)} \li 1 + \row \li 1 \li 3 + \row \li 2 \li 5 + \row \li 3 \li 7 + \endtable - The value ranges from 0.0 (no blur) to inf. By default, the property is - set to \c 0.0 (no blur). + By default, the property is set to \c {floor(samples/2)}. \table \header @@ -112,9 +130,9 @@ \li \b { radius: 6 } \li \b { radius: 12 } \row - \li \l samples: 24 - \li \l samples: 24 - \li \l samples: 24 + \li \l samples: 25 + \li \l samples: 25 + \li \l samples: 25 \row \li \l color: #000000 \li \l color: #000000 @@ -132,9 +150,8 @@ \li \l spread: 0 \li \l spread: 0 \endtable - */ - property real radius: 0.0 + property alias radius: dbs.radius; /*! This property defines how many samples are taken per pixel when edge @@ -142,19 +159,22 @@ quality, but is slower to render. Ideally, this value should be twice as large as the highest required - radius value, for example, if the radius is animated between 0.0 and - 4.0, samples should be set to 8. - - The value ranges from 0 to 32. By default, the property is set to \c 0. + radius value plus one, such as: - This property is not intended to be animated. Changing this property may - cause the underlying OpenGL shaders to be recompiled. + \table + \header \li Radius \li Samples + \row \li 0 \e{(no blur)} \li 1 + \row \li 1 \li 3 + \row \li 2 \li 5 + \row \li 3 \li 7 + \endtable - When \l{DropShadow::fast}{fast} property is set to true, this property - has no effect. + By default, the property is set to \c 9. + This property is not intended to be animated. Changing this property will + cause the underlying OpenGL shaders to be recompiled. */ - property int samples: 0 + property alias samples: dbs.samples /*! This property defines the RGBA color value which is used for the shadow. @@ -179,9 +199,9 @@ \li \l radius: 8 \li \l radius: 8 \row - \li \l samples: 16 - \li \l samples: 16 - \li \l samples: 16 + \li \l samples: 17 + \li \l samples: 17 + \li \l samples: 17 \row \li \l horizontalOffset: 0 \li \l horizontalOffset: 0 @@ -195,13 +215,12 @@ \li \l spread: 0 \li \l spread: 0 \endtable - */ - property color color: "black" + property alias color: dbs.color /*! - \qmlproperty real QtGraphicalEffects1::DropShadow::horizontalOffset - \qmlproperty real QtGraphicalEffects1::DropShadow::verticalOffset + \qmlproperty real QtGraphicalEffects::DropShadow::horizontalOffset + \qmlproperty real QtGraphicalEffects::DropShadow::verticalOffset HorizontalOffset and verticalOffset properties define the offset for the rendered shadow compared to the DropShadow item position. Often, the @@ -232,9 +251,9 @@ \li \l radius: 4 \li \l radius: 4 \row - \li \l samples: 8 - \li \l samples: 8 - \li \l samples: 8 + \li \l samples: 9 + \li \l samples: 9 + \li \l samples: 9 \row \li \l color: #000000 \li \l color: #000000 @@ -248,17 +267,16 @@ \li \l spread: 0 \li \l spread: 0 \endtable - */ - property real horizontalOffset: 0.0 - property real verticalOffset: 0.0 + property alias horizontalOffset: dbs.horizontalOffset + property alias verticalOffset: dbs.verticalOffset /*! This property defines how large part of the shadow color is strenghtened near the source edges. The value ranges from 0.0 to 1.0. By default, the property is set to \c - 0.5. + 0.0. \table \header @@ -278,9 +296,9 @@ \li \l radius: 8 \li \l radius: 8 \row - \li \l samples: 16 - \li \l samples: 16 - \li \l samples: 16 + \li \l samples: 17 + \li \l samples: 17 + \li \l samples: 17 \row \li \l color: #000000 \li \l color: #000000 @@ -294,48 +312,16 @@ \li \l verticalOffset: 20 \li \l verticalOffset: 20 \endtable - */ - property real spread: 0.0 + property alias spread: dbs.spread /*! - This property selects the blurring algorithm that is used to produce the - softness for the effect. Setting this to true enables fast algorithm, - setting value to false produces higher quality result. + \internal - By default, the property is set to \c false. - - \table - \header - \li Output examples with different fast values - \li - \li - \row - \li \image DropShadow_fast1.png - \li \image DropShadow_fast2.png - \row - \li \b { fast: false } - \li \b { fast: true } - \row - \li \l radius: 16 - \li \l radius: 16 - \row - \li \l samples: 24 - \li \l samples: 24 - \row - \li \l color: #000000 - \li \l color: #000000 - \row - \li \l horizontalOffset: 0 - \li \l horizontalOffset: 0 - \row - \li \l verticalOffset: 20 - \li \l verticalOffset: 20 - \row - \li \l spread: 0 - \li \l spread: 0 - \endtable + Starting Qt 5.6, this property has no effect. It is left here + for source compatibility only. + ### Qt 6: remove */ property bool fast: false @@ -350,9 +336,8 @@ properties are animated. By default, the property is set to \c false. - */ - property bool cached: false + property alias cached: dbs.cached /*! This property determines whether or not the effect has a transparent @@ -361,59 +346,16 @@ When set to \c true, the exterior of the item is padded with a 1 pixel wide transparent edge, making sampling outside the source texture use transparency instead of the edge pixels. Without this property, an - image which has opaque edges will not get a blurred edge. + image which has opaque edges will not get a blurred shadow. In the image below, the Rectangle on the left has transparent borders and has blurred edges, whereas the Rectangle on the right does not: + By default, this property is set to \c true. + \snippet DropShadow-transparentBorder-example.qml example - \image transparentBorder.png + \image DropShadow-transparentBorder.png */ - property bool transparentBorder: false - - Loader { - x: rootItem.horizontalOffset - y: rootItem.verticalOffset - width: parent.width - height: parent.height - sourceComponent: rootItem.fast ? fastGlow : gaussianGlow - } - - Component { - id: gaussianGlow - GaussianGlow { - anchors.fill: parent - source: sourceProxy.output - radius: rootItem.radius - maximumRadius: rootItem.samples * 0.5 - color: rootItem.color - cached: rootItem.cached - spread: rootItem.spread - transparentBorder: rootItem.transparentBorder - } - } - - Component { - id: fastGlow - FastGlow { - anchors.fill: parent - source: sourceProxy.output - blur: Math.pow(rootItem.radius / 64.0, 0.4) - color: rootItem.color - cached: rootItem.cached - spread: rootItem.spread - transparentBorder: rootItem.transparentBorder - } - } - - SourceProxy { - id: sourceProxy - input: rootItem.source - sourceRect: rootItem.transparentBorder ? Qt.rect(-1, -1, parent.width + 2.0, parent.height + 2.0) : Qt.rect(0, 0, 0, 0) - } - ShaderEffect { - anchors.fill: parent - property variant source: sourceProxy.output - } + property alias transparentBorder: dbs.transparentBorder } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/FastBlur.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/FastBlur.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/FastBlur.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/FastBlur.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype FastBlur @@ -50,7 +50,7 @@ \brief Applies a fast blur effect to one or more source items. FastBlur offers lower blur quality than - \l{QtGraphicalEffects1::GaussianBlur}{GaussianBlur}, but it is faster to + \l{QtGraphicalEffects::GaussianBlur}{GaussianBlur}, but it is faster to render. The FastBlur effect softens the source content by blurring it with algorithm which uses the source content downscaling and bilinear filtering. Use this effect in situations where the source content is rapidly changing diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/GammaAdjust.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/GammaAdjust.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/GammaAdjust.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/GammaAdjust.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype GammaAdjust diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/GaussianBlur.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/GaussianBlur.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/GaussianBlur.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/GaussianBlur.qml 2016-05-10 05:03:30.000000000 +0000 @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2015 Jolla Ltd, author: ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Graphical Effects module. @@ -39,7 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtQuick.Window 2.1 +import QtGraphicalEffects.private 1.0 /*! \qmltype GaussianBlur @@ -51,7 +53,7 @@ GaussianBlur effect softens the image by blurring it with an algorithm that uses the Gaussian function to calculate the effect. The effect produces - higher quality than \l{QtGraphicalEffects1::FastBlur}{FastBlur}, but is + higher quality than \l{QtGraphicalEffects::FastBlur}{FastBlur}, but is slower to render. \table @@ -68,9 +70,13 @@ The following example shows how to apply the effect. \snippet GaussianBlur-example.qml example + Performing blur live is a costly operation. Fullscreen gaussian blur + with even a moderate number of samples will only run at 60 fps on highend + graphics hardware. + */ Item { - id: rootItem + id: root /*! This property defines the source item that is going to be blurred. @@ -85,12 +91,19 @@ affect the blurring of an individual pixel. A larger radius increases the blur effect. - Depending on the radius value, value of the - \l{GaussianBlur::samples}{samples} should be set to sufficiently large - to ensure the visual quality. + The ideal blur is acheived by selecting \c samples and \c radius such + that \c {samples = 1 + radius * 2}, such as: + + \table + \header \li Radius \li Samples + \row \li 0 \e{(no blur)} \li 1 + \row \li 1 \li 3 + \row \li 2 \li 5 + \row \li 3 \li 7 + \endtable The value ranges from 0.0 (no blur) to inf. By default, the property is - set to \c 0.0 (no blur). + set to \c floor(samples / 2.0). \table \header @@ -116,7 +129,7 @@ \endtable */ - property real radius: 0.0 + property real radius: Math.floor(samples / 2); /*! This property defines how many samples are taken per pixel when blur @@ -124,16 +137,16 @@ to render. Ideally, this value should be twice as large as the highest required - radius value, for example, if the radius is animated between 0.0 and - 4.0, samples should be set to 8. + radius value plus 1, for example, if the radius is animated between 0.0 + and 4.0, samples should be set to 9. - The value ranges from 0 to 32. By default, the property is set to \c 0. + By default, the property is set to \c 9. - This property is not intended to be animated. Changing this property may + \note This property is not intended to be animated. Changing this property may cause the underlying OpenGL shaders to be recompiled. */ - property int samples: 0 + property int samples: 9 /*! This property is a parameter to the gaussian function that is used when @@ -219,7 +232,6 @@ \li \l deviation: 2.7 \li \l deviation: 2.7 \endtable - */ property bool transparentBorder: false @@ -238,58 +250,122 @@ */ property bool cached: false + + // private members... + /*! \internal */ + property int _paddedTexWidth: transparentBorder ? width + 2 * radius: width; + /*! \internal */ + property int _paddedTexHeight: transparentBorder ? height + 2 * radius: height; + /*! \internal */ + property int _kernelRadius: Math.max(0, samples / 2); + /*! \internal */ + property int _kernelSize: _kernelRadius * 2 + 1; + /*! \internal */ + property int _dpr: Screen.devicePixelRatio; + /*! \internal */ + property bool _alphaOnly: false; + /*! \internal */ + property var _maskSource: undefined + + /*! \internal */ + property alias _output: sourceProxy.output; + /*! \internal */ + property alias _outputRect: sourceProxy.sourceRect; + /*! \internal */ + property alias _color: verticalBlur.color; + /*! \internal */ + property real _thickness: 0; + + onSamplesChanged: _rebuildShaders(); + on_KernelSizeChanged: _rebuildShaders(); + onDeviationChanged: _rebuildShaders(); + on_DprChanged: _rebuildShaders(); + on_MaskSourceChanged: _rebuildShaders(); + Component.onCompleted: _rebuildShaders(); + + /*! \internal */ + function _rebuildShaders() { + var params = { + radius: _kernelRadius, + // Limit deviation to something very small avoid getting NaN in the shader. + deviation: Math.max(0.00001, deviation), + alphaOnly: root._alphaOnly, + masked: _maskSource != undefined, + fallback: root.radius != _kernelRadius + } + var shaders = ShaderBuilder.gaussianBlur(params); + horizontalBlur.fragmentShader = shaders.fragmentShader; + horizontalBlur.vertexShader = shaders.vertexShader; + } + SourceProxy { id: sourceProxy - input: rootItem.source - sourceRect: rootItem.transparentBorder ? Qt.rect(-1, -1, parent.width + 2.0, parent.height + 2.0) : Qt.rect(0, 0, 0, 0) + interpolation: SourceProxy.LinearInterpolation + input: root.source + sourceRect: root.transparentBorder + ? Qt.rect(-root.radius, 0, root._paddedTexWidth, parent.height) + : Qt.rect(0, 0, 0, 0) } - ShaderEffectSource { - id: cacheItem - anchors.fill: verticalBlur - visible: rootItem.cached - smooth: true - sourceItem: verticalBlur - live: true - hideSource: visible + ShaderEffect { + id: horizontalBlur + width: root.transparentBorder ? root._paddedTexWidth : root.width + height: root.height; + + // Used by all shaders + property Item source: sourceProxy.output; + property real spread: root.radius / root._kernelRadius; + property var dirstep: Qt.vector2d(1 / (root._paddedTexWidth * root._dpr), 0); + + // Used by fallback shader (sampleCount exceeds number of varyings) + property real deviation: root.deviation + + // Only in use for DropShadow and Glow + property color color: "white" + property real thickness: Math.max(0, Math.min(0.98, 1 - root._thickness * 0.98)); + + // Only in use for MaskedBlur + property var mask: root._maskSource; + + layer.enabled: true + layer.smooth: true + layer.sourceRect: root.transparentBorder + ? Qt.rect(0, -root.radius, width, root._paddedTexHeight) + : Qt.rect(0, 0, 0, 0) + visible: false + blending: false } - GaussianDirectionalBlur { + ShaderEffect { id: verticalBlur - x: transparentBorder ? -maximumRadius - 1 : 0 - y: transparentBorder ? -maximumRadius - 1 : 0 - width: horizontalBlur.width - height: horizontalBlur.height - - horizontalStep: 0.0 - verticalStep: 1.0 / parent.height - - source: ShaderEffectSource { - id: horizontalBlurSource - sourceItem: horizontalBlur - hideSource: true - visible: false - smooth: true - } + x: transparentBorder ? -root.radius : 0 + y: x; + width: root.transparentBorder ? root._paddedTexWidth: root.width + height: root.transparentBorder ? root._paddedTexHeight : root.height; + fragmentShader: horizontalBlur.fragmentShader + vertexShader: horizontalBlur.vertexShader - deviation: rootItem.deviation - radius: rootItem.radius - maximumRadius: rootItem.samples * 0.5 - transparentBorder: rootItem.transparentBorder - } + property Item source: horizontalBlur + property real spread: horizontalBlur.spread + property var dirstep: Qt.vector2d(0, 1 / (root._paddedTexHeight * root._dpr)); - GaussianDirectionalBlur { - id: horizontalBlur - width: transparentBorder ? parent.width + 2 * maximumRadius + 2 : parent.width - height: transparentBorder ? parent.height + 2 * maximumRadius + 2 : parent.height + property real deviation: horizontalBlur.deviation + + property color color: "black" + property real thickness: horizontalBlur.thickness; - horizontalStep: 1.0 / parent.width - verticalStep: 0.0 + property var mask: horizontalBlur.mask; - source: sourceProxy.output - deviation: rootItem.deviation - radius: rootItem.radius - maximumRadius: rootItem.samples / 2.0 - transparentBorder: rootItem.transparentBorder + visible: true } + + ShaderEffectSource { + id: cacheItem + anchors.fill: verticalBlur + visible: root.cached + smooth: true + sourceItem: verticalBlur + hideSource: visible + } + } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/Glow.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/Glow.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/Glow.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/Glow.qml 2016-05-10 05:03:30.000000000 +0000 @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2015 Jolla Ltd, author: ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Graphical Effects module. @@ -39,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype Glow @@ -47,14 +48,13 @@ \since QtGraphicalEffects 1.0 \inherits QtQuick2::Item \ingroup qtgraphicaleffects-glow - \brief Generates a blurred and colorized image of the source and places it - behind the original, giving impression that the source is glowing. + \brief Generates a halo like glow around the source item. - By default effect produces a high quality glow image, thus the rendering - speed of the effect may not be the highest possible. The rendering speed is - reduced especially if the glow edges are heavily softened. For use cases - that require faster rendering speed and the highest possible visual quality - is not necessary, property \l{Glow::fast}{fast} can be set to true. + The Glow effect blurs the alpha channel of the source and colorizes it + with \l {Glow::color}{color} and places it behind the source, resulting in a halo or glow + around the object. The quality of the blurred edge can be controlled using + \l samples and \l radius and the strenght of the glow can be changed using + \l spread. \table \header @@ -65,6 +65,11 @@ \li \image Glow_butterfly.png \endtable + The glow is created by blurring the image live using a gaussian blur. + Performing blur live is a costly operation. Fullscreen gaussian blur with + even a moderate number of samples will only run at 60 fps on highend + graphics hardware. + \section1 Example The following example shows how to apply the effect. @@ -72,7 +77,16 @@ */ Item { - id: rootItem + id: root + + DropShadowBase { + id: dps + anchors.fill: parent + color: "white" + spread: 0.5 + horizontalOffset: 0 + verticalOffset: 0 + } /*! This property defines the source item that is going to be used as source @@ -81,7 +95,7 @@ \note It is not supported to let the effect include itself, for instance by setting source to the effect's parent. */ - property variant source + property alias source: dps.source /*! Radius defines the softness of the glow. A larger radius causes the @@ -90,8 +104,18 @@ Depending on the radius value, value of the \l{Glow::samples}{samples} should be set to sufficiently large to ensure the visual quality. - The value ranges from 0.0 (no blur) to inf. By default, the property is - set to \c 0.0 (no blur). + The ideal blur is acheived by selecting \c samples and \c radius such + that \c {samples = 1 + radius * 2}, such as: + + \table + \header \li Radius \li Samples + \row \li 0 \e{(no blur)} \li 1 + \row \li 1 \li 3 + \row \li 2 \li 5 + \row \li 3 \li 7 + \endtable + + By default, the property is set to \c {floor(samples/2)}. \table \header @@ -107,9 +131,9 @@ \li \b { radius: 6 } \li \b { radius: 12 } \row - \li \l samples: 24 - \li \l samples: 24 - \li \l samples: 24 + \li \l samples: 25 + \li \l samples: 25 + \li \l samples: 25 \row \li \l color: #ffffff \li \l color: #ffffff @@ -120,7 +144,7 @@ \li \l spread: 0 \endtable */ - property real radius: 0.0 + property alias radius: dps.radius /*! This property defines how many samples are taken per pixel when edge @@ -128,18 +152,22 @@ quality, but is slower to render. Ideally, this value should be twice as large as the highest required - radius value, for example, if the radius is animated between 0.0 and - 4.0, samples should be set to 8. + radius value plus one, such as: - The value ranges from 0 to 32. By default, the property is set to \c 0. - - This property is not intended to be animated. Changing this property may - cause the underlying OpenGL shaders to be recompiled. + \table + \header \li Radius \li Samples + \row \li 0 \e{(no blur)} \li 1 + \row \li 1 \li 3 + \row \li 2 \li 5 + \row \li 3 \li 7 + \endtable - When \l fast property is set to true, this property has no effect. + By default, the property is set to \c 9. + This property is not intended to be animated. Changing this property will + cause the underlying OpenGL shaders to be recompiled. */ - property int samples: 0 + property alias samples: dps.samples /*! This property defines how large part of the glow color is strenghtened @@ -166,16 +194,16 @@ \li \l radius: 8 \li \l radius: 8 \row - \li \l samples: 16 - \li \l samples: 16 - \li \l samples: 16 + \li \l samples: 17 + \li \l samples: 17 + \li \l samples: 17 \row \li \l color: #ffffff \li \l color: #ffffff \li \l color: #ffffff \endtable */ - property real spread: 0.0 + property alias spread: dps.spread /*! This property defines the RGBA color value which is used for the glow. @@ -200,9 +228,9 @@ \li \l radius: 8 \li \l radius: 8 \row - \li \l samples: 16 - \li \l samples: 16 - \li \l samples: 16 + \li \l samples: 17 + \li \l samples: 17 + \li \l samples: 17 \row \li \l spread: 0.5 \li \l spread: 0.5 @@ -210,39 +238,15 @@ \endtable */ - property color color: "white" + property alias color: dps.color /*! - This property selects the blurring algorithm that is used to produce the - softness for the effect. Setting this to true enables fast algorithm, - setting value to false produces higher quality result. + \internal - By default, the property is set to \c false. + Starting Qt 5.6, this property has no effect. It is left here + for source compatibility only. - \table - \header - \li Output examples with different fast values - \li - \li - \row - \li \image Glow_fast1.png - \li \image Glow_fast2.png - \row - \li \b { fast: false } - \li \b { fast: true } - \row - \li \l radius: 16 - \li \l radius: 16 - \row - \li \l samples: 24 - \li \l samples: 24 - \row - \li \l color: #ffffff - \li \l color: #ffffff - \row - \li \l spread: 0.3 - \li \l spread: 0.3 - \endtable + ### Qt 6: remove */ property bool fast: false @@ -260,65 +264,26 @@ By default, the property is set to \c false. */ - property bool cached: false + property alias cached: dps.cached /*! This property determines whether or not the effect has a transparent border. - When set to \c true, the exterior of the item is padded with a 1 pixel - wide transparent edge, making sampling outside the source texture use + When set to \c true, the exterior of the item is padded with a + transparent edge, making sampling outside the source texture use transparency instead of the edge pixels. Without this property, an image which has opaque edges will not get a blurred edge. + By default, the property is set to \c true. Set it to false if the source + already has a transparent edge to make the blurring a tiny bit faster. + In the snippet below, the Rectangle on the left has transparent borders and has blurred edges, whereas the Rectangle on the right does not. \snippet Glow-transparentBorder-example.qml example - \image transparentBorder.png + \image Glow-transparentBorder.png */ - property bool transparentBorder: false - - Loader { - anchors.fill: parent - sourceComponent: rootItem.fast ? fastGlow : gaussianGlow - } - - Component { - id: gaussianGlow - GaussianGlow { - anchors.fill: parent - source: sourceProxy.output - radius: rootItem.radius - maximumRadius: rootItem.samples * 0.5 - color: rootItem.color - cached: rootItem.cached - spread: rootItem.spread - transparentBorder: rootItem.transparentBorder - } - } - - Component { - id: fastGlow - FastGlow { - anchors.fill: parent - source: sourceProxy.output - blur: Math.pow(rootItem.radius / 64.0, 0.4) - color: rootItem.color - cached: rootItem.cached - spread: rootItem.spread - transparentBorder: rootItem.transparentBorder - } - } - - SourceProxy { - id: sourceProxy - input: rootItem.source - sourceRect: rootItem.transparentBorder ? Qt.rect(-1, -1, parent.width + 2.0, parent.height + 2.0) : Qt.rect(0, 0, 0, 0) - } - ShaderEffect { - anchors.fill: parent - property variant source: sourceProxy.output - } + property alias transparentBorder: dps.transparentBorder } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/HueSaturation.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/HueSaturation.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/HueSaturation.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/HueSaturation.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype HueSaturation @@ -49,7 +49,7 @@ \ingroup qtgraphicaleffects-color \brief Alters the source item colors in the HSL color space. - HueSaturation is similar to the \l{QtGraphicalEffects1::Colorize}{Colorize} + HueSaturation is similar to the \l{QtGraphicalEffects::Colorize}{Colorize} effect, but the hue and saturation property values are handled differently. The HueSaturation effect always shifts the hue, saturation, and lightness from the original, instead of setting them. diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/InnerShadow.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/InnerShadow.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/InnerShadow.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/InnerShadow.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype InnerShadow @@ -241,8 +241,8 @@ property color color: "black" /*! - \qmlproperty real QtGraphicalEffects1::InnerShadow::horizontalOffset - \qmlproperty real QtGraphicalEffects1::InnerShadow::verticalOffset + \qmlproperty real QtGraphicalEffects::InnerShadow::horizontalOffset + \qmlproperty real QtGraphicalEffects::InnerShadow::verticalOffset HorizontalOffset and verticalOffset properties define the offset for the rendered shadow compared to the InnerShadow item position. Often, the diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/LevelAdjust.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/LevelAdjust.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/LevelAdjust.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/LevelAdjust.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ *****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype LevelAdjust diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/LinearGradient.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/LinearGradient.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/LinearGradient.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/LinearGradient.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype LinearGradient @@ -194,41 +194,60 @@ \row \li \b {gradient:} \code Gradient { - GradientStop { position: 0.000 - color: Qt.rgba(1, 0, 0, 1) } - GradientStop { position: 0.167; - color: Qt.rgba(1, 1, 0, 1) } - GradientStop { position: 0.333; - color: Qt.rgba(0, 1, 0, 1) } - GradientStop { position: 0.500; - color: Qt.rgba(0, 1, 1, 1) } - GradientStop { position: 0.667; - color: Qt.rgba(0, 0, 1, 1) } - GradientStop { position: 0.833; - color: Qt.rgba(1, 0, 1, 1) } - GradientStop { position: 1.000; - color: Qt.rgba(1, 0, 0, 1) } + GradientStop { + position: 0.000 + color: Qt.rgba(1, 0, 0, 1) + } + GradientStop { + position: 0.167 + color: Qt.rgba(1, 1, 0, 1) + } + GradientStop { + position: 0.333 + color: Qt.rgba(0, 1, 0, 1) + } + GradientStop { + position: 0.500 + color: Qt.rgba(0, 1, 1, 1) + } + GradientStop { + position: 0.667 + color: Qt.rgba(0, 0, 1, 1) + } + GradientStop { + position: 0.833 + color: Qt.rgba(1, 0, 1, 1) + } + GradientStop { + position: 1.000 + color: Qt.rgba(1, 0, 0, 1) + } } \endcode \li \b {gradient:} \code Gradient { - GradientStop { position: 0.0 - color: "#F0F0F0" + GradientStop { + position: 0.0 + color: "#F0F0F0" } - GradientStop { position: 0.5 - color: "#000000" + GradientStop { + position: 0.5 + color: "#000000" } - GradientStop { position: 1.0 - color: "#F0F0F0" + GradientStop { + position: 1.0 + color: "#F0F0F0" } } \endcode \li \b {gradient:} \code Gradient { - GradientStop { position: 0.0 + GradientStop { + position: 0.0 color: "#00000000" } - GradientStop { position: 1.0 + GradientStop { + position: 1.0 color: "#FF000000" } } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/MaskedBlur.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/MaskedBlur.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/MaskedBlur.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/MaskedBlur.qml 2016-05-10 05:03:30.000000000 +0000 @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2015 Jolla Ltd, author: ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Graphical Effects module. @@ -39,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype MaskedBlur @@ -51,12 +52,11 @@ MaskedBlur effect softens the image by blurring it. The intensity of the blur can be controlled for each pixel using maskSource so that some parts of - the source are blurred more than others. By default the effect produces a - high quality result, thus the rendering speed may not be the highest - possible. The rendering speed is reduced especially if the - \l{MaskedBlur::samples}{samples} is large. For use cases that require faster - rendering speed and the highest possible visual quality is not necessary, - property \l{MaskedBlur::fast}{fast} can be set to true. + the source are blurred more than others. + + Performing blur live is a costly operation. Fullscreen gaussian blur + with even a moderate number of samples will only run at 60 fps on highend + graphics hardware. \table \header @@ -76,7 +76,7 @@ */ Item { - id: rootItem + id: root /*! This property defines the source item that is going to be blurred. @@ -84,7 +84,7 @@ \note It is not supported to let the effect include itself, for instance by setting source to the effect's parent. */ - property variant source + property alias source: blur.source /*! This property defines the item that is controlling the final intensity @@ -97,7 +97,7 @@ blur completely. Semitransparent maskSource pixels produce blur with a radius that is interpolated according to the pixel transparency level. */ - property variant maskSource + property alias maskSource: maskProxy.input /*! This property defines the distance of the neighboring pixels which @@ -125,21 +125,13 @@ \li \b { radius: 8 } \li \b { radius: 16 } \row - \li \l samples: 24 - \li \l samples: 24 - \li \l samples: 24 - \row - \li \l transparentBorder: false - \li \l transparentBorder: false - \li \l transparentBorder: false - \row - \li \l fast: false - \li \l fast: false - \li \l fast: false + \li \l samples: 25 + \li \l samples: 25 + \li \l samples: 25 \endtable */ - property real radius: 0.0 + property alias radius: blur.radius /*! This property defines how many samples are taken per pixel when blur @@ -147,18 +139,15 @@ to render. Ideally, this value should be twice as large as the highest required - radius value, for example, if the radius is animated between 0.0 and - 4.0, samples should be set to 8. + radius value plus 1, for example, if the radius is animated between 0.0 + and 4.0, samples should be set to 9. - The value ranges from 0 to 32. By default, the property is set to \c 0. + By default, the property is set to \c 9. This property is not intended to be animated. Changing this property may cause the underlying OpenGL shaders to be recompiled. - - When \l{MaskedBlur::fast}{fast} property is set to true, this property - has no effect. */ - property int samples: 0 + property alias samples: blur.samples /*! This property allows the effect output pixels to be cached in order to @@ -173,110 +162,56 @@ By default, the property is set to \c false. */ - property bool cached: false + property alias cached: cacheItem.visible /*! - This property selects the blurring algorithm that is used to produce the - blur. Setting this to true enables fast algorithm, setting value to - false produces higher quality result. - - By default, the property is set to \c false. - - \table - \header - \li Output examples with different fast values - \li - \li - \row - \li \image MaskedBlur_fast1.png - \li \image MaskedBlur_fast2.png - \row - \li \b { fast: false } - \li \b { fast: true } - \row - \li \l radius: 16 - \li \l radius: 16 - \row - \li \l samples: 24 - \li \l samples: 24 - \row - \li \l transparentBorder: false - \li \l transparentBorder: false - \endtable + \internal + Kept for source compatibility only. Removed in Qt 5.6 + ### Qt6: remove */ property bool fast: false /*! - This property defines the blur behavior near the edges of the item, - where the pixel blurring is affected by the pixels outside the source - edges. - - If the property is set to \c true, the pixels outside the source are - interpreted to be transparent, which is similar to OpenGL - clamp-to-border extension. The blur is expanded slightly outside the - effect item area. - - If the property is set to \c false, the pixels outside the source are - interpreted to contain the same color as the pixels at the edge of the - item, which is similar to OpenGL clamp-to-edge behavior. The blur does - not expand outside the effect item area. + \internal - By default, the property is set to \c false. + Kept for source compatibility only. Removed in Qt 5.6 - \table - \header - \li Output examples with different transparentBorder values - \li - \li - \row - \li \image MaskedBlur_transparentBorder1.png - \li \image MaskedBlur_transparentBorder2.png - \row - \li \b { transparentBorder: false } - \li \b { transparentBorder: true } - \row - \li \l radius: 64 - \li \l radius: 64 - \row - \li \l samples: 24 - \li \l samples: 24 - \row - \li \l fast: true - \li \l fast: true - \endtable + Doing transparent border on a masked source doesn't make any sense + as the padded exterior will have a mask alpha value of 0 which means + no blurring and as the padded exterior of the source is a transparent + pixel, the result is no pixels at all. + In Qt 5.6 and before, this worked based on that the mask source + was scaled up to fit the padded blur target rect, which would lead + to inconsistent and buggy results. + + ### Qt6: remove */ - property bool transparentBorder: false + property bool transparentBorder; + + GaussianBlur { + id: blur - Loader { - id: loaderItem + source: root.source; anchors.fill: parent - sourceComponent: rootItem.fast ? fastBlur : gaussianBlur - } + _maskSource: maskProxy.output; - Component { - id: gaussianBlur - GaussianMaskedBlur { - anchors.fill: parent - source: rootItem.source - maskSource: rootItem.maskSource - radius: rootItem.radius - maximumRadius: rootItem.samples * 0.5 - transparentBorder: rootItem.transparentBorder - cached: rootItem.cached + SourceProxy { + id: maskProxy } } - Component { - id: fastBlur - FastMaskedBlur { - anchors.fill: parent - source:rootItem. source - maskSource: rootItem.maskSource - blur: Math.pow(rootItem.radius / 64.0, 0.4) - transparentBorder: rootItem.transparentBorder - cached: rootItem.cached - } + ShaderEffectSource { + id: cacheItem + x: -blur._kernelRadius + y: -blur._kernelRadius + width: blur.width + 2 * blur._kernelRadius + height: blur.height + 2 * blur._kernelRadius + visible: false + smooth: true + sourceRect: Qt.rect(-blur._kernelRadius, -blur._kernelRadius, width, height); + sourceItem: blur + hideSource: visible } } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/OpacityMask.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/OpacityMask.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/OpacityMask.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/OpacityMask.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype OpacityMask diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/DropShadowBase.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/DropShadowBase.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/DropShadowBase.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/DropShadowBase.qml 2016-05-10 05:03:30.000000000 +0000 @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Jolla Ltd, author: +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Graphical Effects module. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtGraphicalEffects.private 1.0 +import QtGraphicalEffects 1.0 + +Item { + id: root + + property variant source + property real radius: Math.floor(samples / 2) + property int samples: 9 + property color color: "black" + property real horizontalOffset: 0 + property real verticalOffset: 0 + property real spread: 0.0 + property bool cached: false + property bool transparentBorder: true + + GaussianBlur { + id: blur + width: parent.width + height: parent.height + x: Math.round(horizontalOffset) + y: Math.round(verticalOffset) + source: root.source + radius: root.radius + samples: root.samples + _thickness: root.spread + transparentBorder: root.transparentBorder + + + _color: root.color; + _alphaOnly: true + // ignoreDevicePixelRatio: root.ignoreDevicePixelRatio + + ShaderEffect { + x: blur._outputRect.x - parent.x + y: blur._outputRect.y - parent.y + width: transparentBorder ? blur._outputRect.width : blur.width + height: transparentBorder ? blur._outputRect.height : blur.height + property variant source: blur._output; + } + + } + + ShaderEffectSource { + id: cacheItem + x: -blur._kernelRadius + horizontalOffset + y: -blur._kernelRadius + verticalOffset + width: blur.width + 2 * blur._kernelRadius + height: blur.height + 2 * blur._kernelRadius + visible: root.cached + smooth: true + sourceRect: Qt.rect(-blur._kernelRadius, -blur._kernelRadius, width, height); + sourceItem: blur + hideSource: visible + } + + +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/FastGlow.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/FastGlow.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/FastGlow.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/FastGlow.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtGraphicalEffects.private 1.0 Item { id: rootItem diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/FastInnerShadow.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/FastInnerShadow.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/FastInnerShadow.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/FastInnerShadow.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtGraphicalEffects.private 1.0 Item { id: rootItem diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/FastMaskedBlur.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/FastMaskedBlur.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/FastMaskedBlur.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/FastMaskedBlur.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtGraphicalEffects.private 1.0 Item { id: rootItem diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianDirectionalBlur.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianDirectionalBlur.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianDirectionalBlur.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianDirectionalBlur.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtGraphicalEffects.private 1.0 Item { id: rootItem diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianGlow.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianGlow.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianGlow.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianGlow.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtGraphicalEffects.private 1.0 Item { id: rootItem diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianInnerShadow.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianInnerShadow.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianInnerShadow.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianInnerShadow.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtGraphicalEffects.private 1.0 Item { id: rootItem diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianMaskedBlur.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianMaskedBlur.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianMaskedBlur.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/GaussianMaskedBlur.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtGraphicalEffects.private 1.0 Item { id: rootItem Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/libqtgraphicaleffectsprivate.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/libqtgraphicaleffectsprivate.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/qmldir 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/qmldir 2016-05-10 05:03:30.000000000 +0000 @@ -0,0 +1,11 @@ +module QtGraphicalEffects.private +plugin qtgraphicaleffectsprivate +classname QtGraphicalEffectsPlugin +FastGlow 1.0 FastGlow.qml +FastInnerShadow 1.0 FastInnerShadow.qml +FastMaskedBlur 1.0 FastMaskedBlur.qml +GaussianDirectionalBlur 1.0 GaussianDirectionalBlur.qml +GaussianGlow 1.0 GaussianGlow.qml +GaussianInnerShadow 1.0 GaussianInnerShadow.qml +GaussianMaskedBlur 1.0 GaussianMaskedBlur.qml +DropShadowBase 1.0 DropShadowBase.qml diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/SourceProxy.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/SourceProxy.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/SourceProxy.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/private/SourceProxy.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Graphical Effects module. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -Item { - id: rootItem - property variant input - property variant output - property variant sourceRect - visible: false - - Component.onCompleted: evaluateInput() - - onInputChanged: evaluateInput() - - onSourceRectChanged: evaluateInput() - - function evaluateInput() { - if (input == undefined) { - output = input - } - else if (sourceRect != undefined && sourceRect != Qt.rect(0, 0, 0, 0) && !isQQuickShaderEffectSource(input)) { - proxySource.sourceItem = input - output = proxySource - proxySource.sourceRect = sourceRect - } - else if (isQQuickItemLayerEnabled(input)) { - output = input - } - else if ((isQQuickImage(input) && !hasTileMode(input) && !hasChildren(input))) { - output = input - } - else if (isQQuickShaderEffectSource(input)) { - output = input - } - else { - proxySource.sourceItem = input - output = proxySource - proxySource.sourceRect = Qt.rect(0, 0, 0, 0) - } - } - - function isQQuickItemLayerEnabled(item) { - if (item.hasOwnProperty("layer")) { - var l = item["layer"] - if (l.hasOwnProperty("enabled") && l["enabled"].toString() == "true") - return true - } - return false - } - - function isQQuickImage(item) { - var imageProperties = [ "fillMode", "progress", "asynchronous", "sourceSize", "status", "smooth" ] - return hasProperties(item, imageProperties) - } - - function isQQuickShaderEffectSource(item) { - var shaderEffectSourceProperties = [ "hideSource", "format", "sourceItem", "mipmap", "wrapMode", "live", "recursive", "sourceRect" ] - return hasProperties(item, shaderEffectSourceProperties) - } - - function hasProperties(item, properties) { - var counter = 0 - for (var j = 0; j < properties.length; j++) { - if (item.hasOwnProperty(properties [j])) - counter++ - } - return properties.length == counter - } - - function hasChildren(item) { - if (item.hasOwnProperty("childrenRect")) { - if (item["childrenRect"].toString() != "QRectF(0, 0, 0, 0)") - return true - else - return false - } - return false - } - - function hasTileMode(item) { - if (item.hasOwnProperty("fillMode")) { - if (item["fillMode"].toString() != "0") - return true - else - return false - } - return false - } - - ShaderEffectSource { - id: proxySource - live: rootItem.input != rootItem.output - hideSource: false - smooth: true - visible: false - } -} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/qmldir 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/qmldir 2016-05-10 05:03:30.000000000 +0000 @@ -24,3 +24,4 @@ ThresholdMask 1.0 ThresholdMask.qml ZoomBlur 1.0 ZoomBlur.qml designersupported + diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/RadialBlur.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/RadialBlur.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/RadialBlur.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/RadialBlur.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype RadialBlur @@ -54,8 +54,8 @@ rotating to the direction of the blur. Other available motionblur effects are - \l{QtGraphicalEffects1::ZoomBlur}{ZoomBlur} and - \l{QtGraphicalEffects1::DirectionalBlur}{DirectionalBlur}. + \l{QtGraphicalEffects::ZoomBlur}{ZoomBlur} and + \l{QtGraphicalEffects::DirectionalBlur}{DirectionalBlur}. \table \header @@ -136,8 +136,8 @@ property int samples: 0 /*! - \qmlproperty real QtGraphicalEffects1::RadialBlur::horizontalOffset - \qmlproperty real QtGraphicalEffects1::RadialBlur::verticalOffset + \qmlproperty real QtGraphicalEffects::RadialBlur::horizontalOffset + \qmlproperty real QtGraphicalEffects::RadialBlur::verticalOffset These properties define the offset in pixels for the perceived center point of the rotation. diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/RadialGradient.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/RadialGradient.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/RadialGradient.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/RadialGradient.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype RadialGradient @@ -265,42 +265,61 @@ \row \li \b {gradient:} \code Gradient { - GradientStop { position: 0.000 - color: Qt.rgba(1, 0, 0, 1) } - GradientStop { position: 0.167; - color: Qt.rgba(1, 1, 0, 1) } - GradientStop { position: 0.333; - color: Qt.rgba(0, 1, 0, 1) } - GradientStop { position: 0.500; - color: Qt.rgba(0, 1, 1, 1) } - GradientStop { position: 0.667; - color: Qt.rgba(0, 0, 1, 1) } - GradientStop { position: 0.833; - color: Qt.rgba(1, 0, 1, 1) } - GradientStop { position: 1.000; - color: Qt.rgba(1, 0, 0, 1) } + GradientStop { + position: 0.000 + color: Qt.rgba(1, 0, 0, 1) + } + GradientStop { + position: 0.167 + color: Qt.rgba(1, 1, 0, 1) + } + GradientStop { + position: 0.333 + color: Qt.rgba(0, 1, 0, 1) + } + GradientStop { + position: 0.500 + color: Qt.rgba(0, 1, 1, 1) + } + GradientStop { + position: 0.667 + color: Qt.rgba(0, 0, 1, 1) + } + GradientStop { + position: 0.833 + color: Qt.rgba(1, 0, 1, 1) + } + GradientStop { + position: 1.000 + color: Qt.rgba(1, 0, 0, 1) + } } \endcode \li \b {gradient:} \code Gradient { - GradientStop { position: 0.0 - color: "#F0F0F0" + GradientStop { + position: 0.0 + color: "#F0F0F0" } - GradientStop { position: 0.5 - color: "#000000" + GradientStop { + position: 0.5 + color: "#000000" } - GradientStop { position: 1.0 - color: "#F0F0F0" + GradientStop { + position: 1.0 + color: "#F0F0F0" } } \endcode \li \b {gradient:} \code Gradient { - GradientStop { position: 0.0 + GradientStop { + position: 0.0 color: "#00000000" } - GradientStop { position: 1.0 + GradientStop { + position: 1.0 color: "#FF000000" } } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/RectangularGlow.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/RectangularGlow.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/RectangularGlow.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/RectangularGlow.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype RectangularGlow @@ -52,7 +52,7 @@ This effect is intended to have good performance. The shape of the glow is limited to a rectangle with a custom corner radius. For situations where - custom shapes are required, consider \l {QtGraphicalEffects1::Glow} {Glow} + custom shapes are required, consider \l {QtGraphicalEffects::Glow} {Glow} effect. \table diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/RecursiveBlur.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/RecursiveBlur.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/RecursiveBlur.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/RecursiveBlur.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype RecursiveBlur @@ -52,8 +52,8 @@ The RecursiveBlur effect softens the image by blurring it with an algorithm that uses a recursive feedback loop to blur the source multiple times. The effect may give more blurry results than - \l{QtGraphicalEffects1::GaussianBlur}{GaussianBlur} or - \l{QtGraphicalEffects1::FastBlur}{FastBlur}, but the result is produced + \l{QtGraphicalEffects::GaussianBlur}{GaussianBlur} or + \l{QtGraphicalEffects::FastBlur}{FastBlur}, but the result is produced asynchronously and takes more time. \table diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/ThresholdMask.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/ThresholdMask.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/ThresholdMask.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/ThresholdMask.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype ThresholdMask diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/ZoomBlur.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/ZoomBlur.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtGraphicalEffects/ZoomBlur.qml 2015-06-26 09:53:04.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtGraphicalEffects/ZoomBlur.qml 2016-05-10 05:03:30.000000000 +0000 @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "private" +import QtGraphicalEffects.private 1.0 /*! \qmltype ZoomBlur @@ -52,8 +52,8 @@ Effect creates perceived impression that the source item appears to be moving towards the center point in Z-direction or that the camera appears to be zooming rapidly. Other available motion blur effects are - \l{QtGraphicalEffects1::DirectionalBlur}{DirectionalBlur} - and \l{QtGraphicalEffects1::RadialBlur}{RadialBlur}. + \l{QtGraphicalEffects::DirectionalBlur}{DirectionalBlur} + and \l{QtGraphicalEffects::RadialBlur}{RadialBlur}. \table \header @@ -138,8 +138,8 @@ property int samples: 0 /*! - \qmlproperty real QtGraphicalEffects1::ZoomBlur::horizontalOffset - \qmlproperty real QtGraphicalEffects1::ZoomBlur::verticalOffset + \qmlproperty real QtGraphicalEffects::ZoomBlur::horizontalOffset + \qmlproperty real QtGraphicalEffects::ZoomBlur::verticalOffset These properties define an offset in pixels for the blur direction center point. Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtLocation/libdeclarative_location.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtLocation/libdeclarative_location.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtLocation/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtLocation/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtLocation/plugins.qmltypes 2015-06-26 09:55:15.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtLocation/plugins.qmltypes 2016-05-20 06:00:20.000000000 +0000 @@ -1,12 +1,13 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtLocation 5.5' +// 'qmlplugindump -nonrelocatable QtLocation 5.6' Module { + dependencies: ["QtQuick 2.0"] Component { name: "QDeclarativeCategory" prototype: "QObject" @@ -126,12 +127,7 @@ prototype: "QQuickItem" exports: ["QtLocation/Map 5.0"] exportMetaObjectRevisions: [0] - Property { - name: "gesture" - type: "QDeclarativeGeoMapGestureArea" - isReadonly: true - isPointer: true - } + Property { name: "gesture"; type: "QQuickGeoMapGestureArea"; isReadonly: true; isPointer: true } Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true } Property { name: "minimumZoomLevel"; type: "double" } Property { name: "maximumZoomLevel"; type: "double" } @@ -147,6 +143,8 @@ Property { name: "mapItems"; type: "QList"; isReadonly: true } Property { name: "error"; type: "QGeoServiceProvider::Error"; isReadonly: true } Property { name: "errorString"; type: "string"; isReadonly: true } + Property { name: "visibleRegion"; type: "QGeoShape" } + Property { name: "color"; type: "QColor" } Signal { name: "pluginChanged" Parameter { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true } @@ -163,6 +161,10 @@ name: "copyrightLinkActivated" Parameter { name: "link"; type: "string" } } + Signal { + name: "colorChanged" + Parameter { name: "color"; type: "QColor" } + } Method { name: "removeMapItem" Parameter { name: "item"; type: "QDeclarativeGeoMapItemBase"; isPointer: true } @@ -176,80 +178,32 @@ name: "toCoordinate" type: "QGeoCoordinate" Parameter { name: "position"; type: "QPointF" } + Parameter { name: "clipToViewPort"; type: "bool" } + } + Method { + name: "toCoordinate" + type: "QGeoCoordinate" + Parameter { name: "position"; type: "QPointF" } } Method { name: "fromCoordinate" type: "QPointF" Parameter { name: "coordinate"; type: "QGeoCoordinate" } + Parameter { name: "clipToViewPort"; type: "bool" } } Method { - name: "toScreenPosition" + name: "fromCoordinate" type: "QPointF" Parameter { name: "coordinate"; type: "QGeoCoordinate" } } - Method { - name: "fitViewportToGeoShape" - Parameter { name: "shape"; type: "QVariant" } - } Method { name: "fitViewportToMapItems" } Method { name: "pan" Parameter { name: "dx"; type: "int" } Parameter { name: "dy"; type: "int" } } - Method { name: "cameraStopped" } - } - Component { - name: "QDeclarativeGeoMapGestureArea" - prototype: "QObject" - exports: ["QtLocation/MapGestureArea 5.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - Enum { - name: "ActiveGesture" - values: { - "NoGesture": 0, - "ZoomGesture": 1, - "PanGesture": 2, - "FlickGesture": 4 - } - } - Enum { - name: "ActiveGestures" - values: { - "NoGesture": 0, - "ZoomGesture": 1, - "PanGesture": 2, - "FlickGesture": 4 - } - } - Property { name: "enabled"; type: "bool" } - Property { name: "pinchEnabled"; type: "bool" } - Property { name: "panEnabled"; type: "bool" } - Property { name: "isPinchActive"; type: "bool"; isReadonly: true } - Property { name: "isPanActive"; type: "bool"; isReadonly: true } - Property { name: "activeGestures"; type: "ActiveGestures" } - Property { name: "maximumZoomLevelChange"; type: "double" } - Property { name: "flickDeceleration"; type: "double" } - Signal { name: "panActiveChanged" } - Signal { name: "pinchActiveChanged" } - Signal { - name: "pinchStarted" - Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true } - } - Signal { - name: "pinchUpdated" - Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true } - } - Signal { - name: "pinchFinished" - Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true } - } - Signal { name: "panStarted" } - Signal { name: "panFinished" } - Signal { name: "flickStarted" } - Signal { name: "flickFinished" } - Signal { name: "movementStopped" } + Method { name: "prefetchData" } + Method { name: "clearData" } } Component { name: "QDeclarativeGeoMapItemBase" @@ -269,19 +223,6 @@ Property { name: "autoFitViewport"; type: "bool" } } Component { - name: "QDeclarativeGeoMapPinchEvent" - prototype: "QObject" - exports: ["QtLocation/MapPinchEvent 5.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - Property { name: "center"; type: "QPointF"; isReadonly: true } - Property { name: "angle"; type: "double"; isReadonly: true } - Property { name: "point1"; type: "QPointF"; isReadonly: true } - Property { name: "point2"; type: "QPointF"; isReadonly: true } - Property { name: "pointCount"; type: "int"; isReadonly: true } - Property { name: "accepted"; type: "bool" } - } - Component { name: "QDeclarativeGeoMapQuickItem" defaultProperty: "data" prototype: "QDeclarativeGeoMapItemBase" @@ -354,7 +295,9 @@ "CommunicationError": 2, "ParseError": 3, "UnsupportedOptionError": 4, - "UnknownError": 5 + "UnknownError": 5, + "UnknownParameterError": 100, + "MissingRequiredParameterError": 101 } } Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true } @@ -757,7 +700,9 @@ "ParseError": 3, "UnsupportedOptionError": 4, "CombinationError": 5, - "UnknownError": 6 + "UnknownError": 6, + "UnknownParameterError": 100, + "MissingRequiredParameterError": 101 } } Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true } @@ -961,14 +906,39 @@ isReadonly: true isPointer: true } + Method { name: "pathLength"; type: "int" } Method { name: "addCoordinate" Parameter { name: "coordinate"; type: "QGeoCoordinate" } } Method { + name: "insertCoordinate" + Parameter { name: "index"; type: "int" } + Parameter { name: "coordinate"; type: "QGeoCoordinate" } + } + Method { + name: "replaceCoordinate" + Parameter { name: "index"; type: "int" } + Parameter { name: "coordinate"; type: "QGeoCoordinate" } + } + Method { + name: "coordinateAt" + type: "QGeoCoordinate" + Parameter { name: "index"; type: "int" } + } + Method { + name: "containsCoordinate" + type: "bool" + Parameter { name: "coordinate"; type: "QGeoCoordinate" } + } + Method { name: "removeCoordinate" Parameter { name: "coordinate"; type: "QGeoCoordinate" } } + Method { + name: "removeCoordinate" + Parameter { name: "index"; type: "int" } + } } Component { name: "QDeclarativeRatings" @@ -1017,16 +987,10 @@ Component { name: "QDeclarativeRouteMapItem" defaultProperty: "data" - prototype: "QDeclarativeGeoMapItemBase" + prototype: "QDeclarativePolylineMapItem" exports: ["QtLocation/MapRoute 5.0"] exportMetaObjectRevisions: [0] Property { name: "route"; type: "QDeclarativeGeoRoute"; isPointer: true } - Property { - name: "line" - type: "QDeclarativeMapLineProperties" - isReadonly: true - isPointer: true - } Signal { name: "routeChanged" Parameter { name: "route"; type: "const QDeclarativeGeoRoute"; isPointer: true } @@ -1153,6 +1117,19 @@ Method { name: "errorString"; type: "string" } } Component { + name: "QGeoMapPinchEvent" + prototype: "QObject" + exports: ["QtLocation/MapPinchEvent 5.0"] + isCreatable: false + exportMetaObjectRevisions: [0] + Property { name: "center"; type: "QPointF"; isReadonly: true } + Property { name: "angle"; type: "double"; isReadonly: true } + Property { name: "point1"; type: "QPointF"; isReadonly: true } + Property { name: "point2"; type: "QPointF"; isReadonly: true } + Property { name: "pointCount"; type: "int"; isReadonly: true } + Property { name: "accepted"; type: "bool" } + } + Component { name: "QQmlPropertyMap" prototype: "QObject" exports: ["QtLocation/ExtendedAttributes 5.0"] @@ -1165,4 +1142,56 @@ } Method { name: "keys"; type: "QStringList" } } + Component { + name: "QQuickGeoMapGestureArea" + defaultProperty: "data" + prototype: "QQuickItem" + exports: [ + "QtLocation/MapGestureArea 5.0", + "QtLocation/MapGestureArea 5.6" + ] + isCreatable: false + exportMetaObjectRevisions: [0, 1] + Enum { + name: "GeoMapGesture" + values: { + "NoGesture": 0, + "PinchGesture": 1, + "PanGesture": 2, + "FlickGesture": 4 + } + } + Enum { + name: "AcceptedGestures" + values: { + "NoGesture": 0, + "PinchGesture": 1, + "PanGesture": 2, + "FlickGesture": 4 + } + } + Property { name: "enabled"; type: "bool" } + Property { name: "pinchActive"; type: "bool"; isReadonly: true } + Property { name: "panActive"; type: "bool"; isReadonly: true } + Property { name: "acceptedGestures"; type: "AcceptedGestures" } + Property { name: "maximumZoomLevelChange"; type: "double" } + Property { name: "flickDeceleration"; type: "double" } + Property { name: "preventStealing"; revision: 1; type: "bool" } + Signal { + name: "pinchStarted" + Parameter { name: "pinch"; type: "QGeoMapPinchEvent"; isPointer: true } + } + Signal { + name: "pinchUpdated" + Parameter { name: "pinch"; type: "QGeoMapPinchEvent"; isPointer: true } + } + Signal { + name: "pinchFinished" + Parameter { name: "pinch"; type: "QGeoMapPinchEvent"; isPointer: true } + } + Signal { name: "panStarted" } + Signal { name: "panFinished" } + Signal { name: "flickStarted" } + Signal { name: "flickFinished" } + } } Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtMultimedia/libdeclarative_multimedia.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtMultimedia/libdeclarative_multimedia.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtMultimedia/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtMultimedia/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtMultimedia/plugins.qmltypes 2015-06-30 10:13:47.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtMultimedia/plugins.qmltypes 2016-05-31 10:23:00.000000000 +0000 @@ -1,12 +1,13 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtMultimedia 5.5' +// 'qmlplugindump -nonrelocatable QtMultimedia 5.6' Module { + dependencies: ["QtQuick 2.0"] Component { name: "QAbstractVideoFilter" prototype: "QObject" @@ -145,8 +146,13 @@ Component { name: "QDeclarativeAudio" prototype: "QObject" - exports: ["QtMultimedia/Audio 5.0", "QtMultimedia/MediaPlayer 5.0"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtMultimedia/Audio 5.0", + "QtMultimedia/Audio 5.6", + "QtMultimedia/MediaPlayer 5.0", + "QtMultimedia/MediaPlayer 5.6" + ] + exportMetaObjectRevisions: [0, 1, 0, 1] Enum { name: "Status" values: { @@ -195,7 +201,23 @@ "ResourceMissing": 3 } } + Enum { + name: "AudioRole" + values: { + "UnknownRole": 0, + "AccessibilityRole": 7, + "AlarmRole": 4, + "GameRole": 9, + "MusicRole": 1, + "NotificationRole": 5, + "RingtoneRole": 6, + "SonificationRole": 8, + "VideoRole": 2, + "VoiceCommunicationRole": 3 + } + } Property { name: "source"; type: "QUrl" } + Property { name: "playlist"; revision: 1; type: "QDeclarativePlaylist"; isPointer: true } Property { name: "loops"; type: "int" } Property { name: "playbackState"; type: "PlaybackState"; isReadonly: true } Property { name: "autoPlay"; type: "bool" } @@ -220,10 +242,13 @@ } Property { name: "mediaObject"; type: "QObject"; isReadonly: true; isPointer: true } Property { name: "availability"; type: "Availability"; isReadonly: true } + Property { name: "audioRole"; revision: 1; type: "AudioRole" } + Signal { name: "playlistChanged"; revision: 1 } Signal { name: "loopCountChanged" } Signal { name: "paused" } Signal { name: "stopped" } Signal { name: "playing" } + Signal { name: "audioRoleChanged"; revision: 1 } Signal { name: "availabilityChanged" Parameter { name: "availability"; type: "Availability" } @@ -240,12 +265,17 @@ name: "seek" Parameter { name: "position"; type: "int" } } + Method { name: "supportedAudioRoles"; revision: 1; type: "QJSValue" } } Component { name: "QDeclarativeCamera" prototype: "QObject" - exports: ["QtMultimedia/Camera 5.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtMultimedia/Camera 5.0", + "QtMultimedia/Camera 5.4", + "QtMultimedia/Camera 5.5" + ] + exportMetaObjectRevisions: [0, 1, 2] Enum { name: "Position" values: { @@ -517,7 +547,7 @@ name: "supportedViewfinderFrameRateRanges" revision: 2 type: "QJSValue" - Parameter { name: "resolution"; type: "QSize" } + Parameter { name: "resolution"; type: "QJSValue" } } Method { name: "supportedViewfinderFrameRateRanges"; revision: 2; type: "QJSValue" } } @@ -1210,6 +1240,137 @@ Property { name: "availableCameras"; type: "QJSValue"; isReadonly: true } } Component { + name: "QDeclarativePlaylist" + defaultProperty: "items" + prototype: "QAbstractListModel" + exports: ["QtMultimedia/Playlist 5.6"] + exportMetaObjectRevisions: [0] + Enum { + name: "PlaybackMode" + values: { + "CurrentItemOnce": 0, + "CurrentItemInLoop": 1, + "Sequential": 2, + "Loop": 3, + "Random": 4 + } + } + Enum { + name: "Error" + values: { + "NoError": 0, + "FormatError": 1, + "FormatNotSupportedError": 2, + "NetworkError": 3, + "AccessDeniedError": 4 + } + } + Property { name: "playbackMode"; type: "PlaybackMode" } + Property { name: "currentItemSource"; type: "QUrl"; isReadonly: true } + Property { name: "currentIndex"; type: "int" } + Property { name: "itemCount"; type: "int"; isReadonly: true } + Property { name: "readOnly"; type: "bool"; isReadonly: true } + Property { name: "error"; type: "Error"; isReadonly: true } + Property { name: "errorString"; type: "string"; isReadonly: true } + Property { name: "items"; type: "QDeclarativePlaylistItem"; isList: true; isReadonly: true } + Signal { + name: "itemAboutToBeInserted" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Signal { + name: "itemInserted" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Signal { + name: "itemAboutToBeRemoved" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Signal { + name: "itemRemoved" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Signal { + name: "itemChanged" + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + } + Signal { name: "loaded" } + Signal { name: "loadFailed" } + Signal { + name: "error" + Parameter { name: "error"; type: "QDeclarativePlaylist::Error" } + Parameter { name: "errorString"; type: "string" } + } + Method { + name: "itemSource" + type: "QUrl" + Parameter { name: "index"; type: "int" } + } + Method { + name: "nextIndex" + type: "int" + Parameter { name: "steps"; type: "int" } + } + Method { name: "nextIndex"; type: "int" } + Method { + name: "previousIndex" + type: "int" + Parameter { name: "steps"; type: "int" } + } + Method { name: "previousIndex"; type: "int" } + Method { name: "next" } + Method { name: "previous" } + Method { name: "shuffle" } + Method { + name: "load" + Parameter { name: "location"; type: "QUrl" } + Parameter { name: "format"; type: "string" } + } + Method { + name: "load" + Parameter { name: "location"; type: "QUrl" } + } + Method { + name: "save" + type: "bool" + Parameter { name: "location"; type: "QUrl" } + Parameter { name: "format"; type: "string" } + } + Method { + name: "save" + type: "bool" + Parameter { name: "location"; type: "QUrl" } + } + Method { + name: "addItem" + type: "bool" + Parameter { name: "source"; type: "QUrl" } + } + Method { + name: "insertItem" + type: "bool" + Parameter { name: "index"; type: "int" } + Parameter { name: "source"; type: "QUrl" } + } + Method { + name: "removeItem" + type: "bool" + Parameter { name: "index"; type: "int" } + } + Method { name: "clear"; type: "bool" } + } + Component { + name: "QDeclarativePlaylistItem" + prototype: "QObject" + exports: ["QtMultimedia/PlaylistItem 5.6"] + exportMetaObjectRevisions: [0] + Property { name: "source"; type: "QUrl" } + } + Component { name: "QDeclarativeRadio" prototype: "QObject" exports: ["QtMultimedia/Radio 5.0"] @@ -1497,8 +1658,11 @@ name: "QDeclarativeVideoOutput" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtMultimedia/VideoOutput 5.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtMultimedia/VideoOutput 5.0", + "QtMultimedia/VideoOutput 5.2" + ] + exportMetaObjectRevisions: [0, 2] Enum { name: "FillMode" values: { diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtMultimedia/Video.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtMultimedia/Video.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtMultimedia/Video.qml 2015-06-30 10:13:47.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtMultimedia/Video.qml 2016-05-31 10:23:00.000000000 +0000 @@ -32,7 +32,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtMultimedia 5.0 +import QtMultimedia 5.6 /*! \qmltype Video @@ -48,9 +48,6 @@ types. \qml - import QtQuick 2.0 - import QtMultimedia 5.0 - Video { id: video width : 800 @@ -239,7 +236,15 @@ */ property alias hasVideo: player.hasVideo - /* documented below due to length of metaData documentation */ + /*! + \qmlproperty object Video::metaData + + This property holds the meta data for the current media. + + See \l{MediaPlayer::metaData}{MediaPlayer.metaData} for details about each meta data key. + + \sa {QMediaMetaData} + */ property alias metaData: player.metaData /*! @@ -269,6 +274,35 @@ property alias position: player.position /*! + \qmlproperty enumeration Video::audioRole + + This property holds the role of the audio stream. It can be set to specify the type of audio + being played, allowing the system to make appropriate decisions when it comes to volume, + routing or post-processing. + + The audio role must be set before setting the source property. + + Supported values can be retrieved with supportedAudioRoles(). + + The value can be one of: + \list + \li MediaPlayer.UnknownRole - the role is unknown or undefined. + \li MediaPlayer.MusicRole - music. + \li MediaPlayer.VideoRole - soundtrack from a movie or a video. + \li MediaPlayer.VoiceCommunicationRole - voice communications, such as telephony. + \li MediaPlayer.AlarmRole - alarm. + \li MediaPlayer.NotificationRole - notification, such as an incoming e-mail or a chat request. + \li MediaPlayer.RingtoneRole - ringtone. + \li MediaPlayer.AccessibilityRole - for accessibility, such as with a screen reader. + \li MediaPlayer.SonificationRole - sonification, such as with user interface sounds. + \li MediaPlayer.GameRole - game audio. + \endlist + + \since 5.6 + */ + property alias audioRole: player.audioRole + + /*! \qmlproperty bool Video::seekable This property holds whether the playback position of the video can be @@ -282,10 +316,23 @@ \qmlproperty url Video::source This property holds the source URL of the media. + + Setting the \l source property clears the current \l playlist, if any. */ property alias source: player.source /*! + \qmlproperty Playlist Video::playlist + + This property holds the playlist used by the media player. + + Setting the \l playlist property resets the \l source to an empty string. + + \since 5.6 + */ + property alias playlist: player.playlist + + /*! \qmlproperty enumeration Video::status This property holds the status of media loading. It can be one of: @@ -402,541 +449,18 @@ player.seek(offset); } -} - -// *************************************** -// Documentation for meta-data properties. -// *************************************** - -/*! - \qmlproperty variant Video::metaData - - This property holds a collection of all the meta-data for the media. - - You can access individual properties like \l {Video::metaData.title}{metaData.title} - or \l {Video::metaData.trackNumber} {metaData.trackNumber}. -*/ - -/*! - \qmlproperty variant Video::metaData.title - - This property holds the title of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.subTitle - - This property holds the sub-title of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.author - - This property holds the author of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.comment - - This property holds a user comment about the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.description - - This property holds a description of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.category - - This property holds the category of the media - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.genre - - This property holds the genre of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.year - - This property holds the year of release of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.date - - This property holds the date of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.userRating - - This property holds a user rating of the media in the range of 0 to 100. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.keywords - - This property holds a list of keywords describing the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.language - - This property holds the language of the media, as an ISO 639-2 code. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.publisher - - This property holds the publisher of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.copyright - - This property holds the media's copyright notice. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.parentalRating - - This property holds the parental rating of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.ratingOrganization - - This property holds the name of the rating organization responsible for the - parental rating of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.size - - This property property holds the size of the media in bytes. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.mediaType - - This property holds the type of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.audioBitRate - - This property holds the bit rate of the media's audio stream in bits per - second. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.audioCodec - - This property holds the encoding of the media audio stream. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.averageLevel - - This property holds the average volume level of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.channelCount - - This property holds the number of channels in the media's audio stream. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.peakValue - - This property holds the peak volume of the media's audio stream. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.sampleRate - - This property holds the sample rate of the media's audio stream in Hertz. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.albumTitle - - This property holds the title of the album the media belongs to. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.albumArtist - - This property holds the name of the principal artist of the album the media - belongs to. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.contributingArtist - - This property holds the names of artists contributing to the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.composer - - This property holds the composer of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.conductor - - This property holds the conductor of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.lyrics - - This property holds the lyrics to the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.mood - - This property holds the mood of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.trackNumber - - This property holds the track number of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.trackCount - - This property holds the number of track on the album containing the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.coverArtUrlSmall - - This property holds the URL of a small cover art image. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.coverArtUrlLarge - - This property holds the URL of a large cover art image. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.resolution - - This property holds the dimension of an image or video. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.pixelAspectRatio - - This property holds the pixel aspect ratio of an image or video. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.videoFrameRate - - This property holds the frame rate of the media's video stream. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.videoBitRate - - This property holds the bit rate of the media's video stream in bits per - second. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.videoCodec - - This property holds the encoding of the media's video stream. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.posterUrl - - This property holds the URL of a poster image. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.chapterNumber - - This property holds the chapter number of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.director - - This property holds the director of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.leadPerformer - - This property holds the lead performer in the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.writer - - This property holds the writer of the media. - - \sa {QMediaMetaData} -*/ - -// The remaining properties are related to photos, and are technically -// available but will certainly never have values. - -/*! - \qmlproperty variant Video::metaData.cameraManufacturer - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.cameraModel - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.event - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.subject - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.orientation - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.exposureTime - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.fNumber - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.exposureProgram - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.isoSpeedRatings - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.exposureBiasValue - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.dateTimeDigitized - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.subjectDistance - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.meteringMode - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.lightSource - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.flash - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.focalLength - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.exposureMode - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.whiteBalance - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.DigitalZoomRatio - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.focalLengthIn35mmFilm - - \sa {QMediaMetaData::FocalLengthIn35mmFile} -*/ - -/*! - \qmlproperty variant Video::metaData.sceneCaptureType - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.gainControl - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.contrast - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.saturation - - \sa {QMediaMetaData} -*/ + /*! + \qmlmethod list Video::supportedAudioRoles() -/*! - \qmlproperty variant Video::metaData.sharpness + Returns a list of supported audio roles. - \sa {QMediaMetaData} -*/ + If setting the audio role is not supported, an empty list is returned. -/*! - \qmlproperty variant Video::metaData.deviceSettingDescription - - \sa {QMediaMetaData} -*/ + \since 5.6 + \sa audioRole + */ + function supportedAudioRoles() { + return player.supportedAudioRoles(); + } +} Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtNfc/libdeclarative_nfc.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtNfc/libdeclarative_nfc.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtNfc/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtNfc/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtNfc/plugins.qmltypes 2015-06-26 09:53:38.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtNfc/plugins.qmltypes 2016-05-23 05:58:18.000000000 +0000 @@ -1,12 +1,13 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtNfc 5.5' +// 'qmlplugindump -nonrelocatable QtNfc 5.6' Module { + dependencies: ["QtQuick 2.0"] Component { name: "QDeclarativeNdefFilter" prototype: "QObject" @@ -56,9 +57,10 @@ "QtNfc/NearField 5.0", "QtNfc/NearField 5.2", "QtNfc/NearField 5.4", - "QtNfc/NearField 5.5" + "QtNfc/NearField 5.5", + "QtNfc/NearField 5.6" ] - exportMetaObjectRevisions: [0, 0, 0, 1] + exportMetaObjectRevisions: [0, 0, 0, 1, 1] Property { name: "messageRecords"; type: "QQmlNdefRecord"; isList: true; isReadonly: true } Property { name: "filter"; type: "QDeclarativeNdefFilter"; isList: true; isReadonly: true } Property { name: "orderMatch"; type: "bool" } Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtPositioning/libdeclarative_positioning.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtPositioning/libdeclarative_positioning.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtPositioning/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtPositioning/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtPositioning/plugins.qmltypes 2015-06-26 09:55:15.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtPositioning/plugins.qmltypes 2016-05-20 06:00:20.000000000 +0000 @@ -1,12 +1,13 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtPositioning 5.5' +// 'qmlplugindump -nonrelocatable QtPositioning 5.6' Module { + dependencies: ["QtQuick 2.0"] Component { name: "LocationSingleton" prototype: "QObject" @@ -60,6 +61,16 @@ type: "QGeoCircle" Parameter { name: "center"; type: "QGeoCoordinate" } } + Method { + name: "shapeToCircle" + type: "QGeoCircle" + Parameter { name: "shape"; type: "QGeoShape" } + } + Method { + name: "shapeToRectangle" + type: "QGeoRectangle" + Parameter { name: "shape"; type: "QGeoShape" } + } } Component { name: "QDeclarativeGeoAddress" @@ -79,14 +90,6 @@ Property { name: "isTextGenerated"; type: "bool"; isReadonly: true } } Component { - name: "QDeclarativeGeoCoordinateAnimation" - prototype: "QQuickPropertyAnimation" - exports: ["QtPositioning/CoordinateAnimation 5.3"] - exportMetaObjectRevisions: [0] - Property { name: "from"; type: "QGeoCoordinate" } - Property { name: "to"; type: "QGeoCoordinate" } - } - Component { name: "QDeclarativeGeoLocation" prototype: "QObject" exports: ["QtPositioning/Location 5.0"] @@ -103,7 +106,7 @@ "QtPositioning/Position 5.0", "QtPositioning/Position 5.3", "QtPositioning/Position 5.4", - "QtPositioning/Position 5.5" + "QtPositioning/Position 5.6" ] exportMetaObjectRevisions: [0, 1, 2, 2] Property { name: "latitudeValid"; type: "bool"; isReadonly: true } @@ -201,4 +204,21 @@ } Method { name: "toString"; type: "string" } } + Component { + name: "QQuickGeoCoordinateAnimation" + prototype: "QQuickPropertyAnimation" + exports: ["QtPositioning/CoordinateAnimation 5.3"] + exportMetaObjectRevisions: [0] + Enum { + name: "Direction" + values: { + "Shortest": 0, + "West": 1, + "East": 2 + } + } + Property { name: "from"; type: "QGeoCoordinate" } + Property { name: "to"; type: "QGeoCoordinate" } + Property { name: "direction"; type: "Direction" } + } } Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQml/Models.2/libmodelsplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQml/Models.2/libmodelsplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQml/Models.2/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQml/Models.2/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQml/Models.2/plugins.qmltypes 2015-06-30 10:17:20.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQml/Models.2/plugins.qmltypes 2016-06-16 09:26:11.000000000 +0000 @@ -1,12 +1,13 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQml.Models 2.2' +// 'qmlplugindump -nonrelocatable QtQml.Models 2.3' Module { + dependencies: [] Component { name: "QAbstractItemModel" prototype: "QObject" @@ -527,10 +528,55 @@ name: "QQmlObjectModel" defaultProperty: "children" prototype: "QQmlInstanceModel" - exports: ["QtQml.Models/ObjectModel 2.1"] - exportMetaObjectRevisions: [0] + exports: [ + "QtQml.Models/ObjectModel 2.1", + "QtQml.Models/ObjectModel 2.3" + ] + exportMetaObjectRevisions: [0, 3] attachedType: "QQmlObjectModelAttached" Property { name: "children"; type: "QObject"; isList: true; isReadonly: true } + Method { name: "clear"; revision: 3 } + Method { + name: "get" + revision: 3 + type: "QObject*" + Parameter { name: "index"; type: "int" } + } + Method { + name: "append" + revision: 3 + Parameter { name: "object"; type: "QObject"; isPointer: true } + } + Method { + name: "insert" + revision: 3 + Parameter { name: "index"; type: "int" } + Parameter { name: "object"; type: "QObject"; isPointer: true } + } + Method { + name: "move" + revision: 3 + Parameter { name: "from"; type: "int" } + Parameter { name: "to"; type: "int" } + Parameter { name: "n"; type: "int" } + } + Method { + name: "move" + revision: 3 + Parameter { name: "from"; type: "int" } + Parameter { name: "to"; type: "int" } + } + Method { + name: "remove" + revision: 3 + Parameter { name: "index"; type: "int" } + Parameter { name: "n"; type: "int" } + } + Method { + name: "remove" + revision: 3 + Parameter { name: "index"; type: "int" } + } } Component { name: "QQmlObjectModelAttached" diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQml/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQml/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQml/plugins.qmltypes 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQml/plugins.qmltypes 2016-06-16 09:26:11.000000000 +0000 @@ -0,0 +1,222 @@ +import QtQuick.tooling 1.2 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. +// +// This file was auto-generated by: +// 'qmlplugindump -nonrelocatable QtQml 2.2' + +Module { + dependencies: [] + Component { + name: "QObject" + exports: ["QtQml/QtObject 2.0"] + exportMetaObjectRevisions: [0] + Property { name: "objectName"; type: "string" } + Signal { + name: "objectNameChanged" + Parameter { name: "objectName"; type: "string" } + } + Method { name: "toString" } + Method { name: "destroy" } + Method { + name: "destroy" + Parameter { name: "delay"; type: "int" } + } + } + Component { + name: "QQmlBind" + prototype: "QObject" + exports: ["QtQml/Binding 2.0"] + exportMetaObjectRevisions: [0] + Property { name: "target"; type: "QObject"; isPointer: true } + Property { name: "property"; type: "string" } + Property { name: "value"; type: "QVariant" } + Property { name: "when"; type: "bool" } + } + Component { + name: "QQmlComponent" + prototype: "QObject" + exports: ["QML/Component 1.0", "QtQml/Component 2.0"] + exportMetaObjectRevisions: [0, 0] + attachedType: "QQmlComponentAttached" + Enum { + name: "CompilationMode" + values: { + "PreferSynchronous": 0, + "Asynchronous": 1 + } + } + Enum { + name: "Status" + values: { + "Null": 0, + "Ready": 1, + "Loading": 2, + "Error": 3 + } + } + Property { name: "progress"; type: "double"; isReadonly: true } + Property { name: "status"; type: "Status"; isReadonly: true } + Property { name: "url"; type: "QUrl"; isReadonly: true } + Signal { + name: "statusChanged" + Parameter { type: "QQmlComponent::Status" } + } + Signal { + name: "progressChanged" + Parameter { type: "double" } + } + Method { + name: "loadUrl" + Parameter { name: "url"; type: "QUrl" } + } + Method { + name: "loadUrl" + Parameter { name: "url"; type: "QUrl" } + Parameter { name: "mode"; type: "CompilationMode" } + } + Method { + name: "setData" + Parameter { type: "QByteArray" } + Parameter { name: "baseUrl"; type: "QUrl" } + } + Method { name: "errorString"; type: "string" } + } + Component { + name: "QQmlComponentAttached" + prototype: "QObject" + Signal { name: "completed" } + Signal { name: "destruction" } + } + Component { + name: "QQmlConnections" + prototype: "QObject" + exports: ["QtQml/Connections 2.0"] + exportMetaObjectRevisions: [0] + Property { name: "target"; type: "QObject"; isPointer: true } + Property { name: "ignoreUnknownSignals"; type: "bool" } + } + Component { + name: "QQmlInstanceModel" + prototype: "QObject" + Property { name: "count"; type: "int"; isReadonly: true } + Signal { + name: "modelUpdated" + Parameter { name: "changeSet"; type: "QQmlChangeSet" } + Parameter { name: "reset"; type: "bool" } + } + Signal { + name: "createdItem" + Parameter { name: "index"; type: "int" } + Parameter { name: "object"; type: "QObject"; isPointer: true } + } + Signal { + name: "initItem" + Parameter { name: "index"; type: "int" } + Parameter { name: "object"; type: "QObject"; isPointer: true } + } + Signal { + name: "destroyingItem" + Parameter { name: "object"; type: "QObject"; isPointer: true } + } + } + Component { + name: "QQmlInstantiator" + defaultProperty: "delegate" + prototype: "QObject" + exports: ["QtQml/Instantiator 2.1"] + exportMetaObjectRevisions: [0] + Property { name: "active"; type: "bool" } + Property { name: "asynchronous"; type: "bool" } + Property { name: "model"; type: "QVariant" } + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "object"; type: "QObject"; isReadonly: true; isPointer: true } + Signal { + name: "objectAdded" + Parameter { name: "index"; type: "int" } + Parameter { name: "object"; type: "QObject"; isPointer: true } + } + Signal { + name: "objectRemoved" + Parameter { name: "index"; type: "int" } + Parameter { name: "object"; type: "QObject"; isPointer: true } + } + Method { + name: "objectAt" + type: "QObject*" + Parameter { name: "index"; type: "int" } + } + } + Component { + name: "QQmlLocale" + exports: ["QtQml/Locale 2.2"] + isCreatable: false + exportMetaObjectRevisions: [0] + Enum { + name: "MeasurementSystem" + values: { + "MetricSystem": 0, + "ImperialSystem": 1, + "ImperialUSSystem": 1, + "ImperialUKSystem": 2 + } + } + Enum { + name: "FormatType" + values: { + "LongFormat": 0, + "ShortFormat": 1, + "NarrowFormat": 2 + } + } + Enum { + name: "CurrencySymbolFormat" + values: { + "CurrencyIsoCode": 0, + "CurrencySymbol": 1, + "CurrencyDisplayName": 2 + } + } + Enum { + name: "DayOfWeek" + values: { + "Sunday": 0, + "Monday": 1, + "Tuesday": 2, + "Wednesday": 3, + "Thursday": 4, + "Friday": 5, + "Saturday": 6 + } + } + } + Component { + name: "QQmlTimer" + prototype: "QObject" + exports: ["QtQml/Timer 2.0"] + exportMetaObjectRevisions: [0] + Property { name: "interval"; type: "int" } + Property { name: "running"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "triggeredOnStart"; type: "bool" } + Property { name: "parent"; type: "QObject"; isReadonly: true; isPointer: true } + Signal { name: "triggered" } + Method { name: "start" } + Method { name: "stop" } + Method { name: "restart" } + } + Component { + name: "QQuickMouseEvent" + prototype: "QObject" + Property { name: "x"; type: "double"; isReadonly: true } + Property { name: "y"; type: "double"; isReadonly: true } + Property { name: "button"; type: "int"; isReadonly: true } + Property { name: "buttons"; type: "int"; isReadonly: true } + Property { name: "modifiers"; type: "int"; isReadonly: true } + Property { name: "wasHeld"; type: "bool"; isReadonly: true } + Property { name: "isClick"; type: "bool"; isReadonly: true } + Property { name: "accepted"; type: "bool" } + } +} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQml/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/QtQml/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQml/qmldir 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQml/qmldir 2016-06-16 09:26:11.000000000 +0000 @@ -0,0 +1,2 @@ +module QtQml +typeinfo plugins.qmltypes Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQml/StateMachine/libqtqmlstatemachine.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQml/StateMachine/libqtqmlstatemachine.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQml/StateMachine/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQml/StateMachine/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQml/StateMachine/plugins.qmltypes 2015-06-30 10:17:19.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQml/StateMachine/plugins.qmltypes 2016-06-16 09:26:11.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. @@ -7,6 +7,7 @@ // 'qmlplugindump -nonrelocatable QtQml.StateMachine 1.0' Module { + dependencies: [] Component { name: "FinalState" defaultProperty: "children" @@ -32,9 +33,17 @@ Component { name: "QAbstractTransition" prototype: "QObject" + Enum { + name: "TransitionType" + values: { + "ExternalTransition": 0, + "InternalTransition": 1 + } + } Property { name: "sourceState"; type: "QState"; isReadonly: true; isPointer: true } Property { name: "targetState"; type: "QAbstractState"; isPointer: true } Property { name: "targetStates"; type: "QList" } + Property { name: "transitionType"; revision: 1; type: "TransitionType" } Signal { name: "triggered" } } Component { name: "QFinalState"; prototype: "QAbstractState" } @@ -51,6 +60,7 @@ } } Property { name: "defaultState"; type: "QAbstractState"; isPointer: true } + Property { name: "defaultTransition"; type: "QAbstractTransition"; isPointer: true } Property { name: "historyType"; type: "HistoryType" } } Component { diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/ApplicationWindow.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/ApplicationWindow.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/ApplicationWindow.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/ApplicationWindow.qml 2016-05-24 04:32:21.000000000 +0000 @@ -45,6 +45,7 @@ \since 5.1 \inqmlmodule QtQuick.Controls \ingroup applicationwindow + \ingroup controls \brief Provides a top-level application window. \image applicationwindow.png @@ -231,7 +232,7 @@ } Binding { target: menuBar; property: "__parentWindow"; value: root } - Keys.forwardTo: menuBar ? [menuBar.__contentItem] : [] + Keys.forwardTo: menuBar ? [menuBar.__contentItem, __panel] : [] ContentItem { id: contentArea diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/ComboBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/ComboBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/ComboBox.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/ComboBox.qml 2016-05-24 04:32:21.000000000 +0000 @@ -145,6 +145,50 @@ */ property alias editText: input.text + /*! \qmlproperty enumeration ComboBox::inputMethodHints + \since QtQuick.Controls 1.5 + Provides hints to the input method about the expected content of the combo box and how it + should operate. + + The value is a bit-wise combination of flags or \c Qt.ImhNone if no hints are set. + + Flags that alter behavior are: + + \list + \li Qt.ImhHiddenText - Characters should be hidden, as is typically used when entering passwords. + \li Qt.ImhSensitiveData - Typed text should not be stored by the active input method + in any persistent storage like predictive user dictionary. + \li Qt.ImhNoAutoUppercase - The input method should not try to automatically switch to upper case + when a sentence ends. + \li Qt.ImhPreferNumbers - Numbers are preferred (but not required). + \li Qt.ImhPreferUppercase - Upper case letters are preferred (but not required). + \li Qt.ImhPreferLowercase - Lower case letters are preferred (but not required). + \li Qt.ImhNoPredictiveText - Do not use predictive text (i.e. dictionary lookup) while typing. + + \li Qt.ImhDate - The text editor functions as a date field. + \li Qt.ImhTime - The text editor functions as a time field. + \endlist + + Flags that restrict input (exclusive flags) are: + + \list + \li Qt.ImhDigitsOnly - Only digits are allowed. + \li Qt.ImhFormattedNumbersOnly - Only number input is allowed. This includes decimal point and minus sign. + \li Qt.ImhUppercaseOnly - Only upper case letter input is allowed. + \li Qt.ImhLowercaseOnly - Only lower case letter input is allowed. + \li Qt.ImhDialableCharactersOnly - Only characters suitable for phone dialing are allowed. + \li Qt.ImhEmailCharactersOnly - Only characters suitable for email addresses are allowed. + \li Qt.ImhUrlCharactersOnly - Only characters suitable for URLs are allowed. + \endlist + + Masks: + + \list + \li Qt.ImhExclusiveInputMask - This mask yields nonzero if any of the exclusive flags are used. + \endlist + */ + property alias inputMethodHints: input.inputMethodHints + /*! This property specifies whether the combobox should gain active focus when pressed. The default value is \c false. */ property bool activeFocusOnPress: false @@ -289,11 +333,12 @@ \qmlsignal ComboBox::activated(int index) \since QtQuick.Controls 1.1 - \a index is the triggered model index or -1 if a new string is accepted - This signal is similar to currentIndex changed, but will only - be emitted if the combo box index was changed by the user and not - when set programatically. + be emitted if the combo box index was changed by the user, not + when set programmatically. + + \a index is the activated model index, or \c -1 if a new string is + accepted. The corresponding handler is \c onActivated. */ @@ -510,6 +555,8 @@ onTextRoleChanged: popup.resolveTextValue(textRole) + ExclusiveGroup { id: eg } + Menu { id: popup objectName: "popup" @@ -517,7 +564,7 @@ style: isPopup ? __style.__popupStyle : __style.__dropDownStyle property string currentText: selectedText - onSelectedTextChanged: if (selectedText) popup.currentText = selectedText + onSelectedTextChanged: popup.currentText = selectedText property string selectedText on__SelectedIndexChanged: { @@ -535,8 +582,6 @@ __minimumWidth: comboBox.width __visualItem: comboBox - property ExclusiveGroup eg: ExclusiveGroup { id: eg } - property bool modelIsArray: false Instantiator { @@ -625,8 +670,7 @@ function toggleShow() { if (popup.__popupVisible) { - popup.__dismissMenu() - popup.__destroyAllMenuPopups() + popup.__dismissAndDestroy() } else { if (items[__selectedIndex]) items[__selectedIndex].checked = true @@ -642,7 +686,7 @@ var selectedItem; if (__selectedIndex !== -1 && (selectedItem = items[__selectedIndex])) { input.editTextMatches = true - selectedText = selectedItem.text + selectedText = Qt.binding(function () { return selectedItem.text }) if (currentText !== selectedText) // __selectedIndex went form -1 to 0 selectedTextChanged() } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Label.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Label.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Label.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Label.qml 2016-05-24 04:32:21.000000000 +0000 @@ -81,13 +81,9 @@ */ id: label - color: pal.windowText + color: SystemPaletteSingleton.windowText(enabled) activeFocusOnTab: false renderType: Settings.isMobile ? Text.QtRendering : Text.NativeRendering - SystemPalette { - id: pal - colorGroup: enabled ? SystemPalette.Active : SystemPalette.Disabled - } Accessible.name: text Accessible.role: Accessible.StaticText } Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/libqtquickcontrolsplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/libqtquickcontrolsplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/MenuBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/MenuBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/MenuBar.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/MenuBar.qml 2016-05-24 04:32:21.000000000 +0000 @@ -44,6 +44,7 @@ \inqmlmodule QtQuick.Controls \since 5.1 \ingroup applicationwindow + \ingroup controls \brief Provides a horizontal menu bar. \image menubar.png @@ -116,6 +117,7 @@ property Component __menuBarComponent: Loader { id: menuBarLoader + Accessible.role: Accessible.MenuBar onStatusChanged: if (status === Loader.Error) console.error("Failed to load panel for", root) @@ -145,11 +147,39 @@ property bool altPressedAgain: false property var mnemonicsMap: ({}) + function openMenuAtIndex(index) { + if (openedMenuIndex === index) + return; + + var oldIndex = openedMenuIndex + openedMenuIndex = index + + if (oldIndex !== -1) { + var menu = root.menus[oldIndex] + if (menu.__popupVisible) + menu.__dismissAndDestroy() + } + + if (openedMenuIndex !== -1) { + menu = root.menus[openedMenuIndex] + if (menu.enabled) { + if (menu.__usingDefaultStyle) + menu.style = d.style.menuStyle + + var xPos = row.LayoutMirroring.enabled ? menuItemLoader.width : 0 + menu.__popup(Qt.rect(xPos, menuBarLoader.height - d.heightPadding, 0, 0), 0) + + if (preselectMenuItem) + menu.__currentIndex = 0 + } + } + } + function dismissActiveFocus(event, reason) { if (reason) { altPressedAgain = false altPressed = false - openedMenuIndex = -1 + openMenuAtIndex(-1) root.__contentItem.parent.forceActiveFocus() } else { event.accepted = false @@ -159,7 +189,7 @@ function maybeOpenFirstMenu(event) { if (altPressed && openedMenuIndex === -1) { preselectMenuItem = true - openedMenuIndex = 0 + openMenuAtIndex(0) } else { event.accepted = false } @@ -196,7 +226,7 @@ idx-- if (idx >= 0) { d.preselectMenuItem = true - d.openedMenuIndex = idx + d.openMenuAtIndex(idx) } } else { event.accepted = false; @@ -210,13 +240,15 @@ idx++ if (idx < root.menus.length) { d.preselectMenuItem = true - d.openedMenuIndex = idx + d.openMenuAtIndex(idx) } } else { event.accepted = false; } } + Keys.forwardTo: d.openedMenuIndex !== -1 ? [root.menus[d.openedMenuIndex].__contentItem] : [] + Row { id: row x: d.style ? d.style.padding.left : 0 @@ -230,7 +262,12 @@ Loader { id: menuItemLoader + Accessible.role: Accessible.MenuItem + Accessible.name: StyleHelpers.removeMnemonics(opts.text) + Accessible.onPressAction: d.openMenuAtIndex(opts.index) + property var styleData: QtObject { + id: opts readonly property int index: __menuItemIndex readonly property string text: !!__menuItem && __menuItem.title readonly property bool enabled: !!__menuItem && __menuItem.enabled @@ -248,35 +285,18 @@ visible: __menuItem.visible Connections { - target: d - onOpenedMenuIndexChanged: { - if (!__menuItem.enabled) - return; + target: __menuItem + onAboutToHide: { if (d.openedMenuIndex === index) { - if (__menuItem.__usingDefaultStyle) - __menuItem.style = d.style.menuStyle - __menuItem.__popup(Qt.rect(row.LayoutMirroring.enabled ? menuItemLoader.width : 0, - menuBarLoader.height - d.heightPadding, 0, 0), 0) - if (d.preselectMenuItem) - __menuItem.__currentIndex = 0 - } else if (__menuItem.__popupVisible) { - __menuItem.__dismissMenu() - __menuItem.__destroyAllMenuPopups() + d.openMenuAtIndex(-1) + menuMouseArea.hoveredItem = null } } } Connections { - target: __menuItem - onPopupVisibleChanged: { - if (!__menuItem.__popupVisible && d.openedMenuIndex === index) - d.openedMenuIndex = -1 - } - } - - Connections { target: __menuItem.__action - onTriggered: d.openedMenuIndex = __menuItemIndex + onTriggered: d.openMenuAtIndex(__menuItemIndex) } Component.onCompleted: { @@ -296,27 +316,23 @@ anchors.fill: parent hoverEnabled: Settings.hoverEnabled - onPositionChanged: updateCurrentItem(mouse, false) - onPressed: { - if (updateCurrentItem(mouse)) { - d.preselectMenuItem = false - d.openedMenuIndex = currentItem.__menuItemIndex - } - } + onPositionChanged: updateCurrentItem(mouse) + onPressed: updateCurrentItem(mouse) onExited: hoveredItem = null property Item currentItem: null property Item hoveredItem: null function updateCurrentItem(mouse) { var pos = mapToItem(row, mouse.x, mouse.y) - if (!hoveredItem || !hoveredItem.contains(Qt.point(pos.x - currentItem.x, pos.y - currentItem.y))) { + if (pressed || !hoveredItem + || !hoveredItem.contains(Qt.point(pos.x - currentItem.x, pos.y - currentItem.y))) { hoveredItem = row.childAt(pos.x, pos.y) if (!hoveredItem) return false; currentItem = hoveredItem - if (d.openedMenuIndex !== -1) { + if (pressed || d.openedMenuIndex !== -1) { d.preselectMenuItem = false - d.openedMenuIndex = currentItem.__menuItemIndex + d.openMenuAtIndex(currentItem.__menuItemIndex) } } return true; diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Menu.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Menu.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Menu.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Menu.qml 2016-05-24 04:32:21.000000000 +0000 @@ -44,6 +44,7 @@ \inqmlmodule QtQuick.Controls \since 5.1 \ingroup menus + \ingroup controls \brief Provides a menu component for use as a context menu, popup menu, or as part of a menu bar. @@ -146,7 +147,7 @@ /*! \internal */ property bool __usingDefaultStyle: false /*! \internal */ - property var __parentContentItem: __parentMenu.__contentItem + property var __parentContentItem: __parentMenu ? __parentMenu.__contentItem : null /*! \internal */ property int __currentIndex: -1 /*! \internal */ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/plugins.qmltypes 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/plugins.qmltypes 2016-05-24 04:32:21.000000000 +0000 @@ -1,12 +1,23 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Controls 1.3' +// 'qmlplugindump -nonrelocatable QtQuick.Controls 1.5' Module { + dependencies: [ + "QtGraphicalEffects 1.0", + "QtGraphicalEffects.private 1.0", + "QtQml.Models 2.2", + "QtQuick 2.6", + "QtQuick.Controls.Styles 1.4", + "QtQuick.Extras 1.4", + "QtQuick.Extras.Private.CppUtils 1.1", + "QtQuick.Layouts 1.1", + "QtQuick.Window 2.2" + ] Component { name: "QQuickAbstractStyle" defaultProperty: "data" @@ -105,6 +116,27 @@ Property { name: "dragThreshold"; type: "double"; isReadonly: true } Property { name: "hasTouchScreen"; type: "bool"; isReadonly: true } Property { name: "isMobile"; type: "bool"; isReadonly: true } + Property { name: "hoverEnabled"; type: "bool"; isReadonly: true } + Method { + name: "styleComponent" + type: "QQmlComponent*" + Parameter { name: "styleDirUrl"; type: "QUrl" } + Parameter { name: "controlStyleName"; type: "string" } + Parameter { name: "control"; type: "QObject"; isPointer: true } + } + } + Component { + name: "QQuickControlsPrivate" + prototype: "QObject" + exports: ["QtQuick.Controls.Private/Controls 1.0"] + isCreatable: false + exportMetaObjectRevisions: [0] + attachedType: "QQuickControlsPrivateAttached" + } + Component { + name: "QQuickControlsPrivateAttached" + prototype: "QObject" + Property { name: "window"; type: "QQuickWindow"; isReadonly: true; isPointer: true } } Component { name: "QQuickExclusiveGroup" @@ -147,12 +179,15 @@ Property { name: "__yOffset"; type: "double" } Property { name: "__action"; type: "QQuickAction"; isReadonly: true; isPointer: true } Property { name: "__popupGeometry"; type: "QRect"; isReadonly: true } - Signal { name: "__menuClosed" } + Signal { name: "aboutToShow" } + Signal { name: "aboutToHide" } Signal { name: "popupVisibleChanged" } + Signal { name: "__menuPopupDestroyed" } Signal { name: "menuContentItemChanged" } Signal { name: "minimumWidthChanged" } - Method { name: "__closeMenu" } Method { name: "__dismissMenu" } + Method { name: "__closeAndDestroy" } + Method { name: "__dismissAndDestroy" } Method { name: "popup" } Method { name: "addItem" @@ -386,17 +421,13 @@ Property { name: "maximumDate"; type: "QDate" } } Component { - name: "QQuickRootItem" - defaultProperty: "data" - prototype: "QQuickItem" - Method { - name: "setWidth" - Parameter { name: "w"; type: "int" } - } - Method { - name: "setHeight" - Parameter { name: "h"; type: "int" } - } + name: "QQuickScenePosListener" + prototype: "QObject" + exports: ["QtQuick.Controls.Private/ScenePosListener 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "item"; type: "QQuickItem"; isPointer: true } + Property { name: "scenePos"; type: "QPointF"; isReadonly: true } + Property { name: "enabled"; type: "bool" } } Component { name: "QQuickSelectionMode" @@ -567,6 +598,54 @@ Method { name: "hideText" } } Component { + name: "QQuickTreeModelAdaptor" + prototype: "QAbstractListModel" + exports: ["QtQuick.Controls.Private/TreeModelAdaptor 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "model"; type: "QAbstractItemModel"; isPointer: true } + Property { name: "rootIndex"; type: "QModelIndex" } + Signal { + name: "modelChanged" + Parameter { name: "model"; type: "QAbstractItemModel"; isPointer: true } + } + Signal { + name: "expanded" + Parameter { name: "index"; type: "QModelIndex" } + } + Signal { + name: "collapsed" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "expand" + Parameter { type: "QModelIndex" } + } + Method { + name: "collapse" + Parameter { type: "QModelIndex" } + } + Method { + name: "setModel" + Parameter { name: "model"; type: "QAbstractItemModel"; isPointer: true } + } + Method { + name: "mapRowToModelIndex" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + } + Method { + name: "selectionForRowRange" + type: "QItemSelection" + Parameter { name: "fromIndex"; type: "QModelIndex" } + Parameter { name: "toIndex"; type: "QModelIndex" } + } + Method { + name: "isExpanded" + type: "bool" + Parameter { type: "QModelIndex" } + } + } + Component { name: "QQuickWheelArea" defaultProperty: "data" prototype: "QQuickItem" @@ -586,998 +665,1448 @@ Signal { name: "horizontalWheelMoved" } } Component { - name: "QQuickWindow" + prototype: "QQuickWindowQmlImpl" + name: "QtQuick.Controls/ApplicationWindow 1.0" + exports: ["QtQuick.Controls/ApplicationWindow 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true defaultProperty: "data" - prototype: "QWindow" - Enum { - name: "SceneGraphError" - values: { - "ContextNotAvailable": 1 - } - } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "color"; type: "QColor" } - Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "menuBar"; type: "MenuBar_QMLTYPE_2"; isPointer: true } + Property { name: "toolBar"; type: "QQuickItem"; isPointer: true } + Property { name: "statusBar"; type: "QQuickItem"; isPointer: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__topBottomMargins"; type: "double" } + Property { name: "__qwindowsize_max"; type: "double"; isReadonly: true } + Property { name: "__width"; type: "double" } + Property { name: "__height"; type: "double" } Property { - name: "activeFocusItem" - revision: 1 - type: "QQuickItem" + name: "contentItem" + type: "ContentItem_QMLTYPE_10" isReadonly: true isPointer: true } - Signal { name: "frameSwapped" } - Signal { - name: "openglContextCreated" - revision: 2 - Parameter { name: "context"; type: "QOpenGLContext"; isPointer: true } - } - Signal { name: "sceneGraphInitialized" } - Signal { name: "sceneGraphInvalidated" } - Signal { name: "beforeSynchronizing" } - Signal { name: "afterSynchronizing"; revision: 2 } - Signal { name: "beforeRendering" } - Signal { name: "afterRendering" } - Signal { name: "afterAnimating"; revision: 2 } - Signal { name: "sceneGraphAboutToStop"; revision: 2 } - Signal { - name: "closing" - revision: 1 - Parameter { name: "close"; type: "QQuickCloseEvent"; isPointer: true } - } - Signal { - name: "colorChanged" - Parameter { type: "QColor" } - } - Signal { name: "activeFocusItemChanged"; revision: 1 } - Signal { - name: "sceneGraphError" - revision: 2 - Parameter { name: "error"; type: "QQuickWindow::SceneGraphError" } - Parameter { name: "message"; type: "string" } - } - Method { name: "update" } - Method { name: "releaseResources" } + Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "__panel"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { - name: "QWindow" - prototype: "QObject" - Enum { - name: "Visibility" - values: { - "Hidden": 0, - "AutomaticVisibility": 1, - "Windowed": 2, - "Minimized": 3, - "Maximized": 4, - "FullScreen": 5 - } - } - Property { name: "title"; type: "string" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "flags"; type: "Qt::WindowFlags" } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "minimumWidth"; type: "int" } - Property { name: "minimumHeight"; type: "int" } - Property { name: "maximumWidth"; type: "int" } - Property { name: "maximumHeight"; type: "int" } - Property { name: "visible"; type: "bool" } - Property { name: "active"; revision: 1; type: "bool"; isReadonly: true } - Property { name: "visibility"; revision: 1; type: "Visibility" } - Property { name: "contentOrientation"; type: "Qt::ScreenOrientation" } - Property { name: "opacity"; revision: 1; type: "double" } - Signal { - name: "screenChanged" - Parameter { name: "screen"; type: "QScreen"; isPointer: true } - } - Signal { - name: "modalityChanged" - Parameter { name: "modality"; type: "Qt::WindowModality" } - } - Signal { - name: "windowStateChanged" - Parameter { name: "windowState"; type: "Qt::WindowState" } - } - Signal { - name: "windowTitleChanged" - revision: 2 - Parameter { name: "title"; type: "string" } - } - Signal { - name: "xChanged" - Parameter { name: "arg"; type: "int" } - } - Signal { - name: "yChanged" - Parameter { name: "arg"; type: "int" } - } - Signal { - name: "widthChanged" - Parameter { name: "arg"; type: "int" } - } - Signal { - name: "heightChanged" - Parameter { name: "arg"; type: "int" } - } + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/BusyIndicator 1.1" + exports: ["QtQuick.Controls/BusyIndicator 1.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "data" + Property { name: "running"; type: "bool" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/Button 1.0" + exports: ["QtQuick.Controls/Button 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "isDefault"; type: "bool" } + Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true } + Property { name: "checkable"; type: "bool" } + Property { name: "checked"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "action"; type: "QQuickAction"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "text"; type: "string" } + Property { name: "tooltip"; type: "string" } + Property { name: "iconSource"; type: "QUrl" } + Property { name: "iconName"; type: "string" } + Property { name: "__position"; type: "string" } + Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } + Property { name: "__action"; type: "QQuickAction"; isPointer: true } + Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } + Property { name: "__behavior"; type: "QVariant" } + Property { name: "__effectivePressed"; type: "bool" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Method { name: "accessiblePressAction"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/Calendar 1.2" + exports: ["QtQuick.Controls/Calendar 1.2"] + exportMetaObjectRevisions: [2] + isComposite: true + defaultProperty: "data" + Property { name: "visibleMonth"; type: "int" } + Property { name: "visibleYear"; type: "int" } + Property { name: "frameVisible"; type: "bool" } + Property { name: "weekNumbersVisible"; type: "bool" } + Property { name: "navigationBarVisible"; type: "bool" } + Property { name: "dayOfWeekFormat"; type: "int" } + Property { name: "__locale"; type: "QVariant" } + Property { name: "__model"; type: "QQuickCalendarModel"; isPointer: true } + Property { name: "selectedDate"; type: "QDate" } + Property { name: "minimumDate"; type: "QDate" } + Property { name: "maximumDate"; type: "QDate" } Signal { - name: "minimumWidthChanged" - Parameter { name: "arg"; type: "int" } + name: "hovered" + Parameter { name: "date"; type: "QDateTime" } } Signal { - name: "minimumHeightChanged" - Parameter { name: "arg"; type: "int" } + name: "pressed" + Parameter { name: "date"; type: "QDateTime" } } Signal { - name: "maximumWidthChanged" - Parameter { name: "arg"; type: "int" } + name: "released" + Parameter { name: "date"; type: "QDateTime" } } Signal { - name: "maximumHeightChanged" - Parameter { name: "arg"; type: "int" } + name: "clicked" + Parameter { name: "date"; type: "QDateTime" } } Signal { - name: "visibleChanged" - Parameter { name: "arg"; type: "bool" } + name: "doubleClicked" + Parameter { name: "date"; type: "QDateTime" } } Signal { - name: "visibilityChanged" - revision: 1 - Parameter { name: "visibility"; type: "QWindow::Visibility" } - } - Signal { name: "activeChanged"; revision: 1 } - Signal { - name: "contentOrientationChanged" - Parameter { name: "orientation"; type: "Qt::ScreenOrientation" } - } - Signal { - name: "focusObjectChanged" - Parameter { name: "object"; type: "QObject"; isPointer: true } - } - Signal { - name: "opacityChanged" - revision: 1 - Parameter { name: "opacity"; type: "double" } - } - Method { name: "requestActivate"; revision: 1 } - Method { - name: "setVisible" - Parameter { name: "visible"; type: "bool" } - } - Method { name: "show" } - Method { name: "hide" } - Method { name: "showMinimized" } - Method { name: "showMaximized" } - Method { name: "showFullScreen" } - Method { name: "showNormal" } - Method { name: "close"; type: "bool" } - Method { name: "raise" } - Method { name: "lower" } - Method { - name: "setTitle" - Parameter { type: "string" } - } - Method { - name: "setX" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setY" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } + name: "pressAndHold" + Parameter { name: "date"; type: "QDateTime" } } + Method { name: "showPreviousMonth"; type: "QVariant" } + Method { name: "showNextMonth"; type: "QVariant" } + Method { name: "showPreviousYear"; type: "QVariant" } + Method { name: "showNextYear"; type: "QVariant" } + Method { name: "__selectPreviousMonth"; type: "QVariant" } + Method { name: "__selectNextMonth"; type: "QVariant" } + Method { name: "__selectPreviousWeek"; type: "QVariant" } + Method { name: "__selectNextWeek"; type: "QVariant" } + Method { name: "__selectFirstDayOfMonth"; type: "QVariant" } + Method { name: "__selectLastDayOfMonth"; type: "QVariant" } + Method { name: "__selectPreviousDay"; type: "QVariant" } + Method { name: "__selectNextDay"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/CheckBox 1.0" + exports: ["QtQuick.Controls/CheckBox 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "checkedState"; type: "int" } + Property { name: "partiallyCheckedEnabled"; type: "bool" } + Property { name: "__ignoreChecked"; type: "bool" } + Property { name: "__ignoreCheckedState"; type: "bool" } + Method { name: "__cycleCheckBoxStates"; type: "QVariant" } + Property { name: "checked"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "text"; type: "string" } + Property { name: "__cycleStatesHandler"; type: "QVariant" } + Property { name: "pressed"; type: "bool" } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras.Private/CircularButton 1.0" + exports: ["QtQuick.Extras.Private/CircularButton 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "isDefault"; type: "bool" } + Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true } + Property { name: "checkable"; type: "bool" } + Property { name: "checked"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "action"; type: "QQuickAction"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "text"; type: "string" } + Property { name: "tooltip"; type: "string" } + Property { name: "iconSource"; type: "QUrl" } + Property { name: "iconName"; type: "string" } + Property { name: "__position"; type: "string" } + Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } + Property { name: "__action"; type: "QQuickAction"; isPointer: true } + Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } + Property { name: "__behavior"; type: "QVariant" } + Property { name: "__effectivePressed"; type: "bool" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Method { name: "accessiblePressAction"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QObject" + name: "QtQuick.Extras.Private/CircularButtonStyleHelper 1.0" + exports: ["QtQuick.Extras.Private/CircularButtonStyleHelper 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + Property { name: "control"; type: "QQuickItem"; isPointer: true } + Property { name: "buttonColorUpTop"; type: "QColor" } + Property { name: "buttonColorUpBottom"; type: "QColor" } + Property { name: "buttonColorDownTop"; type: "QColor" } + Property { name: "buttonColorDownBottom"; type: "QColor" } + Property { name: "outerArcColorTop"; type: "QColor" } + Property { name: "outerArcColorBottom"; type: "QColor" } + Property { name: "innerArcColorTop"; type: "QColor" } + Property { name: "innerArcColorBottom"; type: "QColor" } + Property { name: "innerArcColorBottomStop"; type: "double" } + Property { name: "shineColor"; type: "QColor" } + Property { name: "smallestAxis"; type: "double" } + Property { name: "outerArcLineWidth"; type: "double" } + Property { name: "innerArcLineWidth"; type: "double" } + Property { name: "shineArcLineWidth"; type: "double" } + Property { name: "implicitWidth"; type: "double" } + Property { name: "implicitHeight"; type: "double" } + Property { name: "textColorUp"; type: "QColor" } + Property { name: "textColorDown"; type: "QColor" } + Property { name: "textRaisedColorUp"; type: "QColor" } + Property { name: "textRaisedColorDown"; type: "QColor" } + Property { name: "radius"; type: "double" } + Property { name: "halfRadius"; type: "double" } + Property { name: "outerArcRadius"; type: "double" } + Property { name: "innerArcRadius"; type: "double" } + Property { name: "shineArcRadius"; type: "double" } + Property { name: "zeroAngle"; type: "double" } + Property { name: "buttonColorTop"; type: "QColor" } + Property { name: "buttonColorBottom"; type: "QColor" } Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } + name: "toPixels" + type: "QVariant" + Parameter { name: "percentageOfSmallestAxis"; type: "QVariant" } } Method { - name: "setMinimumWidth" - Parameter { name: "w"; type: "int" } + name: "paintBackground" + type: "QVariant" + Parameter { name: "ctx"; type: "QVariant" } } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/CircularGauge 1.0" + exports: ["QtQuick.Extras/CircularGauge 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "tickmarksVisible"; type: "bool" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "value"; type: "double" } + Property { name: "stepSize"; type: "double" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras.Private/CircularTickmarkLabel 1.0" + exports: ["QtQuick.Extras.Private/CircularTickmarkLabel 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "minimumValueAngle"; type: "double" } + Property { name: "maximumValueAngle"; type: "double" } + Property { name: "angleRange"; type: "double"; isReadonly: true } + Property { name: "tickmarkStepSize"; type: "double" } + Property { name: "tickmarkInset"; type: "double" } + Property { name: "tickmarkCount"; type: "int"; isReadonly: true } + Property { name: "minorTickmarkCount"; type: "int" } + Property { name: "minorTickmarkInset"; type: "double" } + Property { name: "labelInset"; type: "double" } + Property { name: "labelStepSize"; type: "double" } + Property { name: "labelCount"; type: "int"; isReadonly: true } + Property { name: "__tickmarkCount"; type: "double"; isReadonly: true } + Property { name: "tickmarksVisible"; type: "bool" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "stepSize"; type: "double" } Method { - name: "setMinimumHeight" - Parameter { name: "h"; type: "int" } + name: "valueToAngle" + type: "QVariant" + Parameter { name: "value"; type: "QVariant" } } - Method { - name: "setMaximumWidth" - Parameter { name: "w"; type: "int" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/ComboBox 1.0" + exports: ["QtQuick.Controls/ComboBox 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "textRole"; type: "string" } + Property { name: "editable"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "__popup"; type: "QVariant" } + Property { name: "model"; type: "QVariant" } + Property { name: "currentIndex"; type: "int" } + Property { name: "currentText"; type: "string"; isReadonly: true } + Property { name: "editText"; type: "string" } + Property { name: "inputMethodHints"; type: "int" } + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "validator"; type: "QValidator"; isPointer: true } + Property { name: "acceptableInput"; type: "bool"; isReadonly: true } + Signal { name: "accepted" } + Signal { + name: "activated" + Parameter { name: "index"; type: "int" } } Method { - name: "setMaximumHeight" - Parameter { name: "h"; type: "int" } + name: "textAt" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } Method { - name: "alert" - revision: 1 - Parameter { name: "msec"; type: "int" } + name: "find" + type: "QVariant" + Parameter { name: "text"; type: "QVariant" } } + Method { name: "selectAll"; type: "QVariant" } + Method { name: "__selectPrevItem"; type: "QVariant" } + Method { name: "__selectNextItem"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - name: "QWindow" - prototype: "QObject" - Enum { - name: "Visibility" - values: { - "Hidden": 0, - "AutomaticVisibility": 1, - "Windowed": 2, - "Minimized": 3, - "Maximized": 4, - "FullScreen": 5 - } - } - Property { name: "title"; type: "string" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "flags"; type: "Qt::WindowFlags" } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "minimumWidth"; type: "int" } - Property { name: "minimumHeight"; type: "int" } - Property { name: "maximumWidth"; type: "int" } - Property { name: "maximumHeight"; type: "int" } - Property { name: "visible"; type: "bool" } - Property { name: "active"; revision: 1; type: "bool"; isReadonly: true } - Property { name: "visibility"; revision: 1; type: "Visibility" } - Property { name: "contentOrientation"; type: "Qt::ScreenOrientation" } - Property { name: "opacity"; revision: 1; type: "double" } - Signal { - name: "screenChanged" - Parameter { name: "screen"; type: "QScreen"; isPointer: true } - } - Signal { - name: "modalityChanged" - Parameter { name: "modality"; type: "Qt::WindowModality" } - } - Signal { - name: "windowStateChanged" - Parameter { name: "windowState"; type: "Qt::WindowState" } - } - Signal { - name: "windowTitleChanged" - revision: 2 - Parameter { name: "title"; type: "string" } - } - Signal { - name: "xChanged" - Parameter { name: "arg"; type: "int" } + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/DelayButton 1.0" + exports: ["QtQuick.Extras/DelayButton 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "delay"; type: "int" } + Property { name: "__progress"; type: "double" } + Property { name: "progress"; type: "double"; isReadonly: true } + Signal { name: "activated" } + Property { name: "isDefault"; type: "bool" } + Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true } + Property { name: "checkable"; type: "bool" } + Property { name: "checked"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "action"; type: "QQuickAction"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "text"; type: "string" } + Property { name: "tooltip"; type: "string" } + Property { name: "iconSource"; type: "QUrl" } + Property { name: "iconName"; type: "string" } + Property { name: "__position"; type: "string" } + Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } + Property { name: "__action"; type: "QQuickAction"; isPointer: true } + Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } + Property { name: "__behavior"; type: "QVariant" } + Property { name: "__effectivePressed"; type: "bool" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Method { name: "accessiblePressAction"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/Dial 1.0" + exports: ["QtQuick.Extras/Dial 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "__wrap"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "tickmarksVisible"; type: "bool" } + Property { name: "value"; type: "double" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "stepSize"; type: "double" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/Dial 1.1" + exports: ["QtQuick.Extras/Dial 1.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "data" + Property { name: "__wrap"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "tickmarksVisible"; type: "bool" } + Property { name: "value"; type: "double" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "stepSize"; type: "double" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/Gauge 1.0" + exports: ["QtQuick.Extras/Gauge 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "orientation"; type: "int" } + Property { name: "tickmarkAlignment"; type: "int" } + Property { name: "__tickmarkAlignment"; type: "int" } + Property { name: "__tickmarksInside"; type: "bool" } + Property { name: "tickmarkStepSize"; type: "double" } + Property { name: "minorTickmarkCount"; type: "int" } + Property { name: "formatValue"; type: "QVariant" } + Property { name: "minimumValue"; type: "double" } + Property { name: "value"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "font"; type: "QFont" } + Property { name: "__hiddenText"; type: "QQuickText"; isReadonly: true; isPointer: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/GroupBox 1.0" + exports: ["QtQuick.Controls/GroupBox 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "__content" + Property { name: "title"; type: "string" } + Property { name: "flat"; type: "bool" } + Property { name: "checkable"; type: "bool" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "checked"; type: "bool" } + Property { name: "__content"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "__checkbox"; type: "CheckBox_QMLTYPE_74"; isReadonly: true; isPointer: true } + Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } + } + Component { + prototype: "QQuickText" + name: "QtQuick.Controls/Label 1.0" + exports: ["QtQuick.Controls/Label 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QObject" + name: "QtQuick.Controls/Menu 1.0" + exports: ["QtQuick.Controls/Menu 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "items" + Property { name: "__selfComponent"; type: "QQmlComponent"; isPointer: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__usingDefaultStyle"; type: "bool" } + Property { name: "__parentContentItem"; type: "QVariant" } + Property { name: "__currentIndex"; type: "int" } + Method { + name: "addMenu" + type: "QVariant" + Parameter { name: "title"; type: "QVariant" } } - Signal { - name: "yChanged" - Parameter { name: "arg"; type: "int" } + Method { + name: "insertMenu" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "title"; type: "QVariant" } } - Signal { - name: "widthChanged" - Parameter { name: "arg"; type: "int" } + Property { name: "title"; type: "string" } + Property { name: "items"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "__selectedIndex"; type: "int" } + Property { name: "__popupVisible"; type: "bool"; isReadonly: true } + Property { name: "__contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__minimumWidth"; type: "int" } + Property { name: "__font"; type: "QFont" } + Property { name: "__xOffset"; type: "double" } + Property { name: "__yOffset"; type: "double" } + Property { name: "__action"; type: "QQuickAction"; isReadonly: true; isPointer: true } + Property { name: "__popupGeometry"; type: "QRect"; isReadonly: true } + Signal { name: "aboutToShow" } + Signal { name: "aboutToHide" } + Signal { name: "popupVisibleChanged" } + Signal { name: "__menuPopupDestroyed" } + Signal { name: "menuContentItemChanged" } + Signal { name: "minimumWidthChanged" } + Method { name: "__dismissMenu" } + Method { name: "__closeAndDestroy" } + Method { name: "__dismissAndDestroy" } + Method { name: "popup" } + Method { + name: "addItem" + type: "QQuickMenuItem*" + Parameter { type: "string" } } - Signal { - name: "heightChanged" - Parameter { name: "arg"; type: "int" } + Method { + name: "insertItem" + type: "QQuickMenuItem*" + Parameter { type: "int" } + Parameter { type: "string" } } - Signal { - name: "minimumWidthChanged" - Parameter { name: "arg"; type: "int" } + Method { name: "addSeparator" } + Method { + name: "insertSeparator" + Parameter { type: "int" } } - Signal { - name: "minimumHeightChanged" - Parameter { name: "arg"; type: "int" } + Method { + name: "removeItem" + Parameter { type: "QQuickMenuBase"; isPointer: true } } - Signal { - name: "maximumWidthChanged" - Parameter { name: "arg"; type: "int" } + Method { name: "clear" } + Method { + name: "__popup" + Parameter { name: "targetRect"; type: "QRectF" } + Parameter { name: "atItemIndex"; type: "int" } + Parameter { name: "menuType"; type: "MenuType" } } - Signal { - name: "maximumHeightChanged" - Parameter { name: "arg"; type: "int" } + Method { + name: "__popup" + Parameter { name: "targetRect"; type: "QRectF" } + Parameter { name: "atItemIndex"; type: "int" } } - Signal { - name: "visibleChanged" - Parameter { name: "arg"; type: "bool" } + Method { + name: "__popup" + Parameter { name: "targetRect"; type: "QRectF" } } - Signal { - name: "visibilityChanged" - revision: 1 - Parameter { name: "visibility"; type: "QWindow::Visibility" } + Property { name: "enabled"; type: "bool" } + Property { name: "iconSource"; type: "QUrl" } + Property { name: "iconName"; type: "string" } + Property { name: "__icon"; type: "QVariant"; isReadonly: true } + Signal { name: "__textChanged" } + Property { name: "visible"; type: "bool" } + Property { name: "type"; type: "QQuickMenuItemType::MenuItemType"; isReadonly: true } + Property { name: "__parentMenu"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "__isNative"; type: "bool"; isReadonly: true } + Property { name: "__visualItem"; type: "QQuickItem"; isPointer: true } + } + Component { + prototype: "QObject" + name: "QtQuick.Controls/MenuBar 1.0" + exports: ["QtQuick.Controls/MenuBar 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "menus" + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__menuBarComponent"; type: "QQmlComponent"; isPointer: true } + Property { name: "menus"; type: "QQuickMenu"; isList: true; isReadonly: true } + Property { name: "__contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__parentWindow"; type: "QQuickWindow"; isPointer: true } + Property { name: "__isNative"; type: "bool" } + Signal { name: "nativeChanged" } + Signal { name: "contentItemChanged" } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/PieMenu 1.0" + exports: ["QtQuick.Extras/PieMenu 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "menuItems" + Property { name: "selectionAngle"; type: "double"; isReadonly: true } + Property { name: "triggerMode"; type: "int" } + Property { name: "title"; type: "string" } + Property { name: "boundingItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__protectedScope"; type: "QObject"; isPointer: true } + Property { name: "activationMode"; type: "int" } + Property { name: "menuItems"; type: "QQuickMenuItem"; isList: true; isReadonly: true } + Property { name: "currentIndex"; type: "int"; isReadonly: true } + Property { name: "currentItem"; type: "QQuickMenuItem"; isReadonly: true; isPointer: true } + Property { name: "__mouseThief"; type: "QQuickMouseThief"; isReadonly: true; isPointer: true } + Method { + name: "popup" + type: "QVariant" + Parameter { name: "x"; type: "QVariant" } + Parameter { name: "y"; type: "QVariant" } } - Signal { name: "activeChanged"; revision: 1 } - Signal { - name: "contentOrientationChanged" - Parameter { name: "orientation"; type: "Qt::ScreenOrientation" } + Method { + name: "addItem" + type: "QVariant" + Parameter { name: "text"; type: "QVariant" } } - Signal { - name: "focusObjectChanged" - Parameter { name: "object"; type: "QObject"; isPointer: true } + Method { + name: "insertItem" + type: "QVariant" + Parameter { name: "before"; type: "QVariant" } + Parameter { name: "text"; type: "QVariant" } } - Signal { - name: "opacityChanged" - revision: 1 - Parameter { name: "opacity"; type: "double" } + Method { + name: "removeItem" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } + } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickLoader" + name: "QtQuick.Extras.Private/PieMenuIcon 1.0" + exports: ["QtQuick.Extras.Private/PieMenuIcon 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "control"; type: "PieMenu_QMLTYPE_168"; isPointer: true } + Property { name: "styleData"; type: "QObject"; isPointer: true } + Property { name: "iconSource"; type: "string"; isReadonly: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/ProgressBar 1.0" + exports: ["QtQuick.Controls/ProgressBar 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "value"; type: "double" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "indeterminate"; type: "bool" } + Property { name: "orientation"; type: "int" } + Property { name: "__initialized"; type: "bool" } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Method { + name: "setValue" + type: "QVariant" + Parameter { name: "v"; type: "QVariant" } + } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/RadioButton 1.0" + exports: ["QtQuick.Controls/RadioButton 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "checked"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "text"; type: "string" } + Property { name: "__cycleStatesHandler"; type: "QVariant" } + Property { name: "pressed"; type: "bool" } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/ScrollView 1.0" + exports: ["QtQuick.Controls/ScrollView 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "contentItem" + Property { name: "frameVisible"; type: "bool" } + Property { name: "highlightOnFocus"; type: "bool" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__scroller"; type: "QQuickItem"; isPointer: true } + Property { name: "__scrollBarTopMargin"; type: "int" } + Property { name: "__viewTopMargin"; type: "int" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_1"; isPointer: true } + Property { name: "horizontalScrollBarPolicy"; type: "int" } + Property { name: "verticalScrollBarPolicy"; type: "int" } + Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } + Property { name: "__wheelAreaScrollSpeed"; type: "double" } + Property { + name: "__horizontalScrollBar" + type: "ScrollBar_QMLTYPE_24" + isReadonly: true + isPointer: true + } + Property { + name: "__verticalScrollBar" + type: "ScrollBar_QMLTYPE_24" + isReadonly: true + isPointer: true + } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/Slider 1.0" + exports: ["QtQuick.Controls/Slider 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "orientation"; type: "int" } + Property { name: "updateValueWhileDragging"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "tickmarksEnabled"; type: "bool" } + Property { name: "__horizontal"; type: "bool" } + Property { name: "__handlePos"; type: "double" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "stepSize"; type: "double" } + Property { name: "value"; type: "double" } + Method { name: "accessibleIncreaseAction"; type: "QVariant" } + Method { name: "accessibleDecreaseAction"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/SpinBox 1.0" + exports: ["QtQuick.Controls/SpinBox 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "horizontalAlignment"; type: "int" } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } + Property { name: "value"; type: "double" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "stepSize"; type: "double" } + Property { name: "suffix"; type: "string" } + Property { name: "prefix"; type: "string" } + Property { name: "decimals"; type: "int" } + Property { name: "font"; type: "QFont" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "__text"; type: "string" } + Property { name: "__baselineOffset"; type: "double" } + Signal { name: "editingFinished" } + Method { name: "__increment"; type: "QVariant" } + Method { name: "__decrement"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.Controls/SplitView 1.0" + exports: ["QtQuick.Controls/SplitView 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "__contents" + Property { name: "orientation"; type: "int" } + Property { name: "handleDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "resizing"; type: "bool" } + Property { name: "__contents"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "__items"; type: "QQuickItem"; isList: true; isReadonly: true } + Property { name: "__handles"; type: "QQuickItem"; isList: true; isReadonly: true } + Method { + name: "addItem" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } + } + Method { + name: "removeItem" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } + } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/StackView 1.0" + exports: ["QtQuick.Controls/StackView 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "initialItem"; type: "QVariant" } + Property { name: "busy"; type: "bool"; isReadonly: true } + Property { name: "delegate"; type: "StackViewDelegate_QMLTYPE_225"; isPointer: true } + Property { name: "__currentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__depth"; type: "int" } + Property { name: "__currentTransition"; type: "QVariant" } + Property { name: "__guard"; type: "bool" } + Property { name: "invalidItemReplacement"; type: "QQmlComponent"; isPointer: true } + Property { name: "depth"; type: "int"; isReadonly: true } + Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Method { + name: "push" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } + } + Method { + name: "pop" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } } - Method { name: "requestActivate"; revision: 1 } + Method { name: "clear"; type: "QVariant" } Method { - name: "setVisible" - Parameter { name: "visible"; type: "bool" } + name: "find" + type: "QVariant" + Parameter { name: "func"; type: "QVariant" } + Parameter { name: "onlySearchLoadedItems"; type: "QVariant" } } - Method { name: "show" } - Method { name: "hide" } - Method { name: "showMinimized" } - Method { name: "showMaximized" } - Method { name: "showFullScreen" } - Method { name: "showNormal" } - Method { name: "close"; type: "bool" } - Method { name: "raise" } - Method { name: "lower" } Method { - name: "setTitle" - Parameter { type: "string" } + name: "get" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "dontLoad"; type: "QVariant" } } + Method { name: "completeTransition"; type: "QVariant" } Method { - name: "setX" - Parameter { name: "arg"; type: "int" } + name: "replace" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } + Parameter { name: "properties"; type: "QVariant" } + Parameter { name: "immediate"; type: "QVariant" } } Method { - name: "setY" - Parameter { name: "arg"; type: "int" } + name: "__recursionGuard" + type: "QVariant" + Parameter { name: "use"; type: "QVariant" } } Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } + name: "__loadElement" + type: "QVariant" + Parameter { name: "element"; type: "QVariant" } } Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } + name: "__resolveComponent" + type: "QVariant" + Parameter { name: "unknownObjectType"; type: "QVariant" } + Parameter { name: "element"; type: "QVariant" } } Method { - name: "setMinimumWidth" - Parameter { name: "w"; type: "int" } + name: "__cleanup" + type: "QVariant" + Parameter { name: "element"; type: "QVariant" } } Method { - name: "setMinimumHeight" - Parameter { name: "h"; type: "int" } + name: "__setStatus" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } + Parameter { name: "status"; type: "QVariant" } } Method { - name: "setMaximumWidth" - Parameter { name: "w"; type: "int" } + name: "__performTransition" + type: "QVariant" + Parameter { name: "transition"; type: "QVariant" } } + Method { name: "animationFinished"; type: "QVariant" } + } + Component { + prototype: "QObject" + name: "QtQuick.Controls/StackViewDelegate 1.0" + exports: ["QtQuick.Controls/StackViewDelegate 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + Property { name: "pushTransition"; type: "QQmlComponent"; isPointer: true } + Property { name: "popTransition"; type: "QQmlComponent"; isPointer: true } + Property { name: "replaceTransition"; type: "QQmlComponent"; isPointer: true } Method { - name: "setMaximumHeight" - Parameter { name: "h"; type: "int" } + name: "getTransition" + type: "QVariant" + Parameter { name: "properties"; type: "QVariant" } } Method { - name: "alert" - revision: 1 - Parameter { name: "msec"; type: "int" } + name: "transitionFinished" + type: "QVariant" + Parameter { name: "properties"; type: "QVariant" } } } Component { - name: "QQuickWindow" - defaultProperty: "data" - prototype: "QWindow" - exports: ["QtQuick.Window/Window 2.0"] + prototype: "QQuickParallelAnimation" + name: "QtQuick.Controls/StackViewTransition 1.0" + exports: ["QtQuick.Controls/StackViewTransition 1.0"] exportMetaObjectRevisions: [0] - Enum { - name: "SceneGraphError" - values: { - "ContextNotAvailable": 1 - } - } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "color"; type: "QColor" } + isComposite: true + defaultProperty: "animations" + Property { name: "name"; type: "string" } + Property { name: "enterItem"; type: "QQuickItem"; isPointer: true } + Property { name: "exitItem"; type: "QQuickItem"; isPointer: true } + Property { name: "immediate"; type: "bool" } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/StatusBar 1.0" + exports: ["QtQuick.Controls/StatusBar 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "__content" + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "__content"; type: "QObject"; isList: true; isReadonly: true } Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { - name: "activeFocusItem" - revision: 1 - type: "QQuickItem" - isReadonly: true - isPointer: true - } - Signal { name: "frameSwapped" } - Signal { - name: "openglContextCreated" - revision: 2 - Parameter { name: "context"; type: "QOpenGLContext"; isPointer: true } - } - Signal { name: "sceneGraphInitialized" } - Signal { name: "sceneGraphInvalidated" } - Signal { name: "beforeSynchronizing" } - Signal { name: "afterSynchronizing"; revision: 2 } - Signal { name: "beforeRendering" } - Signal { name: "afterRendering" } - Signal { name: "afterAnimating"; revision: 2 } - Signal { name: "sceneGraphAboutToStop"; revision: 2 } - Signal { - name: "closing" - revision: 1 - Parameter { name: "close"; type: "QQuickCloseEvent"; isPointer: true } - } - Signal { - name: "colorChanged" - Parameter { type: "QColor" } - } - Signal { name: "activeFocusItemChanged"; revision: 1 } - Signal { - name: "sceneGraphError" - revision: 2 - Parameter { name: "error"; type: "QQuickWindow::SceneGraphError" } - Parameter { name: "message"; type: "string" } - } - Method { name: "update" } - Method { name: "releaseResources" } } Component { - prototype: "QQuickWindow" - name: "QtQuick.Controls/ApplicationWindow" - exports: ["QtQuick.Controls/ApplicationWindow 1.0"] + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/StatusIndicator 1.0" + exports: ["QtQuick.Extras/StatusIndicator 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "menuBar"; type: "MenuBar_QMLTYPE_3"; isPointer: true } - Property { name: "toolBar"; type: "QQuickItem"; isPointer: true } - Property { name: "statusBar"; type: "QQuickItem"; isPointer: true } + Property { name: "active"; type: "bool" } + Property { name: "color"; type: "QColor" } + Property { name: "on"; type: "bool" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__topBottomMargins"; type: "double" } - Property { name: "__qwindowsize_max"; type: "double"; isReadonly: true } - Property { name: "__width"; type: "double" } - Property { name: "__height"; type: "double" } - Property { - name: "contentItem" - type: "ContentItem_QMLTYPE_11" - isReadonly: true - isPointer: true + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/StatusIndicator 1.1" + exports: ["QtQuick.Extras/StatusIndicator 1.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "data" + Property { name: "active"; type: "bool" } + Property { name: "color"; type: "QColor" } + Property { name: "on"; type: "bool" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/Switch 1.1" + exports: ["QtQuick.Controls/Switch 1.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "data" + Property { name: "checked"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickLoader" + name: "QtQuick.Controls/Tab 1.0" + exports: ["QtQuick.Controls/Tab 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "component" + Property { name: "title"; type: "string" } + Property { name: "__inserted"; type: "bool" } + Property { name: "component"; type: "QQmlComponent"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/TabView 1.0" + exports: ["QtQuick.Controls/TabView 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "currentIndex"; type: "int" } + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "frameVisible"; type: "bool" } + Property { name: "tabsVisible"; type: "bool" } + Property { name: "tabPosition"; type: "int" } + Property { name: "__tabs"; type: "QQmlListModel"; isPointer: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__styleItem"; type: "QVariant" } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Method { + name: "addTab" + type: "QVariant" + Parameter { name: "title"; type: "QVariant" } + Parameter { name: "component"; type: "QVariant" } + } + Method { + name: "insertTab" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "title"; type: "QVariant" } + Parameter { name: "component"; type: "QVariant" } + } + Method { + name: "removeTab" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { + name: "moveTab" + type: "QVariant" + Parameter { name: "from"; type: "QVariant" } + Parameter { name: "to"; type: "QVariant" } + } + Method { + name: "getTab" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } - Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } - Property { name: "__panel"; type: "QObject"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "visible"; type: "bool" } - Property { name: "visibility"; type: "Visibility" } - Signal { - name: "visibleChanged" - Parameter { name: "arg"; type: "bool" } + Method { + name: "__willRemoveIndex" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } - Signal { - name: "visibilityChanged" - Parameter { name: "visibility"; type: "QWindow::Visibility" } + Method { + name: "__didInsertIndex" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } - Property { name: "color"; type: "QColor" } + Method { name: "__setOpacities"; type: "QVariant" } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/TableView 1.0" + exports: ["QtQuick.Controls/TableView 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "__columns" + Property { name: "model"; type: "QVariant" } + Property { name: "rowCount"; type: "int"; isReadonly: true } + Property { name: "currentRow"; type: "int" } Property { - name: "activeFocusItem" - revision: 1 - type: "QQuickItem" + name: "selection" + type: "TableViewSelection_QMLTYPE_281" isReadonly: true isPointer: true } - Signal { name: "frameSwapped" } - Signal { - name: "openglContextCreated" - revision: 2 - Parameter { name: "context"; type: "QOpenGLContext"; isPointer: true } - } - Signal { name: "sceneGraphInitialized" } - Signal { name: "sceneGraphInvalidated" } - Signal { name: "beforeSynchronizing" } - Signal { name: "afterSynchronizing"; revision: 2 } - Signal { name: "beforeRendering" } - Signal { name: "afterRendering" } - Signal { name: "afterAnimating"; revision: 2 } - Signal { name: "sceneGraphAboutToStop"; revision: 2 } - Signal { - name: "closing" - revision: 1 - Parameter { name: "close"; type: "QQuickCloseEvent"; isPointer: true } - } - Signal { - name: "colorChanged" - Parameter { type: "QColor" } - } - Signal { - name: "sceneGraphError" - revision: 2 - Parameter { name: "error"; type: "QQuickWindow::SceneGraphError" } - Parameter { name: "message"; type: "string" } - } - Method { name: "update" } - Method { name: "releaseResources" } - Property { name: "title"; type: "string" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "flags"; type: "Qt::WindowFlags" } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "minimumWidth"; type: "int" } - Property { name: "minimumHeight"; type: "int" } - Property { name: "maximumWidth"; type: "int" } - Property { name: "maximumHeight"; type: "int" } - Property { name: "active"; revision: 1; type: "bool"; isReadonly: true } - Property { name: "contentOrientation"; type: "Qt::ScreenOrientation" } - Property { name: "opacity"; revision: 1; type: "double" } Signal { - name: "screenChanged" - Parameter { name: "screen"; type: "QScreen"; isPointer: true } + name: "activated" + Parameter { name: "row"; type: "int" } } Signal { - name: "modalityChanged" - Parameter { name: "modality"; type: "Qt::WindowModality" } + name: "clicked" + Parameter { name: "row"; type: "int" } } Signal { - name: "windowStateChanged" - Parameter { name: "windowState"; type: "Qt::WindowState" } + name: "doubleClicked" + Parameter { name: "row"; type: "int" } } Signal { - name: "windowTitleChanged" - revision: 2 - Parameter { name: "title"; type: "string" } + name: "pressAndHold" + Parameter { name: "row"; type: "int" } } - Signal { - name: "xChanged" - Parameter { name: "arg"; type: "int" } + Method { + name: "positionViewAtRow" + type: "QVariant" + Parameter { name: "row"; type: "QVariant" } + Parameter { name: "mode"; type: "QVariant" } } - Signal { - name: "yChanged" - Parameter { name: "arg"; type: "int" } + Method { + name: "rowAt" + type: "QVariant" + Parameter { name: "x"; type: "QVariant" } + Parameter { name: "y"; type: "QVariant" } } - Signal { - name: "widthChanged" - Parameter { name: "arg"; type: "int" } + Property { name: "alternatingRowColors"; type: "bool" } + Property { name: "headerVisible"; type: "bool" } + Property { name: "itemDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "rowDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "headerDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "sortIndicatorColumn"; type: "int" } + Property { name: "sortIndicatorVisible"; type: "bool" } + Property { name: "sortIndicatorOrder"; type: "int" } + Property { name: "selectionMode"; type: "int" } + Property { name: "__viewTypeName"; type: "string" } + Property { name: "__isTreeView"; type: "bool"; isReadonly: true } + Property { name: "__itemDelegateLoader"; type: "QQmlComponent"; isPointer: true } + Property { name: "__model"; type: "QVariant" } + Property { name: "__activateItemOnSingleClick"; type: "bool" } + Property { name: "__mouseArea"; type: "QQuickItem"; isPointer: true } + Property { name: "backgroundVisible"; type: "bool" } + Property { name: "contentHeader"; type: "QQmlComponent"; isPointer: true } + Property { name: "contentFooter"; type: "QQmlComponent"; isPointer: true } + Property { name: "columnCount"; type: "int"; isReadonly: true } + Property { name: "section"; type: "QQuickViewSection"; isReadonly: true; isPointer: true } + Property { name: "__columns"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "__currentRowItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "__currentRow"; type: "int" } + Property { name: "__listView"; type: "QQuickListView"; isReadonly: true; isPointer: true } + Method { + name: "addColumn" + type: "QVariant" + Parameter { name: "column"; type: "QVariant" } } - Signal { - name: "heightChanged" - Parameter { name: "arg"; type: "int" } + Method { + name: "insertColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "column"; type: "QVariant" } } - Signal { - name: "minimumWidthChanged" - Parameter { name: "arg"; type: "int" } + Method { + name: "removeColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } - Signal { - name: "minimumHeightChanged" - Parameter { name: "arg"; type: "int" } + Method { + name: "moveColumn" + type: "QVariant" + Parameter { name: "from"; type: "QVariant" } + Parameter { name: "to"; type: "QVariant" } } - Signal { - name: "maximumWidthChanged" - Parameter { name: "arg"; type: "int" } + Method { + name: "getColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } - Signal { - name: "maximumHeightChanged" - Parameter { name: "arg"; type: "int" } + Method { name: "resizeColumnsToContents"; type: "QVariant" } + Property { name: "frameVisible"; type: "bool" } + Property { name: "highlightOnFocus"; type: "bool" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__scroller"; type: "QQuickItem"; isPointer: true } + Property { name: "__scrollBarTopMargin"; type: "int" } + Property { name: "__viewTopMargin"; type: "int" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_1"; isPointer: true } + Property { name: "horizontalScrollBarPolicy"; type: "int" } + Property { name: "verticalScrollBarPolicy"; type: "int" } + Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } + Property { name: "__wheelAreaScrollSpeed"; type: "double" } + Property { + name: "__horizontalScrollBar" + type: "ScrollBar_QMLTYPE_24" + isReadonly: true + isPointer: true } - Signal { - name: "contentOrientationChanged" - Parameter { name: "orientation"; type: "Qt::ScreenOrientation" } + Property { + name: "__verticalScrollBar" + type: "ScrollBar_QMLTYPE_24" + isReadonly: true + isPointer: true } + } + Component { + prototype: "QObject" + name: "QtQuick.Controls/TableViewColumn 1.0" + exports: ["QtQuick.Controls/TableViewColumn 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + Property { name: "__view"; type: "QQuickItem"; isPointer: true } + Property { name: "__index"; type: "int" } + Property { name: "title"; type: "string" } + Property { name: "role"; type: "string" } + Property { name: "width"; type: "int" } + Property { name: "visible"; type: "bool" } + Property { name: "resizable"; type: "bool" } + Property { name: "movable"; type: "bool" } + Property { name: "elideMode"; type: "int" } + Property { name: "horizontalAlignment"; type: "int" } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Method { name: "resizeToContents"; type: "QVariant" } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/TextArea 1.3" + exports: ["QtQuick.Controls/TextArea 1.3"] + exportMetaObjectRevisions: [3] + isComposite: true + defaultProperty: "data" + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "tabChangesFocus"; type: "bool" } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "baseUrl"; type: "QUrl" } + Property { name: "canPaste"; type: "bool"; isReadonly: true } + Property { name: "canRedo"; type: "bool"; isReadonly: true } + Property { name: "canUndo"; type: "bool"; isReadonly: true } + Property { name: "textColor"; type: "QColor" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } + Property { name: "font"; type: "QFont" } + Property { name: "horizontalAlignment"; type: "int" } + Property { name: "effectiveHorizontalAlignment"; type: "int"; isReadonly: true } + Property { name: "verticalAlignment"; type: "int" } + Property { name: "inputMethodHints"; type: "int" } + Property { name: "length"; type: "int"; isReadonly: true } + Property { name: "lineCount"; type: "int"; isReadonly: true } + Property { name: "readOnly"; type: "bool" } + Property { name: "selectedText"; type: "string"; isReadonly: true } + Property { name: "selectionEnd"; type: "int"; isReadonly: true } + Property { name: "selectionStart"; type: "int"; isReadonly: true } + Property { name: "text"; type: "string" } + Property { name: "textFormat"; type: "int" } + Property { name: "wrapMode"; type: "int" } + Property { name: "selectByKeyboard"; type: "bool" } + Property { name: "hoveredLink"; type: "string"; isReadonly: true } + Property { name: "backgroundVisible"; type: "bool" } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "textMargin"; type: "double" } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "contentHeight"; type: "double"; isReadonly: true } + Property { name: "textDocument"; type: "QQuickTextDocument"; isReadonly: true; isPointer: true } Signal { - name: "focusObjectChanged" - Parameter { name: "object"; type: "QObject"; isPointer: true } + name: "linkActivated" + Parameter { name: "link"; type: "string" } } Signal { - name: "opacityChanged" - revision: 1 - Parameter { name: "opacity"; type: "double" } - } - Method { name: "requestActivate"; revision: 1 } - Method { - name: "setVisible" - Parameter { name: "visible"; type: "bool" } + name: "linkHovered" + Parameter { name: "link"; type: "string" } } - Method { name: "show" } - Method { name: "hide" } - Method { name: "showMinimized" } - Method { name: "showMaximized" } - Method { name: "showFullScreen" } - Method { name: "showNormal" } - Method { name: "close"; type: "bool" } - Method { name: "raise" } - Method { name: "lower" } + Signal { name: "editingFinished" } Method { - name: "setTitle" - Parameter { type: "string" } + name: "append" + type: "QVariant" + Parameter { name: "string"; type: "QVariant" } } + Method { name: "copy"; type: "QVariant" } + Method { name: "cut"; type: "QVariant" } + Method { name: "deselect"; type: "QVariant" } Method { - name: "setX" - Parameter { name: "arg"; type: "int" } + name: "getFormattedText" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } Method { - name: "setY" - Parameter { name: "arg"; type: "int" } + name: "getText" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } + name: "insert" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "text"; type: "QVariant" } } Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } + name: "isRightToLeft" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } Method { - name: "setMinimumWidth" - Parameter { name: "w"; type: "int" } + name: "moveCursorSelection" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "mode"; type: "QVariant" } } + Method { name: "paste"; type: "QVariant" } Method { - name: "setMinimumHeight" - Parameter { name: "h"; type: "int" } + name: "positionAt" + type: "QVariant" + Parameter { name: "x"; type: "QVariant" } + Parameter { name: "y"; type: "QVariant" } } Method { - name: "setMaximumWidth" - Parameter { name: "w"; type: "int" } + name: "positionToRectangle" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } } + Method { name: "redo"; type: "QVariant" } Method { - name: "setMaximumHeight" - Parameter { name: "h"; type: "int" } + name: "remove" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } Method { - name: "alert" - revision: 1 - Parameter { name: "msec"; type: "int" } + name: "select" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/BusyIndicator" - exports: ["QtQuick.Controls/BusyIndicator 1.1"] - exportMetaObjectRevisions: [1] - isComposite: true - defaultProperty: "data" - Property { name: "running"; type: "bool" } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "QObject"; isPointer: true } - Property { name: "__panel"; type: "QQuickItem"; isPointer: true } - Property { name: "styleHints"; type: "QVariant" } - Property { name: "__styleData"; type: "QObject"; isPointer: true } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/Button" - exports: ["QtQuick.Controls/Button 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_49"; isPointer: true } - Property { name: "checkable"; type: "bool" } - Property { name: "checked"; type: "bool" } - Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } - Property { name: "action"; type: "QQuickAction"; isPointer: true } - Property { name: "activeFocusOnPress"; type: "bool" } - Property { name: "text"; type: "string" } - Property { name: "tooltip"; type: "string" } - Property { name: "iconSource"; type: "QUrl" } - Property { name: "iconName"; type: "string" } - Property { name: "__position"; type: "string" } - Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } - Property { name: "__action"; type: "QQuickAction"; isPointer: true } - Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } - Property { name: "__effectivePressed"; type: "bool" } - Property { name: "__behavior"; type: "QVariant" } - Property { name: "pressed"; type: "bool"; isReadonly: true } - Property { name: "hovered"; type: "bool"; isReadonly: true } - Signal { name: "clicked" } - Method { name: "accessiblePressAction"; type: "QVariant" } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "QObject"; isPointer: true } - Property { name: "__panel"; type: "QQuickItem"; isPointer: true } - Property { name: "styleHints"; type: "QVariant" } - Property { name: "__styleData"; type: "QObject"; isPointer: true } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/Calendar" - exports: ["QtQuick.Controls/Calendar 1.2"] - exportMetaObjectRevisions: [2] - isComposite: true - defaultProperty: "data" - Property { name: "visibleMonth"; type: "int" } - Property { name: "visibleYear"; type: "int" } + Method { name: "selectAll"; type: "QVariant" } + Method { name: "selectWord"; type: "QVariant" } + Method { name: "undo"; type: "QVariant" } Property { name: "frameVisible"; type: "bool" } - Property { name: "weekNumbersVisible"; type: "bool" } - Property { name: "navigationBarVisible"; type: "bool" } - Property { name: "dayOfWeekFormat"; type: "int" } - Property { name: "__model"; type: "QQuickCalendarModel"; isPointer: true } - Property { name: "__locale"; type: "QVariant" } - Property { name: "selectedDate"; type: "QDate" } - Property { name: "minimumDate"; type: "QDate" } - Property { name: "maximumDate"; type: "QDate" } - Signal { - name: "hovered" - Parameter { name: "date"; type: "QDateTime" } - } - Signal { - name: "pressed" - Parameter { name: "date"; type: "QDateTime" } - } - Signal { - name: "released" - Parameter { name: "date"; type: "QDateTime" } - } - Signal { - name: "clicked" - Parameter { name: "date"; type: "QDateTime" } - } - Signal { - name: "doubleClicked" - Parameter { name: "date"; type: "QDateTime" } - } - Signal { - name: "pressAndHold" - Parameter { name: "date"; type: "QDateTime" } - } - Method { name: "showPreviousMonth"; type: "QVariant" } - Method { name: "showNextMonth"; type: "QVariant" } - Method { name: "showPreviousYear"; type: "QVariant" } - Method { name: "showNextYear"; type: "QVariant" } - Method { name: "__selectPreviousMonth"; type: "QVariant" } - Method { name: "__selectNextMonth"; type: "QVariant" } - Method { name: "__selectPreviousWeek"; type: "QVariant" } - Method { name: "__selectNextWeek"; type: "QVariant" } - Method { name: "__selectFirstDayOfMonth"; type: "QVariant" } - Method { name: "__selectLastDayOfMonth"; type: "QVariant" } - Method { name: "__selectPreviousDay"; type: "QVariant" } - Method { name: "__selectNextDay"; type: "QVariant" } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "QObject"; isPointer: true } - Property { name: "__panel"; type: "QQuickItem"; isPointer: true } - Property { name: "styleHints"; type: "QVariant" } - Property { name: "__styleData"; type: "QObject"; isPointer: true } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/CheckBox" - exports: ["QtQuick.Controls/CheckBox 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "checkedState"; type: "int" } - Property { name: "partiallyCheckedEnabled"; type: "bool" } - Property { name: "__ignoreChecked"; type: "bool" } - Property { name: "__ignoreCheckedState"; type: "bool" } - Method { name: "__cycleCheckBoxStates"; type: "QVariant" } - Property { name: "checked"; type: "bool" } - Property { name: "activeFocusOnPress"; type: "bool" } - Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } - Property { name: "text"; type: "string" } - Property { name: "__cycleStatesHandler"; type: "QVariant" } - Property { name: "pressed"; type: "bool" } - Property { name: "hovered"; type: "bool"; isReadonly: true } - Signal { name: "clicked" } + Property { name: "highlightOnFocus"; type: "bool" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__scroller"; type: "QQuickItem"; isPointer: true } + Property { name: "__scrollBarTopMargin"; type: "int" } + Property { name: "__viewTopMargin"; type: "int" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "QObject"; isPointer: true } - Property { name: "__panel"; type: "QQuickItem"; isPointer: true } - Property { name: "styleHints"; type: "QVariant" } - Property { name: "__styleData"; type: "QObject"; isPointer: true } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/ComboBox" - exports: ["QtQuick.Controls/ComboBox 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "textRole"; type: "string" } - Property { name: "editable"; type: "bool" } - Property { name: "activeFocusOnPress"; type: "bool" } - Property { name: "pressed"; type: "bool"; isReadonly: true } - Property { name: "hovered"; type: "bool"; isReadonly: true } - Property { name: "menu"; type: "QQmlComponent"; isPointer: true } - Property { name: "selectByMouse"; type: "bool" } - Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } - Property { name: "__popup"; type: "QVariant" } - Property { name: "model"; type: "QVariant" } - Property { name: "currentIndex"; type: "int" } - Property { name: "currentText"; type: "string"; isReadonly: true } - Property { name: "editText"; type: "string" } - Property { name: "count"; type: "int"; isReadonly: true } - Property { name: "validator"; type: "QValidator"; isPointer: true } - Property { name: "acceptableInput"; type: "bool"; isReadonly: true } - Signal { name: "accepted" } - Signal { - name: "activated" - Parameter { name: "index"; type: "int" } - } - Method { - name: "textAt" - type: "QVariant" - Parameter { name: "index"; type: "QVariant" } + Property { name: "__style"; type: "Style_QMLTYPE_1"; isPointer: true } + Property { name: "horizontalScrollBarPolicy"; type: "int" } + Property { name: "verticalScrollBarPolicy"; type: "int" } + Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } + Property { name: "__wheelAreaScrollSpeed"; type: "double" } + Property { + name: "__horizontalScrollBar" + type: "ScrollBar_QMLTYPE_24" + isReadonly: true + isPointer: true } - Method { - name: "find" - type: "QVariant" - Parameter { name: "text"; type: "QVariant" } + Property { + name: "__verticalScrollBar" + type: "ScrollBar_QMLTYPE_24" + isReadonly: true + isPointer: true } - Method { name: "selectAll"; type: "QVariant" } - Method { name: "__selectPrevItem"; type: "QVariant" } - Method { name: "__selectNextItem"; type: "QVariant" } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "QObject"; isPointer: true } - Property { name: "__panel"; type: "QQuickItem"; isPointer: true } - Property { name: "styleHints"; type: "QVariant" } - Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Controls/GroupBox" - exports: ["QtQuick.Controls/GroupBox 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "__content" - Property { name: "title"; type: "string" } - Property { name: "flat"; type: "bool" } - Property { name: "checkable"; type: "bool" } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "checked"; type: "bool" } - Property { name: "__content"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "__checkbox"; type: "CheckBox_QMLTYPE_75"; isReadonly: true; isPointer: true } - Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } - } - Component { - prototype: "QQuickText" - name: "QtQuick.Controls/Label" - exports: ["QtQuick.Controls/Label 1.0"] + name: "QtQuick.Controls/TextArea 1.0" + exports: ["QtQuick.Controls/TextArea 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - } - Component { - prototype: "QObject" - name: "QtQuick.Controls/Menu" - exports: ["QtQuick.Controls/Menu 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "items" - Property { name: "__selfComponent"; type: "QQmlComponent"; isPointer: true } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__usingDefaultStyle"; type: "bool" } - Property { name: "__currentIndex"; type: "int" } - Property { name: "__parentContentItem"; type: "QVariant" } + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "tabChangesFocus"; type: "bool" } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "baseUrl"; type: "QUrl" } + Property { name: "canPaste"; type: "bool"; isReadonly: true } + Property { name: "canRedo"; type: "bool"; isReadonly: true } + Property { name: "canUndo"; type: "bool"; isReadonly: true } + Property { name: "textColor"; type: "QColor" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } + Property { name: "font"; type: "QFont" } + Property { name: "horizontalAlignment"; type: "int" } + Property { name: "effectiveHorizontalAlignment"; type: "int"; isReadonly: true } + Property { name: "verticalAlignment"; type: "int" } + Property { name: "inputMethodHints"; type: "int" } + Property { name: "length"; type: "int"; isReadonly: true } + Property { name: "lineCount"; type: "int"; isReadonly: true } + Property { name: "readOnly"; type: "bool" } + Property { name: "selectedText"; type: "string"; isReadonly: true } + Property { name: "selectionEnd"; type: "int"; isReadonly: true } + Property { name: "selectionStart"; type: "int"; isReadonly: true } + Property { name: "text"; type: "string" } + Property { name: "textFormat"; type: "int" } + Property { name: "wrapMode"; type: "int" } + Property { name: "selectByKeyboard"; type: "bool" } + Property { name: "hoveredLink"; type: "string"; isReadonly: true } + Property { name: "backgroundVisible"; type: "bool" } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "textMargin"; type: "double" } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "contentHeight"; type: "double"; isReadonly: true } + Property { name: "textDocument"; type: "QQuickTextDocument"; isReadonly: true; isPointer: true } + Signal { + name: "linkActivated" + Parameter { name: "link"; type: "string" } + } + Signal { + name: "linkHovered" + Parameter { name: "link"; type: "string" } + } + Signal { name: "editingFinished" } Method { - name: "addMenu" + name: "append" type: "QVariant" - Parameter { name: "title"; type: "QVariant" } + Parameter { name: "string"; type: "QVariant" } } + Method { name: "copy"; type: "QVariant" } + Method { name: "cut"; type: "QVariant" } + Method { name: "deselect"; type: "QVariant" } Method { - name: "insertMenu" + name: "getFormattedText" type: "QVariant" - Parameter { name: "index"; type: "QVariant" } - Parameter { name: "title"; type: "QVariant" } + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } - Property { name: "title"; type: "string" } - Property { name: "items"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "__selectedIndex"; type: "int" } - Property { name: "__popupVisible"; type: "bool"; isReadonly: true } - Property { name: "__contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "__minimumWidth"; type: "int" } - Property { name: "__font"; type: "QFont" } - Property { name: "__xOffset"; type: "double" } - Property { name: "__yOffset"; type: "double" } - Property { name: "__action"; type: "QQuickAction"; isReadonly: true; isPointer: true } - Property { name: "__popupGeometry"; type: "QRect"; isReadonly: true } - Signal { name: "__menuClosed" } - Signal { name: "popupVisibleChanged" } - Signal { name: "menuContentItemChanged" } - Signal { name: "minimumWidthChanged" } - Method { name: "__closeMenu" } - Method { name: "__dismissMenu" } - Method { name: "popup" } Method { - name: "addItem" - type: "QQuickMenuItem*" - Parameter { type: "string" } + name: "getText" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } Method { - name: "insertItem" - type: "QQuickMenuItem*" - Parameter { type: "int" } - Parameter { type: "string" } + name: "insert" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "text"; type: "QVariant" } } - Method { name: "addSeparator" } Method { - name: "insertSeparator" - Parameter { type: "int" } + name: "isRightToLeft" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } Method { - name: "removeItem" - Parameter { type: "QQuickMenuBase"; isPointer: true } + name: "moveCursorSelection" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "mode"; type: "QVariant" } } - Method { name: "clear" } + Method { name: "paste"; type: "QVariant" } Method { - name: "__popup" - Parameter { name: "targetRect"; type: "QRectF" } - Parameter { name: "atItemIndex"; type: "int" } - Parameter { name: "menuType"; type: "MenuType" } + name: "positionAt" + type: "QVariant" + Parameter { name: "x"; type: "QVariant" } + Parameter { name: "y"; type: "QVariant" } } Method { - name: "__popup" - Parameter { name: "targetRect"; type: "QRectF" } - Parameter { name: "atItemIndex"; type: "int" } + name: "positionToRectangle" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } } + Method { name: "redo"; type: "QVariant" } Method { - name: "__popup" - Parameter { name: "targetRect"; type: "QRectF" } + name: "remove" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } - Property { name: "enabled"; type: "bool" } - Property { name: "iconSource"; type: "QUrl" } - Property { name: "iconName"; type: "string" } - Property { name: "__icon"; type: "QVariant"; isReadonly: true } - Signal { name: "__textChanged" } - Property { name: "visible"; type: "bool" } - Property { name: "type"; type: "QQuickMenuItemType::MenuItemType"; isReadonly: true } - Property { name: "__parentMenu"; type: "QObject"; isReadonly: true; isPointer: true } - Property { name: "__isNative"; type: "bool"; isReadonly: true } - Property { name: "__visualItem"; type: "QQuickItem"; isPointer: true } - } - Component { - prototype: "QObject" - name: "QtQuick.Controls/MenuBar" - exports: ["QtQuick.Controls/MenuBar 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "menus" - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "QObject"; isPointer: true } - Property { name: "__menuBarComponent"; type: "QQmlComponent"; isPointer: true } - Property { name: "menus"; type: "QQuickMenu"; isList: true; isReadonly: true } - Property { name: "__contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "__parentWindow"; type: "QQuickWindow"; isPointer: true } - Property { name: "__isNative"; type: "bool" } - Signal { name: "nativeChanged" } - Signal { name: "contentItemChanged" } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/ProgressBar" - exports: ["QtQuick.Controls/ProgressBar 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "value"; type: "double" } - Property { name: "minimumValue"; type: "double" } - Property { name: "maximumValue"; type: "double" } - Property { name: "indeterminate"; type: "bool" } - Property { name: "orientation"; type: "int" } - Property { name: "__initialized"; type: "bool" } - Property { name: "hovered"; type: "bool"; isReadonly: true } Method { - name: "setValue" + name: "select" type: "QVariant" - Parameter { name: "v"; type: "QVariant" } + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "QObject"; isPointer: true } - Property { name: "__panel"; type: "QQuickItem"; isPointer: true } - Property { name: "styleHints"; type: "QVariant" } - Property { name: "__styleData"; type: "QObject"; isPointer: true } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/RadioButton" - exports: ["QtQuick.Controls/RadioButton 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "checked"; type: "bool" } - Property { name: "activeFocusOnPress"; type: "bool" } - Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } - Property { name: "text"; type: "string" } - Property { name: "__cycleStatesHandler"; type: "QVariant" } - Property { name: "pressed"; type: "bool" } - Property { name: "hovered"; type: "bool"; isReadonly: true } - Signal { name: "clicked" } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "QObject"; isPointer: true } - Property { name: "__panel"; type: "QQuickItem"; isPointer: true } - Property { name: "styleHints"; type: "QVariant" } - Property { name: "__styleData"; type: "QObject"; isPointer: true } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/ScrollView" - exports: ["QtQuick.Controls/ScrollView 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "contentItem" + Method { name: "selectAll"; type: "QVariant" } + Method { name: "selectWord"; type: "QVariant" } + Method { name: "undo"; type: "QVariant" } Property { name: "frameVisible"; type: "bool" } Property { name: "highlightOnFocus"; type: "bool" } Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } @@ -1585,7 +2114,7 @@ Property { name: "__scrollBarTopMargin"; type: "int" } Property { name: "__viewTopMargin"; type: "int" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "Style_QMLTYPE_2"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_1"; isPointer: true } Property { name: "horizontalScrollBarPolicy"; type: "int" } Property { name: "verticalScrollBarPolicy"; type: "int" } Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } @@ -1593,234 +2122,330 @@ Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_25" + type: "ScrollBar_QMLTYPE_24" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_25" + type: "ScrollBar_QMLTYPE_24" isReadonly: true isPointer: true } } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Controls/Slider" - exports: ["QtQuick.Controls/Slider 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "orientation"; type: "int" } - Property { name: "updateValueWhileDragging"; type: "bool" } - Property { name: "activeFocusOnPress"; type: "bool" } - Property { name: "tickmarksEnabled"; type: "bool" } - Property { name: "__horizontal"; type: "bool" } - Property { name: "__handlePos"; type: "double" } - Property { name: "minimumValue"; type: "double" } - Property { name: "maximumValue"; type: "double" } - Property { name: "pressed"; type: "bool"; isReadonly: true } - Property { name: "hovered"; type: "bool"; isReadonly: true } - Property { name: "stepSize"; type: "double" } - Property { name: "value"; type: "double" } - Method { name: "accessibleIncreaseAction"; type: "QVariant" } - Method { name: "accessibleDecreaseAction"; type: "QVariant" } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "QObject"; isPointer: true } - Property { name: "__panel"; type: "QQuickItem"; isPointer: true } - Property { name: "styleHints"; type: "QVariant" } - Property { name: "__styleData"; type: "QObject"; isPointer: true } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/SpinBox" - exports: ["QtQuick.Controls/SpinBox 1.0"] - exportMetaObjectRevisions: [0] + name: "QtQuick.Controls/TextArea 1.5" + exports: ["QtQuick.Controls/TextArea 1.5"] + exportMetaObjectRevisions: [5] isComposite: true defaultProperty: "data" - Property { name: "activeFocusOnPress"; type: "bool" } - Property { name: "horizontalAlignment"; type: "int" } - Property { name: "hovered"; type: "bool"; isReadonly: true } - Property { name: "selectByMouse"; type: "bool" } Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "tabChangesFocus"; type: "bool" } + Property { name: "selectByMouse"; type: "bool" } Property { name: "menu"; type: "QQmlComponent"; isPointer: true } - Property { name: "value"; type: "double" } - Property { name: "minimumValue"; type: "double" } - Property { name: "maximumValue"; type: "double" } - Property { name: "stepSize"; type: "double" } - Property { name: "suffix"; type: "string" } - Property { name: "prefix"; type: "string" } - Property { name: "decimals"; type: "int" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "baseUrl"; type: "QUrl" } + Property { name: "canPaste"; type: "bool"; isReadonly: true } + Property { name: "canRedo"; type: "bool"; isReadonly: true } + Property { name: "canUndo"; type: "bool"; isReadonly: true } + Property { name: "textColor"; type: "QColor" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } Property { name: "font"; type: "QFont" } - Property { name: "__text"; type: "string" } - Property { name: "__baselineOffset"; type: "double" } + Property { name: "horizontalAlignment"; type: "int" } + Property { name: "effectiveHorizontalAlignment"; type: "int"; isReadonly: true } + Property { name: "verticalAlignment"; type: "int" } + Property { name: "inputMethodHints"; type: "int" } + Property { name: "length"; type: "int"; isReadonly: true } + Property { name: "lineCount"; type: "int"; isReadonly: true } + Property { name: "readOnly"; type: "bool" } + Property { name: "selectedText"; type: "string"; isReadonly: true } + Property { name: "selectionEnd"; type: "int"; isReadonly: true } + Property { name: "selectionStart"; type: "int"; isReadonly: true } + Property { name: "text"; type: "string" } + Property { name: "textFormat"; type: "int" } + Property { name: "wrapMode"; type: "int" } + Property { name: "selectByKeyboard"; type: "bool" } + Property { name: "hoveredLink"; type: "string"; isReadonly: true } + Property { name: "backgroundVisible"; type: "bool" } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "textMargin"; type: "double" } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "contentHeight"; type: "double"; isReadonly: true } + Property { name: "textDocument"; type: "QQuickTextDocument"; isReadonly: true; isPointer: true } + Signal { + name: "linkActivated" + Parameter { name: "link"; type: "string" } + } + Signal { + name: "linkHovered" + Parameter { name: "link"; type: "string" } + } Signal { name: "editingFinished" } - Method { name: "__increment"; type: "QVariant" } - Method { name: "__decrement"; type: "QVariant" } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "QObject"; isPointer: true } - Property { name: "__panel"; type: "QQuickItem"; isPointer: true } - Property { name: "styleHints"; type: "QVariant" } - Property { name: "__styleData"; type: "QObject"; isPointer: true } - } - Component { - prototype: "QQuickItem" - name: "QtQuick.Controls/SplitView" - exports: ["QtQuick.Controls/SplitView 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "__contents" - Property { name: "orientation"; type: "int" } - Property { name: "handleDelegate"; type: "QQmlComponent"; isPointer: true } - Property { name: "resizing"; type: "bool" } - Property { name: "__contents"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "__items"; type: "QQuickItem"; isList: true; isReadonly: true } - Property { name: "__handles"; type: "QQuickItem"; isList: true; isReadonly: true } Method { - name: "addItem" + name: "append" type: "QVariant" - Parameter { name: "item"; type: "QVariant" } + Parameter { name: "string"; type: "QVariant" } } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/StackView" - exports: ["QtQuick.Controls/StackView 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "busy"; type: "bool"; isReadonly: true } - Property { name: "delegate"; type: "StackViewDelegate_QMLTYPE_167"; isPointer: true } - Property { name: "__currentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "__depth"; type: "int" } - Property { name: "__guard"; type: "bool" } - Property { name: "invalidItemReplacement"; type: "QQmlComponent"; isPointer: true } - Property { name: "initialItem"; type: "QVariant" } - Property { name: "__currentTransition"; type: "QVariant" } - Property { name: "depth"; type: "int"; isReadonly: true } - Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Method { name: "copy"; type: "QVariant" } + Method { name: "cut"; type: "QVariant" } + Method { name: "deselect"; type: "QVariant" } Method { - name: "push" + name: "getFormattedText" type: "QVariant" - Parameter { name: "item"; type: "QVariant" } + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } Method { - name: "pop" + name: "getText" type: "QVariant" - Parameter { name: "item"; type: "QVariant" } + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } - Method { name: "clear"; type: "QVariant" } Method { - name: "find" + name: "insert" type: "QVariant" - Parameter { name: "func"; type: "QVariant" } - Parameter { name: "onlySearchLoadedItems"; type: "QVariant" } + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "text"; type: "QVariant" } } Method { - name: "get" + name: "isRightToLeft" type: "QVariant" - Parameter { name: "index"; type: "QVariant" } - Parameter { name: "dontLoad"; type: "QVariant" } + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } - Method { name: "completeTransition"; type: "QVariant" } Method { - name: "replace" + name: "moveCursorSelection" type: "QVariant" - Parameter { name: "item"; type: "QVariant" } - Parameter { name: "properties"; type: "QVariant" } - Parameter { name: "immediate"; type: "QVariant" } + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "mode"; type: "QVariant" } } + Method { name: "paste"; type: "QVariant" } Method { - name: "__recursionGuard" + name: "positionAt" type: "QVariant" - Parameter { name: "use"; type: "QVariant" } + Parameter { name: "x"; type: "QVariant" } + Parameter { name: "y"; type: "QVariant" } } Method { - name: "__loadElement" + name: "positionToRectangle" type: "QVariant" - Parameter { name: "element"; type: "QVariant" } + Parameter { name: "position"; type: "QVariant" } } + Method { name: "redo"; type: "QVariant" } Method { - name: "__resolveComponent" + name: "remove" type: "QVariant" - Parameter { name: "unknownObjectType"; type: "QVariant" } - Parameter { name: "element"; type: "QVariant" } + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { + name: "select" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { name: "selectAll"; type: "QVariant" } + Method { name: "selectWord"; type: "QVariant" } + Method { name: "undo"; type: "QVariant" } + Property { name: "frameVisible"; type: "bool" } + Property { name: "highlightOnFocus"; type: "bool" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__scroller"; type: "QQuickItem"; isPointer: true } + Property { name: "__scrollBarTopMargin"; type: "int" } + Property { name: "__viewTopMargin"; type: "int" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_1"; isPointer: true } + Property { name: "horizontalScrollBarPolicy"; type: "int" } + Property { name: "verticalScrollBarPolicy"; type: "int" } + Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } + Property { name: "__wheelAreaScrollSpeed"; type: "double" } + Property { + name: "__horizontalScrollBar" + type: "ScrollBar_QMLTYPE_24" + isReadonly: true + isPointer: true + } + Property { + name: "__verticalScrollBar" + type: "ScrollBar_QMLTYPE_24" + isReadonly: true + isPointer: true + } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/TextField 1.0" + exports: ["QtQuick.Controls/TextField 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } + Property { name: "acceptableInput"; type: "bool"; isReadonly: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "canPaste"; type: "bool"; isReadonly: true } + Property { name: "canRedo"; type: "bool"; isReadonly: true } + Property { name: "canUndo"; type: "bool"; isReadonly: true } + Property { name: "textColor"; type: "QColor" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } + Property { name: "displayText"; type: "string"; isReadonly: true } + Property { name: "echoMode"; type: "int" } + Property { name: "font"; type: "QFont" } + Property { name: "horizontalAlignment"; type: "int" } + Property { name: "effectiveHorizontalAlignment"; type: "int"; isReadonly: true } + Property { name: "verticalAlignment"; type: "int" } + Property { name: "inputMask"; type: "string" } + Property { name: "inputMethodHints"; type: "int" } + Property { name: "length"; type: "int"; isReadonly: true } + Property { name: "maximumLength"; type: "int" } + Property { name: "placeholderText"; type: "string" } + Property { name: "readOnly"; type: "bool" } + Property { name: "selectedText"; type: "string"; isReadonly: true } + Property { name: "selectionEnd"; type: "int"; isReadonly: true } + Property { name: "selectionStart"; type: "int"; isReadonly: true } + Property { name: "text"; type: "string" } + Property { name: "validator"; type: "QValidator"; isPointer: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "__contentHeight"; type: "double"; isReadonly: true } + Property { name: "__contentWidth"; type: "double"; isReadonly: true } + Property { name: "__baselineOffset"; type: "double" } + Signal { name: "accepted" } + Signal { name: "editingFinished" } + Method { name: "copy"; type: "QVariant" } + Method { name: "cut"; type: "QVariant" } + Method { name: "deselect"; type: "QVariant" } + Method { + name: "getText" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { + name: "insert" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "text"; type: "QVariant" } } Method { - name: "__cleanup" + name: "isRightToLeft" type: "QVariant" - Parameter { name: "element"; type: "QVariant" } + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } + Method { name: "paste"; type: "QVariant" } + Method { name: "redo"; type: "QVariant" } Method { - name: "__setStatus" + name: "remove" type: "QVariant" - Parameter { name: "item"; type: "QVariant" } - Parameter { name: "status"; type: "QVariant" } + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } Method { - name: "__performTransition" + name: "select" type: "QVariant" - Parameter { name: "transition"; type: "QVariant" } + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } - Method { name: "animationFinished"; type: "QVariant" } + Method { name: "selectAll"; type: "QVariant" } + Method { name: "selectWord"; type: "QVariant" } + Method { name: "undo"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QObject" - name: "QtQuick.Controls/StackViewDelegate" - exports: ["QtQuick.Controls/StackViewDelegate 1.0"] + prototype: "QQuickText" + name: "QtQuick.Extras.Private/TextSingleton 1.0" + exports: ["QtQuick.Extras.Private/TextSingleton 1.0"] exportMetaObjectRevisions: [0] isComposite: true - Property { name: "pushTransition"; type: "QQmlComponent"; isPointer: true } - Property { name: "popTransition"; type: "QQmlComponent"; isPointer: true } - Property { name: "replaceTransition"; type: "QQmlComponent"; isPointer: true } - Method { - name: "getTransition" - type: "QVariant" - Parameter { name: "properties"; type: "QVariant" } - } - Method { - name: "transitionFinished" - type: "QVariant" - Parameter { name: "properties"; type: "QVariant" } - } + isCreatable: false + isSingleton: true + defaultProperty: "data" } Component { - prototype: "QQuickParallelAnimation" - name: "QtQuick.Controls/StackViewTransition" - exports: ["QtQuick.Controls/StackViewTransition 1.0"] + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/ToggleButton 1.0" + exports: ["QtQuick.Extras/ToggleButton 1.0"] exportMetaObjectRevisions: [0] isComposite: true - defaultProperty: "animations" - Property { name: "name"; type: "string" } - Property { name: "enterItem"; type: "QQuickItem"; isPointer: true } - Property { name: "exitItem"; type: "QQuickItem"; isPointer: true } - Property { name: "immediate"; type: "bool" } + defaultProperty: "data" + Property { name: "isDefault"; type: "bool" } + Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true } + Property { name: "checkable"; type: "bool" } + Property { name: "checked"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "action"; type: "QQuickAction"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "text"; type: "string" } + Property { name: "tooltip"; type: "string" } + Property { name: "iconSource"; type: "QUrl" } + Property { name: "iconName"; type: "string" } + Property { name: "__position"; type: "string" } + Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } + Property { name: "__action"; type: "QQuickAction"; isPointer: true } + Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } + Property { name: "__behavior"; type: "QVariant" } + Property { name: "__effectivePressed"; type: "bool" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Method { name: "accessiblePressAction"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Controls/StatusBar" - exports: ["QtQuick.Controls/StatusBar 1.0"] + name: "QtQuick.Controls/ToolBar 1.0" + exports: ["QtQuick.Controls/ToolBar 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "__content" Property { name: "style"; type: "QQmlComponent"; isPointer: true } Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "__menu"; type: "QVariant" } Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } Property { name: "__content"; type: "QObject"; isList: true; isReadonly: true } Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Controls/Switch" - exports: ["QtQuick.Controls/Switch 1.1"] - exportMetaObjectRevisions: [1] + name: "QtQuick.Controls/ToolButton 1.0" + exports: ["QtQuick.Controls/ToolButton 1.0"] + exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" + Property { name: "isDefault"; type: "bool" } + Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true } + Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } - Property { name: "activeFocusOnPress"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "action"; type: "QQuickAction"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "text"; type: "string" } + Property { name: "tooltip"; type: "string" } + Property { name: "iconSource"; type: "QUrl" } + Property { name: "iconName"; type: "string" } + Property { name: "__position"; type: "string" } + Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } + Property { name: "__action"; type: "QQuickAction"; isPointer: true } + Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } + Property { name: "__behavior"; type: "QVariant" } + Property { name: "__effectivePressed"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } Signal { name: "clicked" } + Method { name: "accessiblePressAction"; type: "QVariant" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } Property { name: "__style"; type: "QObject"; isPointer: true } Property { name: "__panel"; type: "QQuickItem"; isPointer: true } @@ -1828,81 +2453,61 @@ Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QQuickLoader" - name: "QtQuick.Controls/Tab" - exports: ["QtQuick.Controls/Tab 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "component" - Property { name: "title"; type: "string" } - Property { name: "__inserted"; type: "bool" } - Property { name: "component"; type: "QQmlComponent"; isPointer: true } - } - Component { prototype: "QQuickFocusScope" - name: "QtQuick.Controls/TabView" - exports: ["QtQuick.Controls/TabView 1.0"] - exportMetaObjectRevisions: [0] + name: "QtQuick.Controls/TreeView 1.5" + exports: ["QtQuick.Controls/TreeView 1.5"] + exportMetaObjectRevisions: [5] isComposite: true - defaultProperty: "data" - Property { name: "currentIndex"; type: "int" } - Property { name: "count"; type: "int"; isReadonly: true } - Property { name: "frameVisible"; type: "bool" } - Property { name: "tabsVisible"; type: "bool" } - Property { name: "tabPosition"; type: "int" } - Property { name: "__tabs"; type: "QQmlListModel"; isPointer: true } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__styleItem"; type: "QVariant" } - Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } - Method { - name: "addTab" - type: "QVariant" - Parameter { name: "title"; type: "QVariant" } - Parameter { name: "component"; type: "QVariant" } + defaultProperty: "__columns" + Property { name: "model"; type: "QVariant" } + Property { name: "currentIndex"; type: "QVariant"; isReadonly: true } + Property { name: "selection"; type: "QItemSelectionModel"; isPointer: true } + Property { name: "rootIndex"; type: "QModelIndex" } + Signal { + name: "activated" + Parameter { name: "index"; type: "QVariant" } } - Method { - name: "insertTab" - type: "QVariant" + Signal { + name: "clicked" Parameter { name: "index"; type: "QVariant" } - Parameter { name: "title"; type: "QVariant" } - Parameter { name: "component"; type: "QVariant" } } - Method { - name: "removeTab" - type: "QVariant" + Signal { + name: "doubleClicked" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "pressAndHold" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "expanded" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "collapsed" Parameter { name: "index"; type: "QVariant" } } Method { - name: "moveTab" + name: "isExpanded" type: "QVariant" - Parameter { name: "from"; type: "QVariant" } - Parameter { name: "to"; type: "QVariant" } + Parameter { name: "index"; type: "QVariant" } } Method { - name: "getTab" + name: "collapse" type: "QVariant" Parameter { name: "index"; type: "QVariant" } } Method { - name: "__willRemoveIndex" + name: "expand" type: "QVariant" Parameter { name: "index"; type: "QVariant" } } Method { - name: "__didInsertIndex" + name: "indexAt" type: "QVariant" - Parameter { name: "index"; type: "QVariant" } + Parameter { name: "x"; type: "QVariant" } + Parameter { name: "y"; type: "QVariant" } } - Method { name: "__setOpacities"; type: "QVariant" } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/TableView" - exports: ["QtQuick.Controls/TableView 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "__columns" Property { name: "alternatingRowColors"; type: "bool" } Property { name: "headerVisible"; type: "bool" } Property { name: "itemDelegate"; type: "QQmlComponent"; isPointer: true } @@ -1912,52 +2517,155 @@ Property { name: "sortIndicatorVisible"; type: "bool" } Property { name: "sortIndicatorOrder"; type: "int" } Property { name: "selectionMode"; type: "int" } + Property { name: "__viewTypeName"; type: "string" } + Property { name: "__isTreeView"; type: "bool"; isReadonly: true } + Property { name: "__itemDelegateLoader"; type: "QQmlComponent"; isPointer: true } + Property { name: "__model"; type: "QVariant" } Property { name: "__activateItemOnSingleClick"; type: "bool" } - Property { name: "model"; type: "QVariant" } + Property { name: "__mouseArea"; type: "QQuickItem"; isPointer: true } Property { name: "backgroundVisible"; type: "bool" } - Property { name: "__columns"; type: "QObject"; isList: true; isReadonly: true } Property { name: "contentHeader"; type: "QQmlComponent"; isPointer: true } Property { name: "contentFooter"; type: "QQmlComponent"; isPointer: true } - Property { name: "rowCount"; type: "int"; isReadonly: true } Property { name: "columnCount"; type: "int"; isReadonly: true } Property { name: "section"; type: "QQuickViewSection"; isReadonly: true; isPointer: true } - Property { name: "currentRow"; type: "int" } + Property { name: "__columns"; type: "QObject"; isList: true; isReadonly: true } Property { name: "__currentRowItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "__currentRow"; type: "int" } Property { name: "__listView"; type: "QQuickListView"; isReadonly: true; isPointer: true } + Method { + name: "addColumn" + type: "QVariant" + Parameter { name: "column"; type: "QVariant" } + } + Method { + name: "insertColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "column"; type: "QVariant" } + } + Method { + name: "removeColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { + name: "moveColumn" + type: "QVariant" + Parameter { name: "from"; type: "QVariant" } + Parameter { name: "to"; type: "QVariant" } + } + Method { + name: "getColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { name: "resizeColumnsToContents"; type: "QVariant" } + Property { name: "frameVisible"; type: "bool" } + Property { name: "highlightOnFocus"; type: "bool" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__scroller"; type: "QQuickItem"; isPointer: true } + Property { name: "__scrollBarTopMargin"; type: "int" } + Property { name: "__viewTopMargin"; type: "int" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_1"; isPointer: true } + Property { name: "horizontalScrollBarPolicy"; type: "int" } + Property { name: "verticalScrollBarPolicy"; type: "int" } + Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } + Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { - name: "selection" - type: "TableViewSelection_QMLTYPE_196" + name: "__horizontalScrollBar" + type: "ScrollBar_QMLTYPE_24" + isReadonly: true + isPointer: true + } + Property { + name: "__verticalScrollBar" + type: "ScrollBar_QMLTYPE_24" isReadonly: true isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/TreeView 1.4" + exports: ["QtQuick.Controls/TreeView 1.4"] + exportMetaObjectRevisions: [4] + isComposite: true + defaultProperty: "__columns" + Property { name: "model"; type: "QVariant" } + Property { name: "currentIndex"; type: "QVariant"; isReadonly: true } + Property { name: "selection"; type: "QItemSelectionModel"; isPointer: true } + Property { name: "rootIndex"; type: "QModelIndex" } Signal { name: "activated" - Parameter { name: "row"; type: "int" } + Parameter { name: "index"; type: "QVariant" } } Signal { name: "clicked" - Parameter { name: "row"; type: "int" } + Parameter { name: "index"; type: "QVariant" } } Signal { name: "doubleClicked" - Parameter { name: "row"; type: "int" } + Parameter { name: "index"; type: "QVariant" } } Signal { name: "pressAndHold" - Parameter { name: "row"; type: "int" } + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "expanded" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "collapsed" + Parameter { name: "index"; type: "QVariant" } + } + Method { + name: "isExpanded" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } Method { - name: "positionViewAtRow" + name: "collapse" type: "QVariant" - Parameter { name: "row"; type: "QVariant" } - Parameter { name: "mode"; type: "QVariant" } + Parameter { name: "index"; type: "QVariant" } } Method { - name: "rowAt" + name: "expand" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { + name: "indexAt" type: "QVariant" Parameter { name: "x"; type: "QVariant" } Parameter { name: "y"; type: "QVariant" } } + Property { name: "alternatingRowColors"; type: "bool" } + Property { name: "headerVisible"; type: "bool" } + Property { name: "itemDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "rowDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "headerDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "sortIndicatorColumn"; type: "int" } + Property { name: "sortIndicatorVisible"; type: "bool" } + Property { name: "sortIndicatorOrder"; type: "int" } + Property { name: "selectionMode"; type: "int" } + Property { name: "__viewTypeName"; type: "string" } + Property { name: "__isTreeView"; type: "bool"; isReadonly: true } + Property { name: "__itemDelegateLoader"; type: "QQmlComponent"; isPointer: true } + Property { name: "__model"; type: "QVariant" } + Property { name: "__activateItemOnSingleClick"; type: "bool" } + Property { name: "__mouseArea"; type: "QQuickItem"; isPointer: true } + Property { name: "backgroundVisible"; type: "bool" } + Property { name: "contentHeader"; type: "QQmlComponent"; isPointer: true } + Property { name: "contentFooter"; type: "QQmlComponent"; isPointer: true } + Property { name: "columnCount"; type: "int"; isReadonly: true } + Property { name: "section"; type: "QQuickViewSection"; isReadonly: true; isPointer: true } + Property { name: "__columns"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "__currentRowItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "__currentRow"; type: "int" } + Property { name: "__listView"; type: "QQuickListView"; isReadonly: true; isPointer: true } Method { name: "addColumn" type: "QVariant" @@ -1986,8 +2694,6 @@ Parameter { name: "index"; type: "QVariant" } } Method { name: "resizeColumnsToContents"; type: "QVariant" } - Method { name: "__decrementCurrentIndex"; type: "QVariant" } - Method { name: "__incrementCurrentIndex"; type: "QVariant" } Property { name: "frameVisible"; type: "bool" } Property { name: "highlightOnFocus"; type: "bool" } Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } @@ -1995,7 +2701,7 @@ Property { name: "__scrollBarTopMargin"; type: "int" } Property { name: "__viewTopMargin"; type: "int" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "Style_QMLTYPE_2"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_1"; isPointer: true } Property { name: "horizontalScrollBarPolicy"; type: "int" } Property { name: "verticalScrollBarPolicy"; type: "int" } Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } @@ -2003,302 +2709,345 @@ Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_25" + type: "ScrollBar_QMLTYPE_24" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_25" + type: "ScrollBar_QMLTYPE_24" isReadonly: true isPointer: true } } Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/Tumbler 1.2" + exports: ["QtQuick.Extras/Tumbler 1.2"] + exportMetaObjectRevisions: [2] + isComposite: true + defaultProperty: "data" + Property { name: "__highlightMoveDuration"; type: "int" } + Property { name: "columnCount"; type: "int"; isReadonly: true } + Property { name: "__columnRow"; type: "QQuickRow"; isReadonly: true; isPointer: true } + Property { name: "__movementDelayTimer"; type: "QQmlTimer"; isReadonly: true; isPointer: true } + Method { + name: "__isValidColumnIndex" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { + name: "__isValidColumnAndItemIndex" + type: "QVariant" + Parameter { name: "columnIndex"; type: "QVariant" } + Parameter { name: "itemIndex"; type: "QVariant" } + } + Method { + name: "currentIndexAt" + type: "QVariant" + Parameter { name: "columnIndex"; type: "QVariant" } + } + Method { + name: "setCurrentIndexAt" + type: "QVariant" + Parameter { name: "columnIndex"; type: "QVariant" } + Parameter { name: "itemIndex"; type: "QVariant" } + } + Method { + name: "getColumn" + type: "QVariant" + Parameter { name: "columnIndex"; type: "QVariant" } + } + Method { + name: "addColumn" + type: "QVariant" + Parameter { name: "column"; type: "QVariant" } + } + Method { + name: "insertColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "column"; type: "QVariant" } + } + Method { + name: "__viewAt" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { prototype: "QObject" - name: "QtQuick.Controls/TableViewColumn" - exports: ["QtQuick.Controls/TableViewColumn 1.0"] - exportMetaObjectRevisions: [0] + name: "QtQuick.Extras/TumblerColumn 1.2" + exports: ["QtQuick.Extras/TumblerColumn 1.2"] + exportMetaObjectRevisions: [2] isComposite: true - Property { name: "__view"; type: "QQuickItem"; isPointer: true } + Property { name: "__tumbler"; type: "QQuickItem"; isPointer: true } Property { name: "__index"; type: "int" } - Property { name: "title"; type: "string" } + Property { name: "__currentIndex"; type: "int" } + Property { name: "model"; type: "QVariant" } Property { name: "role"; type: "string" } - Property { name: "width"; type: "int" } - Property { name: "visible"; type: "bool" } - Property { name: "resizable"; type: "bool" } - Property { name: "movable"; type: "bool" } - Property { name: "elideMode"; type: "int" } - Property { name: "horizontalAlignment"; type: "int" } Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } - Method { name: "resizeToContents"; type: "QVariant" } + Property { name: "highlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "columnForeground"; type: "QQmlComponent"; isPointer: true } + Property { name: "visible"; type: "bool" } + Property { name: "activeFocus"; type: "bool"; isReadonly: true } + Property { name: "width"; type: "double" } + Property { name: "currentIndex"; type: "int"; isReadonly: true } } + + // + // Manually added to work around QtC limitations: + // Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/TextArea" - exports: ["QtQuick.Controls/TextArea 1.3"] - exportMetaObjectRevisions: [3] - isComposite: true + name: "QQuickWindow" defaultProperty: "data" - Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } - Property { name: "tabChangesFocus"; type: "bool" } - Property { name: "selectByMouse"; type: "bool" } - Property { name: "menu"; type: "QQmlComponent"; isPointer: true } - Property { name: "activeFocusOnPress"; type: "bool" } - Property { name: "baseUrl"; type: "QUrl" } - Property { name: "canPaste"; type: "bool"; isReadonly: true } - Property { name: "canRedo"; type: "bool"; isReadonly: true } - Property { name: "canUndo"; type: "bool"; isReadonly: true } - Property { name: "textColor"; type: "QColor" } - Property { name: "cursorPosition"; type: "int" } - Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } - Property { name: "font"; type: "QFont" } - Property { name: "horizontalAlignment"; type: "int" } - Property { name: "effectiveHorizontalAlignment"; type: "int"; isReadonly: true } - Property { name: "verticalAlignment"; type: "int" } - Property { name: "inputMethodHints"; type: "int" } - Property { name: "length"; type: "int"; isReadonly: true } - Property { name: "lineCount"; type: "int"; isReadonly: true } - Property { name: "readOnly"; type: "bool" } - Property { name: "selectedText"; type: "string"; isReadonly: true } - Property { name: "selectionEnd"; type: "int"; isReadonly: true } - Property { name: "selectionStart"; type: "int"; isReadonly: true } - Property { name: "text"; type: "string" } - Property { name: "textFormat"; type: "int" } - Property { name: "wrapMode"; type: "int" } - Property { name: "selectByKeyboard"; type: "bool" } - Property { name: "hoveredLink"; type: "string"; isReadonly: true } - Property { name: "backgroundVisible"; type: "bool" } + prototype: "QWindow" + exports: [ + "QtQuick.Window/Window 2.0", + "QtQuick.Window/Window 2.1", + "QtQuick.Window/Window 2.2" + ] + exportMetaObjectRevisions: [0, 1, 2] + Enum { + name: "SceneGraphError" + values: { + "ContextNotAvailable": 1 + } + } Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "textMargin"; type: "double" } - Property { name: "contentWidth"; type: "double"; isReadonly: true } - Property { name: "contentHeight"; type: "double"; isReadonly: true } - Property { name: "textDocument"; type: "QQuickTextDocument"; isReadonly: true; isPointer: true } + Property { name: "color"; type: "QColor" } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { + name: "activeFocusItem" + revision: 1 + type: "QQuickItem" + isReadonly: true + isPointer: true + } + Signal { name: "frameSwapped" } + Signal { + name: "openglContextCreated" + revision: 2 + Parameter { name: "context"; type: "QOpenGLContext"; isPointer: true } + } + Signal { name: "sceneGraphInitialized" } + Signal { name: "sceneGraphInvalidated" } + Signal { name: "beforeSynchronizing" } + Signal { name: "afterSynchronizing"; revision: 2 } + Signal { name: "beforeRendering" } + Signal { name: "afterRendering" } + Signal { name: "afterAnimating"; revision: 2 } + Signal { name: "sceneGraphAboutToStop"; revision: 2 } + Signal { + name: "closing" + revision: 1 + Parameter { name: "close"; type: "QQuickCloseEvent"; isPointer: true } + } + Signal { + name: "colorChanged" + Parameter { type: "QColor" } + } + Signal { name: "activeFocusItemChanged"; revision: 1 } + Signal { + name: "sceneGraphError" + revision: 2 + Parameter { name: "error"; type: "QQuickWindow::SceneGraphError" } + Parameter { name: "message"; type: "string" } + } + Method { name: "update" } + Method { name: "releaseResources" } + } + Component { + name: "QQuickWindowAttached" + prototype: "QObject" + Property { name: "visibility"; type: "QWindow::Visibility"; isReadonly: true } + Property { name: "active"; type: "bool"; isReadonly: true } + Property { name: "activeFocusItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "width"; type: "int"; isReadonly: true } + Property { name: "height"; type: "int"; isReadonly: true } + } + Component { + name: "QQuickWindowQmlImpl" + defaultProperty: "data" + prototype: "QQuickWindow" + exports: ["QtQuick.Window/Window 2.1", "QtQuick.Window/Window 2.2"] + exportMetaObjectRevisions: [0, 1] + attachedType: "QQuickWindowAttached" + Property { name: "visible"; type: "bool" } + Property { name: "visibility"; type: "Visibility" } + Signal { + name: "visibleChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "visibilityChanged" + Parameter { name: "visibility"; type: "QWindow::Visibility" } + } + } + Component { + name: "QWindow" + prototype: "QObject" + Enum { + name: "Visibility" + values: { + "Hidden": 0, + "AutomaticVisibility": 1, + "Windowed": 2, + "Minimized": 3, + "Maximized": 4, + "FullScreen": 5 + } + } + Property { name: "title"; type: "string" } + Property { name: "modality"; type: "Qt::WindowModality" } + Property { name: "flags"; type: "Qt::WindowFlags" } + Property { name: "x"; type: "int" } + Property { name: "y"; type: "int" } + Property { name: "width"; type: "int" } + Property { name: "height"; type: "int" } + Property { name: "minimumWidth"; type: "int" } + Property { name: "minimumHeight"; type: "int" } + Property { name: "maximumWidth"; type: "int" } + Property { name: "maximumHeight"; type: "int" } + Property { name: "visible"; type: "bool" } + Property { name: "active"; revision: 1; type: "bool"; isReadonly: true } + Property { name: "visibility"; revision: 1; type: "Visibility" } + Property { name: "contentOrientation"; type: "Qt::ScreenOrientation" } + Property { name: "opacity"; revision: 1; type: "double" } + Signal { + name: "screenChanged" + Parameter { name: "screen"; type: "QScreen"; isPointer: true } + } + Signal { + name: "modalityChanged" + Parameter { name: "modality"; type: "Qt::WindowModality" } + } + Signal { + name: "windowStateChanged" + Parameter { name: "windowState"; type: "Qt::WindowState" } + } + Signal { + name: "windowTitleChanged" + revision: 2 + Parameter { name: "title"; type: "string" } + } + Signal { + name: "xChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "yChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "widthChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "heightChanged" + Parameter { name: "arg"; type: "int" } + } Signal { - name: "linkActivated" - Parameter { name: "link"; type: "string" } + name: "minimumWidthChanged" + Parameter { name: "arg"; type: "int" } } Signal { - name: "linkHovered" - Parameter { name: "link"; type: "string" } + name: "minimumHeightChanged" + Parameter { name: "arg"; type: "int" } } - Method { - name: "append" - type: "QVariant" - Parameter { name: "string"; type: "QVariant" } + Signal { + name: "maximumWidthChanged" + Parameter { name: "arg"; type: "int" } } - Method { name: "copy"; type: "QVariant" } - Method { name: "cut"; type: "QVariant" } - Method { name: "deselect"; type: "QVariant" } - Method { - name: "getFormattedText" - type: "QVariant" - Parameter { name: "start"; type: "QVariant" } - Parameter { name: "end"; type: "QVariant" } + Signal { + name: "maximumHeightChanged" + Parameter { name: "arg"; type: "int" } } - Method { - name: "getText" - type: "QVariant" - Parameter { name: "start"; type: "QVariant" } - Parameter { name: "end"; type: "QVariant" } + Signal { + name: "visibleChanged" + Parameter { name: "arg"; type: "bool" } } - Method { - name: "insert" - type: "QVariant" - Parameter { name: "position"; type: "QVariant" } - Parameter { name: "text"; type: "QVariant" } + Signal { + name: "visibilityChanged" + revision: 1 + Parameter { name: "visibility"; type: "QWindow::Visibility" } } - Method { - name: "isRightToLeft" - type: "QVariant" - Parameter { name: "start"; type: "QVariant" } - Parameter { name: "end"; type: "QVariant" } + Signal { name: "activeChanged"; revision: 1 } + Signal { + name: "contentOrientationChanged" + Parameter { name: "orientation"; type: "Qt::ScreenOrientation" } + } + Signal { + name: "focusObjectChanged" + Parameter { name: "object"; type: "QObject"; isPointer: true } } + Signal { + name: "opacityChanged" + revision: 1 + Parameter { name: "opacity"; type: "double" } + } + Method { name: "requestActivate"; revision: 1 } Method { - name: "moveCursorSelection" - type: "QVariant" - Parameter { name: "position"; type: "QVariant" } - Parameter { name: "mode"; type: "QVariant" } + name: "setVisible" + Parameter { name: "visible"; type: "bool" } } - Method { name: "paste"; type: "QVariant" } + Method { name: "show" } + Method { name: "hide" } + Method { name: "showMinimized" } + Method { name: "showMaximized" } + Method { name: "showFullScreen" } + Method { name: "showNormal" } + Method { name: "close"; type: "bool" } + Method { name: "raise" } + Method { name: "lower" } Method { - name: "positionAt" - type: "QVariant" - Parameter { name: "x"; type: "QVariant" } - Parameter { name: "y"; type: "QVariant" } + name: "setTitle" + Parameter { type: "string" } } Method { - name: "positionToRectangle" - type: "QVariant" - Parameter { name: "position"; type: "QVariant" } + name: "setX" + Parameter { name: "arg"; type: "int" } } - Method { name: "redo"; type: "QVariant" } Method { - name: "remove" - type: "QVariant" - Parameter { name: "start"; type: "QVariant" } - Parameter { name: "end"; type: "QVariant" } + name: "setY" + Parameter { name: "arg"; type: "int" } } Method { - name: "select" - type: "QVariant" - Parameter { name: "start"; type: "QVariant" } - Parameter { name: "end"; type: "QVariant" } + name: "setWidth" + Parameter { name: "arg"; type: "int" } } - Method { name: "selectAll"; type: "QVariant" } - Method { name: "selectWord"; type: "QVariant" } - Method { name: "undo"; type: "QVariant" } - Property { name: "frameVisible"; type: "bool" } - Property { name: "highlightOnFocus"; type: "bool" } - Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "__scroller"; type: "QQuickItem"; isPointer: true } - Property { name: "__scrollBarTopMargin"; type: "int" } - Property { name: "__viewTopMargin"; type: "int" } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "Style_QMLTYPE_2"; isPointer: true } - Property { name: "horizontalScrollBarPolicy"; type: "int" } - Property { name: "verticalScrollBarPolicy"; type: "int" } - Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } - Property { name: "__wheelAreaScrollSpeed"; type: "double" } - Property { - name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_25" - isReadonly: true - isPointer: true + Method { + name: "setHeight" + Parameter { name: "arg"; type: "int" } } - Property { - name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_25" - isReadonly: true - isPointer: true + Method { + name: "setMinimumWidth" + Parameter { name: "w"; type: "int" } } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/TextField" - exports: ["QtQuick.Controls/TextField 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } - Property { name: "selectByMouse"; type: "bool" } - Property { name: "menu"; type: "QQmlComponent"; isPointer: true } - Property { name: "acceptableInput"; type: "bool"; isReadonly: true } - Property { name: "activeFocusOnPress"; type: "bool" } - Property { name: "canPaste"; type: "bool"; isReadonly: true } - Property { name: "canRedo"; type: "bool"; isReadonly: true } - Property { name: "canUndo"; type: "bool"; isReadonly: true } - Property { name: "textColor"; type: "QColor" } - Property { name: "cursorPosition"; type: "int" } - Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } - Property { name: "displayText"; type: "string"; isReadonly: true } - Property { name: "echoMode"; type: "int" } - Property { name: "font"; type: "QFont" } - Property { name: "horizontalAlignment"; type: "int" } - Property { name: "effectiveHorizontalAlignment"; type: "int"; isReadonly: true } - Property { name: "verticalAlignment"; type: "int" } - Property { name: "inputMask"; type: "string" } - Property { name: "inputMethodHints"; type: "int" } - Property { name: "length"; type: "int"; isReadonly: true } - Property { name: "maximumLength"; type: "int" } - Property { name: "placeholderText"; type: "string" } - Property { name: "readOnly"; type: "bool" } - Property { name: "selectedText"; type: "string"; isReadonly: true } - Property { name: "selectionEnd"; type: "int"; isReadonly: true } - Property { name: "selectionStart"; type: "int"; isReadonly: true } - Property { name: "text"; type: "string" } - Property { name: "validator"; type: "QValidator"; isPointer: true } - Property { name: "hovered"; type: "bool"; isReadonly: true } - Property { name: "__contentHeight"; type: "double"; isReadonly: true } - Property { name: "__contentWidth"; type: "double"; isReadonly: true } - Property { name: "__baselineOffset"; type: "double" } - Signal { name: "accepted" } - Signal { name: "editingFinished" } - Method { name: "copy"; type: "QVariant" } - Method { name: "cut"; type: "QVariant" } - Method { name: "deselect"; type: "QVariant" } Method { - name: "getText" - type: "QVariant" - Parameter { name: "start"; type: "QVariant" } - Parameter { name: "end"; type: "QVariant" } + name: "setMinimumHeight" + Parameter { name: "h"; type: "int" } } Method { - name: "insert" - type: "QVariant" - Parameter { name: "position"; type: "QVariant" } - Parameter { name: "text"; type: "QVariant" } + name: "setMaximumWidth" + Parameter { name: "w"; type: "int" } } Method { - name: "isRightToLeft" - type: "QVariant" - Parameter { name: "start"; type: "QVariant" } - Parameter { name: "end"; type: "QVariant" } + name: "setMaximumHeight" + Parameter { name: "h"; type: "int" } } - Method { name: "paste"; type: "QVariant" } - Method { name: "redo"; type: "QVariant" } Method { - name: "select" - type: "QVariant" - Parameter { name: "start"; type: "QVariant" } - Parameter { name: "end"; type: "QVariant" } + name: "alert" + revision: 1 + Parameter { name: "msec"; type: "int" } } - Method { name: "selectAll"; type: "QVariant" } - Method { name: "selectWord"; type: "QVariant" } - Method { name: "undo"; type: "QVariant" } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "QObject"; isPointer: true } - Property { name: "__panel"; type: "QQuickItem"; isPointer: true } - Property { name: "styleHints"; type: "QVariant" } - Property { name: "__styleData"; type: "QObject"; isPointer: true } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/ToolBar" - exports: ["QtQuick.Controls/ToolBar 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "__content" - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__panel"; type: "QQuickItem"; isPointer: true } - Property { name: "__menu"; type: "QVariant" } - Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } - Property { name: "__content"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - } - Component { - prototype: "QQuickFocusScope" - name: "QtQuick.Controls/ToolButton" - exports: ["QtQuick.Controls/ToolButton 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_49"; isPointer: true } - Property { name: "checkable"; type: "bool" } - Property { name: "checked"; type: "bool" } - Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } - Property { name: "action"; type: "QQuickAction"; isPointer: true } - Property { name: "activeFocusOnPress"; type: "bool" } - Property { name: "text"; type: "string" } - Property { name: "tooltip"; type: "string" } - Property { name: "iconSource"; type: "QUrl" } - Property { name: "iconName"; type: "string" } - Property { name: "__position"; type: "string" } - Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } - Property { name: "__action"; type: "QQuickAction"; isPointer: true } - Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } - Property { name: "__effectivePressed"; type: "bool" } - Property { name: "__behavior"; type: "QVariant" } - Property { name: "pressed"; type: "bool"; isReadonly: true } - Property { name: "hovered"; type: "bool"; isReadonly: true } - Signal { name: "clicked" } - Method { name: "accessiblePressAction"; type: "QVariant" } - Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "QObject"; isPointer: true } - Property { name: "__panel"; type: "QQuickItem"; isPointer: true } - Property { name: "styleHints"; type: "QVariant" } - Property { name: "__styleData"; type: "QObject"; isPointer: true } + Method { name: "requestUpdate"; revision: 3 } } + } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/AbstractCheckable.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/AbstractCheckable.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/AbstractCheckable.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/AbstractCheckable.qml 2016-05-24 04:32:21.000000000 +0000 @@ -41,7 +41,6 @@ /*! \qmltype AbstractCheckable \inqmlmodule QtQuick.Controls - \ingroup controls \brief An abstract representation of a checkable control with a label \qmlabstract \internal diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/BasicButton.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/BasicButton.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/BasicButton.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/BasicButton.qml 2016-05-24 04:32:21.000000000 +0000 @@ -38,6 +38,7 @@ import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 import QtQuick.Controls.Styles 1.1 +import QtQuick.Window 2.2 /*! \qmltype BasicButton @@ -146,6 +147,7 @@ Action { id: ownAction + enabled: button.enabled iconSource: !button.action || __iconOverriden ? button.iconSource : "" iconName: !button.action || __iconOverriden ? button.iconName : "" @@ -205,7 +207,7 @@ Timer { interval: 1000 - running: behavior.containsMouse && !pressed && tooltip.length + running: behavior.containsMouse && !pressed && tooltip.length && behavior.Window.visibility !== Window.Hidden onTriggered: Tooltip.showText(behavior, Qt.point(behavior.mouseX, behavior.mouseY), tooltip) } } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/BasicTableView.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/BasicTableView.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/BasicTableView.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/BasicTableView.qml 2016-05-24 04:32:21.000000000 +0000 @@ -45,8 +45,8 @@ // We mean it. // -import QtQuick 2.4 -import QtQuick.Controls 1.3 +import QtQuick 2.6 +import QtQuick.Controls 1.5 import QtQuick.Controls.Private 1.0 import QtQuick.Controls.Styles 1.2 import QtQuick.Window 2.2 @@ -94,6 +94,7 @@ property Component itemDelegate: __style ? __style.itemDelegate : null /*! \qmlproperty Component BasicTableView::rowDelegate + \keyword basictableview-rowdelegate This property defines a delegate to draw a row. @@ -116,6 +117,7 @@ property Component rowDelegate: __style ? __style.rowDelegate : null /*! \qmlproperty Component BasicTableView::headerDelegate + \keyword basictableview-headerdelegate This property defines a delegate to draw a header. @@ -297,6 +299,8 @@ console.warn(__viewTypeName + "::moveColumn(): Can't move column 0") return } + if (sortIndicatorColumn === from) + sortIndicatorColumn = to columnModel.move(from, to, 1) } @@ -321,7 +325,7 @@ function resizeColumnsToContents () { for (var i = 0; i < __columns.length; ++i) { var col = getColumn(i) - var header = repeater.itemAt(i) + var header = __listView.headerItem.headerRepeater.itemAt(i) if (col) { col.__index = i col.resizeToContents() @@ -345,8 +349,8 @@ implicitHeight: 150 frameVisible: true - __scrollBarTopMargin: (__style && __style.transientScrollBars || Qt.platform.os === "osx") ? headerrow.height : 0 - __viewTopMargin: headerrow.height + __scrollBarTopMargin: headerVisible && (listView.transientScrollBars || Qt.platform.os === "osx") + ? listView.headerItem.height : 0 /*! \internal Use this to display user-friendly messages in TableView and TreeView common functions. @@ -391,13 +395,32 @@ focus: true activeFocusOnTab: false Keys.forwardTo: [__mouseArea] - anchors.topMargin: headerVisible ? tableHeader.height : 0 anchors.fill: parent + contentWidth: headerItem.headerRow.width + listView.vScrollbarPadding + // ### FIXME Late configuration of the header item requires + // this binding to get the header visible after creation + contentY: -headerItem.height + currentIndex: -1 visible: columnCount > 0 interactive: Settings.hasTouchScreen property var rowItemStack: [] // Used as a cache for rowDelegates + readonly property bool transientScrollbars: __style && !!__style.transientScrollBars + readonly property real vScrollbarPadding: __scroller.verticalScrollBar.visible + && !transientScrollbars && Qt.platform.os === "osx" ? + __verticalScrollBar.width + __scroller.scrollBarSpacing + root.__style.padding.right : 0 + + Binding { + // On Mac, we reserve the vSB space in the contentItem because the vSB should + // appear under the header. Unfortunately, the ListView header won't expand + // beyond the ListView's boundaries, that's why we need to ressort to this. + target: root.__scroller + when: Qt.platform.os === "osx" + property: "verticalScrollbarOffset" + value: 0 + } + function incrementCurrentIndexBlocking() { var oldIndex = __listView.currentIndex __scroller.blockUpdates = true; @@ -568,7 +591,6 @@ id: itemrow height: parent.height Repeater { - id: repeater model: columnModel delegate: __itemDelegateLoader @@ -584,27 +606,17 @@ } } - Item { + headerPositioning: ListView.OverlayHeader + header: Item { id: tableHeader - clip: true - parent: __scroller visible: headerVisible - anchors.top: parent.top - anchors.topMargin: viewport.anchors.topMargin - anchors.leftMargin: viewport.anchors.leftMargin - anchors.margins: viewport.anchors.margins - anchors.rightMargin: (frameVisible ? __scroller.rightMargin : 0) + - (__scroller.outerFrame && __scrollBarTopMargin ? 0 - : __verticalScrollBar.width + __scroller.scrollBarSpacing + root.__style.padding.right) - - anchors.left: parent.left - anchors.right: parent.right - - height: headerrow.height + width: Math.max(headerRow.width + listView.vScrollbarPadding, root.viewport.width) + height: visible ? headerRow.height : 0 + property alias headerRow: row + property alias headerRepeater: repeater Row { - id: headerrow - x: -listView.contentX + id: row Repeater { id: repeater @@ -628,8 +640,7 @@ Loader { id: headerStyle sourceComponent: root.headerDelegate - anchors.left: parent.left - anchors.right: parent.right + width: parent.width property QtObject styleData: QtObject { readonly property string value: modelData.title readonly property bool pressed: headerClickArea.pressed @@ -666,7 +677,7 @@ onPositionChanged: { if (drag.active && modelData.movable && pressed && columnCount > 1) { // only do this while dragging for (var h = columnCount-1 ; h >= 0 ; --h) { - if (drag.target.x + listView.contentX + headerRowDelegate.width/2 > headerrow.children[h].x) { + if (headerRow.children[h].visible && drag.target.x + headerRowDelegate.width/2 > headerRow.children[h].x) { repeater.targetIndex = h break } @@ -682,9 +693,9 @@ if (repeater.targetIndex >= 0 && repeater.targetIndex !== index ) { var targetColumn = columnModel.get(repeater.targetIndex).columnItem if (targetColumn.movable && (!__isTreeView || repeater.targetIndex > 0)) { - columnModel.move(index, repeater.targetIndex, 1) if (sortIndicatorColumn === index) sortIndicatorColumn = repeater.targetIndex + columnModel.move(index, repeater.targetIndex, 1) } } repeater.targetIndex = -1 @@ -704,7 +715,7 @@ } parent: tableHeader x: __implicitX - property double __implicitX: headerRowDelegate.x - listView.contentX + property double __implicitX: headerRowDelegate.x width: modelData.width height: parent.height sourceComponent: root.headerDelegate @@ -738,12 +749,9 @@ } } } - - onWidthChanged: listView.contentWidth = width } Loader { - id: loader property QtObject styleData: QtObject{ readonly property string value: "" readonly property bool pressed: false @@ -754,17 +762,17 @@ anchors.top: parent.top anchors.right: parent.right - anchors.bottom: headerrow.bottom - anchors.rightMargin: -2 + anchors.bottom: headerRow.bottom sourceComponent: root.headerDelegate - width: root.width - headerrow.width + 2 - visible: root.columnCount + readonly property real __remainingWidth: parent.width - headerRow.width + visible: __remainingWidth > 0 + width: __remainingWidth z:-1 } } function columnAt(offset) { - var item = headerrow.childAt(offset, 0) + var item = listView.headerItem.headerRow.childAt(offset, 0) return item ? item.column : -1 } } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/ColumnMenuContent.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/ColumnMenuContent.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/ColumnMenuContent.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/ColumnMenuContent.qml 2016-05-24 04:32:21.000000000 +0000 @@ -201,7 +201,7 @@ onPositionChanged: updateCurrentItem({ "x": mouse.x, "y": mouse.y }) onPressed: updateCurrentItem({ "x": mouse.x, "y": mouse.y }) onReleased: { - if (currentItem.__menuItem.enabled) { + if (currentItem && currentItem.__menuItem.enabled) { if (currentItem.styleData.type === MenuItemType.Menu) { showCurrentItemSubMenu(true) } else { diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/Control.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/Control.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/Control.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/Control.qml 2016-05-24 04:32:21.000000000 +0000 @@ -72,19 +72,20 @@ property alias __styleData: styleLoader.styleData Loader { + id: styleLoader + sourceComponent: style + property Item __control: root + property QtObject styleData: null + onStatusChanged: { + if (status === Loader.Error) + console.error("Failed to load Style for", root) + } + } + + Loader { id: panelLoader anchors.fill: parent sourceComponent: __style ? __style.panel : null onStatusChanged: if (status === Loader.Error) console.error("Failed to load Style for", root) - Loader { - id: styleLoader - sourceComponent: style - property Item __control: root - property QtObject styleData: null - onStatusChanged: { - if (status === Loader.Error) - console.error("Failed to load Style for", root) - } - } } } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/EditMenu_base.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/EditMenu_base.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/EditMenu_base.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/EditMenu_base.qml 2016-05-24 04:32:21.000000000 +0000 @@ -161,8 +161,7 @@ if (control.menu) { var menu = getMenuInstance(); - menu.__dismissMenu(); - menu.__destroyAllMenuPopups(); + menu.__dismissAndDestroy(); var menuPos = mapToItem(null, mouse.x, mouse.y) menu.__popup(Qt.rect(menuPos.x, menuPos.y, 0, 0), -1, MenuPrivate.EditMenu); } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/EditMenu_ios.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/EditMenu_ios.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/EditMenu_ios.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/EditMenu_ios.qml 2016-05-24 04:32:21.000000000 +0000 @@ -34,97 +34,41 @@ ** ****************************************************************************/ -import QtQuick 2.1 -import QtQuick.Controls 1.1 +import QtQuick 2.2 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Private 1.0 Item { anchors.fill: parent - property bool __showMenuFromTouchAndHold: false + property bool __showMenuFromTouch: false property Component defaultMenu: Menu { - MenuItem { - text: qsTr("Cut") - visible: !input.readOnly && selectionStart !== selectionEnd - onTriggered: { - cut(); - select(input.cursorPosition, input.cursorPosition); - } - } - MenuItem { - text: qsTr("Copy") - visible: selectionStart !== selectionEnd - onTriggered: { - copy(); - select(input.cursorPosition, input.cursorPosition); - } - } - MenuItem { - text: qsTr("Paste") - visible: input.canPaste - onTriggered: paste(); - } - MenuItem { - text: qsTr("Delete") - visible: !input.readOnly && selectionStart !== selectionEnd - onTriggered: remove(selectionStart, selectionEnd) - } - MenuItem { - text: qsTr("Select") - visible: selectionStart === selectionEnd && input.length > 0 - onTriggered: selectWord(); - } - MenuItem { - text: qsTr("Select All") - visible: !(selectionStart === 0 && selectionEnd === length) - onTriggered: selectAll(); - } + /* iOS plugin will automatically populate edit menus with standard edit actions */ } Connections { target: mouseArea - function clearFocusFromOtherItems() - { - var selectionItem = TextSingleton.selectionItem; - if (!selectionItem) - return; - var otherPos = selectionItem.cursorPosition; - selectionItem.select(otherPos, otherPos) - } - onClicked: { - if (control.menu && getMenuInstance().__popupVisible) { - select(input.cursorPosition, input.cursorPosition); - } else { + var pos = input.positionAt(mouse.x, mouse.y); + var posMoved = (pos !== input.cursorPosition); + var popupVisible = (control.menu && getMenuInstance().__popupVisible); + + if (!input.activeFocus) input.activate(); - clearFocusFromOtherItems(); - } + else if (!popupVisible && !posMoved) + __showMenuFromTouch = true; - if (input.activeFocus) { - var pos = input.positionAt(mouse.x, mouse.y) - input.moveHandles(pos, pos) - } + input.moveHandles(pos, pos) + menuTimer.start(); } onPressAndHold: { - var pos = input.positionAt(mouseArea.mouseX, mouseArea.mouseY); - input.select(pos, pos); - var hasSelection = selectionStart != selectionEnd; - if (!control.menu || (input.length > 0 && (!input.activeFocus || hasSelection))) { - selectWord(); - } else { - // We don't select anything at this point, the - // menu will instead offer to select a word. - __showMenuFromTouchAndHold = true; - menuTimer.start(); - clearFocusFromOtherItems(); - } + __showMenuFromTouch = true; + menuTimer.start(); } - onReleased: __showMenuFromTouchAndHold = false - onCanceled: __showMenuFromTouchAndHold = false } Connections { @@ -166,7 +110,7 @@ if (!control.menu) return; - if ((__showMenuFromTouchAndHold || selectionStart !== selectionEnd) + if ((__showMenuFromTouch || selectionStart !== selectionEnd) && control.activeFocus && (!cursorHandle.pressed && !selectionHandle.pressed) && (!flickable || !flickable.moving) @@ -178,6 +122,7 @@ var targetRect = Qt.rect(topLeft.x, topLeft.y, size.width, size.height); getMenuInstance().__dismissMenu(); getMenuInstance().__popup(targetRect, -1, MenuPrivate.EditMenu); + __showMenuFromTouch = false; } else { getMenuInstance().__dismissMenu(); } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/EditMenu.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/EditMenu.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/EditMenu.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/EditMenu.qml 2016-05-24 04:32:21.000000000 +0000 @@ -45,8 +45,9 @@ property Item selectionHandle property Flickable flickable property Component defaultMenu: item && item.defaultMenu ? item.defaultMenu : null - property Menu menuInstance: null + property QtObject menuInstance: null property MouseArea mouseArea + property QtObject style: __style Connections { target: control @@ -67,6 +68,18 @@ return menuInstance; } - source: Qt.resolvedUrl(Qt.platform.os === "ios" ? "EditMenu_ios.qml" - : Qt.platform.os === "android" ? "" : "EditMenu_base.qml") + function syncStyle() { + if (!style) + return; + + if (style.__editMenu) + sourceComponent = style.__editMenu; + else { + // todo: get ios/android/base menus from style as well + source = (Qt.resolvedUrl(Qt.platform.os === "ios" ? "EditMenu_ios.qml" + : Qt.platform.os === "android" ? "" : "EditMenu_base.qml")); + } + } + onStyleChanged: syncStyle(); + Component.onCompleted: syncStyle(); } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/MenuContentItem.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/MenuContentItem.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/MenuContentItem.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/MenuContentItem.qml 2016-05-24 04:32:21.000000000 +0000 @@ -37,12 +37,15 @@ import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 +import QtQuick.Controls.Private 1.0 Loader { id: menuFrameLoader property var __menu + Accessible.role: Accessible.PopupMenu + visible: status === Loader.Ready width: content.width + (d.style ? d.style.padding.left + d.style.padding.right : 0) height: content.height + (d.style ? d.style.padding.top + d.style.padding.bottom : 0) @@ -77,16 +80,16 @@ function triggerCurrent() { var item = content.menuItemAt(__menu.__currentIndex) if (item) - content.triggered(item) + triggerAndDismiss(item) } function triggerAndDismiss(item) { - if (item && item.styleData.type !== MenuItemType.Separator) { - __menu.__dismissMenu() - if (item.styleData.type !== MenuItemType.Menu) - item.__menuItem.trigger() - __menu.__destroyAllMenuPopups() - } + if (!item) + return; + if (item.styleData.type === MenuItemType.Separator) + __menu.__dismissAndDestroy() + else if (item.styleData.type === MenuItemType.Item) + item.__menuItem.trigger() } } @@ -109,7 +112,7 @@ } } - Keys.onEscapePressed: __menu.__dismissMenu() + Keys.onEscapePressed: __menu.__dismissAndDestroy() Keys.onDownPressed: { if (__menu.__currentIndex < 0) @@ -129,17 +132,19 @@ } Keys.onLeftPressed: { - if ((event.accepted = __menu.__parentMenu.hasOwnProperty("title"))) { - __menu.__closeMenu() - __menu.__destroyMenuPopup() - } + if ((event.accepted = __menu.__parentMenu.hasOwnProperty("title"))) + __menu.__closeAndDestroy() } Keys.onRightPressed: { var item = content.menuItemAt(__menu.__currentIndex) - if ((event.accepted = (item && item.styleData.type === MenuItemType.Menu))) { + if (item && item.styleData.type === MenuItemType.Menu + && !item.__menuItem.__popupVisible) { item.__showSubMenu(true) item.__menuItem.__currentIndex = 0 + event.accepted = true + } else { + event.accepted = false } } @@ -172,6 +177,19 @@ Loader { id: menuItemLoader + Accessible.role: opts.type === MenuItemType.Item || opts.type === MenuItemType.Menu ? + Accessible.MenuItem : Accessible.NoRole + Accessible.name: StyleHelpers.removeMnemonics(opts.text) + Accessible.checkable: opts.checkable + Accessible.checked: opts.checked + Accessible.onPressAction: { + if (opts.type === MenuItemType.Item) { + d.triggerAndDismiss(menuItemLoader) + } else if (opts.type === MenuItemType.Menu) { + __showSubMenu(true /*immediately*/) + } + } + property QtObject styleData: QtObject { id: opts readonly property int index: __menuItemIndex @@ -230,10 +248,8 @@ id: closeMenuTimer interval: 1 onTriggered: { - if (__menu.__currentIndex !== __menuItemIndex) { - __menuItem.__closeMenu() - __menuItem.__destroyMenuPopup() - } + if (__menu.__currentIndex !== __menuItemIndex) + __menuItem.__closeAndDestroy() } } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/ScrollBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/ScrollBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/ScrollBar.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/ScrollBar.qml 2016-05-24 04:32:21.000000000 +0000 @@ -88,7 +88,7 @@ property int pageStep: internal.horizontal ? width : height property bool scrollToClickposition: internal.scrollToClickPosition anchors.fill: parent - cursorShape: __panel.visible ? Qt.ArrowCursor : Qt.IBeamCursor // forces a cursor change + cursorShape: __panel && __panel.visible ? Qt.ArrowCursor : Qt.IBeamCursor // forces a cursor change property bool autoincrement: false property bool scrollToClickPosition: __style ? __style.scrollToClickedPosition : 0 diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/ScrollViewHelper.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/ScrollViewHelper.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/ScrollViewHelper.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/ScrollViewHelper.qml 2016-05-24 04:32:21.000000000 +0000 @@ -44,7 +44,7 @@ \inqmlmodule QtQuick.Controls.Private */ Item { - id: wheelarea + id: scrollHelper property alias horizontalScrollBar: hscrollbar property alias verticalScrollBar: vscrollbar @@ -53,17 +53,15 @@ property int availableWidth property int contentHeight property int contentWidth - property real originX - property real originY property bool active property int horizontalScrollBarPolicy: Qt.ScrollBarAsNeeded property int verticalScrollBarPolicy: Qt.ScrollBarAsNeeded - property int leftMargin: outerFrame ? root.__style.padding.left : 0 - property int rightMargin: outerFrame ? root.__style.padding.right : 0 - property int topMargin: outerFrame ? root.__style.padding.top : 0 - property int bottomMargin: outerFrame ? root.__style.padding.bottom : 0 + property int leftMargin: outerFrame && root.__style ? root.__style.padding.left : 0 + property int rightMargin: outerFrame && root.__style ? root.__style.padding.right : 0 + property int topMargin: outerFrame && root.__style ? root.__style.padding.top : 0 + property int bottomMargin: outerFrame && root.__style ? root.__style.padding.bottom : 0 anchors.fill: parent @@ -72,12 +70,10 @@ function doLayout() { if (!recursionGuard) { recursionGuard = true - wheelarea.availableWidth = viewport.width - wheelarea.availableHeight = viewport.height - wheelarea.contentWidth = flickableItem !== null ? flickableItem.contentWidth : 0 - wheelarea.contentHeight = flickableItem !== null ? flickableItem.contentHeight : 0 - wheelarea.originX = flickableItem !== null ? flickableItem.originX : 0 - wheelarea.originY = flickableItem !== null ? flickableItem.originY : 0 + scrollHelper.contentWidth = flickableItem !== null ? flickableItem.contentWidth : 0 + scrollHelper.contentHeight = flickableItem !== null ? flickableItem.contentHeight : 0 + scrollHelper.availableWidth = viewport.width + scrollHelper.availableHeight = viewport.height recursionGuard = false } } @@ -92,12 +88,6 @@ target: flickableItem onContentWidthChanged: doLayout() onContentHeightChanged: doLayout() - onOriginXChanged: doLayout() - onOriginYChanged: doLayout() - } - - Connections { - target: flickableItem onContentXChanged: { hscrollbar.flash() vscrollbar.flash() @@ -111,7 +101,7 @@ Loader { id: cornerFill z: 1 - sourceComponent: __style.corner + sourceComponent: __style ? __style.corner : null anchors.right: parent.right anchors.bottom: parent.bottom anchors.bottomMargin: bottomMargin @@ -123,15 +113,17 @@ ScrollBar { id: hscrollbar + readonly property int scrollAmount: contentWidth - availableWidth + readonly property bool scrollable: scrollAmount > 0 isTransient: !!__panel && !!__panel.isTransient active: !!__panel && (__panel.sunken || __panel.activeControl !== "none") enabled: !isTransient || __panel.visible orientation: Qt.Horizontal - visible: horizontalScrollBarPolicy == Qt.ScrollBarAsNeeded ? (contentWidth > availableWidth) : horizontalScrollBarPolicy == Qt.ScrollBarAlwaysOn + visible: horizontalScrollBarPolicy == Qt.ScrollBarAsNeeded ? scrollable : horizontalScrollBarPolicy == Qt.ScrollBarAlwaysOn height: visible ? implicitHeight : 0 z: 1 - maximumValue: contentWidth > availableWidth ? originX + contentWidth - availableWidth : 0 - minimumValue: originX + maximumValue: scrollable ? scrollAmount : 0 + minimumValue: 0 anchors.bottom: parent.bottom anchors.left: parent.left anchors.right: cornerFill.left @@ -139,20 +131,20 @@ anchors.bottomMargin: bottomMargin onValueChanged: { if (!blockUpdates) { - flickableItem.contentX = value + flickableItem.contentX = value + flickableItem.originX } } Binding { target: hscrollbar.__panel property: "raised" - value: vscrollbar.active || wheelarea.active + value: vscrollbar.active || scrollHelper.active when: hscrollbar.isTransient } Binding { target: hscrollbar.__panel property: "visible" value: true - when: !hscrollbar.isTransient || wheelarea.active + when: !hscrollbar.isTransient || scrollHelper.active } function flash() { if (hscrollbar.isTransient) { @@ -170,36 +162,38 @@ ScrollBar { id: vscrollbar + readonly property int scrollAmount: contentHeight - availableHeight + readonly property bool scrollable: scrollAmount > 0 isTransient: !!__panel && !!__panel.isTransient active: !!__panel && (__panel.sunken || __panel.activeControl !== "none") enabled: !isTransient || __panel.visible orientation: Qt.Vertical - visible: verticalScrollBarPolicy == Qt.ScrollBarAsNeeded ? (contentHeight > availableHeight) : verticalScrollBarPolicy == Qt.ScrollBarAlwaysOn + visible: verticalScrollBarPolicy === Qt.ScrollBarAsNeeded ? scrollable : verticalScrollBarPolicy === Qt.ScrollBarAlwaysOn width: visible ? implicitWidth : 0 z: 1 anchors.bottom: cornerFill.top - maximumValue: contentHeight > availableHeight ? originY + contentHeight - availableHeight + __viewTopMargin : 0 - minimumValue: originY + maximumValue: scrollable ? scrollAmount + __viewTopMargin : 0 + minimumValue: 0 anchors.right: parent.right anchors.top: parent.top anchors.topMargin: __scrollBarTopMargin + topMargin anchors.rightMargin: rightMargin onValueChanged: { if (flickableItem && !blockUpdates && enabled) { - flickableItem.contentY = value + flickableItem.contentY = value + flickableItem.originY } } Binding { target: vscrollbar.__panel property: "raised" - value: hscrollbar.active || wheelarea.active + value: hscrollbar.active || scrollHelper.active when: vscrollbar.isTransient } Binding { target: vscrollbar.__panel property: "visible" value: true - when: !vscrollbar.isTransient || wheelarea.active + when: !vscrollbar.isTransient || scrollHelper.active } function flash() { if (vscrollbar.isTransient) { diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/TextInputWithHandles.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/TextInputWithHandles.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/TextInputWithHandles.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/TextInputWithHandles.qml 2016-05-24 04:32:21.000000000 +0000 @@ -72,7 +72,6 @@ selectionHandle.position = (selectionStart !== cursorPosition) ? selectionStart : selectionEnd blockRecursion = false } - TextSingleton.updateSelectionItem(input) } function activate() { @@ -145,13 +144,15 @@ active: control.selectByMouse && Settings.isMobile maximum: cursorHandle.position - 1 + readonly property var mappedOrigin: editor.mapToItem(parent, 0,0) + // Mention scenePos in the mappedPos binding to force re-evaluation if it changes - property var mappedPos: listener.scenePos.x !== listener.scenePos.y !== Number.MAX_VALUE ? + readonly property var mappedPos: listener.scenePos.x !== listener.scenePos.y !== Number.MAX_VALUE ? editor.mapToItem(parent, editor.selectionRectangle.x, editor.selectionRectangle.y) : -1 x: mappedPos.x y: mappedPos.y - visible: pressed || (input.hasSelection && handleX + handleWidth >= -1 && handleX <= control.width + 1) + visible: pressed || (input.hasSelection && handleX + handleWidth >= -1 && handleX - mappedOrigin.x <= control.width + 1) onPositionChanged: { if (!input.blockRecursion) { @@ -174,13 +175,15 @@ active: control.selectByMouse && Settings.isMobile minimum: input.hasSelection ? selectionHandle.position + 1 : -1 + readonly property var mappedOrigin: editor.mapToItem(parent, 0,0) + // Mention scenePos in the mappedPos binding to force re-evaluation if it changes - property var mappedPos: listener.scenePos.x !== listener.scenePos.y !== Number.MAX_VALUE ? + readonly property var mappedPos: listener.scenePos.x !== listener.scenePos.y !== Number.MAX_VALUE ? editor.mapToItem(parent, editor.cursorRectangle.x, editor.cursorRectangle.y) : -1 x: mappedPos.x y: mappedPos.y - visible: pressed || ((input.cursorVisible || input.hasSelection) && handleX + handleWidth >= -1 && handleX <= control.width + 1) + visible: pressed || ((input.cursorVisible || input.hasSelection) && handleX + handleWidth >= -1 && handleX - mappedOrigin.x <= control.width + 1) onPositionChanged: { if (!input.blockRecursion) { diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/TextSingleton.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/TextSingleton.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/TextSingleton.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/TextSingleton.qml 2016-05-24 04:32:21.000000000 +0000 @@ -37,25 +37,4 @@ pragma Singleton import QtQuick 2.2 Text { - /** - selectionItem is the item that currently has a text selection. On some platforms - (iOS) you can select text without activating the input field. This means that - selectionItem can be different from item with active focus on those platforms. - */ - property Item selectionItem: null - - function updateSelectionItem(item) - { - // Convenience function to check if we should transfer or - // remove selectionItem status from item. - var selection = item.selectionStart !== item.selectionEnd - if (item === selectionItem) { - if (!selection) - selectionItem = null - } else if (selection) { - if (selectionItem) - selectionItem.select(selectionItem.cursorPosition, selectionItem.cursorPosition) - selectionItem = item - } - } } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/TreeViewItemDelegateLoader.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/TreeViewItemDelegateLoader.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/TreeViewItemDelegateLoader.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Private/TreeViewItemDelegateLoader.qml 2016-05-24 04:32:21.000000000 +0000 @@ -98,6 +98,7 @@ visible: itemDelegateLoader.width > __itemIndentation sourceComponent: __style && __style.__branchDelegate || null anchors.right: parent.item ? parent.item.left : undefined + anchors.rightMargin: __style.__indentation > width ? (__style.__indentation - width) / 2 : 0 anchors.verticalCenter: parent.verticalCenter property QtObject styleData: itemDelegateLoader.styleData onLoaded: if (__rowItem) __rowItem.branchDecoration = item diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/qmldir 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/qmldir 2016-05-24 04:32:21.000000000 +0000 @@ -4,3 +4,4 @@ typeinfo plugins.qmltypes designersupported depends QtQuick.Window 2.2 +depends QtQuick.Layouts 1.0 diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/ScrollView.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/ScrollView.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/ScrollView.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/ScrollView.qml 2016-05-24 04:32:21.000000000 +0000 @@ -44,6 +44,7 @@ \inqmlmodule QtQuick.Controls \since 5.1 \ingroup views + \ingroup controls \brief Provides a scrolling view within another Item. \image scrollview.png @@ -163,7 +164,9 @@ default property Item contentItem /*! \internal */ - property Item __scroller: scroller + property alias __scroller: scroller + /*! \internal */ + property alias __verticalScrollbarOffset: scroller.verticalScrollbarOffset /*! \internal */ property alias __wheelAreaScrollSpeed: wheelArea.scrollSpeed /*! \internal */ @@ -237,13 +240,13 @@ onContentYChanged: { scroller.blockUpdates = true - scroller.verticalScrollBar.value = flickableItem.contentY + scroller.verticalScrollBar.value = flickableItem.contentY - flickableItem.originY scroller.blockUpdates = false } onContentXChanged: { scroller.blockUpdates = true - scroller.horizontalScrollBar.value = flickableItem.contentX + scroller.horizontalScrollBar.value = flickableItem.contentX - flickableItem.originX scroller.blockUpdates = false } @@ -273,49 +276,50 @@ property bool horizontalRecursionGuard: false property bool verticalRecursionGuard: false - horizontalMinimumValue: flickableItem ? flickableItem.originX : 0 - horizontalMaximumValue: flickableItem ? flickableItem.originX + flickableItem.contentWidth - viewport.width : 0 + horizontalMinimumValue: 0 + horizontalMaximumValue: flickableItem ? flickableItem.contentWidth - viewport.width : 0 - verticalMinimumValue: flickableItem ? flickableItem.originY : 0 - verticalMaximumValue: flickableItem ? flickableItem.originY + flickableItem.contentHeight - viewport.height + __viewTopMargin : 0 + verticalMinimumValue: 0 + verticalMaximumValue: flickableItem ? flickableItem.contentHeight - viewport.height + __viewTopMargin : 0 // The default scroll speed for typical angle-based mouse wheels. The value // comes originally from QTextEdit, which sets 20px steps by default, as well as // QQuickWheelArea. // TODO: centralize somewhere, QPlatformTheme? - scrollSpeed: 20 * (__style.__wheelScrollLines || 1) + scrollSpeed: 20 * (__style && __style.__wheelScrollLines || 1) Connections { target: flickableItem onContentYChanged: { wheelArea.verticalRecursionGuard = true - wheelArea.verticalValue = flickableItem.contentY + wheelArea.verticalValue = flickableItem.contentY - flickableItem.originY wheelArea.verticalRecursionGuard = false } onContentXChanged: { wheelArea.horizontalRecursionGuard = true - wheelArea.horizontalValue = flickableItem.contentX + wheelArea.horizontalValue = flickableItem.contentX - flickableItem.originX wheelArea.horizontalRecursionGuard = false } } onVerticalValueChanged: { if (!verticalRecursionGuard) { - if (flickableItem.contentY < flickThreshold && verticalDelta > speedThreshold) { + var effectiveContentY = flickableItem.contentY - flickableItem.originY + if (effectiveContentY < flickThreshold && verticalDelta > speedThreshold) { flickableItem.flick(ignored, Math.min(maxFlick, acceleration * verticalDelta)) - } else if (flickableItem.contentY > flickableItem.contentHeight - - flickThreshold - viewport.height && verticalDelta < -speedThreshold) { + } else if (effectiveContentY > flickableItem.contentHeight - flickThreshold - viewport.height + && verticalDelta < -speedThreshold) { flickableItem.flick(ignored, Math.max(-maxFlick, acceleration * verticalDelta)) } else { - flickableItem.contentY = verticalValue + flickableItem.contentY = verticalValue + flickableItem.originY } } } onHorizontalValueChanged: { if (!horizontalRecursionGuard) - flickableItem.contentX = horizontalValue + flickableItem.contentX = horizontalValue + flickableItem.originX } } @@ -326,9 +330,9 @@ property bool outerFrame: !frameVisible || !(__style ? __style.__externalScrollBars : 0) property int scrollBarSpacing: outerFrame ? 0 : (__style ? __style.__scrollBarSpacing : 0) property int verticalScrollbarOffset: verticalScrollBar.visible && !verticalScrollBar.isTransient ? - verticalScrollBar.width + scrollBarSpacing : 0 + verticalScrollBar.width + scrollBarSpacing : 0 property int horizontalScrollbarOffset: horizontalScrollBar.visible && !horizontalScrollBar.isTransient ? - horizontalScrollBar.height + scrollBarSpacing : 0 + horizontalScrollBar.height + scrollBarSpacing : 0 Loader { id: frameLoader sourceComponent: __style ? __style.frame : null diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/SpinBox.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/SpinBox.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/SpinBox.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/SpinBox.qml 2016-05-24 04:32:21.000000000 +0000 @@ -132,6 +132,15 @@ */ property alias font: input.font + /*! + \qmlproperty int SpinBox::cursorPosition + \since QtQuick.Controls 1.5 + + This property holds the position of the cursor in the SpinBox. + */ + property alias cursorPosition: input.cursorPosition + + /*! This property indicates whether the Spinbox should get active focus when pressed. The default value is \c true. @@ -168,9 +177,7 @@ \since QtQuick.Controls 1.1 This signal is emitted when the Return or Enter key is pressed or - the control loses focus. Note that if there is a validator - set on the control and enter/return is pressed, this signal will - only be emitted if the validator returns an acceptable state. + the control loses focus. The corresponding handler is \c onEditingFinished. */ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/SplitView.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/SplitView.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/SplitView.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/SplitView.qml 2016-05-24 04:32:21.000000000 +0000 @@ -45,6 +45,7 @@ \inqmlmodule QtQuick.Controls \since 5.1 \ingroup views + \ingroup controls \brief Lays out items with a draggable splitter between each item. \image splitview.png @@ -81,7 +82,7 @@ \li \l{Layout::fillHeight}{Layout.fillHeight} (\c true for only one child) \endlist - \note Please import QtQuick.Layout 1.0 in your QML file in order to use the Layout + \note import QtQuick.Layouts 1.0 in your QML file in order to use the Layout attached properties inside SplitView. Example: diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/StackViewDelegate.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/StackViewDelegate.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/StackViewDelegate.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/StackViewDelegate.qml 2016-05-24 04:32:21.000000000 +0000 @@ -39,6 +39,7 @@ /*! \qmltype StackViewDelegate \inqmlmodule QtQuick.Controls + \ingroup controls \since 5.1 \brief A delegate used by StackView for loading transitions. diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/StackView.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/StackView.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/StackView.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/StackView.qml 2016-05-24 04:32:21.000000000 +0000 @@ -42,6 +42,7 @@ \qmltype StackView \inherits Item \ingroup views + \ingroup controls \inqmlmodule QtQuick.Controls \since 5.1 @@ -78,12 +79,12 @@ \endqml \section1 Using StackView in an Application - Using the StackView in the application is typically a simple matter of adding + Using StackView in an application is typically a simple matter of adding the StackView as a child of a Window. The stack is usually anchored to the edges of the window, except at the top or bottom where it might be anchored to a status bar, or some other similar UI component. The stack can then be used by invoking its navigation methods. The first item to show in the StackView - is commonly loaded assigning it to \l initialItem. + is the one that was assigned to \l initialItem. \note Items pushed onto the stack view have \l{Supported Attached Properties}{Stack attached properties}. @@ -92,7 +93,7 @@ replace (replace by specifying argument \c replace to push()). These correspond to classic stack operations where "push" adds an item to the top of a stack, "pop" removes the top item from the stack, and "replace" is like a - pop followed by a push in that it replaces the topmost item on the stack with + pop followed by a push, in that it replaces the topmost item on the stack with a new item (but the applied transtition might be different). The topmost item in the stack corresponds to the one that is \l{StackView::currentItem} {currently} visible on the screen. That means that "push" is the logical equivalent of navigating @@ -103,9 +104,9 @@ example, to return to a "main" item or some kind of section item in the application. For this use case, it is possible to specify an item as a parameter for pop(). This is called an "unwind" operation as the stack gets unwound to the specified item. - If the item is not found then the stack unwinds until there is only a single item in - the stack, which becomes the current item. To explicitly unwind to the bottom - of the stack it is recommended to use \l{pop()} {pop(null)}, though technically any + If the item is not found, then the stack unwinds until there is only a single item in + the stack, which then becomes the current item. To explicitly unwind to the bottom + of the stack, it is recommended to use \l{pop()} {pop(null)}, though technically any non-existent item will do. Given the stack [A, B, C]: @@ -120,12 +121,12 @@ \note When the stack is empty, a push() will not perform a transition animation because there is nothing to transition from (typically during application start-up). A pop() on a stack with depth 1 or 0 is a no-operation. - If removing all items from the stack is needed, a separate function clear() is + If all items need to be removed from the stack, a separate function clear() is available. Calling push() returns the item that was pushed onto the stack. Calling pop() returns the item that was popped off the stack. When pop() is - called in an unwind operation the top-most item (the first item that was + called in an unwind operation, the top-most item (the first item that was popped, which will also be the one transitioning out) is returned. \section1 Deep Linking @@ -157,8 +158,8 @@ \section1 Pushing items An item pushed onto the StackView can be either an Item, a URL, a string - with a URL, or a Component. To push it, assign it to a property "item" - inside a property list, and send it as an argument to \l{StackView::push}{push}: + containing a URL, or a Component. To push it, assign it to a property "item" + inside a property list, and pass it as an argument to \l{StackView::push}{push}: \code stackView.push({item: yourItem}) @@ -176,7 +177,7 @@ \li \c replace: set this property to replace the current item on the stack. When pushing an array, you only need to set this property on the first element to replace as many elements on the stack as inside the array. - \li \c destroyOnPop: set this boolean to true if StackView needs to destroy the item when + \li \c destroyOnPop: set this boolean to \c true if StackView needs to destroy the item when it is popped off the stack. By default (if \a destroyOnPop is not specified), StackView will destroy items pushed as components or URLs. Items not destroyed will be re-parented back to the original parents they had before being pushed onto the stack and hidden. @@ -190,7 +191,7 @@ \endcode You can push several items in one go by using an array of property lists. This is - optimizing compared to pushing items one by one, since StackView then can load only the + more efficient than pushing items one by one, as StackView can then load only the last item in the list. The rest will be loaded as they are about to become the current item (which happens when the stack is popped). The following example shows how to push an array of items: @@ -203,13 +204,13 @@ is later popped off, it gets re-parented back to its original owner again. If, however, an item is pushed as a component or a URL, the actual item will be created as an item from that component. This happens automatically when the item is about to become the current - item in the stack. Ownership of the item will then normally be taken by the StackView. It will as - such automatically destroy the item when it is later popped off. The component that declared the item, by + item in the stack. Ownership of the item will then normally be taken by the StackView, which will + automatically destroy the item when it is later popped off. The component that declared the item, by contrast, remains in the ownership of the application and is not destroyed by the stack. This can be overridden by explicitly setting \c{destroyOnPop} in the list of arguments given to push. If the \c properties to be pushed are specified, they will be copied into the item at loading time - (in case of a component or URL), or when the item will become the current item (in case of an inline + (in case of a component or URL), or when the item becomes the current item (in case of an inline item). The following example shows how this can be done: \code @@ -217,7 +218,7 @@ \endcode - \note If an item is declared inside another item, and if that parent gets destroyed, + \note If an item is declared inside another item, and that parent gets destroyed, (even if a component was used), that child item will also be destroyed. This follows normal Qt parent-child destruction rules, but sometimes comes as a surprise for developers. @@ -242,10 +243,10 @@ Popping the item off the top of the stack at this point would not result in further deactivation since the item is not active. - There is an attached \l{Stack::status}{Stack.status} property that tracks the lifecycle. The - status values list is an enumeration with values \c Stack.Inactive, \c Stack.Activating, + There is an attached \l{Stack::status}{Stack.status} property that tracks the lifecycle. This + property is an enumeration with the following values: \c Stack.Inactive, \c Stack.Activating, \c Stack.Active and \c Stack.Deactivating. Combined with the normal \c Component.onComplete and - \c Component.onDestruction signals the entire lifecycle is thus: + \c Component.onDestruction signals, the entire lifecycle is thus: \list \li Created: Component.onCompleted() @@ -288,14 +289,15 @@ A transition is performed whenever a item is pushed or popped, and consists of two items: enterItem and exitItem. The StackView itself will never move items - around, but instead delegate the job to an external animation set provided + around, but instead delegates the job to an external animation set provided by the style or the application developer. How items should visually enter and leave the stack (and the geometry they should end up with) is therefore completely controlled from the outside. When the transition starts, the StackView will search for a transition that matches the operation executed. There are three transitions to choose - from: \l {StackViewDelegate::}{pushTransition}, \l {StackViewDelegate::}{popTransition}, and \l {StackViewDelegate::}{replaceTransition}. Each implements how - enterItem should animate in, and exitItem out. The transitions are + from: \l {StackViewDelegate::}{pushTransition}, \l {StackViewDelegate::}{popTransition}, + and \l {StackViewDelegate::}{replaceTransition}. Each implements how + \c enterItem should animate in, and \c exitItem out. The transitions are collected inside a StackViewDelegate object assigned to \l {StackView::delegate}{delegate}. By default, popTransition and replaceTransition will be the same as pushTransition, unless you set them @@ -330,9 +332,9 @@ \endqml PushTransition needs to inherit from StackViewTransition, which is a ParallelAnimation that - contains the properties \c enterItem and \c exitItem. You set the target of your - inner animations to those items. Since the same items instance can be pushed several - times to a StackView, you should always override + contains the properties \c enterItem and \c exitItem. These items should be assigned to the + \c target property of animations within the transition. Since the same items instance can + be pushed several times to a StackView, you should always override \l {StackViewDelegate::transitionFinished()}{StackViewDelegate.transitionFinished()}. Implement this function to reset any properties animated on the exitItem so that later transitions can expect the items to be in a default state. @@ -396,7 +398,7 @@ transition to return. You could for example introspect the items, and return different animations depending on the their internal state. StackView will expect you to return a Component that contains a StackViewTransition, or a StackViewTransition directly. The former is easier, as StackView will - then create the transition and later destroy it when it's done, while avoiding any sideeffects + then create the transition and later destroy it when it's done, while avoiding any side effects caused by the transition being alive long after it has run. Returning a StackViewTransition directly can be useful if you need to write some sort of transition caching for performance reasons. As an optimization, you can also return \c null to signal that you just want to show/hide the items @@ -408,7 +410,7 @@ if you need to initialize additional properties of your custom StackViewTransition when the returned component is instantiated. - The following example shows how you can decide which animation to use during runtime : + The following example shows how you can decide which animation to use at runtime: \qml StackViewDelegate { diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/StatusBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/StatusBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/StatusBar.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/StatusBar.qml 2016-05-24 04:32:21.000000000 +0000 @@ -43,6 +43,7 @@ \inqmlmodule QtQuick.Controls \since 5.1 \ingroup applicationwindow + \ingroup controls \brief Contains status information in your app. The common way of using StatusBar is in relation to \l ApplicationWindow. diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/BasicTableViewStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/BasicTableViewStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/BasicTableViewStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/BasicTableViewStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -84,7 +84,7 @@ See qtquickcontrolsstyles-tableviewstyle.qdoc and qtquickcontrolsstyles-treeviewstyle.qdoc */ property Component headerDelegate: BorderImage { - height: textItem.implicitHeight * 1.2 + height: Math.round(textItem.implicitHeight * 1.2) source: "images/header.png" border.left: 4 border.bottom: 2 @@ -94,19 +94,17 @@ anchors.fill: parent verticalAlignment: Text.AlignVCenter horizontalAlignment: styleData.textAlignment - anchors.leftMargin: 12 + anchors.leftMargin: horizontalAlignment === Text.AlignLeft ? 12 : 1 + anchors.rightMargin: horizontalAlignment === Text.AlignRight ? 8 : 1 text: styleData.value elide: Text.ElideRight color: textColor renderType: Settings.isMobile ? Text.QtRendering : Text.NativeRendering } Rectangle { - anchors.right: parent.right - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.bottomMargin: 1 - anchors.topMargin: 1 width: 1 + height: parent.height - 2 + y: 1 color: "#ccc" } } @@ -137,8 +135,9 @@ Text { id: label objectName: "label" - width: parent.width - x - x: styleData.depth && styleData.column === 0 ? 0 : 8 + width: parent.width - x - (horizontalAlignment === Text.AlignRight ? 8 : 1) + x: (styleData.hasOwnProperty("depth") && styleData.column === 0) ? 0 : + horizontalAlignment === Text.AlignRight ? 1 : 8 horizontalAlignment: styleData.textAlignment anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: 1 diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/CircularTickmarkLabelStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/CircularTickmarkLabelStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/CircularTickmarkLabelStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/CircularTickmarkLabelStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -285,6 +285,7 @@ } delegate: Loader { id: tickmarkLabelDelegateLoader + objectName: "labelDelegateLoader" + index sourceComponent: tickmarkLabel x: pos.x y: pos.y @@ -292,8 +293,9 @@ readonly property point pos: panelItem.labelPosFromIndex(index, width, height); readonly property int __index: index + readonly property real __value: value property QtObject styleData: QtObject { - readonly property var value: index != -1 ? labelItemRepeater.model.get(index).value : 0 + readonly property var value: index != -1 ? tickmarkLabelDelegateLoader.__value : 0 readonly property alias index: tickmarkLabelDelegateLoader.__index } } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/DelayButtonStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/DelayButtonStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/DelayButtonStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/DelayButtonStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -191,11 +191,8 @@ DropShadow { id: progressBarDropShadow anchors.fill: progressBar - fast: true // QTBUG-33747 // cached: !control.pressed - radius: 4 - samples: radius * 2 color: progressBarDropShadowColor source: progressBar } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/DialStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/DialStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/DialStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/DialStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -151,10 +151,6 @@ the style's components. For example, it can be used to calculate the angles at which to draw an arc around the dial indicating the safe range of values. - - For example, if minimumValueAngle is set to \c 270 and - maximumValueAngle is set to \c 90, this function will return \c 270 - when passed minimumValue and \c 90 when passed maximumValue. */ function valueToAngle(value) { return control.__panel.circularTickmarkLabel.valueToAngle(value); Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/images/spinner_large.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/images/spinner_large.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/images/spinner_medium.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/images/spinner_medium.png differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/images/spinner_small.png and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/images/spinner_small.png differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/PieMenuStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/PieMenuStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/PieMenuStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/PieMenuStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -115,13 +115,25 @@ /*! The selection color. */ property color selectionColor: "#eee" - /*! The shadow color. */ + /*! + The shadow color. + + \sa DropShadow + */ property color shadowColor: Qt.rgba(0, 0, 0, 0.26) - /*! The shadow radius. */ - property real shadowRadius: 50 + /*! + The shadow radius. - /*! The shadow spread. */ + \sa DropShadow + */ + property real shadowRadius: 10 + + /*! + The shadow spread. + + \sa DropShadow + */ property real shadowSpread: 0.3 /*! @@ -366,11 +378,9 @@ DropShadow { id: dropShadow anchors.fill: itemgroup - fast: true - radius: shadowRadius spread: shadowSpread + samples: shadowRadius * 2 + 1 transparentBorder: true - samples: 12 color: shadowColor source: itemgroup } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/ScrollViewStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/ScrollViewStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/ScrollViewStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/ScrollViewStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -43,6 +43,7 @@ \inqmlmodule QtQuick.Controls.Styles \since 5.1 \ingroup viewsstyling + \ingroup controlsstyling \brief Provides custom styling for ScrollView */ Style { @@ -65,7 +66,7 @@ appear when the content is scrolled and disappear when they are no longer needed. The default value is platform dependent. */ - property bool transientScrollBars: !Settings.isMobile && Settings.hasTouchScreen + property bool transientScrollBars: Settings.isMobile && Settings.hasTouchScreen /*! This Component paints the frame around scroll bars. */ property Component frame: Rectangle { @@ -377,8 +378,8 @@ width: __styleData.horizontal ? extent : implicitWidth anchors.top: bg.top anchors.left: bg.left - anchors.topMargin: __styleData.horizontal ? 0 : -handleOverlap + (2 * begin * (bg.height + (2 * handleOverlap) - extent) + range) / (2 * range) - anchors.leftMargin: __styleData.horizontal ? -handleOverlap + (2 * begin * (bg.width + (2 * handleOverlap) - extent) + range) / (2 * range) : 0 + anchors.topMargin: __styleData.horizontal || range === 0 ? 0 : -handleOverlap + (2 * begin * (bg.height + (2 * handleOverlap) - extent) + range) / (2 * range) + anchors.leftMargin: __styleData.horizontal && range !== 0 ? -handleOverlap + (2 * begin * (bg.width + (2 * handleOverlap) - extent) + range) / (2 * range) : 0 sourceComponent: handle property QtObject styleData: QtObject { readonly property bool hovered: activeControl === "handle" diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/SliderStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/SliderStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/SliderStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/SliderStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -159,9 +159,12 @@ } } - /*! This property holds the tick mark labels + /*! This property holds the tick mark labels. \since QtQuick.Controls.Styles 1.1 + Every tickmark that should be drawn must be defined within this + component, so it is common to use a \l Repeater, for example. + You can access the handle width through the \c styleData.handleWidth property. */ property Component tickmarks: Repeater { diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/StatusIndicatorStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/StatusIndicatorStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/StatusIndicatorStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/StatusIndicatorStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -73,7 +73,6 @@ property Component indicator: Item { readonly property real shineStep: 0.05 readonly property real smallestAxis: Math.min(control.width, control.height) - readonly property real shadowRadius: smallestAxis * 0.4 readonly property real outerRecessPercentage: 0.11 readonly property color offColor: Qt.rgba(0.13, 0.13, 0.13) readonly property color baseColor: control.active ? control.color : offColor @@ -113,12 +112,12 @@ Item { id: shadowGuard anchors.fill: backgroundCanvas - anchors.margins: -shadowRadius + anchors.margins: -shadow.radius Canvas { id: colorCanvas anchors.fill: parent - anchors.margins: shadowRadius + anchors.margins: shadow.radius Connections { target: control @@ -144,9 +143,6 @@ id: shadow source: shadowGuard color: control.color - // Don't set fast here because Qt < 5.3 will run into QTBUG-36931 - radius: shadowRadius - samples: Math.min(32, radius) cached: true anchors.fill: shadowGuard visible: control.active diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TabViewStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TabViewStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TabViewStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TabViewStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -43,6 +43,7 @@ \inqmlmodule QtQuick.Controls.Styles \since 5.1 \ingroup viewsstyling + \ingroup controlsstyling \brief Provides custom styling for TabView \qml diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TextAreaStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TextAreaStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TextAreaStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TextAreaStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -146,4 +146,10 @@ \since QtQuick.Controls.Styles 1.3 */ property Component __cursorDelegate + + /*! \internal + The delegate for the cut/copy/paste menu. + \since QtQuick.Controls.Styles 1.4 + */ + property Component __editMenu } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TextFieldStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TextFieldStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TextFieldStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TextFieldStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -209,4 +209,10 @@ \since QtQuick.Controls.Styles 1.3 */ property Component __cursorDelegate + + /*! \internal + The delegate for the cut/copy/paste menu. + \since QtQuick.Controls.Styles 1.4 + */ + property Component __editMenu } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/ToggleButtonStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/ToggleButtonStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/ToggleButtonStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/ToggleButtonStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -249,8 +249,6 @@ id: uncheckedDropShadow anchors.fill: uncheckedCanvas cached: true - radius: 4 - samples: 8 color: uncheckedDropShadowColor source: uncheckedCanvas visible: !control.checked @@ -260,8 +258,6 @@ id: checkedDropShadow anchors.fill: checkedCanvas cached: true - radius: 4 - samples: 8 color: checkedDropShadowColor source: checkedCanvas visible: control.checked diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TreeViewStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TreeViewStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TreeViewStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TreeViewStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -43,10 +43,10 @@ readonly property TreeView control: __control - property int indentation: 12 + property int indentation: 16 property Component branchDelegate: Item { - width: 16 + width: indentation height: 16 Text { visible: styleData.column === 0 && styleData.hasChildren @@ -54,8 +54,9 @@ color: !control.activeFocus || styleData.selected ? styleData.textColor : "#666" font.pointSize: 10 renderType: Text.NativeRendering + style: Text.PlainText anchors.centerIn: parent - anchors.verticalCenterOffset: styleData.isExpanded ? 2 : 0 + anchors.verticalCenterOffset: 2 } } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TumblerStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TumblerStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TumblerStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Base/TumblerStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -49,8 +49,6 @@ \ingroup controlsstyling \brief Provides custom styling for Tumbler. - \note TumblerStyle requires Qt 5.3.2 or later. - You can create a custom tumbler by replacing the following delegates: \list \li \l background @@ -134,8 +132,9 @@ DropShadow { anchors.fill: rect source: rect - radius: __padding - samples: Math.min(32, radius * 2) + samples: 15 + spread: 0.45 + cached: true } } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/MenuBarStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/MenuBarStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/MenuBarStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/MenuBarStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -45,8 +45,6 @@ property Component background: StyleItem { elementType: "menubar" - Accessible.role: Accessible.MenuBar - Component.onCompleted: { styleRoot.padding.left = pixelMetric("menubarhmargin") + pixelMetric("menubarpanelwidth") styleRoot.padding.right = pixelMetric("menubarhmargin") + pixelMetric("menubarpanelwidth") @@ -69,9 +67,6 @@ selected: (parent && styleData.selected) || sunken hints: { "showUnderlined": styleData.underlineMnemonic } - - Accessible.role: Accessible.MenuItem - Accessible.name: plainText } property Component menuStyle: Desktop.MenuStyle { } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/MenuStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/MenuStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/MenuStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/MenuStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -60,8 +60,6 @@ color: SystemPaletteSingleton.window(control.enabled) } - Accessible.role: Accessible.PopupMenu - Component.onCompleted: { var menuHMargin = pixelMetric("menuhmargin") var menuVMargin = pixelMetric("menuvmargin") @@ -106,9 +104,6 @@ "scrollerDirection": styleData.scrollerDirection, "icon": !!__menuItem && __menuItem.__icon } - - Accessible.role: Accessible.MenuItem - Accessible.name: StyleHelpers.removeMnemonics(text) } property Component scrollIndicator: menuItemPanel diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/ScrollViewStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/ScrollViewStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/ScrollViewStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/ScrollViewStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -71,6 +71,7 @@ readonly property bool __externalScrollBars: __styleitem.styleHint("externalScrollBars") readonly property int __scrollBarSpacing: __styleitem.pixelMetric("scrollbarspacing") readonly property bool scrollToClickedPosition: __styleitem.styleHint("scrollToClickPosition") !== 0 + property bool transientScrollBars: false readonly property int __wheelScrollLines: __styleitem.styleHint("wheelScrollLines") @@ -88,6 +89,8 @@ implicitWidth: horizontal ? 200 : pixelMetric("scrollbarExtent") implicitHeight: horizontal ? pixelMetric("scrollbarExtent") : 200 + + onIsTransientChanged: root.transientScrollBars = isTransient } } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/TableViewStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/TableViewStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/TableViewStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/TableViewStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -96,7 +96,10 @@ font: __styleitem.font anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: styleData["depth"] && styleData.column === 0 ? 0 : 8 + anchors.leftMargin: styleData.hasOwnProperty("depth") && styleData.column === 0 ? 0 : + horizontalAlignment === Text.AlignRight ? 1 : 8 + anchors.rightMargin: (styleData.hasOwnProperty("depth") && styleData.column === 0) + || horizontalAlignment !== Text.AlignRight ? 1 : 8 horizontalAlignment: styleData.textAlignment anchors.verticalCenter: parent.verticalCenter elide: styleData.elideMode diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/TreeViewStyle.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/TreeViewStyle.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/TreeViewStyle.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Desktop/TreeViewStyle.qml 2016-05-24 04:32:21.000000000 +0000 @@ -56,12 +56,12 @@ hasFocus: __styleitem.active Component.onCompleted: { - implicitWidth = si.pixelMetric("treeviewindentation") + root.__indentation = si.pixelMetric("treeviewindentation") + implicitWidth = root.__indentation implicitHeight = implicitWidth var rect = si.subControlRect("dummy"); width = rect.width height = rect.height - root.__indentation = width } } } Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Flat/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Flat/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Flat/qmldir 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Styles/Flat/qmldir 2016-05-24 04:32:21.000000000 +0000 @@ -1,3 +1,3 @@ module QtQuick.Controls.Styles.Flat plugin qtquickextrasflatplugin -classname QtQuickExtrasFlatPlugin +classname QtQuickExtrasStylesPlugin diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/TableViewColumn.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/TableViewColumn.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/TableViewColumn.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/TableViewColumn.qml 2016-05-24 04:32:21.000000000 +0000 @@ -41,6 +41,7 @@ \inqmlmodule QtQuick.Controls \since 5.1 \ingroup viewitems + \ingroup controls \brief Used to define columns in a \l TableView or in a \l TreeView. \image tableview.png diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Tab.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Tab.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/Tab.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/Tab.qml 2016-05-24 04:32:21.000000000 +0000 @@ -41,6 +41,7 @@ \inqmlmodule QtQuick.Controls \since 5.1 \ingroup viewaddons + \ingroup controls \brief Tab represents the content of a tab in a TabView. A Tab item inherits from Loader and provides a similar diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/TabView.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/TabView.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/TabView.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/TabView.qml 2016-05-24 04:32:21.000000000 +0000 @@ -43,6 +43,7 @@ \inqmlmodule QtQuick.Controls \since 5.1 \ingroup views + \ingroup controls \brief A control that allows the user to select one of multiple stacked items. \image tabview.png @@ -115,16 +116,23 @@ /*! \internal */ default property alias data: stack.data - /*! \qmlmethod Tab TabView::addTab(string title, Component component) - Adds a new tab page with title with and optional Component. + /*! + \qmlmethod Tab TabView::addTab(string title, Component component) + + Adds a new tab with the given \a title and an optional \a component. + Returns the newly added tab. */ function addTab(title, component) { return insertTab(__tabs.count, title, component) } - /*! \qmlmethod Tab TabView::insertTab(int index, string title, Component component) - Inserts a new tab with title at index, with an optional Component. + /*! + \qmlmethod Tab TabView::insertTab(int index, string title, Component component) + + Inserts a new tab at \a index, with the given \a title and + an optional \a component. + Returns the newly added tab. */ function insertTab(index, title, component) { diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/TextArea.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/TextArea.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/TextArea.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/TextArea.qml 2016-05-24 04:32:21.000000000 +0000 @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.6 import QtQuick.Window 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 @@ -423,6 +423,16 @@ signal linkHovered(string link) /*! + \qmlsignal TextArea::editingFinished() + \since QtQuick.Controls 1.5 + + This signal is emitted when the text area loses focus. + + The corresponding handler is \c onEditingFinished. + */ + signal editingFinished() + + /*! \qmlproperty string TextArea::hoveredLink \since QtQuick.Controls 1.1 @@ -797,7 +807,6 @@ blockRecursion = false } ensureVisible(cursorRectangle) - TextSingleton.updateSelectionItem(area) } function ensureVisible(rect) { @@ -820,6 +829,7 @@ onLinkActivated: area.linkActivated(link) onLinkHovered: area.linkHovered(link) + onEditingFinished: area.editingFinished() function activate() { if (activeFocusOnPress) { diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/TextField.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/TextField.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/TextField.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/TextField.qml 2016-05-24 04:32:21.000000000 +0000 @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.6 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 @@ -625,7 +625,7 @@ font: textInput.font horizontalAlignment: textInput.horizontalAlignment verticalAlignment: textInput.verticalAlignment - opacity: textInput.displayText.length ? 0.0 : 1.0 + opacity: !textInput.displayText && (!textInput.activeFocus || textInput.horizontalAlignment !== Qt.AlignHCenter) ? 1.0 : 0.0 color: __panel ? __panel.placeholderTextColor : "darkgray" clip: contentWidth > width; elide: Text.ElideRight @@ -660,6 +660,8 @@ Keys.forwardTo: textfield + EnterKey.type: control.EnterKey.type + onAccepted: textfield.accepted() onEditingFinished: textfield.editingFinished() diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/ToolBar.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/ToolBar.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/ToolBar.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/ToolBar.qml 2016-05-24 04:32:21.000000000 +0000 @@ -43,6 +43,7 @@ \inqmlmodule QtQuick.Controls \since 5.1 \ingroup applicationwindow + \ingroup controls \brief Contains ToolButton and related controls. \image toolbar.png diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/TreeView.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/TreeView.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Controls/TreeView.qml 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Controls/TreeView.qml 2016-05-24 04:32:21.000000000 +0000 @@ -44,6 +44,7 @@ id: root property var model: null + property alias rootIndex: modelAdaptor.rootIndex readonly property var currentIndex: modelAdaptor.mapRowToModelIndex(__currentRow) property ItemSelectionModel selection: null @@ -118,10 +119,12 @@ // the flickable from eating our mouse press events preventStealing: !Settings.hasTouchScreen - property int clickedRow: -1 - property int pressedRow: -1 + property var clickedIndex: undefined + property var pressedIndex: undefined + property bool selectOnRelease: false property int pressedColumn: -1 readonly property alias currentRow: root.__currentRow + readonly property alias currentIndex: root.currentIndex // Handle vertical scrolling whem dragging mouse outside boundaries property int autoScroll: 0 // 0 -> do nothing; 1 -> increment; 2 -> decrement @@ -132,7 +135,7 @@ interval: 20 repeat: true onTriggered: { - var oldPressedRow = mouseArea.pressedRow + var oldPressedIndex = mouseArea.pressedIndex var row if (mouseArea.autoScroll === 1) { __listView.incrementCurrentIndexBlocking(); @@ -144,28 +147,33 @@ row = __listView.indexAt(0, __listView.contentY) } - if (row !== oldPressedRow) { - mouseArea.pressedRow = row + var index = modelAdaptor.mapRowToModelIndex(row) + if (index !== oldPressedIndex) { + mouseArea.pressedIndex = index var modifiers = mouseArea.shiftPressed ? Qt.ShiftModifier : Qt.NoModifier - mouseArea.mouseSelect(row, modifiers, true /* drag */) + mouseArea.mouseSelect(index, modifiers, true /* drag */) } } } - function mouseSelect(row, modifiers, drag) { + function mouseSelect(modelIndex, modifiers, drag) { if (!selection) { maybeWarnAboutSelectionMode() return } if (selectionMode) { - var modelIndex = modelAdaptor.mapRowToModelIndex(row) selection.setCurrentIndex(modelIndex, ItemSelectionModel.NoUpdate) if (selectionMode === SelectionMode.SingleSelection) { selection.select(modelIndex, ItemSelectionModel.ClearAndSelect) } else { - var itemSelection = clickedRow === row ? modelIndex - : modelAdaptor.selectionForRowRange(clickedRow, row) + var selectRowRange = (drag && (selectionMode === SelectionMode.MultiSelection + || (selectionMode === SelectionMode.ExtendedSelection + && modifiers & Qt.ControlModifier))) + || modifiers & Qt.ShiftModifier + var itemSelection = !selectRowRange || clickedIndex === modelIndex ? modelIndex + : modelAdaptor.selectionForRowRange(clickedIndex, modelIndex) + if (selectionMode === SelectionMode.MultiSelection || selectionMode === SelectionMode.ExtendedSelection && modifiers & Qt.ControlModifier) { if (drag) @@ -175,7 +183,7 @@ } else if (modifiers & Qt.ShiftModifier) { selection.select(itemSelection, ItemSelectionModel.SelectCurrent) } else { - clickedRow = row // Needed only when drag is true + clickedIndex = modelIndex // Needed only when drag is true selection.select(modelIndex, ItemSelectionModel.ClearAndSelect) } } @@ -185,9 +193,9 @@ function keySelect(keyModifiers) { if (selectionMode) { if (!keyModifiers) - clickedRow = currentRow + clickedIndex = currentIndex if (!(keyModifiers & Qt.ControlModifier)) - mouseSelect(currentRow, keyModifiers, keyModifiers & Qt.ShiftModifier) + mouseSelect(currentIndex, keyModifiers, keyModifiers & Qt.ShiftModifier) } } @@ -202,6 +210,8 @@ if (selectionMode === SelectionMode.SingleSelection) return selection.currentIndex === modelIndex return selection.hasSelection && selection.isSelected(modelIndex) + } else { + return false } } @@ -227,24 +237,40 @@ } onPressed: { - pressedRow = __listView.indexAt(0, mouseY + __listView.contentY) + var pressedRow = __listView.indexAt(0, mouseY + __listView.contentY) + pressedIndex = modelAdaptor.mapRowToModelIndex(pressedRow) pressedColumn = __listView.columnAt(mouseX) + selectOnRelease = false __listView.forceActiveFocus() - if (pressedRow > -1 && !Settings.hasTouchScreen - && !branchDecorationContains(mouse.x, mouse.y)) { - __listView.currentIndex = pressedRow - if (clickedRow === -1) - clickedRow = pressedRow - mouseSelect(pressedRow, mouse.modifiers, false) - if (!mouse.modifiers) - clickedRow = pressedRow + if (pressedRow === -1 + || Settings.hasTouchScreen + || branchDecorationContains(mouse.x, mouse.y)) { + return } + if (selectionMode === SelectionMode.ExtendedSelection + && selection.isSelected(pressedIndex)) { + selectOnRelease = true + return + } + __listView.currentIndex = pressedRow + if (!clickedIndex) + clickedIndex = pressedIndex + mouseSelect(pressedIndex, mouse.modifiers, false) + if (!mouse.modifiers) + clickedIndex = pressedIndex } onReleased: { - pressedRow = -1 + if (selectOnRelease) { + var releasedRow = __listView.indexAt(0, mouseY + __listView.contentY) + var releasedIndex = modelAdaptor.mapRowToModelIndex(releasedRow) + if (releasedRow >= 0 && releasedIndex === pressedIndex) + mouseSelect(pressedIndex, mouse.modifiers, false) + } + pressedIndex = undefined pressedColumn = -1 autoScroll = 0 + selectOnRelease = false } onPositionChanged: { @@ -261,25 +287,28 @@ } if (pressed && containsMouse) { - var oldPressedRow = pressedRow - pressedRow = __listView.indexAt(0, mouseY + __listView.contentY) + var oldPressedIndex = pressedIndex + var pressedRow = __listView.indexAt(0, mouseY + __listView.contentY) + pressedIndex = modelAdaptor.mapRowToModelIndex(pressedRow) pressedColumn = __listView.columnAt(mouseX) - if (pressedRow > -1 && oldPressedRow !== pressedRow) { + if (pressedRow > -1 && oldPressedIndex !== pressedIndex) { __listView.currentIndex = pressedRow - mouseSelect(pressedRow, mouse.modifiers, true /* drag */) + mouseSelect(pressedIndex, mouse.modifiers, true /* drag */) } } } onExited: { - pressedRow = -1 + pressedIndex = undefined pressedColumn = -1 + selectOnRelease = false } onCanceled: { - pressedRow = -1 + pressedIndex = undefined pressedColumn = -1 autoScroll = 0 + selectOnRelease = false } onClicked: { Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Dialogs/libdialogplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Dialogs/libdialogplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Dialogs/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Dialogs/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Dialogs/plugins.qmltypes 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Dialogs/plugins.qmltypes 2016-05-24 04:32:21.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. @@ -7,6 +7,22 @@ // 'qmlplugindump -nonrelocatable QtQuick.Dialogs 1.2' Module { + dependencies: [ + "Qt.labs.folderlistmodel 2.1", + "Qt.labs.settings 1.0", + "QtGraphicalEffects 1.0", + "QtGraphicalEffects.private 1.0", + "QtQml.Models 2.2", + "QtQuick 2.6", + "QtQuick.Controls 1.4", + "QtQuick.Controls.Styles 1.4", + "QtQuick.Extras 1.4", + "QtQuick.Extras.Private.CppUtils 1.1", + "QtQuick.Layouts 1.1", + "QtQuick.PrivateWidgets 1.1", + "QtQuick.Window 2.2" + ] + Component { name: "QQuickAbstractColorDialog" prototype: "QQuickAbstractDialog" @@ -236,6 +252,8 @@ Component { name: "QQuickAbstractMessageDialog" prototype: "QQuickAbstractDialog" + exports: ["QtQuick.PrivateWidgets/QtMessageDialog 1.1"] + exportMetaObjectRevisions: [0] Enum { name: "Icon" values: { @@ -297,6 +315,7 @@ Parameter { name: "button"; type: "QQuickAbstractDialog::StandardButton" } } } + Component { name: "QQuickColorDialog" defaultProperty: "contentItem" @@ -349,6 +368,7 @@ exportMetaObjectRevisions: [0] Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } Property { name: "shortcuts"; type: "QJSValue"; isReadonly: true } + Property { name: "__shortcuts"; type: "QJSValue"; isReadonly: true } Method { name: "clearSelection" } Method { name: "addSelection" @@ -385,82 +405,440 @@ exportMetaObjectRevisions: [0] } Component { - prototype: "QObject" - name: "QtQuick.Dialogs/ColorDialog" - exports: ["QtQuick.Dialogs/ColorDialog 1.0"] + prototype: "QQuickWindowQmlImpl" + name: "QtQuick.Controls/ApplicationWindow 1.0" + exports: ["QtQuick.Controls/ApplicationWindow 1.0"] exportMetaObjectRevisions: [0] isComposite: true - defaultProperty: "contentItem" - Property { name: "__valueSet"; type: "bool" } - Method { name: "__setControlsFromColor"; type: "QVariant" } - Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "showAlphaChannel"; type: "bool" } - Property { name: "color"; type: "QColor" } - Property { name: "currentColor"; type: "QColor" } - Property { name: "currentHue"; type: "double"; isReadonly: true } - Property { name: "currentSaturation"; type: "double"; isReadonly: true } - Property { name: "currentLightness"; type: "double"; isReadonly: true } - Property { name: "currentAlpha"; type: "double"; isReadonly: true } - Signal { name: "selectionAccepted" } - Method { - name: "setVisible" - Parameter { name: "v"; type: "bool" } - } - Method { - name: "setModality" - Parameter { name: "m"; type: "Qt::WindowModality" } - } - Method { - name: "setTitle" - Parameter { name: "t"; type: "string" } + defaultProperty: "data" + Property { name: "menuBar"; type: "MenuBar_QMLTYPE_4"; isPointer: true } + Property { name: "toolBar"; type: "QQuickItem"; isPointer: true } + Property { name: "statusBar"; type: "QQuickItem"; isPointer: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__topBottomMargins"; type: "double" } + Property { name: "__qwindowsize_max"; type: "double"; isReadonly: true } + Property { name: "__width"; type: "double" } + Property { name: "__height"; type: "double" } + Property { + name: "contentItem" + type: "ContentItem_QMLTYPE_12" + isReadonly: true + isPointer: true } + Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "__panel"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/BusyIndicator 1.1" + exports: ["QtQuick.Controls/BusyIndicator 1.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "data" + Property { name: "running"; type: "bool" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/Button 1.0" + exports: ["QtQuick.Controls/Button 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "isDefault"; type: "bool" } + Property { name: "menu"; type: "Menu_QMLTYPE_52"; isPointer: true } + Property { name: "checkable"; type: "bool" } + Property { name: "checked"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "action"; type: "QQuickAction"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "text"; type: "string" } + Property { name: "tooltip"; type: "string" } + Property { name: "iconSource"; type: "QUrl" } + Property { name: "iconName"; type: "string" } + Property { name: "__position"; type: "string" } + Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } + Property { name: "__action"; type: "QQuickAction"; isPointer: true } + Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } + Property { name: "__behavior"; type: "QVariant" } + Property { name: "__effectivePressed"; type: "bool" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Method { name: "accessiblePressAction"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/Calendar 1.2" + exports: ["QtQuick.Controls/Calendar 1.2"] + exportMetaObjectRevisions: [2] + isComposite: true + defaultProperty: "data" + Property { name: "visibleMonth"; type: "int" } + Property { name: "visibleYear"; type: "int" } + Property { name: "frameVisible"; type: "bool" } + Property { name: "weekNumbersVisible"; type: "bool" } + Property { name: "navigationBarVisible"; type: "bool" } + Property { name: "dayOfWeekFormat"; type: "int" } + Property { name: "__locale"; type: "QVariant" } + Property { name: "__model"; type: "QQuickCalendarModel"; isPointer: true } + Property { name: "selectedDate"; type: "QDate" } + Property { name: "minimumDate"; type: "QDate" } + Property { name: "maximumDate"; type: "QDate" } + Signal { + name: "hovered" + Parameter { name: "date"; type: "QDateTime" } + } + Signal { + name: "pressed" + Parameter { name: "date"; type: "QDateTime" } + } + Signal { + name: "released" + Parameter { name: "date"; type: "QDateTime" } + } + Signal { + name: "clicked" + Parameter { name: "date"; type: "QDateTime" } + } + Signal { + name: "doubleClicked" + Parameter { name: "date"; type: "QDateTime" } + } + Signal { + name: "pressAndHold" + Parameter { name: "date"; type: "QDateTime" } + } + Method { name: "showPreviousMonth"; type: "QVariant" } + Method { name: "showNextMonth"; type: "QVariant" } + Method { name: "showPreviousYear"; type: "QVariant" } + Method { name: "showNextYear"; type: "QVariant" } + Method { name: "__selectPreviousMonth"; type: "QVariant" } + Method { name: "__selectNextMonth"; type: "QVariant" } + Method { name: "__selectPreviousWeek"; type: "QVariant" } + Method { name: "__selectNextWeek"; type: "QVariant" } + Method { name: "__selectFirstDayOfMonth"; type: "QVariant" } + Method { name: "__selectLastDayOfMonth"; type: "QVariant" } + Method { name: "__selectPreviousDay"; type: "QVariant" } + Method { name: "__selectNextDay"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/CheckBox 1.0" + exports: ["QtQuick.Controls/CheckBox 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "checkedState"; type: "int" } + Property { name: "partiallyCheckedEnabled"; type: "bool" } + Property { name: "__ignoreChecked"; type: "bool" } + Property { name: "__ignoreCheckedState"; type: "bool" } + Method { name: "__cycleCheckBoxStates"; type: "QVariant" } + Property { name: "checked"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "text"; type: "string" } + Property { name: "__cycleStatesHandler"; type: "QVariant" } + Property { name: "pressed"; type: "bool" } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras.Private/CircularButton 1.0" + exports: ["QtQuick.Extras.Private/CircularButton 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "isDefault"; type: "bool" } + Property { name: "menu"; type: "Menu_QMLTYPE_52"; isPointer: true } + Property { name: "checkable"; type: "bool" } + Property { name: "checked"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "action"; type: "QQuickAction"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "text"; type: "string" } + Property { name: "tooltip"; type: "string" } + Property { name: "iconSource"; type: "QUrl" } + Property { name: "iconName"; type: "string" } + Property { name: "__position"; type: "string" } + Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } + Property { name: "__action"; type: "QQuickAction"; isPointer: true } + Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } + Property { name: "__behavior"; type: "QVariant" } + Property { name: "__effectivePressed"; type: "bool" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Method { name: "accessiblePressAction"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QObject" + name: "QtQuick.Extras.Private/CircularButtonStyleHelper 1.0" + exports: ["QtQuick.Extras.Private/CircularButtonStyleHelper 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + Property { name: "control"; type: "QQuickItem"; isPointer: true } + Property { name: "buttonColorUpTop"; type: "QColor" } + Property { name: "buttonColorUpBottom"; type: "QColor" } + Property { name: "buttonColorDownTop"; type: "QColor" } + Property { name: "buttonColorDownBottom"; type: "QColor" } + Property { name: "outerArcColorTop"; type: "QColor" } + Property { name: "outerArcColorBottom"; type: "QColor" } + Property { name: "innerArcColorTop"; type: "QColor" } + Property { name: "innerArcColorBottom"; type: "QColor" } + Property { name: "innerArcColorBottomStop"; type: "double" } + Property { name: "shineColor"; type: "QColor" } + Property { name: "smallestAxis"; type: "double" } + Property { name: "outerArcLineWidth"; type: "double" } + Property { name: "innerArcLineWidth"; type: "double" } + Property { name: "shineArcLineWidth"; type: "double" } + Property { name: "implicitWidth"; type: "double" } + Property { name: "implicitHeight"; type: "double" } + Property { name: "textColorUp"; type: "QColor" } + Property { name: "textColorDown"; type: "QColor" } + Property { name: "textRaisedColorUp"; type: "QColor" } + Property { name: "textRaisedColorDown"; type: "QColor" } + Property { name: "radius"; type: "double" } + Property { name: "halfRadius"; type: "double" } + Property { name: "outerArcRadius"; type: "double" } + Property { name: "innerArcRadius"; type: "double" } + Property { name: "shineArcRadius"; type: "double" } + Property { name: "zeroAngle"; type: "double" } + Property { name: "buttonColorTop"; type: "QColor" } + Property { name: "buttonColorBottom"; type: "QColor" } Method { - name: "setColor" - Parameter { name: "arg"; type: "QColor" } + name: "toPixels" + type: "QVariant" + Parameter { name: "percentageOfSmallestAxis"; type: "QVariant" } } Method { - name: "setCurrentColor" - Parameter { name: "currentColor"; type: "QColor" } + name: "paintBackground" + type: "QVariant" + Parameter { name: "ctx"; type: "QVariant" } } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/CircularGauge 1.0" + exports: ["QtQuick.Extras/CircularGauge 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "tickmarksVisible"; type: "bool" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "value"; type: "double" } + Property { name: "stepSize"; type: "double" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras.Private/CircularTickmarkLabel 1.0" + exports: ["QtQuick.Extras.Private/CircularTickmarkLabel 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "minimumValueAngle"; type: "double" } + Property { name: "maximumValueAngle"; type: "double" } + Property { name: "angleRange"; type: "double"; isReadonly: true } + Property { name: "tickmarkStepSize"; type: "double" } + Property { name: "tickmarkInset"; type: "double" } + Property { name: "tickmarkCount"; type: "int"; isReadonly: true } + Property { name: "minorTickmarkCount"; type: "int" } + Property { name: "minorTickmarkInset"; type: "double" } + Property { name: "labelInset"; type: "double" } + Property { name: "labelStepSize"; type: "double" } + Property { name: "labelCount"; type: "int"; isReadonly: true } + Property { name: "__tickmarkCount"; type: "double"; isReadonly: true } + Property { name: "tickmarksVisible"; type: "bool" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "stepSize"; type: "double" } Method { - name: "setShowAlphaChannel" - Parameter { name: "arg"; type: "bool" } + name: "valueToAngle" + type: "QVariant" + Parameter { name: "value"; type: "QVariant" } } - Property { name: "visible"; type: "bool" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "title"; type: "string" } - Property { name: "isWindow"; type: "bool"; isReadonly: true } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "__maximumDimension"; type: "int"; isReadonly: true } - Signal { name: "visibilityChanged" } - Signal { name: "geometryChanged" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickAbstractColorDialog" + name: "QtQuick.Dialogs/ColorDialog 1.0" + exports: ["QtQuick.Dialogs/ColorDialog 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "contentItem" + Property { name: "__valueSet"; type: "bool" } + Method { name: "__setControlsFromColor"; type: "QVariant" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/ComboBox 1.0" + exports: ["QtQuick.Controls/ComboBox 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "textRole"; type: "string" } + Property { name: "editable"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "__popup"; type: "QVariant" } + Property { name: "model"; type: "QVariant" } + Property { name: "currentIndex"; type: "int" } + Property { name: "currentText"; type: "string"; isReadonly: true } + Property { name: "editText"; type: "string" } + Property { name: "inputMethodHints"; type: "int" } + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "validator"; type: "QValidator"; isPointer: true } + Property { name: "acceptableInput"; type: "bool"; isReadonly: true } Signal { name: "accepted" } - Signal { name: "rejected" } - Method { name: "open" } - Method { name: "close" } - Method { - name: "setX" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setY" - Parameter { name: "arg"; type: "int" } + Signal { + name: "activated" + Parameter { name: "index"; type: "int" } } Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } + name: "textAt" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } + name: "find" + type: "QVariant" + Parameter { name: "text"; type: "QVariant" } } + Method { name: "selectAll"; type: "QVariant" } + Method { name: "__selectPrevItem"; type: "QVariant" } + Method { name: "__selectNextItem"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QObject" - name: "QtQuick.Dialogs/Dialog" + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/DelayButton 1.0" + exports: ["QtQuick.Extras/DelayButton 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "delay"; type: "int" } + Property { name: "__progress"; type: "double" } + Property { name: "progress"; type: "double"; isReadonly: true } + Signal { name: "activated" } + Property { name: "isDefault"; type: "bool" } + Property { name: "menu"; type: "Menu_QMLTYPE_52"; isPointer: true } + Property { name: "checkable"; type: "bool" } + Property { name: "checked"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "action"; type: "QQuickAction"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "text"; type: "string" } + Property { name: "tooltip"; type: "string" } + Property { name: "iconSource"; type: "QUrl" } + Property { name: "iconName"; type: "string" } + Property { name: "__position"; type: "string" } + Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } + Property { name: "__action"; type: "QQuickAction"; isPointer: true } + Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } + Property { name: "__behavior"; type: "QVariant" } + Property { name: "__effectivePressed"; type: "bool" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Method { name: "accessiblePressAction"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/Dial 1.1" + exports: ["QtQuick.Extras/Dial 1.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "data" + Property { name: "__wrap"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "tickmarksVisible"; type: "bool" } + Property { name: "value"; type: "double" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "stepSize"; type: "double" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/Dial 1.0" + exports: ["QtQuick.Extras/Dial 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "__wrap"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "tickmarksVisible"; type: "bool" } + Property { name: "value"; type: "double" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "stepSize"; type: "double" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickAbstractDialog" + name: "QtQuick.Dialogs/Dialog 1.2" exports: ["QtQuick.Dialogs/Dialog 1.2"] exportMetaObjectRevisions: [2] isComposite: true @@ -496,40 +874,10 @@ } Method { name: "__standardButtonsLeftModel"; type: "QJSValue" } Method { name: "__standardButtonsRightModel"; type: "QJSValue" } - Property { name: "visible"; type: "bool" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "isWindow"; type: "bool"; isReadonly: true } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "__maximumDimension"; type: "int"; isReadonly: true } - Signal { name: "visibilityChanged" } - Signal { name: "geometryChanged" } - Signal { name: "accepted" } - Signal { name: "rejected" } - Method { name: "open" } - Method { name: "close" } - Method { - name: "setX" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setY" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } - } } Component { - prototype: "QObject" - name: "QtQuick.Dialogs/FileDialog" + prototype: "QQuickAbstractFileDialog" + name: "QtQuick.Dialogs/FileDialog 1.0" exports: ["QtQuick.Dialogs/FileDialog 1.0"] exportMetaObjectRevisions: [0] isComposite: true @@ -537,8 +885,8 @@ Property { name: "settings"; type: "QQmlSettings"; isPointer: true } Property { name: "showFocusHighlight"; type: "bool" } Property { name: "palette"; type: "QQuickSystemPalette"; isPointer: true } - Property { name: "dirUpAction"; type: "QQuickAction"; isPointer: true } Property { name: "favoriteFolders"; type: "QVariant" } + Property { name: "dirUpAction"; type: "QQuickAction"; isPointer: true } Method { name: "dirDown" type: "QVariant" @@ -548,270 +896,1674 @@ Method { name: "acceptSelection"; type: "QVariant" } Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } Property { name: "shortcuts"; type: "QJSValue"; isReadonly: true } + Property { name: "__shortcuts"; type: "QJSValue"; isReadonly: true } Method { name: "clearSelection" } Method { name: "addSelection" type: "bool" Parameter { name: "path"; type: "QUrl" } } - Property { name: "selectExisting"; type: "bool" } - Property { name: "selectMultiple"; type: "bool" } - Property { name: "selectFolder"; type: "bool" } - Property { name: "folder"; type: "QUrl" } - Property { name: "nameFilters"; type: "QStringList" } - Property { name: "selectedNameFilter"; type: "string" } - Property { name: "selectedNameFilterExtensions"; type: "QStringList"; isReadonly: true } - Property { name: "selectedNameFilterIndex"; type: "int" } - Property { name: "fileUrl"; type: "QUrl"; isReadonly: true } - Property { name: "fileUrls"; type: "QList"; isReadonly: true } - Property { name: "sidebarVisible"; type: "bool" } - Signal { name: "filterSelected" } - Signal { name: "fileModeChanged" } - Signal { name: "selectionAccepted" } + } + Component { + prototype: "QQuickAbstractFontDialog" + name: "QtQuick.Dialogs/FontDialog 1.1" + exports: ["QtQuick.Dialogs/FontDialog 1.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "contentItem" + Property { name: "font"; type: "QFont" } + Property { name: "currentFont"; type: "QFont" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/Gauge 1.0" + exports: ["QtQuick.Extras/Gauge 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "orientation"; type: "int" } + Property { name: "tickmarkAlignment"; type: "int" } + Property { name: "__tickmarkAlignment"; type: "int" } + Property { name: "__tickmarksInside"; type: "bool" } + Property { name: "tickmarkStepSize"; type: "double" } + Property { name: "minorTickmarkCount"; type: "int" } + Property { name: "formatValue"; type: "QVariant" } + Property { name: "minimumValue"; type: "double" } + Property { name: "value"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "font"; type: "QFont" } + Property { name: "__hiddenText"; type: "QQuickText"; isReadonly: true; isPointer: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/GroupBox 1.0" + exports: ["QtQuick.Controls/GroupBox 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "__content" + Property { name: "title"; type: "string" } + Property { name: "flat"; type: "bool" } + Property { name: "checkable"; type: "bool" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "checked"; type: "bool" } + Property { name: "__content"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "__checkbox"; type: "CheckBox_QMLTYPE_76"; isReadonly: true; isPointer: true } + Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } + } + Component { + prototype: "QQuickText" + name: "QtQuick.Controls/Label 1.0" + exports: ["QtQuick.Controls/Label 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } + Component { + prototype: "QQuickMenu" + name: "QtQuick.Controls/Menu 1.0" + exports: ["QtQuick.Controls/Menu 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "items" + Property { name: "__selfComponent"; type: "QQmlComponent"; isPointer: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__usingDefaultStyle"; type: "bool" } + Property { name: "__parentContentItem"; type: "QVariant" } + Property { name: "__currentIndex"; type: "int" } Method { - name: "setVisible" - Parameter { name: "v"; type: "bool" } + name: "addMenu" + type: "QVariant" + Parameter { name: "title"; type: "QVariant" } } Method { - name: "setTitle" - Parameter { name: "t"; type: "string" } + name: "insertMenu" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "title"; type: "QVariant" } } + } + Component { + prototype: "QQuickMenuBar" + name: "QtQuick.Controls/MenuBar 1.0" + exports: ["QtQuick.Controls/MenuBar 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "menus" + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__menuBarComponent"; type: "QQmlComponent"; isPointer: true } + } + Component { + prototype: "QQuickAbstractMessageDialog" + name: "QtQuick.Dialogs/MessageDialog 1.1" + exports: ["QtQuick.Dialogs/MessageDialog 1.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "contentItem" + Method { name: "calculateImplicitWidth"; type: "QVariant" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/PieMenu 1.0" + exports: ["QtQuick.Extras/PieMenu 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "menuItems" + Property { name: "selectionAngle"; type: "double"; isReadonly: true } + Property { name: "triggerMode"; type: "int" } + Property { name: "title"; type: "string" } + Property { name: "boundingItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__protectedScope"; type: "QObject"; isPointer: true } + Property { name: "activationMode"; type: "int" } + Property { name: "menuItems"; type: "QQuickMenuItem"; isList: true; isReadonly: true } + Property { name: "currentIndex"; type: "int"; isReadonly: true } + Property { name: "currentItem"; type: "QQuickMenuItem"; isReadonly: true; isPointer: true } + Property { name: "__mouseThief"; type: "QQuickMouseThief"; isReadonly: true; isPointer: true } Method { - name: "setSelectExisting" - Parameter { name: "s"; type: "bool" } + name: "popup" + type: "QVariant" + Parameter { name: "x"; type: "QVariant" } + Parameter { name: "y"; type: "QVariant" } } Method { - name: "setSelectMultiple" - Parameter { name: "s"; type: "bool" } + name: "addItem" + type: "QVariant" + Parameter { name: "text"; type: "QVariant" } } Method { - name: "setSelectFolder" - Parameter { name: "s"; type: "bool" } + name: "insertItem" + type: "QVariant" + Parameter { name: "before"; type: "QVariant" } + Parameter { name: "text"; type: "QVariant" } } Method { - name: "setFolder" - Parameter { name: "f"; type: "QUrl" } + name: "removeItem" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickLoader" + name: "QtQuick.Extras.Private/PieMenuIcon 1.0" + exports: ["QtQuick.Extras.Private/PieMenuIcon 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "control"; type: "PieMenu_QMLTYPE_250"; isPointer: true } + Property { name: "styleData"; type: "QObject"; isPointer: true } + Property { name: "iconSource"; type: "string"; isReadonly: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/ProgressBar 1.0" + exports: ["QtQuick.Controls/ProgressBar 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "value"; type: "double" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "indeterminate"; type: "bool" } + Property { name: "orientation"; type: "int" } + Property { name: "__initialized"; type: "bool" } + Property { name: "hovered"; type: "bool"; isReadonly: true } Method { - name: "setNameFilters" - Parameter { name: "f"; type: "QStringList" } + name: "setValue" + type: "QVariant" + Parameter { name: "v"; type: "QVariant" } + } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/RadioButton 1.0" + exports: ["QtQuick.Controls/RadioButton 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "checked"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "text"; type: "string" } + Property { name: "__cycleStatesHandler"; type: "QVariant" } + Property { name: "pressed"; type: "bool" } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/ScrollView 1.0" + exports: ["QtQuick.Controls/ScrollView 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "contentItem" + Property { name: "frameVisible"; type: "bool" } + Property { name: "highlightOnFocus"; type: "bool" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__scroller"; type: "QQuickItem"; isPointer: true } + Property { name: "__scrollBarTopMargin"; type: "int" } + Property { name: "__viewTopMargin"; type: "int" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } + Property { name: "horizontalScrollBarPolicy"; type: "int" } + Property { name: "verticalScrollBarPolicy"; type: "int" } + Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } + Property { name: "__wheelAreaScrollSpeed"; type: "double" } + Property { + name: "__horizontalScrollBar" + type: "ScrollBar_QMLTYPE_27" + isReadonly: true + isPointer: true + } + Property { + name: "__verticalScrollBar" + type: "ScrollBar_QMLTYPE_27" + isReadonly: true + isPointer: true + } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/Slider 1.0" + exports: ["QtQuick.Controls/Slider 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "orientation"; type: "int" } + Property { name: "updateValueWhileDragging"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "tickmarksEnabled"; type: "bool" } + Property { name: "__horizontal"; type: "bool" } + Property { name: "__handlePos"; type: "double" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "stepSize"; type: "double" } + Property { name: "value"; type: "double" } + Method { name: "accessibleIncreaseAction"; type: "QVariant" } + Method { name: "accessibleDecreaseAction"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/SpinBox 1.0" + exports: ["QtQuick.Controls/SpinBox 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "horizontalAlignment"; type: "int" } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } + Property { name: "value"; type: "double" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "stepSize"; type: "double" } + Property { name: "suffix"; type: "string" } + Property { name: "prefix"; type: "string" } + Property { name: "decimals"; type: "int" } + Property { name: "font"; type: "QFont" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "__text"; type: "string" } + Property { name: "__baselineOffset"; type: "double" } + Signal { name: "editingFinished" } + Method { name: "__increment"; type: "QVariant" } + Method { name: "__decrement"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.Controls/SplitView 1.0" + exports: ["QtQuick.Controls/SplitView 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "__contents" + Property { name: "orientation"; type: "int" } + Property { name: "handleDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "resizing"; type: "bool" } + Property { name: "__contents"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "__items"; type: "QQuickItem"; isList: true; isReadonly: true } + Property { name: "__handles"; type: "QQuickItem"; isList: true; isReadonly: true } + Method { + name: "addItem" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } + } + Method { + name: "removeItem" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } + } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/StackView 1.0" + exports: ["QtQuick.Controls/StackView 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "initialItem"; type: "QVariant" } + Property { name: "busy"; type: "bool"; isReadonly: true } + Property { name: "delegate"; type: "StackViewDelegate_QMLTYPE_293"; isPointer: true } + Property { name: "__currentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__depth"; type: "int" } + Property { name: "__currentTransition"; type: "QVariant" } + Property { name: "__guard"; type: "bool" } + Property { name: "invalidItemReplacement"; type: "QQmlComponent"; isPointer: true } + Property { name: "depth"; type: "int"; isReadonly: true } + Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Method { + name: "push" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } + } + Method { + name: "pop" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } + } + Method { name: "clear"; type: "QVariant" } + Method { + name: "find" + type: "QVariant" + Parameter { name: "func"; type: "QVariant" } + Parameter { name: "onlySearchLoadedItems"; type: "QVariant" } + } + Method { + name: "get" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "dontLoad"; type: "QVariant" } + } + Method { name: "completeTransition"; type: "QVariant" } + Method { + name: "replace" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } + Parameter { name: "properties"; type: "QVariant" } + Parameter { name: "immediate"; type: "QVariant" } + } + Method { + name: "__recursionGuard" + type: "QVariant" + Parameter { name: "use"; type: "QVariant" } + } + Method { + name: "__loadElement" + type: "QVariant" + Parameter { name: "element"; type: "QVariant" } + } + Method { + name: "__resolveComponent" + type: "QVariant" + Parameter { name: "unknownObjectType"; type: "QVariant" } + Parameter { name: "element"; type: "QVariant" } + } + Method { + name: "__cleanup" + type: "QVariant" + Parameter { name: "element"; type: "QVariant" } + } + Method { + name: "__setStatus" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } + Parameter { name: "status"; type: "QVariant" } + } + Method { + name: "__performTransition" + type: "QVariant" + Parameter { name: "transition"; type: "QVariant" } + } + Method { name: "animationFinished"; type: "QVariant" } + } + Component { + prototype: "QObject" + name: "QtQuick.Controls/StackViewDelegate 1.0" + exports: ["QtQuick.Controls/StackViewDelegate 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + Property { name: "pushTransition"; type: "QQmlComponent"; isPointer: true } + Property { name: "popTransition"; type: "QQmlComponent"; isPointer: true } + Property { name: "replaceTransition"; type: "QQmlComponent"; isPointer: true } + Method { + name: "getTransition" + type: "QVariant" + Parameter { name: "properties"; type: "QVariant" } + } + Method { + name: "transitionFinished" + type: "QVariant" + Parameter { name: "properties"; type: "QVariant" } + } + } + Component { + prototype: "QQuickParallelAnimation" + name: "QtQuick.Controls/StackViewTransition 1.0" + exports: ["QtQuick.Controls/StackViewTransition 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "animations" + Property { name: "name"; type: "string" } + Property { name: "enterItem"; type: "QQuickItem"; isPointer: true } + Property { name: "exitItem"; type: "QQuickItem"; isPointer: true } + Property { name: "immediate"; type: "bool" } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/StatusBar 1.0" + exports: ["QtQuick.Controls/StatusBar 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "__content" + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "__content"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/StatusIndicator 1.0" + exports: ["QtQuick.Extras/StatusIndicator 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "active"; type: "bool" } + Property { name: "color"; type: "QColor" } + Property { name: "on"; type: "bool" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/StatusIndicator 1.1" + exports: ["QtQuick.Extras/StatusIndicator 1.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "data" + Property { name: "active"; type: "bool" } + Property { name: "color"; type: "QColor" } + Property { name: "on"; type: "bool" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/Switch 1.1" + exports: ["QtQuick.Controls/Switch 1.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "data" + Property { name: "checked"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickLoader" + name: "QtQuick.Controls/Tab 1.0" + exports: ["QtQuick.Controls/Tab 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "component" + Property { name: "title"; type: "string" } + Property { name: "__inserted"; type: "bool" } + Property { name: "component"; type: "QQmlComponent"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/TabView 1.0" + exports: ["QtQuick.Controls/TabView 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "currentIndex"; type: "int" } + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "frameVisible"; type: "bool" } + Property { name: "tabsVisible"; type: "bool" } + Property { name: "tabPosition"; type: "int" } + Property { name: "__tabs"; type: "QQmlListModel"; isPointer: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__styleItem"; type: "QVariant" } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Method { + name: "addTab" + type: "QVariant" + Parameter { name: "title"; type: "QVariant" } + Parameter { name: "component"; type: "QVariant" } + } + Method { + name: "insertTab" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "title"; type: "QVariant" } + Parameter { name: "component"; type: "QVariant" } + } + Method { + name: "removeTab" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { + name: "moveTab" + type: "QVariant" + Parameter { name: "from"; type: "QVariant" } + Parameter { name: "to"; type: "QVariant" } + } + Method { + name: "getTab" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { + name: "__willRemoveIndex" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { + name: "__didInsertIndex" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { name: "__setOpacities"; type: "QVariant" } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/TableView 1.0" + exports: ["QtQuick.Controls/TableView 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "__columns" + Property { name: "model"; type: "QVariant" } + Property { name: "rowCount"; type: "int"; isReadonly: true } + Property { name: "currentRow"; type: "int" } + Property { + name: "selection" + type: "TableViewSelection_QMLTYPE_175" + isReadonly: true + isPointer: true + } + Signal { + name: "activated" + Parameter { name: "row"; type: "int" } + } + Signal { + name: "clicked" + Parameter { name: "row"; type: "int" } + } + Signal { + name: "doubleClicked" + Parameter { name: "row"; type: "int" } + } + Signal { + name: "pressAndHold" + Parameter { name: "row"; type: "int" } + } + Method { + name: "positionViewAtRow" + type: "QVariant" + Parameter { name: "row"; type: "QVariant" } + Parameter { name: "mode"; type: "QVariant" } + } + Method { + name: "rowAt" + type: "QVariant" + Parameter { name: "x"; type: "QVariant" } + Parameter { name: "y"; type: "QVariant" } + } + Property { name: "alternatingRowColors"; type: "bool" } + Property { name: "headerVisible"; type: "bool" } + Property { name: "itemDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "rowDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "headerDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "sortIndicatorColumn"; type: "int" } + Property { name: "sortIndicatorVisible"; type: "bool" } + Property { name: "sortIndicatorOrder"; type: "int" } + Property { name: "selectionMode"; type: "int" } + Property { name: "__viewTypeName"; type: "string" } + Property { name: "__isTreeView"; type: "bool"; isReadonly: true } + Property { name: "__itemDelegateLoader"; type: "QQmlComponent"; isPointer: true } + Property { name: "__model"; type: "QVariant" } + Property { name: "__activateItemOnSingleClick"; type: "bool" } + Property { name: "__mouseArea"; type: "QQuickItem"; isPointer: true } + Property { name: "backgroundVisible"; type: "bool" } + Property { name: "contentHeader"; type: "QQmlComponent"; isPointer: true } + Property { name: "contentFooter"; type: "QQmlComponent"; isPointer: true } + Property { name: "columnCount"; type: "int"; isReadonly: true } + Property { name: "section"; type: "QQuickViewSection"; isReadonly: true; isPointer: true } + Property { name: "__columns"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "__currentRowItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "__currentRow"; type: "int" } + Property { name: "__listView"; type: "QQuickListView"; isReadonly: true; isPointer: true } + Method { + name: "addColumn" + type: "QVariant" + Parameter { name: "column"; type: "QVariant" } + } + Method { + name: "insertColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "column"; type: "QVariant" } + } + Method { + name: "removeColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { + name: "moveColumn" + type: "QVariant" + Parameter { name: "from"; type: "QVariant" } + Parameter { name: "to"; type: "QVariant" } + } + Method { + name: "getColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { name: "resizeColumnsToContents"; type: "QVariant" } + Property { name: "frameVisible"; type: "bool" } + Property { name: "highlightOnFocus"; type: "bool" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__scroller"; type: "QQuickItem"; isPointer: true } + Property { name: "__scrollBarTopMargin"; type: "int" } + Property { name: "__viewTopMargin"; type: "int" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } + Property { name: "horizontalScrollBarPolicy"; type: "int" } + Property { name: "verticalScrollBarPolicy"; type: "int" } + Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } + Property { name: "__wheelAreaScrollSpeed"; type: "double" } + Property { + name: "__horizontalScrollBar" + type: "ScrollBar_QMLTYPE_27" + isReadonly: true + isPointer: true + } + Property { + name: "__verticalScrollBar" + type: "ScrollBar_QMLTYPE_27" + isReadonly: true + isPointer: true + } + } + Component { + prototype: "QObject" + name: "QtQuick.Controls/TableViewColumn 1.0" + exports: ["QtQuick.Controls/TableViewColumn 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + Property { name: "__view"; type: "QQuickItem"; isPointer: true } + Property { name: "__index"; type: "int" } + Property { name: "title"; type: "string" } + Property { name: "role"; type: "string" } + Property { name: "width"; type: "int" } + Property { name: "visible"; type: "bool" } + Property { name: "resizable"; type: "bool" } + Property { name: "movable"; type: "bool" } + Property { name: "elideMode"; type: "int" } + Property { name: "horizontalAlignment"; type: "int" } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Method { name: "resizeToContents"; type: "QVariant" } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/TextArea 1.3" + exports: ["QtQuick.Controls/TextArea 1.3"] + exportMetaObjectRevisions: [3] + isComposite: true + defaultProperty: "data" + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "tabChangesFocus"; type: "bool" } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "baseUrl"; type: "QUrl" } + Property { name: "canPaste"; type: "bool"; isReadonly: true } + Property { name: "canRedo"; type: "bool"; isReadonly: true } + Property { name: "canUndo"; type: "bool"; isReadonly: true } + Property { name: "textColor"; type: "QColor" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } + Property { name: "font"; type: "QFont" } + Property { name: "horizontalAlignment"; type: "int" } + Property { name: "effectiveHorizontalAlignment"; type: "int"; isReadonly: true } + Property { name: "verticalAlignment"; type: "int" } + Property { name: "inputMethodHints"; type: "int" } + Property { name: "length"; type: "int"; isReadonly: true } + Property { name: "lineCount"; type: "int"; isReadonly: true } + Property { name: "readOnly"; type: "bool" } + Property { name: "selectedText"; type: "string"; isReadonly: true } + Property { name: "selectionEnd"; type: "int"; isReadonly: true } + Property { name: "selectionStart"; type: "int"; isReadonly: true } + Property { name: "text"; type: "string" } + Property { name: "textFormat"; type: "int" } + Property { name: "wrapMode"; type: "int" } + Property { name: "selectByKeyboard"; type: "bool" } + Property { name: "hoveredLink"; type: "string"; isReadonly: true } + Property { name: "backgroundVisible"; type: "bool" } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "textMargin"; type: "double" } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "contentHeight"; type: "double"; isReadonly: true } + Property { name: "textDocument"; type: "QQuickTextDocument"; isReadonly: true; isPointer: true } + Signal { + name: "linkActivated" + Parameter { name: "link"; type: "string" } + } + Signal { + name: "linkHovered" + Parameter { name: "link"; type: "string" } + } + Signal { name: "editingFinished" } + Method { + name: "append" + type: "QVariant" + Parameter { name: "string"; type: "QVariant" } + } + Method { name: "copy"; type: "QVariant" } + Method { name: "cut"; type: "QVariant" } + Method { name: "deselect"; type: "QVariant" } + Method { + name: "getFormattedText" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { + name: "getText" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { + name: "insert" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "text"; type: "QVariant" } + } + Method { + name: "isRightToLeft" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { + name: "moveCursorSelection" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "mode"; type: "QVariant" } + } + Method { name: "paste"; type: "QVariant" } + Method { + name: "positionAt" + type: "QVariant" + Parameter { name: "x"; type: "QVariant" } + Parameter { name: "y"; type: "QVariant" } + } + Method { + name: "positionToRectangle" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + } + Method { name: "redo"; type: "QVariant" } + Method { + name: "remove" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { + name: "select" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { name: "selectAll"; type: "QVariant" } + Method { name: "selectWord"; type: "QVariant" } + Method { name: "undo"; type: "QVariant" } + Property { name: "frameVisible"; type: "bool" } + Property { name: "highlightOnFocus"; type: "bool" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__scroller"; type: "QQuickItem"; isPointer: true } + Property { name: "__scrollBarTopMargin"; type: "int" } + Property { name: "__viewTopMargin"; type: "int" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } + Property { name: "horizontalScrollBarPolicy"; type: "int" } + Property { name: "verticalScrollBarPolicy"; type: "int" } + Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } + Property { name: "__wheelAreaScrollSpeed"; type: "double" } + Property { + name: "__horizontalScrollBar" + type: "ScrollBar_QMLTYPE_27" + isReadonly: true + isPointer: true + } + Property { + name: "__verticalScrollBar" + type: "ScrollBar_QMLTYPE_27" + isReadonly: true + isPointer: true + } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/TextArea 1.0" + exports: ["QtQuick.Controls/TextArea 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "tabChangesFocus"; type: "bool" } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "baseUrl"; type: "QUrl" } + Property { name: "canPaste"; type: "bool"; isReadonly: true } + Property { name: "canRedo"; type: "bool"; isReadonly: true } + Property { name: "canUndo"; type: "bool"; isReadonly: true } + Property { name: "textColor"; type: "QColor" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } + Property { name: "font"; type: "QFont" } + Property { name: "horizontalAlignment"; type: "int" } + Property { name: "effectiveHorizontalAlignment"; type: "int"; isReadonly: true } + Property { name: "verticalAlignment"; type: "int" } + Property { name: "inputMethodHints"; type: "int" } + Property { name: "length"; type: "int"; isReadonly: true } + Property { name: "lineCount"; type: "int"; isReadonly: true } + Property { name: "readOnly"; type: "bool" } + Property { name: "selectedText"; type: "string"; isReadonly: true } + Property { name: "selectionEnd"; type: "int"; isReadonly: true } + Property { name: "selectionStart"; type: "int"; isReadonly: true } + Property { name: "text"; type: "string" } + Property { name: "textFormat"; type: "int" } + Property { name: "wrapMode"; type: "int" } + Property { name: "selectByKeyboard"; type: "bool" } + Property { name: "hoveredLink"; type: "string"; isReadonly: true } + Property { name: "backgroundVisible"; type: "bool" } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "textMargin"; type: "double" } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "contentHeight"; type: "double"; isReadonly: true } + Property { name: "textDocument"; type: "QQuickTextDocument"; isReadonly: true; isPointer: true } + Signal { + name: "linkActivated" + Parameter { name: "link"; type: "string" } + } + Signal { + name: "linkHovered" + Parameter { name: "link"; type: "string" } + } + Signal { name: "editingFinished" } + Method { + name: "append" + type: "QVariant" + Parameter { name: "string"; type: "QVariant" } + } + Method { name: "copy"; type: "QVariant" } + Method { name: "cut"; type: "QVariant" } + Method { name: "deselect"; type: "QVariant" } + Method { + name: "getFormattedText" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { + name: "getText" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { + name: "insert" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "text"; type: "QVariant" } + } + Method { + name: "isRightToLeft" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { + name: "moveCursorSelection" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "mode"; type: "QVariant" } + } + Method { name: "paste"; type: "QVariant" } + Method { + name: "positionAt" + type: "QVariant" + Parameter { name: "x"; type: "QVariant" } + Parameter { name: "y"; type: "QVariant" } + } + Method { + name: "positionToRectangle" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + } + Method { name: "redo"; type: "QVariant" } + Method { + name: "remove" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { + name: "select" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { name: "selectAll"; type: "QVariant" } + Method { name: "selectWord"; type: "QVariant" } + Method { name: "undo"; type: "QVariant" } + Property { name: "frameVisible"; type: "bool" } + Property { name: "highlightOnFocus"; type: "bool" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__scroller"; type: "QQuickItem"; isPointer: true } + Property { name: "__scrollBarTopMargin"; type: "int" } + Property { name: "__viewTopMargin"; type: "int" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } + Property { name: "horizontalScrollBarPolicy"; type: "int" } + Property { name: "verticalScrollBarPolicy"; type: "int" } + Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } + Property { name: "__wheelAreaScrollSpeed"; type: "double" } + Property { + name: "__horizontalScrollBar" + type: "ScrollBar_QMLTYPE_27" + isReadonly: true + isPointer: true + } + Property { + name: "__verticalScrollBar" + type: "ScrollBar_QMLTYPE_27" + isReadonly: true + isPointer: true + } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/TextArea 1.5" + exports: ["QtQuick.Controls/TextArea 1.5"] + exportMetaObjectRevisions: [5] + isComposite: true + defaultProperty: "data" + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "tabChangesFocus"; type: "bool" } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "baseUrl"; type: "QUrl" } + Property { name: "canPaste"; type: "bool"; isReadonly: true } + Property { name: "canRedo"; type: "bool"; isReadonly: true } + Property { name: "canUndo"; type: "bool"; isReadonly: true } + Property { name: "textColor"; type: "QColor" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } + Property { name: "font"; type: "QFont" } + Property { name: "horizontalAlignment"; type: "int" } + Property { name: "effectiveHorizontalAlignment"; type: "int"; isReadonly: true } + Property { name: "verticalAlignment"; type: "int" } + Property { name: "inputMethodHints"; type: "int" } + Property { name: "length"; type: "int"; isReadonly: true } + Property { name: "lineCount"; type: "int"; isReadonly: true } + Property { name: "readOnly"; type: "bool" } + Property { name: "selectedText"; type: "string"; isReadonly: true } + Property { name: "selectionEnd"; type: "int"; isReadonly: true } + Property { name: "selectionStart"; type: "int"; isReadonly: true } + Property { name: "text"; type: "string" } + Property { name: "textFormat"; type: "int" } + Property { name: "wrapMode"; type: "int" } + Property { name: "selectByKeyboard"; type: "bool" } + Property { name: "hoveredLink"; type: "string"; isReadonly: true } + Property { name: "backgroundVisible"; type: "bool" } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "textMargin"; type: "double" } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "contentHeight"; type: "double"; isReadonly: true } + Property { name: "textDocument"; type: "QQuickTextDocument"; isReadonly: true; isPointer: true } + Signal { + name: "linkActivated" + Parameter { name: "link"; type: "string" } + } + Signal { + name: "linkHovered" + Parameter { name: "link"; type: "string" } + } + Signal { name: "editingFinished" } + Method { + name: "append" + type: "QVariant" + Parameter { name: "string"; type: "QVariant" } + } + Method { name: "copy"; type: "QVariant" } + Method { name: "cut"; type: "QVariant" } + Method { name: "deselect"; type: "QVariant" } + Method { + name: "getFormattedText" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { + name: "getText" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } Method { - name: "selectNameFilter" - Parameter { name: "f"; type: "string" } + name: "insert" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "text"; type: "QVariant" } } Method { - name: "setSelectedNameFilterIndex" - Parameter { name: "idx"; type: "int" } + name: "isRightToLeft" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } Method { - name: "setSidebarVisible" - Parameter { name: "s"; type: "bool" } + name: "moveCursorSelection" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "mode"; type: "QVariant" } } - Property { name: "visible"; type: "bool" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "title"; type: "string" } - Property { name: "isWindow"; type: "bool"; isReadonly: true } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "__maximumDimension"; type: "int"; isReadonly: true } - Signal { name: "visibilityChanged" } - Signal { name: "geometryChanged" } - Signal { name: "accepted" } - Signal { name: "rejected" } - Method { name: "open" } - Method { name: "close" } + Method { name: "paste"; type: "QVariant" } Method { - name: "setX" - Parameter { name: "arg"; type: "int" } + name: "positionAt" + type: "QVariant" + Parameter { name: "x"; type: "QVariant" } + Parameter { name: "y"; type: "QVariant" } } Method { - name: "setY" - Parameter { name: "arg"; type: "int" } + name: "positionToRectangle" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } } + Method { name: "redo"; type: "QVariant" } Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } + name: "remove" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } + name: "select" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { name: "selectAll"; type: "QVariant" } + Method { name: "selectWord"; type: "QVariant" } + Method { name: "undo"; type: "QVariant" } + Property { name: "frameVisible"; type: "bool" } + Property { name: "highlightOnFocus"; type: "bool" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__scroller"; type: "QQuickItem"; isPointer: true } + Property { name: "__scrollBarTopMargin"; type: "int" } + Property { name: "__viewTopMargin"; type: "int" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } + Property { name: "horizontalScrollBarPolicy"; type: "int" } + Property { name: "verticalScrollBarPolicy"; type: "int" } + Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } + Property { name: "__wheelAreaScrollSpeed"; type: "double" } + Property { + name: "__horizontalScrollBar" + type: "ScrollBar_QMLTYPE_27" + isReadonly: true + isPointer: true + } + Property { + name: "__verticalScrollBar" + type: "ScrollBar_QMLTYPE_27" + isReadonly: true + isPointer: true } } Component { - prototype: "QObject" - name: "QtQuick.Dialogs/FontDialog" - exports: ["QtQuick.Dialogs/FontDialog 1.1"] - exportMetaObjectRevisions: [1] + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/TextField 1.0" + exports: ["QtQuick.Controls/TextField 1.0"] + exportMetaObjectRevisions: [0] isComposite: true - defaultProperty: "contentItem" + defaultProperty: "data" + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } + Property { name: "acceptableInput"; type: "bool"; isReadonly: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "canPaste"; type: "bool"; isReadonly: true } + Property { name: "canRedo"; type: "bool"; isReadonly: true } + Property { name: "canUndo"; type: "bool"; isReadonly: true } + Property { name: "textColor"; type: "QColor" } + Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } + Property { name: "displayText"; type: "string"; isReadonly: true } + Property { name: "echoMode"; type: "int" } Property { name: "font"; type: "QFont" } - Property { name: "currentFont"; type: "QFont" } - Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "scalableFonts"; type: "bool" } - Property { name: "nonScalableFonts"; type: "bool" } - Property { name: "monospacedFonts"; type: "bool" } - Property { name: "proportionalFonts"; type: "bool" } - Signal { name: "selectionAccepted" } + Property { name: "horizontalAlignment"; type: "int" } + Property { name: "effectiveHorizontalAlignment"; type: "int"; isReadonly: true } + Property { name: "verticalAlignment"; type: "int" } + Property { name: "inputMask"; type: "string" } + Property { name: "inputMethodHints"; type: "int" } + Property { name: "length"; type: "int"; isReadonly: true } + Property { name: "maximumLength"; type: "int" } + Property { name: "placeholderText"; type: "string" } + Property { name: "readOnly"; type: "bool" } + Property { name: "selectedText"; type: "string"; isReadonly: true } + Property { name: "selectionEnd"; type: "int"; isReadonly: true } + Property { name: "selectionStart"; type: "int"; isReadonly: true } + Property { name: "text"; type: "string" } + Property { name: "validator"; type: "QValidator"; isPointer: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "__contentHeight"; type: "double"; isReadonly: true } + Property { name: "__contentWidth"; type: "double"; isReadonly: true } + Property { name: "__baselineOffset"; type: "double" } + Signal { name: "accepted" } + Signal { name: "editingFinished" } + Method { name: "copy"; type: "QVariant" } + Method { name: "cut"; type: "QVariant" } + Method { name: "deselect"; type: "QVariant" } Method { - name: "setVisible" - Parameter { name: "v"; type: "bool" } + name: "getText" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } Method { - name: "setModality" - Parameter { name: "m"; type: "Qt::WindowModality" } + name: "insert" + type: "QVariant" + Parameter { name: "position"; type: "QVariant" } + Parameter { name: "text"; type: "QVariant" } } Method { - name: "setTitle" - Parameter { name: "t"; type: "string" } + name: "isRightToLeft" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } + Method { name: "paste"; type: "QVariant" } + Method { name: "redo"; type: "QVariant" } Method { - name: "setFont" - Parameter { name: "arg"; type: "QFont" } + name: "remove" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } } Method { - name: "setCurrentFont" - Parameter { name: "arg"; type: "QFont" } + name: "select" + type: "QVariant" + Parameter { name: "start"; type: "QVariant" } + Parameter { name: "end"; type: "QVariant" } + } + Method { name: "selectAll"; type: "QVariant" } + Method { name: "selectWord"; type: "QVariant" } + Method { name: "undo"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickText" + name: "QtQuick.Extras.Private/TextSingleton 1.0" + exports: ["QtQuick.Extras.Private/TextSingleton 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + isCreatable: false + isSingleton: true + defaultProperty: "data" + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/ToggleButton 1.0" + exports: ["QtQuick.Extras/ToggleButton 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "isDefault"; type: "bool" } + Property { name: "menu"; type: "Menu_QMLTYPE_52"; isPointer: true } + Property { name: "checkable"; type: "bool" } + Property { name: "checked"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "action"; type: "QQuickAction"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "text"; type: "string" } + Property { name: "tooltip"; type: "string" } + Property { name: "iconSource"; type: "QUrl" } + Property { name: "iconName"; type: "string" } + Property { name: "__position"; type: "string" } + Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } + Property { name: "__action"; type: "QQuickAction"; isPointer: true } + Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } + Property { name: "__behavior"; type: "QVariant" } + Property { name: "__effectivePressed"; type: "bool" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Method { name: "accessiblePressAction"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/ToolBar 1.0" + exports: ["QtQuick.Controls/ToolBar 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "__content" + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "__menu"; type: "QVariant" } + Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "__content"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/ToolButton 1.0" + exports: ["QtQuick.Controls/ToolButton 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "isDefault"; type: "bool" } + Property { name: "menu"; type: "Menu_QMLTYPE_52"; isPointer: true } + Property { name: "checkable"; type: "bool" } + Property { name: "checked"; type: "bool" } + Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "action"; type: "QQuickAction"; isPointer: true } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "text"; type: "string" } + Property { name: "tooltip"; type: "string" } + Property { name: "iconSource"; type: "QUrl" } + Property { name: "iconName"; type: "string" } + Property { name: "__position"; type: "string" } + Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } + Property { name: "__action"; type: "QQuickAction"; isPointer: true } + Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } + Property { name: "__behavior"; type: "QVariant" } + Property { name: "__effectivePressed"; type: "bool" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } + Method { name: "accessiblePressAction"; type: "QVariant" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/TreeView 1.5" + exports: ["QtQuick.Controls/TreeView 1.5"] + exportMetaObjectRevisions: [5] + isComposite: true + defaultProperty: "__columns" + Property { name: "model"; type: "QVariant" } + Property { name: "currentIndex"; type: "QVariant"; isReadonly: true } + Property { name: "selection"; type: "QItemSelectionModel"; isPointer: true } + Property { name: "rootIndex"; type: "QModelIndex" } + Signal { + name: "activated" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "clicked" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "doubleClicked" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "pressAndHold" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "expanded" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "collapsed" + Parameter { name: "index"; type: "QVariant" } } Method { - name: "setScalableFonts" - Parameter { name: "arg"; type: "bool" } + name: "isExpanded" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } Method { - name: "setNonScalableFonts" - Parameter { name: "arg"; type: "bool" } + name: "collapse" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } Method { - name: "setMonospacedFonts" - Parameter { name: "arg"; type: "bool" } + name: "expand" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } Method { - name: "setProportionalFonts" - Parameter { name: "arg"; type: "bool" } + name: "indexAt" + type: "QVariant" + Parameter { name: "x"; type: "QVariant" } + Parameter { name: "y"; type: "QVariant" } } - Property { name: "visible"; type: "bool" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "title"; type: "string" } - Property { name: "isWindow"; type: "bool"; isReadonly: true } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "__maximumDimension"; type: "int"; isReadonly: true } - Signal { name: "visibilityChanged" } - Signal { name: "geometryChanged" } - Signal { name: "accepted" } - Signal { name: "rejected" } - Method { name: "open" } - Method { name: "close" } + Property { name: "alternatingRowColors"; type: "bool" } + Property { name: "headerVisible"; type: "bool" } + Property { name: "itemDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "rowDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "headerDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "sortIndicatorColumn"; type: "int" } + Property { name: "sortIndicatorVisible"; type: "bool" } + Property { name: "sortIndicatorOrder"; type: "int" } + Property { name: "selectionMode"; type: "int" } + Property { name: "__viewTypeName"; type: "string" } + Property { name: "__isTreeView"; type: "bool"; isReadonly: true } + Property { name: "__itemDelegateLoader"; type: "QQmlComponent"; isPointer: true } + Property { name: "__model"; type: "QVariant" } + Property { name: "__activateItemOnSingleClick"; type: "bool" } + Property { name: "__mouseArea"; type: "QQuickItem"; isPointer: true } + Property { name: "backgroundVisible"; type: "bool" } + Property { name: "contentHeader"; type: "QQmlComponent"; isPointer: true } + Property { name: "contentFooter"; type: "QQmlComponent"; isPointer: true } + Property { name: "columnCount"; type: "int"; isReadonly: true } + Property { name: "section"; type: "QQuickViewSection"; isReadonly: true; isPointer: true } + Property { name: "__columns"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "__currentRowItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "__currentRow"; type: "int" } + Property { name: "__listView"; type: "QQuickListView"; isReadonly: true; isPointer: true } Method { - name: "setX" - Parameter { name: "arg"; type: "int" } + name: "addColumn" + type: "QVariant" + Parameter { name: "column"; type: "QVariant" } } Method { - name: "setY" - Parameter { name: "arg"; type: "int" } + name: "insertColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "column"; type: "QVariant" } } Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } + name: "removeColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } + name: "moveColumn" + type: "QVariant" + Parameter { name: "from"; type: "QVariant" } + Parameter { name: "to"; type: "QVariant" } } - } - Component { - prototype: "QObject" - name: "QtQuick.Dialogs/MessageDialog" - exports: ["QtQuick.Dialogs/MessageDialog 1.1"] - exportMetaObjectRevisions: [1] - isComposite: true - defaultProperty: "contentItem" - Method { name: "calculateImplicitWidth"; type: "QVariant" } + Method { + name: "getColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { name: "resizeColumnsToContents"; type: "QVariant" } + Property { name: "frameVisible"; type: "bool" } + Property { name: "highlightOnFocus"; type: "bool" } Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "text"; type: "string" } - Property { name: "informativeText"; type: "string" } - Property { name: "detailedText"; type: "string" } - Property { name: "icon"; type: "Icon" } - Property { name: "standardIconSource"; type: "QUrl"; isReadonly: true } - Property { name: "standardButtons"; type: "QQuickAbstractDialog::StandardButtons" } + Property { name: "__scroller"; type: "QQuickItem"; isPointer: true } + Property { name: "__scrollBarTopMargin"; type: "int" } + Property { name: "__viewTopMargin"; type: "int" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } + Property { name: "horizontalScrollBarPolicy"; type: "int" } + Property { name: "verticalScrollBarPolicy"; type: "int" } + Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } + Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { - name: "clickedButton" - type: "QQuickAbstractDialog::StandardButton" + name: "__horizontalScrollBar" + type: "ScrollBar_QMLTYPE_27" isReadonly: true + isPointer: true + } + Property { + name: "__verticalScrollBar" + type: "ScrollBar_QMLTYPE_27" + isReadonly: true + isPointer: true + } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Controls/TreeView 1.4" + exports: ["QtQuick.Controls/TreeView 1.4"] + exportMetaObjectRevisions: [4] + isComposite: true + defaultProperty: "__columns" + Property { name: "model"; type: "QVariant" } + Property { name: "currentIndex"; type: "QVariant"; isReadonly: true } + Property { name: "selection"; type: "QItemSelectionModel"; isPointer: true } + Property { name: "rootIndex"; type: "QModelIndex" } + Signal { + name: "activated" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "clicked" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "doubleClicked" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "pressAndHold" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "expanded" + Parameter { name: "index"; type: "QVariant" } + } + Signal { + name: "collapsed" + Parameter { name: "index"; type: "QVariant" } } - Signal { name: "buttonClicked" } - Signal { name: "discard" } - Signal { name: "help" } - Signal { name: "yes" } - Signal { name: "no" } - Signal { name: "apply" } - Signal { name: "reset" } Method { - name: "setVisible" - Parameter { name: "v"; type: "bool" } + name: "isExpanded" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } Method { - name: "setTitle" - Parameter { name: "arg"; type: "string" } + name: "collapse" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } Method { - name: "setText" - Parameter { name: "arg"; type: "string" } + name: "expand" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } Method { - name: "setInformativeText" - Parameter { name: "arg"; type: "string" } + name: "indexAt" + type: "QVariant" + Parameter { name: "x"; type: "QVariant" } + Parameter { name: "y"; type: "QVariant" } } + Property { name: "alternatingRowColors"; type: "bool" } + Property { name: "headerVisible"; type: "bool" } + Property { name: "itemDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "rowDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "headerDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "sortIndicatorColumn"; type: "int" } + Property { name: "sortIndicatorVisible"; type: "bool" } + Property { name: "sortIndicatorOrder"; type: "int" } + Property { name: "selectionMode"; type: "int" } + Property { name: "__viewTypeName"; type: "string" } + Property { name: "__isTreeView"; type: "bool"; isReadonly: true } + Property { name: "__itemDelegateLoader"; type: "QQmlComponent"; isPointer: true } + Property { name: "__model"; type: "QVariant" } + Property { name: "__activateItemOnSingleClick"; type: "bool" } + Property { name: "__mouseArea"; type: "QQuickItem"; isPointer: true } + Property { name: "backgroundVisible"; type: "bool" } + Property { name: "contentHeader"; type: "QQmlComponent"; isPointer: true } + Property { name: "contentFooter"; type: "QQmlComponent"; isPointer: true } + Property { name: "columnCount"; type: "int"; isReadonly: true } + Property { name: "section"; type: "QQuickViewSection"; isReadonly: true; isPointer: true } + Property { name: "__columns"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "__currentRowItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "__currentRow"; type: "int" } + Property { name: "__listView"; type: "QQuickListView"; isReadonly: true; isPointer: true } Method { - name: "setDetailedText" - Parameter { name: "arg"; type: "string" } + name: "addColumn" + type: "QVariant" + Parameter { name: "column"; type: "QVariant" } } Method { - name: "setIcon" - Parameter { name: "icon"; type: "Icon" } + name: "insertColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "column"; type: "QVariant" } } Method { - name: "setStandardButtons" - Parameter { name: "buttons"; type: "StandardButtons" } + name: "removeColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } Method { - name: "click" - Parameter { name: "button"; type: "QQuickAbstractDialog::StandardButton" } + name: "moveColumn" + type: "QVariant" + Parameter { name: "from"; type: "QVariant" } + Parameter { name: "to"; type: "QVariant" } } - Property { name: "visible"; type: "bool" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "title"; type: "string" } - Property { name: "isWindow"; type: "bool"; isReadonly: true } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "__maximumDimension"; type: "int"; isReadonly: true } - Signal { name: "visibilityChanged" } - Signal { name: "geometryChanged" } - Signal { name: "accepted" } - Signal { name: "rejected" } - Method { name: "open" } - Method { name: "close" } Method { - name: "setX" - Parameter { name: "arg"; type: "int" } + name: "getColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { name: "resizeColumnsToContents"; type: "QVariant" } + Property { name: "frameVisible"; type: "bool" } + Property { name: "highlightOnFocus"; type: "bool" } + Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "__scroller"; type: "QQuickItem"; isPointer: true } + Property { name: "__scrollBarTopMargin"; type: "int" } + Property { name: "__viewTopMargin"; type: "int" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } + Property { name: "horizontalScrollBarPolicy"; type: "int" } + Property { name: "verticalScrollBarPolicy"; type: "int" } + Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } + Property { name: "__wheelAreaScrollSpeed"; type: "double" } + Property { + name: "__horizontalScrollBar" + type: "ScrollBar_QMLTYPE_27" + isReadonly: true + isPointer: true + } + Property { + name: "__verticalScrollBar" + type: "ScrollBar_QMLTYPE_27" + isReadonly: true + isPointer: true + } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/Tumbler 1.2" + exports: ["QtQuick.Extras/Tumbler 1.2"] + exportMetaObjectRevisions: [2] + isComposite: true + defaultProperty: "data" + Property { name: "__highlightMoveDuration"; type: "int" } + Property { name: "columnCount"; type: "int"; isReadonly: true } + Property { name: "__columnRow"; type: "QQuickRow"; isReadonly: true; isPointer: true } + Property { name: "__movementDelayTimer"; type: "QQmlTimer"; isReadonly: true; isPointer: true } + Method { + name: "__isValidColumnIndex" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } Method { - name: "setY" - Parameter { name: "arg"; type: "int" } + name: "__isValidColumnAndItemIndex" + type: "QVariant" + Parameter { name: "columnIndex"; type: "QVariant" } + Parameter { name: "itemIndex"; type: "QVariant" } } Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } + name: "currentIndexAt" + type: "QVariant" + Parameter { name: "columnIndex"; type: "QVariant" } } Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } + name: "setCurrentIndexAt" + type: "QVariant" + Parameter { name: "columnIndex"; type: "QVariant" } + Parameter { name: "itemIndex"; type: "QVariant" } + } + Method { + name: "getColumn" + type: "QVariant" + Parameter { name: "columnIndex"; type: "QVariant" } + } + Method { + name: "addColumn" + type: "QVariant" + Parameter { name: "column"; type: "QVariant" } + } + Method { + name: "insertColumn" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "column"; type: "QVariant" } + } + Method { + name: "__viewAt" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QObject" + name: "QtQuick.Extras/TumblerColumn 1.2" + exports: ["QtQuick.Extras/TumblerColumn 1.2"] + exportMetaObjectRevisions: [2] + isComposite: true + Property { name: "__tumbler"; type: "QQuickItem"; isPointer: true } + Property { name: "__index"; type: "int" } + Property { name: "__currentIndex"; type: "int" } + Property { name: "model"; type: "QVariant" } + Property { name: "role"; type: "string" } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "highlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "columnForeground"; type: "QQmlComponent"; isPointer: true } + Property { name: "visible"; type: "bool" } + Property { name: "activeFocus"; type: "bool"; isReadonly: true } + Property { name: "width"; type: "double" } + Property { name: "currentIndex"; type: "int"; isReadonly: true } } } Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Dialogs/Private/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Dialogs/Private/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Dialogs/Private/plugins.qmltypes 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Dialogs/Private/plugins.qmltypes 2016-05-24 04:32:21.000000000 +0000 @@ -0,0 +1,325 @@ +import QtQuick.tooling 1.2 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. +// +// This file was auto-generated by: +// 'qmlplugindump -nonrelocatable QtQuick.Dialogs.Private 1.1' + +Module { + dependencies: [] + Component { + name: "QAbstractItemModel" + prototype: "QObject" + Enum { + name: "LayoutChangeHint" + values: { + "NoLayoutChangeHint": 0, + "VerticalSortHint": 1, + "HorizontalSortHint": 2 + } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + Parameter { name: "roles"; type: "QVector" } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + } + Signal { + name: "headerDataChanged" + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList" } + } + Signal { name: "layoutChanged" } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList" } + } + Signal { name: "layoutAboutToBeChanged" } + Signal { + name: "rowsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { name: "modelAboutToBeReset" } + Signal { name: "modelReset" } + Signal { + name: "rowsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationRow"; type: "int" } + } + Signal { + name: "rowsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "row"; type: "int" } + } + Signal { + name: "columnsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationColumn"; type: "int" } + } + Signal { + name: "columnsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "column"; type: "int" } + } + Method { name: "submit"; type: "bool" } + Method { name: "revert" } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "parent" + type: "QModelIndex" + Parameter { name: "child"; type: "QModelIndex" } + } + Method { + name: "sibling" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "idx"; type: "QModelIndex" } + } + Method { + name: "rowCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "rowCount"; type: "int" } + Method { + name: "columnCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "columnCount"; type: "int" } + Method { + name: "hasChildren" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "hasChildren"; type: "bool" } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + } + Method { + name: "fetchMore" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "canFetchMore" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "flags" + type: "Qt::ItemFlags" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + Parameter { name: "flags"; type: "Qt::MatchFlags" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + } + } + Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" } + Component { + name: "QQuickFontListModel" + prototype: "QAbstractListModel" + exports: ["QtQuick.Dialogs.Private/FontListModel 1.1"] + exportMetaObjectRevisions: [0] + Property { name: "writingSystem"; type: "string" } + Property { name: "scalableFonts"; type: "bool" } + Property { name: "nonScalableFonts"; type: "bool" } + Property { name: "monospacedFonts"; type: "bool" } + Property { name: "proportionalFonts"; type: "bool" } + Property { name: "count"; type: "int"; isReadonly: true } + Signal { name: "rowCountChanged" } + Method { + name: "setScalableFonts" + Parameter { name: "arg"; type: "bool" } + } + Method { + name: "setNonScalableFonts" + Parameter { name: "arg"; type: "bool" } + } + Method { + name: "setMonospacedFonts" + Parameter { name: "arg"; type: "bool" } + } + Method { + name: "setProportionalFonts" + Parameter { name: "arg"; type: "bool" } + } + Method { + name: "get" + type: "QJSValue" + Parameter { name: "index"; type: "int" } + } + Method { name: "pointSizes"; type: "QJSValue" } + } + Component { + name: "QQuickWritingSystemListModel" + prototype: "QAbstractListModel" + exports: ["QtQuick.Dialogs.Private/WritingSystemListModel 1.1"] + exportMetaObjectRevisions: [0] + Property { name: "writingSystems"; type: "QStringList"; isReadonly: true } + Property { name: "count"; type: "int"; isReadonly: true } + Signal { name: "rowCountChanged" } + Method { + name: "get" + type: "QJSValue" + Parameter { name: "index"; type: "int" } + } + } +} Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Extras/libqtquickextrasplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Extras/libqtquickextrasplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Extras/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Extras/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Extras/plugins.qmltypes 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Extras/plugins.qmltypes 2016-05-24 04:32:21.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. @@ -7,6 +7,12 @@ // 'qmlplugindump -nonrelocatable QtQuick.Extras 1.4' Module { + dependencies: [ + "QtGraphicalEffects 1.0", + "QtGraphicalEffects.private 1.0", + "QtQuick 2.0", + "QtQuick.Window 2.1" + ] Component { name: "QQuickActivationMode" exports: ["QtQuick.Extras/ActivationMode 1.0"] @@ -195,13 +201,13 @@ } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Extras.Private/CircularButton" + name: "QtQuick.Extras.Private/CircularButton 1.0" exports: ["QtQuick.Extras.Private/CircularButton 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_33"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_28"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } @@ -215,8 +221,8 @@ Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } Property { name: "__action"; type: "QQuickAction"; isPointer: true } Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } - Property { name: "__effectivePressed"; type: "bool" } Property { name: "__behavior"; type: "QVariant" } + Property { name: "__effectivePressed"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } Property { name: "hovered"; type: "bool"; isReadonly: true } Signal { name: "clicked" } @@ -229,7 +235,7 @@ } Component { prototype: "QObject" - name: "QtQuick.Extras.Private/CircularButtonStyleHelper" + name: "QtQuick.Extras.Private/CircularButtonStyleHelper 1.0" exports: ["QtQuick.Extras.Private/CircularButtonStyleHelper 1.0"] exportMetaObjectRevisions: [0] isComposite: true @@ -275,7 +281,7 @@ } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Extras/CircularGauge" + name: "QtQuick.Extras/CircularGauge 1.0" exports: ["QtQuick.Extras/CircularGauge 1.0"] exportMetaObjectRevisions: [0] isComposite: true @@ -293,7 +299,7 @@ } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Extras.Private/CircularTickmarkLabel" + name: "QtQuick.Extras.Private/CircularTickmarkLabel 1.0" exports: ["QtQuick.Extras.Private/CircularTickmarkLabel 1.0"] exportMetaObjectRevisions: [0] isComposite: true @@ -327,7 +333,7 @@ } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Extras/DelayButton" + name: "QtQuick.Extras/DelayButton 1.0" exports: ["QtQuick.Extras/DelayButton 1.0"] exportMetaObjectRevisions: [0] isComposite: true @@ -337,7 +343,7 @@ Property { name: "progress"; type: "double"; isReadonly: true } Signal { name: "activated" } Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_33"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_28"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } @@ -351,8 +357,8 @@ Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } Property { name: "__action"; type: "QQuickAction"; isPointer: true } Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } - Property { name: "__effectivePressed"; type: "bool" } Property { name: "__behavior"; type: "QVariant" } + Property { name: "__effectivePressed"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } Property { name: "hovered"; type: "bool"; isReadonly: true } Signal { name: "clicked" } @@ -365,7 +371,29 @@ } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Extras/Dial" + name: "QtQuick.Extras/Dial 1.0" + exports: ["QtQuick.Extras/Dial 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "__wrap"; type: "bool" } + Property { name: "activeFocusOnPress"; type: "bool" } + Property { name: "tickmarksVisible"; type: "bool" } + Property { name: "value"; type: "double" } + Property { name: "minimumValue"; type: "double" } + Property { name: "maximumValue"; type: "double" } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "stepSize"; type: "double" } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/Dial 1.1" exports: ["QtQuick.Extras/Dial 1.1"] exportMetaObjectRevisions: [1] isComposite: true @@ -387,7 +415,7 @@ } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Extras/Gauge" + name: "QtQuick.Extras/Gauge 1.0" exports: ["QtQuick.Extras/Gauge 1.0"] exportMetaObjectRevisions: [0] isComposite: true @@ -412,7 +440,7 @@ } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Extras/PieMenu" + name: "QtQuick.Extras/PieMenu 1.0" exports: ["QtQuick.Extras/PieMenu 1.0"] exportMetaObjectRevisions: [0] isComposite: true @@ -457,18 +485,18 @@ } Component { prototype: "QQuickLoader" - name: "QtQuick.Extras.Private/PieMenuIcon" + name: "QtQuick.Extras.Private/PieMenuIcon 1.0" exports: ["QtQuick.Extras.Private/PieMenuIcon 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "PieMenu_QMLTYPE_93"; isPointer: true } + Property { name: "control"; type: "PieMenu_QMLTYPE_84"; isPointer: true } Property { name: "styleData"; type: "QObject"; isPointer: true } Property { name: "iconSource"; type: "string"; isReadonly: true } } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Extras/StatusIndicator" + name: "QtQuick.Extras/StatusIndicator 1.1" exports: ["QtQuick.Extras/StatusIndicator 1.1"] exportMetaObjectRevisions: [1] isComposite: true @@ -483,8 +511,24 @@ Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { + prototype: "QQuickFocusScope" + name: "QtQuick.Extras/StatusIndicator 1.0" + exports: ["QtQuick.Extras/StatusIndicator 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "active"; type: "bool" } + Property { name: "color"; type: "QColor" } + Property { name: "on"; type: "bool" } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__style"; type: "QObject"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "styleHints"; type: "QVariant" } + Property { name: "__styleData"; type: "QObject"; isPointer: true } + } + Component { prototype: "QQuickText" - name: "QtQuick.Extras.Private/TextSingleton" + name: "QtQuick.Extras.Private/TextSingleton 1.0" exports: ["QtQuick.Extras.Private/TextSingleton 1.0"] exportMetaObjectRevisions: [0] isComposite: true @@ -494,13 +538,13 @@ } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Extras/ToggleButton" + name: "QtQuick.Extras/ToggleButton 1.0" exports: ["QtQuick.Extras/ToggleButton 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_33"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_28"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } @@ -514,8 +558,8 @@ Property { name: "__iconOverriden"; type: "bool"; isReadonly: true } Property { name: "__action"; type: "QQuickAction"; isPointer: true } Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true } - Property { name: "__effectivePressed"; type: "bool" } Property { name: "__behavior"; type: "QVariant" } + Property { name: "__effectivePressed"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } Property { name: "hovered"; type: "bool"; isReadonly: true } Signal { name: "clicked" } @@ -528,7 +572,7 @@ } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Extras/Tumbler" + name: "QtQuick.Extras/Tumbler 1.2" exports: ["QtQuick.Extras/Tumbler 1.2"] exportMetaObjectRevisions: [2] isComposite: true @@ -588,13 +632,14 @@ } Component { prototype: "QObject" - name: "QtQuick.Extras/TumblerColumn" + name: "QtQuick.Extras/TumblerColumn 1.2" exports: ["QtQuick.Extras/TumblerColumn 1.2"] exportMetaObjectRevisions: [2] isComposite: true Property { name: "__tumbler"; type: "QQuickItem"; isPointer: true } Property { name: "__index"; type: "int" } Property { name: "__currentIndex"; type: "int" } + Property { name: "model"; type: "QVariant" } Property { name: "role"; type: "string" } Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } Property { name: "highlight"; type: "QQmlComponent"; isPointer: true } @@ -602,7 +647,6 @@ Property { name: "visible"; type: "bool" } Property { name: "activeFocus"; type: "bool"; isReadonly: true } Property { name: "width"; type: "double" } - Property { name: "model"; type: "QVariant" } Property { name: "currentIndex"; type: "int"; isReadonly: true } } } Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Layouts/libqquicklayoutsplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Layouts/libqquicklayoutsplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Layouts/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Layouts/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Layouts/plugins.qmltypes 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Layouts/plugins.qmltypes 2016-05-24 04:32:21.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. @@ -7,6 +7,7 @@ // 'qmlplugindump -nonrelocatable QtQuick.Layouts 1.2' Module { + dependencies: [] Component { name: "QQuickColumnLayout" defaultProperty: "data" @@ -84,4 +85,18 @@ exports: ["QtQuick.Layouts/RowLayout 1.0"] exportMetaObjectRevisions: [0] } + Component { + name: "QQuickStackLayout" + defaultProperty: "data" + prototype: "QQuickLayout" + exports: ["QtQuick.Layouts/StackLayout 1.3"] + exportMetaObjectRevisions: [0] + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "currentIndex"; type: "int" } + Method { + name: "itemAt" + type: "QQuickItem*" + Parameter { name: "index"; type: "int" } + } + } } Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/LocalStorage/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/LocalStorage/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/LocalStorage/plugins.qmltypes 2015-06-30 10:17:19.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/LocalStorage/plugins.qmltypes 2016-06-16 09:26:11.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. @@ -7,6 +7,7 @@ // 'qmlplugindump -nonrelocatable QtQuick.LocalStorage 2.0' Module { + dependencies: [] Component { name: "QQuickLocalStorage" prototype: "QObject" Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Particles.2/libparticlesplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Particles.2/libparticlesplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Particles.2/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Particles.2/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Particles.2/plugins.qmltypes 2015-06-30 10:17:19.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Particles.2/plugins.qmltypes 2016-06-16 09:26:11.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. @@ -7,6 +7,7 @@ // 'qmlplugindump -nonrelocatable QtQuick.Particles 2.0' Module { + dependencies: [] Component { name: "QQuickAgeAffector" defaultProperty: "data" @@ -491,6 +492,160 @@ } } Component { + name: "QQuickItem" + defaultProperty: "data" + prototype: "QObject" + Enum { + name: "TransformOrigin" + values: { + "TopLeft": 0, + "Top": 1, + "TopRight": 2, + "Left": 3, + "Center": 4, + "Right": 5, + "BottomLeft": 6, + "Bottom": 7, + "BottomRight": 8 + } + } + Property { name: "parent"; type: "QQuickItem"; isPointer: true } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true } + Property { name: "x"; type: "double" } + Property { name: "y"; type: "double" } + Property { name: "z"; type: "double" } + Property { name: "width"; type: "double" } + Property { name: "height"; type: "double" } + Property { name: "opacity"; type: "double" } + Property { name: "enabled"; type: "bool" } + Property { name: "visible"; type: "bool" } + Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true } + Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true } + Property { name: "state"; type: "string" } + Property { name: "childrenRect"; type: "QRectF"; isReadonly: true } + Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true } + Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true } + Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true } + Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true } + Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true } + Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true } + Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true } + Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true } + Property { name: "baselineOffset"; type: "double" } + Property { name: "clip"; type: "bool" } + Property { name: "focus"; type: "bool" } + Property { name: "activeFocus"; type: "bool"; isReadonly: true } + Property { name: "activeFocusOnTab"; revision: 1; type: "bool" } + Property { name: "rotation"; type: "double" } + Property { name: "scale"; type: "double" } + Property { name: "transformOrigin"; type: "TransformOrigin" } + Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true } + Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true } + Property { name: "smooth"; type: "bool" } + Property { name: "antialiasing"; type: "bool" } + Property { name: "implicitWidth"; type: "double" } + Property { name: "implicitHeight"; type: "double" } + Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true } + Signal { + name: "childrenRectChanged" + Parameter { type: "QRectF" } + } + Signal { + name: "baselineOffsetChanged" + Parameter { type: "double" } + } + Signal { + name: "stateChanged" + Parameter { type: "string" } + } + Signal { + name: "focusChanged" + Parameter { type: "bool" } + } + Signal { + name: "activeFocusChanged" + Parameter { type: "bool" } + } + Signal { + name: "activeFocusOnTabChanged" + revision: 1 + Parameter { type: "bool" } + } + Signal { + name: "parentChanged" + Parameter { type: "QQuickItem"; isPointer: true } + } + Signal { + name: "transformOriginChanged" + Parameter { type: "TransformOrigin" } + } + Signal { + name: "smoothChanged" + Parameter { type: "bool" } + } + Signal { + name: "antialiasingChanged" + Parameter { type: "bool" } + } + Signal { + name: "clipChanged" + Parameter { type: "bool" } + } + Signal { + name: "windowChanged" + revision: 1 + Parameter { name: "window"; type: "QQuickWindow"; isPointer: true } + } + Method { name: "update" } + Method { + name: "grabToImage" + revision: 2 + type: "bool" + Parameter { name: "callback"; type: "QJSValue" } + Parameter { name: "targetSize"; type: "QSize" } + } + Method { + name: "grabToImage" + revision: 2 + type: "bool" + Parameter { name: "callback"; type: "QJSValue" } + } + Method { + name: "contains" + type: "bool" + Parameter { name: "point"; type: "QPointF" } + } + Method { + name: "mapFromItem" + Parameter { type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "mapToItem" + Parameter { type: "QQmlV4Function"; isPointer: true } + } + Method { name: "forceActiveFocus" } + Method { + name: "forceActiveFocus" + Parameter { name: "reason"; type: "Qt::FocusReason" } + } + Method { + name: "nextItemInFocusChain" + revision: 1 + type: "QQuickItem*" + Parameter { name: "forward"; type: "bool" } + } + Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" } + Method { + name: "childAt" + type: "QQuickItem*" + Parameter { name: "x"; type: "double" } + Parameter { name: "y"; type: "double" } + } + } + Component { name: "QQuickItemParticle" defaultProperty: "data" prototype: "QQuickParticlePainter" @@ -995,6 +1150,56 @@ Parameter { name: "arg"; type: "bool" } } } + Component { + name: "QQuickStochasticState" + prototype: "QObject" + Property { name: "duration"; type: "int" } + Property { name: "durationVariation"; type: "int" } + Property { name: "randomStart"; type: "bool" } + Property { name: "to"; type: "QVariantMap" } + Property { name: "name"; type: "string" } + Signal { + name: "durationChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "nameChanged" + Parameter { name: "arg"; type: "string" } + } + Signal { + name: "toChanged" + Parameter { name: "arg"; type: "QVariantMap" } + } + Signal { + name: "durationVariationChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { name: "entered" } + Signal { + name: "randomStartChanged" + Parameter { name: "arg"; type: "bool" } + } + Method { + name: "setDuration" + Parameter { name: "arg"; type: "int" } + } + Method { + name: "setName" + Parameter { name: "arg"; type: "string" } + } + Method { + name: "setTo" + Parameter { name: "arg"; type: "QVariantMap" } + } + Method { + name: "setDurationVariation" + Parameter { name: "arg"; type: "int" } + } + Method { + name: "setRandomStart" + Parameter { name: "arg"; type: "bool" } + } + } Component { name: "QQuickTargetDirection" prototype: "QQuickDirection" Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/PrivateWidgets/libwidgetsplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/PrivateWidgets/libwidgetsplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/PrivateWidgets/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/PrivateWidgets/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/PrivateWidgets/plugins.qmltypes 2015-06-26 09:53:03.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/PrivateWidgets/plugins.qmltypes 2016-05-24 04:32:21.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. @@ -7,6 +7,7 @@ // 'qmlplugindump -nonrelocatable QtQuick.PrivateWidgets 1.1' Module { + dependencies: [] Component { name: "QQuickAbstractColorDialog" prototype: "QQuickAbstractDialog" @@ -104,6 +105,7 @@ Property { name: "y"; type: "int" } Property { name: "width"; type: "int" } Property { name: "height"; type: "int" } + Property { name: "__maximumDimension"; type: "int"; isReadonly: true } Signal { name: "visibilityChanged" } Signal { name: "geometryChanged" } Signal { name: "accepted" } @@ -140,6 +142,7 @@ Property { name: "selectedNameFilterIndex"; type: "int" } Property { name: "fileUrl"; type: "QUrl"; isReadonly: true } Property { name: "fileUrls"; type: "QList"; isReadonly: true } + Property { name: "sidebarVisible"; type: "bool" } Signal { name: "filterSelected" } Signal { name: "fileModeChanged" } Signal { name: "selectionAccepted" } @@ -179,6 +182,10 @@ name: "setSelectedNameFilterIndex" Parameter { name: "idx"; type: "int" } } + Method { + name: "setSidebarVisible" + Parameter { name: "s"; type: "bool" } + } } Component { name: "QQuickAbstractFontDialog" Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Scene3D/libqtquickscene3dplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Scene3D/libqtquickscene3dplugin.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Window.2/libwindowplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Window.2/libwindowplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Window.2/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Window.2/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/Window.2/plugins.qmltypes 2015-06-30 10:17:20.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/Window.2/plugins.qmltypes 2016-06-16 09:26:11.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. @@ -7,19 +7,7 @@ // 'qmlplugindump -nonrelocatable QtQuick.Window 2.2' Module { - Component { - name: "QQuickRootItem" - defaultProperty: "data" - prototype: "QQuickItem" - Method { - name: "setWidth" - Parameter { name: "w"; type: "int" } - } - Method { - name: "setHeight" - Parameter { name: "h"; type: "int" } - } - } + dependencies: [] Component { name: "QQuickScreen" prototype: "QObject" @@ -112,6 +100,8 @@ Property { name: "active"; type: "bool"; isReadonly: true } Property { name: "activeFocusItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "width"; type: "int"; isReadonly: true } + Property { name: "height"; type: "int"; isReadonly: true } } Component { name: "QQuickWindowQmlImpl" @@ -288,5 +278,6 @@ revision: 1 Parameter { name: "msec"; type: "int" } } + Method { name: "requestUpdate"; revision: 3 } } } Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/XmlListModel/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/XmlListModel/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick/XmlListModel/plugins.qmltypes 2015-06-30 10:17:20.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick/XmlListModel/plugins.qmltypes 2016-06-16 09:26:11.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. @@ -7,6 +7,272 @@ // 'qmlplugindump -nonrelocatable QtQuick.XmlListModel 2.0' Module { + dependencies: [] + Component { + name: "QAbstractItemModel" + prototype: "QObject" + Enum { + name: "LayoutChangeHint" + values: { + "NoLayoutChangeHint": 0, + "VerticalSortHint": 1, + "HorizontalSortHint": 2 + } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + Parameter { name: "roles"; type: "QVector" } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + } + Signal { + name: "headerDataChanged" + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList" } + } + Signal { name: "layoutChanged" } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList" } + } + Signal { name: "layoutAboutToBeChanged" } + Signal { + name: "rowsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { name: "modelAboutToBeReset" } + Signal { name: "modelReset" } + Signal { + name: "rowsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationRow"; type: "int" } + } + Signal { + name: "rowsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "row"; type: "int" } + } + Signal { + name: "columnsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationColumn"; type: "int" } + } + Signal { + name: "columnsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "column"; type: "int" } + } + Method { name: "submit"; type: "bool" } + Method { name: "revert" } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "parent" + type: "QModelIndex" + Parameter { name: "child"; type: "QModelIndex" } + } + Method { + name: "sibling" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "idx"; type: "QModelIndex" } + } + Method { + name: "rowCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "rowCount"; type: "int" } + Method { + name: "columnCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "columnCount"; type: "int" } + Method { + name: "hasChildren" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "hasChildren"; type: "bool" } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + } + Method { + name: "fetchMore" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "canFetchMore" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "flags" + type: "Qt::ItemFlags" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + Parameter { name: "flags"; type: "Qt::MatchFlags" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + } + } + Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" } Component { name: "QQuickXmlListModel" defaultProperty: "roles" Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick.2/libqtquick2plugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick.2/libqtquick2plugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick.2/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick.2/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtQuick.2/plugins.qmltypes 2015-06-30 10:17:20.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtQuick.2/plugins.qmltypes 2016-06-16 09:26:11.000000000 +0000 @@ -1,12 +1,13 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable -builtins' +// 'qmlplugindump -nonrelocatable QtQuick 2.6' Module { + dependencies: [] Component { name: "QAbstractItemModel" prototype: "QObject" @@ -139,6 +140,137 @@ } Method { name: "submit"; type: "bool" } Method { name: "revert" } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "parent" + type: "QModelIndex" + Parameter { name: "child"; type: "QModelIndex" } + } + Method { + name: "sibling" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "idx"; type: "QModelIndex" } + } + Method { + name: "rowCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "rowCount"; type: "int" } + Method { + name: "columnCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "columnCount"; type: "int" } + Method { + name: "hasChildren" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "hasChildren"; type: "bool" } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + } + Method { + name: "fetchMore" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "canFetchMore" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "flags" + type: "Qt::ItemFlags" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + Parameter { name: "flags"; type: "Qt::MatchFlags" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + } } Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" } Component { @@ -299,27 +431,13 @@ "Quit": 65, "FullScreen": 66, "Deselect": 67, - "DeleteCompleteLine": 68 + "DeleteCompleteLine": 68, + "Backspace": 69, + "Cancel": 70 } } } Component { - name: "QObject" - exports: ["QtQml/QtObject 2.0", "QtQuick/QtObject 2.0"] - exportMetaObjectRevisions: [0, 0] - Property { name: "objectName"; type: "string" } - Signal { - name: "objectNameChanged" - Parameter { name: "objectName"; type: "string" } - } - Method { name: "toString" } - Method { name: "destroy" } - Method { - name: "destroy" - Parameter { name: "delay"; type: "int" } - } - } - Component { name: "QQmlApplication" prototype: "QObject" Property { name: "arguments"; type: "QStringList"; isReadonly: true } @@ -346,83 +464,6 @@ } } Component { - name: "QQmlBind" - prototype: "QObject" - exports: ["QtQml/Binding 2.0", "QtQuick/Binding 2.0"] - exportMetaObjectRevisions: [0, 0] - Property { name: "target"; type: "QObject"; isPointer: true } - Property { name: "property"; type: "string" } - Property { name: "value"; type: "QVariant" } - Property { name: "when"; type: "bool" } - } - Component { - name: "QQmlComponent" - prototype: "QObject" - exports: [ - "QML/Component 1.0", - "QtQml/Component 2.0", - "QtQuick/Component 2.0" - ] - exportMetaObjectRevisions: [0, 0, 0] - attachedType: "QQmlComponentAttached" - Enum { - name: "CompilationMode" - values: { - "PreferSynchronous": 0, - "Asynchronous": 1 - } - } - Enum { - name: "Status" - values: { - "Null": 0, - "Ready": 1, - "Loading": 2, - "Error": 3 - } - } - Property { name: "progress"; type: "double"; isReadonly: true } - Property { name: "status"; type: "Status"; isReadonly: true } - Property { name: "url"; type: "QUrl"; isReadonly: true } - Signal { - name: "statusChanged" - Parameter { type: "QQmlComponent::Status" } - } - Signal { - name: "progressChanged" - Parameter { type: "double" } - } - Method { - name: "loadUrl" - Parameter { name: "url"; type: "QUrl" } - } - Method { - name: "loadUrl" - Parameter { name: "url"; type: "QUrl" } - Parameter { name: "mode"; type: "CompilationMode" } - } - Method { - name: "setData" - Parameter { type: "QByteArray" } - Parameter { name: "baseUrl"; type: "QUrl" } - } - Method { name: "errorString"; type: "string" } - } - Component { - name: "QQmlComponentAttached" - prototype: "QObject" - Signal { name: "completed" } - Signal { name: "destruction" } - } - Component { - name: "QQmlConnections" - prototype: "QObject" - exports: ["QtQml/Connections 2.0", "QtQuick/Connections 2.0"] - exportMetaObjectRevisions: [0, 0] - Property { name: "target"; type: "QObject"; isPointer: true } - Property { name: "ignoreUnknownSignals"; type: "bool" } - } - Component { name: "QQmlDelegateModel" defaultProperty: "delegate" prototype: "QQmlInstanceModel" @@ -514,7 +555,6 @@ Component { name: "QQmlDelegateModelParts"; prototype: "QObject" } Component { name: "QQmlEasingValueType" - prototype: "QQmlValueType" exports: ["QtQuick/Easing 2.0"] isCreatable: false exportMetaObjectRevisions: [0] @@ -576,58 +616,6 @@ Property { name: "bezierCurve"; type: "QVariantList" } } Component { - name: "QQmlInstanceModel" - prototype: "QObject" - Property { name: "count"; type: "int"; isReadonly: true } - Signal { - name: "modelUpdated" - Parameter { name: "changeSet"; type: "QQmlChangeSet" } - Parameter { name: "reset"; type: "bool" } - } - Signal { - name: "createdItem" - Parameter { name: "index"; type: "int" } - Parameter { name: "object"; type: "QObject"; isPointer: true } - } - Signal { - name: "initItem" - Parameter { name: "index"; type: "int" } - Parameter { name: "object"; type: "QObject"; isPointer: true } - } - Signal { - name: "destroyingItem" - Parameter { name: "object"; type: "QObject"; isPointer: true } - } - } - Component { - name: "QQmlInstantiator" - defaultProperty: "delegate" - prototype: "QObject" - exports: ["QtQml/Instantiator 2.1", "QtQuick/Instantiator 2.1"] - exportMetaObjectRevisions: [0, 0] - Property { name: "active"; type: "bool" } - Property { name: "asynchronous"; type: "bool" } - Property { name: "model"; type: "QVariant" } - Property { name: "count"; type: "int"; isReadonly: true } - Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } - Property { name: "object"; type: "QObject"; isReadonly: true; isPointer: true } - Signal { - name: "objectAdded" - Parameter { name: "index"; type: "int" } - Parameter { name: "object"; type: "QObject"; isPointer: true } - } - Signal { - name: "objectRemoved" - Parameter { name: "index"; type: "int" } - Parameter { name: "object"; type: "QObject"; isPointer: true } - } - Method { - name: "objectAt" - type: "QObject*" - Parameter { name: "index"; type: "int" } - } - } - Component { name: "QQmlListElement" prototype: "QObject" exports: ["QtQuick/ListElement 2.0"] @@ -678,49 +666,6 @@ Method { name: "sync" } } Component { - name: "QQmlLocale" - exports: ["QtQml/Locale 2.2", "QtQuick/Locale 2.0"] - isCreatable: false - exportMetaObjectRevisions: [0, 0] - Enum { - name: "MeasurementSystem" - values: { - "MetricSystem": 0, - "ImperialSystem": 1, - "ImperialUSSystem": 1, - "ImperialUKSystem": 2 - } - } - Enum { - name: "FormatType" - values: { - "LongFormat": 0, - "ShortFormat": 1, - "NarrowFormat": 2 - } - } - Enum { - name: "CurrencySymbolFormat" - values: { - "CurrencyIsoCode": 0, - "CurrencySymbol": 1, - "CurrencyDisplayName": 2 - } - } - Enum { - name: "DayOfWeek" - values: { - "Sunday": 0, - "Monday": 1, - "Tuesday": 2, - "Wednesday": 3, - "Thursday": 4, - "Friday": 5, - "Saturday": 6 - } - } - } - Component { name: "QQmlObjectModel" defaultProperty: "children" prototype: "QQmlInstanceModel" @@ -728,6 +673,48 @@ exportMetaObjectRevisions: [0] attachedType: "QQmlObjectModelAttached" Property { name: "children"; type: "QObject"; isList: true; isReadonly: true } + Method { name: "clear"; revision: 3 } + Method { + name: "get" + revision: 3 + type: "QObject*" + Parameter { name: "index"; type: "int" } + } + Method { + name: "append" + revision: 3 + Parameter { name: "object"; type: "QObject"; isPointer: true } + } + Method { + name: "insert" + revision: 3 + Parameter { name: "index"; type: "int" } + Parameter { name: "object"; type: "QObject"; isPointer: true } + } + Method { + name: "move" + revision: 3 + Parameter { name: "from"; type: "int" } + Parameter { name: "to"; type: "int" } + Parameter { name: "n"; type: "int" } + } + Method { + name: "move" + revision: 3 + Parameter { name: "from"; type: "int" } + Parameter { name: "to"; type: "int" } + } + Method { + name: "remove" + revision: 3 + Parameter { name: "index"; type: "int" } + Parameter { name: "n"; type: "int" } + } + Method { + name: "remove" + revision: 3 + Parameter { name: "index"; type: "int" } + } } Component { name: "QQmlObjectModelAttached" @@ -735,22 +722,6 @@ Property { name: "index"; type: "int"; isReadonly: true } } Component { - name: "QQmlTimer" - prototype: "QObject" - exports: ["QtQml/Timer 2.0", "QtQuick/Timer 2.0"] - exportMetaObjectRevisions: [0, 0] - Property { name: "interval"; type: "int" } - Property { name: "running"; type: "bool" } - Property { name: "repeat"; type: "bool" } - Property { name: "triggeredOnStart"; type: "bool" } - Property { name: "parent"; type: "QObject"; isReadonly: true; isPointer: true } - Signal { name: "triggered" } - Method { name: "start" } - Method { name: "stop" } - Method { name: "restart" } - } - Component { name: "QQmlValueType"; prototype: "QObject" } - Component { name: "QQuickAbstractAnimation" prototype: "QObject" exports: ["QtQuick/Animation 2.0"] @@ -880,6 +851,12 @@ Signal { name: "toggleAction" } Signal { name: "increaseAction" } Signal { name: "decreaseAction" } + Signal { name: "scrollUpAction" } + Signal { name: "scrollDownAction" } + Signal { name: "scrollLeftAction" } + Signal { name: "scrollRightAction" } + Signal { name: "previousPageAction" } + Signal { name: "nextPageAction" } Method { name: "valueChanged" } Method { name: "cursorPositionChanged" } Method { @@ -1188,14 +1165,24 @@ name: "QQuickBasePositioner" defaultProperty: "data" prototype: "QQuickImplicitSizeItem" - exports: ["QtQuick/Positioner 2.0"] + exports: ["QtQuick/Positioner 2.0", "QtQuick/Positioner 2.6"] isCreatable: false - exportMetaObjectRevisions: [0] + exportMetaObjectRevisions: [0, 6] attachedType: "QQuickPositionerAttached" Property { name: "spacing"; type: "double" } Property { name: "populate"; type: "QQuickTransition"; isPointer: true } Property { name: "move"; type: "QQuickTransition"; isPointer: true } Property { name: "add"; type: "QQuickTransition"; isPointer: true } + Property { name: "padding"; revision: 6; type: "double" } + Property { name: "topPadding"; revision: 6; type: "double" } + Property { name: "leftPadding"; revision: 6; type: "double" } + Property { name: "rightPadding"; revision: 6; type: "double" } + Property { name: "bottomPadding"; revision: 6; type: "double" } + Signal { name: "paddingChanged"; revision: 6 } + Signal { name: "topPaddingChanged"; revision: 6 } + Signal { name: "leftPaddingChanged"; revision: 6 } + Signal { name: "rightPaddingChanged"; revision: 6 } + Signal { name: "bottomPaddingChanged"; revision: 6 } } Component { name: "QQuickBehavior" @@ -1330,8 +1317,8 @@ name: "QQuickColumn" defaultProperty: "data" prototype: "QQuickBasePositioner" - exports: ["QtQuick/Column 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/Column 2.0", "QtQuick/Column 2.6"] + exportMetaObjectRevisions: [0, 6] } Component { name: "QQuickCurve" @@ -1469,6 +1456,10 @@ Parameter { type: "QQmlV4Function"; isPointer: true } } Method { + name: "getDataAsArrayBuffer" + Parameter { type: "QQmlV4Function"; isPointer: true } + } + Method { name: "acceptProposedAction" Parameter { type: "QQmlV4Function"; isPointer: true } } @@ -1478,6 +1469,14 @@ } } Component { + name: "QQuickEnterKeyAttached" + prototype: "QObject" + exports: ["QtQuick/EnterKey 2.6"] + isCreatable: false + exportMetaObjectRevisions: [6] + Property { name: "type"; type: "Qt::EnterKeyType" } + } + Component { name: "QQuickFlickable" defaultProperty: "flickableData" prototype: "QQuickItem" @@ -1488,7 +1487,8 @@ values: { "StopAtBounds": 0, "DragOverBounds": 1, - "DragAndOvershootBounds": 2 + "OvershootBounds": 2, + "DragAndOvershootBounds": 3 } } Enum { @@ -1608,8 +1608,8 @@ name: "QQuickFlow" defaultProperty: "data" prototype: "QQuickBasePositioner" - exports: ["QtQuick/Flow 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/Flow 2.0", "QtQuick/Flow 2.6"] + exportMetaObjectRevisions: [0, 6] Enum { name: "Flow" values: { @@ -1703,17 +1703,20 @@ } Component { name: "QQuickFontValueType" - prototype: "QQmlValueType" exports: ["QtQuick/Font 2.0"] isCreatable: false exportMetaObjectRevisions: [0] Enum { name: "FontWeight" values: { + "Thin": 0, + "ExtraLight": 12, "Light": 25, "Normal": 50, + "Medium": 57, "DemiBold": 63, "Bold": 75, + "ExtraBold": 81, "Black": 87 } } @@ -1728,6 +1731,7 @@ } } Property { name: "family"; type: "string" } + Property { name: "styleName"; type: "string" } Property { name: "bold"; type: "bool" } Property { name: "weight"; type: "FontWeight" } Property { name: "italic"; type: "bool" } @@ -1739,6 +1743,7 @@ Property { name: "capitalization"; type: "Capitalization" } Property { name: "letterSpacing"; type: "double" } Property { name: "wordSpacing"; type: "double" } + Method { name: "toString"; type: "string" } } Component { name: "QQuickGrabGestureEvent" @@ -1768,8 +1773,8 @@ name: "QQuickGrid" defaultProperty: "data" prototype: "QQuickBasePositioner" - exports: ["QtQuick/Grid 2.0", "QtQuick/Grid 2.1"] - exportMetaObjectRevisions: [0, 1] + exports: ["QtQuick/Grid 2.0", "QtQuick/Grid 2.1", "QtQuick/Grid 2.6"] + exportMetaObjectRevisions: [0, 1, 6] Enum { name: "Flow" values: { @@ -1868,8 +1873,12 @@ name: "QQuickImage" defaultProperty: "data" prototype: "QQuickImageBase" - exports: ["QtQuick/Image 2.0", "QtQuick/Image 2.3"] - exportMetaObjectRevisions: [0, 1] + exports: [ + "QtQuick/Image 2.0", + "QtQuick/Image 2.3", + "QtQuick/Image 2.5" + ] + exportMetaObjectRevisions: [0, 1, 2] Enum { name: "HAlignment" values: { @@ -1904,6 +1913,7 @@ Property { name: "horizontalAlignment"; type: "HAlignment" } Property { name: "verticalAlignment"; type: "VAlignment" } Property { name: "mipmap"; revision: 1; type: "bool" } + Property { name: "autoTransform"; revision: 2; type: "bool" } Signal { name: "paintedGeometryChanged" } Signal { name: "horizontalAlignmentChanged" @@ -1918,6 +1928,7 @@ revision: 1 Parameter { type: "bool" } } + Signal { name: "autoTransformChanged"; revision: 2 } } Component { name: "QQuickImageBase" @@ -2149,6 +2160,7 @@ Property { name: "format"; type: "QQuickShaderEffectSource::Format" } Property { name: "samplerName"; type: "QByteArray" } Property { name: "effect"; type: "QQmlComponent"; isPointer: true } + Property { name: "textureMirroring"; type: "QQuickShaderEffectSource::TextureMirroring" } Signal { name: "enabledChanged" Parameter { name: "enabled"; type: "bool" } @@ -2185,6 +2197,10 @@ name: "sourceRectChanged" Parameter { name: "sourceRect"; type: "QRectF" } } + Signal { + name: "textureMirroringChanged" + Parameter { name: "mirroring"; type: "QQuickShaderEffectSource::TextureMirroring" } + } } Component { name: "QQuickItemView" @@ -2623,13 +2639,18 @@ name: "QQuickMouseArea" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtQuick/MouseArea 2.0", "QtQuick/MouseArea 2.4"] - exportMetaObjectRevisions: [0, 1] + exports: [ + "QtQuick/MouseArea 2.0", + "QtQuick/MouseArea 2.4", + "QtQuick/MouseArea 2.5" + ] + exportMetaObjectRevisions: [0, 1, 2] Property { name: "mouseX"; type: "double"; isReadonly: true } Property { name: "mouseY"; type: "double"; isReadonly: true } Property { name: "containsMouse"; type: "bool"; isReadonly: true } Property { name: "pressed"; type: "bool"; isReadonly: true } Property { name: "enabled"; type: "bool" } + Property { name: "scrollGestureEnabled"; revision: 2; type: "bool" } Property { name: "pressedButtons"; type: "Qt::MouseButtons"; isReadonly: true } Property { name: "acceptedButtons"; type: "Qt::MouseButtons" } Property { name: "hoverEnabled"; type: "bool" } @@ -2639,6 +2660,7 @@ Property { name: "cursorShape"; type: "Qt::CursorShape" } Property { name: "containsPress"; revision: 1; type: "bool"; isReadonly: true } Signal { name: "hoveredChanged" } + Signal { name: "scrollGestureEnabledChanged"; revision: 2 } Signal { name: "positionChanged" Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true } @@ -2681,18 +2703,6 @@ Signal { name: "containsPressChanged"; revision: 1 } } Component { - name: "QQuickMouseEvent" - prototype: "QObject" - Property { name: "x"; type: "double"; isReadonly: true } - Property { name: "y"; type: "double"; isReadonly: true } - Property { name: "button"; type: "int"; isReadonly: true } - Property { name: "buttons"; type: "int"; isReadonly: true } - Property { name: "modifiers"; type: "int"; isReadonly: true } - Property { name: "wasHeld"; type: "bool"; isReadonly: true } - Property { name: "isClick"; type: "bool"; isReadonly: true } - Property { name: "accepted"; type: "bool" } - } - Component { name: "QQuickMultiPointTouchArea" defaultProperty: "data" prototype: "QQuickItem" @@ -2801,6 +2811,7 @@ Property { name: "fillColor"; type: "QColor" } Property { name: "contentsScale"; type: "double" } Property { name: "renderTarget"; type: "RenderTarget" } + Property { name: "textureSize"; type: "QSize" } } Component { name: "QQuickParallelAnimation" @@ -3131,8 +3142,8 @@ name: "QQuickPinchArea" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtQuick/PinchArea 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/PinchArea 2.0", "QtQuick/PinchArea 2.5"] + exportMetaObjectRevisions: [0, 1] Property { name: "enabled"; type: "bool" } Property { name: "pinch"; type: "QQuickPinch"; isReadonly: true; isPointer: true } Signal { @@ -3147,6 +3158,11 @@ name: "pinchFinished" Parameter { name: "pinch"; type: "QQuickPinchEvent"; isPointer: true } } + Signal { + name: "smartZoom" + revision: 1 + Parameter { name: "pinch"; type: "QQuickPinchEvent"; isPointer: true } + } } Component { name: "QQuickPinchEvent" @@ -3324,8 +3340,8 @@ name: "QQuickRow" defaultProperty: "data" prototype: "QQuickBasePositioner" - exports: ["QtQuick/Row 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/Row 2.0", "QtQuick/Row 2.6"] + exportMetaObjectRevisions: [0, 6] Property { name: "layoutDirection"; type: "Qt::LayoutDirection" } Property { name: "effectiveLayoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true } } @@ -3413,8 +3429,11 @@ name: "QQuickShaderEffectSource" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtQuick/ShaderEffectSource 2.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtQuick/ShaderEffectSource 2.0", + "QtQuick/ShaderEffectSource 2.6" + ] + exportMetaObjectRevisions: [0, 1] Enum { name: "WrapMode" values: { @@ -3432,6 +3451,14 @@ "RGBA": 6408 } } + Enum { + name: "TextureMirroring" + values: { + "NoMirroring": 0, + "MirrorHorizontally": 1, + "MirrorVertically": 2 + } + } Property { name: "wrapMode"; type: "WrapMode" } Property { name: "sourceItem"; type: "QQuickItem"; isPointer: true } Property { name: "sourceRect"; type: "QRectF" } @@ -3441,10 +3468,25 @@ Property { name: "hideSource"; type: "bool" } Property { name: "mipmap"; type: "bool" } Property { name: "recursive"; type: "bool" } + Property { name: "textureMirroring"; revision: 1; type: "TextureMirroring" } Signal { name: "scheduledUpdateCompleted" } Method { name: "scheduleUpdate" } } Component { + name: "QQuickShortcut" + prototype: "QObject" + exports: ["QtQuick/Shortcut 2.5", "QtQuick/Shortcut 2.6"] + exportMetaObjectRevisions: [0, 1] + Property { name: "sequence"; type: "QVariant" } + Property { name: "nativeText"; revision: 1; type: "string"; isReadonly: true } + Property { name: "portableText"; revision: 1; type: "string"; isReadonly: true } + Property { name: "enabled"; type: "bool" } + Property { name: "autoRepeat"; type: "bool" } + Property { name: "context"; type: "Qt::ShortcutContext" } + Signal { name: "activated" } + Signal { name: "activatedAmbiguously" } + } + Component { name: "QQuickSmoothedAnimation" prototype: "QQuickNumberAnimation" exports: ["QtQuick/SmoothedAnimation 2.0"] @@ -3755,8 +3797,13 @@ name: "QQuickText" defaultProperty: "data" prototype: "QQuickImplicitSizeItem" - exports: ["QtQuick/Text 2.0", "QtQuick/Text 2.2", "QtQuick/Text 2.3"] - exportMetaObjectRevisions: [0, 2, 3] + exports: [ + "QtQuick/Text 2.0", + "QtQuick/Text 2.2", + "QtQuick/Text 2.3", + "QtQuick/Text 2.6" + ] + exportMetaObjectRevisions: [0, 2, 3, 6] Enum { name: "HAlignment" values: { @@ -3861,6 +3908,11 @@ Property { name: "fontSizeMode"; type: "FontSizeMode" } Property { name: "renderType"; type: "RenderType" } Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true } + Property { name: "padding"; revision: 6; type: "double" } + Property { name: "topPadding"; revision: 6; type: "double" } + Property { name: "leftPadding"; revision: 6; type: "double" } + Property { name: "rightPadding"; revision: 6; type: "double" } + Property { name: "bottomPadding"; revision: 6; type: "double" } Signal { name: "textChanged" Parameter { name: "text"; type: "string" } @@ -3911,6 +3963,11 @@ name: "lineLaidOut" Parameter { name: "line"; type: "QQuickTextLine"; isPointer: true } } + Signal { name: "paddingChanged"; revision: 6 } + Signal { name: "topPaddingChanged"; revision: 6 } + Signal { name: "leftPaddingChanged"; revision: 6 } + Signal { name: "rightPaddingChanged"; revision: 6 } + Signal { name: "bottomPaddingChanged"; revision: 6 } Method { name: "doLayout" } Method { name: "linkAt" @@ -3929,9 +3986,10 @@ "QtQuick/TextEdit 2.0", "QtQuick/TextEdit 2.1", "QtQuick/TextEdit 2.2", - "QtQuick/TextEdit 2.3" + "QtQuick/TextEdit 2.3", + "QtQuick/TextEdit 2.6" ] - exportMetaObjectRevisions: [0, 1, 2, 3] + exportMetaObjectRevisions: [0, 1, 2, 3, 6] Enum { name: "HAlignment" values: { @@ -4026,6 +4084,11 @@ isPointer: true } Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true } + Property { name: "padding"; revision: 6; type: "double" } + Property { name: "topPadding"; revision: 6; type: "double" } + Property { name: "leftPadding"; revision: 6; type: "double" } + Property { name: "rightPadding"; revision: 6; type: "double" } + Property { name: "bottomPadding"; revision: 6; type: "double" } Signal { name: "contentSizeChanged" } Signal { name: "colorChanged" @@ -4097,6 +4160,12 @@ revision: 2 Parameter { name: "link"; type: "string" } } + Signal { name: "editingFinished"; revision: 6 } + Signal { name: "paddingChanged"; revision: 6 } + Signal { name: "topPaddingChanged"; revision: 6 } + Signal { name: "leftPaddingChanged"; revision: 6 } + Signal { name: "rightPaddingChanged"; revision: 6 } + Signal { name: "bottomPaddingChanged"; revision: 6 } Method { name: "selectAll" } Method { name: "selectWord" } Method { @@ -4185,9 +4254,10 @@ exports: [ "QtQuick/TextInput 2.0", "QtQuick/TextInput 2.2", - "QtQuick/TextInput 2.4" + "QtQuick/TextInput 2.4", + "QtQuick/TextInput 2.6" ] - exportMetaObjectRevisions: [0, 2, 3] + exportMetaObjectRevisions: [0, 2, 3, 6] Enum { name: "EchoMode" values: { @@ -4283,6 +4353,11 @@ Property { name: "contentWidth"; type: "double"; isReadonly: true } Property { name: "contentHeight"; type: "double"; isReadonly: true } Property { name: "renderType"; type: "RenderType" } + Property { name: "padding"; revision: 6; type: "double" } + Property { name: "topPadding"; revision: 6; type: "double" } + Property { name: "leftPadding"; revision: 6; type: "double" } + Property { name: "rightPadding"; revision: 6; type: "double" } + Property { name: "bottomPadding"; revision: 6; type: "double" } Signal { name: "accepted" } Signal { name: "editingFinished"; revision: 2 } Signal { @@ -4339,6 +4414,11 @@ Parameter { name: "mode"; type: "SelectionMode" } } Signal { name: "contentSizeChanged" } + Signal { name: "paddingChanged"; revision: 6 } + Signal { name: "topPaddingChanged"; revision: 6 } + Signal { name: "leftPaddingChanged"; revision: 6 } + Signal { name: "rightPaddingChanged"; revision: 6 } + Signal { name: "bottomPaddingChanged"; revision: 6 } Method { name: "selectAll" } Method { name: "selectWord" } Method { @@ -4583,1515 +4663,4 @@ prototype: "QObject" Signal { name: "changed" } } - Component { - name: "Qt" - Enum { - name: "GlobalColor" - values: { - "color0": 0, - "color1": 1, - "black": 2, - "white": 3, - "darkGray": 4, - "gray": 5, - "lightGray": 6, - "red": 7, - "green": 8, - "blue": 9, - "cyan": 10, - "magenta": 11, - "yellow": 12, - "darkRed": 13, - "darkGreen": 14, - "darkBlue": 15, - "darkCyan": 16, - "darkMagenta": 17, - "darkYellow": 18, - "transparent": 19 - } - } - Enum { - name: "KeyboardModifiers" - values: { - "NoModifier": 0, - "ShiftModifier": 33554432, - "ControlModifier": 67108864, - "AltModifier": 134217728, - "MetaModifier": 268435456, - "KeypadModifier": 536870912, - "GroupSwitchModifier": 1073741824, - "KeyboardModifierMask": -33554432 - } - } - Enum { - name: "MouseButtons" - values: { - "NoButton": 0, - "LeftButton": 1, - "RightButton": 2, - "MidButton": 4, - "MiddleButton": 4, - "BackButton": 8, - "XButton1": 8, - "ExtraButton1": 8, - "ForwardButton": 16, - "XButton2": 16, - "ExtraButton2": 16, - "TaskButton": 32, - "ExtraButton3": 32, - "ExtraButton4": 64, - "ExtraButton5": 128, - "ExtraButton6": 256, - "ExtraButton7": 512, - "ExtraButton8": 1024, - "ExtraButton9": 2048, - "ExtraButton10": 4096, - "ExtraButton11": 8192, - "ExtraButton12": 16384, - "ExtraButton13": 32768, - "ExtraButton14": 65536, - "ExtraButton15": 131072, - "ExtraButton16": 262144, - "ExtraButton17": 524288, - "ExtraButton18": 1048576, - "ExtraButton19": 2097152, - "ExtraButton20": 4194304, - "ExtraButton21": 8388608, - "ExtraButton22": 16777216, - "ExtraButton23": 33554432, - "ExtraButton24": 67108864, - "AllButtons": 134217727, - "MaxMouseButton": 67108864, - "MouseButtonMask": -1 - } - } - Enum { - name: "Orientation" - values: { - "Horizontal": 1, - "Vertical": 2 - } - } - Enum { - name: "Orientations" - values: { - "Horizontal": 1, - "Vertical": 2 - } - } - Enum { - name: "FocusPolicy" - values: { - "NoFocus": 0, - "TabFocus": 1, - "ClickFocus": 2, - "StrongFocus": 11, - "WheelFocus": 15 - } - } - Enum { - name: "SortOrder" - values: { - "AscendingOrder": 0, - "DescendingOrder": 1 - } - } - Enum { - name: "Alignment" - values: { - "AlignLeft": 1, - "AlignLeading": 1, - "AlignRight": 2, - "AlignTrailing": 2, - "AlignHCenter": 4, - "AlignJustify": 8, - "AlignAbsolute": 16, - "AlignHorizontal_Mask": 31, - "AlignTop": 32, - "AlignBottom": 64, - "AlignVCenter": 128, - "AlignBaseline": 256, - "AlignVertical_Mask": 480, - "AlignCenter": 132 - } - } - Enum { - name: "TextElideMode" - values: { - "ElideLeft": 0, - "ElideRight": 1, - "ElideMiddle": 2, - "ElideNone": 3 - } - } - Enum { - name: "WindowType" - values: { - "Widget": 0, - "Window": 1, - "Dialog": 3, - "Sheet": 5, - "Drawer": 7, - "Popup": 9, - "Tool": 11, - "ToolTip": 13, - "SplashScreen": 15, - "Desktop": 17, - "SubWindow": 18, - "ForeignWindow": 33, - "CoverWindow": 65, - "WindowType_Mask": 255, - "MSWindowsFixedSizeDialogHint": 256, - "MSWindowsOwnDC": 512, - "BypassWindowManagerHint": 1024, - "X11BypassWindowManagerHint": 1024, - "FramelessWindowHint": 2048, - "WindowTitleHint": 4096, - "WindowSystemMenuHint": 8192, - "WindowMinimizeButtonHint": 16384, - "WindowMaximizeButtonHint": 32768, - "WindowMinMaxButtonsHint": 49152, - "WindowContextHelpButtonHint": 65536, - "WindowShadeButtonHint": 131072, - "WindowStaysOnTopHint": 262144, - "WindowTransparentForInput": 524288, - "WindowOverridesSystemGestures": 1048576, - "WindowDoesNotAcceptFocus": 2097152, - "CustomizeWindowHint": 33554432, - "WindowStaysOnBottomHint": 67108864, - "WindowCloseButtonHint": 134217728, - "MacWindowToolBarButtonHint": 268435456, - "BypassGraphicsProxyWidget": 536870912, - "WindowOkButtonHint": 524288, - "WindowCancelButtonHint": 1048576, - "NoDropShadowWindowHint": 1073741824, - "WindowFullscreenButtonHint": -2147483648 - } - } - Enum { - name: "WindowFlags" - values: { - "Widget": 0, - "Window": 1, - "Dialog": 3, - "Sheet": 5, - "Drawer": 7, - "Popup": 9, - "Tool": 11, - "ToolTip": 13, - "SplashScreen": 15, - "Desktop": 17, - "SubWindow": 18, - "ForeignWindow": 33, - "CoverWindow": 65, - "WindowType_Mask": 255, - "MSWindowsFixedSizeDialogHint": 256, - "MSWindowsOwnDC": 512, - "BypassWindowManagerHint": 1024, - "X11BypassWindowManagerHint": 1024, - "FramelessWindowHint": 2048, - "WindowTitleHint": 4096, - "WindowSystemMenuHint": 8192, - "WindowMinimizeButtonHint": 16384, - "WindowMaximizeButtonHint": 32768, - "WindowMinMaxButtonsHint": 49152, - "WindowContextHelpButtonHint": 65536, - "WindowShadeButtonHint": 131072, - "WindowStaysOnTopHint": 262144, - "WindowTransparentForInput": 524288, - "WindowOverridesSystemGestures": 1048576, - "WindowDoesNotAcceptFocus": 2097152, - "CustomizeWindowHint": 33554432, - "WindowStaysOnBottomHint": 67108864, - "WindowCloseButtonHint": 134217728, - "MacWindowToolBarButtonHint": 268435456, - "BypassGraphicsProxyWidget": 536870912, - "WindowOkButtonHint": 524288, - "WindowCancelButtonHint": 1048576, - "NoDropShadowWindowHint": 1073741824, - "WindowFullscreenButtonHint": -2147483648 - } - } - Enum { - name: "WindowState" - values: { - "WindowNoState": 0, - "WindowMinimized": 1, - "WindowMaximized": 2, - "WindowFullScreen": 4, - "WindowActive": 8 - } - } - Enum { - name: "WindowStates" - values: { - "WindowNoState": 0, - "WindowMinimized": 1, - "WindowMaximized": 2, - "WindowFullScreen": 4, - "WindowActive": 8 - } - } - Enum { - name: "ApplicationState" - values: { - "ApplicationSuspended": 0, - "ApplicationHidden": 1, - "ApplicationInactive": 2, - "ApplicationActive": 4 - } - } - Enum { - name: "ScreenOrientation" - values: { - "PrimaryOrientation": 0, - "PortraitOrientation": 1, - "LandscapeOrientation": 2, - "InvertedPortraitOrientation": 4, - "InvertedLandscapeOrientation": 8 - } - } - Enum { - name: "ScreenOrientations" - values: { - "PrimaryOrientation": 0, - "PortraitOrientation": 1, - "LandscapeOrientation": 2, - "InvertedPortraitOrientation": 4, - "InvertedLandscapeOrientation": 8 - } - } - Enum { - name: "WidgetAttribute" - values: { - "WA_Disabled": 0, - "WA_UnderMouse": 1, - "WA_MouseTracking": 2, - "WA_ContentsPropagated": 3, - "WA_OpaquePaintEvent": 4, - "WA_NoBackground": 4, - "WA_StaticContents": 5, - "WA_LaidOut": 7, - "WA_PaintOnScreen": 8, - "WA_NoSystemBackground": 9, - "WA_UpdatesDisabled": 10, - "WA_Mapped": 11, - "WA_MacNoClickThrough": 12, - "WA_InputMethodEnabled": 14, - "WA_WState_Visible": 15, - "WA_WState_Hidden": 16, - "WA_ForceDisabled": 32, - "WA_KeyCompression": 33, - "WA_PendingMoveEvent": 34, - "WA_PendingResizeEvent": 35, - "WA_SetPalette": 36, - "WA_SetFont": 37, - "WA_SetCursor": 38, - "WA_NoChildEventsFromChildren": 39, - "WA_WindowModified": 41, - "WA_Resized": 42, - "WA_Moved": 43, - "WA_PendingUpdate": 44, - "WA_InvalidSize": 45, - "WA_MacBrushedMetal": 46, - "WA_MacMetalStyle": 46, - "WA_CustomWhatsThis": 47, - "WA_LayoutOnEntireRect": 48, - "WA_OutsideWSRange": 49, - "WA_GrabbedShortcut": 50, - "WA_TransparentForMouseEvents": 51, - "WA_PaintUnclipped": 52, - "WA_SetWindowIcon": 53, - "WA_NoMouseReplay": 54, - "WA_DeleteOnClose": 55, - "WA_RightToLeft": 56, - "WA_SetLayoutDirection": 57, - "WA_NoChildEventsForParent": 58, - "WA_ForceUpdatesDisabled": 59, - "WA_WState_Created": 60, - "WA_WState_CompressKeys": 61, - "WA_WState_InPaintEvent": 62, - "WA_WState_Reparented": 63, - "WA_WState_ConfigPending": 64, - "WA_WState_Polished": 66, - "WA_WState_DND": 67, - "WA_WState_OwnSizePolicy": 68, - "WA_WState_ExplicitShowHide": 69, - "WA_ShowModal": 70, - "WA_MouseNoMask": 71, - "WA_GroupLeader": 72, - "WA_NoMousePropagation": 73, - "WA_Hover": 74, - "WA_InputMethodTransparent": 75, - "WA_QuitOnClose": 76, - "WA_KeyboardFocusChange": 77, - "WA_AcceptDrops": 78, - "WA_DropSiteRegistered": 79, - "WA_ForceAcceptDrops": 79, - "WA_WindowPropagation": 80, - "WA_NoX11EventCompression": 81, - "WA_TintedBackground": 82, - "WA_X11OpenGLOverlay": 83, - "WA_AlwaysShowToolTips": 84, - "WA_MacOpaqueSizeGrip": 85, - "WA_SetStyle": 86, - "WA_SetLocale": 87, - "WA_MacShowFocusRect": 88, - "WA_MacNormalSize": 89, - "WA_MacSmallSize": 90, - "WA_MacMiniSize": 91, - "WA_LayoutUsesWidgetRect": 92, - "WA_StyledBackground": 93, - "WA_MSWindowsUseDirect3D": 94, - "WA_CanHostQMdiSubWindowTitleBar": 95, - "WA_MacAlwaysShowToolWindow": 96, - "WA_StyleSheet": 97, - "WA_ShowWithoutActivating": 98, - "WA_X11BypassTransientForHint": 99, - "WA_NativeWindow": 100, - "WA_DontCreateNativeAncestors": 101, - "WA_MacVariableSize": 102, - "WA_DontShowOnScreen": 103, - "WA_X11NetWmWindowTypeDesktop": 104, - "WA_X11NetWmWindowTypeDock": 105, - "WA_X11NetWmWindowTypeToolBar": 106, - "WA_X11NetWmWindowTypeMenu": 107, - "WA_X11NetWmWindowTypeUtility": 108, - "WA_X11NetWmWindowTypeSplash": 109, - "WA_X11NetWmWindowTypeDialog": 110, - "WA_X11NetWmWindowTypeDropDownMenu": 111, - "WA_X11NetWmWindowTypePopupMenu": 112, - "WA_X11NetWmWindowTypeToolTip": 113, - "WA_X11NetWmWindowTypeNotification": 114, - "WA_X11NetWmWindowTypeCombo": 115, - "WA_X11NetWmWindowTypeDND": 116, - "WA_MacFrameworkScaled": 117, - "WA_SetWindowModality": 118, - "WA_WState_WindowOpacitySet": 119, - "WA_TranslucentBackground": 120, - "WA_AcceptTouchEvents": 121, - "WA_WState_AcceptedTouchBeginEvent": 122, - "WA_TouchPadAcceptSingleTouchEvents": 123, - "WA_X11DoNotAcceptFocus": 126, - "WA_MacNoShadow": 127, - "WA_AlwaysStackOnTop": 128, - "WA_AttributeCount": 129 - } - } - Enum { - name: "ApplicationAttribute" - values: { - "AA_ImmediateWidgetCreation": 0, - "AA_MSWindowsUseDirect3DByDefault": 1, - "AA_DontShowIconsInMenus": 2, - "AA_NativeWindows": 3, - "AA_DontCreateNativeWidgetSiblings": 4, - "AA_MacPluginApplication": 5, - "AA_DontUseNativeMenuBar": 6, - "AA_MacDontSwapCtrlAndMeta": 7, - "AA_Use96Dpi": 8, - "AA_X11InitThreads": 10, - "AA_SynthesizeTouchForUnhandledMouseEvents": 11, - "AA_SynthesizeMouseForUnhandledTouchEvents": 12, - "AA_UseHighDpiPixmaps": 13, - "AA_ForceRasterWidgets": 14, - "AA_UseDesktopOpenGL": 15, - "AA_UseOpenGLES": 16, - "AA_UseSoftwareOpenGL": 17, - "AA_ShareOpenGLContexts": 18, - "AA_AttributeCount": 19 - } - } - Enum { - name: "ImageConversionFlags" - values: { - "ColorMode_Mask": 3, - "AutoColor": 0, - "ColorOnly": 3, - "MonoOnly": 2, - "AlphaDither_Mask": 12, - "ThresholdAlphaDither": 0, - "OrderedAlphaDither": 4, - "DiffuseAlphaDither": 8, - "NoAlpha": 12, - "Dither_Mask": 48, - "DiffuseDither": 0, - "OrderedDither": 16, - "ThresholdDither": 32, - "DitherMode_Mask": 192, - "AutoDither": 0, - "PreferDither": 64, - "AvoidDither": 128, - "NoOpaqueDetection": 256, - "NoFormatConversion": 512 - } - } - Enum { - name: "BGMode" - values: { - "TransparentMode": 0, - "OpaqueMode": 1 - } - } - Enum { - name: "Key" - values: { - "Key_Escape": 16777216, - "Key_Tab": 16777217, - "Key_Backtab": 16777218, - "Key_Backspace": 16777219, - "Key_Return": 16777220, - "Key_Enter": 16777221, - "Key_Insert": 16777222, - "Key_Delete": 16777223, - "Key_Pause": 16777224, - "Key_Print": 16777225, - "Key_SysReq": 16777226, - "Key_Clear": 16777227, - "Key_Home": 16777232, - "Key_End": 16777233, - "Key_Left": 16777234, - "Key_Up": 16777235, - "Key_Right": 16777236, - "Key_Down": 16777237, - "Key_PageUp": 16777238, - "Key_PageDown": 16777239, - "Key_Shift": 16777248, - "Key_Control": 16777249, - "Key_Meta": 16777250, - "Key_Alt": 16777251, - "Key_CapsLock": 16777252, - "Key_NumLock": 16777253, - "Key_ScrollLock": 16777254, - "Key_F1": 16777264, - "Key_F2": 16777265, - "Key_F3": 16777266, - "Key_F4": 16777267, - "Key_F5": 16777268, - "Key_F6": 16777269, - "Key_F7": 16777270, - "Key_F8": 16777271, - "Key_F9": 16777272, - "Key_F10": 16777273, - "Key_F11": 16777274, - "Key_F12": 16777275, - "Key_F13": 16777276, - "Key_F14": 16777277, - "Key_F15": 16777278, - "Key_F16": 16777279, - "Key_F17": 16777280, - "Key_F18": 16777281, - "Key_F19": 16777282, - "Key_F20": 16777283, - "Key_F21": 16777284, - "Key_F22": 16777285, - "Key_F23": 16777286, - "Key_F24": 16777287, - "Key_F25": 16777288, - "Key_F26": 16777289, - "Key_F27": 16777290, - "Key_F28": 16777291, - "Key_F29": 16777292, - "Key_F30": 16777293, - "Key_F31": 16777294, - "Key_F32": 16777295, - "Key_F33": 16777296, - "Key_F34": 16777297, - "Key_F35": 16777298, - "Key_Super_L": 16777299, - "Key_Super_R": 16777300, - "Key_Menu": 16777301, - "Key_Hyper_L": 16777302, - "Key_Hyper_R": 16777303, - "Key_Help": 16777304, - "Key_Direction_L": 16777305, - "Key_Direction_R": 16777312, - "Key_Space": 32, - "Key_Any": 32, - "Key_Exclam": 33, - "Key_QuoteDbl": 34, - "Key_NumberSign": 35, - "Key_Dollar": 36, - "Key_Percent": 37, - "Key_Ampersand": 38, - "Key_Apostrophe": 39, - "Key_ParenLeft": 40, - "Key_ParenRight": 41, - "Key_Asterisk": 42, - "Key_Plus": 43, - "Key_Comma": 44, - "Key_Minus": 45, - "Key_Period": 46, - "Key_Slash": 47, - "Key_0": 48, - "Key_1": 49, - "Key_2": 50, - "Key_3": 51, - "Key_4": 52, - "Key_5": 53, - "Key_6": 54, - "Key_7": 55, - "Key_8": 56, - "Key_9": 57, - "Key_Colon": 58, - "Key_Semicolon": 59, - "Key_Less": 60, - "Key_Equal": 61, - "Key_Greater": 62, - "Key_Question": 63, - "Key_At": 64, - "Key_A": 65, - "Key_B": 66, - "Key_C": 67, - "Key_D": 68, - "Key_E": 69, - "Key_F": 70, - "Key_G": 71, - "Key_H": 72, - "Key_I": 73, - "Key_J": 74, - "Key_K": 75, - "Key_L": 76, - "Key_M": 77, - "Key_N": 78, - "Key_O": 79, - "Key_P": 80, - "Key_Q": 81, - "Key_R": 82, - "Key_S": 83, - "Key_T": 84, - "Key_U": 85, - "Key_V": 86, - "Key_W": 87, - "Key_X": 88, - "Key_Y": 89, - "Key_Z": 90, - "Key_BracketLeft": 91, - "Key_Backslash": 92, - "Key_BracketRight": 93, - "Key_AsciiCircum": 94, - "Key_Underscore": 95, - "Key_QuoteLeft": 96, - "Key_BraceLeft": 123, - "Key_Bar": 124, - "Key_BraceRight": 125, - "Key_AsciiTilde": 126, - "Key_nobreakspace": 160, - "Key_exclamdown": 161, - "Key_cent": 162, - "Key_sterling": 163, - "Key_currency": 164, - "Key_yen": 165, - "Key_brokenbar": 166, - "Key_section": 167, - "Key_diaeresis": 168, - "Key_copyright": 169, - "Key_ordfeminine": 170, - "Key_guillemotleft": 171, - "Key_notsign": 172, - "Key_hyphen": 173, - "Key_registered": 174, - "Key_macron": 175, - "Key_degree": 176, - "Key_plusminus": 177, - "Key_twosuperior": 178, - "Key_threesuperior": 179, - "Key_acute": 180, - "Key_mu": 181, - "Key_paragraph": 182, - "Key_periodcentered": 183, - "Key_cedilla": 184, - "Key_onesuperior": 185, - "Key_masculine": 186, - "Key_guillemotright": 187, - "Key_onequarter": 188, - "Key_onehalf": 189, - "Key_threequarters": 190, - "Key_questiondown": 191, - "Key_Agrave": 192, - "Key_Aacute": 193, - "Key_Acircumflex": 194, - "Key_Atilde": 195, - "Key_Adiaeresis": 196, - "Key_Aring": 197, - "Key_AE": 198, - "Key_Ccedilla": 199, - "Key_Egrave": 200, - "Key_Eacute": 201, - "Key_Ecircumflex": 202, - "Key_Ediaeresis": 203, - "Key_Igrave": 204, - "Key_Iacute": 205, - "Key_Icircumflex": 206, - "Key_Idiaeresis": 207, - "Key_ETH": 208, - "Key_Ntilde": 209, - "Key_Ograve": 210, - "Key_Oacute": 211, - "Key_Ocircumflex": 212, - "Key_Otilde": 213, - "Key_Odiaeresis": 214, - "Key_multiply": 215, - "Key_Ooblique": 216, - "Key_Ugrave": 217, - "Key_Uacute": 218, - "Key_Ucircumflex": 219, - "Key_Udiaeresis": 220, - "Key_Yacute": 221, - "Key_THORN": 222, - "Key_ssharp": 223, - "Key_division": 247, - "Key_ydiaeresis": 255, - "Key_AltGr": 16781571, - "Key_Multi_key": 16781600, - "Key_Codeinput": 16781623, - "Key_SingleCandidate": 16781628, - "Key_MultipleCandidate": 16781629, - "Key_PreviousCandidate": 16781630, - "Key_Mode_switch": 16781694, - "Key_Kanji": 16781601, - "Key_Muhenkan": 16781602, - "Key_Henkan": 16781603, - "Key_Romaji": 16781604, - "Key_Hiragana": 16781605, - "Key_Katakana": 16781606, - "Key_Hiragana_Katakana": 16781607, - "Key_Zenkaku": 16781608, - "Key_Hankaku": 16781609, - "Key_Zenkaku_Hankaku": 16781610, - "Key_Touroku": 16781611, - "Key_Massyo": 16781612, - "Key_Kana_Lock": 16781613, - "Key_Kana_Shift": 16781614, - "Key_Eisu_Shift": 16781615, - "Key_Eisu_toggle": 16781616, - "Key_Hangul": 16781617, - "Key_Hangul_Start": 16781618, - "Key_Hangul_End": 16781619, - "Key_Hangul_Hanja": 16781620, - "Key_Hangul_Jamo": 16781621, - "Key_Hangul_Romaja": 16781622, - "Key_Hangul_Jeonja": 16781624, - "Key_Hangul_Banja": 16781625, - "Key_Hangul_PreHanja": 16781626, - "Key_Hangul_PostHanja": 16781627, - "Key_Hangul_Special": 16781631, - "Key_Dead_Grave": 16781904, - "Key_Dead_Acute": 16781905, - "Key_Dead_Circumflex": 16781906, - "Key_Dead_Tilde": 16781907, - "Key_Dead_Macron": 16781908, - "Key_Dead_Breve": 16781909, - "Key_Dead_Abovedot": 16781910, - "Key_Dead_Diaeresis": 16781911, - "Key_Dead_Abovering": 16781912, - "Key_Dead_Doubleacute": 16781913, - "Key_Dead_Caron": 16781914, - "Key_Dead_Cedilla": 16781915, - "Key_Dead_Ogonek": 16781916, - "Key_Dead_Iota": 16781917, - "Key_Dead_Voiced_Sound": 16781918, - "Key_Dead_Semivoiced_Sound": 16781919, - "Key_Dead_Belowdot": 16781920, - "Key_Dead_Hook": 16781921, - "Key_Dead_Horn": 16781922, - "Key_Back": 16777313, - "Key_Forward": 16777314, - "Key_Stop": 16777315, - "Key_Refresh": 16777316, - "Key_VolumeDown": 16777328, - "Key_VolumeMute": 16777329, - "Key_VolumeUp": 16777330, - "Key_BassBoost": 16777331, - "Key_BassUp": 16777332, - "Key_BassDown": 16777333, - "Key_TrebleUp": 16777334, - "Key_TrebleDown": 16777335, - "Key_MediaPlay": 16777344, - "Key_MediaStop": 16777345, - "Key_MediaPrevious": 16777346, - "Key_MediaNext": 16777347, - "Key_MediaRecord": 16777348, - "Key_MediaPause": 16777349, - "Key_MediaTogglePlayPause": 16777350, - "Key_HomePage": 16777360, - "Key_Favorites": 16777361, - "Key_Search": 16777362, - "Key_Standby": 16777363, - "Key_OpenUrl": 16777364, - "Key_LaunchMail": 16777376, - "Key_LaunchMedia": 16777377, - "Key_Launch0": 16777378, - "Key_Launch1": 16777379, - "Key_Launch2": 16777380, - "Key_Launch3": 16777381, - "Key_Launch4": 16777382, - "Key_Launch5": 16777383, - "Key_Launch6": 16777384, - "Key_Launch7": 16777385, - "Key_Launch8": 16777386, - "Key_Launch9": 16777387, - "Key_LaunchA": 16777388, - "Key_LaunchB": 16777389, - "Key_LaunchC": 16777390, - "Key_LaunchD": 16777391, - "Key_LaunchE": 16777392, - "Key_LaunchF": 16777393, - "Key_MonBrightnessUp": 16777394, - "Key_MonBrightnessDown": 16777395, - "Key_KeyboardLightOnOff": 16777396, - "Key_KeyboardBrightnessUp": 16777397, - "Key_KeyboardBrightnessDown": 16777398, - "Key_PowerOff": 16777399, - "Key_WakeUp": 16777400, - "Key_Eject": 16777401, - "Key_ScreenSaver": 16777402, - "Key_WWW": 16777403, - "Key_Memo": 16777404, - "Key_LightBulb": 16777405, - "Key_Shop": 16777406, - "Key_History": 16777407, - "Key_AddFavorite": 16777408, - "Key_HotLinks": 16777409, - "Key_BrightnessAdjust": 16777410, - "Key_Finance": 16777411, - "Key_Community": 16777412, - "Key_AudioRewind": 16777413, - "Key_BackForward": 16777414, - "Key_ApplicationLeft": 16777415, - "Key_ApplicationRight": 16777416, - "Key_Book": 16777417, - "Key_CD": 16777418, - "Key_Calculator": 16777419, - "Key_ToDoList": 16777420, - "Key_ClearGrab": 16777421, - "Key_Close": 16777422, - "Key_Copy": 16777423, - "Key_Cut": 16777424, - "Key_Display": 16777425, - "Key_DOS": 16777426, - "Key_Documents": 16777427, - "Key_Excel": 16777428, - "Key_Explorer": 16777429, - "Key_Game": 16777430, - "Key_Go": 16777431, - "Key_iTouch": 16777432, - "Key_LogOff": 16777433, - "Key_Market": 16777434, - "Key_Meeting": 16777435, - "Key_MenuKB": 16777436, - "Key_MenuPB": 16777437, - "Key_MySites": 16777438, - "Key_News": 16777439, - "Key_OfficeHome": 16777440, - "Key_Option": 16777441, - "Key_Paste": 16777442, - "Key_Phone": 16777443, - "Key_Calendar": 16777444, - "Key_Reply": 16777445, - "Key_Reload": 16777446, - "Key_RotateWindows": 16777447, - "Key_RotationPB": 16777448, - "Key_RotationKB": 16777449, - "Key_Save": 16777450, - "Key_Send": 16777451, - "Key_Spell": 16777452, - "Key_SplitScreen": 16777453, - "Key_Support": 16777454, - "Key_TaskPane": 16777455, - "Key_Terminal": 16777456, - "Key_Tools": 16777457, - "Key_Travel": 16777458, - "Key_Video": 16777459, - "Key_Word": 16777460, - "Key_Xfer": 16777461, - "Key_ZoomIn": 16777462, - "Key_ZoomOut": 16777463, - "Key_Away": 16777464, - "Key_Messenger": 16777465, - "Key_WebCam": 16777466, - "Key_MailForward": 16777467, - "Key_Pictures": 16777468, - "Key_Music": 16777469, - "Key_Battery": 16777470, - "Key_Bluetooth": 16777471, - "Key_WLAN": 16777472, - "Key_UWB": 16777473, - "Key_AudioForward": 16777474, - "Key_AudioRepeat": 16777475, - "Key_AudioRandomPlay": 16777476, - "Key_Subtitle": 16777477, - "Key_AudioCycleTrack": 16777478, - "Key_Time": 16777479, - "Key_Hibernate": 16777480, - "Key_View": 16777481, - "Key_TopMenu": 16777482, - "Key_PowerDown": 16777483, - "Key_Suspend": 16777484, - "Key_ContrastAdjust": 16777485, - "Key_LaunchG": 16777486, - "Key_LaunchH": 16777487, - "Key_TouchpadToggle": 16777488, - "Key_TouchpadOn": 16777489, - "Key_TouchpadOff": 16777490, - "Key_MicMute": 16777491, - "Key_Red": 16777492, - "Key_Green": 16777493, - "Key_Yellow": 16777494, - "Key_Blue": 16777495, - "Key_ChannelUp": 16777496, - "Key_ChannelDown": 16777497, - "Key_Guide": 16777498, - "Key_Info": 16777499, - "Key_Settings": 16777500, - "Key_MicVolumeUp": 16777501, - "Key_MicVolumeDown": 16777502, - "Key_New": 16777504, - "Key_Open": 16777505, - "Key_Find": 16777506, - "Key_Undo": 16777507, - "Key_Redo": 16777508, - "Key_MediaLast": 16842751, - "Key_Select": 16842752, - "Key_Yes": 16842753, - "Key_No": 16842754, - "Key_Cancel": 16908289, - "Key_Printer": 16908290, - "Key_Execute": 16908291, - "Key_Sleep": 16908292, - "Key_Play": 16908293, - "Key_Zoom": 16908294, - "Key_Exit": 16908298, - "Key_Context1": 17825792, - "Key_Context2": 17825793, - "Key_Context3": 17825794, - "Key_Context4": 17825795, - "Key_Call": 17825796, - "Key_Hangup": 17825797, - "Key_Flip": 17825798, - "Key_ToggleCallHangup": 17825799, - "Key_VoiceDial": 17825800, - "Key_LastNumberRedial": 17825801, - "Key_Camera": 17825824, - "Key_CameraFocus": 17825825, - "Key_unknown": 33554431 - } - } - Enum { - name: "ArrowType" - values: { - "NoArrow": 0, - "UpArrow": 1, - "DownArrow": 2, - "LeftArrow": 3, - "RightArrow": 4 - } - } - Enum { - name: "PenStyle" - values: { - "NoPen": 0, - "SolidLine": 1, - "DashLine": 2, - "DotLine": 3, - "DashDotLine": 4, - "DashDotDotLine": 5, - "CustomDashLine": 6 - } - } - Enum { - name: "PenCapStyle" - values: { - "FlatCap": 0, - "SquareCap": 16, - "RoundCap": 32, - "MPenCapStyle": 48 - } - } - Enum { - name: "PenJoinStyle" - values: { - "MiterJoin": 0, - "BevelJoin": 64, - "RoundJoin": 128, - "SvgMiterJoin": 256, - "MPenJoinStyle": 448 - } - } - Enum { - name: "BrushStyle" - values: { - "NoBrush": 0, - "SolidPattern": 1, - "Dense1Pattern": 2, - "Dense2Pattern": 3, - "Dense3Pattern": 4, - "Dense4Pattern": 5, - "Dense5Pattern": 6, - "Dense6Pattern": 7, - "Dense7Pattern": 8, - "HorPattern": 9, - "VerPattern": 10, - "CrossPattern": 11, - "BDiagPattern": 12, - "FDiagPattern": 13, - "DiagCrossPattern": 14, - "LinearGradientPattern": 15, - "RadialGradientPattern": 16, - "ConicalGradientPattern": 17, - "TexturePattern": 24 - } - } - Enum { - name: "SizeMode" - values: { - "AbsoluteSize": 0, - "RelativeSize": 1 - } - } - Enum { - name: "CursorShape" - values: { - "ArrowCursor": 0, - "UpArrowCursor": 1, - "CrossCursor": 2, - "WaitCursor": 3, - "IBeamCursor": 4, - "SizeVerCursor": 5, - "SizeHorCursor": 6, - "SizeBDiagCursor": 7, - "SizeFDiagCursor": 8, - "SizeAllCursor": 9, - "BlankCursor": 10, - "SplitVCursor": 11, - "SplitHCursor": 12, - "PointingHandCursor": 13, - "ForbiddenCursor": 14, - "WhatsThisCursor": 15, - "BusyCursor": 16, - "OpenHandCursor": 17, - "ClosedHandCursor": 18, - "DragCopyCursor": 19, - "DragMoveCursor": 20, - "DragLinkCursor": 21, - "LastCursor": 21, - "BitmapCursor": 24, - "CustomCursor": 25 - } - } - Enum { - name: "TextFormat" - values: { - "PlainText": 0, - "RichText": 1, - "AutoText": 2 - } - } - Enum { - name: "AspectRatioMode" - values: { - "IgnoreAspectRatio": 0, - "KeepAspectRatio": 1, - "KeepAspectRatioByExpanding": 2 - } - } - Enum { - name: "DockWidgetArea" - values: { - "LeftDockWidgetArea": 1, - "RightDockWidgetArea": 2, - "TopDockWidgetArea": 4, - "BottomDockWidgetArea": 8, - "DockWidgetArea_Mask": 15, - "AllDockWidgetAreas": 15, - "NoDockWidgetArea": 0 - } - } - Enum { - name: "DockWidgetAreas" - values: { - "LeftDockWidgetArea": 1, - "RightDockWidgetArea": 2, - "TopDockWidgetArea": 4, - "BottomDockWidgetArea": 8, - "DockWidgetArea_Mask": 15, - "AllDockWidgetAreas": 15, - "NoDockWidgetArea": 0 - } - } - Enum { - name: "ToolBarArea" - values: { - "LeftToolBarArea": 1, - "RightToolBarArea": 2, - "TopToolBarArea": 4, - "BottomToolBarArea": 8, - "ToolBarArea_Mask": 15, - "AllToolBarAreas": 15, - "NoToolBarArea": 0 - } - } - Enum { - name: "ToolBarAreas" - values: { - "LeftToolBarArea": 1, - "RightToolBarArea": 2, - "TopToolBarArea": 4, - "BottomToolBarArea": 8, - "ToolBarArea_Mask": 15, - "AllToolBarAreas": 15, - "NoToolBarArea": 0 - } - } - Enum { - name: "DateFormat" - values: { - "TextDate": 0, - "ISODate": 1, - "SystemLocaleDate": 2, - "LocalDate": 2, - "LocaleDate": 3, - "SystemLocaleShortDate": 4, - "SystemLocaleLongDate": 5, - "DefaultLocaleShortDate": 6, - "DefaultLocaleLongDate": 7, - "RFC2822Date": 8 - } - } - Enum { - name: "TimeSpec" - values: { - "LocalTime": 0, - "UTC": 1, - "OffsetFromUTC": 2, - "TimeZone": 3 - } - } - Enum { - name: "DayOfWeek" - values: { - "Monday": 1, - "Tuesday": 2, - "Wednesday": 3, - "Thursday": 4, - "Friday": 5, - "Saturday": 6, - "Sunday": 7 - } - } - Enum { - name: "ScrollBarPolicy" - values: { - "ScrollBarAsNeeded": 0, - "ScrollBarAlwaysOff": 1, - "ScrollBarAlwaysOn": 2 - } - } - Enum { - name: "CaseSensitivity" - values: { - "CaseInsensitive": 0, - "CaseSensitive": 1 - } - } - Enum { - name: "Corner" - values: { - "TopLeftCorner": 0, - "TopRightCorner": 1, - "BottomLeftCorner": 2, - "BottomRightCorner": 3 - } - } - Enum { - name: "Edge" - values: { - "TopEdge": 1, - "LeftEdge": 2, - "RightEdge": 4, - "BottomEdge": 8 - } - } - Enum { - name: "Edges" - values: { - "TopEdge": 1, - "LeftEdge": 2, - "RightEdge": 4, - "BottomEdge": 8 - } - } - Enum { - name: "ConnectionType" - values: { - "AutoConnection": 0, - "DirectConnection": 1, - "QueuedConnection": 2, - "BlockingQueuedConnection": 3, - "UniqueConnection": 128 - } - } - Enum { - name: "ShortcutContext" - values: { - "WidgetShortcut": 0, - "WindowShortcut": 1, - "ApplicationShortcut": 2, - "WidgetWithChildrenShortcut": 3 - } - } - Enum { - name: "FillRule" - values: { - "OddEvenFill": 0, - "WindingFill": 1 - } - } - Enum { - name: "MaskMode" - values: { - "MaskInColor": 0, - "MaskOutColor": 1 - } - } - Enum { - name: "ClipOperation" - values: { - "NoClip": 0, - "ReplaceClip": 1, - "IntersectClip": 2 - } - } - Enum { - name: "ItemSelectionMode" - values: { - "ContainsItemShape": 0, - "IntersectsItemShape": 1, - "ContainsItemBoundingRect": 2, - "IntersectsItemBoundingRect": 3 - } - } - Enum { - name: "TransformationMode" - values: { - "FastTransformation": 0, - "SmoothTransformation": 1 - } - } - Enum { - name: "Axis" - values: { - "XAxis": 0, - "YAxis": 1, - "ZAxis": 2 - } - } - Enum { - name: "FocusReason" - values: { - "MouseFocusReason": 0, - "TabFocusReason": 1, - "BacktabFocusReason": 2, - "ActiveWindowFocusReason": 3, - "PopupFocusReason": 4, - "ShortcutFocusReason": 5, - "MenuBarFocusReason": 6, - "OtherFocusReason": 7, - "NoFocusReason": 8 - } - } - Enum { - name: "ContextMenuPolicy" - values: { - "NoContextMenu": 0, - "DefaultContextMenu": 1, - "ActionsContextMenu": 2, - "CustomContextMenu": 3, - "PreventContextMenu": 4 - } - } - Enum { - name: "InputMethodQuery" - values: { - "ImEnabled": 1, - "ImCursorRectangle": 2, - "ImMicroFocus": 2, - "ImFont": 4, - "ImCursorPosition": 8, - "ImSurroundingText": 16, - "ImCurrentSelection": 32, - "ImMaximumTextLength": 64, - "ImAnchorPosition": 128, - "ImHints": 256, - "ImPreferredLanguage": 512, - "ImAbsolutePosition": 1024, - "ImTextBeforeCursor": 2048, - "ImTextAfterCursor": 4096, - "ImPlatformData": -2147483648, - "ImQueryInput": 186, - "ImQueryAll": -1 - } - } - Enum { - name: "InputMethodQueries" - values: { - "ImEnabled": 1, - "ImCursorRectangle": 2, - "ImMicroFocus": 2, - "ImFont": 4, - "ImCursorPosition": 8, - "ImSurroundingText": 16, - "ImCurrentSelection": 32, - "ImMaximumTextLength": 64, - "ImAnchorPosition": 128, - "ImHints": 256, - "ImPreferredLanguage": 512, - "ImAbsolutePosition": 1024, - "ImTextBeforeCursor": 2048, - "ImTextAfterCursor": 4096, - "ImPlatformData": -2147483648, - "ImQueryInput": 186, - "ImQueryAll": -1 - } - } - Enum { - name: "InputMethodHint" - values: { - "ImhNone": 0, - "ImhHiddenText": 1, - "ImhSensitiveData": 2, - "ImhNoAutoUppercase": 4, - "ImhPreferNumbers": 8, - "ImhPreferUppercase": 16, - "ImhPreferLowercase": 32, - "ImhNoPredictiveText": 64, - "ImhDate": 128, - "ImhTime": 256, - "ImhPreferLatin": 512, - "ImhMultiLine": 1024, - "ImhDigitsOnly": 65536, - "ImhFormattedNumbersOnly": 131072, - "ImhUppercaseOnly": 262144, - "ImhLowercaseOnly": 524288, - "ImhDialableCharactersOnly": 1048576, - "ImhEmailCharactersOnly": 2097152, - "ImhUrlCharactersOnly": 4194304, - "ImhLatinOnly": 8388608, - "ImhExclusiveInputMask": -65536 - } - } - Enum { - name: "InputMethodHints" - values: { - "ImhNone": 0, - "ImhHiddenText": 1, - "ImhSensitiveData": 2, - "ImhNoAutoUppercase": 4, - "ImhPreferNumbers": 8, - "ImhPreferUppercase": 16, - "ImhPreferLowercase": 32, - "ImhNoPredictiveText": 64, - "ImhDate": 128, - "ImhTime": 256, - "ImhPreferLatin": 512, - "ImhMultiLine": 1024, - "ImhDigitsOnly": 65536, - "ImhFormattedNumbersOnly": 131072, - "ImhUppercaseOnly": 262144, - "ImhLowercaseOnly": 524288, - "ImhDialableCharactersOnly": 1048576, - "ImhEmailCharactersOnly": 2097152, - "ImhUrlCharactersOnly": 4194304, - "ImhLatinOnly": 8388608, - "ImhExclusiveInputMask": -65536 - } - } - Enum { - name: "ToolButtonStyle" - values: { - "ToolButtonIconOnly": 0, - "ToolButtonTextOnly": 1, - "ToolButtonTextBesideIcon": 2, - "ToolButtonTextUnderIcon": 3, - "ToolButtonFollowStyle": 4 - } - } - Enum { - name: "LayoutDirection" - values: { - "LeftToRight": 0, - "RightToLeft": 1, - "LayoutDirectionAuto": 2 - } - } - Enum { - name: "DropAction" - values: { - "CopyAction": 1, - "MoveAction": 2, - "LinkAction": 4, - "ActionMask": 255, - "TargetMoveAction": 32770, - "IgnoreAction": 0 - } - } - Enum { - name: "DropActions" - values: { - "CopyAction": 1, - "MoveAction": 2, - "LinkAction": 4, - "ActionMask": 255, - "TargetMoveAction": 32770, - "IgnoreAction": 0 - } - } - Enum { - name: "CheckState" - values: { - "Unchecked": 0, - "PartiallyChecked": 1, - "Checked": 2 - } - } - Enum { - name: "ItemFlags" - values: { - "NoItemFlags": 0, - "ItemIsSelectable": 1, - "ItemIsEditable": 2, - "ItemIsDragEnabled": 4, - "ItemIsDropEnabled": 8, - "ItemIsUserCheckable": 16, - "ItemIsEnabled": 32, - "ItemIsTristate": 64, - "ItemNeverHasChildren": 128 - } - } - Enum { - name: "MatchFlags" - values: { - "MatchExactly": 0, - "MatchContains": 1, - "MatchStartsWith": 2, - "MatchEndsWith": 3, - "MatchRegExp": 4, - "MatchWildcard": 5, - "MatchFixedString": 8, - "MatchCaseSensitive": 16, - "MatchWrap": 32, - "MatchRecursive": 64 - } - } - Enum { - name: "WindowModality" - values: { - "NonModal": 0, - "WindowModal": 1, - "ApplicationModal": 2 - } - } - Enum { - name: "TextInteractionFlag" - values: { - "NoTextInteraction": 0, - "TextSelectableByMouse": 1, - "TextSelectableByKeyboard": 2, - "LinksAccessibleByMouse": 4, - "LinksAccessibleByKeyboard": 8, - "TextEditable": 16, - "TextEditorInteraction": 19, - "TextBrowserInteraction": 13 - } - } - Enum { - name: "TextInteractionFlags" - values: { - "NoTextInteraction": 0, - "TextSelectableByMouse": 1, - "TextSelectableByKeyboard": 2, - "LinksAccessibleByMouse": 4, - "LinksAccessibleByKeyboard": 8, - "TextEditable": 16, - "TextEditorInteraction": 19, - "TextBrowserInteraction": 13 - } - } - Enum { - name: "SizeHint" - values: { - "MinimumSize": 0, - "PreferredSize": 1, - "MaximumSize": 2, - "MinimumDescent": 3, - "NSizeHints": 4 - } - } - Enum { - name: "GestureState" - values: { - "NoGesture": 0, - "GestureStarted": 1, - "GestureUpdated": 2, - "GestureFinished": 3, - "GestureCanceled": 4 - } - } - Enum { - name: "GestureType" - values: { - "TapGesture": 1, - "TapAndHoldGesture": 2, - "PanGesture": 3, - "PinchGesture": 4, - "SwipeGesture": 5, - "CustomGesture": 256, - "LastGestureType": -1 - } - } - Enum { - name: "NativeGestureType" - values: { - "BeginNativeGesture": 0, - "EndNativeGesture": 1, - "PanNativeGesture": 2, - "ZoomNativeGesture": 3, - "SmartZoomNativeGesture": 4, - "RotateNativeGesture": 5, - "SwipeNativeGesture": 6 - } - } - Enum { - name: "CursorMoveStyle" - values: { - "LogicalMoveStyle": 0, - "VisualMoveStyle": 1 - } - } - Enum { - name: "TimerType" - values: { - "PreciseTimer": 0, - "CoarseTimer": 1, - "VeryCoarseTimer": 2 - } - } - Enum { - name: "ScrollPhase" - values: { - "ScrollBegin": 1, - "ScrollUpdate": 2, - "ScrollEnd": 3 - } - } - Enum { - name: "MouseEventSource" - values: { - "MouseEventNotSynthesized": 0, - "MouseEventSynthesizedBySystem": 1, - "MouseEventSynthesizedByQt": 2 - } - } - } - Component { name: "QEasingCurve"; prototype: "QQmlEasingValueType" } } Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtSensors/libdeclarative_sensors.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtSensors/libdeclarative_sensors.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtSensors/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtSensors/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtSensors/plugins.qmltypes 2015-06-26 09:56:32.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtSensors/plugins.qmltypes 2016-05-20 11:17:24.000000000 +0000 @@ -1,12 +1,13 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtSensors 5.5' +// 'qmlplugindump -nonrelocatable QtSensors 5.6' Module { + dependencies: ["QtQuick 2.0"] Component { name: "QmlAccelerometer" prototype: "QmlSensor" @@ -51,7 +52,7 @@ exports: [ "QtSensors/Altimeter 5.1", "QtSensors/Altimeter 5.2", - "QtSensors/Altimeter 5.5" + "QtSensors/Altimeter 5.6" ] exportMetaObjectRevisions: [0, 0, 0] } Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtTest/libqmltestplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtTest/libqmltestplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtTest/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtTest/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtTest/plugins.qmltypes 2015-06-30 10:17:19.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtTest/plugins.qmltypes 2016-06-16 09:26:11.000000000 +0000 @@ -1,16 +1,17 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump QtTest 1.1' +// 'qmlplugindump -nonrelocatable QtTest 1.0' Module { + dependencies: [] Component { name: "QuickTestEvent" prototype: "QObject" - exports: ["TestEvent 1.0"] + exports: ["QtTest/TestEvent 1.0"] exportMetaObjectRevisions: [0] Method { name: "keyPress" @@ -95,6 +96,16 @@ Parameter { name: "delay"; type: "int" } } Method { + name: "mouseDoubleClickSequence" + type: "bool" + Parameter { name: "item"; type: "QObject"; isPointer: true } + Parameter { name: "x"; type: "double" } + Parameter { name: "y"; type: "double" } + Parameter { name: "button"; type: "int" } + Parameter { name: "modifiers"; type: "int" } + Parameter { name: "delay"; type: "int" } + } + Method { name: "mouseMove" type: "bool" Parameter { name: "item"; type: "QObject"; isPointer: true } @@ -119,7 +130,7 @@ Component { name: "QuickTestResult" prototype: "QObject" - exports: ["TestResult 1.0", "TestResult 1.1"] + exports: ["QtTest/TestResult 1.0", "QtTest/TestResult 1.1"] exportMetaObjectRevisions: [0, 1] Enum { name: "RunMode" @@ -261,7 +272,7 @@ Component { name: "QuickTestUtil" prototype: "QObject" - exports: ["TestUtil 1.0"] + exports: ["QtTest/TestUtil 1.0"] exportMetaObjectRevisions: [0] Property { name: "printAvailableFunctions"; type: "bool"; isReadonly: true } Property { name: "dragThreshold"; type: "int"; isReadonly: true } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtTest/TestCase.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtTest/TestCase.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtTest/TestCase.qml 2015-06-30 10:17:19.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtTest/TestCase.qml 2016-06-16 09:26:11.000000000 +0000 @@ -613,12 +613,19 @@ \li blue(x, y) Returns the blue channel value of the pixel at \a x, \a y position \li alpha(x, y) Returns the alpha channel value of the pixel at \a x, \a y position \li pixel(x, y) Returns the color value of the pixel at \a x, \a y position + \li equals(image) Returns \c true if this image is identical to \a image - + see \l QImage::operator== (since 5.6) + For example: \code var image = grabImage(rect); compare(image.red(10, 10), 255); compare(image.pixel(20, 20), Qt.rgba(255, 0, 0, 255)); + + rect.width += 10; + var newImage = grabImage(rect); + verify(!newImage.equals(image)); \endcode \endlist @@ -869,6 +876,9 @@ focused item. If \a delay is larger than 0, the test will wait for \a delay milliseconds. + The event will be sent to the TestCase window or, in case of multiple windows, + to the current active window. See \l QGuiApplication::focusWindow() for more details. + \b{Note:} At some point you should release the key using keyRelease(). \sa keyRelease(), keyClick() @@ -894,6 +904,9 @@ focused item. If \a delay is larger than 0, the test will wait for \a delay milliseconds. + The event will be sent to the TestCase window or, in case of multiple windows, + to the current active window. See \l QGuiApplication::focusWindow() for more details. + \sa keyPress(), keyClick() */ function keyRelease(key, modifiers, delay) { @@ -917,6 +930,9 @@ focused item. If \a delay is larger than 0, the test will wait for \a delay milliseconds. + The event will be sent to the TestCase window or, in case of multiple windows, + to the current active window. See \l QGuiApplication::focusWindow() for more details. + \sa keyPress(), keyRelease() */ function keyClick(key, modifiers, delay) { @@ -950,6 +966,9 @@ \sa mouseRelease(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseDrag(), mouseWheel() */ function mousePress(item, x, y, button, modifiers, delay) { + if (!item) + qtest_fail("No item given to mousePress", 1) + if (button === undefined) button = Qt.LeftButton if (modifiers === undefined) @@ -981,6 +1000,9 @@ \sa mousePress(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseDrag(), mouseWheel() */ function mouseRelease(item, x, y, button, modifiers, delay) { + if (!item) + qtest_fail("No item given to mouseRelease", 1) + if (button === undefined) button = Qt.LeftButton if (modifiers === undefined) @@ -1014,6 +1036,9 @@ \sa mousePress(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseRelease(), mouseWheel() */ function mouseDrag(item, x, y, dx, dy, button, modifiers, delay) { + if (!item) + qtest_fail("No item given to mouseDrag", 1) + if (item.x === undefined || item.y === undefined) return if (button === undefined) @@ -1061,6 +1086,9 @@ \sa mousePress(), mouseRelease(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseDrag(), mouseWheel() */ function mouseClick(item, x, y, button, modifiers, delay) { + if (!item) + qtest_fail("No item given to mouseClick", 1) + if (button === undefined) button = Qt.LeftButton if (modifiers === undefined) @@ -1092,6 +1120,9 @@ \sa mouseDoubleClickSequence(), mousePress(), mouseRelease(), mouseClick(), mouseMove(), mouseDrag(), mouseWheel() */ function mouseDoubleClick(item, x, y, button, modifiers, delay) { + if (!item) + qtest_fail("No item given to mouseDoubleClick", 1) + if (button === undefined) button = Qt.LeftButton if (modifiers === undefined) @@ -1130,6 +1161,9 @@ \sa mouseDoubleClick(), mousePress(), mouseRelease(), mouseClick(), mouseMove(), mouseDrag(), mouseWheel() */ function mouseDoubleClickSequence(item, x, y, button, modifiers, delay) { + if (!item) + qtest_fail("No item given to mouseDoubleClickSequence", 1) + if (button === undefined) button = Qt.LeftButton if (modifiers === undefined) @@ -1159,6 +1193,9 @@ \sa mousePress(), mouseRelease(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseDrag(), mouseWheel() */ function mouseMove(item, x, y, delay, buttons) { + if (!item) + qtest_fail("No item given to mouseMove", 1) + if (delay == undefined) delay = -1 if (buttons == undefined) @@ -1184,6 +1221,9 @@ \sa mousePress(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseRelease(), mouseDrag(), QWheelEvent::angleDelta() */ function mouseWheel(item, x, y, xDelta, yDelta, buttons, modifiers, delay) { + if (!item) + qtest_fail("No item given to mouseWheel", 1) + if (delay == undefined) delay = -1 if (buttons == undefined) Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtWebChannel/libdeclarative_webchannel.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtWebChannel/libdeclarative_webchannel.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/experimental/libqtwebengineexperimentalplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/experimental/libqtwebengineexperimentalplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/experimental/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/experimental/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/experimental/qmldir 2015-06-26 09:55:07.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/experimental/qmldir 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -module QtWebEngine.experimental -plugin qtwebengineexperimentalplugin -typeinfo plugins.qmltypes Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/libqtwebengineplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/libqtwebengineplugin.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/plugins.qmltypes 2015-06-26 09:55:07.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/plugins.qmltypes 1970-01-01 00:00:00.000000000 +0000 @@ -1,164 +0,0 @@ -import QtQuick.tooling 1.1 - -// This file describes the plugin-supplied types contained in the library. -// It is used for QML tooling purposes only. -// -// This file was auto-generated by: -// 'qmlplugindump -noinstantiate -nonrelocatable QtWebEngine 1.0' - -Module { - Component { - name: "QQuickWebEngineLoadRequest" - prototype: "QObject" - exports: ["QtWebEngine/WebEngineLoadRequest 1.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - Property { name: "url"; type: "QUrl"; isReadonly: true } - Property { name: "status"; type: "QQuickWebEngineView::LoadStatus"; isReadonly: true } - Property { name: "errorString"; type: "string"; isReadonly: true } - Property { name: "errorDomain"; type: "QQuickWebEngineView::ErrorDomain"; isReadonly: true } - Property { name: "errorCode"; type: "int"; isReadonly: true } - } - Component { - name: "QQuickWebEngineNavigationRequest" - prototype: "QObject" - exports: ["QtWebEngine/WebEngineNavigationRequest 1.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - Property { name: "url"; type: "QUrl"; isReadonly: true } - Property { name: "isMainFrame"; type: "bool"; isReadonly: true } - Property { name: "action"; type: "QQuickWebEngineView::NavigationRequestAction" } - Property { - name: "navigationType" - type: "QQuickWebEngineView::NavigationType" - isReadonly: true - } - } - Component { - name: "QQuickWebEngineNewViewRequest" - prototype: "QObject" - exports: ["QtWebEngine/WebEngineNewViewRequest 1.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - Property { - name: "destination" - type: "QQuickWebEngineView::NewViewDestination" - isReadonly: true - } - Property { name: "userInitiated"; type: "bool"; isReadonly: true } - Method { - name: "openIn" - Parameter { name: "view"; type: "QQuickWebEngineView"; isPointer: true } - } - } - Component { - name: "QQuickWebEngineView" - defaultProperty: "data" - prototype: "QQuickItem" - exports: ["QtWebEngine/WebEngineView 1.0"] - exportMetaObjectRevisions: [0] - Enum { - name: "NavigationRequestAction" - values: { - "AcceptRequest": 0, - "IgnoreRequest": 255 - } - } - Enum { - name: "NavigationType" - values: { - "LinkClickedNavigation": 0, - "TypedNavigation": 1, - "FormSubmittedNavigation": 2, - "BackForwardNavigation": 3, - "ReloadNavigation": 4, - "OtherNavigation": 5 - } - } - Enum { - name: "LoadStatus" - values: { - "LoadStartedStatus": 0, - "LoadStoppedStatus": 1, - "LoadSucceededStatus": 2, - "LoadFailedStatus": 3 - } - } - Enum { - name: "ErrorDomain" - values: { - "NoErrorDomain": 0, - "InternalErrorDomain": 1, - "ConnectionErrorDomain": 2, - "CertificateErrorDomain": 3, - "HttpErrorDomain": 4, - "FtpErrorDomain": 5, - "DnsErrorDomain": 6 - } - } - Enum { - name: "NewViewDestination" - values: { - "NewViewInWindow": 0, - "NewViewInTab": 1, - "NewViewInDialog": 2 - } - } - Enum { - name: "JavaScriptConsoleMessageLevel" - values: { - "InfoMessageLevel": 0, - "WarningMessageLevel": 1, - "ErrorMessageLevel": 2 - } - } - Property { name: "url"; type: "QUrl" } - Property { name: "icon"; type: "QUrl"; isReadonly: true } - Property { name: "loading"; type: "bool"; isReadonly: true } - Property { name: "loadProgress"; type: "int"; isReadonly: true } - Property { name: "title"; type: "string"; isReadonly: true } - Property { name: "canGoBack"; type: "bool"; isReadonly: true } - Property { name: "canGoForward"; type: "bool"; isReadonly: true } - Signal { - name: "loadingChanged" - Parameter { name: "loadRequest"; type: "QQuickWebEngineLoadRequest"; isPointer: true } - } - Signal { - name: "linkHovered" - Parameter { name: "hoveredUrl"; type: "QUrl" } - } - Signal { - name: "navigationRequested" - Parameter { name: "request"; type: "QQuickWebEngineNavigationRequest"; isPointer: true } - } - Signal { - name: "javaScriptConsoleMessage" - Parameter { name: "level"; type: "JavaScriptConsoleMessageLevel" } - Parameter { name: "message"; type: "string" } - Parameter { name: "lineNumber"; type: "int" } - Parameter { name: "sourceID"; type: "string" } - } - Method { - name: "runJavaScript" - Parameter { type: "string" } - Parameter { type: "QJSValue" } - } - Method { - name: "runJavaScript" - Parameter { type: "string" } - } - Method { - name: "loadHtml" - Parameter { name: "html"; type: "string" } - Parameter { name: "baseUrl"; type: "QUrl" } - } - Method { - name: "loadHtml" - Parameter { name: "html"; type: "string" } - } - Method { name: "goBack" } - Method { name: "goForward" } - Method { name: "reload" } - Method { name: "stop" } - } -} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/qmldir 2015-06-26 09:55:07.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/qmldir 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -module QtWebEngine -plugin qtwebengineplugin -typeinfo plugins.qmltypes diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/AlertDialog.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/AlertDialog.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/AlertDialog.qml 2015-06-26 09:55:07.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/AlertDialog.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Dialogs 1.2 - -MessageDialog { - icon: StandardIcon.Information -} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/ConfirmDialog.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/ConfirmDialog.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/ConfirmDialog.qml 2015-06-26 09:55:07.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/ConfirmDialog.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Dialogs 1.1 - -MessageDialog { - icon: StandardIcon.Question - standardButtons: StandardButton.Ok | StandardButton.Cancel -} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/FilePicker.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/FilePicker.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/FilePicker.qml 2015-06-26 09:55:07.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/FilePicker.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick.Dialogs 1.1 - -FileDialog { - - signal filesSelected(var fileList); - - onAccepted: { - filesSelected(fileUrls); - } -} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/MenuItem.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/MenuItem.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/MenuItem.qml 2015-06-26 09:55:07.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/MenuItem.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.5 -import QtQuick.Controls 1.4 as Controls - -Controls.MenuItem { } - diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/Menu.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/Menu.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/Menu.qml 2015-06-26 09:55:07.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/Menu.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.5 -import QtQuick.Controls 1.4 as Controls - -Controls.Menu { - signal done() - - // Use private API for now - onAboutToHide: done(); -} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/MenuSeparator.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/MenuSeparator.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/MenuSeparator.qml 2015-06-26 09:55:07.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/MenuSeparator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.5 -import QtQuick.Controls 1.4 as Controls - -Controls.MenuSeparator { } diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/MessageBubble.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/MessageBubble.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/MessageBubble.qml 2015-06-26 09:55:07.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/MessageBubble.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,147 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.5 - -Item { - id: bubble - - width: 1 - height: 1 - - property int maxWidth: 0 - property string mainText: ""; - property string subText: ""; - - property int border: 1 - - property int arrowWidth: 18 - property int arrowHeight: 18 - property int arrowOffset: 18 - - property int marginLeft: border + 8 - property int marginTop: border + arrowHeight + 6 - property int marginRight: border + 8 - property int marginBottom: border + 6 - - Column { - id: messageColumn - - x: bubble.marginLeft - y: bubble.marginTop - z: 1 - - spacing: 5 - - Text { - id: message - width: bubble.maxWidth - - wrapMode: Text.WordWrap - elide: Text.ElideNone - clip: true - - font.pointSize: subMessage.font.pointSize + 4 - - text: bubble.mainText - } - - Text { - id: subMessage - width: bubble.maxWidth - - wrapMode: Text.WordWrap - elide: Text.ElideNone - clip: true - - text: bubble.subText - } - } - - Canvas { - id: bubbleCanvas - - property int textWidth: Math.min(bubble.maxWidth, Math.max(message.paintedWidth, subMessage.paintedWidth)) - property int textHeight: message.paintedHeight + (subMessage.paintedWidth > 0 ? (messageColumn.spacing + subMessage.paintedHeight) : 0) - - width: textWidth + bubble.marginLeft + bubble.marginRight - height: textHeight + bubble.marginTop + bubble.marginBottom - - property int cornerRadius: 7 - - property int messageBoxLeft: 0 - property int messageBoxTop: bubble.arrowHeight - property int messageBoxRight: width - border - property int messageBoxBottom: height - border - - onPaint: { - var ctx = getContext("2d") - - ctx.lineWidth = bubble.border - ctx.strokeStyle = "#555" - ctx.fillStyle = "#ffffe1" - - ctx.beginPath() - - ctx.moveTo(messageBoxLeft + cornerRadius, messageBoxTop) - - // Arrow - ctx.lineTo(messageBoxLeft + bubble.arrowOffset, messageBoxTop) - ctx.lineTo(messageBoxLeft + bubble.arrowOffset, messageBoxTop - bubble.arrowHeight) - ctx.lineTo(messageBoxLeft + bubble.arrowOffset + bubble.arrowWidth, messageBoxTop) - - // Message Box - ctx.lineTo(messageBoxRight - cornerRadius, messageBoxTop) - ctx.quadraticCurveTo(messageBoxRight, messageBoxTop, messageBoxRight, messageBoxTop + cornerRadius) - ctx.lineTo(messageBoxRight, messageBoxBottom - cornerRadius) - ctx.quadraticCurveTo(messageBoxRight, messageBoxBottom, messageBoxRight - cornerRadius, messageBoxBottom) - ctx.lineTo(messageBoxLeft + cornerRadius, messageBoxBottom) - ctx.quadraticCurveTo(messageBoxLeft, messageBoxBottom, messageBoxLeft, messageBoxBottom - cornerRadius) - ctx.lineTo(messageBoxLeft, messageBoxTop + cornerRadius) - ctx.quadraticCurveTo(messageBoxLeft, messageBoxTop, messageBoxLeft + cornerRadius, messageBoxTop) - - ctx.closePath() - - ctx.fill() - ctx.stroke() - } - - onPainted: { - bubble.width = bubbleCanvas.width - bubble.height = bubbleCanvas.height - } - } -} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/PromptDialog.qml shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/PromptDialog.qml --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/PromptDialog.qml 2015-06-26 09:55:07.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/PromptDialog.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// FIXME: prompt missing in Qt Quick Dialogs atm. Make our own for now. -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.0 -import QtQuick 2.5 - -ApplicationWindow { - signal input(string text); - signal accepted; - signal rejected; - property alias text: message.text; - property alias prompt: field.text; - - width: 350 - height: 100 - flags: Qt.Dialog - - function open() { - show(); - } - - ColumnLayout { - anchors.fill: parent; - anchors.margins: 4; - Text { - id: message; - Layout.fillWidth: true; - } - TextField { - id:field; - Layout.fillWidth: true; - } - RowLayout { - Layout.alignment: Qt.AlignRight - spacing: 8; - Button { - text: "OK" - onClicked: { - input(field.text) - accepted(); - close(); - destroy(); - } - } - Button { - text: "Cancel" - onClicked: { - rejected(); - close(); - destroy(); - } - } - } - } - -} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/qmldir 2015-06-26 09:55:07.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebEngine/UIDelegates/qmldir 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -module QtWebEngine.UIDelegates -AlertDialog 1.0 AlertDialog.qml -ConfirmDialog 1.0 ConfirmDialog.qml -FilePicker 1.0 FilePicker.qml -PromptDialog 1.0 PromptDialog.qml -Menu 1.0 Menu.qml -MenuItem 1.0 MenuItem.qml -MenuSeparator 1.0 MenuSeparator.qml Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtWebKit/libqmlwebkitplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtWebKit/libqmlwebkitplugin.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtWebSockets/libdeclarative_qmlwebsockets.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtWebSockets/libdeclarative_qmlwebsockets.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebSockets/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtWebSockets/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebSockets/plugins.qmltypes 2015-06-26 09:56:18.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebSockets/plugins.qmltypes 2016-05-12 10:12:26.000000000 +0000 @@ -4,7 +4,7 @@ // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -notrelocatable QtWebSockets 1.0' +// 'qmlplugindump -nonrelocatable QtWebSockets 1.0' Module { dependencies: [] @@ -56,7 +56,7 @@ exportMetaObjectRevisions: [0] Property { name: "url"; type: "QUrl"; isReadonly: true } Property { name: "host"; type: "string" } - Property { name: "port"; type: "ushort" } + Property { name: "port"; type: "int" } Property { name: "name"; type: "string" } Property { name: "errorString"; type: "string"; isReadonly: true } Property { name: "listen"; type: "bool" } @@ -75,7 +75,7 @@ } Signal { name: "portChanged" - Parameter { name: "port"; type: "ushort" } + Parameter { name: "port"; type: "int" } } Signal { name: "nameChanged" Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qml/QtWebView/libdeclarative_webview.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qml/QtWebView/libdeclarative_webview.so differ diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebView/plugins.qmltypes shotcut-17.01.01/Shotcut.app/lib/qml/QtWebView/plugins.qmltypes --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebView/plugins.qmltypes 2015-06-25 15:28:42.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebView/plugins.qmltypes 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -import QtQuick.tooling 1.1 - -// This file describes the plugin-supplied types contained in the library. -// It is used for QML tooling purposes only. -// -// This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtWebView 1.0' - -Module { - Component { - name: "QQuickViewController" - defaultProperty: "data" - prototype: "QQuickItem" - Method { - name: "onWindowChanged" - Parameter { name: "window"; type: "QQuickWindow"; isPointer: true } - } - Method { name: "onVisibleChanged" } - } - Component { - name: "QQuickWebView" - defaultProperty: "data" - prototype: "QQuickViewController" - exports: ["QtWebView/WebView 1.0"] - exportMetaObjectRevisions: [0] - Enum { - name: "LoadStatus" - values: { - "LoadStartedStatus": 0, - "LoadStoppedStatus": 1, - "LoadSucceededStatus": 2, - "LoadFailedStatus": 3 - } - } - Property { name: "url"; type: "QUrl" } - Property { name: "loading"; type: "bool"; isReadonly: true } - Property { name: "loadProgress"; type: "int"; isReadonly: true } - Property { name: "title"; type: "string"; isReadonly: true } - Property { name: "canGoBack"; type: "bool"; isReadonly: true } - Property { name: "canGoForward"; type: "bool"; isReadonly: true } - Signal { - name: "loadingChanged" - revision: 1 - Parameter { name: "loadRequest"; type: "QQuickWebViewLoadRequest"; isPointer: true } - } - Method { name: "goBack" } - Method { name: "goForward" } - Method { name: "reload" } - Method { name: "stop" } - Method { - name: "loadHtml" - revision: 1 - Parameter { name: "html"; type: "string" } - Parameter { name: "baseUrl"; type: "QUrl" } - } - Method { - name: "loadHtml" - revision: 1 - Parameter { name: "html"; type: "string" } - } - Method { - name: "runJavaScript" - revision: 1 - Parameter { name: "script"; type: "string" } - Parameter { name: "callback"; type: "QJSValue" } - } - Method { - name: "runJavaScript" - revision: 1 - Parameter { name: "script"; type: "string" } - } - } - Component { - name: "QQuickWebViewLoadRequest" - prototype: "QObject" - exports: ["QtWebView/WebViewLoadRequest 1.1"] - isCreatable: false - exportMetaObjectRevisions: [0] - Property { name: "url"; type: "QUrl"; isReadonly: true } - Property { name: "status"; type: "QQuickWebView::LoadStatus"; isReadonly: true } - Property { name: "errorString"; type: "string"; isReadonly: true } - } -} diff -Nru shotcut-16.07.01/Shotcut.app/lib/qml/QtWebView/qmldir shotcut-17.01.01/Shotcut.app/lib/qml/QtWebView/qmldir --- shotcut-16.07.01/Shotcut.app/lib/qml/QtWebView/qmldir 2015-06-25 15:28:42.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/lib/qml/QtWebView/qmldir 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -module QtWebView -plugin declarative_webview -typeinfo plugins.qmltypes -classname QWebViewModule Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/generic/libqevdevkeyboardplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/generic/libqevdevkeyboardplugin.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/generic/libqevdevmouseplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/generic/libqevdevmouseplugin.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/generic/libqevdevtabletplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/generic/libqevdevtabletplugin.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/generic/libqevdevtouchplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/generic/libqevdevtouchplugin.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/generic/libqtuiotouchplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/generic/libqtuiotouchplugin.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/iconengines/libqsvgicon.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/iconengines/libqsvgicon.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/imageformats/libqdds.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/imageformats/libqdds.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/imageformats/libqgif.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/imageformats/libqgif.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/imageformats/libqicns.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/imageformats/libqicns.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/imageformats/libqico.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/imageformats/libqico.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/imageformats/libqjp2.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/imageformats/libqjp2.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/imageformats/libqjpeg.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/imageformats/libqjpeg.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/imageformats/libqmng.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/imageformats/libqmng.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/imageformats/libqsvg.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/imageformats/libqsvg.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/imageformats/libqtga.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/imageformats/libqtga.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/imageformats/libqtiff.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/imageformats/libqtiff.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/imageformats/libqwbmp.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/imageformats/libqwbmp.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/imageformats/libqwebp.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/imageformats/libqwebp.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/mediaservice/libgstaudiodecoder.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/mediaservice/libgstaudiodecoder.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/mediaservice/libgstcamerabin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/mediaservice/libgstcamerabin.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/mediaservice/libgstmediacapture.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/mediaservice/libgstmediacapture.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/mediaservice/libgstmediaplayer.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/mediaservice/libgstmediaplayer.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/mediaservice/libqtmedia_audioengine.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/mediaservice/libqtmedia_audioengine.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/platforminputcontexts/libcomposeplatforminputcontextplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/platforminputcontexts/libcomposeplatforminputcontextplugin.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/platforminputcontexts/libibusplatforminputcontextplugin.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/platforminputcontexts/libibusplatforminputcontextplugin.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/platforms/libqeglfs.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/platforms/libqeglfs.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/platforms/libqlinuxfb.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/platforms/libqlinuxfb.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/platforms/libqminimalegl.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/platforms/libqminimalegl.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/platforms/libqminimal.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/platforms/libqminimal.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/platforms/libqoffscreen.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/platforms/libqoffscreen.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/platforms/libqwayland-egl.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/platforms/libqwayland-egl.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/platforms/libqwayland-generic.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/platforms/libqwayland-generic.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/platforms/libqxcb.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/platforms/libqxcb.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/platformthemes/libqgtk2.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/platformthemes/libqgtk2.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/sqldrivers/libqsqlite.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/sqldrivers/libqsqlite.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/xcbglintegrations/libqxcb-egl-integration.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/xcbglintegrations/libqxcb-egl-integration.so differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/lib/qt5/xcbglintegrations/libqxcb-glx-integration.so and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/lib/qt5/xcbglintegrations/libqxcb-glx-integration.so differ diff -Nru shotcut-16.07.01/Shotcut.app/share/ffmpeg/examples/demuxing_decoding.c shotcut-17.01.01/Shotcut.app/share/ffmpeg/examples/demuxing_decoding.c --- shotcut-16.07.01/Shotcut.app/share/ffmpeg/examples/demuxing_decoding.c 2016-07-01 09:41:17.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/ffmpeg/examples/demuxing_decoding.c 2017-01-02 10:40:32.000000000 +0000 @@ -93,10 +93,9 @@ return -1; } - printf("video_frame%s n:%d coded_n:%d pts:%s\n", + printf("video_frame%s n:%d coded_n:%d\n", cached ? "(cached)" : "", - video_frame_count++, frame->coded_picture_number, - av_ts2timestr(frame->pts, &video_dec_ctx->time_base)); + video_frame_count++, frame->coded_picture_number); /* copy decoded frame to destination buffer: * this is required since rawvideo expects non aligned data */ diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/avformat/blacklist.txt shotcut-17.01.01/Shotcut.app/share/mlt/avformat/blacklist.txt --- shotcut-16.07.01/Shotcut.app/share/mlt/avformat/blacklist.txt 2016-07-01 09:43:55.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/avformat/blacklist.txt 2017-01-02 10:43:28.000000000 +0000 @@ -17,6 +17,7 @@ colorbalance copy cover_rect +crop dejudder detelecine fifo diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/core/transition_composite.yml shotcut-17.01.01/Shotcut.app/share/mlt/core/transition_composite.yml --- shotcut-16.07.01/Shotcut.app/share/mlt/core/transition_composite.yml 2016-07-01 09:43:55.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/core/transition_composite.yml 2017-01-02 10:43:28.000000000 +0000 @@ -137,6 +137,15 @@ type: geometry readonly: no mutable: yes + - identifier: sliced_composite + title: Use sliced compositing + description: > + Enabling this option will start sliced processing of picture compositing, i.e. + some parts of picture processed in different thread + type: boolean + default: 0 + mutable: yes + widget: checkbox - identifier: key[F] title: Key frame geometry description: > diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/core/transition_mix.yml shotcut-17.01.01/Shotcut.app/share/mlt/core/transition_mix.yml --- shotcut-16.07.01/Shotcut.app/share/mlt/core/transition_mix.yml 2016-07-01 09:43:55.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/core/transition_mix.yml 2017-01-02 10:43:28.000000000 +0000 @@ -40,10 +40,26 @@ widget: checkbox - identifier: combine - title: Use better mixing algorithm + title: Use an alternative mixing algorithm description: > - Mix using a low pass filter to prevent affecting audio levels. + Mix using a low pass filter to prevent affecting audio levels. However, + this may introduce slight artifacts. This is incompatible with start < 0. type: boolean default: 0 mutable: yes + + - identifier: sum + title: Mix by simply adding samples + description: > + The default mixing algorithm halves the sample values before adding them + to absolutely prevent clipping. However, that affects levels. This + algorithm simply adds samples and may clip. In many real world scenarios, + the signals being mixed typically have headroom in their level and are + rarely correlated and thus often will not clip. Also, one can reduce the + gain and add a limiter on the mixed output prior to integer quantization + to prevent clipping. + This mode is incompatible with start < 0. + type: boolean + default: 0 + mutable: yes diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/decklink/consumer_decklink.yml shotcut-17.01.01/Shotcut.app/share/mlt/decklink/consumer_decklink.yml --- shotcut-16.07.01/Shotcut.app/share/mlt/decklink/consumer_decklink.yml 2016-07-01 09:43:55.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/decklink/consumer_decklink.yml 2017-01-02 10:43:28.000000000 +0000 @@ -91,3 +91,13 @@ description: The model name of each device that provides output. type: string readonly: yes + + - identifier: sliced_swab + title: Use sliced swab operation + description: This option enables multithreaded parallel swab frame data operation + type: boolean + readonly: no + minimum: 0 + maximum: 1 + default: 0 + widget: checkbox diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/gtk2/producer_pango.yml shotcut-17.01.01/Shotcut.app/share/mlt/gtk2/producer_pango.yml --- shotcut-16.07.01/Shotcut.app/share/mlt/gtk2/producer_pango.yml 2016-07-01 09:43:55.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/gtk2/producer_pango.yml 2017-01-02 10:43:28.000000000 +0000 @@ -27,6 +27,18 @@ Environment variable MLT_PANGO_PRODUCER_CACHE could be used to override and increase the size of cached converted images of simultaneous use. + Fontset used by pango producer loaded once. That behavior prevents using new + fonts till process used pango producer been restarted. To force fontmap reload + you need to send signal "fontmap-reload" to pango producer: + { + mlt_profile profile = mlt_profile_init("dv_pal"); + mlt_producer producer = mlt_factory_producer(profile, "pango", NULL); + mlt_events_fire(mlt_producer_properties(producer), "fontmap-reload", NULL, NULL ); + mlt_producer_close(producer); + mlt_profile_close(profile); + }; + + parameters: - identifier: argument title: File @@ -167,6 +179,7 @@ values: - normal - italic + - oblique default: normal readonly: no mutable: yes @@ -252,4 +265,60 @@ default: 0 readonly: no mutable: yes + widget: spinner + + - identifier: line_spacing + title: Sets lines spacing + type: integer + description: > + Sets the amount of spacing between the lines of the layout. + default: 0 + readonly: no + mutable: yes + widget: spinner + + - identifier: stretch + title: Font stretch + type: integer + description: > + The stretch feature of pango's font description. Possible values: + 1 - ULTRA_CONDENSED + 2 - EXTRA_CONDENSED + 3 - CONDENSED + 4 - SEMI_CONDENSED + 5 - NORMAL + 6 - SEMI_EXPANDED + 7 - EXPANDED + 8 - EXTRA_EXPANDED + 9 - ULTRA_EXPANDED + minimum: 0 + maximum: 9 + default: 4 + readonly: no + mutable: yes + widget: spinner + + - identifier: wrap_width + title: Sets the width to wrap to + type: integer + description: > + Sets the width to which the lines of the PangoLayout should wrap. + default: 0 + readonly: no + mutable: yes + widget: spinner + + - identifier: wrap_type + title: Sets the wrap mode + type: integer + description: > + Sets the wrap mode; the wrap mode only has effect if a 'wrap_width' is set. + Possible values: + 0 - wrap lines at word boundaries + 1 - wrap lines at character boundaries + 2 - wrap lines at word boundaries, but fall back to character + boundaries if there is not enough space for a full word + default: 0 + readonly: no + mutable: yes widget: spinner diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/MJPEG shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/MJPEG --- shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/MJPEG 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/MJPEG 2017-01-02 10:43:29.000000000 +0000 @@ -0,0 +1,8 @@ +progressive=1 +f=avi +acodec=pcm_s16le +vcodec=mjpeg +qscale=1 + +meta.preset.extension=avi +meta.preset.note=not lossless, but still high quality diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/MPEG-2 shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/MPEG-2 --- shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/MPEG-2 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/MPEG-2 2017-01-02 10:43:29.000000000 +0000 @@ -0,0 +1,12 @@ +f=mpeg +acodec=ac3 +ab=512k +vcodec=mpeg2video +intra=1 +vb=0 +g=1 +bf=0 +qscale=1 + +meta.preset.extension=mpg +meta.preset.note=a little lossy, but intra-frame only with AC-3 audio diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/MPEG-4 shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/MPEG-4 --- shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/MPEG-4 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/MPEG-4 2017-01-02 10:43:29.000000000 +0000 @@ -0,0 +1,11 @@ +f=avi +acodec=pcm_s16le +vcodec=mpeg4 +qscale=1 +intra=1 +g=1 +vb=0 +bf=0 + +meta.preset.extension=avi +meta.preset.note=somewhat lossy, intra-frame only MPEG-4, with uncompressed audio diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/ProRes shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/ProRes --- shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/ProRes 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/ProRes 2017-01-02 10:43:29.000000000 +0000 @@ -0,0 +1,11 @@ +f=mov +acodec=pcm_s16le +vcodec=prores +vb=0 +g=1 +bf=0 +threads=1 +vprofile=2 + +meta.preset.extension=mov +meta.preset.note=Designed by Apple in California. Set vprofile=1 for LT or =3 for HQ. diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/ProRes-Kostya shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/ProRes-Kostya --- shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/ProRes-Kostya 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/intermediate/ProRes-Kostya 2017-01-02 10:43:29.000000000 +0000 @@ -0,0 +1,10 @@ +f=mov +acodec=pcm_s16le +vcodec=prores_ks +vb=0 +g=1 +bf=0 +vprofile=2 + +meta.preset.extension=mov +meta.preset.note=Use this one for interlaced output. Set vprofile=1 for LT or =3 for HQ. diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/MJPEG shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/MJPEG --- shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/MJPEG 2016-07-01 09:43:55.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/MJPEG 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -progressive=1 -f=avi -acodec=pcm_s16le -vcodec=mjpeg -qscale=1 - -meta.preset.extension=avi -meta.preset.note=not lossless, but still high quality diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/MPEG-2 shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/MPEG-2 --- shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/MPEG-2 2016-07-01 09:43:55.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/MPEG-2 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -f=mpeg -acodec=ac3 -ab=512k -vcodec=mpeg2video -intra=1 -vb=0 -g=1 -bf=0 -qscale=1 - -meta.preset.extension=mpg -meta.preset.note=a little lossy, but intra-frame only with AC-3 audio diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/MPEG-4 shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/MPEG-4 --- shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/MPEG-4 2016-07-01 09:43:55.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/MPEG-4 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -f=avi -acodec=pcm_s16le -vcodec=mpeg4 -qscale=1 -intra=1 -g=1 -vb=0 -bf=0 - -meta.preset.extension=avi -meta.preset.note=somewhat lossy, intra-frame only MPEG-4, with uncompressed audio diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/ProRes shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/ProRes --- shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/ProRes 2016-07-01 09:43:55.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/ProRes 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -f=mov -acodec=pcm_s16le -vcodec=prores -vb=0 -g=1 -bf=0 -threads=1 -vprofile=2 - -meta.preset.extension=mov -meta.preset.note=Designed by Apple in California. Set vprofile=1 for LT or =3 for HQ. diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/ProRes-Kostya shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/ProRes-Kostya --- shotcut-16.07.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/ProRes-Kostya 2016-07-01 09:43:55.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/presets/consumer/avformat/lossless/ProRes-Kostya 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -f=mov -acodec=pcm_s16le -vcodec=prores_ks -vb=0 -g=1 -bf=0 -vprofile=2 - -meta.preset.extension=mov -meta.preset.note=Use this one for interlaced output. Set vprofile=1 for LT or =3 for HQ. diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/qt/filter_qtblend.yml shotcut-17.01.01/Shotcut.app/share/mlt/qt/filter_qtblend.yml --- shotcut-16.07.01/Shotcut.app/share/mlt/qt/filter_qtblend.yml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/qt/filter_qtblend.yml 2017-01-02 10:43:28.000000000 +0000 @@ -0,0 +1,45 @@ +schema_version: 0.1 +type: filter +identifier: qtblend +title: Composite and transform +version: 1 +copyright: Meltytech, LLC +creator: Jean-Baptiste Mardelle +license: LGPLv2.1 +language: en +tags: + - Video +description: > + A filter allowing compositing and transform. + +parameters: + - identifier: rect + title: Rectangle + type: geometry + description: > + Keyframable rectangle specification. + mutable: yes + + - identifier: compositing + title: Composition mode + description: > + Defines which composition operation will be performed (see QPainter CompositionMode for doc). + type: integer + default: 0 + minimum: 0 + maximum: 40 + mutable: yes + widget: spinner + + - identifier: rotation + title: Rotation angle + description: > + Angle for rotation. + type: float + default: 1 + minimum: 0 + maximum: 360 + mutable: yes + widget: spinner + + diff -Nru shotcut-16.07.01/Shotcut.app/share/mlt/qt/transition_qtblend.yml shotcut-17.01.01/Shotcut.app/share/mlt/qt/transition_qtblend.yml --- shotcut-16.07.01/Shotcut.app/share/mlt/qt/transition_qtblend.yml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/mlt/qt/transition_qtblend.yml 2017-01-02 10:43:28.000000000 +0000 @@ -0,0 +1,52 @@ +schema_version: 0.1 +type: transition +identifier: qtblend +title: Composite and transform +version: 1 +copyright: Meltytech, LLC +creator: Jean-Baptiste Mardelle +license: LGPLv2.1 +language: en +tags: + - Video +description: > + A transition allowing compositing and transform. + +parameters: + - identifier: rect + title: Rectangle + type: geometry + description: > + Keyframable rectangle specification. + mutable: yes + + - identifier: distort + title: Ignore aspect ratio + description: > + Determines whether the image aspect ratio will be distorted while scaling + to completely fill the geometry rectangle. + type: boolean + default: 0 + mutable: yes + widget: checkbox + + - identifier: compositing + title: Composition mode + description: > + Defines which composition operation will be performed (see QPainter CompositionMode for doc). + type: integer + default: 0 + minimum: 0 + maximum: 40 + mutable: yes + widget: spinner + + - identifier: rotation + title: Rotation angle + description: > + Angle for rotation. + type: float + default: 1 + minimum: 0 + maximum: 360 + mutable: yes diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/export-edl/export-edl.js shotcut-17.01.01/Shotcut.app/share/shotcut/qml/export-edl/export-edl.js --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/export-edl/export-edl.js 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/export-edl/export-edl.js 2017-01-02 09:43:01.000000000 +0000 @@ -1,34 +1,34 @@ //QML Browserify - original prelude from browser-pack var modules = (function outer (modules, cache, entry) { - var previousRequire = typeof require == "function" && require; - function newRequire(name, jumped){ - if(!cache[name]) { - if(!modules[name]) { - var currentRequire = typeof require == "function" && require; - - if (!jumped && currentRequire) return currentRequire(name, true); - - if (previousRequire) return previousRequire(name, true); - - var err = new Error('Cannot find module \'' + name + '\''); - err.code = 'MODULE_NOT_FOUND'; - throw err; +    var previousRequire = typeof require == "function" && require; +    function newRequire(name, jumped){ +        if(!cache[name]) { +            if(!modules[name]) { +                var currentRequire = typeof require == "function" && require; - } +                if (!jumped && currentRequire) return currentRequire(name, true); - var m = cache[name] = {exports:{}}; - modules[name][0].call(m.exports, function(x){ - var id = modules[name][1][x]; - return newRequire(id ? id : x); - },m,m.exports,outer,modules,cache,entry); - } +                if (previousRequire) return previousRequire(name, true); - return cache[name].exports; - } +                var err = new Error('Cannot find module \'' + name + '\''); +                err.code = 'MODULE_NOT_FOUND'; +                throw err; + +            } + +            var m = cache[name] = {exports:{}}; +            modules[name][0].call(m.exports, function(x){ +                var id = modules[name][1][x]; +                return newRequire(id ? id : x); +            },m,m.exports,outer,modules,cache,entry); +        } + +        return cache[name].exports; +    } - for(var i=0;i> export-edl.js // cat main.js >> export-edl.js -// Then, open in Qt Creator, make a change and save it. This is fixing something -// in the qml-browserify output that is throwing a syntax error. +// See also rebuild.sh (function main(xmlString, options) { var mltxml = new MltXmlParser(xmlString, options); diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/export-edl/main.js shotcut-17.01.01/Shotcut.app/share/shotcut/qml/export-edl/main.js --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/export-edl/main.js 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/export-edl/main.js 2017-01-02 09:43:01.000000000 +0000 @@ -6,8 +6,7 @@ // qml-browserify --globals false -o export-edl.js // cat mlt2edl.js >> export-edl.js // cat main.js >> export-edl.js -// Then, open in Qt Creator, make a change and save it. This is fixing something -// in the qml-browserify output that is throwing a syntax error. +// See also rebuild.sh (function main(xmlString, options) { var mltxml = new MltXmlParser(xmlString, options); diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/export-edl/mlt2edl.js shotcut-17.01.01/Shotcut.app/share/shotcut/qml/export-edl/mlt2edl.js --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/export-edl/mlt2edl.js 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/export-edl/mlt2edl.js 2017-01-02 09:43:01.000000000 +0000 @@ -120,7 +120,7 @@ p.children.forEach(function (event) { if ('length' in event.attr) { var out = self.Timecode(event.attr['length']); - // MLTblacks are 1 frame longer than "out". + // MLT blacks are 1 frame longer than "out". out.subtract(self.Timecode(1)); eventList.push({ 'producer': 'black', @@ -220,7 +220,10 @@ playlist.events.forEach(function(event) { var srcIn = self.Timecode(event.inTime); var srcOut = self.Timecode(event.outTime); - var srcLen = self.Timecode(event.outTime); srcLen.subtract(srcIn); + srcOut.add(self.Timecode(1)); + var srcLen = self.Timecode(event.outTime); + srcLen.add(self.Timecode(1)); + srcLen.subtract(srcIn); // increment program tally progOut.add(srcLen); var reelName = sourceLinks[event.producer].reel_name; diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/export-edl/test-node.js shotcut-17.01.01/Shotcut.app/share/shotcut/qml/export-edl/test-node.js --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/export-edl/test-node.js 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/export-edl/test-node.js 2017-01-02 09:43:01.000000000 +0000 @@ -1,6 +1,6 @@ // Use this to test with node.js during development: // npm install -// node test-test.js /path/to/some.mlt +// node test-node.js /path/to/some.mlt var mlt2edl = require('./mlt2edl.js'); diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/alpha_adjust/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/alpha_adjust/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/alpha_adjust/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/alpha_adjust/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -87,7 +87,6 @@ maximumValue: 100 decimals: 1 suffix: ' %' - spinnerWidth: 80 value: filter.getDouble(paramAmount) * 100 onValueChanged: { filter.set(paramAmount, value / 100) diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_bandpass/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_bandpass/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_bandpass/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_bandpass/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -68,7 +68,7 @@ minimumValue: 5 maximumValue: 21600 suffix: ' Hz' - spinnerWidth: 80 + spinnerWidth: 100 value: filter.getDouble('0') onValueChanged: { filter.set('0', value) @@ -78,15 +78,16 @@ onClicked: sliderCenter.value = 322 } - Label { text: qsTr('Bandwidth') - Layout.alignment: Qt.AlignRight + Label { + text: qsTr('Bandwidth') + Layout.alignment: Qt.AlignRight } SliderSpinner { id: sliderBandwidth minimumValue: 5 maximumValue: 21600 suffix: ' Hz' - spinnerWidth: 80 + spinnerWidth: 100 value: filter.getDouble('1') onValueChanged: { filter.set('1', value) @@ -96,32 +97,34 @@ onClicked: sliderBandwidth.value = 322 } - Label { text: qsTr('Rolloff rate') - Layout.alignment: Qt.AlignRight + Label { + text: qsTr('Rolloff rate') + Layout.alignment: Qt.AlignRight } SliderSpinner { id: sliderStages minimumValue: 1 maximumValue: 10 - spinnerWidth: 80 - value: filter.get('1') + spinnerWidth: 100 + value: filter.get('2') onValueChanged: { - filter.set('1', value) + filter.set('2', value) } } UndoButton { onClicked: sliderStages.value = 1 } - Label { text: qsTr('Dry') - Layout.alignment: Qt.AlignRight + Label { + text: qsTr('Dry') + Layout.alignment: Qt.AlignRight } SliderSpinner { id: sliderWetness minimumValue: 0 maximumValue: 100 decimals: 1 - spinnerWidth: 80 + spinnerWidth: 100 label: qsTr('Wet') suffix: ' %' value: filter.getDouble('wetness') * maximumValue diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_compressor/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_compressor/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_compressor/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_compressor/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -88,7 +88,6 @@ minimumValue: 0 maximumValue: 100 decimals: 1 - spinnerWidth: 80 label: qsTr('Peak') suffix: ' %' value: filter.getDouble('0') * maximumValue @@ -109,7 +108,6 @@ minimumValue: 2 maximumValue: 400 suffix: ' ms' - spinnerWidth: 80 value: filter.getDouble('1') onValueChanged: { filter.set('1', value) @@ -127,7 +125,6 @@ id: sliderRelease minimumValue: 2 maximumValue: 800 - spinnerWidth: 80 suffix: ' ms' value: filter.getDouble('2') onValueChanged: { @@ -148,7 +145,6 @@ minimumValue: -30 maximumValue: 0 decimals: 1 - spinnerWidth: 80 suffix: ' dB' value: filter.getDouble('3') onValueChanged: { @@ -169,7 +165,6 @@ minimumValue: 1 maximumValue: 20 prefix: ' 1:' - spinnerWidth: 80 value: filter.getDouble('4') onValueChanged: { filter.set('4', value) @@ -190,7 +185,6 @@ maximumValue: 10 decimals: 1 suffix: ' dB' - spinnerWidth: 80 value: filter.getDouble('5') onValueChanged: { filter.set('5', value) @@ -211,7 +205,6 @@ maximumValue: 24 decimals: 1 suffix: ' dB' - spinnerWidth: 80 value: filter.getDouble('6') onValueChanged: { filter.set('6', value) diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_delay/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_delay/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_delay/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_delay/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -68,7 +68,6 @@ maximumValue: 4 suffix: ' s' decimals: 2 - spinnerWidth: 80 value: filter.getDouble('0') onValueChanged: { filter.set('0', value) @@ -88,7 +87,6 @@ maximumValue: 0 suffix: ' dB' decimals: 1 - spinnerWidth: 80 value: filter.getDouble('1') onValueChanged: { filter.set('1', value) @@ -107,7 +105,6 @@ minimumValue: 0 maximumValue: 100 decimals: 1 - spinnerWidth: 80 label: qsTr('Wet') suffix: ' %' value: filter.getDouble('wetness') * maximumValue diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_expander/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_expander/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_expander/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_expander/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -75,7 +75,6 @@ minimumValue: 0 maximumValue: 100 decimals: 1 - spinnerWidth: 80 label: qsTr('Peak') suffix: ' %' value: filter.getDouble('0') * maximumValue @@ -96,7 +95,6 @@ minimumValue: 2 maximumValue: 400 suffix: ' ms' - spinnerWidth: 80 value: filter.getDouble('1') onValueChanged: { filter.set('1', value) @@ -114,7 +112,6 @@ id: sliderRelease minimumValue: 2 maximumValue: 800 - spinnerWidth: 80 suffix: ' ms' value: filter.getDouble('2') onValueChanged: { @@ -135,7 +132,6 @@ minimumValue: -30 maximumValue: 0 decimals: 1 - spinnerWidth: 80 suffix: ' dB' value: filter.getDouble('3') onValueChanged: { @@ -156,7 +152,6 @@ minimumValue: 1 maximumValue: 20 prefix: ' 1:' - spinnerWidth: 80 value: filter.getDouble('4') onValueChanged: { filter.set('4', value) @@ -177,7 +172,6 @@ maximumValue: 10 decimals: 1 suffix: ' dB' - spinnerWidth: 80 value: filter.getDouble('5') onValueChanged: { filter.set('5', value) @@ -198,7 +192,6 @@ maximumValue: 0 decimals: 1 suffix: ' dB' - spinnerWidth: 80 value: filter.getDouble('6') onValueChanged: { filter.set('6', value) diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_fadein/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_fadein/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_fadein/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_fadein/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 Meltytech, LLC + * Copyright (c) 2014-2016 Meltytech, LLC * Author: Dan Dennedy * * This program is free software: you can redistribute it and/or modify @@ -45,7 +45,7 @@ Label { text: qsTr('Duration') } TimeSpinner { id: timeSpinner - minimumValue: 1 + minimumValue: 2 maximumValue: 5000 value: filter.getDouble('out') - filter.getDouble('in') + 1 onValueChanged: filter.set('out', filter.getDouble('in') + value - 1) diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_fadeout/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_fadeout/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_fadeout/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_fadeout/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 Meltytech, LLC + * Copyright (c) 2014-2016 Meltytech, LLC * Author: Dan Dennedy * * This program is free software: you can redistribute it and/or modify @@ -45,7 +45,7 @@ Label { text: qsTr('Duration') } TimeSpinner { id: timeSpinner - minimumValue: 1 + minimumValue: 2 maximumValue: 5000 value: filter.getDouble('out') - filter.getDouble('in') + 1 onValueChanged: { diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_gain/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_gain/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_gain/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_gain/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -53,7 +53,6 @@ maximumValue: 24 suffix: ' dB' decimals: 1 - spinnerWidth: 80 value: toDb(filter.getDouble(gainParameter)) onValueChanged: filter.set(gainParameter, fromDb(value)) } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_highpass/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_highpass/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_highpass/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_highpass/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -65,7 +65,6 @@ minimumValue: 5 maximumValue: 21600 suffix: ' Hz' - spinnerWidth: 80 value: filter.getDouble('0') onValueChanged: { filter.set('0', value) @@ -82,7 +81,6 @@ id: sliderStages minimumValue: 1 maximumValue: 10 - spinnerWidth: 80 value: filter.get('1') onValueChanged: { filter.set('1', value) @@ -100,7 +98,6 @@ minimumValue: 0 maximumValue: 100 decimals: 1 - spinnerWidth: 80 label: qsTr('Wet') suffix: ' %' value: filter.getDouble('wetness') * maximumValue diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_limiter/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_limiter/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_limiter/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_limiter/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Meltytech, LLC + * Copyright (c) 2015-2016 Meltytech, LLC * Author: Lauren Dennedy * * This program is free software: you can redistribute it and/or modify @@ -41,7 +41,7 @@ function setControls() { sliderInput.value = filter.getDouble('0') sliderLimit.value = filter.getDouble('1') - sliderRelease.value = filter.get('2') + sliderRelease.value = filter.getDouble('2') } Timer { @@ -81,7 +81,6 @@ maximumValue: 20 suffix: ' dB' decimals: 1 - spinnerWidth: 80 value: filter.getDouble('0') onValueChanged: { filter.set('0', value) @@ -102,7 +101,6 @@ maximumValue: 0 suffix: ' dB' decimals: 1 - spinnerWidth: 80 value: filter.getDouble('1') onValueChanged: { filter.set('1', value) @@ -123,8 +121,7 @@ maximumValue: 2 suffix: ' s' decimals: 2 - spinnerWidth: 80 - value: filter.get('2') + value: filter.getDouble('2') onValueChanged: { filter.set('2', value) } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_lowpass/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_lowpass/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_lowpass/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_lowpass/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -69,7 +69,6 @@ minimumValue: 5 maximumValue: 21600 suffix: ' Hz' - spinnerWidth: 80 value: filter.getDouble('0') onValueChanged: { filter.set('0', value) @@ -87,7 +86,6 @@ id: sliderStages minimumValue: 1 maximumValue: 10 - spinnerWidth: 80 value: filter.get('1') onValueChanged: { filter.set('1', value) @@ -106,7 +104,6 @@ minimumValue: 0 maximumValue: 100 decimals: 1 - spinnerWidth: 80 label: qsTr('Wet') suffix: ' %' value: filter.getDouble('wetness') * maximumValue diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_normalize_1p/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_normalize_1p/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_normalize_1p/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_normalize_1p/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -43,7 +43,7 @@ function setControls() { programSlider.value = filter.getDouble('target_loudness') - windowSlider.value = filter.get('window') + windowSlider.value = filter.getDouble('window') maxgainSlider.value = filter.getDouble('max_gain') mingainSlider.value = filter.getDouble('min_gain') maxrateSlider.value = filter.getDouble('max_rate') @@ -59,8 +59,8 @@ property int _prevResetVal: 0 property int _resetCountDown: 0 onTriggered: { - loudnessGauge.value = filter.get('in_loudness') - gainGauge.value = filter.get('out_gain') + loudnessGauge.value = filter.getDouble('in_loudness') + gainGauge.value = filter.getDouble('out_gain') if( filter.get('reset_count') != _prevResetVal ) { _prevResetVal = filter.get('reset_count') _resetCountDown = 1000 / timer.interval diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_notch/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_notch/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_notch/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_notch/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -68,7 +68,6 @@ minimumValue: 5 maximumValue: 21600 suffix: ' Hz' - spinnerWidth: 80 value: filter.getDouble('0') onValueChanged: { filter.set('0', value) @@ -78,15 +77,15 @@ onClicked: sliderCenter.value = 322 } - Label { text: qsTr('Bandwidth') - Layout.alignment: Qt.AlignRight + Label { + text: qsTr('Bandwidth') + Layout.alignment: Qt.AlignRight } SliderSpinner { id: sliderBandwidth minimumValue: 5 maximumValue: 21600 suffix: ' Hz' - spinnerWidth: 80 value: filter.getDouble('1') onValueChanged: { filter.set('1', value) @@ -96,32 +95,32 @@ onClicked: sliderBandwidth.value = 322 } - Label { text: qsTr('Rolloff rate') - Layout.alignment: Qt.AlignRight + Label { + text: qsTr('Rolloff rate') + Layout.alignment: Qt.AlignRight } SliderSpinner { id: sliderStages minimumValue: 1 maximumValue: 10 - spinnerWidth: 80 - value: filter.get('1') + value: filter.get('2') onValueChanged: { - filter.set('1', value) + filter.set('2', value) } } UndoButton { onClicked: sliderStages.value = 1 } - Label { text: qsTr('Dry') - Layout.alignment: Qt.AlignRight + Label { + text: qsTr('Dry') + Layout.alignment: Qt.AlignRight } SliderSpinner { id: sliderWetness minimumValue: 0 maximumValue: 100 decimals: 1 - spinnerWidth: 80 label: qsTr('Wet') suffix: ' %' value: filter.getDouble('wetness') * maximumValue diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_reverb/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_reverb/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/audio_reverb/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/audio_reverb/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -114,14 +114,13 @@ Label { text: qsTr('Room size') Layout.alignment: Qt.AlignRight - ToolTip {text: qsTr('The size of the room, in meters. Excessivly large, and excessively small values will make it sound a bit unrealistic.Values of around 30 sound good.')} + ToolTip {text: qsTr('The size of the room, in meters. Excessively large, and excessively small values will make it sound a bit unrealistic. Values of around 30 sound good.')} } SliderSpinner { id: sliderRoom minimumValue: 1 maximumValue: 300 suffix: ' m' - spinnerWidth: 80 value: filter.getDouble('0') onValueChanged: { filter.set('0', value) @@ -141,7 +140,6 @@ maximumValue: 30 decimals: 1 suffix: ' s' - spinnerWidth: 80 value: filter.getDouble('1') onValueChanged: { filter.set('1', value) @@ -161,7 +159,6 @@ minimumValue: 0 maximumValue: 100 decimals: 1 - spinnerWidth: 80 suffix: ' %' value: filter.getDouble('2') * maximumValue onValueChanged: { @@ -182,7 +179,6 @@ minimumValue: 0 maximumValue: 100 decimals: 1 - spinnerWidth: 80 suffix: ' %' value: filter.getDouble('3') * maximumValue onValueChanged: { @@ -204,7 +200,6 @@ maximumValue: 0 suffix: ' dB' decimals: 1 - spinnerWidth: 80 value: filter.getDouble('4') onValueChanged: { filter.set('4', value) @@ -224,7 +219,6 @@ minimumValue: -70 maximumValue: 0 suffix: ' dB' - spinnerWidth: 80 value: filter.getDouble('5') onValueChanged: { filter.set('5', value) @@ -245,7 +239,6 @@ maximumValue: 0 decimals: 1 suffix: ' dB' - spinnerWidth: 80 value: filter.getDouble('6') onValueChanged: { filter.set('6', value) diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/bluescreen0r/meta.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/bluescreen0r/meta.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/bluescreen0r/meta.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/bluescreen0r/meta.qml 2017-01-02 09:43:01.000000000 +0000 @@ -24,4 +24,5 @@ name: qsTr("Chroma Key: Simple") mlt_service: 'frei0r.bluescreen0r' qml: 'ui.qml' + allowMultiple: false } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/bluescreen0r/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/bluescreen0r/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/bluescreen0r/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/bluescreen0r/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -84,7 +84,6 @@ maximumValue: 100 decimals: 1 suffix: ' %' - spinnerWidth: 80 value: filter.getDouble(distanceParam) * 100 onValueChanged: filter.set(distanceParam, value / 100) } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/brightness/ui_movit.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/brightness/ui_movit.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/brightness/ui_movit.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/brightness/ui_movit.qml 2017-01-02 09:43:01.000000000 +0000 @@ -47,7 +47,6 @@ minimumValue: 0.0 maximumValue: 200.0 decimals: 1 - spinnerWidth: 80 suffix: ' %' onValueChanged: filter.set("opacity", value / 100.0) } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/brightness/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/brightness/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/brightness/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/brightness/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -46,7 +46,6 @@ minimumValue: 0.0 maximumValue: 200.0 decimals: 1 - spinnerWidth: 80 suffix: ' %' onValueChanged: filter.set("level", value / 100.0) } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/contrast/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/contrast/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/contrast/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/contrast/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -28,7 +28,7 @@ height: 50 function setControls() { - contrastSlider.value = filter.getDouble("gamma_r") / gammaFactor * 100.0 + contrastSlider.value = filter.getDouble("gain_r") / gainFactor * 100.0 } Component.onCompleted: { @@ -71,7 +71,6 @@ minimumValue: 0 maximumValue: 100 decimals: 1 - spinnerWidth: 80 suffix: ' %' onValueChanged: { var v = value / 100.0 diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/dynamictext/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/dynamictext/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/dynamictext/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/dynamictext/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -36,7 +36,7 @@ if (application.OS === 'Windows') filter.set('family', 'Verdana') filter.set('fgcolour', '#ffffffff') - filter.set('bgcolour', '#20000000') + filter.set('bgcolour', '#00000000') filter.set('olcolour', '#ff000000') filter.set('weight', 500) diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/fadeout_movit/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/fadeout_movit/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/fadeout_movit/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/fadeout_movit/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 Meltytech, LLC + * Copyright (c) 2014-2016 Meltytech, LLC * Author: Dan Dennedy * * This program is free software: you can redistribute it and/or modify @@ -48,7 +48,7 @@ Label { text: qsTr('Duration') } TimeSpinner { id: timeSpinner - minimumValue: 1 + minimumValue: 2 maximumValue: 5000 value: filter.getDouble('out') - filter.getDouble('in') + 1 onValueChanged: filter.set('in', filter.getDouble('out') - duration + 1) diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/keyspillm0pup/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/keyspillm0pup/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/keyspillm0pup/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/keyspillm0pup/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -173,7 +173,6 @@ maximumValue: 100 decimals: 1 suffix: ' %' - spinnerWidth: 80 value: filter.getDouble(toleranceParam) * 100 onValueChanged: filter.set(toleranceParam, value / 100) } @@ -191,7 +190,6 @@ maximumValue: 100 decimals: 1 suffix: ' %' - spinnerWidth: 80 value: filter.getDouble(slopeParam) * 100 onValueChanged: filter.set(slopeParam, value / 100) } @@ -209,7 +207,6 @@ maximumValue: 100 decimals: 1 suffix: ' %' - spinnerWidth: 80 value: filter.getDouble(hueGateParam) * 100 onValueChanged: filter.set(hueGateParam, value / 100) } @@ -227,7 +224,6 @@ maximumValue: 100 decimals: 1 suffix: ' %' - spinnerWidth: 80 value: filter.getDouble(saturationParam) * 100 onValueChanged: filter.set(saturationParam, value / 100) } @@ -259,7 +255,6 @@ maximumValue: 100 decimals: 1 suffix: ' %' - spinnerWidth: 80 value: filter.getDouble(amount1Param) * 100 onValueChanged: filter.set(amount1Param, value / 100) } @@ -291,7 +286,6 @@ maximumValue: 100 decimals: 1 suffix: ' %' - spinnerWidth: 80 value: filter.getDouble(amount2Param) * 100 onValueChanged: filter.set(amount2Param, value / 100) } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/lenscorrection/meta.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/lenscorrection/meta.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/lenscorrection/meta.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/lenscorrection/meta.qml 2017-01-02 09:43:01.000000000 +0000 @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2016 Meltytech, LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.0 +import org.shotcut.qml 1.0 + +Metadata { + type: Metadata.Filter + name: qsTr("Lens Correction") + mlt_service: 'frei0r.lenscorrection' + qml: 'ui.qml' +} diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/lenscorrection/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/lenscorrection/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/lenscorrection/ui.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/lenscorrection/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -0,0 +1,154 @@ +/* + * Copyright (c) 2016 Meltytech, LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.2 +import QtQuick.Controls 1.1 +import QtQuick.Layouts 1.1 +import Shotcut.Controls 1.0 +import QtQuick.Controls.Styles 1.1 + +Item { + property string xCent: '0' + property double xCentd: 0.5 + property string yCent: '1' + property double yCentd: 0.5 + property string centCor: '2' + property double centCord: 0.5 + property string edgeCor: '3' + property double edgeCord: 0.5 + + property var defaultParameters: [xCent, yCent, centCor, edgeCor] + + width: 300 + height: 150 + Component.onCompleted: { + presetItem.parameters = defaultParameters + if (filter.isNew) { + // Set default parameter values + filter.set(xCent, xCentd) + filter.set(yCent, yCentd) + filter.set(centCor, centCord) + filter.set(edgeCor, edgeCord) + filter.savePreset(defaultParameters) + } + xSlider.value = filter.getDouble(xCent) + ySlider.value = filter.getDouble(yCent) + cCorSlider.value = filter.getDouble(centCor) + eCorSlider.value = filter.getDouble(edgeCor) + } + + + GridLayout { + columns: 3 + anchors.fill: parent + anchors.margins: 8 + + Label { + text: qsTr('Preset') + Layout.alignment: Qt.AlignRight + } + Preset { + id: presetItem + Layout.columnSpan: 2 + onPresetSelected: { + xSlider.value = filter.getDouble(xCent) + ySlider.value = filter.getDouble(yCent) + cCorSlider.value = filter.getDouble(centCor) + eCorSlider.value = filter.getDouble(edgeCor) + } + } + + // Row 1 + Label { + text: qsTr('X Center') + Layout.alignment: Qt.AlignRight + } + SliderSpinner { + id: xSlider + minimumValue: 0 + maximumValue: 1 + decimals: 3 + suffix: '' + value: filter.getDouble(xCent) + onValueChanged: filter.set(xCent, value) + } + UndoButton { + onClicked: xSlider.value = xCentd + } + + // Row 2 + Label { + text: qsTr('Y Center') + Layout.alignment: Qt.AlignRight + } + SliderSpinner { + id: ySlider + minimumValue: 0 + maximumValue: 1 + decimals: 3 + suffix: '' + value: filter.getDouble(yCent) + onValueChanged: filter.set(yCent, value) + + } + UndoButton { + onClicked: ySlider.value = yCentd + } + + // Row 3 + Label { + text: qsTr('Correction at Center') + Layout.alignment: Qt.AlignRight + } + SliderSpinner { + id: cCorSlider + minimumValue: 0 + maximumValue: 1 + decimals: 3 + suffix: '' + value: filter.getDouble(centCor) + onValueChanged: filter.set(centCor, value) + + } + UndoButton { + onClicked: cCorSlider.value = centCord + } + + // Row 4 + Label { + text: qsTr('Correction at Edges') + Layout.alignment: Qt.AlignRight + } + SliderSpinner { + id: eCorSlider + minimumValue: 0 + maximumValue: 1 + decimals: 3 + suffix: '' + value: filter.getDouble(edgeCor) + onValueChanged: filter.set(edgeCor, value) + + } + UndoButton { + onClicked: eCorSlider.value = edgeCord + } + + Item { + Layout.fillHeight: true + } + } +} diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/lut3d/meta.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/lut3d/meta.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/lut3d/meta.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/lut3d/meta.qml 2017-01-02 09:43:01.000000000 +0000 @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2016 Meltytech, LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.0 +import org.shotcut.qml 1.0 + +Metadata { + type: Metadata.Filter + name: qsTr("LUT (3D)") + mlt_service: 'avfilter.lut3d' + qml: 'ui.qml' +} diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/lut3d/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/lut3d/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/lut3d/ui.qml 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/lut3d/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2016 Meltytech, LLC + * Author: Dan Dennedy + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.1 +import QtQuick.Dialogs 1.1 +import QtQuick.Controls 1.1 +import QtQuick.Layouts 1.0 +import QtQuick.Window 2.1 +import Shotcut.Controls 1.0 as Shotcut +import org.shotcut.qml 1.0 as Shotcut + +Item { + id: lut3dRoot + width: 350 + height: 100 + property string settingsOpenPath: settings.openPath + + SystemPalette { id: activePalette; colorGroup: SystemPalette.Active } + Shotcut.File { id: lutFile } + + // This signal is used to workaround context properties not available in + // the FileDialog onAccepted signal handler on Qt 5.5. + signal fileOpened(string path) + onFileOpened: settings.openPath = path + + Component.onCompleted: { + var resource = filter.get('av.file') + lutFile.url = resource + + if (filter.isNew) { + interpolationCombo.currentIndex = 1 + } else { + interpolationCombo.currentIndex = interpolationCombo.valueToIndex() + } + + if (lutFile.exists()) { + fileLabel.text = lutFile.fileName + fileLabelTip.text = lutFile.url + } else { + console.log('lutFile.url = ' + lutFile.url) + fileLabel.text = qsTr("No File Loaded") + fileLabel.color = 'red' + fileLabelTip.text = qsTr('No 3D LUT file loaded.\nClick "Open" to load a file.') + } + } + + FileDialog { + id: fileDialog + modality: Qt.WindowModal + selectMultiple: false + selectFolder: false + folder: settingsOpenPath + nameFilters: ['3D-LUT Files (*.3dl *.cube *.dat *.m3d)', 'AfterEffects (*.3dl)', 'Iridas (*.cube)', 'DaVinci (*.dat)', 'Pandora (*.m3d)', 'All Files (*)'] + selectedNameFilter: nameFilters[0] + onAccepted: { + lutFile.url = fileDialog.fileUrl + lut3dRoot.fileOpened(lutFile.path) + fileLabel.text = lutFile.fileName + fileLabel.color = activePalette.text + fileLabelTip.text = lutFile.url + filter.set('av.file', lutFile.url) + } + } + + GridLayout { + columns: 3 + anchors.fill: parent + anchors.margins: 8 + + Button { + id: openButton + text: qsTr('Open...') + Layout.alignment: Qt.AlignRight + onClicked: { + fileDialog.selectExisting = true + fileDialog.title = qsTr( "Open 3D LUT File" ) + fileDialog.open() + } + } + Label { + id: fileLabel + Layout.columnSpan: 2 + Layout.fillWidth: true + Shotcut.ToolTip { id: fileLabelTip } + } + + Label { + text: qsTr('Interpolation') + Layout.alignment: Qt.AlignRight + } + ComboBox { + id: interpolationCombo + implicitWidth: 180 + model: [qsTr('Nearest'), qsTr('Trilinear'), qsTr('Tetrahedral')] + property var values: ['nearest', 'trilinear', 'tetrahedral'] + onCurrentIndexChanged: filter.set('av.interp', values[currentIndex]) + + function valueToIndex() { + var w = filter.get('av.interp') + for (var i = 0; i < values.length; ++i) + if (values[i] === w) break; + if (i === values.length) i = 1; + return i; + } + } + Shotcut.UndoButton { + onClicked: interpolationCombo.currentIndex = 1 + } + + Item { + Layout.fillHeight: true + Layout.columnSpan: 3 + } + } +} diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/rotate/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/rotate/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/rotate/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/rotate/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -66,7 +66,7 @@ maximumValue: 360 decimals: 1 spinnerWidth: 110 - suffix: qsTr(' degree') + suffix: qsTr(' deg', 'degrees') onValueChanged: filter.set('transition.fix_rotate_x', value) } UndoButton { diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/select0r/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/select0r/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/select0r/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/select0r/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -171,7 +171,6 @@ maximumValue: 100 decimals: 1 suffix: ' %' - spinnerWidth: 80 value: filter.getDouble(deltaRDefault) * 100 onValueChanged: filter.set(deltaRParam, value / 100) } @@ -189,7 +188,6 @@ maximumValue: 100 decimals: 1 suffix: ' %' - spinnerWidth: 80 value: filter.getDouble(deltaGDefault) * 100 onValueChanged: filter.set(deltaGParam, value / 100) } @@ -207,7 +205,6 @@ maximumValue: 100 decimals: 1 suffix: ' %' - spinnerWidth: 80 value: filter.getDouble(deltaBDefault) * 100 onValueChanged: filter.set(deltaBParam, value / 100) } @@ -265,7 +262,6 @@ maximumValue: 100 decimals: 1 suffix: ' %' - spinnerWidth: 80 value: filter.getDouble(slopeParam) * 100 onValueChanged: filter.set(slopeParam, value / 100) } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/smartblur/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/smartblur/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/smartblur/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/smartblur/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -74,7 +74,6 @@ minimumValue: 0.1 maximumValue: 5.0 decimals: 1 - spinnerWidth: 80 onValueChanged: { filter.set("av.luma_radius", value) filter.set("av.chroma_radius", value) @@ -94,7 +93,6 @@ minimumValue: 0.0 maximumValue: 1.0 decimals: 1 - spinnerWidth: 80 onValueChanged: { filter.set("av.luma_strength", value) filter.set("av.chroma_strength", value) @@ -114,7 +112,6 @@ minimumValue: 0.0 maximumValue: 30 decimals: 0 - spinnerWidth: 80 onValueChanged: { filter.set("av.luma_threshold", value) filter.set("av.chroma_threshold", value) diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/stabilize/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/stabilize/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/stabilize/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/stabilize/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -27,21 +27,38 @@ width: 350 height: 150 property string settingsSavePath: settings.savePath + property string _analysisRequiredMessage: qsTr('Click Analyze to use this filter.') + + Component.onCompleted: { + shakinessSlider.value = filter.getDouble('shakiness') + accuracySlider.value = filter.getDouble('accuracy') + button.enabled = !hasAnalysisCompleted() + setStatus(false) + } + + function hasAnalysisCompleted() { + return (filter.get("results").length > 0 && + filter.get("filename").indexOf(filter.get("results")) !== -1) + } function setStatus( inProgress ) { if (inProgress) { status.text = qsTr('Analyzing...') } - else if (filter.get("results").length > 0 && - filter.get("filename").indexOf(filter.get("results")) !== -1) { + else if (hasAnalysisCompleted()) { status.text = qsTr('Analysis complete.') } else { - status.text = qsTr('Click Analyze to use this filter.') + status.text = _analysisRequiredMessage } } + function analyzeValueChanged() { + button.enabled = true + status.text = _analysisRequiredMessage + } + // This signal is used to workaround context properties not available in // the FileDialog onAccepted signal handler on Qt 5.5. signal fileSaved(string filename) @@ -57,7 +74,6 @@ onAnalyzeFinished: { filter.set("reload", 1); setStatus(false) - button.enabled = true } } @@ -117,8 +133,10 @@ maximumValue: 10 tickmarksEnabled: true stepSize: 1 - value: filter.getDouble('shakiness') - onValueChanged: filter.set('shakiness', value) + onValueChanged: { + filter.set('shakiness', value) + analyzeValueChanged() + } } UndoButton { onClicked: shakinessSlider.value = 4 @@ -134,13 +152,30 @@ maximumValue: 15 tickmarksEnabled: true stepSize: 1 - value: filter.getDouble('accuracy') - onValueChanged: filter.set('accuracy', value) + onValueChanged: { + filter.set('accuracy', value) + analyzeValueChanged() + } } UndoButton { onClicked: accuracySlider.value = 4 } + Button { + id: button + text: qsTr('Analyze') + Layout.alignment: Qt.AlignRight + onClicked: { + button.enabled = false + fileDialog.folder = settings.savePath + fileDialog.open() + } + } + Label { + id: status + Layout.columnSpan: 2 + } + Label { text: qsTr('Filter Options') Layout.columnSpan: 3 @@ -166,23 +201,24 @@ onClicked: zoomSlider.value = 0 } - Button { - id: button - text: qsTr('Analyze') + Label { + text: qsTr('Smoothing') Layout.alignment: Qt.AlignRight - onClicked: { - button.enabled = false - fileDialog.folder = settings.savePath - fileDialog.open() - } } - Label { - id: status - Layout.columnSpan: 2 - Component.onCompleted: { - setStatus(false) + SliderSpinner { + id: smoothingSlider + minimumValue: 0 + maximumValue: 100 + tickmarksEnabled: true + stepSize: 1 + value: filter.get('smoothing') + onValueChanged: { + filter.set('smoothing', value) } } + UndoButton { + onClicked: smoothingSlider.value = 15 + } Item { Layout.fillHeight: true; diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/webvfx/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/webvfx/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/webvfx/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/webvfx/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 Meltytech, LLC + * Copyright (c) 2014-2016 Meltytech, LLC * Author: Brian Matherly * * This program is free software: you can redistribute it and/or modify @@ -37,7 +37,7 @@ url: { if (!htmlFile.url || !htmlFile.exists()) return ""; - var uiFile = htmlFile.url.toString(); + var uiFile = htmlFile.url; return uiFile.substr(0, uiFile.lastIndexOf(".")) + "_ui.qml"; } onUrlChanged: { @@ -69,7 +69,7 @@ if (htmlFile.exists()) { fileLabel.text = htmlFile.fileName - fileLabelTip.text = htmlFile.url.toString() + fileLabelTip.text = htmlFile.url openButton.visible = false newButton.visible = false editButton.visible = true @@ -107,14 +107,14 @@ fileLabel.text = htmlFile.fileName fileLabel.color = activePalette.text - fileLabelTip.text = htmlFile.url.toString() + fileLabelTip.text = htmlFile.url openButton.visible = false newButton.visible = false webvfxCheckBox.enabled = false editButton.visible = true reloadButton.visible = true - var resource = htmlFile.url.toString() + var resource = htmlFile.url if (!webvfxCheckBox.checked) { resource = "plain:" + resource } @@ -122,7 +122,7 @@ filter.set("disable", 0) if (!selectExisting) { - editor.edit(htmlFile.url.toString()) + editor.edit(htmlFile.url) editButton.enabled = false reloadButton.enabled = false } @@ -214,7 +214,7 @@ text: qsTr('Edit...') visible: false onClicked: { - editor.edit(htmlFile.url.toString()) + editor.edit(htmlFile.url) editButton.enabled = false reloadButton.enabled = false } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/webvfx_ruttetraizer/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/webvfx_ruttetraizer/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/webvfx_ruttetraizer/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/webvfx_ruttetraizer/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -111,8 +111,7 @@ id: densitySlider minimumValue: 1 maximumValue: 100 - spinnerWidth: 110 - suffix: ' pixels' + suffix: ' px' value: filter.getDouble('density') onValueChanged: filter.set('density', value) } @@ -128,8 +127,7 @@ id: depthSlider minimumValue: 1 maximumValue: 500 - spinnerWidth: 110 - suffix: ' pixels' + suffix: ' px' value: filter.getDouble('depth') onValueChanged: filter.set('depth', value) } @@ -161,8 +159,7 @@ id: xRotationSlider minimumValue: 0 maximumValue: 360 - spinnerWidth: 110 - suffix: ' degree' + suffix: qsTr(' deg', 'degrees') value: filter.getDouble('rotation_x') * maximumValue onValueChanged: filter.set('rotation_x', value / maximumValue) } @@ -178,8 +175,7 @@ id: yRotationSlider minimumValue: 0 maximumValue: 360 - spinnerWidth: 110 - suffix: ' degree' + suffix: qsTr(' deg', 'degrees') value: filter.getDouble('rotation_y') * maximumValue onValueChanged: filter.set('rotation_y', value / maximumValue) } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/white/ui.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/white/ui.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/filters/white/ui.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/filters/white/ui.qml 2017-01-02 09:43:01.000000000 +0000 @@ -151,7 +151,7 @@ maximumValue: 15000.0 decimals: 0 stepSize: 10 - suffix: ' deg' + suffix: qsTr(' deg', 'degrees') onValueChanged: tempslider.value = value } } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/ColorPicker.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/ColorPicker.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/ColorPicker.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/ColorPicker.qml 2017-01-02 09:43:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Meltytech, LLC + * Copyright (c) 2014-2016 Meltytech, LLC * Author: Brian Matherly * * This program is free software: you can redistribute it and/or modify @@ -19,7 +19,7 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.1 -import QtQuick.Dialogs 1.1 +import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import Shotcut.Controls 1.0 @@ -62,15 +62,19 @@ showAlphaChannel: alpha color: value onAccepted: { - if (alpha) { - var alphaHex = Math.round(255 * currentColor.a).toString(16) - if (alphaHex.length === 1) - alphaHex = '0' + alphaHex - value = '#' + alphaHex + currentColor.toString().substr(1) - } else { - value = currentColor - } + // Make a copy of the current value. + var myColor = Qt.darker(value, 1.0) + // Ignore alpha when comparing. + myColor.a = currentColor.a + // If the user changed color but left alpha at 0, + // they probably want to reset alpha to opaque. + if (currentColor.a === 0 && !Qt.colorEqual(currentColor, myColor)) + currentColor.a = 255 + // Assign the new color value. Unlike docs say, using currentColor + // is actually more cross-platform compatible. + value = currentColor } + modality: Qt.ApplicationModal } Button { diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/Preset.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/Preset.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/Preset.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/Preset.qml 2017-01-02 09:43:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 Meltytech, LLC + * Copyright (c) 2013-2016 Meltytech, LLC * Author: Dan Dennedy * * This program is free software: you can redistribute it and/or modify @@ -45,7 +45,7 @@ Button { id: saveButton iconName: 'list-add' - iconSource: 'qrc:///icons/oxygen/16x16/actions/list-add.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/list-add.png' tooltip: qsTr('Save') implicitWidth: 20 implicitHeight: 20 @@ -54,7 +54,7 @@ Button { id: deleteButton iconName: 'list-remove' - iconSource: 'qrc:///icons/oxygen/16x16/actions/list-remove.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/list-remove.png' tooltip: qsTr('Delete') implicitWidth: 20 implicitHeight: 20 diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/SliderSpinner.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/SliderSpinner.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/SliderSpinner.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/SliderSpinner.qml 2017-01-02 09:43:01.000000000 +0000 @@ -97,7 +97,7 @@ SpinBox { id: spinner - Layout.minimumWidth: 70 + Layout.minimumWidth: 90 minimumValue: slider.minimumValue / ratio maximumValue: slider.maximumValue / ratio stepSize: 1 / Math.pow(10, decimals) diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/TimeSpinner.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/TimeSpinner.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/TimeSpinner.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/TimeSpinner.qml 2017-01-02 09:43:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Meltytech, LLC + * Copyright (c) 2014-2016 Meltytech, LLC * Author: Dan Dennedy * * This program is free software: you can redistribute it and/or modify @@ -32,10 +32,10 @@ TextField { id: timeField - text: filter.timeFromFrames(value) + text: filter.timeFromFrames(clamp(value, minimumValue, maximumValue)) horizontalAlignment: TextInput.AlignRight validator: RegExpValidator {regExp: /^\s*(\d*:){0,2}(\d*[.;:])?\d*\s*$/} - onEditingFinished: value = clamp(filter.framesFromTime(text), minimumValue, maximumValue) + onEditingFinished: value = filter.framesFromTime(text) Keys.onDownPressed: decrementAction.trigger() Keys.onUpPressed: incrementAction.trigger() onFocusChanged: if (focus) selectAll() @@ -43,7 +43,7 @@ Button { id: decrementButton iconName: 'list-remove' - iconSource: 'qrc:///icons/oxygen/16x16/actions/list-remove.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/list-remove.png' tooltip: qsTr('Decrement') implicitWidth: 20 implicitHeight: 20 @@ -64,7 +64,7 @@ Button { id: incrementButton iconName: 'list-add' - iconSource: 'qrc:///icons/oxygen/16x16/actions/list-add.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/list-add.png' tooltip: qsTr('Increment') implicitWidth: 20 implicitHeight: 20 @@ -90,7 +90,7 @@ } Action { id: decrementAction - onTriggered: value = value = Math.max(value - 1, minimumValue) + onTriggered: value = Math.max(value - 1, minimumValue) } Action { id: incrementAction diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/UndoButton.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/UndoButton.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/UndoButton.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/modules/Shotcut/Controls/UndoButton.qml 2017-01-02 09:43:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Meltytech, LLC + * Copyright (c) 2013-2016 Meltytech, LLC * Author: Dan Dennedy * * This program is free software: you can redistribute it and/or modify @@ -20,7 +20,7 @@ Button { iconName: 'edit-undo' - iconSource: 'qrc:///icons/oxygen/16x16/actions/edit-undo.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/edit-undo.png' tooltip: qsTr('Reset to default') implicitWidth: 20 implicitHeight: 20 diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/timeline/Clip.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/timeline/Clip.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/timeline/Clip.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/timeline/Clip.qml 2017-01-02 09:43:01.000000000 +0000 @@ -246,7 +246,7 @@ anchors.fill: parent enabled: isBlank acceptedButtons: Qt.RightButton - onClicked: menu.popup() + onClicked: menu.show() } MouseArea { @@ -286,6 +286,7 @@ } } onDoubleClicked: timeline.position = clipRoot.x / multitrack.scaleFactor + onWheel: zoomByWheel(wheel) MouseArea { anchors.fill: parent @@ -295,7 +296,7 @@ (fadeInMouseArea.drag.active || fadeOutMouseArea.drag.active)? Qt.PointingHandCursor : drag.active? Qt.ClosedHandCursor : isBlank? Qt.ArrowCursor : Qt.OpenHandCursor - onClicked: menu.popup() + onClicked: menu.show() } } @@ -564,6 +565,10 @@ } Menu { id: menu + function show() { + mergeItem.visible = timeline.mergeClipWithNext(trackIndex, index, true) + popup() + } MenuItem { visible: !isBlank && !isTransition text: qsTr('Cut') @@ -602,6 +607,11 @@ onTriggered: timeline.splitClip(trackIndex, index) } MenuItem { + id: mergeItem + text: qsTr('Merge with next clip') + onTriggered: timeline.mergeClipWithNext(trackIndex, index, false) + } + MenuItem { visible: !isBlank && !isTransition text: qsTr('Rebuild Audio Waveform') onTriggered: timeline.remakeAudioLevels(trackIndex, index) diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/timeline/Timeline.js shotcut-17.01.01/Shotcut.app/share/shotcut/qml/timeline/Timeline.js --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/timeline/Timeline.js 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/timeline/Timeline.js 2017-01-02 09:43:01.000000000 +0000 @@ -55,12 +55,14 @@ // Scroll tracks if at edges. if (pos.x > headerWidth + scrollView.width - 50) { + // Right edge scrollTimer.backwards = false scrollTimer.start() } else if (pos.x >= headerWidth && pos.x < headerWidth + 50) { + // Left edge if (scrollView.flickableItem.contentX < 50) { - scrollView.flickableItem.contentX = 0; scrollTimer.stop() + scrollView.flickableItem.contentX = 0; } else { scrollTimer.backwards = true scrollTimer.start() diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/timeline/timeline.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/timeline/timeline.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/timeline/timeline.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/timeline/timeline.qml 2017-01-02 09:43:01.000000000 +0000 @@ -31,22 +31,35 @@ signal clipClicked() - function zoomIn() { - scaleSlider.value += 0.0625 + function setZoom(value) { + toolbar.scaleSlider.value = value for (var i = 0; i < tracksRepeater.count; i++) tracksRepeater.itemAt(i).redrawWaveforms() } + function adjustZoom(by) { + setZoom(toolbar.scaleSlider.value + by) + } + + function zoomIn() { + adjustZoom(0.0625) + } + function zoomOut() { - scaleSlider.value -= 0.0625 - for (var i = 0; i < tracksRepeater.count; i++) - tracksRepeater.itemAt(i).redrawWaveforms() + adjustZoom(-0.0625) } function resetZoom() { - scaleSlider.value = 1.0 - for (var i = 0; i < tracksRepeater.count; i++) - tracksRepeater.itemAt(i).redrawWaveforms() + setZoom(1.0) + } + + function zoomByWheel(wheel) { + if (wheel.modifiers & Qt.ControlModifier) { + adjustZoom(wheel.angleDelta.y / 720) + } + if (wheel.modifiers & Qt.ShiftModifier) { + multitrack.trackHeight = Math.max(30, multitrack.trackHeight + wheel.angleDelta.y / 5) + } } function makeTracksTaller() { @@ -81,6 +94,7 @@ anchors.fill: parent acceptedButtons: Qt.RightButton onClicked: menu.popup() + onWheel: zoomByWheel(wheel) } DropArea { @@ -174,14 +188,6 @@ anchors.bottom: parent.bottom } } - - ZoomSlider { - id: scaleSlider - width: headerWidth - height: root.height - trackHeaders.height - ruler.height - toolbar.height + 4 - z: 2 - onValueChanged: Logic.scrollIfNeeded() - } } MouseArea { id: tracksArea @@ -207,7 +213,9 @@ id: scrubTimer interval: 25 repeat: true - running: parent.scim && parent.containsMouse && (parent.mouseX < 50 || parent.mouseX > parent.width - 50) + running: parent.scim && parent.containsMouse + && (parent.mouseX < 50 || parent.mouseX > parent.width - 50) + && (timeline.position * multitrack.scaleFactor >= 50) onTriggered: { if (parent.mouseX < 50) timeline.position -= 10 @@ -529,7 +537,7 @@ Connections { target: multitrack - onLoaded: scaleSlider.value = Math.pow(multitrack.scaleFactor - 0.01, 1.0 / 3.0) + onLoaded: toolbar.scaleSlider.value = Math.pow(multitrack.scaleFactor - 0.01, 1.0 / 3.0) } // This provides continuous scrolling at the left/right edges. diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/timeline/TimelineToolbar.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/timeline/TimelineToolbar.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/timeline/TimelineToolbar.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/timeline/TimelineToolbar.qml 2017-01-02 09:43:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 Meltytech, LLC + * Copyright (c) 2013-2016 Meltytech, LLC * Author: Dan Dennedy * * This program is free software: you can redistribute it and/or modify @@ -20,12 +20,14 @@ import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 import QtGraphicalEffects 1.0 +import 'Timeline.js' as Logic ToolBar { property alias ripple: rippleButton.checked property alias scrub: scrubButton.checked property alias snap: snapButton.checked property color checkedColor: Qt.rgba(activePalette.highlight.r, activePalette.highlight.g, activePalette.highlight.b, 0.3) + property alias scaleSlider: scaleSlider SystemPalette { id: activePalette } @@ -101,7 +103,7 @@ checkable: true checked: true iconName: 'snap' - iconSource: 'qrc:///icons/oxygen/16x16/actions/snap.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/snap.png' tooltip: qsTr('Toggle snapping') } ToolButton { @@ -110,7 +112,7 @@ implicitHeight: 24 checkable: true iconName: 'scrub_drag' - iconSource: 'qrc:///icons/oxygen/16x16/actions/scrub_drag.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/scrub_drag.png' tooltip: qsTr('Scrub while dragging') } ToolButton { @@ -119,10 +121,30 @@ implicitHeight: 24 checkable: true iconName: 'target' - iconSource: 'qrc:///icons/oxygen/16x16/actions/target.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/target.png' tooltip: qsTr('Ripple trim and drop') text: qsTr('Ripple') } + Button { // separator + enabled: false + implicitWidth: 1 + implicitHeight: 20 + } + ToolButton { + action: zoomOutAction + implicitWidth: 28 + implicitHeight: 24 + } + ZoomSlider { + id: scaleSlider + onValueChanged: Logic.scrollIfNeeded() + } + ToolButton { + action: zoomInAction + implicitWidth: 28 + implicitHeight: 24 + } + ColorOverlay { id: snapColorEffect visible: snapButton.checked @@ -153,7 +175,7 @@ id: menuAction tooltip: qsTr('Display a menu of additional actions') iconName: 'format-justify-fill' - iconSource: 'qrc:///icons/oxygen/16x16/actions/format-justify-fill.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/format-justify-fill.png' onTriggered: menu.popup() } @@ -187,7 +209,7 @@ id: appendAction tooltip: qsTr('Append to the current track (A)') iconName: 'list-add' - iconSource: 'qrc:///icons/oxygen/16x16/actions/list-add.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/list-add.png' onTriggered: timeline.append(currentTrack) } @@ -195,7 +217,7 @@ id: deleteAction tooltip: qsTr('Ripple Delete - Remove current clip\nshifting following clips to the left (X)') iconName: 'list-remove' - iconSource: 'qrc:///icons/oxygen/16x16/actions/list-remove.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/list-remove.png' onTriggered: timeline.remove(currentTrack, timeline.selection[0]) } @@ -203,7 +225,7 @@ id: liftAction tooltip: qsTr('Lift - Remove current clip without\naffecting position of other clips (Z)') iconName: 'lift' - iconSource: 'qrc:///icons/oxygen/16x16/actions/lift.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/lift.png' onTriggered: timeline.lift(currentTrack, timeline.selection[0]) } @@ -211,7 +233,7 @@ id: overwriteAction tooltip: qsTr('Overwrite clip onto the current track (B)') iconName: 'overwrite' - iconSource: 'qrc:///icons/oxygen/16x16/actions/overwrite.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/overwrite.png' onTriggered: timeline.overwrite(currentTrack) } @@ -219,7 +241,23 @@ id: splitAction tooltip: qsTr('Split At Playhead (S)') iconName: 'split' - iconSource: 'qrc:///icons/oxygen/16x16/actions/split.png' + iconSource: 'qrc:///icons/oxygen/32x32/actions/split.png' onTriggered: timeline.splitClip(currentTrack) } + + Action { + id: zoomOutAction + tooltip: qsTr("Zoom timeline out (-)") + iconName: 'zoom-out' + iconSource: 'qrc:///icons/oxygen/32x32/actions/zoom-out.png' + onTriggered: root.zoomOut() + } + + Action { + id: zoomInAction + tooltip: qsTr("Zoom timeline in (+)") + iconName: 'zoom-in' + iconSource: 'qrc:///icons/oxygen/32x32/actions/zoom-in.png' + onTriggered: root.zoomIn() + } } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/timeline/Track.js shotcut-17.01.01/Shotcut.app/share/shotcut/qml/timeline/Track.js --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/timeline/Track.js 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/timeline/Track.js 2017-01-02 09:43:01.000000000 +0000 @@ -30,12 +30,19 @@ for (var i = 0; i < repeater.count; i++) { var itemLeft = repeater.itemAt(i).x var itemRight = itemLeft + repeater.itemAt(i).width + // Snap to blank if (right > itemLeft - SNAP && right < itemLeft + SNAP) { clip.x = itemLeft - clip.width return } else if (clip.x > itemRight - SNAP && clip.x < itemRight + SNAP) { clip.x = itemRight return + } else if (right > itemRight - SNAP && right < itemRight + SNAP) { + clip.x = itemRight - clip.width + return + } else if (clip.x > itemLeft - SNAP && clip.x < itemLeft + SNAP) { + clip.x = itemLeft + return } } } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/timeline/Track.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/timeline/Track.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/timeline/Track.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/timeline/Track.qml 2017-01-02 09:43:01.000000000 +0000 @@ -180,7 +180,9 @@ 'audio': false, 'isTransition': false, 'fadeIn': 0, - 'fadeOut': 0 + 'fadeOut': 0, + 'hash': '', + 'speed': 1.0 }) } } diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/qml/views/filter/filterview.qml shotcut-17.01.01/Shotcut.app/share/shotcut/qml/views/filter/filterview.qml --- shotcut-16.07.01/Shotcut.app/share/shotcut/qml/views/filter/filterview.qml 2016-07-01 08:40:52.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/qml/views/filter/filterview.qml 2017-01-02 09:43:01.000000000 +0000 @@ -23,7 +23,7 @@ Rectangle { id: root - + property int selectedIndex: -1 signal currentFilterRequested(int attachedIndex) function clearCurrentFilter() { @@ -36,7 +36,7 @@ function setCurrentFilter(index) { attachedFilters.setCurrentFilter(index) - removeButton.selectedIndex = index + selectedIndex = index filterConfig.source = metadata ? metadata.qmlFilePath : "" } @@ -98,7 +98,7 @@ GridLayout { id: attachedContainer - columns: 3 + columns: 6 anchors { top: titleBackground.bottom left: parent.left @@ -110,7 +110,7 @@ AttachedFilters { id: attachedFilters - Layout.columnSpan: 3 + Layout.columnSpan: 6 Layout.fillWidth: true Layout.fillHeight: true onFilterClicked: { @@ -134,19 +134,41 @@ onClicked: filterMenu.popup(addButton) } Button { - id: removeButton - - property int selectedIndex: -1 - + id: removeButton Layout.minimumWidth: height iconName: 'list-remove' - enabled: selectedIndex > -1 ? true : false + enabled: selectedIndex > -1 opacity: enabled ? 1.0 : 0.5 tooltip: qsTr('Remove selected filter') onClicked: { attachedfiltersmodel.remove(selectedIndex) } } + Button { // separator + enabled: false + implicitWidth: 1 + implicitHeight: 20 + } + Button { + id: copyButton + Layout.minimumWidth: height + iconName: 'edit-copy' + enabled: selectedIndex > -1 + opacity: enabled ? 1.0 : 0.5 + iconSource: 'qrc:///icons/oxygen/32x32/actions/edit-copy.png' + tooltip: qsTr('Copy the filters') + onClicked: application.copyFilters() + } + Button { + id: pasteButton + Layout.minimumWidth: height + enabled: application.hasFiltersOnClipboard + opacity: enabled ? 1.0 : 0.5 + iconName: 'edit-paste' + iconSource: 'qrc:///icons/oxygen/32x32/actions/edit-paste.png' + tooltip: qsTr('Paste filters') + onClicked: application.pasteFilters() + } Item { Layout.fillWidth: true } Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_ar.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_ar.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qtbase_de.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qtbase_de.qm differ diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qtbase_en.qm shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qtbase_en.qm --- shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qtbase_en.qm 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qtbase_en.qm 2016-09-13 04:53:46.000000000 +0000 @@ -0,0 +1 @@ +<¸dÊÍ!¿`¡½Ý \ No newline at end of file Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qtbase_fi.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qtbase_fi.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qtbase_he.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qtbase_he.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qtbase_ja.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qtbase_ja.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qtbase_ko.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qtbase_ko.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qtbase_lv.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qtbase_lv.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qtbase_pl.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qtbase_pl.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qtbase_ru.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qtbase_ru.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qtbase_uk.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qtbase_uk.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_da.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_da.qm differ diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_en.qm shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_en.qm --- shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_en.qm 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_en.qm 2016-09-13 04:53:45.000000000 +0000 @@ -0,0 +1 @@ +<¸dÊÍ!¿`¡½Ý \ No newline at end of file Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_es.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_es.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_fa.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_fa.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_fr.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_fr.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_gl.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_gl.qm differ diff -Nru shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_help_en.qm shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_help_en.qm --- shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_help_en.qm 1970-01-01 00:00:00.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_help_en.qm 2016-09-13 04:53:46.000000000 +0000 @@ -0,0 +1 @@ +<¸dÊÍ!¿`¡½Ý \ No newline at end of file Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_help_pl.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_help_pl.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_he.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_he.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_hu.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_hu.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_lt.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_lt.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_pl.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_pl.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_pt.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_pt.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_sl.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_sl.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_sv.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_sv.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_zh_CN.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_zh_CN.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/qt_zh_TW.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/qt_zh_TW.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_ca.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_ca.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_cs.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_cs.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_da.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_da.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_de.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_de.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_el.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_el.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_es.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_es.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_fr.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_fr.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_gd.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_gd.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_it.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_it.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_nl.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_nl.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_oc.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_oc.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_pl.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_pl.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_pt_BR.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_pt_BR.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_pt_PT.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_pt_PT.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_ru.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_ru.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_sk.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_sk.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_uk.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_uk.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_zh_CN.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_zh_CN.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_zh.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_zh.qm differ Binary files /tmp/tmpDEq1XY/sCCw4kE5vr/shotcut-16.07.01/Shotcut.app/share/shotcut/translations/shotcut_zh_TW.qm and /tmp/tmpDEq1XY/2qpsSicSBZ/shotcut-17.01.01/Shotcut.app/share/shotcut/translations/shotcut_zh_TW.qm differ diff -Nru shotcut-16.07.01/Shotcut.app/versions shotcut-17.01.01/Shotcut.app/versions --- shotcut-16.07.01/Shotcut.app/versions 2016-07-01 09:52:48.000000000 +0000 +++ shotcut-17.01.01/Shotcut.app/versions 2017-01-02 10:56:32.000000000 +0000 @@ -1,12 +1,12 @@ vid.stab 97c6ae2719faac74687fe409b5a7258eab06b22e release-0.98a-20-g97c6ae2 -opus 4a4bc08031cf3c909a568d47e007131085b5d350 v1.1.1-rc-107-g4a4bc08 -libvpx fbbd3f0d8dfeca8c6513dfa9e1ed1c3dee1f2621 v1.5.0-1192-gfbbd3f0 -x265 462cfd01042fda3970f2a51a5b54a58efa7142b4 1.9-5-g462cfd0 -x264 3f5ed56d4105f68c01b86f94f41bb9bbefa3433b -libepoxy 8bbc0d40c6c4e023e71ac8bfe7f5898005cac920 v1.3.1-2-g8bbc0d4 +opus efcdeb9bb286882743aeeb8661c088187e315262 v1.2-alpha-18-gefcdeb9 +libvpx ecdb6a00c273b45d38b9079c5bcc6a4d84d9da1a v1.6.0-860-gecdb6a0 +x265 3202dd984ab4bfda0977ef543b7eb12f0684ddb0 2.2-1-g3202dd9 +x264 b97ae0644f16bad2e2c9c9181264a946769a0aa0 +libepoxy e2c33af5bfcfc9d168f9e776156dd47c33f428b3 v1.3.1 movit d2050acb601e0d16bb33b1c1e7cf443dce2d3c93 -frei0r b63f5db473ce280f8532e2eb6f4f6a5df9b7af91 v1.5-5-gb63f5db -FFmpeg 96f5019bde0f6719133a36433fec465b8538df25 n3.0.2-29-g96f5019 -mlt af73fe9d0c098b8176d323b9d7d37d3805629493 v6.2.0-22-gaf73fe9 -shotcut 11bd06743777ba91fc25a523af81144d9fd5553e v16.07 -webvfx 1d4d72214bd27c2bcc26637a3892e408fe0e5cb5 0.4.4-55-g1d4d722 +frei0r de73545252dcd8fce8cb70e7978ca106d862ef70 v1.5-23-gde73545 +FFmpeg 76961f4f42d28c7b4197c2cbef8bae3dc7b67379 n3.0.5-6-g76961f4 +mlt 1b306a3ffd2adbf639afba106305ffd57ef37a89 v6.4.1-30-g1b306a3 +shotcut 44f877d976002f5c329681552acca6cadd494e11 v16.12-14-g44f877d +webvfx e918ce4667e623c3d60735cb898223e730c6d7af 0.4.4-60-ge918ce4