diff --git a/CMakeLists.txt b/CMakeLists.txt
index fed116ae0..5d6164829 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,7 +108,7 @@ macro_optional_find_package(LibAttica)
macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fetching and managing of resolvers from the tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" FALSE "" "")
macro_optional_find_package(QuaZip)
-macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers autmatically. Will build internal copy instead." "http://quazip.sourceforge.net/" FALSE "" "")
+macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" FALSE "" "")
IF( NOT QuaZip_FOUND )
add_subdirectory( ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip )
@@ -116,6 +116,7 @@ IF( NOT QuaZip_FOUND )
SET( QuaZip_LIBRARY quazip )
SET( QuaZip_LIBRARIES ${QuaZip_LIBRARY} )
SET( QuaZip_FOUND true )
+ macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically. Building internal copy" "http://quazip.sourceforge.net/" FALSE "" "")
# copy headers to build/quazip so we can use proper includes inside the code
FILE( COPY ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip/quazip/ DESTINATION ${CMAKE_BINARY_DIR}/libtomahawk/thirdparty/quazip )
diff --git a/lang/tomahawk_sv.ts b/lang/tomahawk_sv.ts
new file mode 100644
index 000000000..3dfdb591c
--- /dev/null
+++ b/lang/tomahawk_sv.ts
@@ -0,0 +1,3396 @@
+
+
+
+
+ ActionCollection
+
+
+ &Listen Along
+
+
+
+
+ &Stop Listening Along
+
+
+
+
+ &Load Playlist
+ &Läs in spellista
+
+
+
+ &Rename Playlist
+ &Byt namn på spellista
+
+
+
+ &Copy Playlist Link
+ &Kopiera länk till spellista
+
+
+
+ &Play
+ Spela &upp
+
+
+
+ &Stop
+ &Stoppa
+
+
+
+ &Previous Track
+ &Föregående spår
+
+
+
+ &Next Track
+ &Nästa spår
+
+
+
+ &Quit
+ A&vsluta
+
+
+
+ AlbumInfoWidget
+
+
+ Form
+ Formulär
+
+
+
+ Other Albums by Artist
+ Andra album av artisten
+
+
+
+
+ Click to show Super Collection Tracks
+ Klicka för att visa spår i komplett samling
+
+
+
+
+ Click to show Official Tracks
+ Klicka för att visa officiella spår
+
+
+
+ Other Albums by %1
+ Andra album av %1
+
+
+
+ AlbumModel
+
+
+ Album
+ Album
+
+
+
+
+ All albums from %1
+ Alla album från %1
+
+
+
+ All albums
+ Alla album
+
+
+
+ ArtistInfoWidget
+
+
+ Form
+ Formulär
+
+
+
+ Top Hits
+ Största hits
+
+
+
+ Related Artists
+ Relaterade artister
+
+
+
+ Albums
+ Album
+
+
+
+
+ Click to show All Releases
+ Klicka för att visa alla utgåvor
+
+
+
+ Click to show Official Releases
+ Klicka för att visa officiella utgåvor
+
+
+
+ ArtistView
+
+
+ Sorry, your filter '%1' did not match any results.
+ Tyvärr, ditt filter "%1" matchade inte några resultat.
+
+
+
+ AudioControls
+
+
+ Form
+ Formulär
+
+
+
+ Prev
+ Föreg
+
+
+
+ Play
+ Spela upp
+
+
+
+ Pause
+ Paus
+
+
+
+ Next
+ Nästa
+
+
+
+ TextLabel
+ Textetikett
+
+
+
+ Artist
+ Artist
+
+
+
+ Album
+ Album
+
+
+
+ Owner
+ Ägare
+
+
+
+ love
+ älska
+
+
+
+ Time
+ Tid
+
+
+
+ Time Left
+ Tid kvar
+
+
+
+ Shuffle
+ Blanda
+
+
+
+ Repeat
+ Upprepa
+
+
+
+ Low
+ Låg
+
+
+
+ High
+ Hög
+
+
+
+ AudioEngine
+
+
+ Tomahawk is playing "%1" by %2%3.
+ Tomahawk spelar upp "%1" av %2%3.
+
+
+
+ on album %1
+ från albumet %1
+
+
+
+ CategoryAddItem
+
+
+
+ New Playlist
+ Ny spellista
+
+
+
+
+
+
+ New Station
+ Ny station
+
+
+
+
+
+ %1 Station
+ %1 station
+
+
+
+ CategoryItem
+
+
+ Playlists
+ Spellistor
+
+
+
+ Stations
+ Stationer
+
+
+
+ ClearButton
+
+
+ Clear
+ Töm
+
+
+
+ CollectionFlatModel
+
+ Your Collection
+ Din samling
+
+
+
+ My Collection
+ Min samling
+
+
+
+ Collection of %1
+ Samling av %1
+
+
+
+ CollectionItem
+
+
+ Top Loved Tracks
+ Mest älskade spår
+
+
+
+ Loved Tracks
+ Älskade spår
+
+
+
+ Dashboard
+ Översikt
+
+
+
+ Charts
+ Topplistor
+
+
+
+ New Additions
+ Nyheter
+
+
+
+ Super Collection
+ Komplett samling
+
+
+
+ CollectionModel
+
+ Name
+ Namn
+
+
+ Tracks
+ Spår
+
+
+ Duration
+ Speltid
+
+
+ Origin
+ Källa
+
+
+
+ CollectionView
+
+ &Play
+ Spela &upp
+
+
+ Add to &Queue
+ Lägg till i &kö
+
+
+
+ This collection is empty.
+ Denna samling är tom.
+
+
+
+ ContextWidget
+
+
+ InfoBar
+ Inforad
+
+
+
+
+ Show Footnotes
+ Visa fotnot
+
+
+
+ Hide Footnotes
+ Dölj fotnot
+
+
+
+ CrashReporter
+
+
+ Tomahawk Crash Reporter
+
+
+
+
+ <p><b>Sorry!</b> Tomahawk crashed. Information about the crash is now being sent to Tomahawk HQ so that we can fix the bug.</p>
+
+
+
+
+ Abort
+ Avbryt
+
+
+
+ You can disable sending crash reports in the configuration dialog.
+
+
+
+
+ Uploaded %L1 of %L2 KB.
+
+
+
+
+
+ Close
+ Stäng
+
+
+
+ Sent! <b>Many thanks</b>.
+ Skickat! <b>Tack så mycket</b>.
+
+
+
+ Failed to send crash info.
+
+
+
+
+ DatabaseCommand_AllAlbums
+
+
+ Unknown
+ Okänt
+
+
+
+ DiagnosticsDialog
+
+
+ Tomahawk Diagnostics
+ Diagnostik för Tomahawk
+
+
+
+ Update
+ Uppdatera
+
+
+
+ Copy to Clipboard
+ Kopiera till urklipp
+
+
+
+ GetNewStuffDelegate
+
+
+ Installed
+ Installerat
+
+
+
+
+ Installing
+ Installerar
+
+
+
+
+ Failed
+ Misslyckades
+
+
+
+ Uninstalling
+ Avinstallerar
+
+
+
+ Install
+ Installera
+
+
+
+ Upgrading
+ Uppgraderar
+
+
+
+ Uninstall
+ Avinstallera
+
+
+
+ Upgrade
+ Uppgradera
+
+
+
+ %1 downloads
+ %1 hämtningar
+
+
+
+ GetNewStuffDialog
+
+
+ Download New Resolvers
+
+
+
+
+ GlobalSearchWidget
+
+
+ Form
+ Formulär
+
+
+
+ GoogleWrapper
+
+
+ Configure this Google Account
+ Konfigurera detta Google-konto
+
+
+
+ Google Address
+ Google-adress
+
+
+
+ Enter your Google login to connect with your friends using Tomahawk!
+ Ange ditt Google-konto för att ansluta till dina vänner med Tomahawk!
+
+
+
+ Add Friend
+ Lägg till vän
+
+
+
+ Enter Google Address:
+ Ange Google-adress:
+
+
+
+ InfoBar
+
+
+ InfoBar
+ Inforad
+
+
+
+
+
+
+ TextLabel
+ Textetikett
+
+
+
+ Automatically update
+ Uppdatera automatiskt
+
+
+
+ Filter...
+ Filter...
+
+
+
+ JabberConfig
+
+
+ Jabber Configuration
+ Konfigurera Jabber
+
+
+
+ Configure this Jabber account
+ Konfigurera detta Jabber-konto
+
+
+
+ Enter your Jabber login to connect with your friends using Tomahawk!
+
+
+
+
+ Login Information
+
+
+
+
+ Jabber ID:
+ Jabber ID:
+
+
+
+ e.g. user@example.com
+ t.ex. användare@exempel.se
+
+
+
+ Password:
+ Lösenord:
+
+
+
+ An account with this name already exists!
+
+
+
+
+ Advanced Jabber Settings
+
+
+
+
+ Server:
+ Server:
+
+
+
+ Port:
+ Port:
+
+
+
+ JabberPlugin
+
+
+ Add Friend...
+ Lägg till vän...
+
+
+
+ Add Friend
+ Lägg till vän
+
+
+
+ User Interaction
+
+
+
+
+ Host is unknown
+
+
+
+
+ Item not found
+
+
+
+
+ Authorization Error
+ Auktoriseringsfel
+
+
+
+ Remote Stream Error
+
+
+
+
+ Remote Connection failed
+
+
+
+
+ Internal Server Error
+
+
+
+
+ System shutdown
+
+
+
+
+ Conflict
+
+
+
+
+ Unknown
+ Okänt
+
+
+
+ Enter Jabber ID:
+ Ange Jabber-id:
+
+
+
+ XML Console...
+ XML-konsoll...
+
+
+
+ I'm sorry -- I'm just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!
+
+
+
+
+ Authorize User
+ Auktorisera användare
+
+
+
+ Do you want to grant <b>%1</b> access to your Collection?
+ Vill du ge <b>%1</b> åtkomst till din samling?
+
+
+
+ Jabber_p
+
+ Authorize User
+ Auktorisera användare
+
+
+ Do you want to grant <b>%1</b> access to your Collection?
+ Vill du ge <b>%1</b> åtkomst till din samling?
+
+
+
+ JobStatusView
+
+
+ Searching For
+ Söker efter
+
+
+
+ Pending
+ Väntar
+
+
+
+ Idle
+ Overksam
+
+
+
+ LastfmContext
+
+
+ Last.fm
+ Last.fm
+
+
+
+ LatchedStatusItem
+
+
+ %1 is listening along to you!
+ %1 lyssnar samtidigt som du!
+
+
+
+ LoadXSPF
+
+
+ Load XSPF
+ Läs in XSPF
+
+
+
+ Playlist Url
+ Url till spellista
+
+
+
+ Enter URL...
+ Ange URL...
+
+
+
+ ...
+ …
+
+
+
+ Automatically update
+ Uppdatera automatiskt
+
+
+
+ LoadXSPFDialog
+
+
+ Load XSPF File
+ Läs in XSPF-fil
+
+
+
+ LocalCollection
+
+
+ Bookmarks
+ Bokmärken
+
+
+
+ Saved tracks
+ Sparade spår
+
+
+
+ NewPlaylistWidget
+
+
+ Enter a title for the new playlist:
+ Gib einen Titel für die neue Playliste ein:
+
+
+
+ Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!
+ Tomahawk bietet verschiedene Wege, Playlisten zu erstellen und Musik zu finden, die du magst!
+
+
+
+ Just enter a genre or tag name and Tomahawk will suggest a few songs to get you started with your new playlist:
+ Gib einfach ein Genre oder einen Tagnamen ein, und Tomahawk wird dir einige Lieder vorschlagen und dir helfen eine neue Playliste zu erstellen:
+
+
+
+ &Create Playlist
+ Playliste &erstellen
+
+
+
+ Create a new playlist
+ Erstelle eine neue Playliste
+
+
+
+ PlaylistDelegate
+
+ %1 tracks
+ %1 spår
+
+
+
+ PlaylistManager
+
+ All available tracks
+ Alla tillgängliga spår
+
+
+ All available albums
+ Alla tillgängliga album
+
+
+
+ PlaylistModel
+
+ A playlist by %1
+ Eine Playliste von %1
+
+
+
+ A playlist by %1, created %2
+ En spellista av %1, skapad %2
+
+
+
+ you
+ dig
+
+
+
+ All tracks by %1 on album %2
+ Alla spår av %1 från albumet %2
+
+
+
+ All tracks by %1
+ Alla spår av %1
+
+
+
+ PlaylistTypeSelectorDlg
+
+
+ New Playlist
+ Ny spellista
+
+
+
+ Just a regular old playlist... Give it a name, drag in some tracks, and go!
+ En helt vanlig gammal spellista... Ge den ett namn, dra dit några spår och kör!
+
+
+
+ Don't know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!
+ Vet du inte exakt vad vill göra? Ge Tomahawk ett par parametrar och låt den bygga en spellista åt dig!
+
+
+
+ Name:
+ Namn:
+
+
+
+ New Playlist...
+ Ny spellista...
+
+
+
+ Create Manual Playlist
+ Skapa manuell spellista
+
+
+
+ Create Automatic Playlist
+ Skapa automatisk spellista
+
+
+
+ PlaylistView
+
+ &Play
+ &Abspielen
+
+
+ Add to &Queue
+ In &Warteschlange einreihen
+
+
+ &Delete Items
+ Elemente &entfernen
+
+
+ &Delete Item
+ Element &entfernen
+
+
+
+ This playlist is currently empty. Add some tracks to it and enjoy the music!
+ Denna spellista är för närvarande tom. Lägg till några spår och njut av musiken!
+
+
+
+ ProxyDialog
+
+
+ Proxy Settings
+ Proxyinställningar
+
+
+
+ Hostname of proxy server
+ Värdnamn för proxyservern
+
+
+
+ Host
+ Värdnamn
+
+
+
+ Port
+ Port
+
+
+
+ Proxy login
+
+
+
+
+ User
+ Användare
+
+
+
+ Password
+ Lösenord
+
+
+
+ Proxy password
+
+
+
+
+ Type
+ Typ
+
+
+
+ No Proxy Hosts:
+
+
+
+
+ localhost *.example.com (space separated)
+
+
+
+
+ Use proxy for DNS lookups?
+
+
+
+
+ QObject
+
+
+ ago
+ sedan
+
+
+
+ %1 years%2
+ %1 år%2
+
+
+
+ %1 year%2
+ %1 år%2
+
+
+
+ %1 months%2
+ %1 månader%2
+
+
+
+ %1 month%2
+ %1 månad%2
+
+
+
+ %1 weeks%2
+ %1 veckor%2
+
+
+
+ %1 week%2
+ %1 vecka%2
+
+
+
+ %1 days%2
+ %1 dagar%2
+
+
+
+ %1 day%2
+ %1 dag%2
+
+
+
+ %1 hours%2
+ %1 timmar%2
+
+
+
+ %1 hour%2
+ %1 timme%2
+
+
+
+ %1 minutes%2
+ %1 minuter%2
+
+
+
+ just now
+ precis nyss
+
+
+
+ QuaZipFilePrivate
+
+
+ ZIP/UNZIP API error %1
+ ZIP/UNZIP API-fel %1
+
+
+
+ QueueView
+
+ Click to show queue
+ Klicka för att visa kö
+
+
+ Click to hide queue
+ Klicka för att dölja kö
+
+
+
+ InfoBar
+ Inforad
+
+
+
+ Open Queue
+ Öppna kö
+
+
+
+ Show Queue
+ Visa kö
+
+
+
+ Hide Queue
+ Dölj kö
+
+
+
+ RelatedArtistsContext
+
+
+ Related Artists
+ Relaterade artister
+
+
+
+ ResolverConfigDelegate
+
+
+ Not found: %1
+ Hittades inte: %1
+
+
+
+ Failed to load: %1
+ Gick inte att läsa in: %1
+
+
+
+ SearchLineEdit
+
+
+ Search
+ Sök
+
+
+
+ SearchWidget
+
+
+ Search: %1
+ Sök: %1
+
+
+
+ Results for '%1'
+ Resultat för "%1"
+
+
+
+ Servent
+
+
+ Incoming Connection Attempt
+ Inkommande anslutningsförsök
+
+
+
+ Another Tomahawk instance is attempting to connect to you. Select whether to allow or deny this connection.
+
+Peer name: %1
+Peer ID: %2
+
+Remember: Only allow peers to connect if you have the legal right for them to stream music from you.
+
+
+
+
+ Deny
+ Neka
+
+
+
+ Always Deny
+ Neka alltid
+
+
+
+ Allow
+ Tillåt
+
+
+
+ Always Allow
+ Tillåt alltid
+
+
+
+ SettingsDialog
+
+ Music Player Settings
+ Übersetzung eher dürftig
+ Einstellungen für das Musikabspielprogramm
+
+
+ Jabber
+ Jabber
+
+
+ Jabber ID:
+ Jabber-ID:
+
+
+ Password:
+ Passwort:
+
+
+ Advanced Jabber Settings
+ Erweiterte Einstellungen für Jabber
+
+
+ Server:
+ Server:
+
+
+ Port:
+ Port:
+
+
+ Network
+ Netzwerk
+
+
+ Advanced Network Settings
+ Erweiterte Netzwerkeinstellungen
+
+
+ If you're having difficulty connecting to peers, try setting this to your external IP address/host name and a port number (default 50210). Make sure to forward that port to this machine!
+ Wenn du Schwierigkeiten hast, dich mit anderen Leuten zu verbinden, versuche deine externe IP-Adresse/Rechnernamen und eine Portnummer (Standard 50210) hier einzutragen. Stelle sicher, den Port entsprechend an diesen Rechner weiterzuleiten!
+
+
+ Static Host Name:
+ Statischer Rechnername:
+
+
+ Static Port:
+ Statischer Port:
+
+
+ Always use static host name/port? (Overrides UPnP discovery/port forwarding)
+ Statischen Rechnernamen/Port immer benutzen? (Überschreibt UPnP-discovery/Portweiterleitung)
+
+
+ Proxy Settings...
+ Proxy-Einstellungen…
+
+
+ Playdar HTTP API
+ Playdar HTTP API
+
+
+ Connect automatically when Tomahawk starts
+ Automatisch beim Start von Tomahawk verbinden
+
+
+ Use UPnP to establish port forward
+ Benutze UPnP um die Portweiterleitung einzurichten
+
+
+ Local Music
+ Lokale Musik
+
+
+ Path to scan for music files:
+ Pfad zu den Musikdateien:
+
+
+ ...
+ …
+
+
+
+ Last.fm
+ Last.fm
+
+
+ Scrobble tracks to Last.fm
+ Gespielte Stücke an Last.fm übertragen
+
+
+ Last.fm Login
+ Last.fm Anmeldung
+
+
+ Username:
+ Benutzername:
+
+
+ Test Login
+ Anmeldung testen
+
+
+ Script Resolvers
+ Script Resolver
+
+
+ Loaded script resolvers:
+ Geladene Script Resolver:
+
+
+ Select Music Folder
+ Musikordner auswählen
+
+
+
+ Accounts
+ Konton
+
+
+
+ Collection
+ Samling
+
+
+
+ Resolvers
+
+
+
+
+ Advanced
+ Avancerat
+
+
+
+
+ Failed
+ Misslyckades
+
+
+
+ Success
+ Lyckades
+
+
+
+ Could not contact server
+ Kunde inte kontakta servern
+
+
+
+ Load script resolver file
+
+
+
+
+ Delete Account
+ Ta bort konto
+
+
+
+ SipConfigDelegate
+
+
+ Online
+ Ansluten
+
+
+
+ Connecting...
+ Ansluter...
+
+
+
+ Offline
+ Frånkopplad
+
+
+
+ SipHandler
+
+
+ Legal Warning
+ Juridisk varning
+
+
+
+ By pressing OK below, you agree that your use of Tomahawk will be in accordance with any applicable laws, including copyright and intellectual property laws, in effect in your country of residence, and indemnify the Tomahawk developers and project from liability should you choose to break those laws.
+
+For more information, please see http://gettomahawk.com/legal
+
+
+
+
+ I Do Not Agree
+ Jag godkänner inte
+
+
+
+ I Agree
+ Jag godkänner
+
+
+
+ SipModel
+
+
+ Add New Account...
+ Lägg till nytt konto...
+
+
+
+ SocialPlaylistWidget
+
+
+ Popular New Albums From Your Friends
+ Populära nya album från dina vänner
+
+
+
+ Most Played Playlists
+ Mest spelade spellistor
+
+
+
+ Most Played Tracks You Don't Have
+ Mest spelade spår som du inte har
+
+
+
+ SourceDelegate
+
+
+ Track
+ Spår
+
+
+
+ Album
+ Album
+
+
+
+ Artist
+ Artist
+
+
+
+ Local
+ Lokalt
+
+
+
+ Top 10
+ Topp 10
+
+
+
+ Offline
+ Frånkopplad
+
+
+
+ All available tracks
+ Alla tillgängliga spår
+
+
+
+ Online
+ Ansluten
+
+
+
+ SourceInfoWidget
+
+
+ Recent Albums
+ Senaste album
+
+
+
+ Latest Additions
+ Senaste tilläggen
+
+
+
+ Recently Played Tracks
+ Senaste spelade spår
+
+
+ Latest Additions to their Collection
+ Zuletzt zur Sammlung hinzugefügt
+
+
+ Recently played Tracks
+ Zuletzt gespiele Stücke
+
+
+ Info about %1
+ Information über %1
+
+
+ Your Collection
+ Deine Sammlung
+
+
+
+ New Additions
+ Nya tillägg
+
+
+
+ My recent activity
+ Min senaste aktivitet
+
+
+
+ Recent activity from %1
+ Senaste aktivitet från %1
+
+
+
+ SourceTreeItem
+
+ Super Collection
+ Komplettsammlung
+
+
+
+ SourceTreeItemWidget
+
+ Form
+ Form
+
+
+ Off
+ Aus
+
+
+ Info
+ Info
+
+
+ Super Collection
+ Komplettsammlung
+
+
+ All available tracks
+ Alle verfügbaren Stücke
+
+
+ Idle
+ Warte
+
+
+ %L1 tracks
+ %L1 Stücke
+
+
+ Checking
+ Überprüfe
+
+
+ Fetching
+ Sammle
+
+
+ Parsing
+ Parse
+
+
+ Saving
+ Speichere
+
+
+ Synced
+ Synchronisiert
+
+
+ Scanning (%L1 tracks)
+ Durchsuche (%L1 Stücke)
+
+
+ Offline
+ Nicht verbunden
+
+
+
+ SourceTreeView
+
+ &Load Playlist
+ &Lade Playliste
+
+
+ &Rename Playlist
+ Playliste &umbenennen
+
+
+ &Delete Playlist
+ Playliste &löschen
+
+
+
+ &Copy Link
+ &Kopiera länk
+
+
+
+ &Delete %1
+ &Ta bort %1
+
+
+
+ &Export Playlist
+ &Exportera spellista
+
+
+
+ Save XSPF
+ Spara XSPF
+
+
+
+ Playlists (*.xspf)
+ Spellistor (*.xspf)
+
+
+
+ SourcesModel
+
+
+ Collection
+ Samling
+
+
+
+ Playlist
+ Spellista
+
+
+
+ Automatic Playlist
+ Automatisk spellista
+
+
+
+ Station
+ Station
+
+
+
+ StackedSettingsDialog
+
+
+ Tomahawk Settings
+ Inställningar för Tomahawk
+
+
+
+ Accounts
+ Konton
+
+
+
+ Connect to your friends with Google Chat, Twitter, and more.
+ Anslut till dina vänner med Google Chat, Twitter och annat.
+
+
+
+
+ ...
+ …
+
+
+
+ Local Music Information
+
+
+
+
+ Path to scan for music files:
+
+
+
+
+ The Echo Nest supports keeping track of your catalog metadata
+ and using it to craft personalized radios. Enabling this option
+ will allow you (and all your friends) to create automatic playlists
+ and stations based on your personal taste profile.
+
+
+
+
+ Upload collection list to The Echo Nest to enable user radio
+
+
+
+
+ Watch for changes
+
+
+
+
+ Time between scans, in seconds:
+
+
+
+
+ Now Playing Information
+
+
+
+
+ Applications to update with currently playing track:
+
+
+
+
+ Adium
+ Adium
+
+
+
+ Scrobble tracks to Last.fm
+
+
+
+
+ Username:
+ Användarnamn:
+
+
+
+ Password:
+ Lösenord:
+
+
+
+ Test Login
+
+
+
+
+ Script Resolvers
+
+
+
+
+ Script resolvers search for a given track to make it playable.
+
+
+
+
+ Get more resolvers...
+
+
+
+
+ Advanced Network Settings
+ Avancerade nätverksinställningar
+
+
+
+ If you're having difficulty connecting to peers, try setting this to your external IP address/host name and a port number (default 50210). Make sure to forward that port to this machine!
+
+
+
+
+ Static Host Name:
+
+
+
+
+ Static Port:
+ Statisk port:
+
+
+
+ Always use static host name/port? (Overrides UPnP discovery/port forwarding)
+
+
+
+
+ Proxy Settings...
+ Proxyinställningar...
+
+
+
+ Playdar HTTP API
+ Playdar HTTP API
+
+
+
+ Use UPnP to establish port forward
+
+
+
+
+ Tomahawk::ContextMenu
+
+
+
+
+ &Play
+ Spela &upp
+
+
+
+
+
+ Add to &Queue
+ Lägg till i &kö
+
+
+
+ Copy Track &Link
+ Kopiera &länk till spåret
+
+
+
+ &Delete Items
+ &Ta bort objekt
+
+
+
+ &Delete Item
+ &Ta bort objekt
+
+
+
+ Tomahawk::CustomPlaylistView
+
+
+ Top Loved Tracks
+ Mest älskade spår
+
+
+
+ Your loved tracks
+ Dina älskade spår
+
+
+
+ %1's loved tracks
+ Älskade spår för %1
+
+
+
+ The most loved tracks from all your friends
+ De mest älskade spåren från alla dina vänner
+
+
+
+ All of your loved tracks
+ Alla dina älskade spår
+
+
+
+ All of %1's loved tracks
+ Alla spår som %1 älskar
+
+
+
+ Tomahawk::DropJobNotifier
+
+
+ Fetching %1 from database
+ Hämtar %1 från databasen
+
+
+
+ Parsing %1 %2
+ Tolkar %1 %2
+
+
+
+ Tomahawk::DynamicControlList
+
+
+ Click to collapse
+ Klicka för att fälla in
+
+
+
+ Tomahawk::DynamicModel
+
+
+
+ Could not find a playable track.
+
+Please change the filters or try again.
+
+
+
+
+ Failed to generate preview with the desired filters
+
+
+
+
+ Tomahawk::DynamicSetupWidget
+
+
+ Type:
+ Typ:
+
+
+
+ Generate
+ Generera
+
+
+
+ Tomahawk::DynamicView
+
+
+ Add some filters above to seed this station!
+
+
+
+
+ Press Generate to get started!
+
+
+
+
+ Add some filters above, and press Generate to get started!
+
+
+
+
+ Tomahawk::EchonestControl
+
+
+
+
+
+
+
+ is
+ är
+
+
+
+ from user
+ från användare
+
+
+
+
+ No users with Echo Nest Catalogs enabled. Try enabling option in Collection settings
+
+
+
+
+ similar to
+ liknande
+
+
+
+
+
+
+
+
+
+ Less
+ Mindre
+
+
+
+
+
+
+
+
+
+ More
+ Mer
+
+
+
+ 0 BPM
+ 0 BPM
+
+
+
+ 500 BPM
+ 500 BPM
+
+
+
+ 0 secs
+ 0 sekunder
+
+
+
+ 3600 secs
+ 3600 sekunder
+
+
+
+ -100 dB
+ -100 dB
+
+
+
+ 100 dB
+ 100 dB
+
+
+
+ Major
+ Dur
+
+
+
+ Minor
+ Moll
+
+
+
+ C
+ C
+
+
+
+ C Sharp
+ Cis
+
+
+
+ D
+ D
+
+
+
+ E Flat
+ Es
+
+
+
+ E
+ E
+
+
+
+ F
+ F
+
+
+
+ F Sharp
+ Fis
+
+
+
+ G
+ G
+
+
+
+ A Flat
+ As
+
+
+
+ A
+ A
+
+
+
+ B Flat
+ B
+
+
+
+ B
+ H
+
+
+
+ Ascending
+ Stigande
+
+
+
+ Descending
+ Fallande
+
+
+
+ Tempo
+ Tempo
+
+
+
+ Duration
+ Längd
+
+
+
+ Loudness
+ Loudness
+
+
+
+ Artist Familiarity
+
+
+
+
+ Artist Hotttnesss
+
+
+
+
+ Song Hotttnesss
+
+
+
+
+ Latitude
+ Latitud
+
+
+
+ Longitude
+ Longitud
+
+
+
+ Mode
+ Läge
+
+
+
+ Key
+
+
+
+
+ Energy
+ Energi
+
+
+
+ Danceability
+
+
+
+
+ Tomahawk::EchonestSteerer
+
+
+ Steer this station:
+
+
+
+
+ Takes effect on track change
+
+
+
+
+ Much less
+ Mycket mindre
+
+
+
+ Less
+ Mindre
+
+
+
+ A bit less
+ Lite mindre
+
+
+
+ Keep at current
+
+
+
+
+ A bit more
+ Lite mer
+
+
+
+ More
+ Mer
+
+
+
+ Much more
+ Mycket mer
+
+
+
+ Tempo
+ Tempo
+
+
+
+ Loudness
+ Loudness
+
+
+
+ Danceability
+
+
+
+
+ Energy
+ Energi
+
+
+
+ Song Hotttnesss
+
+
+
+
+ Artist Hotttnesss
+
+
+
+
+ Artist Familiarity
+
+
+
+
+ By Description
+ Efter beskrivning
+
+
+
+ Enter a description
+ Ange en beskrivning
+
+
+
+ Apply steering command
+
+
+
+
+ Reset all steering commands
+
+
+
+
+ Tomahawk::InfoSystem::ChartsPlugin
+
+
+ Top Overall
+
+
+
+
+ Artists
+ Artister
+
+
+
+ Albums
+ Album
+
+
+
+ Tracks
+ Spår
+
+
+
+ Tomahawk::JSPFLoader
+
+
+ New Playlist
+ Ny spellista
+
+
+
+ Failed to save tracks
+ Misslyckades med att spara spår
+
+
+
+ Some tracks in the playlist do not contain an artist and a title. They will be ignored.
+
+
+
+
+ XSPF Error
+ XSPF-fel
+
+
+
+ This is not a valid XSPF playlist.
+ Detta är inte en giltig XSPF-spellista.
+
+
+
+ Tomahawk::LatchManager
+
+
+ &Catch Up
+
+
+
+
+
+ &Listen Along
+
+
+
+
+ Tomahawk::Source
+
+
+
+ Scanning (%L1 tracks)
+ Söker igenom (%L1 spår)
+
+
+
+ Checking
+ Kontrollerar
+
+
+
+ Fetching
+ Hämtar
+
+
+
+ Parsing
+ Tolkar
+
+
+
+ Saving (%1%)
+ Sparar (%1%)
+
+
+ Saving
+ Speichere
+
+
+
+ TomahawkOAuthTwitter
+
+
+ Twitter PIN
+
+
+
+
+ After authenticating on Twitter's web site,
+enter the displayed PIN number here:
+
+
+
+
+ TomahawkTrayIcon
+
+
+
+ Hide Tomahawk Window
+ Dölj Tomahawk-fönstret
+
+
+
+ Show Tomahawk Window
+ Visa Tomahawk-fönstret
+
+
+
+ Play
+ Spela upp
+
+
+
+ Pause
+ Paus
+
+
+ Stop
+ Stoppa
+
+
+ Previous Track
+ Föregående spår
+
+
+ Next Track
+ Nästa spår
+
+
+ Quit
+ Avsluta
+
+
+
+ Currently not playing.
+ Spelar ingenting för närvarande.
+
+
+
+ TomahawkWindow
+
+
+ Tomahawk
+ Tomahawk
+
+
+
+ &Settings
+ &Inställningar
+
+
+ &Music Player
+ &Musikspelare
+
+
+ &Playlist
+ S&pellista
+
+
+
+ &Network
+ &Nätverk
+
+
+
+ &Help
+ &Hjälp
+
+
+
+ &Quit
+ A&vsluta
+
+
+
+ Ctrl+Q
+ Ctrl+Q
+
+
+
+ Go &online
+ A&nslut
+
+
+
+ Add &Friend...
+ Lägg till &vän...
+
+
+ Re&scan Collection...
+ Sammlung neu&laden…
+
+
+
+ &Tomahawk
+ &Tomahawk
+
+
+
+ &Window
+ &Fönster
+
+
+
+ Go &Online
+ A&nslut
+
+
+
+ U&pdate Collection
+ U&ppdatera samling
+
+
+
+ Update Collection
+ Uppdatera samling
+
+
+
+ &Configure Tomahawk...
+ &Konfigurera Tomahawk...
+
+
+
+ Load &XSPF...
+ Läs in &XSPF...
+
+
+
+ Create &New Playlist...
+ Skapa &ny spellista...
+
+
+
+ About &Tomahawk...
+ Om &Tomahawk...
+
+
+
+ Create New &Automatic Playlist
+ Skapa ny a&utomatisk spellista
+
+
+
+ Create New &Station
+ Skapa ny &station
+
+
+
+ Show Offline Sources
+ Visa frånkopplade källor
+
+
+
+ Hide Offline Sources
+ Dölj frånkopplade källor
+
+
+
+ Minimize
+ Minimera
+
+
+
+ Ctrl+M
+ Ctrl+M
+
+
+
+ Zoom
+ Zoom
+
+
+
+ Meta+Ctrl+Z
+ Meta+Ctrl+Z
+
+
+
+ Diagnostics...
+ Diagnostik...
+
+
+
+ Fully &Rescan Collection
+ Sök &igenom hela samlingen igen
+
+
+
+ Fully Rescan Collection
+ Sök igenom hela samlingen igen
+
+
+
+
+ Play
+ Spela upp
+
+
+
+ Space
+ Blanksteg
+
+
+
+ Previous
+ Föregående
+
+
+
+ Next
+ Nästa
+
+
+ Check for updates...
+ Suche nach Updates…
+
+
+ Back
+ Bakåt
+
+
+ Forward
+ Framåt
+
+
+ Home
+ Hem
+
+
+
+ Global Search...
+ Global sökning...
+
+
+
+
+ Check For Updates...
+ Leta efter uppdateringar...
+
+
+
+
+
+ Connect To Peer
+ Anslut till klient
+
+
+
+ Enter peer address:
+ Ange klientadress:
+
+
+
+ Enter peer port:
+ Ange klientport:
+
+
+
+ Enter peer key:
+ Ange klientnyckel:
+
+
+
+ XSPF Error
+ XSPF-fel
+
+
+
+ This is not a valid XSPF playlist.
+ Detta är inte en giltig XSPF-spellista.
+
+
+
+ Failed to save tracks
+ Misslyckades med att spara spår
+
+
+
+ Some tracks in the playlist do not contain an artist and a title. They will be ignored.
+ Några spår i spellistan innehåller inte någon artist och titel. De kommer att ignoreras.
+
+
+
+ Create New Station
+ Skapa ny station
+
+
+
+ Name:
+ Namn:
+
+
+
+ New Station
+ Ny station
+
+
+
+ New Playlist
+ Ny spellista
+
+
+
+ Pause
+ Paus
+
+
+
+ Go &offline
+ Koppla &från
+
+
+
+ Authentication Error
+ Autentiseringsfel
+
+
+
+ %1 by %2
+ track, artist name
+ %1 av %2
+
+
+
+ %1 - %2
+ current track, some window title
+ %1 - %2
+
+
+
+ About Tomahawk
+ Om Tomahawk
+
+
+
+ <h2><b>Tomahawk %1<br/>(%2)</h2>Copyright 2010, 2011<br/>Christian Muehlhaeuser <muesli@tomahawk-player.org><br/><br/>Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindström, Michael Zanetti, Harald Sitter and Steve Robertson
+ <h2><b>Tomahawk %1<br/>(%2)</h2>Copyright 2010, 2011<br/>Christian Muehlhaeuser <muesli@tomahawk-player.org><br/><br/>Tack till: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindström, Michael Zanetti, Harald Sitter och Steve Robertson
+
+
+ by
+ av
+
+
+ <h2><b>Tomahawk %1</h2>Copyright 2010, 2011<br/>Christian Muehlhaeuser <muesli@tomahawk-player.org><br/><br/>Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Harald Sitter and Steve Robertson
+ <h2><b>Tomahawk %1</h2>Copyright 2010, 2011<br/>Christian Muehlhaeuser <muesli@tomahawk-player.org><br/><br/>Danke an: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Harald Sitter und Steve Robertson
+
+
+
+ TopBar
+
+
+ Form
+ Formulär
+
+
+
+ 0 Sources
+ 0 källor
+
+
+
+ 0 Tracks
+ 0 spår
+
+
+
+ 0 Artists
+ 0 artister
+
+
+
+ 0 Shown
+ 0 visade
+
+
+
+ Tracks
+ Spår
+
+
+
+ Artists
+ Artister
+
+
+
+ Filter
+ Filter
+
+
+
+ Artist View
+ Artistvy
+
+
+
+ Flat View
+ Platt vy
+
+
+
+ Sources
+ Källor
+
+
+
+ Shown
+ Visade
+
+
+
+ TopTracksContext
+
+
+ Top Hits
+
+
+
+
+ TrackModel
+
+
+ Artist
+ Artist
+
+
+
+ Track
+ Spår
+
+
+
+ Album
+ Album
+
+
+
+ Duration
+ Speltid
+
+
+
+ Bitrate
+ Bitfrekvens
+
+
+
+ Age
+ Ålder
+
+
+
+ Year
+ År
+
+
+
+ Size
+ Storlek
+
+
+
+ Origin
+ Källa
+
+
+
+ Title
+ Titel
+
+
+
+ Score
+ Betyg
+
+
+
+ TrackView
+
+
+ Sorry, your filter '%1' did not match any results.
+ Entschuldige, dein Filter '%1' erzeugte keine Ergebnisse.
+
+
+
+ TransferStatusItem
+
+
+ from
+ från
+
+
+
+ to
+ till
+
+
+
+ TransferView
+
+ Peer
+ Gegenstelle
+
+
+ Rate
+ Rate
+
+
+ Track
+ Stück
+
+
+
+ TreeItemDelegate
+
+
+ Unknown
+ Okänt
+
+
+
+ TreeModel
+
+
+ Name
+ Namn
+
+
+
+ Duration
+ Speltid
+
+
+
+ Bitrate
+ Bitfrekvens
+
+
+
+ Age
+ Ålder
+
+
+
+ Year
+ År
+
+
+
+ Size
+ Storlek
+
+
+
+ Origin
+ Källa
+
+
+
+ All Artists
+ Alla artister
+
+
+
+
+ My Collection
+ Min samling
+
+
+
+
+ Collection of %1
+ Samling av %1
+
+
+
+ TwitterConfigWidget
+
+ Authenticating with Twitter allows you to discover and play music from your Twitter friends running Tomahawk.
+ Die Authentifizierung mit Twitter ermöglicht es dir Musik von den Twitter-Freunden zu hören, die Tomahawk verwenden
+
+
+ This feature works best when you have set a static host name in the "Network" settings tab under Advanced Settings, but may work even if you do not. Tomahawk uses Direct Messages and this will only work when both Twitter users have followed each other.
+ Dies funktioniert am Besten, wenn du einen statischen Hostnamen im "Netzwerk"-Tab unter Erweiterte Netzwerkeinstellungen eingetragen hast. Es kann aber auch ohne funktionieren. Tomahawk verwendet Direktnachrichten, was voraussetzt, dass sich beide Twitternutzer gegenseitig folgen.
+
+
+
+
+
+ Status: No saved credentials
+
+
+
+
+ Authenticate with Twitter
+ Autentisera med Twitter
+
+
+ Here's how it works: just press one of the buttons below to tweet "Got Tomahawk?" and some necessary information. Then be (very) patient. Twitter is an asynchronous protocol so it can take a bit!
+
+If connections to peers seem to have been lost, just press the appropriate button again to re-post a tweet for resynchronization.
+ So geht's: klicke auf einen der Buttons unten um "Got Tomahawk?" und einige notwendige Informationen zu twittern. Dann heisst es (sehr) geduldig sein. Twitter ist ein asynchrones Protokoll, also kann es etwas dauern!
+
+Sollte die Verbindung zu anderen Gegenstellen verloren gehen, klicke einfach erneut auf den entsprechenden Button um einen Tweet zur Resynchronisierung zu senden.
+
+
+
+ Configure this Twitter account
+ Konfigurera detta Twitter-konto
+
+
+
+ The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.
+
+
+
+
+ Twitter Connections
+
+
+
+
+
+If you only want to post tweets, you're done.
+
+If you want to connect Tomahawk to your friends using Twitter, select the type of tweet and press the button below to send a sync message. You must both be following each other as Direct Messages are used. Then be (very) patient -- it can take several minutes!
+
+You can re-send a sync message at any time simply by sending another tweet using the button.
+
+
+
+
+ Select the kind of tweet you would like, then press the button to post it:
+
+
+
+
+
+ Global Tweet
+
+
+
+
+
+ @Mention
+
+
+
+
+
+ Direct Message
+ Direktmeddelande
+
+
+
+ e.g. @tomahawk
+ t.ex. @tomahawk
+
+
+
+ Send Message
+ Skicka meddelande
+
+
+ e.g. @tomahawkplayer
+ z.B. @tomahawkplayer
+
+
+
+
+
+ Tweet!
+ Twittra!
+
+
+
+
+
+ Authenticate
+ Autentisera
+
+
+
+
+ Status: Credentials saved for %1
+
+
+
+
+
+ De-authenticate
+
+
+
+
+
+
+
+
+
+
+ Tweetin' Error
+
+
+
+
+ The credentials could not be verified.
+You may wish to try re-authenticating.
+
+
+
+
+ Status: Error validating credentials
+
+
+
+
+ Send Message!
+ Skicka meddelande!
+
+
+
+ Send Mention!
+
+
+
+
+ You must enter a user name for this type of tweet.
+
+
+
+
+ Your saved credentials could not be loaded.
+You may wish to try re-authenticating.
+
+
+
+
+ Your saved credentials could not be verified.
+You may wish to try re-authenticating.
+
+
+
+
+
+ There was an error posting your status -- sorry!
+
+
+
+
+
+ Tweeted!
+
+
+
+
+ Your tweet has been posted!
+
+
+
+
+ There was an error posting your direct message -- sorry!
+
+
+
+
+ Your message has been posted!
+ Ditt meddelande har postats!
+
+
+
+ TwitterPlugin
+
+
+ Twitter
+ Twitter
+
+
+
+ ViewManager
+
+
+ All available tracks
+ Alla tillgängliga spår
+
+
+
+ All available albums
+ Alla tillgängliga album
+
+
+
+ WelcomeWidget
+
+ Recently played playlists:
+ Zuletzt gespielte Playlisten:
+
+
+ Recently played tracks:
+ Zuletzt gespielte Stücke:
+
+
+ You have not played any playlists yet.
+ Du hast bisher keine Playlisten abgespielt.
+
+
+
+ Welcome to Tomahawk
+ Välkommen till Tomahawk
+
+
+
+ Recent Additions
+ Senaste tillägg
+
+
+
+ Newest Stations & Playlists
+ Nyaste stationer och spellistor
+
+
+
+ Recently Played Tracks
+ Senaste spelade spår
+
+
+
+ No recently created playlists in your network.
+ Inga skapade spellistor i ditt nätverk på sistone.
+
+
+
+ WhatsHotWidget
+
+
+ Charts
+ Topplistor
+
+
+
+ WikipediaContext
+
+
+ Wikipedia
+ Wikipedia
+
+
+
+ XMPPBot
+
+
+
+Terms for %1:
+
+
+
+
+
+ No terms found, sorry.
+
+
+
+
+
+Hotttness for %1: %2
+
+
+
+
+
+
+Familiarity for %1: %2
+
+
+
+
+
+
+Lyrics for "%1" by %2:
+
+%3
+
+
+
+
+
+ XSPFLoader
+
+
+ New Playlist
+ Ny spellista
+
+
+ Failed to save tracks
+ Konnte Stücke nicht abspeichern
+
+
+ Some tracks in the playlist do not contain an artist and a title. They will be ignored.
+ Einige Stücke in der Playliste enthalten weder Künstler noch Titel. Diese werden ignoriert.
+
+
+ XSPF Error
+ XSPF-Fehler
+
+
+ This is not a valid XSPF playlist.
+ Dies ist keine gültige XSPF-Playliste.
+
+
+
+ XmlConsole
+
+
+ Xml stream console
+
+
+
+
+
+ Filter
+
+
+
+
+ Save log
+ Spara logg
+
+
+
+ Disabled
+ Inaktiverad
+
+
+
+ By JID
+ Efter JID
+
+
+
+ By namespace uri
+
+
+
+
+ By all attributes
+ Efter alla attribut
+
+
+
+ Visible stanzas
+
+
+
+
+ Information query
+
+
+
+
+ Message
+ Meddelande
+
+
+
+ Presence
+
+
+
+
+ Custom
+ Anpassad
+
+
+
+ Close
+ Stäng
+
+
+
+ Save XMPP log to file
+ Spara XMPP-logg till fil
+
+
+
+ OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)
+ OpenDocument-format (*.odf);;HTML-fil (*.html);;Vanlig text (*.txt)
+
+
+
+ ZeroconfConfig
+
+
+ Form
+ Formulär
+
+
+
+ Local Network configuration
+ Lokal nätverkskonfiguration
+
+
+
+ This plugin will automatically find other users running Tomahawk on your local network
+ Denna insticksmodul hittar automatiskt andra användare som kör Tomahawk på ditt lokala nätverk
+
+
+
+ Connect automatically when Tomahawk starts
+ Anslut automatiskt när Tomahawk startar
+
+
+
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 80c931efe..7ac9c43dc 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -238,6 +238,7 @@ set( libGuiHeaders
widgets/playlisttypeselectordlg.h
widgets/welcomewidget.h
widgets/whatshotwidget.h
+ widgets/whatshotwidget_p.h
widgets/RecentlyPlayedPlaylistsModel.h
widgets/RecentPlaylistsModel.h
widgets/OverlayButton.h
diff --git a/src/libtomahawk/actioncollection.cpp b/src/libtomahawk/actioncollection.cpp
index 2d252eacc..bfaff95fb 100644
--- a/src/libtomahawk/actioncollection.cpp
+++ b/src/libtomahawk/actioncollection.cpp
@@ -46,7 +46,7 @@ ActionCollection::initActions()
m_actionCollection[ "latchOff" ] = latchOff;
bool isPublic = TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening;
- QAction *privacyToggle = new QAction( tr( QString( isPublic ? "&Listen Privately" : "&Listen Publicly" ).toAscii().constData() ), this );
+ QAction *privacyToggle = new QAction( ( isPublic ? tr( "&Listen Privately" ) : tr( "&Listen Publicly" ) ), this );
privacyToggle->setIcon( QIcon( RESPATH "images/private-listening.png" ) );
privacyToggle->setIconVisibleInMenu( isPublic );
m_actionCollection[ "togglePrivacy" ] = privacyToggle;
diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp
index 097a89c40..6a7aeb1df 100644
--- a/src/libtomahawk/audio/audioengine.cpp
+++ b/src/libtomahawk/audio/audioengine.cpp
@@ -418,7 +418,7 @@ AudioEngine::togglePrivateListeningMode()
#ifndef TOMAHAWK_HEADLESS
QAction *privacyToggle = ActionCollection::instance()->getAction( "togglePrivacy" );
bool isPublic = TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening;
- privacyToggle->setText( tr( QString( isPublic ? "&Listen Privately" : "&Listen Publicly" ).toAscii().constData() ) );
+ privacyToggle->setText( ( isPublic ? tr( "&Listen Privately" ) : tr( "&Listen Publicly" ) ) );
privacyToggle->setIconVisibleInMenu( isPublic );
#endif
emit privacyModeChanged();
diff --git a/src/libtomahawk/dropjob.cpp b/src/libtomahawk/dropjob.cpp
index 9633bdee0..c88ae7cc1 100644
--- a/src/libtomahawk/dropjob.cpp
+++ b/src/libtomahawk/dropjob.cpp
@@ -68,7 +68,8 @@ DropJob::mimeTypes()
<< "application/tomahawk.metadata.artist"
<< "application/tomahawk.metadata.album"
<< "application/tomahawk.mixed"
- << "text/plain";
+ << "text/plain"
+ << "text/uri-list";
return mimeTypes;
}
@@ -77,6 +78,7 @@ bool
DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType, DropJob::DropAction acceptedAction )
{
Q_UNUSED( acceptedAction );
+
if ( data->hasFormat( "application/tomahawk.query.list" )
|| data->hasFormat( "application/tomahawk.plentry.list" )
|| data->hasFormat( "application/tomahawk.result.list" )
@@ -90,7 +92,9 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType
// check plain text url types
if ( !data->hasFormat( "text/plain" ) )
- return false;
+ if ( !data->hasFormat( "text/uri-list" ) )
+ return false;
+
const QString url = data->data( "text/plain" );
@@ -99,6 +103,9 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType
if( url.contains( "xspf" ) )
return true;
+ if( data->data( "text/uri-list" ).contains( "xspf" ) )
+ return true;
+
// Not the most elegant
if ( url.contains( "spotify" ) && url.contains( "playlist" ) && s_canParseSpotifyPlaylists )
return true;
@@ -151,7 +158,7 @@ DropJob::isDropType( DropJob::DropType desired, const QMimeData* data )
const QString url = data->data( "text/plain" );
if ( desired == Playlist )
{
- if( url.contains( "xspf" ) )
+ if( url.contains( "xspf" ) || data->data( "text/uri-list").contains( "xspf" ) )
return true;
// Not the most elegant
@@ -222,10 +229,15 @@ DropJob::parseMimeData( const QMimeData *data )
results = tracksFromArtistMetaData( data );
else if ( data->hasFormat( "application/tomahawk.mixed" ) )
tracksFromMixedData( data );
- else if ( data->hasFormat( "text/plain" ) )
+ else if ( data->hasFormat( "text/plain" ) && !data->data( "text/plain" ).isEmpty() )
{
const QString plainData = QString::fromUtf8( data->data( "text/plain" ) );
handleAllUrls( plainData );
+
+ }else if ( data->hasFormat( "text/uri-list" ) )
+ {
+ const QString plainData = QString::fromUtf8( data->data( "text/uri-list" ).trimmed() );
+ handleAllUrls( plainData );
}
m_resultList.append( results );
@@ -411,7 +423,7 @@ void
DropJob::handleXspfs( const QString& fileUrls )
{
tDebug() << Q_FUNC_INFO << "Got xspf playlist!!" << fileUrls;
-
+ bool error = false;
QStringList urls = fileUrls.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
if ( dropAction() == Default )
@@ -419,16 +431,37 @@ DropJob::handleXspfs( const QString& fileUrls )
foreach ( const QString& url, urls )
{
+ XSPFLoader* l;
+
QFile xspfFile( QUrl::fromUserInput( url ).toLocalFile() );
if ( xspfFile.exists() )
{
- XSPFLoader* l = new XSPFLoader( true, this );
+ l = new XSPFLoader( dropAction() == Create, this );
tDebug( LOGINFO ) << "Loading local xspf " << xspfFile.fileName();
l->load( xspfFile );
}
+ else if( QUrl( url ).isValid() )
+ {
+
+ l = new XSPFLoader( dropAction() == Create, this );
+ tDebug( LOGINFO ) << "Loading remote xspf " << url;
+ l->load( QUrl( url ) );
+ }
else
- tLog( LOGINFO ) << "Error Loading local xspf " << xspfFile.fileName();
+ {
+ error = true;
+ tLog() << "Failed to load or parse dropped XSPF";
+
+ }
+
+ if ( dropAction() == Append && !error )
+ {
+ qDebug() << Q_FUNC_INFO << "Trying to append xspf";
+ connect( l, SIGNAL( tracks( QList ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
+ }
+
+
}
}
diff --git a/src/libtomahawk/jobview/JobStatusModel.cpp b/src/libtomahawk/jobview/JobStatusModel.cpp
index 6eb92126e..2b7e4aab7 100644
--- a/src/libtomahawk/jobview/JobStatusModel.cpp
+++ b/src/libtomahawk/jobview/JobStatusModel.cpp
@@ -81,6 +81,7 @@ JobStatusModel::data( const QModelIndex& index, int role ) const
{
case Qt::DecorationRole:
return item->icon();
+ case Qt::ToolTipRole:
case Qt::DisplayRole:
{
if ( m_collapseCount.contains( item->type() ) )
diff --git a/src/libtomahawk/playlist/artistview.cpp b/src/libtomahawk/playlist/artistview.cpp
index 59ce86097..708a97a4a 100644
--- a/src/libtomahawk/playlist/artistview.cpp
+++ b/src/libtomahawk/playlist/artistview.cpp
@@ -369,6 +369,9 @@ ArtistView::onMenuTriggered( int action )
bool
ArtistView::jumpToCurrentTrack()
{
+ if ( !m_proxyModel )
+ return false;
+
scrollTo( m_proxyModel->currentIndex(), QAbstractItemView::PositionAtCenter );
return true;
}
diff --git a/src/libtomahawk/playlist/treeproxymodel.cpp b/src/libtomahawk/playlist/treeproxymodel.cpp
index dc2e59ef3..9dfae69e0 100644
--- a/src/libtomahawk/playlist/treeproxymodel.cpp
+++ b/src/libtomahawk/playlist/treeproxymodel.cpp
@@ -43,6 +43,15 @@ TreeProxyModel::TreeProxyModel( QObject* parent )
setSourceTreeModel( 0 );
}
+QPersistentModelIndex
+TreeProxyModel::currentIndex() const
+{
+ if ( !m_model )
+ return QPersistentModelIndex();
+
+ return mapFromSource( m_model->currentItem() );
+}
+
void
TreeProxyModel::setSourceModel( QAbstractItemModel* sourceModel )
diff --git a/src/libtomahawk/playlist/treeproxymodel.h b/src/libtomahawk/playlist/treeproxymodel.h
index d15f3e8a8..84f09bcdb 100644
--- a/src/libtomahawk/playlist/treeproxymodel.h
+++ b/src/libtomahawk/playlist/treeproxymodel.h
@@ -39,7 +39,7 @@ public:
virtual void setSourceTreeModel( TreeModel* sourceModel );
virtual void setSourceModel( QAbstractItemModel* sourceModel );
- virtual QPersistentModelIndex currentIndex() const { return mapFromSource( m_model->currentItem() ); }
+ virtual QPersistentModelIndex currentIndex() const;
virtual void setCurrentIndex( const QModelIndex& index ) { m_model->setCurrentItem( mapToSource( index ) ); }
virtual QList tracks() { Q_ASSERT( FALSE ); QList queries; return queries; }
diff --git a/src/libtomahawk/playlistinterface.h b/src/libtomahawk/playlistinterface.h
index 266e10e7e..5aa3fd46e 100644
--- a/src/libtomahawk/playlistinterface.h
+++ b/src/libtomahawk/playlistinterface.h
@@ -67,6 +67,10 @@ public:
virtual void reset() {}
+ // Some playlist interfaces can wrap other interfaces. When checking for top-level
+ // equality (say, to compare the currently playing interface) this might be needed
+ virtual bool hasChildInterface( PlaylistInterface* ) { return false; }
+
QObject* object() const { return m_object; }
static void dontDelete( Tomahawk::PlaylistInterface* obj )
diff --git a/src/libtomahawk/sip/SipHandler.cpp b/src/libtomahawk/sip/SipHandler.cpp
index 6d8881d64..c28485928 100644
--- a/src/libtomahawk/sip/SipHandler.cpp
+++ b/src/libtomahawk/sip/SipHandler.cpp
@@ -383,7 +383,7 @@ SipHandler::connectPlugin( bool startup, const QString &pluginId )
int result = QMessageBox::question(
//TomahawkApp::instance()->mainWindow(),
0, tr( "Legal Warning" ),
- tr( "By pressing OK below, you agree that your use of Tomahawk will be in accordance with any applicable laws, including copyright and intellectual property laws, in effect in your country of residence, and indemnify the Tomahawk developers and project from liability should you choose to break those laws.\n\nFor more information, please see http://gettomahawk.com/legal" ),
+ tr( "By pressing I Agree below, you agree that your use of Tomahawk will be in accordance with any applicable laws, including copyright and intellectual property laws, in effect in your country of residence, and indemnify the Tomahawk developers and project from liability should you choose to break those laws.\n\nFor more information, please see http://gettomahawk.com/legal" ),
tr( "I Do Not Agree" ), tr( "I Agree" )
);
if ( result != 1 )
diff --git a/src/libtomahawk/utils/xspfloader.cpp b/src/libtomahawk/utils/xspfloader.cpp
index 08930ac01..77dba6a26 100644
--- a/src/libtomahawk/utils/xspfloader.cpp
+++ b/src/libtomahawk/utils/xspfloader.cpp
@@ -235,9 +235,16 @@ XSPFLoader::gotBody()
m_entries );
// 10 minute default---for now, no way to change it
+ connect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistCreated() ) );
new Tomahawk::XspfUpdater( m_playlist, 6000000, m_autoUpdate, m_url.toString() );
- deleteLater();
+ emit ok( m_playlist );
+ }
+ else{
+
+ if( !m_entries.isEmpty() )
+ emit tracks( m_entries );
}
- emit ok( m_playlist );
+ deleteLater();
+
}
diff --git a/src/libtomahawk/utils/xspfloader.h b/src/libtomahawk/utils/xspfloader.h
index 33826bc03..fa9a27194 100644
--- a/src/libtomahawk/utils/xspfloader.h
+++ b/src/libtomahawk/utils/xspfloader.h
@@ -51,6 +51,8 @@ public:
signals:
void error( XSPFLoader::XSPFErrorCode error );
void ok( const Tomahawk::playlist_ptr& );
+ void track( const Tomahawk::query_ptr& track );
+ void tracks( const QList< Tomahawk::query_ptr > tracks );
public slots:
void load( const QUrl& url );
diff --git a/src/libtomahawk/viewmanager.cpp b/src/libtomahawk/viewmanager.cpp
index b7cd72b08..f7ea016c8 100644
--- a/src/libtomahawk/viewmanager.cpp
+++ b/src/libtomahawk/viewmanager.cpp
@@ -818,6 +818,8 @@ ViewManager::pageForInterface( Tomahawk::PlaylistInterface* interface ) const
ViewPage* page = m_pageHistory.at( i );
if ( page->playlistInterface() == interface )
return page;
+ if ( page->playlistInterface() && page->playlistInterface()->hasChildInterface( interface ) )
+ return page;
}
return 0;
diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h
index 4a3b6b50a..6a312b5e3 100644
--- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h
+++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h
@@ -64,6 +64,12 @@ public:
virtual QList< Tomahawk::query_ptr > tracks() { return QList< Tomahawk::query_ptr >(); }
virtual int unfilteredTrackCount() const { return 0; }
+ virtual bool hasChildInterface( PlaylistInterface* other )
+ {
+ return ( m_w->ui->albums->playlistInterface() == other ) ||
+ ( m_w->ui->relatedArtists->playlistInterface() == other ) ||
+ ( m_w->ui->topHits->playlistInterface() == other );
+ }
public slots:
virtual void setRepeatMode( RepeatMode mode )
{
diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp
index bbd47f6bf..4034f0b37 100644
--- a/src/libtomahawk/widgets/welcomewidget.cpp
+++ b/src/libtomahawk/widgets/welcomewidget.cpp
@@ -99,6 +99,19 @@ WelcomeWidget::~WelcomeWidget()
delete ui;
}
+PlaylistInterface*
+WelcomeWidget::playlistInterface() const
+{
+ return ui->tracksView->playlistInterface();
+}
+
+
+bool
+WelcomeWidget::jumpToCurrentTrack()
+{
+ return ui->tracksView->jumpToCurrentTrack();
+}
+
bool
WelcomeWidget::isBeingPlayed() const
{
diff --git a/src/libtomahawk/widgets/welcomewidget.h b/src/libtomahawk/widgets/welcomewidget.h
index 0dc92f040..bc4bcc24e 100644
--- a/src/libtomahawk/widgets/welcomewidget.h
+++ b/src/libtomahawk/widgets/welcomewidget.h
@@ -84,7 +84,7 @@ public:
~WelcomeWidget();
virtual QWidget* widget() { return this; }
- virtual Tomahawk::PlaylistInterface* playlistInterface() const { return 0; }
+ virtual Tomahawk::PlaylistInterface* playlistInterface() const;
virtual QString title() const { return tr( "Welcome to Tomahawk" ); }
virtual QString description() const { return QString(); }
@@ -92,7 +92,7 @@ public:
virtual bool showStatsBar() const { return false; }
virtual bool showInfoBar() const { return false; }
- virtual bool jumpToCurrentTrack() { return false; }
+ virtual bool jumpToCurrentTrack();
virtual bool isBeingPlayed() const;
protected:
diff --git a/src/libtomahawk/widgets/whatshotwidget.cpp b/src/libtomahawk/widgets/whatshotwidget.cpp
index 7cb374e66..9e5717eec 100644
--- a/src/libtomahawk/widgets/whatshotwidget.cpp
+++ b/src/libtomahawk/widgets/whatshotwidget.cpp
@@ -18,6 +18,7 @@
*/
#include "whatshotwidget.h"
+#include "whatshotwidget_p.h"
#include "ui_whatshotwidget.h"
#include
@@ -50,6 +51,7 @@ static QString s_whatsHotIdentifier = QString( "WhatsHotWidget" );
WhatsHotWidget::WhatsHotWidget( QWidget* parent )
: QWidget( parent )
, ui( new Ui::WhatsHotWidget )
+ , m_playlistInterface( 0 )
, m_sortedProxy( 0 )
{
ui->setupUi( this );
@@ -90,6 +92,8 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent )
ui->artistsViewLeft->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
ui->artistsViewLeft->header()->setVisible( false );
+ m_playlistInterface = new ChartsPlaylistInterface( this );
+
connect( Tomahawk::InfoSystem::InfoSystem::instance(),
SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
@@ -102,9 +106,16 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent )
WhatsHotWidget::~WhatsHotWidget()
{
+ delete m_playlistInterface;
delete ui;
}
+PlaylistInterface*
+WhatsHotWidget::playlistInterface() const
+{
+ return m_playlistInterface;
+}
+
bool
WhatsHotWidget::isBeingPlayed() const
diff --git a/src/libtomahawk/widgets/whatshotwidget.h b/src/libtomahawk/widgets/whatshotwidget.h
index ecd0be8ef..392c39a32 100644
--- a/src/libtomahawk/widgets/whatshotwidget.h
+++ b/src/libtomahawk/widgets/whatshotwidget.h
@@ -31,6 +31,7 @@
#include "dllmacro.h"
+class ChartsPlaylistInterface;
class QSortFilterProxyModel;
class QStandardItemModel;
class QStandardItem;
@@ -58,7 +59,7 @@ public:
~WhatsHotWidget();
virtual QWidget* widget() { return this; }
- virtual Tomahawk::PlaylistInterface* playlistInterface() const { return 0; }
+ virtual Tomahawk::PlaylistInterface* playlistInterface() const;
virtual QString title() const { return tr( "Charts" ); }
virtual QString description() const { return QString(); }
@@ -90,6 +91,7 @@ private:
QStandardItem* parseNode( QStandardItem* parentItem, const QString &label, const QVariant &data );
Ui::WhatsHotWidget *ui;
+ ChartsPlaylistInterface* m_playlistInterface;
QStandardItemModel* m_crumbModelLeft;
QSortFilterProxyModel* m_sortedProxy;
@@ -101,6 +103,8 @@ private:
QString m_queueItemToShow;
QSet< QString > m_queuedFetches;
QTimer* m_timer;
+
+ friend class ChartsPlaylistInterface;
};
#endif // WHATSHOTWIDGET_H
diff --git a/src/libtomahawk/widgets/whatshotwidget_p.h b/src/libtomahawk/widgets/whatshotwidget_p.h
new file mode 100644
index 000000000..e4e3d8dc4
--- /dev/null
+++ b/src/libtomahawk/widgets/whatshotwidget_p.h
@@ -0,0 +1,107 @@
+/* === This file is part of Tomahawk Player - ===
+ *
+ * Copyright 2011, Leo Franchi
+ *
+ * Tomahawk is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Tomahawk is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Tomahawk. If not, see .
+ */
+
+#ifndef WHATSHOTWIDGET_P_H
+#define WHATSHOTWIDGET_P_H
+
+#include "whatshotwidget.h"
+#include "playlistinterface.h"
+#include "ui_whatshotwidget.h"
+#include "treeproxymodel.h"
+#include "playlistview.h"
+#include "result.h"
+
+#include
+
+class ChartsPlaylistInterface : public QObject, public Tomahawk::PlaylistInterface
+{
+ Q_OBJECT
+public:
+ explicit ChartsPlaylistInterface( WhatsHotWidget* w )
+ : PlaylistInterface( this )
+ , m_w( w )
+ {
+ connect( m_w->ui->tracksViewLeft->proxyModel(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
+ SLOT( anyRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
+ connect( m_w->ui->artistsViewLeft->proxyModel(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
+ SLOT( anyRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
+
+ connect( m_w->ui->tracksViewLeft->proxyModel(), SIGNAL( shuffleModeChanged( bool ) ),
+ SLOT( anyShuffleChanged( bool ) ) );
+ connect( m_w->ui->artistsViewLeft->proxyModel(), SIGNAL( shuffleModeChanged( bool ) ),
+ SLOT( anyShuffleChanged( bool ) ) );
+ }
+ virtual ~ChartsPlaylistInterface() {}
+
+
+ // Any one is fine, we keep them all synched
+ virtual RepeatMode repeatMode() const { return m_w->ui->tracksViewLeft->proxyModel()->repeatMode(); }
+
+ virtual bool shuffled() const { return m_w->ui->tracksViewLeft->proxyModel()->shuffled(); }
+
+ // Do nothing
+ virtual Tomahawk::result_ptr currentItem() const { return Tomahawk::result_ptr(); }
+ virtual Tomahawk::result_ptr siblingItem( int ) { return Tomahawk::result_ptr(); }
+ virtual int trackCount() const { return 0; }
+ virtual QList< Tomahawk::query_ptr > tracks() { return QList< Tomahawk::query_ptr >(); }
+ virtual int unfilteredTrackCount() const { return 0; }
+
+ virtual bool hasChildInterface( PlaylistInterface* other )
+ {
+ return m_w->ui->tracksViewLeft->playlistInterface() == other ||
+ m_w->ui->artistsViewLeft->playlistInterface() == other;
+
+ }
+public slots:
+ virtual void setRepeatMode( RepeatMode mode )
+ {
+ m_w->ui->tracksViewLeft->proxyModel()->setRepeatMode( mode );
+ m_w->ui->artistsViewLeft->proxyModel()->setRepeatMode( mode );
+ }
+
+ virtual void setShuffled( bool enabled )
+ {
+ m_w->ui->tracksViewLeft->proxyModel()->setShuffled( enabled );
+ m_w->ui->artistsViewLeft->proxyModel()->setShuffled( enabled );
+ }
+
+signals:
+ void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
+ void shuffleModeChanged( bool enabled );
+
+ void trackCountChanged( unsigned int tracks );
+ void sourceTrackCountChanged( unsigned int tracks );
+ void nextTrackReady();
+
+private slots:
+ void anyRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode )
+ {
+ emit repeatModeChanged( mode );
+ }
+
+ void anyShuffleChanged( bool enabled )
+ {
+ emit shuffleModeChanged( enabled );
+ }
+
+private:
+ WhatsHotWidget* m_w;
+
+};
+
+#endif
diff --git a/src/sourcetree/sourcedelegate.cpp b/src/sourcetree/sourcedelegate.cpp
index 5e77cf209..90d57836b 100644
--- a/src/sourcetree/sourcedelegate.cpp
+++ b/src/sourcetree/sourcedelegate.cpp
@@ -144,8 +144,8 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co
type == SourcesModel::Station ||
type == SourcesModel::TemporaryPage ||
type == SourcesModel::GenericPage );
-
- if ( playable && item->isBeingPlayed() )
+ const bool playing = ( AudioEngine::instance()->isPlaying() || AudioEngine::instance()->isPaused() );
+ if ( playable && playing && item->isBeingPlayed() )
{
const int iconW = o3.rect.height() - 4;
QRect iconRect = QRect( option.rect.x() - iconW - 4, option.rect.y() + 2, iconW, iconW );