From af0c817f3a7b8a7aca40b1b88741cd9460a97799 Mon Sep 17 00:00:00 2001 From: Nikolay Tischenko Date: Wed, 22 Sep 2010 13:09:05 +0700 Subject: [PATCH] Added fullscreen button --- resources/fullscreen.png | Bin 0 -> 5970 bytes resources/resources.qrc | 2 + resources/window.png | Bin 0 -> 5647 bytes src/filestorage.cpp | 12 +- src/filestorage.h | 1 + src/libraryform.cpp | 9 +- src/mainwindow.cpp | 11 ++ src/mainwindow.h | 1 + src/player/player.cpp | 2 + src/ui/libraryform.ui | 449 +++++++++++++++++++++++----------------------- src/ui/mainwindow.ui | 45 +++++ 11 files changed, 299 insertions(+), 233 deletions(-) create mode 100644 resources/fullscreen.png create mode 100644 resources/window.png diff --git a/resources/fullscreen.png b/resources/fullscreen.png new file mode 100644 index 0000000000000000000000000000000000000000..5b60f687f8bf14ce3b130d207efd200d49c516d8 GIT binary patch literal 5970 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 Ql*NFxxjmuCY|o*80)k|8Q~&?~ literal 0 HcmV?d00001 diff --git a/resources/resources.qrc b/resources/resources.qrc index 24f51a2..444ab95 100644 --- a/resources/resources.qrc +++ b/resources/resources.qrc @@ -23,5 +23,7 @@ dynamic.png fav.png forward.png + window.png + fullscreen.png diff --git a/resources/window.png b/resources/window.png new file mode 100644 index 0000000000000000000000000000000000000000..d55f245591a4e02a3b0c20034f209e1f00885483 GIT binary patch literal 5647 zcmcIo2{@E%`+r4tkw_(-F(irE?9MUcmZW1#?SP)LP^ zvx7JSY&ae+j*Er<7d=M8VPX?uARcZb0)+XvY=n`xd=O@Wz#uS2G?bY!%+wfRY>F|% zm>9w^D3k>fWsWpP8KEt(Xbcu@0sHm`C&ZD3A$%HW8wxE@M+`crF_ugff+Ri& zeL^XTL7`DbC^Yo?!3wgVvmh{0E-;`dL0|xt1|p#C`oYj9M9Adw1sk~nmM8_F|hpE?s6k_GDm8A{<7iC5 zps^+>tg*>D6dH>{iKB~Ugu)7hR1OVvB;(=G69kJz$6A`(*^n)b$u<^t7GzsA+5&?n z*_seBBy(G1GqU-7cQTh2B1(o?clv+l?gr%oi$e|ipTdX^5)Aj9NaF3`@=09iw9$l) zoB*!)Fnw>svZ3=yEMWv5zL8I5gn(i-VE<~fk;bJ%Dx%F$-xT|a4N1s{;*cUi8WZLL z@r_-=AXGuJqDJnKW!kN*` zFo-3pB-kJ-hXL)c5gkg#kRTzPAQp-h3PN>|&E|3hFdLze&+-ou7b90L$4K-X%;QQdSTS=HZ@ZZnR zjAkQ=!RG^sfQ2k*E%RV!nf@Qje4nR(Yao)~XB=k3iaGp^iGwQ3%*}xH5>Oc+1>~~@ z|2>=kucZCA>_og>T(Ax-0hGZJ^9ax8;+%ZqG6RE&FB&XVdc*}?Kn(@yGu2>riuJ#i zTd35{1P^0^&|NWi{rt4F&l%I0(7_j7S4dGOB)S>kGqvMe`p&Kchy0h7&TQ|z9tB$d z%rmI>f!Z$QT;Bx^<~lc!1A+0OzRZ3i{^3?_|P(J6~SzIvMz=ZsPU5sY{Ou z17}BbE81l0WfjvMjNMJ670(b?Eq<}@W>fRaK7@6Qye3nq0WfR9l)+&Xx@ z%vC@l{DFcjQ16mck6IZ&t^AglwM8O&zeK$-)xt?OS`Dy{Od_5JtnDPCb2IfkfqW@o zM+?or7uaY7>{zqs^#dR}_hZ&B3Bd1&wz@=qDgavoCXfNBVaB8vy zo)`frNACa!;CvNO->RZe4#+A3DEEZewSd$vV8<;Top4}(7NBPL-W&JVx-yjk14yZ? za$L2prEQF#tWmIxw>M&yeygL#IyE!u0&2E3qA?dB|K{Ycqxo(pE5*NtcYGO9nGFPv3f*`xlJKIWa3~z zxw7>oAb+sadz2^A#`bth_0y;QeSJ?hG!gx%cf5B`F&ekmdrt;^io$)J7=Ll~m2M1X zYmB|r#}|!v$D9jRwjGw+@8A78+5T&l!t__I2k<6G|7srtwO)7C;3RVPp;1f$Jdt>K z?TytP)AUz8hF>HJJ*L3t9U(!24Qm!yo#xlF`h4FWbVV z-&sxC=dT8$0~`+r1Hd-2E`oBW!s@0h0Fd)z49?qVjx{VZte0Ndu&}#9;p+~w{Y2fS zMxqK)o*uoDzhmv$y+r-Ed*`(bb|C+-)-tJgXU3)R79kqFE-%9Kls{8t^BVN)V&tT3 zZpkj8YIi0`_#g1mNs`sbiv6hF;2@=XP#1PPLCqcRlxpgL_BcR+c{ymk$MY9h#&5B! zNnL*n!0i1RS7(nt5>xJu|3mQ-sk+E~#eTaJ3is(kbawL6{G9vzi!1Pl%#IJ-FJUTo zCKE_EQT1<@$rv{Up%Bg2i5Dyk< zb|sLS%ym^0NtiX&DGMAgoT7B7cGz`rJah&P&*Ydmtk6lj-ANBDm$5uz2wQh6wlBBu zdY^HhW}o(ZKlxmL>)=x#Jzwd2+}XKddA~}(Nxw9hiLvoIneFkc=s0DuY4T=b>G4XB zbMEm)OH4wtE${7H>gZHZdgADV6-*801nb-zVa?)aM_0LK-1qKi8MJ?s@kVkiOi?LL zec#OlhW_%LWirbc%fptP%XB`y{K3KHHz_D{^ibwNmU0%?%g3P7;8*q3JMu?29MwCj zX@I1hDL!5Nyja0&)T@P(d}f>H?lLf=) zIc`ZZ-eBxq;W2t7z)Ge!Gx*~%p{v}0eqqLF)Pd(}@7BIrt9jbQxf%^_2`o;}NcSmm zC~+^bAG%^zHe8r{`igC>@0XZGHa9n{*|Nr-k=(j4cfj+h=d(ij!lf>F?06ZXIIuwT zcr7{X8mDk1GweFjauXkSWeDmJjdnfKa$}-KtqaR}iat3l9=k!$V*c`suu(GJ~GU!;|xB0a1NM#)- zcC)2#fsfbbtrd2qxuvTg)t1&4E-tKgO>-^Dd&IbY{;$g0m1nA!pYMMn-Bnh}uG~#! z_-in#Zj@agNxPD^yJq)qlXw}W_@|3Xv^Hx+2`=*0u$!>Yvs;giSna+smOhAN__V3C zJu&XBT+*_(iIwY_^T3{=!KfDO8%;Qv=(M*5kwHM@Xf{8)b)|2Ea6EYH%gB!L+? z#^Iu_b0cOWtdaQc-|w3IzBbR-SaARPEz%43{&p*c-;bgKd(K9=k=$Y!mj-l@G-RrG z>ErWN1!2V#)OQ+$4+Q@2y@Xzz`E$&3-|ctJ>#J^6wYXj9=53GdA??wbrcXysw*!UI zt0fqci7_@Yeha>QjQmymT9OsE3;a<2blB!lezlFdP4eE-z5NZP+RR&jrj%+=3}m*Z zwz3w*Zj5^K=)Mf~HTB^2D8)6g@v+`VoJ|RGT_K|v-X51q%8)k zT;DqwxI`ZQGquh%LidJofnk63{xxS(>YSCFpXFflmS%^-*cd$a3VPq+)RbUiv9?QE zCF3pQbwFs#SunPI>IUav6>`;4ncIOCDQ6e@8p&4@PrspT)_-guQ_cXr1FqdmyknVO zlDF>O@ZE|#T`A_r-u*s3tlFsh@^EEAoRhbame1=eXLnkb+EdU3|l2m>28t!r(Sa`ej-g+y_Dash-GsSGA9ivc%%SkLh37TT5Np!NWHtJ0vG%bQV=U zuKwepRtKKqk^E@gko}^Yzg(TleHUh=WTxcx+p*?XIy`bj-{6E?&%`PvY-i}9U1wj) zJoqJ4i=l-+x=vK?8lbiI>{RByt5FfY?693aIIzBMee0I@mxb@kyZV=SU-r&E zhuzM8D}0NaN_*gTv-VhRc3Jh7!0M66E0=Z!Oblw~nYTV0yAtu&(&Ugp;X<>3!a!Z_2+)$nc!P4@T6@PN@YaywP-lmtQF?C|9rA%WfGV0^Qp~tQ5 zneE3j-e;s;WB*z(`L=#&`MIv<#^zO5Z-*PBw~cN3GTac>9j5i}WRJ32->=@0!`pAz0f2;)BiV)$-uY)1nzJ9JVms{<%}n_q?b@HdlA4^N)2H99Yq`Mwi4NUQ zN8S}sT_`J+2G=F}GCd+rd^)Uo@Rim1>1E1jW8D_(%ZiI*66)`!XZ2)O_wycdRt;Bi z7et3_6#(XdhBor5B+s6TV5%bk}yr>z=9$kB7`Y)ByU-ya6**bfHC3 z&SVp=?NjB3RaY0dJW!(~={XYZM;Qd2wIMI=GI&6*MW=~NPLF^=AQ{qcSR{oq2r?Uw z;hnFe5(rM@jyB@7Msz}1Ou_x(`;4B6cq!j>cL#t$xbaxxuW8B6iR#u8Cb1^5LS_Bv z1x)!tRS#g{eYFm?4tzc!|Bp35@zCb6{-Or&D!1aAge)gqC{R#zs<@aukthe$O~BWW zw^n~?Q?HqL&T)B{5p9D7Rxeg>t(FEHBI92}9sbFJeS%us0cZ;VM_X5N8F9zne**CU B(Y^ox literal 0 HcmV?d00001 diff --git a/src/filestorage.cpp b/src/filestorage.cpp index 93c7261..3d6d730 100644 --- a/src/filestorage.cpp +++ b/src/filestorage.cpp @@ -27,6 +27,8 @@ QList FileStorage::getPlaylists() { } Playlist FileStorage::getPlaylist(QString name) { + if (name == _CURRENT_PLAYLIST_SUBST_) + name = _CURRENT_PLAYLIST_NAME_; QFile playlistFile (_path_prefix+"/"+name+"."+_PLAYLIST_FILE_EXTENSION_); Playlist playlist; playlist.setName(PLAYLIST_BAD_NAME); @@ -68,6 +70,8 @@ QStringList FileStorage::getPlaylistsNames() { QString suffix = info.suffix().toLower(); if (suffix == _PLAYLIST_FILE_EXTENSION_) { QString name = info.fileName().replace(QString(".%1").arg(_PLAYLIST_FILE_EXTENSION_), "", Qt::CaseInsensitive); + if (name == _CURRENT_PLAYLIST_NAME_) + name = _CURRENT_PLAYLIST_SUBST_; playlistNames.append(name); } } @@ -75,7 +79,10 @@ QStringList FileStorage::getPlaylistsNames() { } void FileStorage::savePlaylist(Playlist playlist) { - QString filename = _path_prefix + "/" +playlist.name()+"."_PLAYLIST_FILE_EXTENSION_; + QString name = playlist.name(); + if (playlist.name() == _CURRENT_PLAYLIST_SUBST_) + name = _CURRENT_PLAYLIST_NAME_; + QString filename = _path_prefix + "/" +name+"."_PLAYLIST_FILE_EXTENSION_; QFile playlistFile(filename); if (playlistFile.exists()) { playlistFile.remove(); @@ -99,7 +106,8 @@ void FileStorage::removePlaylist(Playlist playlist) { } void FileStorage::removePlaylist(QString name) { - QString filename = _path_prefix + "/" + name + "." + _PLAYLIST_FILE_EXTENSION_; + QString filename = _path_prefix + "/" + (name == _CURRENT_PLAYLIST_SUBST_ ? _CURRENT_PLAYLIST_NAME_ : name) + + "." + _PLAYLIST_FILE_EXTENSION_; QFile file(filename); file.remove(); } diff --git a/src/filestorage.h b/src/filestorage.h index d49216f..dcc0edc 100644 --- a/src/filestorage.h +++ b/src/filestorage.h @@ -7,6 +7,7 @@ #include #define _CURRENT_PLAYLIST_NAME_ "___current" +#define _CURRENT_PLAYLIST_SUBST_ "Now playing" #define _PLAYLIST_FILE_EXTENSION_ "spls" #define _PLAYLIST_SIGNATURE_ "#SOMEPLAYLIST" #define _PLAYLIST_META_KEYWORD_ "#META" diff --git a/src/libraryform.cpp b/src/libraryform.cpp index 8ce4c1d..3704819 100644 --- a/src/libraryform.cpp +++ b/src/libraryform.cpp @@ -271,14 +271,17 @@ void LibraryForm::_delete_button() { QModelIndexList selected = ui->listView->selectionModel()->selectedIndexes(); QQueue to_delete; foreach (QModelIndex id, selected) { - _delete_track(_current_tracks.at(id.row())); to_delete.append(id.row()); } qSort(to_delete); int count = to_delete.count(); for (int i = count-1; i >= 0; i--) { - _lib->removePlaylist(_model->item(to_delete.at(i))->data().toString()); - _model->removeRow(to_delete.at(i)); + QString name = _model->item(to_delete.at(i))->text(); + if (name != _CURRENT_PLAYLIST_SUBST_) { + qDebug() << "deleting " << name; + _lib->removePlaylist(name); + _model->removeRow(to_delete.at(i)); + } } } } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f9d470e..dc82962 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -43,6 +43,7 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->searchLine, SIGNAL(textChanged(QString)), this, SLOT(_search(QString))); connect(ui->nextButton, SIGNAL(clicked()), this, SLOT(_nextItem())); connect(ui->prevButton, SIGNAL(clicked()), this, SLOT(_prevItem())); + connect(ui->fscreenButton, SIGNAL(clicked()), this, SLOT(_toggle_full_screen())); hideSearchPanel(); library(); } @@ -156,3 +157,13 @@ void MainWindow::_cancelSearch() { _player_form->cancelSearch(); } } + +void MainWindow::_toggle_full_screen() { + if (isFullScreen()) { + ui->fscreenButton->setIcon(QIcon(":/icons/fullscreen.png")); + showNormal(); + } else { + ui->fscreenButton->setIcon(QIcon(":/icons/window.png")); + showFullScreen(); + } +} diff --git a/src/mainwindow.h b/src/mainwindow.h index e9b4608..0a31c0e 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -42,6 +42,7 @@ private slots: void _nextItem(); void _prevItem(); void _cancelSearch(); + void _toggle_full_screen(); private: PlayerForm *_player_form; LibraryForm *_library_form; diff --git a/src/player/player.cpp b/src/player/player.cpp index 0f11f9d..fb000d9 100644 --- a/src/player/player.cpp +++ b/src/player/player.cpp @@ -133,6 +133,8 @@ void Player::_tick(qint64 ticks) { void Player::setPlaylist(Playlist playlist) { _playlist = playlist; _history.clear(); + _prev_history.clear(); + _queue.clear(); } void Player::seek(int s) { diff --git a/src/ui/libraryform.ui b/src/ui/libraryform.ui index 10e9499..6ba7458 100644 --- a/src/ui/libraryform.ui +++ b/src/ui/libraryform.ui @@ -50,7 +50,7 @@ Form - + 0 @@ -58,9 +58,9 @@ 0 - + - + 0 @@ -84,7 +84,7 @@ - :/icons/artists.png:/icons/artists.png + :/icons/back.png:/icons/back.png true @@ -92,20 +92,65 @@ - - - Qt::Horizontal + + + + 0 + 0 + - + + + 70 + 70 + + + - 40 - 20 + 70 + 70 - + + + + + + :/icons/add.png:/icons/add.png + + + true + + - + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/delete.png:/icons/delete.png + + + true + + + + + 0 @@ -129,7 +174,7 @@ - :/icons/dynamic.png:/icons/dynamic.png + :/icons/use.png:/icons/use.png true @@ -137,20 +182,26 @@ - + - Qt::Horizontal + Qt::Vertical - 40 - 20 + 20 + 40 - + + + + 0 + 0 + + 70 @@ -168,7 +219,7 @@ - :/icons/playlists.png:/icons/playlists.png + :/icons/player.png:/icons/player.png true @@ -178,222 +229,164 @@ - + 0 - - - - - - 0 - 0 - - - - - 70 - 70 - - - - - 70 - 70 - - - - - - - - :/icons/back.png:/icons/back.png - - - true - - - - - - - - 0 - 0 - - - - - 70 - 70 - - - - - 70 - 70 - - - - - - - - :/icons/add.png:/icons/add.png - - - true - - - - - - - - 70 - 70 - - - - - 70 - 70 - - - - - - - - :/icons/delete.png:/icons/delete.png - - - true - - - - - - - - 0 - 0 - - - - - 70 - 70 - - - - - 70 - 70 - - - - - - - - :/icons/use.png:/icons/use.png - - - true - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - - 70 - 70 - - - - - 70 - 70 - - - - - - - - :/icons/player.png:/icons/player.png - - - true - - - - + + + false + + + + + + Qt::AutoText + + + Qt::AlignCenter + + - + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::MultiSelection + + + false + - 0 - - - - - false - - - - - - Qt::AutoText - - - Qt::AlignCenter - - - - - - - QAbstractItemView::NoEditTriggers - - - QAbstractItemView::MultiSelection - - - false - - - 1 - - - false - - - - + 1 + + + false + + + + + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/artists.png:/icons/artists.png + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/dynamic.png:/icons/dynamic.png + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/playlists.png:/icons/playlists.png + + + true + + diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui index b6c3180..4361c8d 100644 --- a/src/ui/mainwindow.ui +++ b/src/ui/mainwindow.ui @@ -21,6 +21,51 @@ 0 + + + + 0 + 0 + + + + + 60 + 60 + + + + + 60 + 60 + + + + + + + + :/icons/fullscreen.png:/icons/fullscreen.png + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + Qt::Horizontal -- 1.7.9.5