From 303a503b13c2f506f413d032a1b9675077e6f1e7 Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Sun, 17 Dec 2023 14:10:41 +0100 Subject: [PATCH 1/2] Use Sailfish.Pickers.FolderPickerPage to configure music directories --- qml/pages/AddFolder.qml | 141 ------------------------------------ qml/pages/ManageFolders.qml | 13 +++- src/utils.cpp | 44 ----------- src/utils.h | 2 - translations/ca.ts | 100 +++++++++---------------- translations/da.ts | 100 +++++++++---------------- translations/de.ts | 100 +++++++++---------------- translations/es.ts | 106 ++++++++++----------------- translations/flowplayer.ts | 100 +++++++++---------------- translations/fr.ts | 106 ++++++++++----------------- translations/it.ts | 100 +++++++++---------------- translations/nl.ts | 106 ++++++++++----------------- translations/ru.ts | 106 ++++++++++----------------- translations/sv.ts | 106 ++++++++++----------------- 14 files changed, 392 insertions(+), 838 deletions(-) delete mode 100644 qml/pages/AddFolder.qml diff --git a/qml/pages/AddFolder.qml b/qml/pages/AddFolder.qml deleted file mode 100644 index e9dc31e..0000000 --- a/qml/pages/AddFolder.qml +++ /dev/null @@ -1,141 +0,0 @@ -import QtQuick 2.0 -import Sailfish.Silica 1.0 -import FlowPlayer 1.0 - -Dialog { - id: root - - allowedOrientations: appWindow.pagesOrientations - - onAccepted: { - utils.addFolderToList(currentPath) - //pageStack.pop() - } - - onStatusChanged: { - if (status===PageStatus.Activating) { - foldersModel.clear() - utils.getFolderItems(currentPath) - } - } - - ListModel { id: foldersModel } - - Connections { - target: utils - - onAppendFile: { - foldersModel.append({"name":name, "path":path, "icon":icon}) - } - - onAppendFilesDone: currentPath = path - } - - property string currentPath: "/home/nemo" - - DialogHeader { - id: header - acceptText: qsTr("Done") - cancelText: qsTr("Cancel") - spacing: 0 - } - - SilicaFlickable { - id: flick - anchors.fill: parent - anchors.topMargin: header.height - clip: true - - Header { - id: header2 - title: qsTr("Select folder") - } - - IconButton { - id: upBtn - enabled: currentPath!=="/" - anchors.verticalCenter: header2.verticalCenter - anchors.left: parent.left - anchors.leftMargin: Theme.paddingMedium - icon.source: "image://theme/icon-m-up" - onClicked: { - foldersModel.clear() - utils.getFolderItemsUp(currentPath); - } - } - - SilicaListView { - id: flist - anchors.fill: parent - anchors.topMargin: header2.height - clip: true - - model: foldersModel - - delegate: ListItem { - contentHeight: Theme.itemSizeSmall - width: parent.width - clip: true - - enabled: model.icon==="folder" - - menu: contextMenu - - function removeItem() { - remorseAction(qsTr("Deleting"), - function() { - utils.removeFolder(model.location) - foldersModel.remove(model.index, 1) - }) - } - - Component { - id: contextMenu - ContextMenu { - MenuItem { - text: qsTr("Remove") - onClicked: { - removeItem() - } - } - } - } - - Image { - id: licon - anchors.left: parent.left - anchors.leftMargin: Theme.paddingLarge - anchors.verticalCenter: parent.verticalCenter - source: "image://theme/icon-m-" + model.icon - } - - Label - { - anchors.left: licon.right - anchors.leftMargin: Theme.paddingLarge - anchors.right: parent.right - anchors.rightMargin: Theme.paddingLarge - anchors.verticalCenter: parent.verticalCenter - truncationMode: TruncationMode.Fade - text: model.name - } - - onClicked: { - var p = model.path - foldersModel.clear() - utils.getFolderItems(p); - } - - } - - } - - ViewPlaceholder { - enabled: foldersModel.count===0 - flickable: flick - text: qsTr("No items") - } - - } - -} diff --git a/qml/pages/ManageFolders.qml b/qml/pages/ManageFolders.qml index 2667646..ac3f51b 100644 --- a/qml/pages/ManageFolders.qml +++ b/qml/pages/ManageFolders.qml @@ -1,5 +1,6 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 +import Sailfish.Pickers 1.0 import FlowPlayer 1.0 Page { @@ -42,7 +43,7 @@ Page { PullDownMenu { MenuItem { text: qsTr("Add folder") - onClicked: pageStack.push("AddFolder.qml") + onClicked: pageStack.push(folderPickerPage) } } @@ -118,6 +119,16 @@ Page { text: qsTr("No folders") } + Component { + id: folderPickerPage + FolderPickerPage { + dialogTitle: qsTr("Select folder") + showSystemFiles: false + onSelectedPathChanged: { + utils.addFolderToList(selectedPath) + } + } + } } diff --git a/src/utils.cpp b/src/utils.cpp index b47b3ad..0e7fe3e 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -635,50 +635,6 @@ void Utils::getFolders() } } -void Utils::getFolderItemsUp(QString path) -{ - if (path.endsWith("/")) - path.chop(1); - int i = path.lastIndexOf("/"); - path = path.left(i); - if (path=="") path = "/"; - getFolderItems(path); -} - -void Utils::getFolderItems(QString path) -{ - qDebug() << "Loading folder: " << path; - - if (!QFileInfo(path).exists()) - return; - - QDir dir (path); - QStringList data; - //data << ".mp3" << "*.m4a" << "*.wma" << "*.flac" << "*.ogg" << "*.wav" << "*.asf"; - //dir.setNameFilters(data); - - QFileInfoList entries; - entries = dir.entryInfoList(QDir::AllEntries | QDir::System | QDir::NoDotAndDotDot , - QDir::Name | QDir::IgnoreCase | QDir::DirsFirst); - - - QListIterator entriesIterator (entries); - while(entriesIterator.hasNext()) - { - QFileInfo fileInfo = entriesIterator.next(); - - if (fileInfo.isDir()) - emit appendFile(fileInfo.fileName(), fileInfo.absoluteFilePath(), "folder"); - else if (fileInfo.fileName().endsWith(".mp3") || fileInfo.fileName().endsWith(".m4a") || - fileInfo.fileName().endsWith(".wma") || fileInfo.fileName().endsWith(".ogg") || - fileInfo.fileName().endsWith(".flac") || fileInfo.fileName().endsWith(".wav") || - fileInfo.fileName().endsWith(".asf")) - emit appendFile(fileInfo.fileName(), fileInfo.absoluteFilePath(), "sounds"); - } - - emit appendFilesDone(path); -} - void Utils::addFolderToList(QString path) { QStringList folders = settings.value("Folders","").toString().split(""); diff --git a/src/utils.h b/src/utils.h index 9fb7637..64fdb52 100644 --- a/src/utils.h +++ b/src/utils.h @@ -113,8 +113,6 @@ public slots: void removeAlbumArt(); void getFolders(); - void getFolderItems(QString path); - void getFolderItemsUp(QString path); void addFolderToList(QString path); void removeFolder(QString path); diff --git a/translations/ca.ts b/translations/ca.ts index 95741bd..85a86ab 100644 --- a/translations/ca.ts +++ b/translations/ca.ts @@ -24,39 +24,6 @@ Podeu contribuir a mantenir aquest projecte actiu fent una petita donació - - AddFolder - - - Done - Fet - - - - Cancel - Cancel·la - - - - Select folder - Selecciona una carpeta - - - - Deleting - S'està eliminant - - - - Remove - Elimina - - - - No items - No hi ha cap element - - AddRadio @@ -234,17 +201,17 @@ Datos - + Various artists Artistes diversos - + 1 album 1 àlbum - + %1 albums %1 àlbums @@ -335,48 +302,48 @@ LFM - - + + Error fetching artist information Error en l'obtenció de la informació de l'artista - + The artist could not be found No s'ha pogut trobar l'artista - + Error fetching album information Error en l'obtenció de la informació de l'àlbum - + The album could not be found No s'ha pogut trobar l'àlbum - + No album information available No s'ha trobat informació de l'àlbum - + Error fetching track information Error en l'obtenció de la informació de la pista - + The track could not be found No s'ha pogut trobar la pista - + No track information available No s'ha trobat informació de la pista - + Fetching artist information S'està obtenint la informació de l'artista @@ -586,30 +553,35 @@ ManageFolders - + Add folder Afegeix una carpeta - + Manage folders Gestor de carpetes - + Deleting S'està eliminant - + Remove Elimina - + No folders No hi ha cap carpeta + + + Select folder + Selecciona una carpeta + Meta @@ -674,17 +646,17 @@ Missing - + Various artists Artistes diversos - + Unknown album Àlbum desconegut - + Unknown artist Artista desconegut @@ -706,12 +678,12 @@ MyPlaylist - + Unknown artist Artista desconegut - + Unknown album Àlbum desconegut @@ -1354,22 +1326,22 @@ Utils - - - - - - + + + + + + No lyrics founded No s'ha trobat la lletra - + Error fetching lyrics Error en l'obtenció de la lletra - + Album cover not founded No s'ha trobat la caràtula diff --git a/translations/da.ts b/translations/da.ts index d367991..032e981 100644 --- a/translations/da.ts +++ b/translations/da.ts @@ -24,39 +24,6 @@ Du kan bidrage til at holde dette projekt i live ved at give en lille donation - - AddFolder - - - Done - Udført - - - - Cancel - Annuller - - - - Select folder - Vælg folder - - - - Deleting - Sletter - - - - Remove - Fjern - - - - No items - Ingen poster - - AddRadio @@ -234,17 +201,17 @@ Datos - + Various artists Forskellige kunstnere - + 1 album 1 album - + %1 albums %1 albums @@ -335,48 +302,48 @@ LFM - - + + Error fetching artist information Fejl ved hentning af kunstnerinformation - + The artist could not be found Kunstneren kunne ikke findes - + Error fetching album information Fejl ved hentning af albuminformation - + The album could not be found Albummet kunne ikke findes - + No album information available Ingen albuminformation tilgængelig - + Error fetching track information Fejl ved hentning af sporinformation - + The track could not be found Sporet kan ikke findes - + No track information available Ingen information om spor tilgængelig - + Fetching artist information Henter info om kunstner @@ -586,30 +553,35 @@ ManageFolders - + Add folder Tilføj folder - + Manage folders Håndter foldere - + Deleting Sletter - + Remove Fjern - + No folders Ingen foldere + + + Select folder + Vælg folder + Meta @@ -674,17 +646,17 @@ Missing - + Various artists Forskellige kunstnere - + Unknown album Ukendt album - + Unknown artist Ukendt kunstner @@ -706,12 +678,12 @@ MyPlaylist - + Unknown artist Ukendt kunstner - + Unknown album Ukendt album @@ -1354,22 +1326,22 @@ Utils - - - - - - + + + + + + No lyrics founded Ingen tekster fundet - + Error fetching lyrics Fejl ved hentning af tekster - + Album cover not founded Albumomslag ikke fundet diff --git a/translations/de.ts b/translations/de.ts index 18b68f8..5b6163b 100644 --- a/translations/de.ts +++ b/translations/de.ts @@ -27,39 +27,6 @@ Du kannst den ursprünglichen Autor von FlowPlayer durch eine Spende unterstützen: - - AddFolder - - - Done - Fertig - - - - Cancel - Abbrechen - - - - Select folder - Ordner auswählen - - - - Deleting - Löschen - - - - Remove - Entfernen - - - - No items - Keine Einträge vorhanden - - AddRadio @@ -237,17 +204,17 @@ Datos - + Various artists Diverse Künstler - + 1 album 1 Album - + %1 albums %1 Alben @@ -338,48 +305,48 @@ LFM - - + + Error fetching artist information Fehler beim Abruf der Künstlerinformationen - + The artist could not be found Der Künstler konnte nicht gefunden werden - + Error fetching album information Fehler beim Abruf der Albuminformationen - + The album could not be found Das Album konnte nicht gefunden werden - + No album information available Keine Informationen zum Album verfügbar - + Error fetching track information Fehler beim Abruf der Titelinformationen - + The track could not be found Der Titel konnte nicht gefunden werden - + No track information available Keine Titelinformationen verfügbar - + Fetching artist information Hole Künstlerinformationen @@ -589,30 +556,35 @@ ManageFolders - + Add folder Ordner hinzufügen - + Manage folders Ordner verwalten - + Deleting Löschen - + Remove Entfernen - + No folders Keine Ordner vorhanden + + + Select folder + Ordner auswählen + Meta @@ -677,17 +649,17 @@ Missing - + Various artists Diverse Künstler - + Unknown album Unbekanntes Album - + Unknown artist Unbekannter Künstler @@ -709,12 +681,12 @@ MyPlaylist - + Unknown artist Unbekannter Künstler - + Unknown album Unbekanntes Album @@ -1357,22 +1329,22 @@ Utils - - - - - - + + + + + + No lyrics founded Keine Songtexte gefunden - + Error fetching lyrics Fehler beim Abruf der Songtexte - + Album cover not founded Albumcover nicht gefunden diff --git a/translations/es.ts b/translations/es.ts index b74922b..69d6ea2 100644 --- a/translations/es.ts +++ b/translations/es.ts @@ -1,4 +1,6 @@ - + + + AboutPage @@ -22,39 +24,6 @@ Usted puede contribuír a mantener este proyecto haciendo una pequeña donación - - AddFolder - - - Done - Listo - - - - Cancel - Cancelar - - - - Select folder - Seleccionar carpeta - - - - Deleting - Eliminando - - - - Remove - Eliminar - - - - No items - No hay ítems - - AddRadio @@ -232,17 +201,17 @@ Datos - + Various artists Artistas varios - + 1 album 1 álbum - + %1 albums %1 álbumes @@ -333,48 +302,48 @@ LFM - - + + Error fetching artist information Error al descargar información del artista - + The artist could not be found No se encontró el artista - + Error fetching album information Error al descargar información del álbum - + The album could not be found No se encontró el álbum - + No album information available No hay información del álbum disponible - + Error fetching track information Error al descargar información de la canción - + The track could not be found No se encontró la canción - + No track information available No hay información de la canción disponible - + Fetching artist information Descargando información del artista @@ -584,30 +553,35 @@ ManageFolders - + Add folder Agregar carpeta - + Manage folders Administrar carpetas - + Deleting Eliminando - + Remove Eliminar - + No folders No hay carpetas + + + Select folder + Seleccionar carpeta + Meta @@ -672,17 +646,17 @@ Missing - + Various artists Artistas varios - + Unknown album Album desconocido - + Unknown artist Artista desconocido @@ -704,12 +678,12 @@ MyPlaylist - + Unknown artist Artista desconocido - + Unknown album Album desconocido @@ -1352,22 +1326,22 @@ Utils - - - - - - + + + + + + No lyrics founded No se encontró las letras - + Error fetching lyrics Error al descargar letras - + Album cover not founded No se encontró la carátula @@ -1385,4 +1359,4 @@ Carátula no encontrada - \ No newline at end of file + diff --git a/translations/flowplayer.ts b/translations/flowplayer.ts index 4fc4858..be3300d 100644 --- a/translations/flowplayer.ts +++ b/translations/flowplayer.ts @@ -29,39 +29,6 @@ - - AddFolder - - - Done - - - - - Cancel - - - - - Select folder - - - - - Deleting - - - - - Remove - - - - - No items - - - AddRadio @@ -239,17 +206,17 @@ Datos - + Various artists - + 1 album - + %1 albums @@ -340,48 +307,48 @@ LFM - - + + Error fetching artist information - + The artist could not be found - + Error fetching album information - + The album could not be found - + No album information available - + Error fetching track information - + The track could not be found - + No track information available - + Fetching artist information @@ -591,30 +558,35 @@ ManageFolders - + Add folder - + Manage folders - + Deleting - + Remove - + No folders + + + Select folder + + Meta @@ -679,17 +651,17 @@ Missing - + Various artists - + Unknown album - + Unknown artist @@ -711,12 +683,12 @@ MyPlaylist - + Unknown artist - + Unknown album @@ -1359,22 +1331,22 @@ Utils - - - - - - + + + + + + No lyrics founded - + Error fetching lyrics - + Album cover not founded diff --git a/translations/fr.ts b/translations/fr.ts index ffcabd5..6493b30 100644 --- a/translations/fr.ts +++ b/translations/fr.ts @@ -1,4 +1,6 @@ - + + + AboutPage @@ -22,39 +24,6 @@ Vous pouvez aider à maintenir ce projet en vie en faisant une petite donation - - AddFolder - - - Done - Accepter - - - - Cancel - Annuler - - - - Select folder - Choisir le dossier - - - - Deleting - Suppression - - - - Remove - Retirer - - - - No items - Pas d'objet - - AddRadio @@ -232,17 +201,17 @@ Datos - + Various artists Artistes divers - + 1 album 1 album - + %1 albums %1 album @@ -333,48 +302,48 @@ LFM - - + + Error fetching artist information Erreur lors de la recherche d'informations sur l'artiste - + The artist could not be found L'artiste n'a pas été trouvé - + Error fetching album information Erreur lors de la recherche d'informations sur l'album - + The album could not be found L'album ne peut être trouvé - + No album information available Pas d'information disponible sur l'album - + Error fetching track information Erreur lors de la recherche d'informations sur la piste - + The track could not be found La piste ne peut être trouvée - + No track information available Pas d'information disponible sur la piste - + Fetching artist information Recherche d'informations sur l'artiste @@ -584,30 +553,35 @@ ManageFolders - + Add folder Ajouter un dossier - + Manage folders Gérer les dossiers - + Deleting Suppression - + Remove Retirer - + No folders Pas de dossier + + + Select folder + Choisir le dossier + Meta @@ -672,17 +646,17 @@ Missing - + Various artists Artistes divers - + Unknown album Album inconnu - + Unknown artist Artiste inconnu @@ -704,12 +678,12 @@ MyPlaylist - + Unknown artist Artiste inconnu - + Unknown album Album inconnu @@ -1352,22 +1326,22 @@ Utils - - - - - - + + + + + + No lyrics founded Paroles non trouvées - + Error fetching lyrics Erreur lors de la recherche des paroles - + Album cover not founded Pochette d'album non trouvée @@ -1385,4 +1359,4 @@ Pochette non trouvée - \ No newline at end of file + diff --git a/translations/it.ts b/translations/it.ts index 6aecc5e..3a7d342 100644 --- a/translations/it.ts +++ b/translations/it.ts @@ -24,39 +24,6 @@ Puoi contribuire al mantenimento di questo progetto effettuando una donazione - - AddFolder - - - Done - Fatto - - - - Cancel - Annulla - - - - Select folder - Seleziona cartella - - - - Deleting - Eliminazione - - - - Remove - Rimuovi - - - - No items - Nessun elemento - - AddRadio @@ -234,17 +201,17 @@ Datos - + Various artists Artisti vari - + 1 album 1 album - + %1 albums %1 album @@ -335,48 +302,48 @@ LFM - - + + Error fetching artist information Errore nel recuperare le info sull'artista - + The artist could not be found L'artista non può essere trovato - + Error fetching album information Errore nel recuperare le info sull'album - + The album could not be found L'album non può essere trovato - + No album information available Nessuna info sull'album disponibile - + Error fetching track information Errore nel recuperare le info sulla traccia - + The track could not be found La traccia non può essere trovata - + No track information available Nessuna info sulla traccia disponibile - + Fetching artist information Recupero info sull'artista @@ -586,30 +553,35 @@ ManageFolders - + Add folder Aggiungi cartella - + Manage folders Gestisci cartelle - + Deleting Eliminazione - + Remove Rimuovi - + No folders Nessuna cartella + + + Select folder + Seleziona cartella + Meta @@ -674,17 +646,17 @@ Missing - + Various artists Artisti vari - + Unknown album Album sconosciuto - + Unknown artist Artista sconosciuto @@ -706,12 +678,12 @@ MyPlaylist - + Unknown artist Artista sconosciuto - + Unknown album Album sconosciuto @@ -1354,22 +1326,22 @@ Utils - - - - - - + + + + + + No lyrics founded Testo non trovato - + Error fetching lyrics Errore nel recuperare il testo - + Album cover not founded Copertina album non trovata diff --git a/translations/nl.ts b/translations/nl.ts index 5de5edd..e634a96 100644 --- a/translations/nl.ts +++ b/translations/nl.ts @@ -1,4 +1,6 @@ - + + + AboutPage @@ -22,39 +24,6 @@ Met een kleine donatie, kunt u uw bijdrage leveren en het project in leven houden. - - AddFolder - - - Done - Klaar - - - - Cancel - Annuleren - - - - Select folder - Selecteer map - - - - Deleting - Verwijderen - - - - Remove - Verwijder - - - - No items - Geen items - - AddRadio @@ -232,17 +201,17 @@ Datos - + Various artists Diverse artiesten - + 1 album 1 album - + %1 albums %1 albums @@ -333,48 +302,48 @@ LFM - - + + Error fetching artist information Fout bij het ophalen van informatie over de artiest - + The artist could not be found Artiest kan niet worden gevonden - + Error fetching album information Fout bij het ophalen van informatie over de album - + The album could not be found Album kan niet worden gevonden - + No album information available Album informatie niet beschikbaar - + Error fetching track information Fout bij het ophalen van informatie over de track - + The track could not be found Track kan niet worden gevonden - + No track information available Track informatie niet beschikbaar - + Fetching artist information Informatie ophalen over de artiest @@ -584,30 +553,35 @@ ManageFolders - + Add folder Voeg map toe - + Manage folders Mappen beheren - + Deleting Verwijderen - + Remove Verwijder - + No folders Geen mappen + + + Select folder + Selecteer map + Meta @@ -672,17 +646,17 @@ Missing - + Various artists Diverse artiesten - + Unknown album Onbekende album - + Unknown artist Onbekende artiest @@ -704,12 +678,12 @@ MyPlaylist - + Unknown artist Onbekende artiest - + Unknown album Onbekende album @@ -1352,22 +1326,22 @@ Utils - - - - - - + + + + + + No lyrics founded Geen lyrics gevonden - + Error fetching lyrics Fout bij het ophalen van de lyrics - + Album cover not founded Album cover niet gevonden @@ -1385,4 +1359,4 @@ Cover niet gevonden - \ No newline at end of file + diff --git a/translations/ru.ts b/translations/ru.ts index 3444c10..a132f50 100644 --- a/translations/ru.ts +++ b/translations/ru.ts @@ -1,4 +1,6 @@ - + + + AboutPage @@ -22,39 +24,6 @@ Вы можете внести свой вклад в жизнь проекта, сделав небольшое пожертвование - - AddFolder - - - Done - Готово - - - - Cancel - Отмена - - - - Select folder - Выбрать папку - - - - Deleting - Удаление - - - - Remove - Удалить - - - - No items - Нет файлов - - AddRadio @@ -232,17 +201,17 @@ Datos - + Various artists Различные исполнители - + 1 album 1 альбом - + %1 albums %1 альбомов @@ -333,48 +302,48 @@ LFM - - + + Error fetching artist information Ошибка при получении сведений об исполнителе - + The artist could not be found Исполнитель не может быть найден - + Error fetching album information Ошибка при получении информации об альбоме - + The album could not be found Альбом не найден - + No album information available Нет информации об альбоме - + Error fetching track information Ошибка при получении информации о треке - + The track could not be found Трек не найден - + No track information available Нет информации о треке - + Fetching artist information Поиск сведений об исполнителе @@ -584,30 +553,35 @@ ManageFolders - + Add folder Добавить папку - + Manage folders Управление папками - + Deleting Удаление - + Remove Удалить - + No folders Папок нет + + + Select folder + Выбрать папку + Meta @@ -672,17 +646,17 @@ Missing - + Various artists Различные исполнители - + Unknown album Неизвестный альбом - + Unknown artist Неизвестный исполнитель @@ -704,12 +678,12 @@ MyPlaylist - + Unknown artist Неизвестный исполнитель - + Unknown album Неизвестный альбом @@ -1352,22 +1326,22 @@ Utils - - - - - - + + + + + + No lyrics founded Текст песни не найден - + Error fetching lyrics Ошибка при получении текста - + Album cover not founded Обложка альбома не найдена @@ -1385,4 +1359,4 @@ Обложка не найдена - \ No newline at end of file + diff --git a/translations/sv.ts b/translations/sv.ts index 8da0235..de59bc0 100644 --- a/translations/sv.ts +++ b/translations/sv.ts @@ -1,4 +1,6 @@ - + + + AboutPage @@ -27,39 +29,6 @@ Du kan stödja den ursprungliga utvecklaren av FlowPlayer genom att donera: - - AddFolder - - - Done - Klar - - - - Cancel - Avbryt - - - - Select folder - Välj mapp - - - - Deleting - Tar bort - - - - Remove - Ta bort - - - - No items - Inga objekt - - AddRadio @@ -237,17 +206,17 @@ Datos - + Various artists Diverse artister - + 1 album 1 album - + %1 albums %1 album @@ -338,48 +307,48 @@ LFM - - + + Error fetching artist information Fel vid hämtning av artistinformation - + The artist could not be found Artisten kunde inte hittas - + Error fetching album information Fel vid hämtning av albuminformation - + The album could not be found Albumet kunde inte hittas - + No album information available Ingen albuminformation tillgänglig - + Error fetching track information Fel vid hämtning av spårinformation - + The track could not be found Spåret kunde inte hittas - + No track information available Ingen spårinformation tillgänglig - + Fetching artist information Hämtar artistinformation @@ -589,30 +558,35 @@ ManageFolders - + Add folder Lägg till mapp - + Manage folders Hantera mappar - + Deleting Tar bort - + Remove Ta bort - + No folders Inga mappar + + + Select folder + Välj mapp + Meta @@ -677,17 +651,17 @@ Missing - + Various artists Diverse artister - + Unknown album Okänt album - + Unknown artist Okänd artist @@ -709,12 +683,12 @@ MyPlaylist - + Unknown artist Okänd artist - + Unknown album Okänt album @@ -1357,22 +1331,22 @@ Utils - - - - - - + + + + + + No lyrics founded Inga texter hittades - + Error fetching lyrics Fel vid texthämtning - + Album cover not founded Inget omslag hittades @@ -1390,4 +1364,4 @@ Inget omslag hittades - \ No newline at end of file + From 9ba1cebaefa56348d25d85165172fcac18a6feb0 Mon Sep 17 00:00:00 2001 From: Damien Caliste Date: Wed, 7 Feb 2024 10:00:13 +0100 Subject: [PATCH 2/2] Detect if Pickers are available. Fallback to old code if the Sailfish.Pickers module is not available in the import path. --- FlowPlayer.pro | 1 + qml/pages/AddFolder.qml | 141 ++++++++++++++++++++++++++++++++++++ qml/pages/ManageFolders.qml | 13 +--- qml/pages/PickFolder.qml | 12 +++ src/FlowPlayer.cpp | 5 ++ src/utils.cpp | 44 +++++++++++ src/utils.h | 2 + translations/ca.ts | 100 ++++++++++++++++--------- translations/da.ts | 100 ++++++++++++++++--------- translations/de.ts | 100 ++++++++++++++++--------- translations/es.ts | 106 +++++++++++++++++---------- translations/flowplayer.ts | 100 ++++++++++++++++--------- translations/fr.ts | 106 +++++++++++++++++---------- translations/it.ts | 100 ++++++++++++++++--------- translations/nl.ts | 106 +++++++++++++++++---------- translations/ru.ts | 106 +++++++++++++++++---------- translations/sv.ts | 106 +++++++++++++++++---------- 17 files changed, 856 insertions(+), 392 deletions(-) create mode 100644 qml/pages/AddFolder.qml create mode 100644 qml/pages/PickFolder.qml diff --git a/FlowPlayer.pro b/FlowPlayer.pro index 8f20ce8..5cb219d 100644 --- a/FlowPlayer.pro +++ b/FlowPlayer.pro @@ -78,6 +78,7 @@ OTHER_FILES += \ qml/pages/SongsPage.qml \ qml/pages/ManageFolders.qml \ qml/pages/AddFolder.qml \ + qml/pages/PickFolder.qml \ qml/pages/AboutPage.qml \ qml/pages/SelectPreset.qml \ qml/pages/LastFM.qml \ diff --git a/qml/pages/AddFolder.qml b/qml/pages/AddFolder.qml new file mode 100644 index 0000000..e9dc31e --- /dev/null +++ b/qml/pages/AddFolder.qml @@ -0,0 +1,141 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import FlowPlayer 1.0 + +Dialog { + id: root + + allowedOrientations: appWindow.pagesOrientations + + onAccepted: { + utils.addFolderToList(currentPath) + //pageStack.pop() + } + + onStatusChanged: { + if (status===PageStatus.Activating) { + foldersModel.clear() + utils.getFolderItems(currentPath) + } + } + + ListModel { id: foldersModel } + + Connections { + target: utils + + onAppendFile: { + foldersModel.append({"name":name, "path":path, "icon":icon}) + } + + onAppendFilesDone: currentPath = path + } + + property string currentPath: "/home/nemo" + + DialogHeader { + id: header + acceptText: qsTr("Done") + cancelText: qsTr("Cancel") + spacing: 0 + } + + SilicaFlickable { + id: flick + anchors.fill: parent + anchors.topMargin: header.height + clip: true + + Header { + id: header2 + title: qsTr("Select folder") + } + + IconButton { + id: upBtn + enabled: currentPath!=="/" + anchors.verticalCenter: header2.verticalCenter + anchors.left: parent.left + anchors.leftMargin: Theme.paddingMedium + icon.source: "image://theme/icon-m-up" + onClicked: { + foldersModel.clear() + utils.getFolderItemsUp(currentPath); + } + } + + SilicaListView { + id: flist + anchors.fill: parent + anchors.topMargin: header2.height + clip: true + + model: foldersModel + + delegate: ListItem { + contentHeight: Theme.itemSizeSmall + width: parent.width + clip: true + + enabled: model.icon==="folder" + + menu: contextMenu + + function removeItem() { + remorseAction(qsTr("Deleting"), + function() { + utils.removeFolder(model.location) + foldersModel.remove(model.index, 1) + }) + } + + Component { + id: contextMenu + ContextMenu { + MenuItem { + text: qsTr("Remove") + onClicked: { + removeItem() + } + } + } + } + + Image { + id: licon + anchors.left: parent.left + anchors.leftMargin: Theme.paddingLarge + anchors.verticalCenter: parent.verticalCenter + source: "image://theme/icon-m-" + model.icon + } + + Label + { + anchors.left: licon.right + anchors.leftMargin: Theme.paddingLarge + anchors.right: parent.right + anchors.rightMargin: Theme.paddingLarge + anchors.verticalCenter: parent.verticalCenter + truncationMode: TruncationMode.Fade + text: model.name + } + + onClicked: { + var p = model.path + foldersModel.clear() + utils.getFolderItems(p); + } + + } + + } + + ViewPlaceholder { + enabled: foldersModel.count===0 + flickable: flick + text: qsTr("No items") + } + + } + +} diff --git a/qml/pages/ManageFolders.qml b/qml/pages/ManageFolders.qml index ac3f51b..3e752dc 100644 --- a/qml/pages/ManageFolders.qml +++ b/qml/pages/ManageFolders.qml @@ -1,6 +1,5 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import Sailfish.Pickers 1.0 import FlowPlayer 1.0 Page { @@ -43,7 +42,7 @@ Page { PullDownMenu { MenuItem { text: qsTr("Add folder") - onClicked: pageStack.push(folderPickerPage) + onClicked: pageStack.push(hasPickers ? "PickFolder.qml" : "AddFolder.qml") } } @@ -119,16 +118,6 @@ Page { text: qsTr("No folders") } - Component { - id: folderPickerPage - FolderPickerPage { - dialogTitle: qsTr("Select folder") - showSystemFiles: false - onSelectedPathChanged: { - utils.addFolderToList(selectedPath) - } - } - } } diff --git a/qml/pages/PickFolder.qml b/qml/pages/PickFolder.qml new file mode 100644 index 0000000..c636087 --- /dev/null +++ b/qml/pages/PickFolder.qml @@ -0,0 +1,12 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Pickers 1.0 +import FlowPlayer 1.0 + +FolderPickerPage { + dialogTitle: qsTr("Select folder") + showSystemFiles: false + onSelectedPathChanged: { + utils.addFolderToList(selectedPath) + } +} diff --git a/src/FlowPlayer.cpp b/src/FlowPlayer.cpp index 55a5e0f..1ee8fce 100644 --- a/src/FlowPlayer.cpp +++ b/src/FlowPlayer.cpp @@ -60,6 +60,11 @@ int main(int argc, char *argv[]) window->engine()->addImportPath("/usr/share/flowplayer/qml"); window->rootContext()->setContextProperty("appVersion", VERSION); + bool hasPickers = false; + for (const QString &path : window->engine()->importPathList()) { + hasPickers = hasPickers || QFile::exists(path + "/Sailfish/Pickers"); + } + window->rootContext()->setContextProperty("hasPickers", hasPickers); qmlRegisterType("FlowPlayer", 1, 0, "Utils"); qmlRegisterType("FlowPlayer", 1, 0, "CoverSearch"); diff --git a/src/utils.cpp b/src/utils.cpp index 0e7fe3e..b47b3ad 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -635,6 +635,50 @@ void Utils::getFolders() } } +void Utils::getFolderItemsUp(QString path) +{ + if (path.endsWith("/")) + path.chop(1); + int i = path.lastIndexOf("/"); + path = path.left(i); + if (path=="") path = "/"; + getFolderItems(path); +} + +void Utils::getFolderItems(QString path) +{ + qDebug() << "Loading folder: " << path; + + if (!QFileInfo(path).exists()) + return; + + QDir dir (path); + QStringList data; + //data << ".mp3" << "*.m4a" << "*.wma" << "*.flac" << "*.ogg" << "*.wav" << "*.asf"; + //dir.setNameFilters(data); + + QFileInfoList entries; + entries = dir.entryInfoList(QDir::AllEntries | QDir::System | QDir::NoDotAndDotDot , + QDir::Name | QDir::IgnoreCase | QDir::DirsFirst); + + + QListIterator entriesIterator (entries); + while(entriesIterator.hasNext()) + { + QFileInfo fileInfo = entriesIterator.next(); + + if (fileInfo.isDir()) + emit appendFile(fileInfo.fileName(), fileInfo.absoluteFilePath(), "folder"); + else if (fileInfo.fileName().endsWith(".mp3") || fileInfo.fileName().endsWith(".m4a") || + fileInfo.fileName().endsWith(".wma") || fileInfo.fileName().endsWith(".ogg") || + fileInfo.fileName().endsWith(".flac") || fileInfo.fileName().endsWith(".wav") || + fileInfo.fileName().endsWith(".asf")) + emit appendFile(fileInfo.fileName(), fileInfo.absoluteFilePath(), "sounds"); + } + + emit appendFilesDone(path); +} + void Utils::addFolderToList(QString path) { QStringList folders = settings.value("Folders","").toString().split(""); diff --git a/src/utils.h b/src/utils.h index 64fdb52..9fb7637 100644 --- a/src/utils.h +++ b/src/utils.h @@ -113,6 +113,8 @@ public slots: void removeAlbumArt(); void getFolders(); + void getFolderItems(QString path); + void getFolderItemsUp(QString path); void addFolderToList(QString path); void removeFolder(QString path); diff --git a/translations/ca.ts b/translations/ca.ts index 85a86ab..95741bd 100644 --- a/translations/ca.ts +++ b/translations/ca.ts @@ -24,6 +24,39 @@ Podeu contribuir a mantenir aquest projecte actiu fent una petita donació + + AddFolder + + + Done + Fet + + + + Cancel + Cancel·la + + + + Select folder + Selecciona una carpeta + + + + Deleting + S'està eliminant + + + + Remove + Elimina + + + + No items + No hi ha cap element + + AddRadio @@ -201,17 +234,17 @@ Datos - + Various artists Artistes diversos - + 1 album 1 àlbum - + %1 albums %1 àlbums @@ -302,48 +335,48 @@ LFM - - + + Error fetching artist information Error en l'obtenció de la informació de l'artista - + The artist could not be found No s'ha pogut trobar l'artista - + Error fetching album information Error en l'obtenció de la informació de l'àlbum - + The album could not be found No s'ha pogut trobar l'àlbum - + No album information available No s'ha trobat informació de l'àlbum - + Error fetching track information Error en l'obtenció de la informació de la pista - + The track could not be found No s'ha pogut trobar la pista - + No track information available No s'ha trobat informació de la pista - + Fetching artist information S'està obtenint la informació de l'artista @@ -553,35 +586,30 @@ ManageFolders - + Add folder Afegeix una carpeta - + Manage folders Gestor de carpetes - + Deleting S'està eliminant - + Remove Elimina - + No folders No hi ha cap carpeta - - - Select folder - Selecciona una carpeta - Meta @@ -646,17 +674,17 @@ Missing - + Various artists Artistes diversos - + Unknown album Àlbum desconegut - + Unknown artist Artista desconegut @@ -678,12 +706,12 @@ MyPlaylist - + Unknown artist Artista desconegut - + Unknown album Àlbum desconegut @@ -1326,22 +1354,22 @@ Utils - - - - - - + + + + + + No lyrics founded No s'ha trobat la lletra - + Error fetching lyrics Error en l'obtenció de la lletra - + Album cover not founded No s'ha trobat la caràtula diff --git a/translations/da.ts b/translations/da.ts index 032e981..d367991 100644 --- a/translations/da.ts +++ b/translations/da.ts @@ -24,6 +24,39 @@ Du kan bidrage til at holde dette projekt i live ved at give en lille donation + + AddFolder + + + Done + Udført + + + + Cancel + Annuller + + + + Select folder + Vælg folder + + + + Deleting + Sletter + + + + Remove + Fjern + + + + No items + Ingen poster + + AddRadio @@ -201,17 +234,17 @@ Datos - + Various artists Forskellige kunstnere - + 1 album 1 album - + %1 albums %1 albums @@ -302,48 +335,48 @@ LFM - - + + Error fetching artist information Fejl ved hentning af kunstnerinformation - + The artist could not be found Kunstneren kunne ikke findes - + Error fetching album information Fejl ved hentning af albuminformation - + The album could not be found Albummet kunne ikke findes - + No album information available Ingen albuminformation tilgængelig - + Error fetching track information Fejl ved hentning af sporinformation - + The track could not be found Sporet kan ikke findes - + No track information available Ingen information om spor tilgængelig - + Fetching artist information Henter info om kunstner @@ -553,35 +586,30 @@ ManageFolders - + Add folder Tilføj folder - + Manage folders Håndter foldere - + Deleting Sletter - + Remove Fjern - + No folders Ingen foldere - - - Select folder - Vælg folder - Meta @@ -646,17 +674,17 @@ Missing - + Various artists Forskellige kunstnere - + Unknown album Ukendt album - + Unknown artist Ukendt kunstner @@ -678,12 +706,12 @@ MyPlaylist - + Unknown artist Ukendt kunstner - + Unknown album Ukendt album @@ -1326,22 +1354,22 @@ Utils - - - - - - + + + + + + No lyrics founded Ingen tekster fundet - + Error fetching lyrics Fejl ved hentning af tekster - + Album cover not founded Albumomslag ikke fundet diff --git a/translations/de.ts b/translations/de.ts index 5b6163b..18b68f8 100644 --- a/translations/de.ts +++ b/translations/de.ts @@ -27,6 +27,39 @@ Du kannst den ursprünglichen Autor von FlowPlayer durch eine Spende unterstützen: + + AddFolder + + + Done + Fertig + + + + Cancel + Abbrechen + + + + Select folder + Ordner auswählen + + + + Deleting + Löschen + + + + Remove + Entfernen + + + + No items + Keine Einträge vorhanden + + AddRadio @@ -204,17 +237,17 @@ Datos - + Various artists Diverse Künstler - + 1 album 1 Album - + %1 albums %1 Alben @@ -305,48 +338,48 @@ LFM - - + + Error fetching artist information Fehler beim Abruf der Künstlerinformationen - + The artist could not be found Der Künstler konnte nicht gefunden werden - + Error fetching album information Fehler beim Abruf der Albuminformationen - + The album could not be found Das Album konnte nicht gefunden werden - + No album information available Keine Informationen zum Album verfügbar - + Error fetching track information Fehler beim Abruf der Titelinformationen - + The track could not be found Der Titel konnte nicht gefunden werden - + No track information available Keine Titelinformationen verfügbar - + Fetching artist information Hole Künstlerinformationen @@ -556,35 +589,30 @@ ManageFolders - + Add folder Ordner hinzufügen - + Manage folders Ordner verwalten - + Deleting Löschen - + Remove Entfernen - + No folders Keine Ordner vorhanden - - - Select folder - Ordner auswählen - Meta @@ -649,17 +677,17 @@ Missing - + Various artists Diverse Künstler - + Unknown album Unbekanntes Album - + Unknown artist Unbekannter Künstler @@ -681,12 +709,12 @@ MyPlaylist - + Unknown artist Unbekannter Künstler - + Unknown album Unbekanntes Album @@ -1329,22 +1357,22 @@ Utils - - - - - - + + + + + + No lyrics founded Keine Songtexte gefunden - + Error fetching lyrics Fehler beim Abruf der Songtexte - + Album cover not founded Albumcover nicht gefunden diff --git a/translations/es.ts b/translations/es.ts index 69d6ea2..b74922b 100644 --- a/translations/es.ts +++ b/translations/es.ts @@ -1,6 +1,4 @@ - - - + AboutPage @@ -24,6 +22,39 @@ Usted puede contribuír a mantener este proyecto haciendo una pequeña donación + + AddFolder + + + Done + Listo + + + + Cancel + Cancelar + + + + Select folder + Seleccionar carpeta + + + + Deleting + Eliminando + + + + Remove + Eliminar + + + + No items + No hay ítems + + AddRadio @@ -201,17 +232,17 @@ Datos - + Various artists Artistas varios - + 1 album 1 álbum - + %1 albums %1 álbumes @@ -302,48 +333,48 @@ LFM - - + + Error fetching artist information Error al descargar información del artista - + The artist could not be found No se encontró el artista - + Error fetching album information Error al descargar información del álbum - + The album could not be found No se encontró el álbum - + No album information available No hay información del álbum disponible - + Error fetching track information Error al descargar información de la canción - + The track could not be found No se encontró la canción - + No track information available No hay información de la canción disponible - + Fetching artist information Descargando información del artista @@ -553,35 +584,30 @@ ManageFolders - + Add folder Agregar carpeta - + Manage folders Administrar carpetas - + Deleting Eliminando - + Remove Eliminar - + No folders No hay carpetas - - - Select folder - Seleccionar carpeta - Meta @@ -646,17 +672,17 @@ Missing - + Various artists Artistas varios - + Unknown album Album desconocido - + Unknown artist Artista desconocido @@ -678,12 +704,12 @@ MyPlaylist - + Unknown artist Artista desconocido - + Unknown album Album desconocido @@ -1326,22 +1352,22 @@ Utils - - - - - - + + + + + + No lyrics founded No se encontró las letras - + Error fetching lyrics Error al descargar letras - + Album cover not founded No se encontró la carátula @@ -1359,4 +1385,4 @@ Carátula no encontrada - + \ No newline at end of file diff --git a/translations/flowplayer.ts b/translations/flowplayer.ts index be3300d..4fc4858 100644 --- a/translations/flowplayer.ts +++ b/translations/flowplayer.ts @@ -29,6 +29,39 @@ + + AddFolder + + + Done + + + + + Cancel + + + + + Select folder + + + + + Deleting + + + + + Remove + + + + + No items + + + AddRadio @@ -206,17 +239,17 @@ Datos - + Various artists - + 1 album - + %1 albums @@ -307,48 +340,48 @@ LFM - - + + Error fetching artist information - + The artist could not be found - + Error fetching album information - + The album could not be found - + No album information available - + Error fetching track information - + The track could not be found - + No track information available - + Fetching artist information @@ -558,35 +591,30 @@ ManageFolders - + Add folder - + Manage folders - + Deleting - + Remove - + No folders - - - Select folder - - Meta @@ -651,17 +679,17 @@ Missing - + Various artists - + Unknown album - + Unknown artist @@ -683,12 +711,12 @@ MyPlaylist - + Unknown artist - + Unknown album @@ -1331,22 +1359,22 @@ Utils - - - - - - + + + + + + No lyrics founded - + Error fetching lyrics - + Album cover not founded diff --git a/translations/fr.ts b/translations/fr.ts index 6493b30..ffcabd5 100644 --- a/translations/fr.ts +++ b/translations/fr.ts @@ -1,6 +1,4 @@ - - - + AboutPage @@ -24,6 +22,39 @@ Vous pouvez aider à maintenir ce projet en vie en faisant une petite donation + + AddFolder + + + Done + Accepter + + + + Cancel + Annuler + + + + Select folder + Choisir le dossier + + + + Deleting + Suppression + + + + Remove + Retirer + + + + No items + Pas d'objet + + AddRadio @@ -201,17 +232,17 @@ Datos - + Various artists Artistes divers - + 1 album 1 album - + %1 albums %1 album @@ -302,48 +333,48 @@ LFM - - + + Error fetching artist information Erreur lors de la recherche d'informations sur l'artiste - + The artist could not be found L'artiste n'a pas été trouvé - + Error fetching album information Erreur lors de la recherche d'informations sur l'album - + The album could not be found L'album ne peut être trouvé - + No album information available Pas d'information disponible sur l'album - + Error fetching track information Erreur lors de la recherche d'informations sur la piste - + The track could not be found La piste ne peut être trouvée - + No track information available Pas d'information disponible sur la piste - + Fetching artist information Recherche d'informations sur l'artiste @@ -553,35 +584,30 @@ ManageFolders - + Add folder Ajouter un dossier - + Manage folders Gérer les dossiers - + Deleting Suppression - + Remove Retirer - + No folders Pas de dossier - - - Select folder - Choisir le dossier - Meta @@ -646,17 +672,17 @@ Missing - + Various artists Artistes divers - + Unknown album Album inconnu - + Unknown artist Artiste inconnu @@ -678,12 +704,12 @@ MyPlaylist - + Unknown artist Artiste inconnu - + Unknown album Album inconnu @@ -1326,22 +1352,22 @@ Utils - - - - - - + + + + + + No lyrics founded Paroles non trouvées - + Error fetching lyrics Erreur lors de la recherche des paroles - + Album cover not founded Pochette d'album non trouvée @@ -1359,4 +1385,4 @@ Pochette non trouvée - + \ No newline at end of file diff --git a/translations/it.ts b/translations/it.ts index 3a7d342..6aecc5e 100644 --- a/translations/it.ts +++ b/translations/it.ts @@ -24,6 +24,39 @@ Puoi contribuire al mantenimento di questo progetto effettuando una donazione + + AddFolder + + + Done + Fatto + + + + Cancel + Annulla + + + + Select folder + Seleziona cartella + + + + Deleting + Eliminazione + + + + Remove + Rimuovi + + + + No items + Nessun elemento + + AddRadio @@ -201,17 +234,17 @@ Datos - + Various artists Artisti vari - + 1 album 1 album - + %1 albums %1 album @@ -302,48 +335,48 @@ LFM - - + + Error fetching artist information Errore nel recuperare le info sull'artista - + The artist could not be found L'artista non può essere trovato - + Error fetching album information Errore nel recuperare le info sull'album - + The album could not be found L'album non può essere trovato - + No album information available Nessuna info sull'album disponibile - + Error fetching track information Errore nel recuperare le info sulla traccia - + The track could not be found La traccia non può essere trovata - + No track information available Nessuna info sulla traccia disponibile - + Fetching artist information Recupero info sull'artista @@ -553,35 +586,30 @@ ManageFolders - + Add folder Aggiungi cartella - + Manage folders Gestisci cartelle - + Deleting Eliminazione - + Remove Rimuovi - + No folders Nessuna cartella - - - Select folder - Seleziona cartella - Meta @@ -646,17 +674,17 @@ Missing - + Various artists Artisti vari - + Unknown album Album sconosciuto - + Unknown artist Artista sconosciuto @@ -678,12 +706,12 @@ MyPlaylist - + Unknown artist Artista sconosciuto - + Unknown album Album sconosciuto @@ -1326,22 +1354,22 @@ Utils - - - - - - + + + + + + No lyrics founded Testo non trovato - + Error fetching lyrics Errore nel recuperare il testo - + Album cover not founded Copertina album non trovata diff --git a/translations/nl.ts b/translations/nl.ts index e634a96..5de5edd 100644 --- a/translations/nl.ts +++ b/translations/nl.ts @@ -1,6 +1,4 @@ - - - + AboutPage @@ -24,6 +22,39 @@ Met een kleine donatie, kunt u uw bijdrage leveren en het project in leven houden. + + AddFolder + + + Done + Klaar + + + + Cancel + Annuleren + + + + Select folder + Selecteer map + + + + Deleting + Verwijderen + + + + Remove + Verwijder + + + + No items + Geen items + + AddRadio @@ -201,17 +232,17 @@ Datos - + Various artists Diverse artiesten - + 1 album 1 album - + %1 albums %1 albums @@ -302,48 +333,48 @@ LFM - - + + Error fetching artist information Fout bij het ophalen van informatie over de artiest - + The artist could not be found Artiest kan niet worden gevonden - + Error fetching album information Fout bij het ophalen van informatie over de album - + The album could not be found Album kan niet worden gevonden - + No album information available Album informatie niet beschikbaar - + Error fetching track information Fout bij het ophalen van informatie over de track - + The track could not be found Track kan niet worden gevonden - + No track information available Track informatie niet beschikbaar - + Fetching artist information Informatie ophalen over de artiest @@ -553,35 +584,30 @@ ManageFolders - + Add folder Voeg map toe - + Manage folders Mappen beheren - + Deleting Verwijderen - + Remove Verwijder - + No folders Geen mappen - - - Select folder - Selecteer map - Meta @@ -646,17 +672,17 @@ Missing - + Various artists Diverse artiesten - + Unknown album Onbekende album - + Unknown artist Onbekende artiest @@ -678,12 +704,12 @@ MyPlaylist - + Unknown artist Onbekende artiest - + Unknown album Onbekende album @@ -1326,22 +1352,22 @@ Utils - - - - - - + + + + + + No lyrics founded Geen lyrics gevonden - + Error fetching lyrics Fout bij het ophalen van de lyrics - + Album cover not founded Album cover niet gevonden @@ -1359,4 +1385,4 @@ Cover niet gevonden - + \ No newline at end of file diff --git a/translations/ru.ts b/translations/ru.ts index a132f50..3444c10 100644 --- a/translations/ru.ts +++ b/translations/ru.ts @@ -1,6 +1,4 @@ - - - + AboutPage @@ -24,6 +22,39 @@ Вы можете внести свой вклад в жизнь проекта, сделав небольшое пожертвование + + AddFolder + + + Done + Готово + + + + Cancel + Отмена + + + + Select folder + Выбрать папку + + + + Deleting + Удаление + + + + Remove + Удалить + + + + No items + Нет файлов + + AddRadio @@ -201,17 +232,17 @@ Datos - + Various artists Различные исполнители - + 1 album 1 альбом - + %1 albums %1 альбомов @@ -302,48 +333,48 @@ LFM - - + + Error fetching artist information Ошибка при получении сведений об исполнителе - + The artist could not be found Исполнитель не может быть найден - + Error fetching album information Ошибка при получении информации об альбоме - + The album could not be found Альбом не найден - + No album information available Нет информации об альбоме - + Error fetching track information Ошибка при получении информации о треке - + The track could not be found Трек не найден - + No track information available Нет информации о треке - + Fetching artist information Поиск сведений об исполнителе @@ -553,35 +584,30 @@ ManageFolders - + Add folder Добавить папку - + Manage folders Управление папками - + Deleting Удаление - + Remove Удалить - + No folders Папок нет - - - Select folder - Выбрать папку - Meta @@ -646,17 +672,17 @@ Missing - + Various artists Различные исполнители - + Unknown album Неизвестный альбом - + Unknown artist Неизвестный исполнитель @@ -678,12 +704,12 @@ MyPlaylist - + Unknown artist Неизвестный исполнитель - + Unknown album Неизвестный альбом @@ -1326,22 +1352,22 @@ Utils - - - - - - + + + + + + No lyrics founded Текст песни не найден - + Error fetching lyrics Ошибка при получении текста - + Album cover not founded Обложка альбома не найдена @@ -1359,4 +1385,4 @@ Обложка не найдена - + \ No newline at end of file diff --git a/translations/sv.ts b/translations/sv.ts index de59bc0..8da0235 100644 --- a/translations/sv.ts +++ b/translations/sv.ts @@ -1,6 +1,4 @@ - - - + AboutPage @@ -29,6 +27,39 @@ Du kan stödja den ursprungliga utvecklaren av FlowPlayer genom att donera: + + AddFolder + + + Done + Klar + + + + Cancel + Avbryt + + + + Select folder + Välj mapp + + + + Deleting + Tar bort + + + + Remove + Ta bort + + + + No items + Inga objekt + + AddRadio @@ -206,17 +237,17 @@ Datos - + Various artists Diverse artister - + 1 album 1 album - + %1 albums %1 album @@ -307,48 +338,48 @@ LFM - - + + Error fetching artist information Fel vid hämtning av artistinformation - + The artist could not be found Artisten kunde inte hittas - + Error fetching album information Fel vid hämtning av albuminformation - + The album could not be found Albumet kunde inte hittas - + No album information available Ingen albuminformation tillgänglig - + Error fetching track information Fel vid hämtning av spårinformation - + The track could not be found Spåret kunde inte hittas - + No track information available Ingen spårinformation tillgänglig - + Fetching artist information Hämtar artistinformation @@ -558,35 +589,30 @@ ManageFolders - + Add folder Lägg till mapp - + Manage folders Hantera mappar - + Deleting Tar bort - + Remove Ta bort - + No folders Inga mappar - - - Select folder - Välj mapp - Meta @@ -651,17 +677,17 @@ Missing - + Various artists Diverse artister - + Unknown album Okänt album - + Unknown artist Okänd artist @@ -683,12 +709,12 @@ MyPlaylist - + Unknown artist Okänd artist - + Unknown album Okänt album @@ -1331,22 +1357,22 @@ Utils - - - - - - + + + + + + No lyrics founded Inga texter hittades - + Error fetching lyrics Fel vid texthämtning - + Album cover not founded Inget omslag hittades @@ -1364,4 +1390,4 @@ Inget omslag hittades - + \ No newline at end of file