From ef018332b97aac6482391c9d85ab9aa90b93ec7a Mon Sep 17 00:00:00 2001 From: Anika Raemer Date: Sat, 20 Oct 2018 18:06:19 +0200 Subject: [PATCH] added basic usi for music player. No model yet. --- LenaPi/MusicPlayer.qml | 44 ++++++++++++++++++++++++++ LenaPi/RoundButton.qml | 2 +- LenaPi/lenapi.qrc | 2 ++ LenaPi/main.qml | 1 + LenaPi/models/NavigationListModel.cpp | 8 ++++- LenaPi/models/NavigationListModel.h | 1 + LenaPi/qml.qrc | 1 + LenaPi/resources/pause.jpg | Bin 0 -> 3156 bytes LenaPi/resources/play.jpg | Bin 0 -> 3371 bytes 9 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 LenaPi/MusicPlayer.qml create mode 100644 LenaPi/resources/pause.jpg create mode 100644 LenaPi/resources/play.jpg diff --git a/LenaPi/MusicPlayer.qml b/LenaPi/MusicPlayer.qml new file mode 100644 index 0000000..04c4a72 --- /dev/null +++ b/LenaPi/MusicPlayer.qml @@ -0,0 +1,44 @@ +import QtQuick 2.0 + +Item{ + id: container + + Image { + id: backgroundImage + + anchors.fill: parent + source: "file:///home/ar/source/testLenaPi/benjamin/image.jpg" + fillMode: Image.PreserveAspectCrop + verticalAlignment: Image.AlignTop + } + RoundButton{ + id: backNavigation + anchors.left: parent.left + anchors.top: parent.top + anchors.margins: 20 + } + + Rectangle { + id: controlPannel + + anchors.left: parent.left + anchors.right: parent.right + anchors.bottom: parent.bottom + color: "#99ffffff" + height: 120 + + RoundButton{ + id: startPause + anchors.centerIn: parent + width: 80 + imageSource: "qrc:/icon_play" + + onClicked:{ + if(imageSource == "qrc:/icon_play") + imageSource = "qrc:/icon_pause" + else + imageSource = "qrc:/icon_play" + } + } + } +} diff --git a/LenaPi/RoundButton.qml b/LenaPi/RoundButton.qml index 2323615..1f65010 100644 --- a/LenaPi/RoundButton.qml +++ b/LenaPi/RoundButton.qml @@ -10,7 +10,7 @@ Rectangle { color: "white" - width: 50 + width: 65 height: width radius: width/2 diff --git a/LenaPi/lenapi.qrc b/LenaPi/lenapi.qrc index 174a464..6d29653 100644 --- a/LenaPi/lenapi.qrc +++ b/LenaPi/lenapi.qrc @@ -3,5 +3,7 @@ resources/back.png resources/defaultImage.png resources/sky.jpg + resources/pause.jpg + resources/play.jpg diff --git a/LenaPi/main.qml b/LenaPi/main.qml index 3826654..938dae7 100644 --- a/LenaPi/main.qml +++ b/LenaPi/main.qml @@ -18,6 +18,7 @@ Window { Loader{ anchors.fill: parent + //source: "MusicPlayer.qml" source: "Navigation.qml" } diff --git a/LenaPi/models/NavigationListModel.cpp b/LenaPi/models/NavigationListModel.cpp index 4369b46..906f610 100644 --- a/LenaPi/models/NavigationListModel.cpp +++ b/LenaPi/models/NavigationListModel.cpp @@ -33,6 +33,12 @@ bool NavigationListModel::isBackVisible() return mIsBackVisible; } +void NavigationListModel::navigateTo(NavigationItemModel *item) +{ + if(!item) return; + setModelItems(item->getSiblings()); +} + void NavigationListModel::navigateBack() { if(!mIsBackVisible || mItems.isEmpty()) return; @@ -40,5 +46,5 @@ void NavigationListModel::navigateBack() auto item = qobject_cast(mItems.at(0)); if(!item || item->getParentItem()->isRoot()) return; - setModelItems(item->getParentItem()->getSiblings()); + navigateTo(item->getParentItem()); } diff --git a/LenaPi/models/NavigationListModel.h b/LenaPi/models/NavigationListModel.h index 6f4e65e..3b6eaa1 100644 --- a/LenaPi/models/NavigationListModel.h +++ b/LenaPi/models/NavigationListModel.h @@ -22,6 +22,7 @@ public: bool isBackVisible(); + void navigateTo(NavigationItemModel* item); Q_INVOKABLE void navigateBack(); private: diff --git a/LenaPi/qml.qrc b/LenaPi/qml.qrc index 06ea4f2..a874956 100644 --- a/LenaPi/qml.qrc +++ b/LenaPi/qml.qrc @@ -6,5 +6,6 @@ MyScrollView.qml RoundButton.qml Navigation.qml + MusicPlayer.qml diff --git a/LenaPi/resources/pause.jpg b/LenaPi/resources/pause.jpg new file mode 100644 index 0000000000000000000000000000000000000000..65c879c63fe2c57cea65b3cfd1f491349c455b12 GIT binary patch literal 3156 zcmb7GYgkg*8s12vb`(V<6>Ln%%V=Vm=A1OO37DFWPFZ4wW@CB7BGV_!43VkRkVZvL z*}uK>t*sr#4uita!#Fu% zoV-3?;DmF>VK8n>+}!(Va*eS^Gwi9WEobLX0ynHFg##}g27QRqXKY&V8UVG0lYh4X6BZNIdBW`=_)(G3hkkkpF5>Xf+HYe( zqo@xN-;JsPYd8$V21fy5z)b(rQQLaH-vS>dC#YAwTEN4xY3=F#B(5U5)iI4u%|o<+(y-DlYcnnJwTtz zlT1`zNb?Xy#KJaMJ+1O&BxF4?|7OJzrh@M#(3y$v9b$5LBtp6m>uBZ@?&her9dn}` ztZBof{Lg)uJ*%~I7=%4Ij_@QZh7dCln7fJ!r+R)HY^6C1p63n^2ZRT#A`b*?{n9Is zY{ykF2i0BHH+)Bs}&P0os1ZTp)Uy=tWr6Dh+;qZD(0jl0oOA%2- zg zpf!jYy1q;FJ}LF;mfC)XO8Ct(&DgFBC+F`lbUvsu0x0QB@%>w&HTxG4345o5WIx?3 zK~~S)-cQ{4D2R1C$AF78?`d)^V07Ue_vP%0?xj|Xi_#2!o~L&_E*yU7^7UUf9Et2& z?Xc#WIH~VU@w%b&+$8=;1Y5nQK40SgJxN>JP#}bX)vOX)C0AmP|Fh>H68+3T^&Wjb zNbM}9%4De&*2);)h_%myzLOca{qZA>)5w&;OQ;6fBPWffJyLavdGO5Mww7W>XMqnn z(Or)XUw-pd@o%g@7&;@cYwVfp=7xD;vuIuTz;n+#yUqWtV8|}&$3wf&w~sq=8fy0L zIetx?o%Uwuv}c0qlAx}r=K$g4zeKcD;hNgp5dpf?UsCmKO;tU2^QC8u&^|p-eoOJnJ2`_cx(u3voQJuoM_RmI(;%2S=Dmh$Vp%eC_M#embbjeHrtX(D2i%_fi| zo{VjtjHHUPZ$c2kQf1Xvo1asIu}!DL*4=O)zE^>`<&pwP!pR!hCz+x7>WP#sHMk3Z zR^QJUNDNFjqd$n$Dn>daPb*#Gdu;0-&8#p2oX+gZK@0Uu)@MdQk<Y;U`H^rW zEUS5nGrpy!>s98=`exk3&al=KWH8(47}G-XNNxN19Q&*%v6FeNXgs?hPE=U6Wy)%n zo0aE|a1b2T_+`V9fBGf0>|e&cSkS5(zjD?(L%%cTPzo{tie!zjU}#0dyOTC=x&MVI4 zKd<^&b130p^kSz`BS3-RmNMvujn(q)(rFy#ff~*=g#)riR6Bb|Z!*XI`2^gR-s&PS zu>u`Tpj))w-m3t|{se2OYuewjb{|gf8lymY-5_2HCUz^TIk*vLt0O2Q900x-)(;f$Q%7$7V*?ptdnmrfc2YMM^eDA13IG#g!6a*?=#cw+8x9-N%P;UN}M3{_=R0%M!mN6CoC0-5jFu`6RlWBD$RD zzgl<-vKqJWmL|n&?bVruTsZ|~GdY&K$tIpB9E^HpotfJS0gc!UW;osH>F5Wh0&p?o za#DBhTHX)zj(1nlt(MT5H-(^&A&GfrSHX8T!cIz-Ll zT>ANV+6j;if!hdFd^rhJ6(}jt-ypEJ^d z^!tDphdjxwaC|v7MM;xGlb`pOr~dv$GVAAWXGjOUgoR-JBT>z+Qs~wf)VJ!5P5eoI zJuEOiI!tZMEoOf99!dnE9+O|88HGnGi;6&IdvjJr`2yp}K_|_2< zWd&fiFT!0KHSe_rhp{!{5BlG}m$odYI-Y5LF&~IHkK$k4Vr3ZPY z=8qE=`V-ypwVR>w8&50L76BK2wfzTULN_|}dsp9|(s_%BlUXB7oX^XYLGyQS_l?tp zxz6my8Q+%nx&t+BI-RDWZhK&%Vg8w|8@m?`4Ov{R{G}*kjS+Zp?VX9V1g~+3B2X=` z;}tfHvH9GpU4it@X+!Eo*^_1GJEK!N*WYPeG^9WBctqGiZl58pVcCyrq~cUBYIWIF zb;m7MLWrxk;VTowLuEx#A+F+{uobz=1m-lx}h;ffcZh5;8qV)fFlBU?JRQ0s-L5)Ymt+ z+C#f=`NfL!tiS_nDCR{2JVfDdBM@MIk{u(T1^|#p7tFf!s+iY09 z#%wJXyK(zQvn@EhHC}(c?T+to_M35dON5q|*2tMBJi z`1b!EIAsHb(SQb^0TjX*LShgo3_{ri83LFH2nBav4ul3$O&z783jTFOLr4S)g+iiK z)l^Zc@Cd|qBj3Q2vTEIWqOI_2fS66j3&fvgX z!76@{;NpU`J}#Ft%Sp_?TjD_+u-d0qA`fnkQQUN%Y@VZj$YAvT8ew)#G|;~gc5nT_ zdaQuSCyY6D@dDXTt*!}#r0t{~r|HA*yM@7+hl3?Ul||KuWjI_LZ*Otmd>u7g$d0X_ zw=-&WnqMiKaG%&l<15tWj8A9`AjqRXByjtN*mX*asHcsa*_VzXPi480 z5eDbn$e5g_=s}g}!O&Y}IqE*rm+fA^RQ_(y>UCjK$6hI+%0n;RvZQlKWw9l*>;2EX zEDTAgU~qGaeWH6~$+eXE*Z!WJZSAp2XwatXZ%wLaitkS&Gg7>N?wzHCKW5MS7Gqzt z_(?K$mB0DrMkVyahOqJWh&sFv`6oVwwBNVdlleI8v6B*F%w^#lQN|-pdmbI-Epf5eXGhO*LY{NbpwpnJQp(0MaIY7`1H}dL36^KZcg7u z1B(R@4>7@|z;n_AY3YI4_|bczo_yrp`**c*V?$Zio#c*8;cbjCGspT_fU2}fuG{aG z5#>PjmkicPyc!gIH;PSefW>@n(6D?tXh_SD7sz20aTs~FL=lTaX10lXZQ8f6d)`8_ z;vZv;^Nz6zobWs%*(X?!J8U&fXkz70@|nZig?HAqb%n7+1RGHpD}R_($nKHhbEnP1 zoeB8ziV|iex8zhw(pW;aM0W8#EyG)A@cmXVJW^Mf?CjJem+AJa$XD;xH~}?c;Fi;{ zlrgxF5r(y3Xedo+@jlB7uT}f$qdKkuIv*c>s9fN8sMO$OJXn+GHJb416reP;^WLb> z;;Yx6pT2mjD-2(1JEwo_sq;JOm_fx>2(cURXkEKVo5>YWAGHT|z1Qm$9O(=keO#l2 z{#Z+zKb{o##{7A0#u}$o=7Oi>I^KPNW@{UR+|rQ^Z*v;0x_3BMc8P7Pie=bb^!ySH6KgMvvm+~7bB zuvwVV-NDt=!N=Tg-!!L@E^nRGGcKM|l;Bs2@^1$2M%#bc# ze{R`D9ldqw%JoAIIa5k#)19M!Gsa?R{>ML})1OSK8IW9UWZ$8TI3#^SkMw%FGz-S@GS&AfYF0P=iu;lpT0~HOYAEZ zId86!MLb*2E18iG#J%JU$8f|ROyc1jMi{G_V7p84qkL-Jz3Ejvtncvj%64YtycL5} z+RgCgCsxd4e|YigC=i4wQ6Fo_rk&tXXW_vKXL7RLd1Ch>vf=yZHLlBqd0vx`)*OKG z(oSH{KaW1}O%CaKj`{}ItLoe#-goLfsY5is8sNeL2%)Vz&}%EoT3-xoXHYUJ2b#KsY=7cB%D|!t2w`>0m8U zowSdy&9xQRk1g~`OfJVb*eCMo#RHB2-Zk`IjRRWyq8=^jRT0Iy#jw^Qs6+43W<&Dm z4TEz$CFFN-iSI)%U{!=Uabu{#Xcu>EvH6W)Fd^un9mA75J{c6r?uRd~(xA=%0eYrB zE#8jnqFEs&lZuM@eOpSx&m{5mh)U>4ivwlGLXaZ0=h?EJ5UHGQSr6A&;Qws##?TrM z25HL?4|mfn_j6g^tBTR-dMN`3|4X2jL?>`kwdYaKgY%J*uQP>N^*c8OtSHN|Zkp_0 zswcRT_7R&wY9A65=XoR)k zRQpLwJks6WMx2cok^U^O@t!;K53vG&nLQN)Y;Yu;?eq9>8qR9ok`c7PxAIJ^q+XRi zRlMY!Vcowt?0dx3gF*D=5Xq)lS83@ELAHFq50&9JDXkIN1e>;Oi@SxU89zro0)-P= z3aDsU3yVE!E3gg6QeEK}9s{k39{=Dzu!lNI8!Fw@j7kme0CDmn`|kkR)os*m1TsXA z0xh%@xI-H#cO|qJmdv)G;NYy0ge25g`iW}0^1bLvWki}EC-?BZ3;V016Vr5bL* zG-eu{0}g%wzYj2eF88Kfv^m>l! z>tgk4!3aP6@NnAkDv2ZMbhD={j+=XA5id<|n;nQlP3?hQ_aGpF@C2~xozW(_CR^14 zga#)shnVL86DnBuHa?C9`b*yCS5X>j=*HEqJBY{~M4&kbg`t6$Lx?~|Bg;*rZc0uq zv-vOg22O9?Fx(sLHG{8ILMBVApBGpto}gUp&1P3^dEH$k_;8QW*nkvyQcUv>v$EXn zx+70z1y)HyiWX#7ca0ma>uy_QB(%41-}pT3v#1Q^iHoIm?Q!|3^3&gsw=Lf1*|%`S zZJgHxeq?xd+Fbqb<1_4P$NU01Ix*$5_Gkd#6=nj<4FQx8>IxB#Wy}7&N?Y!0sv(jwr4Awkcen_-?sQ!Mc8Tu=%*E znwYHEun7&!G6e|}vV5#6!1G)wyc_?#21orJ%c|zfoFV>QXv1ctnm2+5Ve}B_&5$b% aTyOgoD4?-1e2S!P+>NxRsXz#2=f43fS39Tx literal 0 HcmV?d00001