X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fplayerform.cpp;h=e819b615932cf6c74c90af75c21694521d3d0ccf;hb=124ea2784ef15293b90e42fc3f04021f1f9e181e;hp=a0ffb3783fa9c818969f1fe741d5011fedffdea8;hpb=f5220f7e7820734fb853b1043b6f33fecc241000;p=someplayer

diff --git a/src/playerform.cpp b/src/playerform.cpp
index a0ffb37..e819b61 100644
--- a/src/playerform.cpp
+++ b/src/playerform.cpp
@@ -87,12 +87,12 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
 	_model = new QStandardItemModel(0, 2, this);
 	ui->playlistView->setModel(_model);
 	_context_menu = new QMenu(ui->playlistView);
-	QAction *clear_playlist = _context_menu->addAction("Clear playlist");
-	QAction *delete_action = _context_menu->addAction("Delete");
-	QAction *add_to_favorites = _context_menu->addAction("Add to favorites");
-	QAction *enqueue_action = _context_menu->addAction("Enqueue");
-	QAction *add_to_playlists = _context_menu->addAction("Add to playlists");
-	QAction *edit_tags = _context_menu->addAction("Edit tags");
+	QAction *clear_playlist = _context_menu->addAction(tr("Clear playlist"));
+	QAction *delete_action = _context_menu->addAction(tr("Delete"));
+	QAction *add_to_favorites = _context_menu->addAction(tr("Add to favorites"));
+	QAction *enqueue_action = _context_menu->addAction(tr("Enqueue"));
+	QAction *add_to_playlists = _context_menu->addAction(tr("Add to playlists"));
+	QAction *edit_tags = _context_menu->addAction(tr("Edit tags"));
 
 	_track_renderer = new TrackRenderer(this);
 	_track_renderer->setActiveRow(-1);
@@ -239,7 +239,9 @@ 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()).absolutePath());
+	if (!_coverfinder->extract(QFileInfo(track.source()).absoluteFilePath())) {
+		_coverfinder->find(QFileInfo(track.source()).absolutePath());
+	}
 }
 
 void PlayerForm::_tick(int done, int all) {
@@ -662,7 +664,8 @@ void PlayerForm::hideCountdown() {
 }
 
 void PlayerForm::_display_cover(QImage image) {
-	_cover->setPixmap(QPixmap::fromImage(image));
+	QPixmap p = QPixmap::fromImage(image);
+	_cover->setPixmap(p);
 }
 
 void PlayerForm::_c_add_to_favorites() {