Changes of Revision 10
| [-] [+] | Changed | _service:tar_git:harbour-sirensong.spec |
| [-] [+] | Changed | _service ^ |
| @@ -6,7 +6,7 @@ <service name="tar_git"> <param name="url">https://github.com/r0kk3rz/SirenSong-Media-Player.git</param> <param name="branch">master</param> - <param name="revision">b6c44e7705a080236159b1e3da871cb5972e4002</param> + <param name="revision">7f74ab8c69e8f625860aecdff9ba12f727b54010</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param> | ||
| [-] [+] | Changed | _service:tar_git:harbour-sirensong-0.6.tar.bz2/SirenSong-Media-Player.pro ^ |
| @@ -30,26 +30,19 @@ OTHER_FILES += \ qml/cover/CoverPage.qml \ - translations/*.ts \ harbour-sirensong.desktop \ - qml/pages/AlphaMenu.qml \ - qml/pages/AlphaMenuGroupView.qml \ - qml/pages/AlphaMenuGroup.qml \ - qml/pages/PlayerPage.qml \ - qml/pages/SongSelect.qml \ - qml/pages/ArtistSelect.qml \ - qml/pages/SearchSelect.qml \ + qml/pages/*.qml \ qml/pages/functions.js \ - qml/pages/LibraryPage.qml \ - qml/pages/SettingsPage.qml \ - translations/SirenSong-Media-Player-fr.ts \ - translations/SirenSong-Media-Player-nl.ts \ - translations/SirenSong-Media-Player-ru.ts \ - translations/harbour-sirensong-cz.ts \ - qml/harbour-sirensong.qml \ rpm/harbour-sirensong.spec \ rpm/harbour-sirensong.yaml \ - rpm/harbour-sirensong.changes.in + rpm/harbour-sirensong.changes.in \ + translations/harbour-sirensong-de.ts \ + translations/harbour-sirensong-fi.ts \ + translations/harbour-sirensong-fr.ts \ + translations/harbour-sirensong-cz.ts \ + translations/harbour-sirensong-nl.ts \ + translations/harbour-sirensong-ru.ts \ + translations/harbour-sirensong-sv.ts icons.files = $${TARGET}.png icons.path = /usr/share/icons/hicolor/86x86/apps @@ -59,11 +52,12 @@ CONFIG += sailfishapp_i18n CONFIG += sailfishapp_i18n_unfinished TRANSLATIONS += translations/harbour-sirensong-de.ts \ -translations/harbour-sirensong-fi.ts \ -translations/harbour-sirensong-fr.ts \ -translations/harbour-sirensong-cz.ts \ -translations/harbour-sirensong-nl.ts \ -translations/harbour-sirensong-ru.ts + translations/harbour-sirensong-fi.ts \ + translations/harbour-sirensong-fr.ts \ + translations/harbour-sirensong-cz.ts \ + translations/harbour-sirensong-nl.ts \ + translations/harbour-sirensong-ru.ts \ + translations/harbour-sirensong-sv.ts HEADERS += \ src/mediaplayer.h \ @@ -74,3 +68,7 @@ src/mediaplaylist.h \ src/settings.h +DISTFILES += \ + qml/pages/SongItem.qml \ + qml/pages/TieredMenu.qml + | ||
| [-] [+] | Changed | _service:tar_git:harbour-sirensong-0.6.tar.bz2/qml/pages/ArtistSelect.qml ^ |
| @@ -10,6 +10,7 @@ property Item _currActiveGroup property Item _currActiveAlbum + //Top Level Menu Repeater { model: queryModel @@ -25,6 +26,7 @@ property alias containsMouse: mouseArea.containsMouse property bool highlighted: pressed && containsMouse || artistItem.active property int baseHeight: Theme.itemSizeSmall + property string selectedArtist MouseArea { id: mouseArea @@ -57,6 +59,7 @@ groupResultsList = albumListComponent.createObject(artistItem); groupResultsList.open(artistName); artistItem.active = true; + artistItem.selectedArtist = artistName; root._currActiveGroup = artistItem; } @@ -70,6 +73,7 @@ { artistItem.active = false; artistItem.groupResultsList.close(); + artistItem.selectedArtist = ""; } } } @@ -100,90 +104,21 @@ Component { id: albumListComponent - Column { - id: albumListView - height: (albumListQueryModel.count * Theme.itemSizeSmall) + submenuHeight - - x: -parent.x - y: Theme.itemSizeSmall + TieredMenu { width: root.width - - property Item songListItem - property int submenuHeight: (songListItem != null) && (songListItem.active == true) ? songListItem.implicitHeight : 0 - - Repeater { - id: albumRepeater - model: albumListQueryModel - - Item { - id: albumItem - height: Theme.itemSizeSmall + ((songListItem != null) && (active == true) ? songListItem.implicitHeight : 0) - width: albumListView.width - property bool active: false - - ListItem { - width: parent.width - height: Theme.itemSizeSmall - onClicked: activate(parent) - Label { x:60; text: albumTitle; anchors.verticalCenter: parent.verticalCenter } - } - - function activate(albumItem) - { - if(!albumItem.active) - { - if(root._currActiveAlbum != null) - { - deactivate(root._currActiveAlbum) - } - - songListItem = songListComponent.createObject(albumItem); - albumItem.active = true - songListItem.open(albumTitle) - - root._currActiveAlbum = albumItem - } - else - { - deactivate(albumItem) - } - } - - function deactivate(albumItem) - { - albumItem.active = false; - - if(albumListView.songListItem.active == true) - albumListView.songListItem.close(); - } - } - } - - function open(artistName) - { - albumListQueryModel.filter(artistName) - albumRepeater.model = albumListQueryModel - state = "active"; - } - - function close() - { - state = ""; - albumRepeater.model = emptyModel; - } - - SparqlListModel { + subListComponent: songListComponent + activeParentItem: root._currActiveAlbum + menuListQueryModel: SparqlListModel { id: albumListQueryModel connection: SparqlConnection { - id: sparqlConnection driver: "QTRACKER_DIRECT" } function filter(filterText) { - albumListQueryModel.query = "SELECT ?albumTitle " + "WHERE { ?album a nmm:MusicAlbum . " + + albumListQueryModel.query = "SELECT ?menuText " + "WHERE { ?album a nmm:MusicAlbum . " + "?album nmm:albumArtist ?albumArtist . " + - "?album nmm:albumTitle ?albumTitle . " + + "?album nmm:albumTitle ?menuText. " + "?albumArtist nmm:artistName ?artistName " + "FILTER (?artistName = '"+ filterText +"') "+ "} " @@ -212,48 +147,9 @@ NumberAnimation { duration: 200 } } - delegate: ListItem { + delegate: SongItem { width: parent.width id: songList - - menu: ContextMenu { - MenuItem { - text: qsTr("Add to Play Queue") - onClicked: SirenSong.addToPlaylist(url) - } - } - - onClicked: { - SirenSong.play(url) - if (libraryPage.forwardNavigation) { - pageStack.navigateForward(PageStackAction.Animated) - } - } - - Row { - spacing: 20 - x: 10 - - Label { - text: UIFunctions.durationString(length) - height: Theme.itemSizeHuge - font.pixelSize: Theme.fontSizeExtraLarge - color: Theme.secondaryColor - } - - Column { - Label { - text: title != null ? title : filename - font.pixelSize: Theme.fontSizeMedium - color: Theme.primaryColor - } - Label { - text: artist != null ? artist : qsTr("Unknown Artist") - font.pixelSize: Theme.fontSizeExtraSmall - color: Theme.secondaryColor - } - } - } } function open(albumTitle) @@ -294,10 +190,12 @@ "?song nmm:musicAlbum ?album . " + "?album nmm:albumArtist ?albumArtist . " + "?album nmm:albumTitle ?albumTitle . " + - "?albumArtist nmm:artistName ?artist " + - "FILTER (?albumTitle = '"+ filterText +"') "+ + "?song nmm:performer ?aName . "+ + "?aName nmm:artistName ?artist "+ + "FILTER (?albumTitle = '"+ filterText +"' && + ?artist = '"+ _currActiveGroup.selectedArtist +"') "+ "} " + - "ORDER BY ASC(?tracknumber)" + "GROUP BY ?song ORDER BY ASC(?tracknumber)" } } } | ||
| [-] [+] | Changed | _service:tar_git:harbour-sirensong-0.6.tar.bz2/qml/pages/LibraryPage.qml ^ |
| @@ -8,6 +8,7 @@ property Component songSelectComponent: Qt.createComponent("SongSelect.qml", Component.Asynchronous) property Component artistSelectComponent: Qt.createComponent("ArtistSelect.qml", Component.Asynchronous) + property Component searchSelectComponent: Qt.createComponent("SearchSelect.qml", Component.Asynchronous) property int defaultLibraryMenu: settings.value("defaultLibraryMenu") property string launchArgs: Qt.resolvedUrl(Qt.application.arguments[1]); @@ -70,11 +71,6 @@ // pull down for different library menus PullDownMenu { - /* - MenuItem { - text: qsTr("Search") - onClicked: browser.source = "SearchSelect.qml" - } */ MenuItem { text: qsTr("Settings") @@ -82,6 +78,11 @@ } MenuItem { + text: qsTr("Search") + onClicked: browser.sourceComponent = searchSelectComponent + } + + MenuItem { text: qsTr("Sort by Artist") onClicked: browser.sourceComponent = artistSelectComponent } | ||
| [-] [+] | Changed | _service:tar_git:harbour-sirensong-0.6.tar.bz2/qml/pages/SearchSelect.qml ^ |
| @@ -1,113 +1,54 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 +import QtSparql 1.0 - SilicaListView { + Column { id: searchPage - property bool keepSearchFieldFocus + property bool keepSearchFieldFocus: true property string activeView: "list" property string searchString - onSearchStringChanged: listModel.update() + onSearchStringChanged: songListQueryModel.filter() - - model: ListModel { - id: listModel - - property variant countries: ["Afghanistan", "Albania", "Algeria", "Andorra", "Angola", - "Antigua and Barbuda", "Argentina", "Armenia", "Australia", "Austria", - "Azerbaijan", "Bahamas", "Bahrain", "Bangladesh", "Barbados", - "Belarus", "Belgium", "Belize", "Benin", "Bhutan", - "Bolivia", "Bosnia and Herzegovina", "Botswana", "Brazil", "Brunei", - "Bulgaria", "Burkina Faso", "Burma", "Burundi", "Cambodia", - "Cameroon", "Canada", "Cape Verde", "Central African Republic", "Chad", - "Chile", "China", "Colombia", "Comoros", "Costa Rica", - "Croatia", "Cuba", "Cyprus", "Czech Republic", "Denmark", - "Djibouti", "Dominica", "Dominican Republic", "East Timor", "Ecuador", - "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", - "Ethiopia", "Fiji", "Finland", "France", "Gabon", - "Gambia", "Georgia", "Germany", "Ghana", "Greece", - "Grenada", "Guatemala", "Guinea", "Guinea-Bissau", "Guyana", - "Haiti", "Honduras", "Hungary", "Iceland", "India", - "Indonesia", "Iran", "Iraq", "Ireland", "Israel", - "Italy", "Jamaica", "Japan", "Jordan", "Kazakhstan", - "Kenya", "Kiribati", "Korea North", "Korea South", "Kuwait", - "Kyrgyzstan", "Laos", "Latvia", "Lebanon", "Lesotho", - "Liberia", "Libya", "Liechtenstein", "Lithuania", "Luxembourg", - "Macedonia", "Madagascar", "Malawi", "Malaysia", "Maldives", - "Mali", "Malta", "Marshall Islands", "Mauritania", "Mauritius", - "Mexico", "Micronesia", "Moldova", "Monaco", "Mongolia", - "Montenegro", "Morocco", "Mozambique", "Namibia", "Nauru", - "Nepal", "Netherlands", "New Zealand", "Nicaragua", "Niger", - "Nigeria", "Norway", "Oman", "Pakistan", "Palau", - "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", - "Poland", "Portugal", "Qatar", "Romania", "Russia", - "Rwanda", "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "Samoa", - "San Marino", "Saudi Arabia", "Senegal", "Serbia", "Seychelles", - "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands", - "Somalia", "South Africa", "South Sudan", "Spain", "Sri Lanka", - "Sudan", "Suriname", "Swaziland", "Sweden", "Switzerland", - "Syria", "Tajikistan", "Tanzania", "Thailand", "Togo", - "Tonga", "Trinidad and Tobago", "Tunisia", "Turkey", "Turkmenistan", - "Tuvalu", "Uganda", "Ukraine", "United Arab Emirates", "United Kingdom", - "United States", "Uruguay", "Uzbekistan", "Vanuatu", "Vatican City", - "Venezuela", "Vietnam", "Yemen", "Zambia", "Zimbabwe", - "Abkhazia", "Cook Islands", "Kosovo", "Nagorno-Karabakh", "Niue", - "Northern Cyprus", "Palestine", "SADR", "Somaliland", "South Ossetia", - "Taiwan"] - - function update() { - var filteredCountries = countries.filter(function (country) { return country.toLowerCase().indexOf(searchString) !== -1 }) - while (count > filteredCountries.length) { - remove(filteredCountries.length) - } - for (var index = 0; index < filteredCountries.length; index++) { - if (index < count) { - setProperty(index, "text", filteredCountries[index]) - } else { - append({ "text": filteredCountries[index]}) + SearchField { + id: searchField + width: parent.width + + Binding { + target: searchPage + property: "searchString" + value: searchField.text.toLowerCase().trim() } } - } - } - anchors.fill: parent - currentIndex: -1 // otherwise currentItem will steal focus - header: SearchField { - id: searchField - width: parent.width - - Binding { - target: searchPage - property: "searchString" - value: searchField.text.toLowerCase().trim() - } - } - delegate: BackgroundItem { - id: backgroundItem - ListView.onAdd: AddAnimation { - target: backgroundItem - } - ListView.onRemove: RemoveAnimation { - target: backgroundItem - } + Repeater + { + id: searchResults + + model: SparqlListModel { + id: songListQueryModel + query: "" + connection: SparqlConnection { + id: sparqlConnection + driver: "QTRACKER_DIRECT" + } - Label { - x: searchField.textLeftMargin - anchors.verticalCenter: parent.verticalCenter - color: searchString.length > 0 ? (highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor) - : (highlighted ? Theme.highlightColor : Theme.primaryColor) - textFormat: Text.StyledText - text: Theme.highlightText(model.text, searchString, Theme.highlightColor) + function filter() + { + songListQueryModel.query = "SELECT ?title ?artist ?url ?length ?filename " + + "WHERE { ?song a nmm:MusicPiece . " + + "?song nie:url ?url . " + + "OPTIONAL { ?song nie:title ?title } " + + "?song nfo:duration ?length . " + + "?song nfo:fileName ?filename . " + + "?song nmm:performer ?aName . "+ + "?aName nmm:artistName ?artist . "+ + "FILTER( regex(STR(?title), '"+searchString+ "', 'i')"+ + "|| regex(STR(?artist), '"+searchString+"', 'i') )"+ + "} LIMIT 50" + } } - } - - VerticalScrollDecorator {} - Component.onCompleted: { - if (keepSearchFieldFocus) { - searchField.forceActiveFocus() - } - keepSearchFieldFocus = false - listModel.update() + delegate: SongItem { } } } | ||
| [-] [+] | Added | _service:tar_git:harbour-sirensong-0.6.tar.bz2/qml/pages/SongItem.qml ^ |
| @@ -0,0 +1,45 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import harbour.sirensong 1.0 +import "functions.js" as UIFunctions + +ListItem { + menu: ContextMenu { + MenuItem { + text: qsTr("Add to Play Queue") + onClicked: SirenSong.addToPlaylist(url) + } + } + + onClicked: { + SirenSong.play(url) + if (libraryPage.forwardNavigation) { + pageStack.navigateForward(PageStackAction.Animated) + } + } + + Row { + spacing: 20 + x: 10 + + Label { + text: UIFunctions.durationString(length) + height: Theme.itemSizeHuge + font.pixelSize: Theme.fontSizeExtraLarge + color: Theme.secondaryColor + } + + Column { + Label { + text: title != null ? title : filename + font.pixelSize: Theme.fontSizeMedium + color: Theme.primaryColor + } + Label { + text: artist != null ? artist : qsTr("Unknown Artist") + font.pixelSize: Theme.fontSizeExtraSmall + color: Theme.secondaryColor + } + } + } + } | ||
| [-] [+] | Changed | _service:tar_git:harbour-sirensong-0.6.tar.bz2/qml/pages/SongSelect.qml ^ |
| @@ -18,48 +18,9 @@ } width: parent.width - listDelegate: ListItem { + listDelegate: SongItem { width: parent.width id: songList - - menu: ContextMenu { - MenuItem { - text: qsTr("Add to Play Queue") - onClicked: SirenSong.addToPlaylist(url) - } - } - - onClicked: { - SirenSong.play(url) - if (libraryPage.forwardNavigation) { - pageStack.navigateForward(PageStackAction.Animated) - } - } - - Row { - spacing: 20 - x: 10 - - Label { - text: UIFunctions.durationString(length) - height: Theme.itemSizeHuge - font.pixelSize: Theme.fontSizeExtraLarge - color: Theme.secondaryColor - } - - Column { - Label { - text: title != null ? title : filename - font.pixelSize: Theme.fontSizeMedium - color: Theme.primaryColor - } - Label { - text: artist != null ? artist : qsTr("Unknown Artist") - font.pixelSize: Theme.fontSizeExtraSmall - color: Theme.secondaryColor - } - } - } } } | ||
| [-] [+] | Added | _service:tar_git:harbour-sirensong-0.6.tar.bz2/qml/pages/TieredMenu.qml ^ |
| @@ -0,0 +1,84 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +Column { + property QtObject menuListQueryModel + property Component subListComponent + property Item activeParentItem + property Item activeSubItem + + id: menuListView + height: (menuListQueryModel.count * Theme.itemSizeSmall) + submenuHeight + + x: -parent.x + y: Theme.itemSizeSmall + + property int submenuHeight: (activeSubItem != null) && (activeSubItem.active == true) ? activeSubItem.implicitHeight : 0 + + //Empty List + ListModel { + id: emptyModel + } + + Repeater { + id: menuRepeater + model: menuListQueryModel + + Item { + id: menuItem + height: Theme.itemSizeSmall + ((activeSubItem != null) && (active == true) ? activeSubItem.implicitHeight : 0) + width: menuListView.width + property bool active: false + + ListItem { + width: parent.width + height: Theme.itemSizeSmall + onClicked: activate(parent) + Label { x:60; text: menuText; anchors.verticalCenter: parent.verticalCenter } + } + + function activate(selectedItem) + { + if(!menuItem.active) + { + if(activeParentItem != null) + { + deactivate(activeParentItem) + } + + activeSubItem = subListComponent.createObject(selectedItem); + menuItem.active = true + activeSubItem.open(menuText) + + activeParentItem = selectedItem + } + else + { + deactivate(menuItem) + } + } + + function deactivate(albumItem) + { + albumItem.active = false; + + if(menuListView.activeSubItem.active == true) + menuListView.activeSubItem.close(); + } + } + } + + function open(artistName) + { + menuListQueryModel.filter(artistName) + menuRepeater.model = menuListQueryModel + state = "active"; + } + + function close() + { + + state = ""; + menuRepeater.model = emptyModel; + } + } | ||
| [-] [+] | Changed | _service:tar_git:harbour-sirensong-0.6.tar.bz2/src/mediaplayer.cpp ^ |
| @@ -209,42 +209,29 @@ void MediaPlayer :: checkPlaylist(int currentIndex) { - iCurrentIndex = currentIndex; + // this fires on startup with index -1 for some reason + if(currentIndex != -1) + { + setArtist(plModel->data(plModel->index(currentIndex), plModel->Artist).toString()); + setTitle(plModel->data(plModel->index(currentIndex), plModel->Title).toString()); - setArtist(plModel->data(plModel->index(currentIndex), plModel->Artist).toString()); - setTitle(plModel->data(plModel->index(currentIndex), plModel->Title).toString()); + qDebug() << "currIndex: " << currentIndex; - emit currentIndexChanged(); + emit currentIndexChanged(); - if(autoQueue) - { - //check if current item is the last in list - if(currentIndex == (playlist->mediaCount() -1)) + if(autoQueue) { - //insert random item next - tracker->randomItem(); + //check if current item is the last in list + if(currentIndex == (playlist->mediaCount() -1)) + { + //insert random item next + tracker->randomItem(); + } } } } void MediaPlayer :: metaDataCallback() { - - if(player->metaData(QMediaMetaData::Title).toString() != "") - { - setTitle(player->metaData(QMediaMetaData::Title).toString()); - } - else - { - setTitle(QFileInfo(player->currentMedia().canonicalUrl().toString()).fileName()); - } - - if(player->metaData(QMediaMetaData::AlbumArtist).toString() != "") - { - setArtist(player->metaData(QMediaMetaData::AlbumArtist).toString()); - } - else - { - setArtist("Unknown Artist"); - } + qDebug() << "MetaData: Average Level: " << player->metaData(QMediaMetaData::AverageLevel); } | ||
| [-] [+] | Changed | _service:tar_git:harbour-sirensong-0.6.tar.bz2/translations/harbour-sirensong-cz.ts ^ |
| @@ -2,17 +2,6 @@ <!DOCTYPE TS> <TS version="2.1" language="cs_CZ"> <context> - <name>ArtistSelect</name> - <message> - <source>Add to Play Queue</source> - <translation>Přidat do seznamu skladeb</translation> - </message> - <message> - <source>Unknown Artist</source> - <translation>Neznámý umělec</translation> - </message> -</context> -<context> <name>LibraryPage</name> <message> <source>Sort by Artist</source> @@ -30,6 +19,10 @@ <source>Settings</source> <translation type="unfinished"></translation> </message> + <message> + <source>Search</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PlayerPage</name> @@ -90,14 +83,14 @@ </message> </context> <context> - <name>SongSelect</name> + <name>SongItem</name> <message> <source>Add to Play Queue</source> - <translation>Přidat do seznamu skladeb</translation> + <translation type="unfinished">Přidat do seznamu skladeb</translation> </message> <message> <source>Unknown Artist</source> - <translation>Neznámý umělec</translation> + <translation type="unfinished">Neznámý umělec</translation> </message> </context> </TS> | ||
| [-] [+] | Changed | _service:tar_git:harbour-sirensong-0.6.tar.bz2/translations/harbour-sirensong-de.ts ^ |
| @@ -2,37 +2,29 @@ <!DOCTYPE TS> <TS version="2.1" language="de"> <context> - <name>ArtistSelect</name> + <name>LibraryPage</name> <message> - <location filename="../qml/pages/ArtistSelect.qml" line="221"/> - <source>Add to Play Queue</source> + <location filename="../qml/pages/LibraryPage.qml" line="76"/> + <source>Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/ArtistSelect.qml" line="251"/> - <source>Unknown Artist</source> - <translation type="unfinished">Unbekannte Künstler</translation> - </message> -</context> -<context> - <name>LibraryPage</name> - <message> - <location filename="../qml/pages/LibraryPage.qml" line="80"/> + <location filename="../qml/pages/LibraryPage.qml" line="81"/> <source>Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/LibraryPage.qml" line="85"/> + <location filename="../qml/pages/LibraryPage.qml" line="86"/> <source>Sort by Artist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/LibraryPage.qml" line="90"/> + <location filename="../qml/pages/LibraryPage.qml" line="91"/> <source>Sort by Song</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/LibraryPage.qml" line="102"/> + <location filename="../qml/pages/LibraryPage.qml" line="103"/> <source>Library</source> <translation type="unfinished">Bibliothek</translation> </message> @@ -109,16 +101,16 @@ </message> </context> <context> - <name>SongSelect</name> + <name>SongItem</name> <message> - <location filename="../qml/pages/SongSelect.qml" line="27"/> + <location filename="../qml/pages/SongItem.qml" line="9"/> <source>Add to Play Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/SongSelect.qml" line="57"/> + <location filename="../qml/pages/SongItem.qml" line="39"/> <source>Unknown Artist</source> - <translation>Unbekannte Künstler</translation> + <translation type="unfinished">Unbekannte Künstler</translation> </message> </context> </TS> | ||
| [-] [+] | Changed | _service:tar_git:harbour-sirensong-0.6.tar.bz2/translations/harbour-sirensong-fi.ts ^ |
| @@ -2,17 +2,6 @@ <!DOCTYPE TS> <TS version="2.1" language="fi"> <context> - <name>ArtistSelect</name> - <message> - <source>Add to Play Queue</source> - <translation>Lisää Soitettavien Jonoon</translation> - </message> - <message> - <source>Unknown Artist</source> - <translation>Tuntematon Artisti</translation> - </message> -</context> -<context> <name>LibraryPage</name> <message> <source>Sort by Artist</source> @@ -30,6 +19,10 @@ <source>Settings</source> <translation type="unfinished"></translation> </message> + <message> + <source>Search</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PlayerPage</name> @@ -90,14 +83,14 @@ </message> </context> <context> - <name>SongSelect</name> + <name>SongItem</name> <message> <source>Add to Play Queue</source> - <translation>Lisää Soitettavien Jonoon</translation> + <translation type="unfinished">Lisää Soitettavien Jonoon</translation> </message> <message> <source>Unknown Artist</source> - <translation>Tuntematon Artisti</translation> + <translation type="unfinished">Tuntematon Artisti</translation> </message> </context> </TS> | ||
| [-] [+] | Changed | _service:tar_git:harbour-sirensong-0.6.tar.bz2/translations/harbour-sirensong-fr.ts ^ |
| @@ -2,17 +2,6 @@ <!DOCTYPE TS> <TS version="2.1" language="fr"> <context> - <name>ArtistSelect</name> - <message> - <source>Add to Play Queue</source> - <translation>Ajouter à la liste de lecture</translation> - </message> - <message> - <source>Unknown Artist</source> - <translation>Artiste inconnu</translation> - </message> -</context> -<context> <name>LibraryPage</name> <message> <source>Sort by Artist</source> @@ -30,6 +19,10 @@ <source>Settings</source> <translation>Paramètres</translation> </message> + <message> + <source>Search</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PlayerPage</name> @@ -90,14 +83,14 @@ </message> </context> <context> - <name>SongSelect</name> + <name>SongItem</name> <message> <source>Add to Play Queue</source> - <translation>Ajouter à la liste de lecture</translation> + <translation type="unfinished">Ajouter à la liste de lecture</translation> </message> <message> <source>Unknown Artist</source> - <translation>Artiste inconnu</translation> + <translation type="unfinished">Artiste inconnu</translation> </message> </context> </TS> | ||
| [-] [+] | Changed | _service:tar_git:harbour-sirensong-0.6.tar.bz2/translations/harbour-sirensong-nl.ts ^ |
| @@ -2,17 +2,6 @@ <!DOCTYPE TS> <TS version="2.1" language="nl_NL"> <context> - <name>ArtistSelect</name> - <message> - <source>Add to Play Queue</source> - <translation>Toevoegen aan afspeelwachtrij</translation> - </message> - <message> - <source>Unknown Artist</source> - <translation>Onbekende artiest</translation> - </message> -</context> -<context> <name>LibraryPage</name> <message> <source>Sort by Artist</source> @@ -30,6 +19,10 @@ <source>Settings</source> <translation>Instellingen</translation> </message> + <message> + <source>Search</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PlayerPage</name> @@ -90,14 +83,14 @@ </message> </context> <context> - <name>SongSelect</name> + <name>SongItem</name> <message> <source>Add to Play Queue</source> - <translation>Toevoegen aan afspeelwachtrij</translation> + <translation type="unfinished">Toevoegen aan afspeelwachtrij</translation> </message> <message> <source>Unknown Artist</source> - <translation>Onbekende artiest</translation> + <translation type="unfinished">Onbekende artiest</translation> </message> </context> </TS> | ||
| [-] [+] | Changed | _service:tar_git:harbour-sirensong-0.6.tar.bz2/translations/harbour-sirensong-ru.ts ^ |
| @@ -2,17 +2,6 @@ <!DOCTYPE TS> <TS version="2.1" language="ru_RU"> <context> - <name>ArtistSelect</name> - <message> - <source>Add to Play Queue</source> - <translation>Добавить в очередь воспроизведения</translation> - </message> - <message> - <source>Unknown Artist</source> - <translation>Неизвестный исполнитель</translation> - </message> -</context> -<context> <name>LibraryPage</name> <message> <source>Sort by Artist</source> @@ -30,6 +19,10 @@ <source>Settings</source> <translation>Настройки</translation> </message> + <message> + <source>Search</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PlayerPage</name> @@ -90,14 +83,14 @@ </message> </context> <context> - <name>SongSelect</name> + <name>SongItem</name> <message> <source>Add to Play Queue</source> - <translation>Добавить в очередь воспроизведения</translation> + <translation type="unfinished">Добавить в очередь воспроизведения</translation> </message> <message> <source>Unknown Artist</source> - <translation>Неизвестный исполнитель</translation> + <translation type="unfinished">Неизвестный исполнитель</translation> </message> </context> </TS> | ||
| [-] [+] | Added | _service:tar_git:harbour-sirensong-0.6.tar.bz2/translations/harbour-sirensong-sv.ts ^ |
| @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="sv"> +<context> + <name>LibraryPage</name> + <message> + <source>Sort by Artist</source> + <translation>Sortera efter artist</translation> + </message> + <message> + <source>Sort by Song</source> + <translation>Sortera efter låt</translation> + </message> + <message> + <source>Library</source> + <translation>Bibliotek</translation> + </message> + <message> + <source>Settings</source> + <translation>Inställningar</translation> + </message> + <message> + <source>Search</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>PlayerPage</name> + <message> + <source>Play Queue</source> + <translation>Uppspelningskö</translation> + </message> + <message> + <source>Clear Play Queue</source> + <translation>Rensa uppspelningskön</translation> + </message> + <message> + <source>Repeat: On</source> + <translation>Repetition: På</translation> + </message> + <message> + <source>Repeat: Off</source> + <translation>Repetition: Av</translation> + </message> + <message> + <source>Clear Playlist</source> + <translation>Rensa spelningslistan</translation> + </message> +</context> +<context> + <name>SettingsPage</name> + <message> + <source>Repeat</source> + <translation>Repetera</translation> + </message> + <message> + <source>Auto Queue</source> + <translation>Autokö</translation> + </message> + <message> + <source>Default Library Menu</source> + <translation>Standard biblioteksmeny</translation> + </message> + <message> + <source>Sort by Artist</source> + <translation>Sortera efter artist</translation> + </message> + <message> + <source>Play Mode</source> + <translation>Uppspelningsläge</translation> + </message> + <message> + <source>Save</source> + <translation>Spara</translation> + </message> + <message> + <source>Sort by Song</source> + <translation>Sortera efter låt</translation> + </message> + <message> + <source>Shuffle</source> + <translation>Blanda</translation> + </message> +</context> +<context> + <name>SongItem</name> + <message> + <source>Add to Play Queue</source> + <translation type="unfinished">Lägg till i uppspelningskön</translation> + </message> + <message> + <source>Unknown Artist</source> + <translation type="unfinished">Okänd artist</translation> + </message> +</context> +</TS> | ||
| [-] [+] | Changed | _service:tar_git:harbour-sirensong-0.6.tar.bz2/translations/harbour-sirensong.ts ^ |
| @@ -2,17 +2,6 @@ <!DOCTYPE TS> <TS version="2.1"> <context> - <name>ArtistSelect</name> - <message> - <source>Add to Play Queue</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Unknown Artist</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>LibraryPage</name> <message> <source>Sort by Artist</source> @@ -30,6 +19,10 @@ <source>Settings</source> <translation type="unfinished"></translation> </message> + <message> + <source>Search</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PlayerPage</name> @@ -90,7 +83,7 @@ </message> </context> <context> - <name>SongSelect</name> + <name>SongItem</name> <message> <source>Add to Play Queue</source> <translation type="unfinished"></translation> | ||