Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

try to start the 'load cover' dialog in album cover manager inside the chosen album's folder (Fixes issue #733)

Browse Source
This commit is contained in:
Paweł Bara 2010-12-15 20:15:46 +00:00
parent 80e8fc8d60
commit 61d5641c35
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ui/albumcovermanager.cpp
View File

@ -510,8 +510,11 @@ void AlbumCoverManager::ChooseManualCover() {
return;
QListWidgetItem* item = context_menu_items_[0];
QString dir = InitialPathForOpenCoverDialog(item->data(Role_PathAutomatic).toString(),
item->data(Role_FirstFilename).toString());
QString cover = QFileDialog::getOpenFileName(
this, tr("Choose manual cover"), item->data(Role_PathAutomatic).toString(),
this, tr("Choose manual cover"), dir,
tr("Images (*.png *.jpg *.jpeg *.bmp *.gif *.xpm *.pbm *.pgm *.ppm *.xbm *.tiff)") + ";;" +
tr("All files (*)"));
if (cover.isNull())
@ -533,6 +536,18 @@ void AlbumCoverManager::ChooseManualCover() {
cover_loading_tasks_[id] = item;
}
QString AlbumCoverManager::InitialPathForOpenCoverDialog(const QString& path_automatic, const QString& first_file_name) const {
if(!path_automatic.isEmpty() && path_automatic != "embedded") {
return path_automatic;
} else if (!first_file_name.isEmpty() && first_file_name.contains('/')) {
// we get rid of the filename because it's extension is screwing with the dialog's
// filters
return first_file_name.section('/', 0, -2);
} else {
return QString();
}
}
void AlbumCoverManager::UnsetCover() {
foreach (QListWidgetItem* item, context_menu_items_) {
item->setIcon(no_cover_icon_);

2
src/ui/albumcovermanager.h
View File

@ -111,6 +111,8 @@ class AlbumCoverManager : public QMainWindow {
Hide_WithoutCovers,
};
QString InitialPathForOpenCoverDialog(const QString& path_automatic, const QString& first_file_name) const;
void CancelRequests();
void UpdateStatusText();