_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);
_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()));
connect(ui->cfavButton, SIGNAL(clicked()), this, SLOT(_c_add_to_favorites()));
connect(ui->ctagButton, SIGNAL(clicked()), this, SLOT(_c_edit_tags()));
connect(_cover, SIGNAL(clicked()), this, SLOT(_toggle_extra_buttons()));
+ connect(_player, SIGNAL(startPlaylist()), this, SLOT(_start_playlist()));
+ connect(_player, SIGNAL(saveLastPlayed(LastPlayed)), _lib, SLOT(saveLastPlayedForCurPlaylist(LastPlayed)));
ui->viewButton->setIcon(QIcon(":/icons/"+_icons_theme+"/playback.png"));
_top_gradient = ui->topWidget->styleSheet();
_bottom_gradient = ui->bottomWidget->styleSheet();
void PlayerForm::_process_click(QModelIndex index) {
if (index.column() == 1) {
int id = index.row();
- _player->stop();
_player->setTrackId(id);
_player->play();
_track_renderer->setActiveRow(id);
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();
_display_track(track);
+ _context_menu->actions().at(2)->setText(_lib->isFavorite(track) ? tr("Remove from favorites") : tr("Add to favorites"));
+ emit trackChanged();
}
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);
+ ui->cfavButton->setChecked(_lib->isFavorite(track) && !ui->cfavButton->icon().isNull());
}
void PlayerForm::_tick(int done, int all) {
if (idx.isEmpty())
return;
int id = idx.first().row();
- _lib->addToFavorites(_current_playlist.tracks().at(id));
+ Track cur = _current_playlist.tracks().at(id);
+ if (!cur.source().isEmpty()) {
+ bool isf = _lib->isFavorite(cur);
+ if (!isf) {
+ _lib->addToFavorites(cur);
+ } else {
+ _lib->removeFromFavorites(cur);
+ }
+ isf = _lib->isFavorite(cur);
+ ui->cfavButton->setChecked(isf && !ui->cfavButton->icon().isNull());
+ _context_menu->actions().at(2)->setText(isf ? tr("Remove from favorites") : tr("Add to favorites"));
+ }
+
}
void PlayerForm::_state_changed(PlayerState state) {
}
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();
}
}
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();
}
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();
}
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"));
}
}
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();
}
}
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"));
}
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);
}
ui->caddButton->setEnabled(true);
ui->cdeleteButton->setEnabled(true);
ui->cfavButton->setEnabled(true);
+ ui->cfavButton->setChecked(_lib->isFavorite(_player->current()));
ui->ctagButton->setEnabled(true);
ui->caddButton->setIcon(QIcon(":/icons/"+_icons_theme+"/add.png"));
ui->cdeleteButton->setIcon(QIcon(":/icons/"+_icons_theme+"/delete.png"));
ui->caddButton->setEnabled(false);
ui->cdeleteButton->setEnabled(false);
ui->cfavButton->setEnabled(false);
+ ui->cfavButton->setChecked(false);
ui->ctagButton->setEnabled(false);
ui->caddButton->setIcon(QIcon());
ui->cdeleteButton->setIcon(QIcon());
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();
+}
+
+void PlayerForm::next() {
+ _player->next();
+}
+
+void PlayerForm::prev() {
+ _player->prev();
+}
+
+QString PlayerForm::playerCaption() {
+ TrackMetadata meta = _player->current().metadata();
+ return QString("%1 - %2").arg(meta.artist()).arg(meta.title());
+}
+
+void PlayerForm::_start_playlist() {
+ Config config;
+ if (config.getValue("playback/autoresume_off").toBool()) {
+ _player->next();
+ return;
+ }
+ LastPlayed lp = _lib->getLastPlayedForCurPlaylist();
+ _player->setTrackId(lp.trackId);
+ _player->setAwaitingSeek(lp.position);
}