From 5ff5327f43b84c12ffb451bbd2adc178933ee16c Mon Sep 17 00:00:00 2001 From: hawkeyexp Date: Sat, 22 Sep 2018 13:29:25 +0200 Subject: [PATCH] Rework player usage --- assets/home-hot.png | Bin 0 -> 3524 bytes assets/list-hot.png | Bin 0 -> 4066 bytes assets/player-hot.png | Bin 0 -> 3240 bytes assets/resources.qrc | 3 + .../f1x/openauto/autoapp/UI/MainWindow.hpp | 4 +- src/autoapp/UI/MainWindow.cpp | 44 ++++-- src/autoapp/UI/SettingsWindow.cpp | 5 +- src/autoapp/UI/mainwindow.ui | 138 ++++++++++++------ src/autoapp/UI/settingswindow.ui | 9 +- 9 files changed, 135 insertions(+), 68 deletions(-) create mode 100644 assets/home-hot.png create mode 100644 assets/list-hot.png create mode 100644 assets/player-hot.png diff --git a/assets/home-hot.png b/assets/home-hot.png new file mode 100644 index 0000000000000000000000000000000000000000..4b0ec03415747d48a2946d547dfeac752eeb2c3b GIT binary patch literal 3524 zcmZ{mWmFV;*Tw(CAVYTuh?g!2=}X5@LkbKslmY?+(g;$5Lzfq%%K?;bC8dY%mM$d) z1g?aD)Z_j7uJwM{=lA*SefC->`jMUn88H(v0DugkscQI#O8<$F;Lj{|^jP@=B6m&G z7XXmZ{3i&=e0LWBVtq$A{Lv!^H!rsr4sPzO2soV8-P6t9(b*0F-vz7@8fmmcFMqaj zqM{vzN!E5Vq$6ZCREfpVCUEn!5m9PIvAv(CGw7gFQ^RNO&y9k{#bMsi83>TZ5YNFj z*gnLC=0(K}UVaP6bDC*6+Zws4n^o8@KgQOK!El76shVO25*X4FmHSj*L;JdWzikL9 z1ru|+14_agTecV191w6GBq#TP9S3Uz5Z@^hLV(lF!ackfc}uaYl3@YCgh6m#34d!7 zVrYSqf1FAoP*R6ru<6`JAQvB44L!422ag1S70>IfDS*MAX9Pfic`_RvBsT%D(%40* z0tZ=8KK3|94WJ$ZT6^toX)q@U9wJQaHNnRQfE%SGsRo3k;GscOI3K_d09O4R9KIkd z1JJ4;naKToP)WJX|Hr9}YPm*EX|-T;LO~ChiHXpC-cba@16oOIJnKv)p-#UHM$uq# zim%7R0OTgn{n_^T+IN(^a&%NOuAcm<;BGs?ExV1)`pxE8nfssMzIg>r+z1HQFkxf~ zFfKPAxDN0go{;2vpT*i&Qz+Ge+?@rJWB32OQG5TkaejVtV`EOMTgBXZ&?N8%-T4$} za_xK(BzJXo`n7G1Gg#CzSOfq3Yv=HZPQksgM4~X8rLB04s|J$WE0!ttZiG!Eil27f zfZ8KYHS^7}XaRe)N+Mqm*W|73+N!`MRAE&De0;6|2}lquwtNQtrOiW$^1`j10dUmp z*71dx5Q=dK{Wj)vd#HG=k;?@z_J~9e0G_CF3Lyt;6#EDPP|XeI|ESD-(s5S+M{uv> z&Qb@-m6c?e3TJnx3Z)9ME#{u56<>LX3U9>7M;3l7;V()o;y43`h$MG%p-$t^m`yIPoJAL?pezu z|3>ot_IQ~C#X`ISyze3I`(2n=xAQ}x-Y%6-e+v*LJsbMOUQSxp%k=SaIkY+Y^x4=a zAAIUyH5`#7zK;s4^?hYclnzR7PP3Tx9;Z0f0+AFEG|ZrrhdrrSyOz6&>Z1Fuji^W@ zN>hMihB}@`m@*&=-YvyR9Ss-dX?%-^_>_;Fq@GltbT#DI5h%$L*JR>I8d$J(s)k7? z3$Q-u58uFUbZv-jFmJFOnG<7elsxj!jn;S#2cK&(Zc=WFZxYz0iz*xEWg0FQzeiF@ z#G9#9ystN`GKegu5%&jmV;}ONl*nHCb_PX;n=y*Np8pkH!XR;q zRtk3tGrushq_nVfrIf_@*mwvTU-HB#uu|Pv%xJxY=u2vuaVhrEo)NPVx)VkR|)$I14Ju=RA0^LJi)MBBVYX~#h^E3}7vYkbUw;yR5Yb{0;hscEUG zGR-oBGL5}f$;$mAY+=am)}LF8l)(K8d6SzMbgo`ay=3rZgMQb zeTzR0;FeuV@B-@;>$GoS35^qSdDH6us8hUg?6p|uTzBbp>CNLN;AZ32*4@=T$TZY# zEaWSc)sfZd8yOz?Ffx-NktHuOE4rPvoi&@a+F)hoYbH=%T>se)QN3YSXnIiJ;u>xy zZCZdbHnXfzufSGt%`{gu7f}^8>LuxwWzV3yKK`s9s4rW(lPHAXo$C$?Ts zGsM^Jh&9TZ(m*qy8()MTN5w{KhYSg&DF|gT_b&IhZfJR(dRTt*pFG88)ns+<7cW*F zNFF#IL@wnFi|6oVn~J>{@9KwtHQ1a`B*{s6=(JiMqz~5*M%Qg~2tN}}FsYdR*ihh8 zdS-pdpzuqnL7etTjEOhH1NW9@_bv5N!ltWr*1sdL%nEeTF_pB73~6+)=XjTV zH<=^d2HP{1l50!Kx*KiB>?iGawpIkQ&B;?s)3(ycUCHJbYROg~*Y2PGQd<;G8{u7S z4y}hb=C#XxZm}yG7#)#SMCKz;kiU_V2b0Tn*0blX69>!zEx*KnOfQa;=c$)2mKAy~9{YXJN$53vW@yj&Jq&(6ve&)fR26^9K zZ8z9MA3-unGUI>V^{#QatNLy1oDr>_-6xY-c=;xv{2OfQua_)n7UAbAnMaxGSw@+c z<~HU{`ojtnGrKGPR~n0dQM?nEGxgItMh-YG?1W4up^wJiU{kPxK|&WxR*N6%1Gb-y zu0E%5J8Yu#`ZlR{8@nyrB0Fkv^x5mEdU2D+6e2%d9Fu?n&*9Z4k}vo zTb`aM?JLj2mm{YY&2N_G4wqg($NA(QPb_Ji5rl`1-6WjGQ^4=UXT%RhkVWie|E(Y` zy{71Sy>nFrAG00f&Stpza5GfNKrbA0KD{?PI*~r{KJ6$isomvO!Sya~kFjd8x3l+t z+kmf_$di-Dm-`()OFk@zd8-uq8?RVj^WHjKd^$B6FS<-(OiH@Nho&E2JrfgL{PSFyOnC=dW!k>m zEY&1lb=~f;{7;DPPKqm~SX6Z91%z7m4hcyQx2|(J?E?}uXIf=t180c^LTUkVRlyJ{ zH6-N~_{p5I@n&EXecWw5KZNy}-}vQv|6ap!&U~w1`+T67+b=w&6ldd7_hTRjC~(k! z|1U7awVBjEjI<`7BRCRwxlR%Ol(X@7#9BCN^(Kq+`{G`j7#10|@jL2EE8s11$tR0* zI=1G$CaPl=?7KV8u~TT&ChXYGl0#Cb+qXbt)ufnqj=scH;6A5}p|a|fdTWn8exYSp zo&wTzqb{6%kt^fB3%jlvl4FCyLlB(j*BWVYLIKG@$w%nEX{D+87*DME?#uSiNRP}p}w16$e?^hL9s?Y0wq8w9qMS6mv_kB z%;K|92NBk3&*lUYN;%$FjN`jsu6;_Re6>`-D3;=W3s3oRNw_ z9b;TTY*ipX1bFTRhKfP2s=Q@q=QqEX7(zde>?}ReP*nQ)l1m(0sC&qF2YBNUdylwj zf9Q#MOWGMR>KC?>`I%E~!K9>=<|6l=HkCewxh07GQ@-kEvRNo{AUTJGa9e?J0Z-=w`KASzr+iKtYdi;{1Lo5Djzr{-jkg5 zmSU0fdGT2cef!7D}8|M$QYp?A!HsaGctON zjtH;k{queQ_}-s?@B4dS*Y~>bn1=?M;-hSTCUA=vv+Hg43=b5+5Qx9hV0v2*j5T+(ObV|78 z6PPYCEJfGbn3f1?42uh+N#y2dC#KRtvKP+N8g<{%(72M(zGOuq{7I`VQhC+BL@2hzHbPt zhLdpl04k!!C+yEJIU(RIR8diYql>T;Kmw*ni9nZrc9$qi^fl!!EYlVe_7>9Rmnf@C z6h;G7gW_Qyf$9TDSZ)Tl2`In^_9IS?>)@dfu;+QbH3hcCY2RE?X*Y5+@7K;xp@CkN()fT*^Gix#MB23=!Rqz!sOoOl|DC%`|cMyaV03y$P}hP z5axMRbpHU~^$}^o3tXH_1Ep#cDA-xBIQIF^8;!yb==u50jg2{-KA4TeutmrfqUUj! z#ihreP{qHv)78#3u5fX?a83NP)t=E4y%Lu3B;vP@i(3hrf163K|FTYT^l3YyE%|BI zji`O&)wA9mi@g-?@wMoSz8gjz*An40(EZ6kl;k2GCL={-?}_hmVRApH~@~? zyt}{g65)lpMtmRlzdlsC)GW9U!d$eId;xf*&LwO*+^8~01b})$IDefQ^GP>@U>5;P z_wB`Q(!ci7Z(&@0JuoU5$&)aaXZCzmZ(zJpm^xN|dy#Ldtdd0wcq01D$TRkCEqv-YF6b8|jS+`#qLh}HajYrS zOpEnM>Dev0Xxj&^i3&qN{LSB}c1^LA@CGBLZ)8nybeRm(+XqFYU!VAiWhKxRWPg43 ziAm|5bm8{bN>|E-1ZDW3Xx9%0LWw>PQQ?7JSiP(uakA4$Jx3K;F!>cFO^WvORrFsD@pW#N*%vp_6EjQ7^4hleA%O!pIa>zzM+436Sr z(Uw|*oHNu3cSWdzk?=klF6tP#I1l>6E$#Y$Oed))A53}~bM6S1XG>}^aVCFRc;enb zD3>A#6&Q-#$ld7Okl0|}U_Y`U$#qoq{pZYNjn{bCO^0!lYEyEPz&S%)&8#@fc&V(= z^o~@5HLSW2Wn60%U3ORUMV1^Uf=*kvq`D||ipiDU75B9EhhOWRrBpV9^sg3^BRiTu z(tqHc_>+-G(MAj+5xk7q41^2_Mt_Fd484zxQ*n%grlK-pKQp#7DKovzEcsFVuV@p8 zNm6xExl@_>MNG>pK2|JOkeVHvjhH5sKQalad0-}CvR+R7Ev?e5BKP4>6J`@cxk6cV z1)|K`ROO#gtIHSyt6sfcL-;>N1@({D+XtYePK=EKg6!_(l~FIkrTVz*G4rop^0#GN zvbM!3Rg@RX!6kGgEEY>G)ZQU!< z($g#}wJMD&HGg(U*X)<(e(ca_v$_bUP#e_YvE|W3B#hn8-8PvwSt=zdrPEiEKdlk2 za4%slY*Y9D>{WV@k=OYsEKkq7bUCnN`_6T zvW)f7ANf8i=qcz8Vn#7Vn3+teY$dT-@$KyG?Ah#NBmVZ-{P)d8yA zE7Drds>IUF+OF|Ib#C?jnYQY-(mSPSgJgrsyctAq-M^?WsPbmUy3IKPYz@j272<$! zq(?OO*YqAFcO-|jhP=O2A|#KVr>JDLW(|G*=^2f@x%_h0Sk8e;NdHONjtIhXoN9bd zVjXpNgs<;uu1WTkCW0P;ejag*jEm8IGa{U>ES$|eur$=Mq2qVzYxg~9@-#QQF}r8K z3|o63eem=kdNF@gGM_KcO5*v~-XZv^(dL8-X@07x`$|=)A>1$=(X`De;v|x2Q9WDN zT;gAWb2y||{;m8he_eT9QD#|u+3NAAOjq+z^N3-uci!X375Hn;>nGPi*At*L>^=m6 z7Za`)ZgcD6Ea(;c=Xe!)tn=@N`F*u_1!y%|wS+g-Z#KKD*gwll^O$DUF| zJ`DXa^OewH%OS2el#C}bI?^IaCEf>V$uuFBF6BS52!Fn!ey*OTzMPE^GnA_p(vjj< zt`K%pT##v%Y*iT$cCi|rw#>EE_RwXK6Xvgx_VVal`MZA{y_UO1x*klQAu?p=6IeLb za}rrfS1wE~D4(XPhcu8)`K3n1Uq<)t{?T3k`|%`!J*+(l4v`7z3FI8ymY>bwNQ+-T zC}}UTT`G{PU!p{C6aAK_{6o7Qx!zK?d>&oaOQ@%~l6;3)L{j1hUswgZeliNNi`a5` zIa1{u*>KhG71u1nmP+`=z41fUZ7U%X6zt;QXvxUoNOw6!cT4kO9W`DGC z82dpc=P>_zpSp+odlIT7O4mY&)pDz&%1y38(KirFvQB$jAj+JeO0gvt#qT+7Sh;VJ zUK85E9i;Cb{-}HSO?MN-{U@mz$!288&&An&J3~tmtCc2)^Qc^AW!jk78X7EpI_>K@ z-o=1T=4kKX&zXxUpUNxy&`-u)CS7*6mWA?cDAFp@x6&!R$mbV6k*}D4+CTlRffY%| z@M7B{P;hkdXT_Fw=h81@7zGv6e@stI&rPKdCYPEVX3xAP4w!@6e@pI7V{O`Tm&#u{ zv1Sl6{b`qJ=L_wNMx07bOvTPw+J&cGwSlMa{vh5Y-X$R?1!@-kZJKpb$<#PuM&PF= z#o)cptK36>A#!PQv-ddzYn(pnfg3wG;uRblx%|S*cfnQP38(J8WJR!wxWTfHvL0lc zWL?-e+O!&uDo@PpE(iV9#NMOKkyNw_)Hyc&@^oS6%~UetX#8DnYHmoV@SjC{Y!NDW z+i7gYjnezDmCEn?q{emJwnDqYnC(%E-%$g0^R7jUMOLl+W6xc`UB#>9DZ|0GoVKhQ zw5>b(AgH4$*af%4oF_B3bkY&{FWvRbbe^2jQpa(SH?ALdxu z-LU=fiR!-EJbWp7TE*sSaqe*OwOf~e!STeRCXOI7V*D!cG=UO+J0UY+B#J!hXP&IG zoZOnqv&)^orSS15!12lldq*0$&AU#*Z6oD$A6t9gs?aF zCe%sGSRa6(`v8PR0PyGfhC2Yf5Cve@9sv0a0O-Aw9``>0;5NCox|(Ug!d}*R9J4dS z;OFs+F+J}2T>ZvL&k@J;in=DYs?Suowf^4)=`#@=L_xgE?MPnBIHEP}-;}?KR@Icw z)~kL$?2dR83sXz8w)F7VZq%LhNcwX+b`jv(K<1Q0j;V^-yHL$|vW0oFJbs}#ei4!{ z(>E$R#O>3C0iu8m;C1~U$Rb_d2S>=p+wpBi!;rKto%-t6ZoQ)nery2g+N^&*C&7_r zp;JBW)+94KJIh%@^R`9drGS7y@@>%Nu+<0*N)5opZr{gfRxtHw1%``q=AE@6|yP@ULQ_*G(q3CKvbVrKR=DChe&2) zGLVn%z}{_i7Q6g9=@1-wb9hlFNLur=XxeSxAmT1zK@*+2A6r-NsO=$le>f{snqc%O zexvnIraK`N(98-d-t-X(^%J%`N}c(!)s})@=9Sa65m47nsdMy?FfMJFOK0OsQfekv zorZ*6)DuPouHr76LjI5^9`i0u`8Q-0t~8a~kxeY^-9I#|BAcSf98dbKMs6kduGLhB z_DE09D%qGrn>spk^Bd$>$O>ieFEf`KDkI4#9&$f_z7kdqBc6Dt$2!C%re2P`l=q2d zU*xA4E6-y1+*0IKttrW@h5ZxKQj%V+Tz5RGy}k_{7B1l-DKO>7+-jkT`p&7HWP85| zHWnl0XNOC1wi1Dy=@1#E8XF`~@A0e1#1!Jra zPi@J?0XK(*4jLilnzFY-S`BTnx&Ec-ZSLNos$N9T=D+~slcH@@t;I_-CP8@?TMEWY zzNTaf0j^EfbMy1{F+VJ6G*p7~aN))}>PBy&M0G7KNSzXKDR}^1vJ9$~o4!d|A2*kf zkl>|@tEXCXWEmX)gxxP)m;G&+BMT{^p}40^Hv6Kqn4@nr5?1&t#S=>jX;DeAp(BaR zl#Lf5RQpxD9q8RsgB4EIIh2h*)@F$MYQ3F==W1KdI9QLjstZJJ&9OC!%JZfeONCwB zSX49N+K#HL^O;8N6Sj>Up1y3mq?33(GJ3P)+C0_9BjyQk-aHa0f&>FMb_%(qaUHZUYEl4|@`*%tbt)7Bs3@{`t-BWBPB z+?p2t>+qgZ&^H~@T5ZfN4Ilyn99eLN!MZ`~T-r(7kekQNeYPg#^QTXKHOA%buP)C| z^F6TU>rtv~&-m@P2B7};=o~NQ^CEx9jupqRKP;X&JDI7r*^Yn)%=+e#>gwv|v&#GN z=1cvRt>uknDf#B?;!-Vz(0A{+&}sgXcZgGR*?Rx}{nqa8Zhcdel!u2$SY~0$IoutS zYk+vUxIL~xOr6MD$t>%?D5(@ z#rc_At{N~9JFYbzR#2mYlEDM=q76zV0@+Vq%N)}){=c~S-wav>3o3YkvsS#CrT!J> QCPaa@hJktw%>K>)0O?+jl>h($ literal 0 HcmV?d00001 diff --git a/assets/player-hot.png b/assets/player-hot.png new file mode 100644 index 0000000000000000000000000000000000000000..6689cc04ea7ae121ea02459861652945e86482b2 GIT binary patch literal 3240 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 a{2TzOHA1kH7nZpI0000pause-hot.png prevbig-hot.png nextbig-hot.png + list-hot.png + home-hot.png + player-hot.png coverlogo.png black.png Roboto-Regular.ttf diff --git a/include/f1x/openauto/autoapp/UI/MainWindow.hpp b/include/f1x/openauto/autoapp/UI/MainWindow.hpp index f383114..8595138 100644 --- a/include/f1x/openauto/autoapp/UI/MainWindow.hpp +++ b/include/f1x/openauto/autoapp/UI/MainWindow.hpp @@ -113,7 +113,7 @@ private slots: void on_horizontalSliderProgressPlayer_sliderMoved(int position); void on_horizontalSliderVolumePlayer_sliderMoved(int position); - void on_pushButtonPlayerPlay_clicked(); + void on_pushButtonList_clicked(); void on_pushButtonPlayerStop_clicked(); void on_pushButtonPlayerPause_clicked(); void on_positionChanged(qint64 position); @@ -125,12 +125,12 @@ private slots: void on_pushButtonPlayerPrevBig_clicked(); void on_pushButtonPlayerPrevAlbum_clicked(); void on_pushButtonPlayerNextAlbum_clicked(); + void on_pushButtonBackToPlayer_clicked(); void on_comboBoxAlbum_currentIndexChanged(const QString &arg1); void on_mp3List_currentRowChanged(int currentRow); void scanFolders(); void scanFiles(); - private: Ui::MainWindow* ui_; QString brightnessFilename = "/sys/class/backlight/rpi_backlight/brightness"; diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index 31390a4..b3a385d 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -549,10 +549,11 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi connect(player, &QMediaPlayer::durationChanged, this, &MainWindow::on_durationChanged); connect(player, &QMediaPlayer::metaDataAvailableChanged, this, &MainWindow::metaDataChanged); - //ui_->labelFolderpath->hide(); - ui_->pushButtonPlayerPlay->hide(); + ui_->pushButtonList->hide(); + ui_->pushButtonBackToPlayer->hide(); ui_->PlayerPlayingWidget->hide(); - + ui_->pushButtonPlayerStop->hide(); + ui_->pushButtonPlayerPause->hide(); //this->musicfolder = QString::fromStdString(configuration->getMp3MasterPath()); //this->albumfolder = QString::fromStdString(configuration->getMp3SubFolder()); //ui_->labelFolderpath->setText(this->musicfolder); @@ -1204,15 +1205,13 @@ void f1x::openauto::autoapp::ui::MainWindow::on_horizontalSliderVolumePlayer_sli ui_->volumeValueLabelPlayer->setText(QString::number(position) + "%"); } -void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerPlay_clicked() +void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonList_clicked() { - QString path = this->musicfolder + "/" + this->albumfolder + "/" + this->selectedMp3file; - player->setMedia(QMediaContent(QUrl::fromLocalFile(path))); - player->play(); - //qDebug() << player->errorString(); - ui_->pushButtonPlayerPause->setStyleSheet( "background-color: rgb(233, 185, 110); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(0,0,0);"); - ui_->mp3selectWidget->hide(); - ui_->PlayerPlayingWidget->show(); + ui_->mp3selectWidget->show(); + ui_->PlayerPlayingWidget->hide(); + ui_->pushButtonList->hide(); + ui_->pushButtonPlayerPlayList->show(); + ui_->pushButtonBackToPlayer->show(); } void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerStop_clicked() @@ -1222,6 +1221,11 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerStop_clicked() ui_->pushButtonPlayerPause->setStyleSheet( "background-color: rgb(233, 185, 110); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(0,0,0);"); ui_->mp3selectWidget->show(); ui_->PlayerPlayingWidget->hide(); + ui_->pushButtonBackToPlayer->hide(); + ui_->pushButtonPlayerPlayList->show(); + ui_->pushButtonPlayerStop->hide(); + ui_->pushButtonList->hide(); + ui_->pushButtonPlayerPause->hide(); ui_->playerPositionTime->setText("00:00 / 00:00"); ui_->labelCurrentPlaying->setText(""); ui_->labelTrack->setText(""); @@ -1233,14 +1237,10 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerPause_clicked() if(player->state() == QMediaPlayer::PlayingState){ player->pause(); ui_->pushButtonPlayerPause->setStyleSheet( "background-color: rgb(218, 143, 143); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(0,0,0);"); - ui_->mp3selectWidget->show(); - ui_->PlayerPlayingWidget->hide(); }else{ ui_->pushButtonPlayerPause->setStyleSheet( "background-color: rgb(233, 185, 110); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(0,0,0);"); player->play(); player->setPosition(player->position()); - ui_->mp3selectWidget->hide(); - ui_->PlayerPlayingWidget->show(); } } @@ -1333,7 +1333,12 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerPlayList_clicked player->play(); ui_->mp3selectWidget->hide(); ui_->PlayerPlayingWidget->show(); + ui_->pushButtonPlayerPlayList->hide(); + ui_->pushButtonList->show(); + ui_->pushButtonBackToPlayer->hide(); + ui_->pushButtonPlayerStop->show(); ui_->pushButtonPlayerPause->setStyleSheet( "background-color: rgb(233, 185, 110); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(0,0,0);"); + ui_->pushButtonPlayerPause->show(); int currentalbum = ui_->comboBoxAlbum->currentIndex(); ui_->labelCurrentAlbumIndex->setText(QString::number(currentalbum+1)); } @@ -1433,3 +1438,12 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerNextAlbum_clicke player->play(); } } + +void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonBackToPlayer_clicked() +{ + ui_->PlayerPlayingWidget->show(); + ui_->mp3selectWidget->hide(); + ui_->pushButtonBackToPlayer->hide(); + ui_->pushButtonPlayerPlayList->hide(); + ui_->pushButtonList->show(); +} diff --git a/src/autoapp/UI/SettingsWindow.cpp b/src/autoapp/UI/SettingsWindow.cpp index ec164e8..24994ff 100644 --- a/src/autoapp/UI/SettingsWindow.cpp +++ b/src/autoapp/UI/SettingsWindow.cpp @@ -616,7 +616,10 @@ void SettingsWindow::loadSystemValues() dac = "Hifiberry - DAC Plus"; } if (getparams[23] == "hifiberry-digi") { - dac = "Hifiberry - DAC Digi"; + dac = "Hifiberry - Digi"; + } + if (getparams[23] == "hifiberry-digi-pro") { + dac = "Hifiberry - Digi Pro"; } if (getparams[23] == "hifiberry-amp") { dac = "Hifiberry - DAC Amp"; diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index 4fa9261..e42460a 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -7,7 +7,7 @@ 0 0 956 - 1296 + 1295 @@ -3173,6 +3173,90 @@ QSlider::handle:horizontal { background: rgb(255, 255, 255); height: 52px; width 10 + + + + + 0 + 0 + + + + + 0 + 40 + + + + + 16777215 + 40 + + + + background-color: rgba(114, 159, 207, 0.7); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/player-hot.png + + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 0 + 40 + + + + + 16777215 + 40 + + + + background-color: rgba(114, 159, 207, 0.7); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/list-hot.png + + + + + 32 + 32 + + + + @@ -3190,7 +3274,7 @@ QSlider::handle:horizontal { background: rgb(255, 255, 255); height: 52px; width 16777215 - 30 + 40 @@ -3215,48 +3299,6 @@ outline: none; - - - - - 0 - 0 - - - - - 0 - 40 - - - - - 16777215 - 30 - - - - background-color: rgba(138, 226, 52, 0.7); -border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); -outline: none; - - - - - - - :/play-hot.png - - - - - 32 - 32 - - - - @@ -3274,7 +3316,7 @@ outline: none; 16777215 - 30 + 40 @@ -3316,7 +3358,7 @@ outline: none; 16777215 - 30 + 40 @@ -3362,7 +3404,7 @@ outline: none; 16777215 - 30 + 40 @@ -3383,7 +3425,7 @@ outline: none; - :/back-hot.png + :/home-hot.png diff --git a/src/autoapp/UI/settingswindow.ui b/src/autoapp/UI/settingswindow.ui index f2ca641..8af4140 100644 --- a/src/autoapp/UI/settingswindow.ui +++ b/src/autoapp/UI/settingswindow.ui @@ -5172,12 +5172,17 @@ outline: none; - Hifiberry - DAC Digi + Hifiberry - DAC Amp - Hifiberry - DAC Amp + Hifiberry - Digi + + + + + Hifiberry - Digi Pro