From 49f273edd25bc937204acad9c2b618ab2cf95f27 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Tue, 11 May 2010 20:02:19 +0000 Subject: [PATCH] Add an option to add a whole folder to the playlist --- src/translations/cs.po | 13 +++++++++++-- src/translations/da.po | 13 +++++++++++-- src/translations/de.po | 13 +++++++++++-- src/translations/el.po | 13 +++++++++++-- src/translations/en_GB.po | 13 +++++++++++-- src/translations/es.po | 13 +++++++++++-- src/translations/fi.po | 8 +++++++- src/translations/fr.po | 13 +++++++++++-- src/translations/gl.po | 8 +++++++- src/translations/it.po | 13 +++++++++++-- src/translations/kk.po | 8 +++++++- src/translations/nb.po | 13 +++++++++++-- src/translations/pl.po | 13 +++++++++++-- src/translations/pt.po | 13 +++++++++++-- src/translations/pt_BR.po | 8 +++++++- src/translations/ro.po | 8 +++++++- src/translations/ru.po | 13 +++++++++++-- src/translations/sk.po | 13 +++++++++++-- src/translations/sv.po | 13 +++++++++++-- src/translations/tr.po | 8 +++++++- src/translations/translations.pot | 8 +++++++- src/ui/mainwindow.cpp | 26 +++++++++++++++++++++++--- src/ui/mainwindow.h | 3 ++- src/ui/mainwindow.ui | 16 +++++++++++++--- 24 files changed, 241 insertions(+), 42 deletions(-) diff --git a/src/translations/cs.po b/src/translations/cs.po index 5393f09c4..f5355dc96 100644 --- a/src/translations/cs.po +++ b/src/translations/cs.po @@ -786,6 +786,9 @@ msgstr "Upravit tag\"%1\"..." msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "OSD náhled" @@ -891,8 +894,8 @@ msgstr "O Clementine..." msgid "Shuffle playlist" msgstr "Zamíchat seznam skladeb" -msgid "Add media..." -msgstr "Přidat média..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Přidat proud..." @@ -909,6 +912,9 @@ msgstr "Režim opakování" msgid "Remove from playlist" msgstr "Odstranit z playlistu" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Knihovna" @@ -1098,6 +1104,9 @@ msgstr "..." msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Add media..." +#~ msgstr "Přidat média..." + #~ msgid "Radio" #~ msgstr "Rádio" diff --git a/src/translations/da.po b/src/translations/da.po index 270e8167e..ee5e8493e 100644 --- a/src/translations/da.po +++ b/src/translations/da.po @@ -789,6 +789,9 @@ msgstr "Redigér mærke \"%1\"..." msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "Forhåndsvisning af OSD" @@ -894,8 +897,8 @@ msgstr "Om Clementine..." msgid "Shuffle playlist" msgstr "Bland spilleliste" -msgid "Add media..." -msgstr "Tilføj medie..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Tilføj stream..." @@ -912,6 +915,9 @@ msgstr "Gentagelsestilstand" msgid "Remove from playlist" msgstr "Fjern fra spilleliste" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Bibliotek" @@ -1101,5 +1107,8 @@ msgstr "..." msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Add media..." +#~ msgstr "Tilføj medie..." + #~ msgid "Radio" #~ msgstr "Radio" diff --git a/src/translations/de.po b/src/translations/de.po index 13bd6808b..8af1a697d 100644 --- a/src/translations/de.po +++ b/src/translations/de.po @@ -785,6 +785,9 @@ msgstr "%1 bearbeiten" msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "OSD Vorschau" @@ -890,8 +893,8 @@ msgstr "Über Clementine..." msgid "Shuffle playlist" msgstr "Wiedergabeliste mischen" -msgid "Add media..." -msgstr "Medien hinzufügen..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Stream hinzufügen..." @@ -908,6 +911,9 @@ msgstr "Endlosschleife" msgid "Remove from playlist" msgstr "Aus der Wiedergabeliste entfernen" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Musiksammlung" @@ -1099,6 +1105,9 @@ msgstr "…" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Add media..." +#~ msgstr "Medien hinzufügen..." + #~ msgid "Radio" #~ msgstr "Radio" diff --git a/src/translations/el.po b/src/translations/el.po index 5fc45328b..8a2ab1852 100644 --- a/src/translations/el.po +++ b/src/translations/el.po @@ -788,6 +788,9 @@ msgstr "Τροποποίηση ετικέτας \"%1\"..." msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "Προ-επισκόπηση OSD" @@ -893,8 +896,8 @@ msgstr "Περί του Clementine..." msgid "Shuffle playlist" msgstr "Ανάμιξη λίστας" -msgid "Add media..." -msgstr "Προσθήκη πολυμέσων..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Προσθήκη ροής..." @@ -911,6 +914,9 @@ msgstr "Λειτουργία επανάληψης" msgid "Remove from playlist" msgstr "Αφαίρεση από την λίστα" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Βιβλιοθήκη" @@ -1100,6 +1106,9 @@ msgstr "..." msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Add media..." +#~ msgstr "Προσθήκη πολυμέσων..." + #~ msgid "Radio" #~ msgstr "Ραδιόφωνο" diff --git a/src/translations/en_GB.po b/src/translations/en_GB.po index 54da93614..1ca38965b 100644 --- a/src/translations/en_GB.po +++ b/src/translations/en_GB.po @@ -784,6 +784,9 @@ msgstr "Edit tag \"%1\"..." msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "OSD Preview" @@ -889,8 +892,8 @@ msgstr "About Clementine..." msgid "Shuffle playlist" msgstr "Shuffle playlist" -msgid "Add media..." -msgstr "Add media..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Add stream..." @@ -907,6 +910,9 @@ msgstr "Repeat mode" msgid "Remove from playlist" msgstr "Remove from playlist" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Library" @@ -1096,5 +1102,8 @@ msgstr "..." msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Add media..." +#~ msgstr "Add media..." + #~ msgid "Radio" #~ msgstr "Radio" diff --git a/src/translations/es.po b/src/translations/es.po index 4bd186786..454c6f6b2 100644 --- a/src/translations/es.po +++ b/src/translations/es.po @@ -791,6 +791,9 @@ msgstr "Editar etiqueta \"%1\"..." msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "Previsualización del OSD" @@ -896,8 +899,8 @@ msgstr "Acerca de Clementine..." msgid "Shuffle playlist" msgstr "Mezclar lista de reproducción" -msgid "Add media..." -msgstr "Añadir medio..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Añadir flujo..." @@ -914,6 +917,9 @@ msgstr "Modo de repetición" msgid "Remove from playlist" msgstr "Eliminar de la lista de reproducción" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Colección" @@ -1105,6 +1111,9 @@ msgstr "..." msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Add media..." +#~ msgstr "Añadir medio..." + #~ msgid "Radio" #~ msgstr "Radio" diff --git a/src/translations/fi.po b/src/translations/fi.po index 7dcd618fe..322ccbb9b 100644 --- a/src/translations/fi.po +++ b/src/translations/fi.po @@ -780,6 +780,9 @@ msgstr "" msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "" @@ -885,7 +888,7 @@ msgstr "" msgid "Shuffle playlist" msgstr "" -msgid "Add media..." +msgid "Add file..." msgstr "" msgid "Add stream..." @@ -903,6 +906,9 @@ msgstr "" msgid "Remove from playlist" msgstr "" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "" diff --git a/src/translations/fr.po b/src/translations/fr.po index aa13ea1fe..e39eae89f 100644 --- a/src/translations/fr.po +++ b/src/translations/fr.po @@ -792,6 +792,9 @@ msgstr "Modifer le tag \"%1\"..." msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "Prévisualisation de l'affichage à l'écran (OSD)" @@ -897,8 +900,8 @@ msgstr "À propos de Clementine..." msgid "Shuffle playlist" msgstr "Mélanger la liste de lecture" -msgid "Add media..." -msgstr "Ajouter un media..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Ajouter un flux..." @@ -915,6 +918,9 @@ msgstr "Mode répétition" msgid "Remove from playlist" msgstr "Supprimer de la liste de lecture" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Bibliothèque" @@ -1106,6 +1112,9 @@ msgstr "..." msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Add media..." +#~ msgstr "Ajouter un media..." + #~ msgid "Radio" #~ msgstr "Radio" diff --git a/src/translations/gl.po b/src/translations/gl.po index f0c742190..8ecd7f67b 100644 --- a/src/translations/gl.po +++ b/src/translations/gl.po @@ -782,6 +782,9 @@ msgstr "Editar a tag \"%1\"..." msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "Pré-visualizar no OSD" @@ -887,7 +890,7 @@ msgstr "" msgid "Shuffle playlist" msgstr "" -msgid "Add media..." +msgid "Add file..." msgstr "" msgid "Add stream..." @@ -905,6 +908,9 @@ msgstr "" msgid "Remove from playlist" msgstr "" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "" diff --git a/src/translations/it.po b/src/translations/it.po index 210aafd30..424e44f0a 100644 --- a/src/translations/it.po +++ b/src/translations/it.po @@ -789,6 +789,9 @@ msgstr "Modifica tag \"%1\"..." msgid "Add media" msgstr "Aggiungi media" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "Anteprima OSD" @@ -894,8 +897,8 @@ msgstr "Informazioni su Clementine..." msgid "Shuffle playlist" msgstr "Mescola la scaletta" -msgid "Add media..." -msgstr "Aggiungi media..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Aggiungi flusso..." @@ -912,6 +915,9 @@ msgstr "Modalità di ripetizione" msgid "Remove from playlist" msgstr "Rimuovi dalla scaletta" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Raccolta" @@ -1103,5 +1109,8 @@ msgstr "..." msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Add media..." +#~ msgstr "Aggiungi media..." + #~ msgid "Radio" #~ msgstr "Radio" diff --git a/src/translations/kk.po b/src/translations/kk.po index b84740570..104ffd77c 100644 --- a/src/translations/kk.po +++ b/src/translations/kk.po @@ -782,6 +782,9 @@ msgstr "" msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "" @@ -887,7 +890,7 @@ msgstr "" msgid "Shuffle playlist" msgstr "" -msgid "Add media..." +msgid "Add file..." msgstr "" msgid "Add stream..." @@ -905,6 +908,9 @@ msgstr "" msgid "Remove from playlist" msgstr "" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "" diff --git a/src/translations/nb.po b/src/translations/nb.po index 16ace3c70..659bf6910 100644 --- a/src/translations/nb.po +++ b/src/translations/nb.po @@ -786,6 +786,9 @@ msgstr "Endre merkelapp \"%1\"..." msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "Forhåndsvisning av notifikasjon" @@ -891,8 +894,8 @@ msgstr "Om Clementine..." msgid "Shuffle playlist" msgstr "Bland spilleliste" -msgid "Add media..." -msgstr "Legg til media..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Legg til strøm..." @@ -909,6 +912,9 @@ msgstr "Repeteringsmodus" msgid "Remove from playlist" msgstr "Fjern fra spillelisten" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Bibliotek" @@ -1098,6 +1104,9 @@ msgstr "…" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Add media..." +#~ msgstr "Legg til media..." + #~ msgid "Radio" #~ msgstr "Radio" diff --git a/src/translations/pl.po b/src/translations/pl.po index 3605b9842..3b5e22dc7 100644 --- a/src/translations/pl.po +++ b/src/translations/pl.po @@ -784,6 +784,9 @@ msgstr "Edytuj znacznik \"%1\"..." msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "Podgląd OSD" @@ -889,8 +892,8 @@ msgstr "O Clemetine..." msgid "Shuffle playlist" msgstr "Zamieszaj playlistę" -msgid "Add media..." -msgstr "Dodaj media..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Dodaj strumień..." @@ -907,6 +910,9 @@ msgstr "Tryb powtarzania" msgid "Remove from playlist" msgstr "Usuń z playlisty" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Biblioteka" @@ -1096,6 +1102,9 @@ msgstr "..." msgid "0:00:00" msgstr "" +#~ msgid "Add media..." +#~ msgstr "Dodaj media..." + #~ msgid "Radio" #~ msgstr "Radio" diff --git a/src/translations/pt.po b/src/translations/pt.po index 0c2bb6628..924e711f4 100644 --- a/src/translations/pt.po +++ b/src/translations/pt.po @@ -787,6 +787,9 @@ msgstr "Editar a tag \"%1\"..." msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "Pré-visualizar o OSD" @@ -892,8 +895,8 @@ msgstr "Sobre a Clementine" msgid "Shuffle playlist" msgstr "Lista de reprodução aleatória" -msgid "Add media..." -msgstr "Adicionar ficheiro multimédia..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Adicionar stream..." @@ -910,6 +913,9 @@ msgstr "Modo de repetição" msgid "Remove from playlist" msgstr "Remover da lista de reprodução" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Biblioteca" @@ -1099,6 +1105,9 @@ msgstr "..." msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Add media..." +#~ msgstr "Adicionar ficheiro multimédia..." + #~ msgid "Radio" #~ msgstr "Rádio" diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po index ecdf26d17..7db6824f8 100644 --- a/src/translations/pt_BR.po +++ b/src/translations/pt_BR.po @@ -780,6 +780,9 @@ msgstr "" msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "" @@ -885,7 +888,7 @@ msgstr "" msgid "Shuffle playlist" msgstr "" -msgid "Add media..." +msgid "Add file..." msgstr "" msgid "Add stream..." @@ -903,6 +906,9 @@ msgstr "" msgid "Remove from playlist" msgstr "" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "" diff --git a/src/translations/ro.po b/src/translations/ro.po index 992428f76..a5316fd2d 100644 --- a/src/translations/ro.po +++ b/src/translations/ro.po @@ -781,6 +781,9 @@ msgstr "" msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "Previzualizare OSD" @@ -886,7 +889,7 @@ msgstr "Despre Clementine..." msgid "Shuffle playlist" msgstr "Amestecă lista de melodii" -msgid "Add media..." +msgid "Add file..." msgstr "" msgid "Add stream..." @@ -904,6 +907,9 @@ msgstr "Mod repetitiv" msgid "Remove from playlist" msgstr "Elimină din lista de redare" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Bibliotecă" diff --git a/src/translations/ru.po b/src/translations/ru.po index b4c4633c6..b7070b831 100644 --- a/src/translations/ru.po +++ b/src/translations/ru.po @@ -784,6 +784,9 @@ msgstr "Редактировать тег \"%1\"..." msgid "Add media" msgstr "Добавить файлы" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "Предпросмотр OSD" @@ -889,8 +892,8 @@ msgstr "О программе Clementine..." msgid "Shuffle playlist" msgstr "Перемешать плейлист" -msgid "Add media..." -msgstr "Добавить..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Добавить поток..." @@ -907,6 +910,9 @@ msgstr "Повторять" msgid "Remove from playlist" msgstr "Удалить из плейлиста" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Коллекция" @@ -1097,6 +1103,9 @@ msgstr "..." msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Add media..." +#~ msgstr "Добавить..." + #~ msgid "Radio" #~ msgstr "Радио" diff --git a/src/translations/sk.po b/src/translations/sk.po index 22710ec2e..5e5316524 100644 --- a/src/translations/sk.po +++ b/src/translations/sk.po @@ -786,6 +786,9 @@ msgstr "Upraviť tag \"%1\"..." msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "OSD náhľad" @@ -891,8 +894,8 @@ msgstr "O Clemetine..." msgid "Shuffle playlist" msgstr "Zamiešať playlist" -msgid "Add media..." -msgstr "Pridať médiá..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Pridať stream..." @@ -909,6 +912,9 @@ msgstr "Opakovací mód" msgid "Remove from playlist" msgstr "Odstrániť z playlistu" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Zbierka" @@ -1098,6 +1104,9 @@ msgstr "..." msgid "0:00:00" msgstr "" +#~ msgid "Add media..." +#~ msgstr "Pridať médiá..." + #~ msgid "Radio" #~ msgstr "Rádio" diff --git a/src/translations/sv.po b/src/translations/sv.po index d23cb8837..97dcc8d83 100644 --- a/src/translations/sv.po +++ b/src/translations/sv.po @@ -787,6 +787,9 @@ msgstr "Redigera tagg \"%1\"..." msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "OSD förhandsgranskning" @@ -892,8 +895,8 @@ msgstr "Om Clementine..." msgid "Shuffle playlist" msgstr "Slumpsportera spellista" -msgid "Add media..." -msgstr "Lägg till media..." +msgid "Add file..." +msgstr "" msgid "Add stream..." msgstr "Lägg till ström..." @@ -910,6 +913,9 @@ msgstr "Upprepningsläge" msgid "Remove from playlist" msgstr "Ta bort från spellista" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "Bibliotek" @@ -1099,5 +1105,8 @@ msgstr "..." msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Add media..." +#~ msgstr "Lägg till media..." + #~ msgid "Radio" #~ msgstr "Radio" diff --git a/src/translations/tr.po b/src/translations/tr.po index ff84100e0..b793be8aa 100644 --- a/src/translations/tr.po +++ b/src/translations/tr.po @@ -780,6 +780,9 @@ msgstr "" msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "" @@ -885,7 +888,7 @@ msgstr "" msgid "Shuffle playlist" msgstr "" -msgid "Add media..." +msgid "Add file..." msgstr "" msgid "Add stream..." @@ -903,6 +906,9 @@ msgstr "" msgid "Remove from playlist" msgstr "" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "" diff --git a/src/translations/translations.pot b/src/translations/translations.pot index 0e973bda7..13c232371 100644 --- a/src/translations/translations.pot +++ b/src/translations/translations.pot @@ -771,6 +771,9 @@ msgstr "" msgid "Add media" msgstr "" +msgid "Add folder" +msgstr "" + msgid "OSD Preview" msgstr "" @@ -876,7 +879,7 @@ msgstr "" msgid "Shuffle playlist" msgstr "" -msgid "Add media..." +msgid "Add file..." msgstr "" msgid "Add stream..." @@ -894,6 +897,9 @@ msgstr "" msgid "Remove from playlist" msgstr "" +msgid "Add folder..." +msgstr "" + msgid "Library" msgstr "" diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 58111fa6a..6ed4dfac8 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -172,8 +172,9 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg connect(ui_->action_configure, SIGNAL(triggered()), settings_dialog_.get(), SLOT(show())); connect(ui_->action_about, SIGNAL(triggered()), about_dialog_.get(), SLOT(show())); connect(ui_->action_shuffle, SIGNAL(triggered()), playlist_, SLOT(Shuffle())); - connect(ui_->action_open_media, SIGNAL(triggered()), SLOT(AddMedia())); - connect(ui_->action_add_media, SIGNAL(triggered()), SLOT(AddMedia())); + connect(ui_->action_open_media, SIGNAL(triggered()), SLOT(AddFile())); + connect(ui_->action_add_file, SIGNAL(triggered()), SLOT(AddFile())); + connect(ui_->action_add_folder, SIGNAL(triggered()), SLOT(AddFolder())); connect(ui_->action_add_stream, SIGNAL(triggered()), SLOT(AddStream())); connect(ui_->action_cover_manager, SIGNAL(triggered()), cover_manager_.get(), SLOT(show())); connect(ui_->action_equalizer, SIGNAL(triggered()), equalizer_.get(), SLOT(show())); @@ -802,7 +803,7 @@ void MainWindow::LibraryScanFinished() { multi_loading_indicator_->TaskFinished(MultiLoadingIndicator::UpdatingLibrary); } -void MainWindow::AddMedia() { +void MainWindow::AddFile() { // Last used directory QString directory = settings_.value("add_media_path", QDir::currentPath()).toString(); @@ -843,6 +844,25 @@ void MainWindow::AddMedia() { playlist_->InsertPaths(urls); } +void MainWindow::AddFolder() { + // Last used directory + QString directory = settings_.value("add_folder_path", QDir::currentPath()).toString(); + + // Show dialog + directory = QFileDialog::getExistingDirectory(this, tr("Add folder"), directory); + if (directory.isEmpty()) + return; + + // Save last used directory + settings_.setValue("add_folder_path", directory); + + // Add media + QUrl url(QUrl::fromLocalFile(directory)); + if (url.scheme().isEmpty()) + url.setScheme("file"); + playlist_->InsertPaths(QList() << url); +} + void MainWindow::AddStream() { add_stream_dialog_->show(); } diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index 92f110dc4..f7e2f24e2 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -125,7 +125,8 @@ class MainWindow : public QMainWindow { void ReloadSettings(); - void AddMedia(); + void AddFile(); + void AddFolder(); void AddStream(); void AddStreamAccepted(); diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui index bc1ac917c..ee80a3b12 100644 --- a/src/ui/mainwindow.ui +++ b/src/ui/mainwindow.ui @@ -398,7 +398,8 @@ Playlist - + + @@ -579,13 +580,13 @@ Shuffle playlist - + :/open_media.png:/open_media.png - Add media... + Add file... @@ -652,6 +653,15 @@ Transcode Music + + + + :/folder-new.png:/folder-new.png + + + Add folder... + +