From 5c3a5cf8106e1b873924b296c792448c33ee4df1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Thu, 25 Sep 2014 12:47:01 +0300
Subject: [PATCH] QMLVideo Example visual update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Task-number: QTBUG-36287
Change-Id: I797a995c2ccd6f6fec40fbf50f93e297ae15a9b1
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
---
.../video/qmlvideo/images/close.png | Bin 1799 -> 0 bytes
.../video/qmlvideo/images/folder.png | Bin 1841 -> 1829 bytes
.../video/qmlvideo/images/progress_handle.svg | 35 ----
.../images/progress_handle_pressed.svg | 35 ----
.../video/qmlvideo/images/titlebar.png | Bin 1436 -> 0 bytes
.../video/qmlvideo/images/titlebar.sci | 5 -
.../multimedia/video/qmlvideo/images/up.png | Bin 662 -> 1268 bytes
examples/multimedia/video/qmlvideo/main.cpp | 7 +-
.../video/qmlvideo/qml/qmlvideo/Button.qml | 21 ++-
.../qmlvideo/qml/qmlvideo/ErrorDialog.qml | 8 +-
.../qmlvideo/qml/qmlvideo/FileBrowser.qml | 174 ++++++++++--------
.../video/qmlvideo/qml/qmlvideo/Scene.qml | 11 +-
.../qmlvideo/qml/qmlvideo/SceneBasic.qml | 3 +-
.../qmlvideo/qml/qmlvideo/SceneFullScreen.qml | 3 +-
.../qml/qmlvideo/SceneFullScreenInverted.qml | 3 +-
.../qmlvideo/qml/qmlvideo/SceneMulti.qml | 3 +-
.../qmlvideo/qml/qmlvideo/SceneOverlay.qml | 2 +-
.../qmlvideo/qml/qmlvideo/SceneRotate.qml | 6 +-
.../qml/qmlvideo/SceneSelectionPanel.qml | 107 +++++++----
.../qmlvideo/qml/qmlvideo/SeekControl.qml | 30 +--
.../qmlvideo/qml/qmlvideo/VideoFillMode.qml | 6 +-
.../qmlvideo/qml/qmlvideo/VideoMetadata.qml | 26 +--
.../qml/qmlvideo/VideoPlaybackRate.qml | 10 +-
.../video/qmlvideo/qml/qmlvideo/VideoSeek.qml | 6 +-
.../video/qmlvideo/qml/qmlvideo/main.qml | 62 +++++--
.../multimedia/video/qmlvideo/qmlvideo.qrc | 5 -
.../qml/qmlvideofx/ContentCamera.qml | 43 -----
.../video/qmlvideofx/qmlvideofx.qrc | 1 -
28 files changed, 290 insertions(+), 322 deletions(-)
delete mode 100644 examples/multimedia/video/qmlvideo/images/close.png
delete mode 100644 examples/multimedia/video/qmlvideo/images/progress_handle.svg
delete mode 100644 examples/multimedia/video/qmlvideo/images/progress_handle_pressed.svg
delete mode 100644 examples/multimedia/video/qmlvideo/images/titlebar.png
delete mode 100644 examples/multimedia/video/qmlvideo/images/titlebar.sci
delete mode 100644 examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
diff --git a/examples/multimedia/video/qmlvideo/images/close.png b/examples/multimedia/video/qmlvideo/images/close.png
deleted file mode 100644
index 6904df0e447a1b85b232e8950c351b7be648505d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1799
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
diff --git a/examples/multimedia/video/qmlvideo/images/folder.png b/examples/multimedia/video/qmlvideo/images/folder.png
index e53e2ad464eb993256a6c3567fc940498e26fc8b..62d97004fb01e085c3060619ac68dbec2fa7e8aa 100644
GIT binary patch
literal 1829
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
J);T3K0RRmm*FFFM
literal 1841
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
diff --git a/examples/multimedia/video/qmlvideo/images/progress_handle.svg b/examples/multimedia/video/qmlvideo/images/progress_handle.svg
deleted file mode 100644
index 7ad9014e3..000000000
--- a/examples/multimedia/video/qmlvideo/images/progress_handle.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="10px"
- height="46px"
- version="1.1">
- <g>
- <defs>
- <linearGradient id="MyGradient1" x1="0%" y1="0%" x2="100%" y2="100%">
- <stop offset="0%" stop-color="lightcyan" />
- <stop offset="100%" stop-color="dodgerblue" />
- </linearGradient>
- </defs>
- <rect
- stroke="white"
- fill="url(#MyGradient1)"
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- width="8"
- height="44"
- x="1"
- y="1"
- rx="4"
- ry="4"/>
- </g>
-</svg>
diff --git a/examples/multimedia/video/qmlvideo/images/progress_handle_pressed.svg b/examples/multimedia/video/qmlvideo/images/progress_handle_pressed.svg
deleted file mode 100644
index c9c6c486c..000000000
--- a/examples/multimedia/video/qmlvideo/images/progress_handle_pressed.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="10px"
- height="46px"
- version="1.1">
- <g>
- <defs>
- <linearGradient id="MyGradient1" x1="0%" y1="0%" x2="100%" y2="100%">
- <stop offset="0%" stop-color="skyblue" />
- <stop offset="100%" stop-color="darkblue" />
- </linearGradient>
- </defs>
- <rect
- stroke="white"
- fill="url(#MyGradient1)"
- stroke-linecap="round"
- stroke-linejoin="round"
- stroke-width="2"
- width="8"
- height="44"
- x="1"
- y="1"
- rx="4"
- ry="4"/>
- </g>
-</svg>
diff --git a/examples/multimedia/video/qmlvideo/images/titlebar.png b/examples/multimedia/video/qmlvideo/images/titlebar.png
deleted file mode 100644
index 51c90082d052a94af34488ca9a13842122f7d7a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1436
zcmV;N1!MY&P)<h;3K|Lk000e1NJLTq001!n001lq1^@s6%+yd>00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXW1
z0xv7!9LBW(000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000E{Nkl<Z
zXx`PDzit~x5XOJAx1{I@R?^xq6ay}j0504Ha9+XBk|J%IJY8xxR^!45+!zo9Ie|^y
z?arjw-MhWxk&>Liq!w7*fp`1oo9~;MC5Hkm0Ga8f)%S;LHn|^l4>W+QI@MK<0LU%?
zTCN^g=1tdNq`Dpph<f7&#N2xjKFg}9x;p|{O<B-t^AQL@@W6u%WSN2NlGq_Z=*0Q~
z=ztdJJa7uEfRo&p6_BO^a3~N3NDZLPeGRM&h;MR#kbx|6cL(&1sV`^+V3PrS0=x&#
zR;!a&=jY%5`s~>=PESv9&Y_yal)K%ETFKXCtR`vY67D3wB9@+&cbGgIArTN6+wSAX
zkGy^RmUr*o{T4#Fkk#tskC!ih`Tfb0Cxj5Vy1F8SK-YDE!#OZB%*L~eNSa)23&d?U
zSw1i0>gRr9IT1mtHP62Lmb0@nE-o&3^XAQ;^5Vq{d;a`6A3l8G`uZB@98Hs4A;w4}
zZZ8P$T;_Us-Wa3LiY3JoBbsA{322^IDj+WNr!^z_J?9)<*YWV-LmoYP#Ov3u@#p8~
zTwPspd3nidwF01RTNaB2BC@r4CKHDcwm?9#oSA`>USgwAW7e}#gkM0Yvk41^nr1^7
z&N;5HuQ@q6;px+-_|@_O@8ADLBaYYwR2A=iy0?Jz0cyTE=eGiSB!O3eXvr9oHkkl)
zJria&VhTXjdXO$lOS6-T2wfXkEEZf|Uh??yV|<K}&8EZqMAKriKvmhapII)KJ>9$6
z$kf}E2}3pUBO*h1vm}>TF;RnPvP?}ajZsZ(s`c^F`G#o9X1&4r25)A>7;$dUeu#sd
zH0nr`HO-^wWQOLC8t2no3_(Fez${xkBmh<z%pgTD17`~?R&tDKoS7j`2$`~`StJ6w
zZi88*Z6ne+HeH)HrHI&IfyxhR37Cb^xkN<hB<?(`7!b0hi!q9Q3ae)8!B7^fu}P05
zsAz}~I(!I$7-L>=yunfEn^?XuQ?3Ij+Zzn(@H!pav#Pqq_?!|nMq-S~Ct{2l-QZ~b
zHR{$P`zF6tD!u{4zWIxhQbJa`7!wn!ntVca%bFsRXx#Sb;tV@Ca^rcTGS~=!F~4Rd
zD^=}7d=H{l@KpDMcDE-M<BOS?g72+-!x2qHP%)xL+R!CAmBFTiWmJ=l%5~1#QaR{d
zTAj(~Kon!{@<ZnwS|X{&!Lg?qwBGz2?fn8X?A*n%=RnlM=X^s|QywDAscl=ju1n|`
zGf{HKF1?FLAHVMcq8vqb9c9GWV!w`t<pdB-S+^~I-ELU78=P~q*8Y;{^EFzLdiQya
zE6C>beynXOK|hy7X0?B$O;vFv(d|Qf^dRaKe_z@t5t}6@ZhHA%GI8viucfZ4DLUOJ
z%g-f2H+QV4licii=|7xc|4$k9K5-Z1_4nO<nfz-z`Hdi&rs<Eo{g<Z<$T@cu((<=K
zDk3yZ(`WW_wklsv4(;4Gf`~Ep091AK(@F82L(9oG;%J&Z)@*8Nxuc9!{)eA_<i0ln
zey)DjUojM0>T1!U>l1aAsH<udpMg&v_&Yz?FcerykwrLc-OeUp`VtqDBFjG+#F}y4
z?$9jkW1}$A0UMtw3EBG7Dk=wLVai7NLA?Mem7~sQ2D*v$kEQ%OCo7$@;xmBAaTem|
qKomxLW_+gPnEw(nC#%ulBK`%3l#FT?MBUf`0000<MNUMnLSTaHVxb-Y
diff --git a/examples/multimedia/video/qmlvideo/images/titlebar.sci b/examples/multimedia/video/qmlvideo/images/titlebar.sci
deleted file mode 100644
index 0418d94cd..000000000
--- a/examples/multimedia/video/qmlvideo/images/titlebar.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 10
-border.top: 12
-border.bottom: 12
-border.right: 10
-source: titlebar.png
diff --git a/examples/multimedia/video/qmlvideo/images/up.png b/examples/multimedia/video/qmlvideo/images/up.png
index b05f8025d0157a5e7b2792b058cdb4553b1d6bff..6823de0040faa2b40088178f9de0aaa2a33f4ee9 100644
GIT binary patch
literal 1268
zcmeAS@N?(olHy`uVBq!ia0vp^LO?9T!3HFAj=Wa~Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&saCvz|c^^%uLVF
z#MI2pP)EVYz|ctF0Eo<V4Na^}&8&>f6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M(
zT(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}<f6=ilFa-(1(1n}N%^HE
zwn{*kLcEY$05>+T7#d8#0MoBXEYLU9GXQxBrqI_HztY@Xxa#7Ppj3o=u^L<)Qdy9y
zACy|0Us{w5jJPyqkW~d%&PAz-CHX}m`T04pPz=b(FUc>?$S+WE4mMNJ@J&q4%mWE%
zf_3=%T6yLbmn7yTr+T{BDgn*V%gju%a<MdVbv1Ufbh5N?H8gZJb~JS~w={DzGjp_X
zb~HC}h3R$4PcF?(%`1WFO+n~&#HkmQ7;+1MHoK%2WtOF;xE1B+Du6w0m5JLe<~YrR
z>P^Az77Ltu^?{Dj2SqJXRKtXT=?BDwCtM&0p7c}mfa$#mn6UdBzjZM%Fs6CBIEGZ*
zS~GROm$RWr`(DGQ1?R4rZ+N65vSvm8gZW<K-s0t=jy0^-7CWppEJBXD7l^o&2<lpJ
zKYF3?DB+J%`i_|Vw<mp>?fGn%#QS}+KIuEBnAvb~;U`Nsi%k<JXdYsnWg<Ai^iXg6
zg8XO(1D6}_vnN$Ke^q(X)8Hd;D<drE`iinWc7KwX6pCAZi#!oHTix+LQM93DgX(Qb
z7x@h41DRFxu10i+sebL5)@YORJgRr=q+Kq)3hygF_a2Md(jB(T@n6W5vr!D;d(U0U
zT61+rmdUlOHr7pdPe<jt`iYp<t>*|0eOlwSa_!rIo8bZ;=T@q0$a;AATeJNhA+d{%
zOSE3}v5GZmo%#~&yYAQulP7Xn8)tAcajww`UlQ}9>qOXm4&xU-LEbN>u`X-YIu-JK
z{={qbdzaNIF8#fC_2Ww2OWT*5asFNR_36j+m78n2dwz&%{)tVt&Mn;f_^!F3xaf_=
e2hP>ANHDZN+w`o>Y1uwdIppc;=d#Wzp$P!%^~9C{
delta 651
zcmV;60(AZK36=$r7k?561^@s6R?d!B00001b5ch_0Itp)=>Px#24YJ`L;(K){{a7>
zy{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXS@05=qo0T_V*00I_CL_t(I
z%e|D(YZE~f$3JgoH`$m3@}o^mwTd1D5%pxX218XWdhp;Mpnpf(i`0|eyeoL`%|F2Z
zKoAr>NKwR-pa?2eNi}JHY?GSo?0V>K8`3uF#RrcWn3>P}zM1z1{-ar;k2L*<^-?UZ
zZ);mF887GnD}eb|B@?N%y?F8J!OrztlfA>o^i!Y$#Qs*1Xe|XNVcj`5yZ>f+Htp=m
zRdqVkJK(lCx_{Q>gKzjgtZW-dYbj)M&cmrnac=rTQu}%t<GW<?sO%V%Zj%%32Jd{s
zH^AQwR7|GqyQj*9xyt1vVps8ui&6nvLoN^5yp)=&9I3DH9=2eEpuMTIeXo4JG(SC)
z)H=R`=e1DcV=2&~=kkynmx*SbL-ikg0=@!f5On4AOn+?Q<WwgcOEiEEO8iYg1Y38(
zH>gxf_I11D8#UelwLwtl%SZ3m%V*wrby*e9oJ{~dtOz1tD`>95;{Cw9UE)=v#v|Z0
z&{qSX&%guVnynp@P6k`R3f&HYmVgLNU><k^tONdF#Rh-}bVb0D080g^FeRlxLS^Az
z7gz)OKz}e?`ax75I*cAclmex}R)P>jK~3~(JNA$eAihC-5CH`U8*?qet_?YCeyi2~
z`Qmwd%yl;oiwc1P{XQ5&ElO!C_;z!E8^H0fuk;S-F9DB%c61do;_HY3aljr{4D`a+
l+EgVYx?e`D2SX#j0sXq9GS=auNdN!<07*qoL<FuvV1g~RAr$}s
diff --git a/examples/multimedia/video/qmlvideo/main.cpp b/examples/multimedia/video/qmlvideo/main.cpp
index 5d5b8b33d..3edee5ab6 100644
--- a/examples/multimedia/video/qmlvideo/main.cpp
+++ b/examples/multimedia/video/qmlvideo/main.cpp
@@ -123,13 +123,14 @@ int main(int argc, char *argv[])
const QStringList moviesLocation = QStandardPaths::standardLocations(QStandardPaths::MoviesLocation);
const QUrl videoPath =
- QUrl::fromLocalFile(moviesLocation.isEmpty() ?
- app.applicationDirPath() :
- moviesLocation.front());
+ QUrl::fromLocalFile(moviesLocation.isEmpty() ?
+ app.applicationDirPath() :
+ moviesLocation.front());
viewer.rootContext()->setContextProperty("videoPath", videoPath);
QMetaObject::invokeMethod(rootObject, "init");
+ viewer.setMinimumSize(QSize(640, 360));
viewer.show();
return app.exec();
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml
index ea686ea3f..4f5cbada4 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml
@@ -33,30 +33,31 @@
import QtQuick 2.0
-Rectangle {
+Item {
id: root
- color: textColor
- radius: 0.25 * height
property string text
- property color bgColor: "white"
- property color bgColorSelected: "red"
- property color textColor: "black"
+ property color bgColor: "#757575"
+ property color bgColorSelected: "#bdbdbd"
+ property color textColor: "white"
+ property color textColorSelected: "black"
property alias enabled: mouseArea.enabled
+ property alias radius: bgr.radius
signal clicked
Rectangle {
- anchors { fill: parent; margins: 1 }
+ id: bgr
+ anchors.fill: parent
color: mouseArea.pressed ? bgColorSelected : bgColor
- radius: 0.25 * height
+ radius: height / 15
Text {
id: text
anchors.centerIn: parent
text: root.text
- font.pixelSize: 0.5 * parent.height
- color: mouseArea.pressed ? bgColor : textColor
+ font.pixelSize: 0.4 * parent.height
+ color: mouseArea.pressed ? textColorSelected : textColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml
index c9e7cd109..33a55ebd7 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml
@@ -38,6 +38,8 @@ Rectangle {
color: "transparent"
opacity: 0.0
property alias enabled: mouseArea.enabled
+ property int dialogWidth: 300
+ property int dialogHeight: 200
state: enabled ? "on" : "baseState"
states: [
@@ -70,9 +72,9 @@ Rectangle {
Rectangle {
anchors.centerIn: parent
- width: 300
- height: 200
- radius: 10
+ width: dialogWidth
+ height: dialogHeight
+ radius: 5
color: "white"
Text {
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
index 466ea8b97..33109bd34 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
@@ -40,6 +40,9 @@ Rectangle {
property string folder
+ property int itemHeight: Math.min(parent.width, parent.height) / 15
+ property int buttonHeight: Math.min(parent.width, parent.height) / 12
+
signal fileSelected(string file)
function selectFile(file) {
@@ -66,12 +69,12 @@ Rectangle {
Rectangle {
id: root
- color: "white"
+ color: "black"
property bool showFocusHighlight: false
property variant folders: folders1
property variant view: view1
property alias folder: folders1.folder
- property color textColor: "black"
+ property color textColor: "white"
FolderListModel {
id: folders1
@@ -103,34 +106,39 @@ Rectangle {
fileBrowser.selectFile(path)
}
width: root.width
- height: 52
+ height: folderImage.height
color: "transparent"
Rectangle {
- id: highlight; visible: false
+ id: highlight
+ visible: false
anchors.fill: parent
- color: palette.highlight
- gradient: Gradient {
- GradientStop { id: t1; position: 0.0; color: palette.highlight }
- GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
- }
+ anchors.leftMargin: 5
+ anchors.rightMargin: 5
+ color: "#212121"
}
Item {
- width: 48; height: 48
+ id: folderImage
+ width: itemHeight
+ height: itemHeight
Image {
+ id: folderPicture
source: "qrc:/folder.png"
- anchors.centerIn: parent
+ width: itemHeight * 0.9
+ height: itemHeight * 0.9
+ anchors.left: parent.left
+ anchors.margins: 5
visible: folders.isFolder(index)
}
}
Text {
id: nameText
- anchors.fill: parent; verticalAlignment: Text.AlignVCenter
+ anchors.fill: parent;
+ verticalAlignment: Text.AlignVCenter
text: fileName
- anchors.leftMargin: 54
- font.pixelSize: 32
+ anchors.leftMargin: itemHeight + 10
color: (wrapper.ListView.isCurrentItem && root.showFocusHighlight) ? palette.highlightedText : textColor
elide: Text.ElideRight
}
@@ -142,7 +150,7 @@ Rectangle {
root.showFocusHighlight = false;
wrapper.ListView.view.currentIndex = index;
}
- onClicked: { if (folders == wrapper.ListView.view.model) launch() }
+ onClicked: { if (folders === wrapper.ListView.view.model) launch() }
}
states: [
@@ -160,17 +168,12 @@ Rectangle {
id: view1
anchors.top: titleBar.bottom
anchors.bottom: cancelButton.top
- x: 0
width: parent.width
model: folders1
delegate: folderDelegate
highlight: Rectangle {
- color: palette.highlight
+ color: "#212121"
visible: root.showFocusHighlight && view1.count != 0
- gradient: Gradient {
- GradientStop { id: t1; position: 0.0; color: palette.highlight }
- GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
- }
width: view1.currentItem == null ? 0 : view1.currentItem.width
}
highlightMoveVelocity: 1000
@@ -215,12 +218,8 @@ Rectangle {
model: folders2
delegate: folderDelegate
highlight: Rectangle {
- color: palette.highlight
+ color: "#212121"
visible: root.showFocusHighlight && view2.count != 0
- gradient: Gradient {
- GradientStop { id: t1; position: 0.0; color: palette.highlight }
- GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
- }
width: view1.currentItem == null ? 0 : view1.currentItem.width
}
highlightMoveVelocity: 1000
@@ -254,19 +253,29 @@ Rectangle {
}
Rectangle {
- id: cancelButton
- width: 100
- height: titleBar.height - 7
+ width: parent.width
+ height: buttonHeight + 10
+ anchors.bottom: parent.bottom
color: "black"
- anchors { bottom: parent.bottom; horizontalCenter: parent.horizontalCenter }
+ }
+
+ Rectangle {
+ id: cancelButton
+ width: parent.width
+ height: buttonHeight
+ color: "#212121"
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.margins: 5
+ radius: buttonHeight / 15
Text {
- anchors { fill: parent; margins: 4 }
+ anchors.fill: parent
text: "Cancel"
color: "white"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
- font.pixelSize: 20
}
MouseArea {
@@ -277,55 +286,66 @@ Rectangle {
Keys.onPressed: {
root.keyPressed(event.key);
- if (event.key == Qt.Key_Return || event.key == Qt.Key_Select || event.key == Qt.Key_Right) {
+ if (event.key === Qt.Key_Return || event.key === Qt.Key_Select || event.key === Qt.Key_Right) {
view.currentItem.launch();
event.accepted = true;
- } else if (event.key == Qt.Key_Left) {
+ } else if (event.key === Qt.Key_Left) {
up();
}
}
- BorderImage {
- source: "qrc:/titlebar.sci";
- width: parent.width;
- height: 52
- y: -7
+
+ Rectangle {
id: titleBar
+ width: parent.width
+ height: buttonHeight + 10
+ anchors.top: parent.top
+ color: "black"
Rectangle {
- id: upButton
- width: 48
- height: titleBar.height - 7
- color: "transparent"
- Image { anchors.centerIn: parent; source: "qrc:/up.png" }
- MouseArea { id: upRegion; anchors.centerIn: parent
- width: 56
- height: 56
- onClicked: up()
- }
- states: [
- State {
- name: "pressed"
- when: upRegion.pressed
- PropertyChanges { target: upButton; color: palette.highlight }
- }
- ]
- }
+ width: parent.width;
+ height: buttonHeight
+ color: "#212121"
+ anchors.margins: 5
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.right: parent.right
+ radius: buttonHeight / 15
- Rectangle {
- color: "gray"
- x: 48
- width: 1
- height: 44
- }
+ Rectangle {
+ id: upButton
+ width: buttonHeight
+ height: buttonHeight
+ color: "transparent"
+ Image {
+ width: itemHeight
+ height: itemHeight
+ anchors.centerIn: parent
+ source: "qrc:/up.png"
+ }
+ MouseArea { id: upRegion; anchors.centerIn: parent
+ width: buttonHeight
+ height: buttonHeight
+ onClicked: up()
+ }
+ states: [
+ State {
+ name: "pressed"
+ when: upRegion.pressed
+ PropertyChanges { target: upButton; color: palette.highlight }
+ }
+ ]
+ }
- Text {
- anchors.left: upButton.right; anchors.right: parent.right; height: parent.height
- anchors.leftMargin: 4; anchors.rightMargin: 4
- text: folders.folder
- color: "white"
- elide: Text.ElideLeft; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignVCenter
- font.pixelSize: 32
+ Text {
+ anchors.left: upButton.right; anchors.right: parent.right; height: parent.height
+ anchors.leftMargin: 5; anchors.rightMargin: 5
+ text: folders.folder
+ color: "white"
+ elide: Text.ElideLeft;
+ horizontalAlignment: Text.AlignLeft;
+ verticalAlignment: Text.AlignVCenter
+ }
}
}
@@ -366,14 +386,14 @@ Rectangle {
function keyPressed(key) {
switch (key) {
- case Qt.Key_Up:
- case Qt.Key_Down:
- case Qt.Key_Left:
- case Qt.Key_Right:
- root.showFocusHighlight = true;
+ case Qt.Key_Up:
+ case Qt.Key_Down:
+ case Qt.Key_Left:
+ case Qt.Key_Right:
+ root.showFocusHighlight = true;
break;
- default:
- // do nothing
+ default:
+ // do nothing
break;
}
}
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml
index 5443dc846..04c852a96 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml
@@ -39,9 +39,9 @@ Rectangle {
property alias buttonHeight: closeButton.height
property string source1
property string source2
- property int contentWidth: 250
+ property int contentWidth: parent.width / 2
property real volume: 0.25
- property int margins: 10
+ property int margins: 5
property QtObject content
signal close
@@ -54,9 +54,12 @@ Rectangle {
right: parent.right
margins: root.margins
}
- width: 50
- height: 30
+ width: Math.max(parent.width, parent.height) / 12
+ height: Math.min(parent.width, parent.height) / 12
z: 2.0
+ bgColor: "#212121"
+ bgColorSelected: "#757575"
+ textColorSelected: "white"
text: "Back"
onClicked: root.close()
}
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
index cb50e3653..dd2dfaf54 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
@@ -59,8 +59,7 @@ Scene {
}
text: content.started ? "Tap the screen to stop content"
: "Tap the screen to start content"
- color: "yellow"
- font.pixelSize: 20
+ color: "#e0e0e0"
z: 2.0
}
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml
index aa2b42678..63f94de28 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml
@@ -86,8 +86,7 @@ Scene {
margins: 20
}
text: "Tap on the content to toggle full-screen mode"
- color: "yellow"
- font.pixelSize: 20
+ color: "#e0e0e0"
z: 2.0
}
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml
index 7824589e0..99159591d 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml
@@ -91,8 +91,7 @@ Scene {
margins: 20
}
text: "Tap on the content to toggle full-screen mode"
- color: "yellow"
- font.pixelSize: 20
+ color: "#e0e0e0"
z: 2.0
}
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMulti.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMulti.qml
index f31cc9580..042c609d3 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMulti.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMulti.qml
@@ -65,8 +65,7 @@ Scene {
margins: 20
}
text: content() ? content().started ? "Tap to stop" : "Tap to start" : ""
- color: "yellow"
- font.pixelSize: 20
+ color: "#e0e0e0"
}
MouseArea {
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml
index 1f4559a5f..bdeff4e19 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml
@@ -53,7 +53,7 @@ Scene {
y: 0.5 * parent.height
width: content.width
height: content.height
- color: "yellow"
+ color: "#e0e0e0"
opacity: 0.5
SequentialAnimation on x {
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneRotate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneRotate.qml
index cfba508a2..2ad65f606 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneRotate.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneRotate.qml
@@ -56,7 +56,7 @@ Scene {
bottom: rotateNegativeButton.top
margins: parent.margins
}
- width: 90
+ width: Math.max(parent.width, parent.height) / 10
height: root.buttonHeight
text: "Rotate +" + delta
onClicked: content.rotation = content.rotation + delta
@@ -69,7 +69,7 @@ Scene {
verticalCenter: parent.verticalCenter
margins: parent.margins
}
- width: 90
+ width: Math.max(parent.width, parent.height) / 10
height: root.buttonHeight
text: "Rotate -" + delta
onClicked: content.rotation = content.rotation - delta
@@ -82,7 +82,7 @@ Scene {
verticalCenter: parent.verticalCenter
margins: parent.margins
}
- width: 30
+ width: Math.max(parent.width, parent.height) / 25
height: root.buttonHeight
enabled: false
text: content.rotation % 360
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml
index 976644b4b..8e6d11a86 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml
@@ -39,44 +39,64 @@ Rectangle {
property string sceneSource: ""
ListModel {
- id: list
- ListElement { name: "multi"; source: "SceneMulti.qml" }
- ListElement { name: "video"; source: "VideoBasic.qml" }
- ListElement { name: "video-drag"; source: "VideoDrag.qml" }
- ListElement { name: "video-fillmode"; source: "VideoFillMode.qml" }
- ListElement { name: "video-fullscreen"; source: "VideoFullScreen.qml" }
- ListElement { name: "video-fullscreen-inverted"; source: "VideoFullScreenInverted.qml" }
- ListElement { name: "video-metadata"; source: "VideoMetadata.qml" }
- ListElement { name: "video-move"; source: "VideoMove.qml" }
- ListElement { name: "video-overlay"; source: "VideoOverlay.qml" }
- ListElement { name: "video-playbackrate"; source: "VideoPlaybackRate.qml" }
- ListElement { name: "video-resize"; source: "VideoResize.qml" }
- ListElement { name: "video-rotate"; source: "VideoRotate.qml" }
- ListElement { name: "video-spin"; source: "VideoSpin.qml" }
- ListElement { name: "video-seek"; source: "VideoSeek.qml" }
- ListElement { name: "camera"; source: "CameraBasic.qml" }
- ListElement { name: "camera-drag"; source: "CameraDrag.qml" }
- ListElement { name: "camera-fullscreen"; source: "CameraFullScreen.qml" }
- ListElement { name: "camera-fullscreen-inverted"; source: "CameraFullScreenInverted.qml" }
- ListElement { name: "camera-move"; source: "CameraMove.qml" }
- ListElement { name: "camera-overlay"; source: "CameraOverlay.qml" }
- ListElement { name: "camera-resize"; source: "CameraResize.qml" }
- ListElement { name: "camera-rotate"; source: "CameraRotate.qml" }
- ListElement { name: "camera-spin"; source: "CameraSpin.qml" }
+ id: videolist
+ ListElement { name: "Multi"; source: "SceneMulti.qml" }
+ ListElement { name: "Video"; source: "VideoBasic.qml" }
+ ListElement { name: "Drag"; source: "VideoDrag.qml" }
+ ListElement { name: "Fillmode"; source: "VideoFillMode.qml" }
+ ListElement { name: "Fullscreen"; source: "VideoFullScreen.qml" }
+ ListElement { name: "Fullscreen-inverted"; source: "VideoFullScreenInverted.qml" }
+ ListElement { name: "Metadata"; source: "VideoMetadata.qml" }
+ ListElement { name: "Move"; source: "VideoMove.qml" }
+ ListElement { name: "Overlay"; source: "VideoOverlay.qml" }
+ ListElement { name: "Playback Rate"; source: "VideoPlaybackRate.qml" }
+ ListElement { name: "Resize"; source: "VideoResize.qml" }
+ ListElement { name: "Rotate"; source: "VideoRotate.qml" }
+ ListElement { name: "Spin"; source: "VideoSpin.qml" }
+ ListElement { name: "Seek"; source: "VideoSeek.qml" }
+ }
+
+ ListModel {
+ id: cameralist
+ ListElement { name: "Camera"; source: "CameraBasic.qml" }
+ ListElement { name: "Drag"; source: "CameraDrag.qml" }
+ ListElement { name: "Fullscreen"; source: "CameraFullScreen.qml" }
+ ListElement { name: "Fullscreen-inverted"; source: "CameraFullScreenInverted.qml" }
+ ListElement { name: "Move"; source: "CameraMove.qml" }
+ ListElement { name: "Overlay"; source: "CameraOverlay.qml" }
+ ListElement { name: "Resize"; source: "CameraResize.qml" }
+ ListElement { name: "Rotate"; source: "CameraRotate.qml" }
+ ListElement { name: "Spin"; source: "CameraSpin.qml" }
+ }
+
+ Component {
+ id: leftDelegate
+ Item {
+ width: root.width / 2
+ height: 0.8 * itemHeight
+
+ Button {
+ anchors.fill: parent
+ anchors.margins: 5
+ anchors.rightMargin: 2.5
+ anchors.bottomMargin: 0
+ text: name
+ onClicked: root.sceneSource = source
+ }
+ }
}
Component {
- id: delegate
+ id: rightDelegate
Item {
- id: delegateItem
- width: root.width
- height: itemHeight
+ width: root.width / 2
+ height: 0.8 * itemHeight
Button {
- id: selectorItem
- anchors.centerIn: parent
- width: 0.9 * parent.width
- height: 0.8 * itemHeight
+ anchors.fill: parent
+ anchors.margins: 5
+ anchors.leftMargin: 2.5
+ anchors.bottomMargin: 0
text: name
onClicked: root.sceneSource = source
}
@@ -85,20 +105,29 @@ Rectangle {
Flickable {
anchors.fill: parent
- contentHeight: (itemHeight * list.count) + layout.anchors.topMargin + layout.spacing
+ contentHeight: (itemHeight * videolist.count) + 10
clip: true
- Column {
+ Row {
id: layout
-
anchors {
fill: parent
- topMargin: 10
+ topMargin: 5
+ bottomMargin: 5
+ }
+
+ Column {
+ Repeater {
+ model: videolist
+ delegate: leftDelegate
+ }
}
- Repeater {
- model: list
- delegate: delegate
+ Column {
+ Repeater {
+ model: cameralist
+ delegate: rightDelegate
+ }
}
}
}
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SeekControl.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SeekControl.qml
index 9c3810134..f14fa402c 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SeekControl.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SeekControl.qml
@@ -35,7 +35,7 @@ import QtQuick 2.0
Item {
id: seekControl
- height: 46
+ height: Math.min(parent.width, parent.height) / 20
property int duration: 0
property int playPosition: 0
property int seekPosition: 0
@@ -45,8 +45,9 @@ Item {
Rectangle {
id: background
anchors.fill: parent
- color: "black"
+ color: "white"
opacity: 0.3
+ radius: parent.height / 15
}
Rectangle {
@@ -60,7 +61,6 @@ Item {
Text {
width: 90
anchors { left: parent.left; top: parent.top; bottom: parent.bottom; leftMargin: 10 }
- font { family: "Nokia Sans S60"; pixelSize: 24 }
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
color: "white"
@@ -71,7 +71,6 @@ Item {
Text {
width: 90
anchors { right: parent.right; top: parent.top; bottom: parent.bottom; rightMargin: 10 }
- font { family: "Nokia Sans S60"; pixelSize: 24 }
horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter
color: "white"
@@ -79,35 +78,36 @@ Item {
text: formatTime(duration)
}
- Image {
+ Rectangle {
id: progressHandle
- height: 46
- width: 10
- source: mouseArea.pressed ? "qrc:/images/progress_handle_pressed.svg" : "qrc:/images/progress_handle.svg"
+ height: parent.height
+ width: parent.height / 2
+ color: "white"
+ opacity: 0.5
anchors.verticalCenter: progressBar.verticalCenter
- x: seekControl.duration == 0 ? 0 : seekControl.playPosition / seekControl.duration * 630
+ x: seekControl.duration == 0 ? 0 : seekControl.playPosition / seekControl.duration * background.width
MouseArea {
id: mouseArea
anchors { horizontalCenter: parent.horizontalCenter; bottom: parent.bottom }
- height: 46+16
- width: height
+ height: parent.height
+ width: parent.height * 2
enabled: seekControl.enabled
drag {
target: progressHandle
axis: Drag.XAxis
minimumX: 0
- maximumX: 631
+ maximumX: background.width
}
onPressed: {
seekControl.seeking = true;
}
onCanceled: {
- seekControl.seekPosition = progressHandle.x * seekControl.duration / 630
+ seekControl.seekPosition = progressHandle.x * seekControl.duration / background.width
seekControl.seeking = false
}
onReleased: {
- seekControl.seekPosition = progressHandle.x * seekControl.duration / 630
+ seekControl.seekPosition = progressHandle.x * seekControl.duration / background.width
seekControl.seeking = false
mouse.accepted = true
}
@@ -120,7 +120,7 @@ Item {
interval: 300
running: seekControl.seeking
onTriggered: {
- seekControl.seekPosition = progressHandle.x*seekControl.duration/630
+ seekControl.seekPosition = progressHandle.x*seekControl.duration / background.width
}
}
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml
index f623aa412..b114d5bb4 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml
@@ -54,16 +54,16 @@ Scene {
verticalCenter: parent.verticalCenter
margins: parent.margins
}
- width: 150
+ width: Math.max(parent.width, parent.height) / 5
height: root.buttonHeight
text: "PreserveAspectFit"
onClicked: {
if (!content.dummy) {
var video = content.contentItem()
- if (video.fillMode == VideoOutput.Stretch) {
+ if (video.fillMode === VideoOutput.Stretch) {
video.fillMode = VideoOutput.PreserveAspectFit
text = "PreserveAspectFit"
- } else if (video.fillMode == VideoOutput.PreserveAspectFit) {
+ } else if (video.fillMode === VideoOutput.PreserveAspectFit) {
video.fillMode = VideoOutput.PreserveAspectCrop
text = "PreserveAspectCrop"
} else {
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
index 00580f782..05c6dd76c 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
@@ -56,55 +56,55 @@ Scene {
Column {
anchors.fill: parent
Text {
- color: "yellow"
+ color: "#e0e0e0"
text: "Title:" + content.contentItem().metaData.title
}
Text {
- color: "yellow"
+ color: "#e0e0e0"
text: "Size:" + content.contentItem().metaData.size
}
Text {
- color: "yellow"
+ color: "#e0e0e0"
text: "Resolution:" + content.contentItem().metaData.resolution
}
Text {
- color: "yellow"
+ color: "#e0e0e0"
text: "Media type:" + content.contentItem().metaData.mediaType
}
Text {
- color: "yellow"
+ color: "#e0e0e0"
text: "Video codec:" + content.contentItem().metaData.videoCodec
}
Text {
- color: "yellow"
+ color: "#e0e0e0"
text: "Video bit rate:" + content.contentItem().metaData.videoBitRate
}
Text {
- color: "yellow"
+ color: "#e0e0e0"
text: "Video frame rate:" +content.contentItem().metaData.videoFrameRate
}
Text {
- color: "yellow"
+ color: "#e0e0e0"
text: "Audio codec:" + content.contentItem().metaData.audioCodec
}
Text {
- color: "yellow"
+ color: "#e0e0e0"
text: "Audio bit rate:" + content.contentItem().metaData.audioBitRate
}
Text {
- color: "yellow"
+ color: "#e0e0e0"
text: "Date:" + content.contentItem().metaData.date
}
Text {
- color: "yellow"
+ color: "#e0e0e0"
text: "Description:" + content.contentItem().metaData.description
}
Text {
- color: "yellow"
+ color: "#e0e0e0"
text: "Copyright:" + content.contentItem().metaData.copyright
}
Text {
- color: "yellow"
+ color: "#e0e0e0"
text: "Seekable:" + content.contentItem().metaData.seekable
}
}
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml
index 5c1e6ab17..45d599b34 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml
@@ -56,12 +56,12 @@ Scene {
bottom: decreaseButton.top
margins: parent.margins
}
- width: 90
+ width: Math.max(parent.width, parent.height) / 10
height: root.buttonHeight
text: "Increase"
onClicked: {
var video = content.contentItem()
- video.playbackRate = video.playbackRate + delta
+ video.playbackRate += delta
}
}
@@ -72,12 +72,12 @@ Scene {
verticalCenter: parent.verticalCenter
margins: parent.margins
}
- width: 90
+ width: Math.max(parent.width, parent.height) / 10
height: root.buttonHeight
text: "Decrease"
onClicked: {
var video = content.contentItem()
- video.playbackRate = video.playbackRate - delta
+ video.playbackRate -= delta
}
}
@@ -88,7 +88,7 @@ Scene {
verticalCenter: parent.verticalCenter
margins: parent.margins
}
- width: 50
+ width: Math.max(parent.width, parent.height) / 25
height: root.buttonHeight
enabled: false
text: Math.round(10 * content.contentItem().playbackRate) / 10
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSeek.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSeek.qml
index 2d43bdf6e..05a312e37 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSeek.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSeek.qml
@@ -36,6 +36,7 @@ import QtQuick 2.0
Scene {
id: root
property string contentType: "video"
+ contentWidth: parent.width
Content {
id: content
@@ -51,13 +52,12 @@ Scene {
anchors {
left: parent.left
right: parent.right
- leftMargin: 100
- rightMargin: 140
+ margins: 10
bottom: parent.bottom
}
duration: content.contentItem() ? content.contentItem().duration : 0
playPosition: content.contentItem() ? content.contentItem().position : 0
- onSeekPositionChanged: { content.contentItem().seek(seekPosition); }
+ onSeekPositionChanged: content.contentItem().seek(seekPosition);
}
Component.onCompleted: root.content = content
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml
index c2c15439f..96acb4bc4 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml
@@ -35,22 +35,21 @@ import QtQuick 2.0
Rectangle {
id: root
- width: 640
- height: 360
+ anchors.fill: parent
color: "black"
property string source1
property string source2
- property color bgColor: "#002244"
+ property color bgColor: "black"
property real volume: 0.25
property bool perfMonitorsLogging: false
property bool perfMonitorsVisible: false
QtObject {
id: d
- property int itemHeight: 40
+ property int itemHeight: root.height > root.width ? root.width / 10 : root.height / 10
property int buttonHeight: 0.8 * itemHeight
- property int margins: 10
+ property int margins: 5
}
Loader {
@@ -92,6 +91,9 @@ Rectangle {
right: exitButton.left
margins: d.margins
}
+ bgColor: "#212121"
+ bgColorSelected: "#757575"
+ textColorSelected: "white"
height: d.buttonHeight
text: (root.source1 == "") ? "Select file 1" : root.source1
onClicked: fileBrowser1.show()
@@ -105,6 +107,9 @@ Rectangle {
right: exitButton.left
margins: d.margins
}
+ bgColor: "#212121"
+ bgColorSelected: "#757575"
+ textColorSelected: "white"
height: d.buttonHeight
text: (root.source2 == "") ? "Select file 2" : root.source2
onClicked: fileBrowser2.show()
@@ -117,24 +122,57 @@ Rectangle {
right: parent.right
margins: d.margins
}
- width: 50
+ bgColor: "#212121"
+ bgColorSelected: "#757575"
+ textColorSelected: "white"
+ width: parent.width / 10
height: d.buttonHeight
text: "Exit"
onClicked: Qt.quit()
}
+ Row {
+ id: modes
+ anchors.top: openFile2Button.bottom
+ anchors.margins: 0
+ anchors.topMargin: 5
+ Button {
+ width: root.width / 2
+ height: 0.8 * d.itemHeight
+ bgColor: "#212121"
+ radius: 0
+ text: "Video Modes"
+ enabled: false
+ }
+ Button {
+ width: root.width / 2
+ height: 0.8 * d.itemHeight
+ bgColor: "#212121"
+ radius: 0
+ text: "Camera Modes"
+ enabled: false
+ }
+ }
+
+ Rectangle {
+ id: divider
+ height: 1
+ width: parent.width
+ color: "black"
+ anchors.top: modes.bottom
+ }
+
SceneSelectionPanel {
id: sceneSelectionPanel
itemHeight: d.itemHeight
- color: "#004444"
+ color: "#212121"
anchors {
- top: openFile2Button.bottom
+ top: divider.bottom
left: parent.left
right: parent.right
bottom: parent.bottom
- margins: d.margins
}
- radius: 10
+ radius: 0
onSceneSourceChanged: {
sceneLoader.source = sceneSource
var scene = null
@@ -205,7 +243,9 @@ Rectangle {
ErrorDialog {
id: errorDialog
- anchors.fill: parent
+ anchors.fill: root
+ dialogWidth: d.itemHeight * 5
+ dialogHeight: d.itemHeight * 3
enabled: false
}
diff --git a/examples/multimedia/video/qmlvideo/qmlvideo.qrc b/examples/multimedia/video/qmlvideo/qmlvideo.qrc
index 9471eb6b7..6418215d0 100644
--- a/examples/multimedia/video/qmlvideo/qmlvideo.qrc
+++ b/examples/multimedia/video/qmlvideo/qmlvideo.qrc
@@ -1,13 +1,8 @@
<RCC>
<qresource prefix="/">
<file alias="leaves.jpg">images/leaves.jpg</file>
- <file alias="close.png">images/close.png</file>
<file alias="folder.png">images/folder.png</file>
- <file alias="titlebar.png">images/titlebar.png</file>
- <file alias="titlebar.sci">images/titlebar.sci</file>
<file alias="up.png">images/up.png</file>
- <file alias="progress_handle.svg">images/progress_handle.svg</file>
- <file alias="progress_handle_pressed.svg">images/progress_handle_pressed.svg</file>
<file>qml/qmlvideo/Button.qml</file>
<file>qml/qmlvideo/CameraBasic.qml</file>
<file>qml/qmlvideo/CameraDrag.qml</file>
diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
deleted file mode 100644
index fcf43f4b6..000000000
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtMultimedia 5.0
-
-VideoOutput {
- source: camera
-
- Camera {
- id: camera
- }
-}
diff --git a/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc b/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc
index f3ad27704..e7978e39f 100644
--- a/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc
+++ b/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc
@@ -3,7 +3,6 @@
<file>images/qt-logo.png</file>
<file>qml/qmlvideofx/Button.qml</file>
<file>qml/qmlvideofx/Content.qml</file>
- <file>qml/qmlvideofx/ContentCamera.qml</file>
<file>qml/qmlvideofx/ContentImage.qml</file>
<file>qml/qmlvideofx/ContentVideo.qml</file>
<file>qml/qmlvideofx/Divider.qml</file>
--
GitLab