Centring current track (Player) and selected element after Back button

[someplayer] / src / playerform.cpp

diff --git a/src/playerform.cpp b/src/playerform.cpp
index 11328da..4be237f 100644 (file)
--- a/src/playerform.cpp
+++ b/src/playerform.cpp
@@ -97,6 +97,7 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        _track_renderer = new TrackRenderer(this);
        _track_renderer->setActiveRow(-1);
        _track_renderer->setSearchRow(-1);
+       _track_renderer->setActiveTrackColor(config.getValue("ui/trackcolor").toString());
        ui->playlistView->setItemDelegateForColumn(1, _track_renderer);
        ui->playlistView->setItemDelegateForColumn(0, _track_renderer);
 
@@ -107,7 +108,7 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        _cover->setMinimumSize(300, 300);
        _cover->setMaximumSize(300, 300);
        _cover->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-       _cover->setScaledContents(true);
+       _cover->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
        _cover->setPixmap(QPixmap::fromImage(_coverfinder->defaultCover()));
 
        connect(ui->libraryButton, SIGNAL(clicked()), this, SLOT(_library()));
@@ -221,7 +222,7 @@ void PlayerForm::_track_changed(Track track) {
        int id = _current_playlist.tracks().indexOf(track);
        QModelIndex index = _model->index(id, 0);
        ui->playlistView->setCurrentIndex(index);
-       ui->playlistView->scrollTo(index);
+       ui->playlistView->scrollTo(index, QAbstractItemView::PositionAtCenter);
        _track_renderer->setActiveRow(id);
        ui->playlistView->hide();
        ui->playlistView->show();
@@ -239,7 +240,7 @@ void PlayerForm::_display_track(Track track) {
        ui->seekSlider->setMinimum(0);
        ui->seekSlider->setMaximum(track.metadata().length());
        _tick(0, track.metadata().length());
-       _coverfinder->find(QFileInfo(track.source()));
+       _coverfinder->find(track);
 }
 
 void PlayerForm::_tick(int done, int all) {
@@ -341,7 +342,7 @@ void PlayerForm::nextItem() {
        }
        QModelIndex id = _model->index(_search_current_id, 1);
        _track_renderer->setSearchRow(_search_current_id);
-       ui->playlistView->scrollTo(id);
+       ui->playlistView->scrollTo(id, QAbstractItemView::PositionAtCenter);
        ui->playlistView->hide();
        ui->playlistView->show();
 }
@@ -357,7 +358,7 @@ void PlayerForm::prevItem() {
        }
        QModelIndex id = _model->index(_search_current_id, 1);
        _track_renderer->setSearchRow(_search_current_id);
-       ui->playlistView->scrollTo(id);
+       ui->playlistView->scrollTo(id, QAbstractItemView::PositionAtCenter);
        ui->playlistView->hide();
        ui->playlistView->show();
 }
@@ -365,7 +366,7 @@ void PlayerForm::prevItem() {
 void PlayerForm::cancelSearch() {
        _search_pattern = "";
        _track_renderer->setSearchRow(-1);
-       ui->playlistView->scrollTo(_model->index(_track_renderer->activeRow(), 1));
+       ui->playlistView->scrollTo(_model->index(_track_renderer->activeRow(), 1), QAbstractItemView::PositionAtCenter);
        ui->playlistView->hide();
        ui->playlistView->show();
 }
@@ -479,9 +480,9 @@ void PlayerForm::landscapeMode() {
        ui->bhorizontalLayout->addWidget(ui->dirButton);
 
        if (_tools_widget->isVisible()) {
-               ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/more.png"));
-       } else {
                ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/unmore.png"));
+       } else {
+               ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/more.png"));
        }
 }
 
@@ -560,12 +561,12 @@ void PlayerForm::portraitMode() {
 
 void PlayerForm::_tools_widget_toggle() {
        if (_tools_widget->isVisible()) {
-               ui->moreButton->setIcon(QIcon(landscape ? ":/icons/"+_icons_theme+"/unmore.png" : ":/icons/"+_icons_theme+"/more.png"));
+               ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/more.png"));
                _tools_widget->hide();
                _tools_widget->reset();
                cancelSearch();
        } else {
-               ui->moreButton->setIcon(QIcon(landscape ? ":/icons/"+_icons_theme+"/more.png" : ":/icons/"+_icons_theme+"/unmore.png"));
+               ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/unmore.png"));
                _tools_widget->show();
                _tools_widget->setFocus();
        }
@@ -593,9 +594,9 @@ void PlayerForm::updateIcons() {
        }
        ui->libraryButton->setIcon(QIcon(":/icons/"+_icons_theme+"/library.png"));
        if (_tools_widget->isVisible()) {
-               ui->moreButton->setIcon(QIcon(landscape ? ":/icons/" + _icons_theme + "/unmore.png" : ":/icons/" + _icons_theme + "/more.png"));
+               ui->moreButton->setIcon(QIcon(":/icons/" + _icons_theme + "/unmore.png"));
        } else {
-               ui->moreButton->setIcon(QIcon(landscape ? ":/icons/" + _icons_theme + "/more.png" : ":/icons/" + _icons_theme + "/unmore.png"));
+               ui->moreButton->setIcon(QIcon(":/icons/" + _icons_theme + "/more.png"));
        }
        ui->nextButton->setIcon(QIcon(":/icons/"+_icons_theme+"/next.png"));
        ui->stopButton->setIcon(QIcon(":/icons/"+_icons_theme+"/stop.png"));
@@ -662,7 +663,7 @@ void PlayerForm::hideCountdown() {
 }
 
 void PlayerForm::_display_cover(QImage image) {
-       QPixmap p = QPixmap::fromImage(image);
+       QPixmap p = QPixmap::fromImage(image).scaled(_cover->width(), _cover->height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
        _cover->setPixmap(p);
 }
 
@@ -723,4 +724,18 @@ void PlayerForm::_toggle_extra_buttons() {
 
 void PlayerForm::updateTranslations() {
        ui->retranslateUi(this);
+       __clear_playlist->setText(tr("Clear playlist"));
+       __delete_action->setText(tr("Delete"));
+       __add_to_favorites->setText(tr("Add to favorites"));
+       __enqueue_action->setText(tr("Enqueue"));
+       __add_to_playlists->setText(tr("Add to playlists"));
+       __edit_tags->setText(tr("Edit tags"));
+}
+
+void PlayerForm::updateTrackColor() {
+       Config config;
+       QString color = config.getValue("ui/trackcolor").toString();
+       _track_renderer->setActiveTrackColor(color);
+       ui->playlistView->hide();
+       ui->playlistView->show();
 }