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

Pass the list of songs into the organiser from the library

Browse Source
This commit is contained in:
David Sansome 2010-08-30 15:28:55 +00:00
parent 30911ba1ad
commit 2a160bee5f
3 changed files with 17 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/library/libraryview.cpp
View File

@ -257,49 +257,24 @@ void LibraryView::scrollTo(const QModelIndex& index, ScrollHint hint) {
QTreeView::scrollTo(index, hint);
}
void LibraryView::GetSelectedFileInfo(
QStringList *filenames, quint64 *size, SongList* songs_out) const {
SongList LibraryView::GetSelectedSongs() const {
QModelIndexList selected_indexes =
qobject_cast<QSortFilterProxyModel*>(model())->mapSelectionToSource(
selectionModel()->selection()).indexes();
SongList songs = library_->GetChildSongs(selected_indexes);
if (size)
*size = 0;
foreach (const Song& song, songs) {
if (filenames)
*filenames << song.filename();
if (size && song.filesize() >= 0)
*size += song.filesize();
}
if (songs_out)
*songs_out = songs;
return library_->GetChildSongs(selected_indexes);
}
void LibraryView::Organise() {
QStringList filenames;
quint64 size = 0;
GetSelectedFileInfo(&filenames, &size);
if (!organise_dialog_)
organise_dialog_.reset(new OrganiseDialog(task_manager_));
organise_dialog_->SetDestinationModel(library_->directory_model());
organise_dialog_->SetCopy(false);
organise_dialog_->SetFilenames(filenames, size);
organise_dialog_->SetSongs(GetSelectedSongs());
organise_dialog_->show();
}
void LibraryView::Delete() {
SongList songs;
GetSelectedFileInfo(NULL, NULL, &songs);
if (songs.isEmpty())
return;
if (QMessageBox::question(this, tr("Delete files"),
tr("These files will be deleted from disk, are you sure you want to continue?"),
QMessageBox::Yes, QMessageBox::Cancel) != QMessageBox::Yes)
@ -314,20 +289,16 @@ void LibraryView::Delete() {
DeleteFiles* delete_files = new DeleteFiles(task_manager_, storage);
connect(delete_files, SIGNAL(Finished(SongList)), SLOT(DeleteFinished(SongList)));
delete_files->Start(songs);
delete_files->Start(GetSelectedSongs());
}
void LibraryView::CopyToDevice() {
QStringList filenames;
quint64 size = 0;
GetSelectedFileInfo(&filenames, &size);
if (!organise_dialog_)
organise_dialog_.reset(new OrganiseDialog(task_manager_));
organise_dialog_->SetDestinationModel(devices_->connected_devices_model(), true);
organise_dialog_->SetCopy(true);
organise_dialog_->SetFilenames(filenames, size);
organise_dialog_->SetSongs(GetSelectedSongs());
organise_dialog_->show();
}

2
src/library/libraryview.h
View File

@ -86,7 +86,7 @@ class LibraryView : public AutoExpandingTreeView {
private:
void RecheckIsEmpty();
void ShowInVarious(bool on);
void GetSelectedFileInfo(QStringList* filenames, quint64* size, SongList* songs = NULL) const;
SongList GetSelectedSongs() const;
private:
LibraryModel* library_;

17
src/ui/organisedialog.cpp
View File

@ -99,9 +99,10 @@ void OrganiseDialog::SetDestinationModel(QAbstractItemModel *model, bool devices
ui_->eject_after->setVisible(devices);
}
void OrganiseDialog::SetSongs(const SongList &songs) {
quint64 total_size = 0;
QStringList filenames;
void OrganiseDialog::SetSongs(const SongList& songs) {
total_size_ = 0;
filenames_.clear();
preview_songs_.clear();
foreach (const Song& song, songs) {
QUrl url(song.filename());
@ -111,11 +112,15 @@ void OrganiseDialog::SetSongs(const SongList &songs) {
continue;
if (song.filesize() > 0)
total_size += song.filesize();
filenames << url.toLocalFile();
total_size_ += song.filesize();
filenames_ << url.toLocalFile();
if (preview_songs_.count() < kNumberOfPreviews)
preview_songs_ << song;
}
SetFilenames(filenames, total_size);
ui_->free_space->set_additional_bytes(total_size_);
UpdatePreviews();
}
void OrganiseDialog::SetUrls(const QList<QUrl> &urls, quint64 total_size) {