From d66afb9ba37636749d8b1ba5b274cd5b3694b272 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Tue, 8 Jan 2013 09:36:14 -0500 Subject: [PATCH 01/28] Don't crash when listening along if a result in a sourceplaylistinterface's next is not valid --- src/libtomahawk/audio/AudioEngine.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp index f4453d5f6..a3e1177fc 100644 --- a/src/libtomahawk/audio/AudioEngine.cpp +++ b/src/libtomahawk/audio/AudioEngine.cpp @@ -241,7 +241,9 @@ AudioEngine::canGoNext() return false; } - return ( m_currentTrack && m_playlist.data()->hasNextResult() && m_playlist.data()->nextResult()->isOnline() ); + return ( m_currentTrack && m_playlist.data()->hasNextResult() && + !m_playlist.data()->nextResult().isNull() && + m_playlist.data()->nextResult()->isOnline() ); } @@ -903,7 +905,7 @@ AudioEngine::setPlaylist( Tomahawk::playlistinterface_ptr playlist ) connect( m_playlist.data(), SIGNAL( shuffleModeChanged( bool ) ), SIGNAL( shuffleModeChanged( bool ) ) ); connect( m_playlist.data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) ); - + emit shuffleModeChanged( m_playlist.data()->shuffled() ); emit repeatModeChanged( m_playlist.data()->repeatMode() ); } From fd0a80da1fd5049fcb5d6eef9ea6a6f24566066a Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Tue, 8 Jan 2013 15:46:53 +0100 Subject: [PATCH 02/28] Remove headers from CMakeLists.txt which don't need to be tracked anymore because of automoc --- src/libtomahawk/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 1071ad8ac..ca7e5567e 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -156,7 +156,6 @@ set( libGuiSources if(QCA2_FOUND) set( libGuiSources ${libGuiSources} utils/GroovesharkParser.cpp ) - set( libGuiHeaders ${libGuiHeaders} utils/GroovesharkParser.h ) endif() if(UNIX AND NOT APPLE AND NOT Qt5Core_DIR) @@ -364,7 +363,6 @@ ENDIF(QCA2_FOUND) IF(LIBATTICA_FOUND) SET( libGuiSources ${libGuiSources} AtticaManager.cpp ) - SET( libGuiHeaders ${libGuiHeaders} AtticaManager.h ) INCLUDE_DIRECTORIES( ${LIBATTICA_INCLUDE_DIR} ) LIST(APPEND LINK_LIBRARIES ${LIBATTICA_LIBRARIES} ${QuaZip_LIBRARIES} ) ENDIF(LIBATTICA_FOUND) From 2e511318f5794929f0e3c3d48c3c14528e05a222 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Tue, 8 Jan 2013 19:02:01 +0100 Subject: [PATCH 03/28] Try to remove frame from toolbar on Windows 8. --- src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog.cpp b/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog.cpp index df63ff3df..8ab5eb83e 100644 --- a/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog.cpp +++ b/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog.cpp @@ -68,6 +68,9 @@ QToolbarTabDialog::QToolbarTabDialog() : pimpl->toolbar = new QToolBar(pimpl->dialog.data()); pimpl->toolbar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); +#ifdef Q_OS_WIN + pimpl->toolbar->setStyleSheet( "QToolBar { border: 0px; }" ); +#endif pimpl->stack = new QStackedWidget(pimpl->dialog.data()); From 64a2854130ec1dcf0e4e717de76e22ca037fff15 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Tue, 8 Jan 2013 19:59:05 +0100 Subject: [PATCH 04/28] Send invite on returnPressed. --- src/widgets/AccountWidget.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/widgets/AccountWidget.cpp b/src/widgets/AccountWidget.cpp index fa4aa2c12..52ab83996 100644 --- a/src/widgets/AccountWidget.cpp +++ b/src/widgets/AccountWidget.cpp @@ -1,6 +1,6 @@ /* === This file is part of Tomahawk Player - === * - * Copyright 2012 Teo Mrnjavac + * Copyright 2012-2013, Teo Mrnjavac * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -292,6 +292,8 @@ AccountWidget::setupConnections( const QPersistentModelIndex& idx, int accountId this, SLOT( changeAccountConnectionState( bool ) ) ); connect( m_inviteButton, SIGNAL( clicked() ), this, SLOT( sendInvite() ) ); + connect( m_inviteEdit, SIGNAL( returnPressed() ), + this, SLOT( sendInvite() ) ); m_inviteEdit->setPlaceholderText( account->sipPlugin()->inviteString() ); } From d2c83bf61409c79706b3e4e9119e87ef17d14090 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 5 Jan 2013 13:34:21 +0100 Subject: [PATCH 05/28] * Auto resize tophits view and limit it to 20 tracks. --- src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index babcc4fcd..9302482e7 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -75,7 +75,8 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* ui->topHits->setPlayableModel( m_topHitsModel ); ui->topHits->setSortingEnabled( false ); ui->topHits->setEmptyTip( tr( "Sorry, we could not find any top hits for this artist!" ) ); - + ui->topHits->setAutoResize( true ); + ui->relatedArtists->setAutoFitItems( false ); ui->relatedArtists->setWrapping( false ); ui->relatedArtists->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); @@ -281,7 +282,7 @@ ArtistInfoWidget::onTracksFound( const QList& queries, Mode Q_UNUSED( mode ); m_topHitsModel->finishLoading(); - m_topHitsModel->appendQueries( queries ); + m_topHitsModel->appendQueries( queries.mid( 0, 20 ) ); } From 0a97127ea8f30df9311a5d41c45142377a87c703 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 8 Jan 2013 21:42:36 +0100 Subject: [PATCH 06/28] * Fixed AudioEngine not correctly emitting stopped(). --- src/libtomahawk/audio/AudioEngine.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp index a3e1177fc..b0ad84cf3 100644 --- a/src/libtomahawk/audio/AudioEngine.cpp +++ b/src/libtomahawk/audio/AudioEngine.cpp @@ -167,17 +167,19 @@ AudioEngine::pause() void AudioEngine::stop( AudioErrorCode errorCode ) { - tDebug() << Q_FUNC_INFO << errorCode; + tDebug() << Q_FUNC_INFO << errorCode << isStopped(); if ( isStopped() ) return; - if( errorCode == NoError ) + if ( errorCode == NoError ) setState( Stopped ); else setState( Error ); - m_mediaObject->stop(); + if ( m_mediaObject->state() != Phonon::StoppedState ) + m_mediaObject->stop(); + emit stopped(); if ( !m_playlist.isNull() ) @@ -746,10 +748,6 @@ AudioEngine::onStateChanged( Phonon::State newState, Phonon::State oldState ) // We don't emit this state to listeners - yet. m_state = Loading; } - if ( newState == Phonon::StoppedState ) - { - m_state = Stopped; - } if ( newState == Phonon::ErrorState ) { stop( UnknownError ); @@ -801,11 +799,14 @@ AudioEngine::onStateChanged( Phonon::State newState, Phonon::State oldState ) m_expectStop = false; tDebug( LOGVERBOSE ) << "Finding next track."; if ( canGoNext() ) + { loadNextTrack(); + } else { if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == Tomahawk::PlaylistModes::Retry ) m_waitingOnNewTrack = true; + stop(); } } From ea9bc9a4a2823259f7c435a7ae9b3d229c5c6723 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 8 Jan 2013 23:06:24 +0100 Subject: [PATCH 07/28] * Updated copyright in about dialog to 2013. --- src/TomahawkWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index d966d7cc7..dfb710951 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -1190,7 +1190,7 @@ TomahawkWindow::showAboutTomahawk() .arg( TomahawkUtils::appFriendlyVersion() ); #endif - const QString copyright( tr( "Copyright 2010 - 2012" ) ); + const QString copyright( tr( "Copyright 2010 - 2013" ) ); const QString thanksto( tr( "Thanks to:" ) ); desc = QString( "%1
Christian Muehlhaeuser <muesli@tomahawk-player.org>

" From ed151e1e3ab01c152d9ae46b2602fb92992d0497 Mon Sep 17 00:00:00 2001 From: Tomahawk CI Date: Wed, 9 Jan 2013 01:17:45 +0100 Subject: [PATCH 08/28] Automatic merge of Transifex translations --- lang/tomahawk_ar.ts | 10 +- lang/tomahawk_bg.ts | 10 +- lang/tomahawk_bn_IN.ts | 8 +- lang/tomahawk_ca.ts | 10 +- lang/tomahawk_cs.ts | 10 +- lang/tomahawk_de.ts | 10 +- lang/tomahawk_el.ts | 8 +- lang/tomahawk_en.ts | 10 +- lang/tomahawk_es.ts | 10 +- lang/tomahawk_fi.ts | 10 +- lang/tomahawk_fr.ts | 10 +- lang/tomahawk_gl.ts | 345 +++++++++++++++++++++-------------------- lang/tomahawk_hi_IN.ts | 8 +- lang/tomahawk_hu.ts | 8 +- lang/tomahawk_it.ts | 10 +- lang/tomahawk_ja.ts | 10 +- lang/tomahawk_lt.ts | 10 +- lang/tomahawk_pl.ts | 10 +- lang/tomahawk_pt_BR.ts | 10 +- lang/tomahawk_ru.ts | 72 ++++----- lang/tomahawk_sv.ts | 10 +- lang/tomahawk_tr.ts | 8 +- lang/tomahawk_zh_CN.ts | 10 +- lang/tomahawk_zh_TW.ts | 8 +- 24 files changed, 317 insertions(+), 308 deletions(-) diff --git a/lang/tomahawk_ar.ts b/lang/tomahawk_ar.ts index fde5707bb..c18ca0241 100644 --- a/lang/tomahawk_ar.ts +++ b/lang/tomahawk_ar.ts @@ -374,17 +374,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 نعتذر، لم نستطيع إيجاد الأغنية '%1' ل%2 - + Sorry, Tomahawk couldn't find the artist '%1' نعتذر، لم نستطيع إيجاد الفنان '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 نعتذر، لم نستطيع إيجاد الألبوم '%1' ل%2 @@ -3472,8 +3472,8 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 - حقوق الطبع والنشر ٢٠١٠ - ٢٠١٢ + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_bg.ts b/lang/tomahawk_bg.ts index 24a900f44..bb1ffd250 100644 --- a/lang/tomahawk_bg.ts +++ b/lang/tomahawk_bg.ts @@ -373,17 +373,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 Съжалявам. Не успявам да открия изпълнение '%1' от '%2' - + Sorry, Tomahawk couldn't find the artist '%1' Съжалявам, но не откривам '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 Съжалявам, но не откривам албум с име '%1' от '%2' @@ -3489,8 +3489,8 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 - Всички права - запазени. 2010 - 2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_bn_IN.ts b/lang/tomahawk_bn_IN.ts index 49bc69713..5e2c86d72 100644 --- a/lang/tomahawk_bn_IN.ts +++ b/lang/tomahawk_bn_IN.ts @@ -373,17 +373,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 - + Sorry, Tomahawk couldn't find the artist '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 @@ -3461,7 +3461,7 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 + Copyright 2010 - 2013 diff --git a/lang/tomahawk_ca.ts b/lang/tomahawk_ca.ts index fdf76c236..97e73ed58 100644 --- a/lang/tomahawk_ca.ts +++ b/lang/tomahawk_ca.ts @@ -373,17 +373,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 - + Sorry, Tomahawk couldn't find the artist '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 @@ -3470,8 +3470,8 @@ introduïu el PIN aquí: - Copyright 2010 - 2012 - Copyright 2010 - 2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_cs.ts b/lang/tomahawk_cs.ts index 351764363..66b54bee3 100644 --- a/lang/tomahawk_cs.ts +++ b/lang/tomahawk_cs.ts @@ -374,17 +374,17 @@ se s vámi spojil? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 Promiňte, Tomahawku se nepodařilo najít skladbu '%1' od %2 - + Sorry, Tomahawk couldn't find the artist '%1' Promiňte, Tomahawku se nepodařilo najít umělce '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 Promiňte, Tomahawku se nepodařilo najít album '%1' od %2 @@ -3471,8 +3471,8 @@ služby Twitter zde zadejte tam zobrazené číslo PIN: - Copyright 2010 - 2012 - Autorské právo 2010 - 2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_de.ts b/lang/tomahawk_de.ts index 3d1ab5beb..43889c479 100644 --- a/lang/tomahawk_de.ts +++ b/lang/tomahawk_de.ts @@ -374,17 +374,17 @@ erlauben sich mit dir zu verbinden? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 Sorry, Tomahawk konnte '%1' von %2 nicht finden - + Sorry, Tomahawk couldn't find the artist '%1' Sorry, Tomahawk konnte den Künstler '%1' nicht finden - + Sorry, Tomahawk couldn't find the album '%1' by %2 Sorry, Tomahawk konnte das Album '%1' von %2 nicht finden @@ -3469,8 +3469,8 @@ Tomahawk auf Twitter's Website authentifiziert hast: - Copyright 2010 - 2012 - Copright 2010 - 2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_el.ts b/lang/tomahawk_el.ts index 7977a4025..8ec26200a 100644 --- a/lang/tomahawk_el.ts +++ b/lang/tomahawk_el.ts @@ -373,17 +373,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 - + Sorry, Tomahawk couldn't find the artist '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 @@ -3469,7 +3469,7 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 + Copyright 2010 - 2013 diff --git a/lang/tomahawk_en.ts b/lang/tomahawk_en.ts index c553282b5..7fd46c18b 100644 --- a/lang/tomahawk_en.ts +++ b/lang/tomahawk_en.ts @@ -374,17 +374,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 Sorry, Tomahawk couldn't find the track '%1' by %2 - + Sorry, Tomahawk couldn't find the artist '%1' Sorry, Tomahawk couldn't find the artist '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 Sorry, Tomahawk couldn't find the album '%1' by %2 @@ -3474,8 +3474,8 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 - Copyright 2010 - 2012 + Copyright 2010 - 2013 + Copyright 2010 - 2013 {2010 ?} diff --git a/lang/tomahawk_es.ts b/lang/tomahawk_es.ts index 44e6b5bbb..e8e9193d3 100644 --- a/lang/tomahawk_es.ts +++ b/lang/tomahawk_es.ts @@ -374,17 +374,17 @@ conectarse a usted y transmitir música? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 Tomahawk no pudo encontrar la pista '%1' de %2 - + Sorry, Tomahawk couldn't find the artist '%1' Tomahawk no pudo encontrar el artista '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 Tomahawk no pudo encontrar el álbum '%1' de %2 @@ -3474,8 +3474,8 @@ introduzca su número PIN aquí: - Copyright 2010 - 2012 - Copyright 2010-2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_fi.ts b/lang/tomahawk_fi.ts index 0c89f274d..1a1c3cad2 100644 --- a/lang/tomahawk_fi.ts +++ b/lang/tomahawk_fi.ts @@ -374,17 +374,17 @@ yhdistää ja toistaa sinulta virtaa? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 Valitettavasti Tomahawk ei löytänyt artistin %2 kappaletta ”%1” - + Sorry, Tomahawk couldn't find the artist '%1' Valitettavasti Tomahawk ei löytänyt artistia ”%1” - + Sorry, Tomahawk couldn't find the album '%1' by %2 Valitettavasti Tomahawk ei löytänyt artistin %2 albumia ”%1” @@ -3477,8 +3477,8 @@ anna siellä näytetty PIN-koodi tähän: - Copyright 2010 - 2012 - Copyright 2010–2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_fr.ts b/lang/tomahawk_fr.ts index 6efbec2f2..59a485ddf 100644 --- a/lang/tomahawk_fr.ts +++ b/lang/tomahawk_fr.ts @@ -374,17 +374,17 @@ de se connecter et streamer de vous? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 Désolé, on a pas pu trouver la piste '%1' pour %2 - + Sorry, Tomahawk couldn't find the artist '%1' Désolé, on a pas pu trouver l'artiste '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 Désolé, on a pas pu trouver l'album '%1' pour %2 @@ -3471,8 +3471,8 @@ saisissez le numéro PIN ici : - Copyright 2010 - 2012 - Droit d'auteur 2010 - 2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_gl.ts b/lang/tomahawk_gl.ts index bc958c7ab..d16b9dbf4 100644 --- a/lang/tomahawk_gl.ts +++ b/lang/tomahawk_gl.ts @@ -124,7 +124,7 @@ connect and stream from you? &Listen Publicly - &Escoutar en público + &Escoitar en público @@ -224,7 +224,7 @@ connect and stream from you? &View Logfile - + &Ver o ficheiro de rexistro @@ -373,17 +373,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 Tomahawk non atopa a pista «%1» de %2 - + Sorry, Tomahawk couldn't find the artist '%1' - Tomahawl non atopa o artista «%1» + Tomahawk non atopa o artista «%1» - + Sorry, Tomahawk couldn't find the album '%1' by %2 Tomahawk non atopa o álbum «%1» de %2 @@ -463,7 +463,7 @@ connect and stream from you? Send this report - Envíar este informe + Enviar este informe @@ -543,7 +543,7 @@ connect and stream from you? Open &Log-file - Abrir o ficheiro de &rexístro + Abrir o ficheiro de &rexistro @@ -621,22 +621,22 @@ connect and stream from you? Artist Familiarity - Familiraridade do artista + Familiaridade do artista By Description - Por descripción + Por descrición Enter a description - Introducir unha descripción + Introducir unha descrición Apply steering command - Aplicar o comando de direción + Aplicar o comando de dirección @@ -662,7 +662,7 @@ connect and stream from you? This playlist is currently empty. Add some tracks to it and enjoy the music! - Esta lista de reprodución está baleira. Engádelle algunhas pistas para desfrutar da música! + Esta lista de reprodución está baleira. Engádelle algunhas pistas para gozar da música! @@ -706,7 +706,7 @@ connect and stream from you? Import Playback History - Importar o historial de reproducióis + Importar o historial de reproducións @@ -781,7 +781,7 @@ connect and stream from you? Saved tracks - PIstas gardadas + Pistas gardadas @@ -804,7 +804,7 @@ connect and stream from you? All of your loved tracks - Todas as pistas que che gustarn + Todas as pistas que che gustaron @@ -940,7 +940,7 @@ connect and stream from you? Just enter a genre or tag name and Tomahawk will suggest a few songs to get you started with your new playlist: - Só introduce un xéneor ou unha etiqueta e Tomahawk suxerirache unhas cantas cancións para que comeces cunha nova lista de reprodución: + Só introduce un xénero ou unha etiqueta e Tomahawk suxerirache unhas cantas cancións para que comeces cunha nova lista de reprodución: @@ -1021,42 +1021,42 @@ connect and stream from you? Accuracy - + Precisión Perfect match - + Coincidencia perfecta Very good match - + Coincidencia moi boa Good match - + Boa coincidencia Vague match - + Parcialmente coincidente Bad match - + Mala coincidencia Very bad match - + Nada coincidentes Not available - + Non está dispoñíbel @@ -1084,31 +1084,31 @@ connect and stream from you? played %1 by you e.g. played 3 hours ago by you - + reproduciu %3 horas atrás por ti played %1 by %2 e.g. played 3 hours ago by SomeSource - + reproduciu % por %2 added %1 e.g. added 3 hours ago - + engadiu %1 by <b>%1</b> e.g. by SomeArtist - + por <b>%1</b> by <b>%1</b> on <b>%2</b> e.g. by SomeArtist on SomeAlbum - + by <b>%1</b> on <b>%2</b> @@ -1150,7 +1150,7 @@ connect and stream from you? Don't know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you! - Non sabes exactamente o que queres? Dalle a Tomahawk algunhas ideas e deixalle que che faga unha lista de reprodución para ti! + Non sabes exactamente o que queres? Dálle a Tomahawk algunhas ideas e déixalle que che faga unha lista de reprodución para ti! @@ -1183,7 +1183,7 @@ connect and stream from you? This playlist is currently empty. Add some tracks to it and enjoy the music! - Esta lista de reprodución está agora mesmo baleira. Engádelle unhas pistas para desfrutar da música! + Esta lista de reprodución está agora mesmo baleira. Engádelle unhas pistas para gozar da música! @@ -1251,52 +1251,52 @@ connect and stream from you? %n year(s) ago - %n ano(s) atrás + %n ano(s) atrás%n ano(s) atrás %n year(s) - %n ano(s) + %n ano(s)%n ano(s) %n month(s) ago - %n mes(es) atrás + %n mes(es) atrás%n mes(es) atrás %n month(s) - %n mes(es) + %n mes(es)%n mes(es) %n week(s) ago - %n semana(s) atrás + %n semana(s) atrás%n semana(s) atrás %n week(s) - %n semana(s) + %n semana(s)%n semana(s) %n day(s) ago - %n día(s) atrás + %n día(s) atrás%n día(s) atrás %n day(s) - %n día(s) + %n día(s)%n día(s) %n hour(s) ago - %n hora(s) atrás + %n hora(s) atrás%n hora(s) atrás %n hour(s) - %n hora(s) + %n hora(s)%n hora(s) @@ -1332,13 +1332,13 @@ connect and stream from you? %1 Config - + %1 Configuración %1 Configuration - + %1 Configuración @@ -1360,7 +1360,7 @@ connect and stream from you? Open Queue - %n item(s) - Abrir a ringleira - %n elemento(s) + Abrir a ringleira - %n elementoAbrir a ringleira - %n elementos @@ -1455,7 +1455,7 @@ connect and stream from you? Configure Tomahawk's advanced settings, including network connectivity settings, browser interaction and more. - Configurar as propiedades avanzadas de Tomahawks, incluíndo a conectividade a rede, a interacción co navegador e outras. + Configurar as propiedades avanzadas de Tomahawk, incluíndo a conectividade a rede, a interacción co navegador e outras. @@ -1506,12 +1506,12 @@ connect and stream from you? Use static external IP address/host name and port - + Empregar a dirección IP externa estática ou o nome de servidor e porto Set this to your external IP address or host name. Make sure to forward the port to this host! - + Define isto para a túa dirección IP externa ou nome de servidor. Asegúrate de que remitir o porto a este servidor! @@ -1556,7 +1556,7 @@ connect and stream from you? Show notification when a new song starts to play - + Mostrar notificacións cando se comece a reproducir unha nova canción @@ -1577,7 +1577,7 @@ connect and stream from you? 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. - O Echo Nest soporta estar ao tanto do teu catálogo de metadatos e empregalo para artellar rádios personalizadas. Activando esta opción podes (e tódolos teus amigos) crear listas de reprodución automática e emisoras baseandose nos perfís de gustos persoais. + O Echo Nest soporta estar ao tanto do teu catálogo de metadatos e empregalo para artellar radios personalizadas. Activando esta opción podes (e tódolos teus amigos) crear listas de reprodución automática e emisoras baseándose nos perfís de gustos persoais. @@ -1641,7 +1641,7 @@ connect and stream from you? Tweet - Chio + Chío @@ -1689,7 +1689,7 @@ connect and stream from you? All available tracks - Tódolas pistas dispoñíbeis + Tódalas pistas dispoñíbeis @@ -1763,7 +1763,7 @@ connect and stream from you? Latest additions to your collection - Os últimos engadidos á túa coleción + Os últimos engadidos á túa colección @@ -1950,7 +1950,7 @@ connect and stream from you? Username or Facebook Email - Nome de usuario ou correo electrónico de Fabook + Nome de usuario ou correo electrónico de Facebook @@ -1970,7 +1970,7 @@ connect and stream from you? Sync Starred tracks to Loved tracks - + Sincronizar as pistas almacenadas coas pistas que che gustan @@ -2067,7 +2067,7 @@ connect and stream from you? Unfortunately, automatic installation of this resolver is not available or disabled for your platform.<br /><br />Please use "Install from file" above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:<br /><br />http://www.tomahawk-player.org/resolvers/%1 - Lamentablemente a instalación automatica deste resolvedor non está disponíbel ou está desactivado para a túa plataforma.<br/><br/>Usa o «instalar dende ficheiro» de arriba, buscándoo para a túa distribución ou compilándoo. Podes atopar máis intrucións aquí:<br/><br/>http://www.tomahawk-player.org/resolvers/%1 + Lamentablemente a instalación automática deste resolvedor non está dispoñíbel ou está desactivado para a túa plataforma.<br/><br/>Usa o «instalar dende ficheiro» de arriba, buscándoo para a túa distribución ou compilándoo. Podes atopar máis instrucións aquí:<br/><br/>http://www.tomahawk-player.org/resolvers/%1 @@ -2124,7 +2124,7 @@ connect and stream from you? Scrobble your tracks to last.fm, and find freely downloadable tracks to play - + Rexistra as túas escoitas en last.fm e atopa pistas para descargar gratis e reproducilas @@ -2154,7 +2154,7 @@ connect and stream from you? History Incomplete. Resume Text on a button that resumes import - Historial incompleto. Reanudando + Historial incompleto. Reiniciar @@ -2228,7 +2228,7 @@ connect and stream from you? Disable Spotify collaborations - Descativar as colaboracións con Spotify + Desactivar as colaboracións con Spotify @@ -2341,7 +2341,7 @@ Podes volver a probar a acceder. Global Tweet - Chio global + Chío global @@ -2379,7 +2379,7 @@ Proba a volver a autenticarte. Your saved credentials could not be verified. You may wish to try re-authenticating. - Gardaches redenciais que non se poden comprobar. + Gardaches credenciais que non se poden comprobar. Proba a volver a autenticarte. @@ -2402,7 +2402,7 @@ Proba a volver a autenticarte. There was an error posting your direct message -- sorry! - Houbo un erro ao envíar a túa mensaxe directa .-- mágoa! + Houbo un erro ao enviar a túa mensaxe directa .-- mágoa! @@ -2424,7 +2424,7 @@ Proba a volver a autenticarte. Local Network - + Rede local @@ -2432,7 +2432,7 @@ Proba a volver a autenticarte. Local Network - + Rede local @@ -2475,19 +2475,19 @@ Proba a volver a autenticarte. &Go to "%1" - + &Ir a «%1» Go to "%1" - + Ir a «%1» &Copy Track Link - + &Copiar a ligazón da pista @@ -2607,7 +2607,7 @@ Cambia os filtros e proba de novo. Add some filters above, and press Generate to get started! - Engade algúns filtros enriba e preme Xenerar para comezar! + Engade algúns filtros enriba e preme xerar para comezar! @@ -2730,22 +2730,22 @@ Proba a trocar os filtros para ter outra lista música para escoitar. E Flat - + Mi bemol E - E + Mi F - F + Fa F Sharp - + Fa sostido @@ -2755,22 +2755,22 @@ Proba a trocar os filtros para ter outra lista música para escoitar. A Flat - + La bemol A - A + La B Flat - + Mi bemol B - B + Si @@ -2867,7 +2867,7 @@ Proba a trocar os filtros para ter outra lista música para escoitar. from no one - de niguén + de ninguén @@ -2877,7 +2877,7 @@ Proba a trocar os filtros para ter outra lista música para escoitar. from my radio - + dende a miña radio @@ -2887,37 +2887,37 @@ Proba a trocar os filtros para ter outra lista música para escoitar. Variety - + Variedade Adventurousness - + Ao aventureiro very low - + moi baixa low - + baixa moderate - + moderada high - + alta very high - + moi alta @@ -2932,7 +2932,7 @@ Proba a trocar os filtros para ter outra lista música para escoitar. about %n minute(s) long - cerca de %n minuto(s) de longa + cerca de %n minuto(s) de longacerca de %n minuto(s) de longa @@ -3147,17 +3147,17 @@ Proba a trocar os filtros para ter outra lista música para escoitar. %n other(s) - + %n diferente%n diferentes %n people - + %n persoa%n persoas loved this track - gustóuvos esta pista + gustouvos esta pista @@ -3181,7 +3181,7 @@ Proba a trocar os filtros para ter outra lista música para escoitar. Track '%1' by %2 is not streamable. - + A pista «%1» de %2 non se pode pór en fluxo. @@ -3241,7 +3241,7 @@ Proba a trocar os filtros para ter outra lista música para escoitar. Automatically update from XSPF - Actualizar automáticamente de XSPF + Actualizar automaticamente de XSPF @@ -3263,7 +3263,7 @@ Proba a trocar os filtros para ter outra lista música para escoitar. After authenticating on Twitter's web site, enter the displayed PIN number here: - Despois de autentificarse na páxina web de Twitter, introduce o número PIN que se mostrase aquí: + Despois de autenticase na páxina web de Twitter, introduce o número PIN que se mostrase aquí: @@ -3271,7 +3271,7 @@ enter the displayed PIN number here: Local Network - + Rede local @@ -3348,7 +3348,7 @@ enter the displayed PIN number here: Go forward one page - Ir unha páxian adiante + Ir unha páxina adiante @@ -3365,7 +3365,7 @@ enter the displayed PIN number here: Search for any artist, album or song... - + Buscar a calquera artista, álbum ou canción... @@ -3446,7 +3446,7 @@ enter the displayed PIN number here: Error connecting to SIP: Authentication failed! - Erro conectándose a SIP: Fallou a autentificación! + Erro conectándose a SIP: Fallou a autenticación! @@ -3472,8 +3472,8 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 - Copyright 2010 - 2012 + Copyright 2010 - 2013 + @@ -3509,12 +3509,12 @@ enter the displayed PIN number here: You've listened to this track %n time(s). - Escoitaches esta pista %n vece(s). + Escoitaches esta pista %n vece(s).Escoitaches esta pista %n vece(s). You've never listened to this track before. - Nunca antes escoutaras esta pista. + Nunca antes escoitaras esta pista. @@ -3524,7 +3524,7 @@ enter the displayed PIN number here: You've listened to %1 %n time(s). - Escoitaches %1 %n veces. + Escoitaches %1 %n veces.Escoitaches %1 %n veces. @@ -3596,27 +3596,27 @@ enter the displayed PIN number here: Configure this Twitter account - + Configura esta conta de Twitter The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account. - + Este engadido de Twitter permíteche descubrir e reproducir música que estean a escoitar as túas amizades do Twitter, e tamén publicar mensaxes na túa conta. Status: No saved credentials - + Estado: sen credenciais gardadas Authenticate with Twitter - + Autenticarse con Twitter Twitter Connections - + Conexións de Twitter @@ -3626,32 +3626,37 @@ 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. - + +Se só queres chiar, xa está feito. + +Se queres conectar o Tomahawk coas túas amizades usando o Twitter, escolle o tipo de chío e preme no botón de embaixo para enviar unha mensaxe sincronizada. Ambos teredes que vos seguir mutuamente xa que se empregarán Mensaxes Directas. Logo, se moi paciente e agarda -- pode tardar varios minutos! + +Podes reenviar e sincronizar as mensaxes en calquera momento simplemente enviando outro chío empregando o botón. Select the kind of tweet you would like, then press the button to post it: - + Escolle o tipo de chíos que queres e despois preme no botón para publicalo. Global Tweet - + Chío global @Mention - + @Mención Direct Message - + Mensaxe Directo e.g. @tomahawk - + p.ex @tomahawk @@ -3664,7 +3669,7 @@ You can re-send a sync message at any time simply by sending another tweet using Enter Twitter username - + Introduce o teu nome de usuario de Twitter @@ -3672,27 +3677,27 @@ You can re-send a sync message at any time simply by sending another tweet using This playlist is empty! - + Esta lista de reprodución está baleira! After you have scanned your music collection you will find your tracks right here. - + Cando teñas a colección de música escaneada as pistas aparecerán aquí. This collection is empty. - + Esta colección está baleira. SuperCollection - + Supercolección Combined libraries of all your online friends - + Bibliotecas combinadas de todas as túas amizades @@ -3702,12 +3707,12 @@ You can re-send a sync message at any time simply by sending another tweet using Recently played tracks from all your friends - + Pistas escoitadas recentemente polas túas amizades Sorry, we could not find any recent plays! - + Non se atoparan reproducións recentes! @@ -3715,12 +3720,12 @@ You can re-send a sync message at any time simply by sending another tweet using Recent Additions - + Engadidos recentemente Newest Stations & Playlists - + Novas estacións e listas de reprodución @@ -3735,12 +3740,12 @@ You can re-send a sync message at any time simply by sending another tweet using No recently created playlists in your network. - + Non hai listas creadas recentemente na túa rede. Welcome to Tomahawk - + Benvidos a Tomahawk @@ -3766,26 +3771,28 @@ You can re-send a sync message at any time simply by sending another tweet using Terms for %1: - + +Termos para %1: No terms found, sorry. - + Non se atoparon termos. Hotttness for %1: %2 - + +Popularidade de %1: %2 Familiarity for %1: %2 - + Familiaridade con %1: %2 @@ -3794,7 +3801,9 @@ Lyrics for "%1" by %2: %3 - + Letras para «%1» por %2: + +%3 @@ -3802,17 +3811,17 @@ Lyrics for "%1" by %2: Failed to parse contents of XSPF playlist - + Fallouse ao procesar os contidos da lista de reprodución XSPF Some playlist entries were found without artist and track name, they will be omitted - + Algunhas entradas da lista de reprodución atopáronse sen artistas e nomes de pista co cal omitiranse. Failed to fetch the desired playlist from the network, or the desired file does not exist - + Ou ben fallou a busca da lista de reprodución que querías na rede ou o ben ese ficheiro non existe @@ -3825,7 +3834,7 @@ Lyrics for "%1" by %2: Xml stream console - + Consola de fluxo de xml @@ -3846,27 +3855,27 @@ Lyrics for "%1" by %2: By JID - + Por JID By namespace uri - + Pola uri de espazo de nomes By all attributes - + Por todos os atributos Visible stanzas - + Stanzas visibles Information query - + Consulta de información @@ -3891,12 +3900,12 @@ Lyrics for "%1" by %2: Save XMPP log to file - + Gardar o ficheiro de rexistro XMPP OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt) - + Formato OpenDocument (*.odf);; Ficheiro HTML (*.html);;Texto plano (*.txt) @@ -3904,32 +3913,32 @@ Lyrics for "%1" by %2: Xmpp Configuration - + Configuración de Xmpp Configure this Xmpp account - + Configurar esta conta Xmpp Enter your Xmpp login to connect with your friends using Tomahawk! - + Introduce o teu rexistro de usuario Xmpp para conectar coas túas amizades empregando o Tomahawk! Login Information - Información de autentificación + Información de autenticación Xmpp ID: - + ID Xmpp: e.g. user@example.com - + p.ex usuario@trasno.net @@ -3939,12 +3948,12 @@ Lyrics for "%1" by %2: An account with this name already exists! - + Xa existe unha conta con este nome! Advanced Xmpp Settings - + Configuración de Xmpp avanzada @@ -3959,17 +3968,17 @@ Lyrics for "%1" by %2: Lots of servers don't support this (e.g. GTalk, jabber.org) - + Moitos dos servidores non admiten isto (p.ex GTalk, jabber.org) Publish currently playing track - + Publicar a pista que se está a escoitar agora Enforce secure connection - + Forzar a conexión segura @@ -3977,17 +3986,17 @@ Lyrics for "%1" by %2: User Interaction - + Interacción de usuarios Host is unknown - + Descoñécese o servidor Item not found - + Elemento non encontrado @@ -3997,12 +4006,12 @@ Lyrics for "%1" by %2: Remote Stream Error - + Remote Connection failed - + Fallou a conexión remota @@ -4027,32 +4036,32 @@ Lyrics for "%1" by %2: Do you want to add <b>%1</b> to your friend list? - + Queres engadir |b>%1</b> a túa lista de amizades? No Compression Support - + Non se soporta a compresión Enter Jabber ID - + Introducir a ID de Jabber No Encryption Support - + Non se soporta o encriptado No Authorization Support - + Non hai soporte de autorización No Supported Feature - + Característica non soportada @@ -4062,7 +4071,7 @@ Lyrics for "%1" by %2: Enter Xmpp ID: - + Introduce a ID de XMPP: @@ -4077,12 +4086,12 @@ Lyrics for "%1" by %2: 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! - + Síntocho -- Son unha mensaxe automática empregada por Tomahawk Player (http://gettomahawk.com). Se ves esta mensaxe é porque a quen te dirixes case seguro non está conectado. Inténtao máis tarde! Authorize User - + Autorizar o usuario @@ -4090,17 +4099,17 @@ Lyrics for "%1" by %2: Local Network configuration - + Configuración da rede local This plugin will automatically find other users running Tomahawk on your local network - + Este engadido automaticamente atopa outros usuario que empreguen Tomahawk na mesma rede local Connect automatically when Tomahawk starts - + Conectarse automaticamente cando Tomahawk se inicie \ No newline at end of file diff --git a/lang/tomahawk_hi_IN.ts b/lang/tomahawk_hi_IN.ts index b1f2261d7..b72fa3ebb 100644 --- a/lang/tomahawk_hi_IN.ts +++ b/lang/tomahawk_hi_IN.ts @@ -373,17 +373,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 - + Sorry, Tomahawk couldn't find the artist '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 @@ -3461,7 +3461,7 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 + Copyright 2010 - 2013 diff --git a/lang/tomahawk_hu.ts b/lang/tomahawk_hu.ts index 18dada1f0..4df900563 100644 --- a/lang/tomahawk_hu.ts +++ b/lang/tomahawk_hu.ts @@ -373,17 +373,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 - + Sorry, Tomahawk couldn't find the artist '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 @@ -3461,7 +3461,7 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 + Copyright 2010 - 2013 diff --git a/lang/tomahawk_it.ts b/lang/tomahawk_it.ts index 2bc350e2b..772e0c13c 100644 --- a/lang/tomahawk_it.ts +++ b/lang/tomahawk_it.ts @@ -373,17 +373,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 - + Sorry, Tomahawk couldn't find the artist '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 @@ -3461,8 +3461,8 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 - Copyright 2010 - 2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_ja.ts b/lang/tomahawk_ja.ts index 7689614d2..388b4ea6a 100644 --- a/lang/tomahawk_ja.ts +++ b/lang/tomahawk_ja.ts @@ -373,17 +373,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 Tomahawkは%2の%1を見つかりませんでした。 - + Sorry, Tomahawk couldn't find the artist '%1' Tomahawkは'%1'と言うアーティストを見つかりませんでした。 - + Sorry, Tomahawk couldn't find the album '%1' by %2 Tomahawkは%2の%1を見つかりませんでした。 @@ -3474,8 +3474,8 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 - Copyright 2010 - 2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_lt.ts b/lang/tomahawk_lt.ts index 2a5fa27df..690fd9fc1 100644 --- a/lang/tomahawk_lt.ts +++ b/lang/tomahawk_lt.ts @@ -373,17 +373,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 Atsiprašome, Tomahawk nepavyko rasti takelio '%1', atliekamo %2 - + Sorry, Tomahawk couldn't find the artist '%1' Atsiprašome, Tomahawk nepavyko rasti atlikėjo '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 Atsiprašome, Tomahawk nepavyko rasti %2 atliekamo albumo '%1' @@ -3461,8 +3461,8 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 - Autorinės teisės 2010 - 2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_pl.ts b/lang/tomahawk_pl.ts index 47c4e243b..838cb1437 100644 --- a/lang/tomahawk_pl.ts +++ b/lang/tomahawk_pl.ts @@ -374,17 +374,17 @@ połączyć się i strumieniować od ciebie? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 Przepraszamy, Tomahawk nie mógł znaleźć utworu '%1' wykonawcy %2 - + Sorry, Tomahawk couldn't find the artist '%1' Przepraszamy, Tomahawk nie mógł znaleźć wykonawcy '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 Przepraszamy, Tomahawk nie mógł znaleźć albumu '%1' wykonawcy %2 @@ -3471,8 +3471,8 @@ wprowadź pokazany numer PIN tutaj: - Copyright 2010 - 2012 - Copyright 2010 - 2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_pt_BR.ts b/lang/tomahawk_pt_BR.ts index a309d1b19..b89cfc5f9 100644 --- a/lang/tomahawk_pt_BR.ts +++ b/lang/tomahawk_pt_BR.ts @@ -374,17 +374,17 @@ se conecte e faça o stream de você? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 Desculpe, o Tomahawk não encontrou a faixa '%1' de %2 - + Sorry, Tomahawk couldn't find the artist '%1' Desculpe, o Tomahawk não encontrou o artista '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 Desculpe, o Tomahawk não encontrou o álbum '%1' de %2 @@ -3471,8 +3471,8 @@ colocar o número PIN mostrado aqui: - Copyright 2010 - 2012 - Copyright 2010 - 2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_ru.ts b/lang/tomahawk_ru.ts index e182a34a2..26e38532e 100644 --- a/lang/tomahawk_ru.ts +++ b/lang/tomahawk_ru.ts @@ -378,17 +378,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 К сожалению, Tomahawk не смог найти песню '%1' %2 - + Sorry, Tomahawk couldn't find the artist '%1' К сожалению, Tomahawk не смог найти исполнителя '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 К сожалению, Tomahawk не смог найти альбом '%1' %2 @@ -398,7 +398,7 @@ connect and stream from you? Create new Playlist - Создать новый Плейлист + Создать Новый Плейлист @@ -463,7 +463,7 @@ connect and stream from you? <html><head/><body><p><span style=" font-weight:600;">Sorry!</span> Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.</p></body></html> - + <html><head/><body><p><span style=" font-weight:600;">Простите!</span> Tomahawk сломался :). Пожалуйста, сообщите нам об этом! Tomahawk создал отчет об ошибке, который поможет улучшить стабильность в будущем. Теперь Вы можете отправить отчет непосредственно разработчикам Tomahawk. Спасибо за помощь! </p></body></html> @@ -616,12 +616,12 @@ connect and stream from you? Song Hotttnesss - + Song Hotttnesss Artist Hotttnesss - + Artist Hotttnesss @@ -696,7 +696,7 @@ connect and stream from you? Username: - Имя пользователя: + Имя Пользователя: @@ -804,7 +804,7 @@ connect and stream from you? The most loved tracks from all your friends - Любимые песни ваших друзей + Любимые Песни Вас и Ваших Друзей @@ -814,7 +814,7 @@ connect and stream from you? All of %1's loved tracks - Все из %1 любимые песни + Все Любимые Песни %1 @@ -1036,12 +1036,12 @@ connect and stream from you? Very good match - Очень хорошое совпадение + Очень Хорошое Good match - Хорошое совпадение + Хорошое @@ -1145,7 +1145,7 @@ connect and stream from you? New Playlist - Новый плейлист + Новый Плейлист @@ -1365,7 +1365,7 @@ connect and stream from you? Open Queue - %n item(s) - + Открыть %n в ОчередиОткрыть %n в ОчередиОткрыть %n в Очереди @@ -1763,7 +1763,7 @@ connect and stream from you? SuperCollection - Общая коллекция + Общая Коллекция @@ -1910,12 +1910,12 @@ connect and stream from you? My Music - Моя музыка + Моя Музыка SuperCollection - Общая коллекция + Общая Коллекция @@ -2455,7 +2455,7 @@ You may wish to try re-authenticating. Add to &Queue - Добавить В &Очередь + Добавить в &Очередь @@ -2465,7 +2465,7 @@ You may wish to try re-authenticating. Stop Playback after this &Track - Остановить воспроизведение после этого &Песни + Остановить Воспроизведение После Этой &Песни @@ -2505,7 +2505,7 @@ You may wish to try re-authenticating. Un-&Love - &Не Любимая + &НеЛюбимая @@ -2660,7 +2660,7 @@ Try tweaking the filters for a new set of songs to play. Less - Ьеньше + Менее @@ -2873,7 +2873,7 @@ Try tweaking the filters for a new set of songs to play. My Collection - Моя коллекция + Моя Коллекция @@ -2888,12 +2888,12 @@ Try tweaking the filters for a new set of songs to play. Variety - + Variety Adventurousness - + Adventurousness @@ -2933,7 +2933,7 @@ Try tweaking the filters for a new set of songs to play. about %n minute(s) long - + Продолжительность около %n минутыПродолжительность около %n минутПродолжительность около %n минут @@ -3072,7 +3072,7 @@ Try tweaking the filters for a new set of songs to play. New Playlist - Новый плейлист + Новый Плейлист @@ -3148,12 +3148,12 @@ Try tweaking the filters for a new set of songs to play. %n other(s) - + %n другой%n другие%n другие %n people - + %n человек%n человека%n человек @@ -3250,7 +3250,7 @@ Try tweaking the filters for a new set of songs to play. My Collection - Моя коллекция + Моя Коллекция @@ -3316,7 +3316,7 @@ enter the displayed PIN number here: Un-&Love - &Нелюбимая + &НеЛюбимая @@ -3411,7 +3411,7 @@ enter the displayed PIN number here: Create New Station - Создать новую станцию + Создать Новую Станцию @@ -3472,8 +3472,8 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 - Авторское право 2010 - 2012 + Copyright 2010 - 2013 + @@ -3509,7 +3509,7 @@ enter the displayed PIN number here: You've listened to this track %n time(s). - Слушал эту песню %n раз.Слушал эту песню %n раз.Слушал эту песню %n раз. + Вы слушали эту песню %n раз.Вы слушали эту песню %n раз.Вы слушали эту песню %n раз. @@ -3574,7 +3574,7 @@ enter the displayed PIN number here: My Collection - Моя коллекция + Моя Коллекция @@ -3691,7 +3691,7 @@ You can re-send a sync message at any time simply by sending another tweet using SuperCollection - Общая коллекция + Общая Коллекция diff --git a/lang/tomahawk_sv.ts b/lang/tomahawk_sv.ts index b1deda860..47969e6e3 100644 --- a/lang/tomahawk_sv.ts +++ b/lang/tomahawk_sv.ts @@ -374,17 +374,17 @@ ansluta och strömma från dig? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 Tyvärr! Tomahawk kunde inte hitta spåret '%1' av %2 - + Sorry, Tomahawk couldn't find the artist '%1' Tyvärr! Tomahawk kunde inte hitta artisten '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 Tyvärr! Tomahawk kunde inte hitta albumet '%1' av %2 @@ -3471,8 +3471,8 @@ anger du PIN-koden här: - Copyright 2010 - 2012 - Copyright 2010-2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_tr.ts b/lang/tomahawk_tr.ts index f975e08e1..4c9f59548 100644 --- a/lang/tomahawk_tr.ts +++ b/lang/tomahawk_tr.ts @@ -373,17 +373,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 - + Sorry, Tomahawk couldn't find the artist '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 @@ -3461,7 +3461,7 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 + Copyright 2010 - 2013 diff --git a/lang/tomahawk_zh_CN.ts b/lang/tomahawk_zh_CN.ts index 99174698b..84eb991bc 100644 --- a/lang/tomahawk_zh_CN.ts +++ b/lang/tomahawk_zh_CN.ts @@ -373,17 +373,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 抱歉，Tomahawk 未找到 %2 的歌曲 '%1' - + Sorry, Tomahawk couldn't find the artist '%1' 抱歉，Tomahawk 无法找到艺术家 '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 抱歉，Tomahawk 无法找到 %2 的专辑 '%1' @@ -3472,8 +3472,8 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 - 版权所有 2010 - 2012 + Copyright 2010 - 2013 + diff --git a/lang/tomahawk_zh_TW.ts b/lang/tomahawk_zh_TW.ts index 89a55f44a..6cafd037f 100644 --- a/lang/tomahawk_zh_TW.ts +++ b/lang/tomahawk_zh_TW.ts @@ -373,17 +373,17 @@ connect and stream from you? AudioEngine - + Sorry, Tomahawk couldn't find the track '%1' by %2 - + Sorry, Tomahawk couldn't find the artist '%1' - + Sorry, Tomahawk couldn't find the album '%1' by %2 @@ -3461,7 +3461,7 @@ enter the displayed PIN number here: - Copyright 2010 - 2012 + Copyright 2010 - 2013 From ebcda30c96a39e84d5caf5f8ce3f813fe73466ec Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 04:32:27 +0100 Subject: [PATCH 09/28] * Temporary fixes until PlaylistChartItemDelegate becomes a proper PlaylistItemDelegate. --- .../playlist/PlaylistChartItemDelegate.cpp | 12 +++++------- src/libtomahawk/playlist/PlaylistChartItemDelegate.h | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp index 49c9cc7b9..eba7c3b97 100644 --- a/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp +++ b/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp @@ -59,10 +59,11 @@ PlaylistChartItemDelegate::PlaylistChartItemDelegate( TrackView* parent, Playabl m_bottomOption = QTextOption( Qt::AlignBottom ); m_bottomOption.setWrapMode( QTextOption::NoWrap ); + connect( this, SIGNAL( updateIndex( QModelIndex ) ), parent, SLOT( update( QModelIndex ) ) ); + connect( m_model, SIGNAL( modelReset() ), this, SLOT( modelChanged() ) ); if ( PlaylistView* plView = qobject_cast< PlaylistView* >( parent ) ) connect( plView, SIGNAL( modelChanged() ), this, SLOT( modelChanged() ) ); - } @@ -91,11 +92,8 @@ PlaylistChartItemDelegate::sizeHint( const QStyleOptionViewItem& option, const Q stretch = 2; } - if ( index.isValid() ) - { - int rowHeight = option.fontMetrics.height() + 8; - size.setHeight( rowHeight * stretch ); - } + int rowHeight = option.fontMetrics.height() + 8; + size.setHeight( rowHeight * stretch ); return size; } @@ -241,7 +239,7 @@ PlaylistChartItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& void PlaylistChartItemDelegate::doUpdateIndex( const QPersistentModelIndex& idx ) { - emit updateRequest( idx ); + emit updateIndex( idx ); } diff --git a/src/libtomahawk/playlist/PlaylistChartItemDelegate.h b/src/libtomahawk/playlist/PlaylistChartItemDelegate.h index 87017d453..ffa642bd6 100644 --- a/src/libtomahawk/playlist/PlaylistChartItemDelegate.h +++ b/src/libtomahawk/playlist/PlaylistChartItemDelegate.h @@ -43,7 +43,7 @@ public: PlaylistChartItemDelegate( TrackView* parent = 0, PlayableProxyModel* proxy = 0 ); signals: - void updateRequest( const QModelIndex& idx ); + void updateIndex( const QModelIndex& idx ); protected: void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const; From ee13c256072281987b266ec95796ab71a2268228 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 04:33:07 +0100 Subject: [PATCH 10/28] * Manual signal connect is obsolete. --- src/libtomahawk/widgets/WhatsHotWidget.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libtomahawk/widgets/WhatsHotWidget.cpp b/src/libtomahawk/widgets/WhatsHotWidget.cpp index 31704a062..68a7a09bd 100644 --- a/src/libtomahawk/widgets/WhatsHotWidget.cpp +++ b/src/libtomahawk/widgets/WhatsHotWidget.cpp @@ -81,7 +81,6 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent ) ui->tracksViewLeft->setHeaderHidden( true ); ui->tracksViewLeft->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); PlaylistChartItemDelegate* del = new PlaylistChartItemDelegate( ui->tracksViewLeft, ui->tracksViewLeft->proxyModel() ); - connect( del, SIGNAL( updateRequest( QModelIndex ) ), ui->tracksViewLeft, SLOT( update( QModelIndex ) ) ); ui->tracksViewLeft->setItemDelegate( del ); ui->tracksViewLeft->setUniformRowHeights( false ); From 34da802874ddac70cce523981745c9bda222080d Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 04:33:23 +0100 Subject: [PATCH 11/28] * Use an AlbumItemDelegate for Artist page. --- src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index 9302482e7..9cb1d7aff 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -25,6 +25,7 @@ #include "audio/AudioEngine.h" #include "playlist/GridItemDelegate.h" +#include "playlist/AlbumItemDelegate.h" #include "playlist/PlayableModel.h" #include "playlist/TreeModel.h" #include "playlist/PlaylistModel.h" @@ -76,7 +77,10 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* ui->topHits->setSortingEnabled( false ); ui->topHits->setEmptyTip( tr( "Sorry, we could not find any top hits for this artist!" ) ); ui->topHits->setAutoResize( true ); - + + AlbumItemDelegate* del = new AlbumItemDelegate( ui->topHits, ui->topHits->proxyModel() ); + ui->topHits->setPlaylistItemDelegate( del ); + ui->relatedArtists->setAutoFitItems( false ); ui->relatedArtists->setWrapping( false ); ui->relatedArtists->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); From 04175de726a9f488dfb9ec46fecdf1af16f772f1 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 05:07:31 +0100 Subject: [PATCH 12/28] * Use the same color for drawing charts-position & album-position. --- src/libtomahawk/playlist/AlbumItemDelegate.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/playlist/AlbumItemDelegate.cpp b/src/libtomahawk/playlist/AlbumItemDelegate.cpp index 2ba6700e2..51d75bf08 100644 --- a/src/libtomahawk/playlist/AlbumItemDelegate.cpp +++ b/src/libtomahawk/playlist/AlbumItemDelegate.cpp @@ -118,12 +118,12 @@ AlbumItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, QFontMetrics smallBoldFontMetrics( smallBoldFont ); painter->setFont( boldFont ); - painter->setPen( option.palette.text().color().lighter() ); + painter->setPen( option.palette.text().color().lighter( 450 ) ); QRect figureRect = r.adjusted( 4, 0, 0, 0 ); figureRect.setWidth( QFontMetrics( painter->font() ).width( "888" ) ); painter->drawText( figureRect, QString::number( index.row() + 1 ), QTextOption( Qt::AlignCenter ) ); - + r.adjust( figureRect.width() + 12, 0, 0, 0 ); QRect leftRect = r.adjusted( 0, 0, -48, 0 ); QRect rightRect = r.adjusted( r.width() - smallBoldFontMetrics.width( TomahawkUtils::timeToString( duration ) ), 0, 0, 0 ); From d9dbc7f1607e3c876d8d159ca501edaa0dd736b9 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 05:55:12 +0100 Subject: [PATCH 13/28] * Support external links in artist biographies. --- .../widgets/infowidgets/ArtistInfoWidget.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index 9cb1d7aff..e05b7d392 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -20,6 +20,7 @@ #include "ArtistInfoWidget.h" #include "ui_ArtistInfoWidget.h" +#include #include #include @@ -324,7 +325,15 @@ void ArtistInfoWidget::onBiographyLinkClicked( const QUrl& url ) { tDebug() << Q_FUNC_INFO << url; - GlobalActionManager::instance()->parseTomahawkLink( url.toString() ); + + if ( url.scheme() == "tomahawk" ) + { + GlobalActionManager::instance()->parseTomahawkLink( url.toString() ); + } + else + { + QDesktopServices::openUrl( url ); + } } From ecec703191af772ce775fac400e53695c90c1760 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 06:14:35 +0100 Subject: [PATCH 14/28] * Fixed Artist & Album page layout when the items don't fill up the entire view. --- .../widgets/infowidgets/AlbumInfoWidget.ui | 33 ++++++------- .../widgets/infowidgets/ArtistInfoWidget.ui | 49 +++++++------------ 2 files changed, 33 insertions(+), 49 deletions(-) diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui index a4d3b1b66..f931cbde4 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui @@ -13,7 +13,7 @@ Form - + 16 @@ -73,12 +73,6 @@ - - - 0 - 0 - - QFrame::StyledPanel @@ -126,12 +120,6 @@ 0 - - - 0 - 300 - - true @@ -142,12 +130,6 @@ - - - 0 - 0 - - QFrame::StyledPanel @@ -207,6 +189,19 @@ + + + + Qt::Vertical + + + + 20 + 0 + + + + diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui index 3ad93f889..5f78b702a 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui @@ -13,7 +13,7 @@ Form - + 16 @@ -73,12 +73,6 @@ - - - 0 - 0 - - QFrame::StyledPanel @@ -126,12 +120,6 @@ 0 - - - 0 - 300 - - true @@ -142,12 +130,6 @@ - - - 0 - 0 - - QFrame::StyledPanel @@ -209,12 +191,6 @@ - - - 0 - 0 - - QFrame::StyledPanel @@ -274,6 +250,19 @@ + + + + Qt::Vertical + + + + 20 + 0 + + + + @@ -282,16 +271,16 @@ QListView
playlist/GridView.h
- - PlaylistView - QTreeView -
playlist/PlaylistView.h
- PlayableCover QLabel
widgets/PlayableCover.h
 + + PlaylistView + QTreeView +
playlist/PlaylistView.h
+ From dd79ffe7e778239d37fbb9361a5ebe3dc8021be9 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 06:18:05 +0100 Subject: [PATCH 15/28] * Always enfore the vertical scrollbar on Artist & Album pages to get rid of flickery resizing. --- src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp | 1 + src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index f18fb710b..8b66ca5a7 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -99,6 +99,7 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par QScrollArea* area = new QScrollArea(); area->setWidgetResizable( true ); + area->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); area->setWidget( widget ); area->setStyleSheet( "QScrollArea { background-color: #454e59; }" ); diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index e05b7d392..26864844a 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -122,6 +122,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* QScrollArea* area = new QScrollArea(); area->setWidgetResizable( true ); + area->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); area->setWidget( widget ); area->setStyleSheet( "QScrollArea { background-color: #454e59; }" ); From c832e63c59aeb6c8f664db1c82ce413566b3d03f Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 07:06:02 +0100 Subject: [PATCH 16/28] * Style fixes in WhatsHotWidget. --- src/libtomahawk/widgets/WhatsHotWidget.cpp | 59 ++++++++++------------ src/libtomahawk/widgets/WhatsHotWidget.h | 6 +-- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/src/libtomahawk/widgets/WhatsHotWidget.cpp b/src/libtomahawk/widgets/WhatsHotWidget.cpp index 68a7a09bd..ff66a5c18 100644 --- a/src/libtomahawk/widgets/WhatsHotWidget.cpp +++ b/src/libtomahawk/widgets/WhatsHotWidget.cpp @@ -103,12 +103,7 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent ) // Read last viewed charts, to be used as defaults m_currentVIds = TomahawkSettings::instance()->lastChartIds(); - qDebug() << "Got last chartIds:" << m_currentVIds; - - // TracksView is first shown, show spinner on that - // After fadeOut, charts are loaded - m_loadingSpinner = new AnimatedSpinner( ui->tracksViewLeft ); - m_loadingSpinner->fadeIn(); + tDebug( LOGVERBOSE ) << "Re-loading last chartIds:" << m_currentVIds; MetaPlaylistInterface* mpl = new MetaPlaylistInterface(); mpl->addChildInterface( ui->tracksViewLeft->playlistInterface() ); @@ -120,14 +115,15 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent ) WhatsHotWidget::~WhatsHotWidget() { - qDebug() << "Deleting whatshot"; + tDebug( LOGVERBOSE ) << Q_FUNC_INFO; + // Write the settings - qDebug() << "Writing chartIds to settings:" << m_currentVIds; TomahawkSettings::instance()->setLastChartIds( m_currentVIds ); + qDeleteAll( m_workers ); m_workers.clear(); m_workerThread->exit( 0 ); - m_playlistInterface.clear(); + delete ui; } @@ -212,7 +208,7 @@ WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestDat { case InfoSystem::InfoChartCapabilities: { - QStandardItem *rootItem= m_crumbModelLeft->invisibleRootItem(); + QStandardItem* rootItem= m_crumbModelLeft->invisibleRootItem(); QVariantMap defaults; if ( returnedData.contains( "defaults" ) ) defaults = returnedData.take( "defaults" ).toMap(); @@ -221,22 +217,23 @@ WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestDat QString defaultSource = returnedData.take( "defaultSource" ).toString(); // Here, we dont want current sessions last view, but rather what was current on previus quit QString lastSeen = TomahawkSettings::instance()->lastChartIds().value( "lastseen" ).toString(); - if( !lastSeen.isEmpty() ) + if ( !lastSeen.isEmpty() ) defaultSource = lastSeen; // Merge defaults with current defaults, split the value in to a list - foreach( const QString&key, m_currentVIds.keys() ) + foreach ( const QString& key, m_currentVIds.keys() ) defaults[ key ] = m_currentVIds.value( key ).toString().split( "/" ); - qDebug() << "Defaults after merge" << defaults; + + tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Defaults after merge" << defaults; foreach ( const QString label, returnedData.keys() ) { - QStandardItem *childItem = parseNode( rootItem, label, returnedData[ label ] ); + QStandardItem* childItem = parseNode( rootItem, label, returnedData[ label ] ); rootItem->appendRow( childItem ); } // Set the default source // Set the default chart for each source - if( !defaults.empty() ) + if ( !defaults.empty() ) { for ( int i = 0; i < rootItem->rowCount(); i++ ) { @@ -251,7 +248,7 @@ WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestDat QStringList defaultIndices = defaults[ source->text().toLower() ].toStringList(); QStandardItem* cur = source; - foreach( const QString& index, defaultIndices ) + foreach ( const QString& index, defaultIndices ) { // Go through the children of the current item, marking the default one as default for ( int k = 0; k < cur->rowCount(); k++ ) @@ -276,10 +273,9 @@ WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestDat case InfoSystem::InfoChart: { - - if( returnedData.contains( "chart_error") ) + if ( returnedData.contains( "chart_error" ) ) { - tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Info came back with error!!"; + tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Info came back with error!"; Tomahawk::InfoSystem::InfoStringHash criteria; criteria.insert( "chart_refetch", returnedData[ "chart_source" ].value< QString >() ); @@ -301,7 +297,6 @@ WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestDat break; const QString type = returnedData[ "type" ].toString(); - if ( !returnedData.contains( type ) ) break; @@ -318,7 +313,7 @@ WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestDat loader->setType( ChartDataLoader::Artist ); loader->setData( returnedData[ "artists" ].value< QStringList >() ); - connect( loader, SIGNAL( artists( Tomahawk::ChartDataLoader*, QList< Tomahawk::artist_ptr > ) ), this, SLOT( chartArtistsLoaded( Tomahawk::ChartDataLoader*, QList< Tomahawk::artist_ptr > ) ) ); + connect( loader, SIGNAL( artists( Tomahawk::ChartDataLoader*, QList< Tomahawk::artist_ptr > ) ), SLOT( chartArtistsLoaded( Tomahawk::ChartDataLoader*, QList< Tomahawk::artist_ptr > ) ) ); TreeModel* artistsModel = new TreeModel( ui->artistsViewLeft ); artistsModel->setMode( InfoSystemMode ); @@ -334,7 +329,7 @@ WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestDat loader->setType( ChartDataLoader::Album ); loader->setData( returnedData[ "albums" ].value< QList< Tomahawk::InfoSystem::InfoStringHash > >() ); - connect( loader, SIGNAL( albums( Tomahawk::ChartDataLoader*, QList< Tomahawk::album_ptr > ) ), this, SLOT( chartAlbumsLoaded( Tomahawk::ChartDataLoader*, QList< Tomahawk::album_ptr > ) ) ); + connect( loader, SIGNAL( albums( Tomahawk::ChartDataLoader*, QList< Tomahawk::album_ptr > ) ), SLOT( chartAlbumsLoaded( Tomahawk::ChartDataLoader*, QList< Tomahawk::album_ptr > ) ) ); PlayableModel* albumModel = new PlayableModel( ui->albumsView ); albumModel->startLoading(); @@ -349,7 +344,7 @@ WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestDat loader->setType( ChartDataLoader::Track ); loader->setData( returnedData[ "tracks" ].value< QList< Tomahawk::InfoSystem::InfoStringHash > >() ); - connect( loader, SIGNAL( tracks( Tomahawk::ChartDataLoader*, QList< Tomahawk::query_ptr > ) ), this, SLOT( chartTracksLoaded( Tomahawk::ChartDataLoader*, QList< Tomahawk::query_ptr > ) ) ); + connect( loader, SIGNAL( tracks( Tomahawk::ChartDataLoader*, QList< Tomahawk::query_ptr > ) ), SLOT( chartTracksLoaded( Tomahawk::ChartDataLoader*, QList< Tomahawk::query_ptr > ) ) ); PlaylistModel* trackModel = new PlaylistModel( ui->tracksViewLeft ); trackModel->startLoading(); @@ -375,7 +370,6 @@ void WhatsHotWidget::infoSystemFinished( QString target ) { Q_UNUSED( target ); - m_loadingSpinner->fadeOut(); } @@ -437,6 +431,7 @@ WhatsHotWidget::leftCrumbIndexChanged( QModelIndex index ) criteria.insert( "chart_expires", QString::number( chartExpires ) ); /// Remember to lower the source! criteria.insert( "chart_source", index.data().toString().toLower() ); + Tomahawk::InfoSystem::InfoRequestData requestData; QVariantMap customData; customData.insert( "whatshot_side", "left" ); @@ -472,12 +467,12 @@ WhatsHotWidget::changeEvent( QEvent* e ) QStandardItem* -WhatsHotWidget::parseNode( QStandardItem* parentItem, const QString &label, const QVariant &data ) +WhatsHotWidget::parseNode( QStandardItem* parentItem, const QString& label, const QVariant& data ) { Q_UNUSED( parentItem ); -// tDebug( LOGVERBOSE ) << "WhatsHot: parsing " << label; +// tDebug( LOGVERBOSE ) << "WhatsHot: parsing" << label; - QStandardItem *sourceItem = new QStandardItem( label ); + QStandardItem* sourceItem = new QStandardItem( label ); if ( data.canConvert< QList< Tomahawk::InfoSystem::InfoStringHash > >() ) { @@ -485,7 +480,7 @@ WhatsHotWidget::parseNode( QStandardItem* parentItem, const QString &label, cons foreach ( Tomahawk::InfoSystem::InfoStringHash chart, charts ) { - QStandardItem *childItem= new QStandardItem( chart[ "label" ] ); + QStandardItem* childItem= new QStandardItem( chart[ "label" ] ); childItem->setData( chart[ "id" ], Breadcrumb::ChartIdRole ); childItem->setData( chart[ "expires" ], Breadcrumb::ChartExpireRole ); @@ -505,7 +500,7 @@ WhatsHotWidget::parseNode( QStandardItem* parentItem, const QString &label, cons QVariantMap dataMap = data.toMap(); foreach ( const QString childLabel,dataMap.keys() ) { - QStandardItem *childItem = parseNode( sourceItem, childLabel, dataMap[ childLabel ] ); + QStandardItem* childItem = parseNode( sourceItem, childLabel, dataMap[ childLabel ] ); sourceItem->appendRow( childItem ); } } @@ -515,13 +510,13 @@ WhatsHotWidget::parseNode( QStandardItem* parentItem, const QString &label, cons foreach ( const QVariant value, dataList ) { - QStandardItem *childItem = new QStandardItem( value.toString() ); + QStandardItem* childItem = new QStandardItem( value.toString() ); sourceItem->appendRow( childItem ); } } else { - QStandardItem *childItem = new QStandardItem( data.toString() ); + QStandardItem* childItem = new QStandardItem( data.toString() ); sourceItem->appendRow( childItem ); } return sourceItem; @@ -565,7 +560,7 @@ WhatsHotWidget::chartArtistsLoaded( ChartDataLoader* loader, const QList< artist if ( m_artistModels.contains( chartId ) ) { - foreach( const artist_ptr& artist, artists ) + foreach ( const artist_ptr& artist, artists ) { m_artistModels[ chartId ]->addArtists( artist ); m_artistModels[ chartId ]->finishLoading(); diff --git a/src/libtomahawk/widgets/WhatsHotWidget.h b/src/libtomahawk/widgets/WhatsHotWidget.h index 3c6c6e197..d39e30b42 100644 --- a/src/libtomahawk/widgets/WhatsHotWidget.h +++ b/src/libtomahawk/widgets/WhatsHotWidget.h @@ -97,9 +97,9 @@ private: void setLeftViewAlbums( PlayableModel* albumModel ); void setLeftViewTracks( PlaylistModel* trackModel ); - QStandardItem* parseNode( QStandardItem* parentItem, const QString &label, const QVariant &data ); + QStandardItem* parseNode( QStandardItem* parentItem, const QString& label, const QVariant& data ); - Ui::WhatsHotWidget *ui; + Ui::WhatsHotWidget* ui; Tomahawk::playlistinterface_ptr m_playlistInterface; QStandardItemModel* m_crumbModelLeft; @@ -119,7 +119,7 @@ private: QSet< QString > m_queuedFetches; QTimer* m_timer; QMap m_currentVIds; - AnimatedSpinner* m_loadingSpinner; + friend class Tomahawk::ChartsPlaylistInterface; }; From 453c0ab0c45bb94be36d0ab75af9808af5969c73 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 07:06:37 +0100 Subject: [PATCH 17/28] * Don't pre-initialize the charts widget. This will require some more changes in WhatsHotWidget - to be discussed with Hugo. --- src/libtomahawk/ViewManager.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp index 9356e8697..c9619dabd 100644 --- a/src/libtomahawk/ViewManager.cpp +++ b/src/libtomahawk/ViewManager.cpp @@ -74,7 +74,7 @@ ViewManager::ViewManager( QObject* parent ) : QObject( parent ) , m_widget( new QWidget() ) , m_welcomeWidget( new WelcomeWidget() ) - , m_whatsHotWidget( new WhatsHotWidget() ) + , m_whatsHotWidget( 0 ) , m_newReleasesWidget( new NewReleasesWidget() ) , m_recentPlaysWidget( 0 ) , m_currentPage( 0 ) @@ -109,7 +109,6 @@ ViewManager::ViewManager( QObject* parent ) connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( applyFilter() ) ); connect( m_infobar, SIGNAL( filterTextChanged( QString ) ), SLOT( setFilter( QString ) ) ); - connect( this, SIGNAL( tomahawkLoaded() ), m_whatsHotWidget, SLOT( fetchData() ) ); connect( this, SIGNAL( tomahawkLoaded() ), m_newReleasesWidget, SLOT( fetchData() ) ); connect( this, SIGNAL( tomahawkLoaded() ), m_welcomeWidget, SLOT( loadData() ) ); @@ -376,6 +375,12 @@ ViewManager::showWelcomePage() Tomahawk::ViewPage* ViewManager::showWhatsHotPage() { + if ( !m_whatsHotWidget ) + { + m_whatsHotWidget = new WhatsHotWidget(); + m_whatsHotWidget->fetchData(); + } + return show( m_whatsHotWidget ); } From c984e796691e5f0fde8f3eaf936f0dfd5fe136ab Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 07:14:24 +0100 Subject: [PATCH 18/28] * Updated AUTHORS file. --- AUTHORS | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/AUTHORS b/AUTHORS index 2ef2e1853..996bc73ad 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,15 +4,17 @@ Tomahawk is primarily authored by: Contributors include: -* Leo Franchi +* Leo Franchi * Dominik Schmidt -* Jeff Mitchell -* J Herskowitz +* Jeff Mitchell +* J Herskowitz * Alejandro Wainzinger -* Hugo Lindström +* Hugo Lindström * Teo Mrnjavac +* Michael Zanetti +* Christopher Reichert Thanks to: * Harald Sitter -* Steve Robertson +* Syd Lawrence From 23fe27ed5e3b92751ccec2a203fddf0940b06b3d Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 07:17:22 +0100 Subject: [PATCH 19/28] * Updated ChangeLog. --- ChangeLog | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec1e63532..ef845c10a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,8 @@ Version 0.6.0: biographies. * New AudioControl logic - only enable Prev/Skip buttons if available. * Added more options to right-click/context menus. - * Resolver source icon in Audiocontrols now supports being a link-back URL to original source. + * Resolver source icon in Audiocontrols now supports being a link-back URL + to original source. * Make friends' currently playing song (in sidebar) clickable. * Improve MusicBrainz plugin to use normalized artist names and avoid duplicate tracks. @@ -23,10 +24,10 @@ Version 0.6.0: * Remove YouTube resolver from plug-in directory on request of YouTube. * Fixed iTunes m3u playlist support. * Support dropping of new Soundcloud user, track, set & likes URLs. - * Add HotNewHipHop as available chart. - * Add iTunes as available source for New Releases. + * Added HotNewHipHop as available chart. + * Added iTunes as available source for New Releases. * Updates and additions to translations including: Japanese, Bulgarian, - Finish, Russian, Arabic, Chinese, Swedish and more. + Finnish, Russian, Arabic, Chinese, Swedish, Czech and more. * (Linux) Allow disabling of playback notifications. Version 0.5.5: From 63049af4c4cfc9d13323a745f7986ab5b5764f32 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 07:19:25 +0100 Subject: [PATCH 20/28] * Fixed english source translation. --- lang/tomahawk_en.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/tomahawk_en.ts b/lang/tomahawk_en.ts index 7fd46c18b..0142b8965 100644 --- a/lang/tomahawk_en.ts +++ b/lang/tomahawk_en.ts @@ -3475,7 +3475,7 @@ enter the displayed PIN number here: Copyright 2010 - 2013 - Copyright 2010 - 2013 {2010 ?} + Copyright 2010 - 2013 From 7746070433a755d6124675d7a1e1e95970817e34 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 07:20:13 +0100 Subject: [PATCH 21/28] * Fixed pt_BR translation. --- lang/tomahawk_pt_BR.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/tomahawk_pt_BR.ts b/lang/tomahawk_pt_BR.ts index b89cfc5f9..6e47b9d3f 100644 --- a/lang/tomahawk_pt_BR.ts +++ b/lang/tomahawk_pt_BR.ts @@ -1123,7 +1123,7 @@ se conecte e faça o stream de você? A playlist by %1, created %2. - Uma lista de reprodução de %1, criada %2. {1,?} + Uma lista de reprodução de %1, criada %2. From de0684d42a0043d3eea4a5843811506bac03d2dc Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 07:21:48 +0100 Subject: [PATCH 22/28] * Updated authors in about dialog. --- src/TomahawkWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index dfb710951..ff5084467 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -1194,7 +1194,7 @@ TomahawkWindow::showAboutTomahawk() const QString thanksto( tr( "Thanks to:" ) ); desc = QString( "%1
Christian Muehlhaeuser <muesli@tomahawk-player.org>

" - "%2 Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindström, Syd Lawrence, Michael Zanetti, Harald Sitter, Steve Robertson, Teo Mrnjavac" ) + "%2 Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindström, Syd Lawrence, Michael Zanetti, Teo Mrnjavac, Christopher Reichert, Harald Sitter" ) .arg( copyright ) .arg( thanksto ); From f8394a2ef24123a9f15af26eb509b89b76c366e8 Mon Sep 17 00:00:00 2001 From: Tomahawk CI Date: Wed, 9 Jan 2013 07:25:50 +0100 Subject: [PATCH 23/28] Automatic merge of Transifex translations --- lang/tomahawk_ar.ts | 34 +++++++++++++++++----------------- lang/tomahawk_bg.ts | 34 +++++++++++++++++----------------- lang/tomahawk_bn_IN.ts | 34 +++++++++++++++++----------------- lang/tomahawk_ca.ts | 34 +++++++++++++++++----------------- lang/tomahawk_cs.ts | 34 +++++++++++++++++----------------- lang/tomahawk_de.ts | 34 +++++++++++++++++----------------- lang/tomahawk_el.ts | 34 +++++++++++++++++----------------- lang/tomahawk_en.ts | 36 ++++++++++++++++++------------------ lang/tomahawk_es.ts | 34 +++++++++++++++++----------------- lang/tomahawk_fi.ts | 34 +++++++++++++++++----------------- lang/tomahawk_fr.ts | 34 +++++++++++++++++----------------- lang/tomahawk_gl.ts | 34 +++++++++++++++++----------------- lang/tomahawk_hi_IN.ts | 34 +++++++++++++++++----------------- lang/tomahawk_hu.ts | 34 +++++++++++++++++----------------- lang/tomahawk_it.ts | 34 +++++++++++++++++----------------- lang/tomahawk_ja.ts | 34 +++++++++++++++++----------------- lang/tomahawk_lt.ts | 34 +++++++++++++++++----------------- lang/tomahawk_pl.ts | 34 +++++++++++++++++----------------- lang/tomahawk_pt_BR.ts | 36 ++++++++++++++++++------------------ lang/tomahawk_ru.ts | 34 +++++++++++++++++----------------- lang/tomahawk_sv.ts | 34 +++++++++++++++++----------------- lang/tomahawk_tr.ts | 34 +++++++++++++++++----------------- lang/tomahawk_zh_CN.ts | 34 +++++++++++++++++----------------- lang/tomahawk_zh_TW.ts | 34 +++++++++++++++++----------------- 24 files changed, 410 insertions(+), 410 deletions(-) diff --git a/lang/tomahawk_ar.ts b/lang/tomahawk_ar.ts index c18ca0241..785426ec7 100644 --- a/lang/tomahawk_ar.ts +++ b/lang/tomahawk_ar.ts @@ -261,12 +261,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist - + Other Albums @@ -281,7 +281,7 @@ connect and stream from you? نعتذر، لم نستطيع إيجاد أغاني أخرى لهذا الألبوم! - + Other Albums by %1 ألبومات أخرى ل%1 @@ -303,32 +303,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits الأكثر شهرة - + Related Artists الفنانين ذات الذوق القريب - + Albums ألبومات - + Sorry, we could not find any albums for this artist! نعتذر, لم نستطيع إيجاد ألبومات أخرى لهذا الفنان! - + Sorry, we could not find any related artists! نعتذر، لم نستطيع إيجاد فنانين! - + Sorry, we could not find any top hits for this artist! نعتذر، لم نستطيع إيجاد أغاني مشهورة جدا لهذا الفنان! @@ -3675,42 +3675,42 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! - + After you have scanned your music collection you will find your tracks right here. بعد إجراء مسح مجموعة أغانيك الخاصة ستجد أغانيك هنا. - + This collection is empty. هذه المجموعة فارغة. - + SuperCollection سوبر كولكشن - + Combined libraries of all your online friends مكتبات مجمعة لكل اصحابك المتصلين - + Recently Played Tracks الأغاني التي إستمعت إليها مؤخرا - + Recently played tracks from all your friends جميع الأغاني التي استمع إليها أصدقائك مؤخرا - + Sorry, we could not find any recent plays! نعتذر، لم نستطيع إيجاد أغاني مسموعة مؤخرا! diff --git a/lang/tomahawk_bg.ts b/lang/tomahawk_bg.ts index bb1ffd250..25c4dee72 100644 --- a/lang/tomahawk_bg.ts +++ b/lang/tomahawk_bg.ts @@ -260,12 +260,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist Списък на песни за изпълняване - + Other Albums Други албуми @@ -280,7 +280,7 @@ connect and stream from you? Съжалявам, но не откривам нито една песен за този артист! - + Other Albums by %1 Други албуми от %1 @@ -302,32 +302,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits Най-известни изпълнения - + Related Artists Изпълнители с подобно звучене - + Albums Албуми - + Sorry, we could not find any albums for this artist! Съжалявам, но не откривам нито един албум за този артист! - + Sorry, we could not find any related artists! Съжалявам, но не откривам нито един подобен на този артист! - + Sorry, we could not find any top hits for this artist! Съжалявам, но не откривам нито една хитова песен на този артист! @@ -3693,43 +3693,43 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! Списъкът е празен! - + After you have scanned your music collection you will find your tracks right here. След като бъде сканирана колекцията ти, ще откриеш твоите песни точно тук. - + This collection is empty. Празна колекция. - + SuperCollection Обща колекция /Сборен излед от локалните и наличните в колекциите на приятелите ти/ - + Combined libraries of all your online friends Обща колекция с всичките ми приятели на линия - + Recently Played Tracks Наскоро изпълени песни - + Recently played tracks from all your friends Наскоро изпълнени песни от всичките ти приятели - + Sorry, we could not find any recent plays! Съжалявам, но не откривам скорошни списъци diff --git a/lang/tomahawk_bn_IN.ts b/lang/tomahawk_bn_IN.ts index 5e2c86d72..cad839415 100644 --- a/lang/tomahawk_bn_IN.ts +++ b/lang/tomahawk_bn_IN.ts @@ -260,12 +260,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist - + Other Albums @@ -280,7 +280,7 @@ connect and stream from you? - + Other Albums by %1 @@ -302,32 +302,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits - + Related Artists - + Albums - + Sorry, we could not find any albums for this artist! - + Sorry, we could not find any related artists! - + Sorry, we could not find any top hits for this artist! @@ -3659,42 +3659,42 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! - + After you have scanned your music collection you will find your tracks right here. - + This collection is empty. - + SuperCollection - + Combined libraries of all your online friends - + Recently Played Tracks - + Recently played tracks from all your friends - + Sorry, we could not find any recent plays! diff --git a/lang/tomahawk_ca.ts b/lang/tomahawk_ca.ts index 97e73ed58..9de03308f 100644 --- a/lang/tomahawk_ca.ts +++ b/lang/tomahawk_ca.ts @@ -260,12 +260,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist - + Other Albums @@ -280,7 +280,7 @@ connect and stream from you? - + Other Albums by %1 Altres Àlbums de %1 @@ -302,32 +302,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits Grans Èxits - + Related Artists Artistes Relacionats - + Albums Àlbums - + Sorry, we could not find any albums for this artist! - + Sorry, we could not find any related artists! - + Sorry, we could not find any top hits for this artist! @@ -3673,42 +3673,42 @@ Podeu reenviar un missatge de sincronisme en qualsevol moment simplement enviant ViewManager - + This playlist is empty! - + After you have scanned your music collection you will find your tracks right here. - + This collection is empty. - + SuperCollection SuperCol·lecció - + Combined libraries of all your online friends Biblioteques combinades de tots els amis en línia - + Recently Played Tracks Cançons Escoltades Recentment - + Recently played tracks from all your friends Cançons escoltades recentment pels amics - + Sorry, we could not find any recent plays! diff --git a/lang/tomahawk_cs.ts b/lang/tomahawk_cs.ts index 66b54bee3..2d385a166 100644 --- a/lang/tomahawk_cs.ts +++ b/lang/tomahawk_cs.ts @@ -261,12 +261,12 @@ se s vámi spojil? AlbumInfoWidget - + Tracklist Seznam skladeb - + Other Albums Jiná alba @@ -281,7 +281,7 @@ se s vámi spojil? Promiňte, nepodařilo se najít žádné skladby pro toto album! - + Other Albums by %1 Jiná alba %1 @@ -303,32 +303,32 @@ se s vámi spojil? ArtistInfoWidget - + Top Hits Nejlepší písně - + Related Artists Podobní umělci - + Albums Alba - + Sorry, we could not find any albums for this artist! Promiňte, nepodařilo se najít žádná alba tohoto umělce! - + Sorry, we could not find any related artists! Promiňte, nepodařilo se najít žádné podobné umělce! - + Sorry, we could not find any top hits for this artist! Sorry, wir konnten keine Lieder für diesen Künstler finden! @@ -3673,42 +3673,42 @@ Kdykoli můžete odeslat novou seřizovací zprávu. ViewManager - + This playlist is empty! Tento seznam skladeb je prázdný! - + After you have scanned your music collection you will find your tracks right here. Poté co byla prohledána vaše hudební sbírka, najdete své skladby přesně zde. - + This collection is empty. Tato sbírka je prázdná. - + SuperCollection Supersbírka - + Combined libraries of all your online friends Spojená sbírka všech vašich přátel - + Recently Played Tracks Nedávno poslouchané skladby - + Recently played tracks from all your friends Naposledy poslouchané skladby všech vašich přátel - + Sorry, we could not find any recent plays! Promiňte, ale nepodařilo se najít žádné nedávno poslouchané skladby! diff --git a/lang/tomahawk_de.ts b/lang/tomahawk_de.ts index 43889c479..b64fe67ce 100644 --- a/lang/tomahawk_de.ts +++ b/lang/tomahawk_de.ts @@ -261,12 +261,12 @@ erlauben sich mit dir zu verbinden? AlbumInfoWidget - + Tracklist Tracklist - + Other Albums Andere Alben @@ -281,7 +281,7 @@ erlauben sich mit dir zu verbinden? Sorry, wir konnten keine anderen Lieder für dieses Album finden! - + Other Albums by %1 Andere Alben von %1 @@ -303,32 +303,32 @@ erlauben sich mit dir zu verbinden? ArtistInfoWidget - + Top Hits Top Hits - + Related Artists Ähnliche Künstler - + Albums Alben - + Sorry, we could not find any albums for this artist! Sorry, wir konnten keine Alben für diesen Künstler finden! - + Sorry, we could not find any related artists! Sorry, wir konnten keine ähnlichen Künstler finden! - + Sorry, we could not find any top hits for this artist! Sorry, wir konnten keine Lieder für diesen Künstler finden! @@ -3671,42 +3671,42 @@ Du kannst jederzeit eine neue Sync-Nachricht abschicken. ViewManager - + This playlist is empty! Diese Playlist ist leer! - + After you have scanned your music collection you will find your tracks right here. Nachdem du deine Musik Sammlung gescannt hast, findest du all deine Lieder genau hier. - + This collection is empty. Diese Sammlung ist leer. - + SuperCollection SuperCollection - + Combined libraries of all your online friends Kombinierte Sammlung all deiner Freunde - + Recently Played Tracks Zuletzt gehörte Lieder - + Recently played tracks from all your friends Zuletzt gehörte Lieder all deiner Freunde - + Sorry, we could not find any recent plays! Es konnten keine zuletzt gehörten Songs gefunden werden! diff --git a/lang/tomahawk_el.ts b/lang/tomahawk_el.ts index 8ec26200a..10320f41d 100644 --- a/lang/tomahawk_el.ts +++ b/lang/tomahawk_el.ts @@ -260,12 +260,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist - + Other Albums @@ -280,7 +280,7 @@ connect and stream from you? - + Other Albums by %1 Άλλα Άλμπουμ από %1 @@ -302,32 +302,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits - + Related Artists Παρόμοιοι Καλλιτέχνες - + Albums Άλμπουμ - + Sorry, we could not find any albums for this artist! - + Sorry, we could not find any related artists! - + Sorry, we could not find any top hits for this artist! @@ -3667,42 +3667,42 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! - + After you have scanned your music collection you will find your tracks right here. - + This collection is empty. - + SuperCollection ΥπερΣυλλογή - + Combined libraries of all your online friends - + Recently Played Tracks Τελευταίες Αναπαραγωγές Κομματιών - + Recently played tracks from all your friends Τελευταίες αναπαραγωγές από όλους τους φίλους σας - + Sorry, we could not find any recent plays! diff --git a/lang/tomahawk_en.ts b/lang/tomahawk_en.ts index 0142b8965..52ef8e964 100644 --- a/lang/tomahawk_en.ts +++ b/lang/tomahawk_en.ts @@ -261,12 +261,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist Tracklist - + Other Albums Other Albums @@ -281,7 +281,7 @@ connect and stream from you? Sorry, we could not find any tracks for this album! - + Other Albums by %1 Other Albums by %1 @@ -303,32 +303,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits Top Hits - + Related Artists Related Artists - + Albums Albums - + Sorry, we could not find any albums for this artist! Sorry, we could not find any albums for this artist! - + Sorry, we could not find any related artists! Sorry, we could not find any related artists! - + Sorry, we could not find any top hits for this artist! Sorry, we could not find any top hits for this artist! @@ -3475,7 +3475,7 @@ enter the displayed PIN number here: Copyright 2010 - 2013 - Copyright 2010 - 2013 + Copyright 2010 - 2013 {2010 ?} @@ -3677,42 +3677,42 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! This playlist is empty! - + After you have scanned your music collection you will find your tracks right here. After you have scanned your music collection you will find your tracks right here. - + This collection is empty. This collection is empty. - + SuperCollection SuperCollection - + Combined libraries of all your online friends Combined libraries of all your online friends - + Recently Played Tracks Recently Played Tracks - + Recently played tracks from all your friends Recently played tracks from all your friends - + Sorry, we could not find any recent plays! Sorry, we could not find any recent plays! diff --git a/lang/tomahawk_es.ts b/lang/tomahawk_es.ts index e8e9193d3..05d1f4d0c 100644 --- a/lang/tomahawk_es.ts +++ b/lang/tomahawk_es.ts @@ -261,12 +261,12 @@ conectarse a usted y transmitir música? AlbumInfoWidget - + Tracklist Pistas - + Other Albums Otros álbumes @@ -281,7 +281,7 @@ conectarse a usted y transmitir música? No se encontraron pistas de este álbum - + Other Albums by %1 Otros álbumes de %1 @@ -303,32 +303,32 @@ conectarse a usted y transmitir música? ArtistInfoWidget - + Top Hits Grandes éxitos - + Related Artists Artistas relacionados - + Albums Álbumes - + Sorry, we could not find any albums for this artist! No se encontraron álbumes de este artista - + Sorry, we could not find any related artists! No se encontraron artistas relacionados - + Sorry, we could not find any top hits for this artist! No se encontraron éxitos de este artista @@ -3677,42 +3677,42 @@ Puede reenviar el mensaje de sincronización en cualquier momento simplemente en ViewManager - + This playlist is empty! Lista de reproducción vacía - + After you have scanned your music collection you will find your tracks right here. Después de escanear su colección de música encontrará sus pistas aquí - + This collection is empty. Colección vacía - + SuperCollection Supercolección - + Combined libraries of all your online friends Bibliotecas combinadas de todos tus amigos - + Recently Played Tracks Pistas reproducidas recientemente - + Recently played tracks from all your friends Temas escuchados recientemente por mis amigos - + Sorry, we could not find any recent plays! No hay reproducciones recientes diff --git a/lang/tomahawk_fi.ts b/lang/tomahawk_fi.ts index 1a1c3cad2..8efe39b71 100644 --- a/lang/tomahawk_fi.ts +++ b/lang/tomahawk_fi.ts @@ -261,12 +261,12 @@ yhdistää ja toistaa sinulta virtaa? AlbumInfoWidget - + Tracklist Kappalelista - + Other Albums Muita albumeita @@ -281,7 +281,7 @@ yhdistää ja toistaa sinulta virtaa? Valitettavasti emme löytäneet mitään tämän albumin kappaleita! - + Other Albums by %1 Muita artistin %1 levyjä @@ -303,32 +303,32 @@ yhdistää ja toistaa sinulta virtaa? ArtistInfoWidget - + Top Hits Parhaat hitit - + Related Artists Samankaltaisia artisteja - + Albums Albumit - + Sorry, we could not find any albums for this artist! Valitettavasti emme löytänet yhtään tämän artistin albumia! - + Sorry, we could not find any related artists! Valitettavasti emme löytäneet yhtään samankaltaista artistia! - + Sorry, we could not find any top hits for this artist! Valitettavasti emme löytäneet yhtään tämän artistin parhaista hiteistä! @@ -3680,42 +3680,42 @@ Voit lähettää synkronointiviestin uudelleen millä hetkellä hyvänsä lähet ViewManager - + This playlist is empty! Tämä soittolista on tyhjä! - + After you have scanned your music collection you will find your tracks right here. Löydät kappaleesi tästä, kunhan musiikkikokoelmasi haku on valmistunut. - + This collection is empty. Tämä kokoelma on tyhjä. - + SuperCollection Superkokoelma - + Combined libraries of all your online friends Kaikkien verkkokaveriesi yhdistetyt kirjastot - + Recently Played Tracks Viime aikoina kuunnellut kappaleet - + Recently played tracks from all your friends Kaikkien kaveriesi viime aikoina kuuntelemat kappaleet - + Sorry, we could not find any recent plays! Valitettavasti emme löytäneet yhtään viimeaikaisia soittoja! diff --git a/lang/tomahawk_fr.ts b/lang/tomahawk_fr.ts index 59a485ddf..356b32c46 100644 --- a/lang/tomahawk_fr.ts +++ b/lang/tomahawk_fr.ts @@ -261,12 +261,12 @@ de se connecter et streamer de vous? AlbumInfoWidget - + Tracklist Liste des pistes - + Other Albums Autres Albums @@ -281,7 +281,7 @@ de se connecter et streamer de vous? Désolé, nous n'avons pu trouver aucune piste pour cet album ! - + Other Albums by %1 Autres albums de %1 @@ -303,32 +303,32 @@ de se connecter et streamer de vous? ArtistInfoWidget - + Top Hits Top Hits - + Related Artists Artistes similaires - + Albums Albums - + Sorry, we could not find any albums for this artist! Désolé, on a pas pu trouver aucun album pour cet artiste! - + Sorry, we could not find any related artists! Désolé, on a rien trouvé par rapport a cet artite! - + Sorry, we could not find any top hits for this artist! Désolé, on a pas pu trouver aucun top hit pour cet artiste! @@ -3674,42 +3674,42 @@ Vous pouvez envoyer un message de synchronisation quand vous le souhaitez en env ViewManager - + This playlist is empty! Cette liste de lecture est vide! - + After you have scanned your music collection you will find your tracks right here. Après avoir scanné votre collection musicale, vous trouverez tous vos titres ici. - + This collection is empty. La collection est vide. - + SuperCollection SuperCollection - + Combined libraries of all your online friends Collections regroupant toutes celles de vos amis en ligne - + Recently Played Tracks Derniers titres joués - + Recently played tracks from all your friends Derniers titres joués par vos amis - + Sorry, we could not find any recent plays! Désolé, aucune piste récemment jouée n'a pu être trouvée ! diff --git a/lang/tomahawk_gl.ts b/lang/tomahawk_gl.ts index d16b9dbf4..5d0defb78 100644 --- a/lang/tomahawk_gl.ts +++ b/lang/tomahawk_gl.ts @@ -260,12 +260,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist Lista de reprodución - + Other Albums Outros álbums @@ -280,7 +280,7 @@ connect and stream from you? Non se puido atopar ningunha outra pista para este álbum! - + Other Albums by %1 Outros álbums de %1 @@ -302,32 +302,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits Maiores éxitos - + Related Artists Artistas relacionados - + Albums Álbums - + Sorry, we could not find any albums for this artist! Non se atopou ningún álbum para este artista! - + Sorry, we could not find any related artists! Non se atopou ningún artista relacionado! - + Sorry, we could not find any top hits for this artist! Non se atopou ningún éxito deste artista! @@ -3675,42 +3675,42 @@ Podes reenviar e sincronizar as mensaxes en calquera momento simplemente enviand ViewManager - + This playlist is empty! Esta lista de reprodución está baleira! - + After you have scanned your music collection you will find your tracks right here. Cando teñas a colección de música escaneada as pistas aparecerán aquí. - + This collection is empty. Esta colección está baleira. - + SuperCollection Supercolección - + Combined libraries of all your online friends Bibliotecas combinadas de todas as túas amizades - + Recently Played Tracks Pistas recentemente reproducidas - + Recently played tracks from all your friends Pistas escoitadas recentemente polas túas amizades - + Sorry, we could not find any recent plays! Non se atoparan reproducións recentes! diff --git a/lang/tomahawk_hi_IN.ts b/lang/tomahawk_hi_IN.ts index b72fa3ebb..7b5585395 100644 --- a/lang/tomahawk_hi_IN.ts +++ b/lang/tomahawk_hi_IN.ts @@ -260,12 +260,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist - + Other Albums @@ -280,7 +280,7 @@ connect and stream from you? - + Other Albums by %1 @@ -302,32 +302,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits - + Related Artists - + Albums - + Sorry, we could not find any albums for this artist! - + Sorry, we could not find any related artists! - + Sorry, we could not find any top hits for this artist! @@ -3659,42 +3659,42 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! - + After you have scanned your music collection you will find your tracks right here. - + This collection is empty. - + SuperCollection - + Combined libraries of all your online friends - + Recently Played Tracks - + Recently played tracks from all your friends - + Sorry, we could not find any recent plays! diff --git a/lang/tomahawk_hu.ts b/lang/tomahawk_hu.ts index 4df900563..b10cc8810 100644 --- a/lang/tomahawk_hu.ts +++ b/lang/tomahawk_hu.ts @@ -260,12 +260,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist Zeneszám lista - + Other Albums Egyéb albumok @@ -280,7 +280,7 @@ connect and stream from you? - + Other Albums by %1 @@ -302,32 +302,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits Top Hits - + Related Artists Kapcsolódó előadók - + Albums Albumok - + Sorry, we could not find any albums for this artist! - + Sorry, we could not find any related artists! - + Sorry, we could not find any top hits for this artist! @@ -3659,42 +3659,42 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! Ez a lejátszólista üres! - + After you have scanned your music collection you will find your tracks right here. - + This collection is empty. Ez a kollekció üres. - + SuperCollection - + Combined libraries of all your online friends - + Recently Played Tracks Mostanában játszott zeneszámok - + Recently played tracks from all your friends - + Sorry, we could not find any recent plays! diff --git a/lang/tomahawk_it.ts b/lang/tomahawk_it.ts index 772e0c13c..554c97f1e 100644 --- a/lang/tomahawk_it.ts +++ b/lang/tomahawk_it.ts @@ -260,12 +260,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist - + Other Albums @@ -280,7 +280,7 @@ connect and stream from you? Ci dispiace, ma non abbiamo trovato nessuna traccia di questo album! - + Other Albums by %1 Altri album di %1 @@ -302,32 +302,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits Top Hits - + Related Artists Artisti simili - + Albums Album - + Sorry, we could not find any albums for this artist! Ci dispiace, ma non abbiamo trovato nessun album di questo artista! - + Sorry, we could not find any related artists! Siamo spiacenti, non è stato possibile trovare artisti simili! - + Sorry, we could not find any top hits for this artist! Ci dispiace, ma non abbiamo trovato alcun risultato top per l'artista! @@ -3659,42 +3659,42 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! - + After you have scanned your music collection you will find your tracks right here. Dopo aver analizzato la tua collezione troverai le tracce qui. - + This collection is empty. La collezione è vuota. - + SuperCollection Supercollezione - + Combined libraries of all your online friends Collezioni combinate di tutti i tuoi amici online - + Recently Played Tracks Tracce ascoltate di recente - + Recently played tracks from all your friends Tracce ascoltate di recente dai tuoi amici - + Sorry, we could not find any recent plays! diff --git a/lang/tomahawk_ja.ts b/lang/tomahawk_ja.ts index 388b4ea6a..dd05acf2d 100644 --- a/lang/tomahawk_ja.ts +++ b/lang/tomahawk_ja.ts @@ -260,12 +260,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist トラックリスト - + Other Albums 他のアルバム @@ -280,7 +280,7 @@ connect and stream from you? このアルバムの曲は見つかりませんでした。 - + Other Albums by %1 %1の他のアルバム @@ -302,32 +302,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits 大ヒット曲 - + Related Artists 似たアーティスト - + Albums アルバム - + Sorry, we could not find any albums for this artist! このアーティストのアルバムは見つかりませんでした。 - + Sorry, we could not find any related artists! 関連アーティストは見つかりませんでした。 - + Sorry, we could not find any top hits for this artist! このアーティストの大ヒット曲は見つかりませんでした。 @@ -3677,42 +3677,42 @@ Twitterを使っている友達にTomahawkを接続したいなら、ツイー ViewManager - + This playlist is empty! このプレイリストには何も入っていません。 - + After you have scanned your music collection you will find your tracks right here. コレクションのスキャンが完了したら、トラックはここに表示されます。 - + This collection is empty. このコレクションには何も入っていません。 - + SuperCollection スーパーコレクション - + Combined libraries of all your online friends オンラインの友達全員のライブラリ - + Recently Played Tracks 最近再生したトラック - + Recently played tracks from all your friends 友達の最近再生したトラック - + Sorry, we could not find any recent plays! 最近の再生した項目が見つかりませんでした。 diff --git a/lang/tomahawk_lt.ts b/lang/tomahawk_lt.ts index 690fd9fc1..074e6bb2e 100644 --- a/lang/tomahawk_lt.ts +++ b/lang/tomahawk_lt.ts @@ -260,12 +260,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist - + Other Albums @@ -280,7 +280,7 @@ connect and stream from you? Atsiprašome, neradome jokių takelių iš šio albumo! - + Other Albums by %1 Kiti %1 albumai @@ -302,32 +302,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits - + Related Artists Susiję atlikėjai - + Albums Albumai - + Sorry, we could not find any albums for this artist! Atsiprašome, neradome jokių šio atlikėjo albumų! - + Sorry, we could not find any related artists! Atsiprašome, neradome jokių susijusių atlikėjų! - + Sorry, we could not find any top hits for this artist! @@ -3659,42 +3659,42 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! - + After you have scanned your music collection you will find your tracks right here. Peržvelgus Jūsų muzikos kolekciją, savo takelius galėsite rasti čia akimirksniu. - + This collection is empty. Ši kolekcija yra tuščia. - + SuperCollection Super kolekcija - + Combined libraries of all your online friends Jungtinė visų Jūsų prisijungusių draugų kolekcija - + Recently Played Tracks Neseniai groti takeliai - + Recently played tracks from all your friends Visų Jūsų draugų neseniai groti takeliai - + Sorry, we could not find any recent plays! diff --git a/lang/tomahawk_pl.ts b/lang/tomahawk_pl.ts index 838cb1437..e40e38617 100644 --- a/lang/tomahawk_pl.ts +++ b/lang/tomahawk_pl.ts @@ -261,12 +261,12 @@ połączyć się i strumieniować od ciebie? AlbumInfoWidget - + Tracklist - + Other Albums @@ -281,7 +281,7 @@ połączyć się i strumieniować od ciebie? - + Other Albums by %1 Inne albumy %1 @@ -303,32 +303,32 @@ połączyć się i strumieniować od ciebie? ArtistInfoWidget - + Top Hits Hity na Topie - + Related Artists Powiązani artyści - + Albums Albumy - + Sorry, we could not find any albums for this artist! - + Sorry, we could not find any related artists! - + Sorry, we could not find any top hits for this artist! @@ -3674,42 +3674,42 @@ Zawsze możesz ponownie wysłać wiadomość synchronizacyjną - po prostu wyśl ViewManager - + This playlist is empty! - + After you have scanned your music collection you will find your tracks right here. - + This collection is empty. - + SuperCollection SuperKolekcja - + Combined libraries of all your online friends Połączone biblioteki wszystkich twoich znajomych online - + Recently Played Tracks Ostatnio odtwarzane utwory - + Recently played tracks from all your friends Utwory ostatnio odtwarzane przez twoich znajomych - + Sorry, we could not find any recent plays! diff --git a/lang/tomahawk_pt_BR.ts b/lang/tomahawk_pt_BR.ts index 6e47b9d3f..5eb206dda 100644 --- a/lang/tomahawk_pt_BR.ts +++ b/lang/tomahawk_pt_BR.ts @@ -261,12 +261,12 @@ se conecte e faça o stream de você? AlbumInfoWidget - + Tracklist Lista de faixas - + Other Albums Outros álbuns @@ -281,7 +281,7 @@ se conecte e faça o stream de você? Desculpe, mas não conseguimos encontrar outras faixas para este álbum! - + Other Albums by %1 Outros álbuns de %1 @@ -303,32 +303,32 @@ se conecte e faça o stream de você? ArtistInfoWidget - + Top Hits Mais Tocadas - + Related Artists Artistas Relacionados - + Albums Álbuns - + Sorry, we could not find any albums for this artist! Desculpe, mas não conseguimos encontrar outros álbuns para este artista! - + Sorry, we could not find any related artists! Desculpe, mas não conseguimos encontrar outros artistas relacionados a este! - + Sorry, we could not find any top hits for this artist! Desculpe, mas não conseguimos encontrar outras faixas mais tocadas deste artista! @@ -1123,7 +1123,7 @@ se conecte e faça o stream de você? A playlist by %1, created %2. - Uma lista de reprodução de %1, criada %2. + Uma lista de reprodução de %1, criada %2. {1,?} @@ -3674,42 +3674,42 @@ Você pode enviar uma outra mensagem de sincronia a qualquer momento simplesment ViewManager - + This playlist is empty! Essa lista de reprodução está vazia! - + After you have scanned your music collection you will find your tracks right here. Depois de escanear sua biblioteca de músicas as faixas irão aparecer aqui. - + This collection is empty. Esta coleção esta vazia. - + SuperCollection SuperColeção - + Combined libraries of all your online friends Bibliotecas combinadas de todos os seus amigos online - + Recently Played Tracks Faixas Reproduzidas Recentemente - + Recently played tracks from all your friends Faixas reproduzidas recentemente por todos os seus amigos - + Sorry, we could not find any recent plays! Desculpe, não foi possível encontrar reproduções recentes! diff --git a/lang/tomahawk_ru.ts b/lang/tomahawk_ru.ts index 26e38532e..b196af2e5 100644 --- a/lang/tomahawk_ru.ts +++ b/lang/tomahawk_ru.ts @@ -265,12 +265,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist Треклист - + Other Albums Другие Альбомы @@ -285,7 +285,7 @@ connect and stream from you? К сожалению, мы не смогли найти никаких треков для этого альбома! - + Other Albums by %1 Другие альбомы %1 @@ -307,32 +307,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits Хиты - + Related Artists Похожие исполнители - + Albums Альбомы - + Sorry, we could not find any albums for this artist! К сожалению, мы не смогли найти никаких альбомов этого исполнителя! - + Sorry, we could not find any related artists! К сожалению, мы не смогли найти никаких исполнители! - + Sorry, we could not find any top hits for this artist! К сожалению, мы не смогли найти никаких хитов этого исполнителя! @@ -3674,42 +3674,42 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! Плейлист пуст. - + After you have scanned your music collection you will find your tracks right here. После сканирования вашей музыкальной коллекции вы найдете треки прямо здесь. - + This collection is empty. Коллекция пуста - + SuperCollection Общая Коллекция - + Combined libraries of all your online friends Комбинированная библиотека всех ваших друзей онлайн - + Recently Played Tracks Последние Воспроизводимые Песни - + Recently played tracks from all your friends Последние воспроизводимые песни все ваших друзей - + Sorry, we could not find any recent plays! К сожалению, мы не смогли найти никаких воспроизвидений песен! diff --git a/lang/tomahawk_sv.ts b/lang/tomahawk_sv.ts index 47969e6e3..de3aea74d 100644 --- a/lang/tomahawk_sv.ts +++ b/lang/tomahawk_sv.ts @@ -261,12 +261,12 @@ ansluta och strömma från dig? AlbumInfoWidget - + Tracklist Spårlista - + Other Albums Andra album @@ -281,7 +281,7 @@ ansluta och strömma från dig? Tyvärr! Det gick inte hitta några spår från detta albumet! - + Other Albums by %1 Andra album av %1 @@ -303,32 +303,32 @@ ansluta och strömma från dig? ArtistInfoWidget - + Top Hits Största hits - + Related Artists Relaterade artister - + Albums Album - + Sorry, we could not find any albums for this artist! Tyvärr! Det gick inte hitta några album av denna artisten! - + Sorry, we could not find any related artists! Tyvärr! Det gick inte hitta några relaterade artister! - + Sorry, we could not find any top hits for this artist! Tyvärr! Det gick inte hitta några tophits av denna artisten @@ -3669,42 +3669,42 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! Spellistan är tom! - + After you have scanned your music collection you will find your tracks right here. - + This collection is empty. - + SuperCollection Superkollektion - + Combined libraries of all your online friends Kombinerat bibliotek av alla dina vänner online - + Recently Played Tracks Senast spelade spår - + Recently played tracks from all your friends Alla dina vänners senast spelade spår - + Sorry, we could not find any recent plays! Tyvärr! Det gick inte hitta några nyligen spelade spår diff --git a/lang/tomahawk_tr.ts b/lang/tomahawk_tr.ts index 4c9f59548..852809b39 100644 --- a/lang/tomahawk_tr.ts +++ b/lang/tomahawk_tr.ts @@ -260,12 +260,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist - + Other Albums @@ -280,7 +280,7 @@ connect and stream from you? - + Other Albums by %1 Diğer %1 Albümleri @@ -302,32 +302,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits En Çok Dinlenenler - + Related Artists Benzer Sanatçılar - + Albums Albümler - + Sorry, we could not find any albums for this artist! - + Sorry, we could not find any related artists! - + Sorry, we could not find any top hits for this artist! @@ -3659,42 +3659,42 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! - + After you have scanned your music collection you will find your tracks right here. - + This collection is empty. - + SuperCollection - + Combined libraries of all your online friends - + Recently Played Tracks - + Recently played tracks from all your friends - + Sorry, we could not find any recent plays! diff --git a/lang/tomahawk_zh_CN.ts b/lang/tomahawk_zh_CN.ts index 84eb991bc..7ac2d5681 100644 --- a/lang/tomahawk_zh_CN.ts +++ b/lang/tomahawk_zh_CN.ts @@ -260,12 +260,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist - + Other Albums 其他专辑 @@ -280,7 +280,7 @@ connect and stream from you? 抱歉，没有找到这张专辑的其他歌曲！ - + Other Albums by %1 %1 的其他专辑 @@ -302,32 +302,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits 最热歌曲 - + Related Artists 相关艺人 - + Albums 专辑 - + Sorry, we could not find any albums for this artist! 抱歉，未找到该艺术家的其他专辑！ - + Sorry, we could not find any related artists! 抱歉，没有找到相关的艺术家！ - + Sorry, we could not find any top hits for this artist! 抱歉，没有找到该艺术家的任何人气歌曲！ @@ -3675,42 +3675,42 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! 当前播放列表为空！ - + After you have scanned your music collection you will find your tracks right here. 在扫描音乐收藏后你将可以在这里找到你的音乐。 - + This collection is empty. 收藏为空。 - + SuperCollection 超级收藏 - + Combined libraries of all your online friends 当前在线的朋友的音乐库集合 - + Recently Played Tracks 最近播放歌曲 - + Recently played tracks from all your friends 所有朋友最近播放的歌曲 - + Sorry, we could not find any recent plays! 对不起，找不到任何最近播放项目！ diff --git a/lang/tomahawk_zh_TW.ts b/lang/tomahawk_zh_TW.ts index 6cafd037f..fbbb3dbe8 100644 --- a/lang/tomahawk_zh_TW.ts +++ b/lang/tomahawk_zh_TW.ts @@ -260,12 +260,12 @@ connect and stream from you? AlbumInfoWidget - + Tracklist - + Other Albums @@ -280,7 +280,7 @@ connect and stream from you? - + Other Albums by %1 列出所有其他專輯，依 %1 @@ -302,32 +302,32 @@ connect and stream from you? ArtistInfoWidget - + Top Hits 流行精選 - + Related Artists 相關演出者 - + Albums 專輯 - + Sorry, we could not find any albums for this artist! - + Sorry, we could not find any related artists! - + Sorry, we could not find any top hits for this artist! @@ -3659,42 +3659,42 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + This playlist is empty! - + After you have scanned your music collection you will find your tracks right here. - + This collection is empty. - + SuperCollection 超級收藏 - + Combined libraries of all your online friends 聯合您所有線上朋友的音樂庫 - + Recently Played Tracks - + Recently played tracks from all your friends - + Sorry, we could not find any recent plays! From ed5bf55b16e560bd5863ca4d951159d8b1c97801 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 07:37:47 +0100 Subject: [PATCH 24/28] * Mark AccountFactoryWrapper.ui's as non-translatable. --- src/libtomahawk/accounts/AccountFactoryWrapper.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/accounts/AccountFactoryWrapper.ui b/src/libtomahawk/accounts/AccountFactoryWrapper.ui index b7ba54df3..65a61ad71 100644 --- a/src/libtomahawk/accounts/AccountFactoryWrapper.ui +++ b/src/libtomahawk/accounts/AccountFactoryWrapper.ui @@ -11,7 +11,7 @@ - Dialog + Dialog @@ -27,7 +27,7 @@ - Description goes here + Description goes here Qt::AlignCenter From cc9aa4c6f7c95ba76ade0c56e3e201068f5308b2 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 07:43:14 +0100 Subject: [PATCH 25/28] * Try to fix source translation again. --- lang/tomahawk_en.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/tomahawk_en.ts b/lang/tomahawk_en.ts index 52ef8e964..3d6cecea2 100644 --- a/lang/tomahawk_en.ts +++ b/lang/tomahawk_en.ts @@ -3475,7 +3475,7 @@ enter the displayed PIN number here: Copyright 2010 - 2013 - Copyright 2010 - 2013 {2010 ?} + Copyright 2010 - 2013 From 655a5d8ecf616e0fbd419c797169be8597c03363 Mon Sep 17 00:00:00 2001 From: Tomahawk CI Date: Wed, 9 Jan 2013 08:02:50 +0100 Subject: [PATCH 26/28] Automatic merge of Transifex translations --- lang/tomahawk_ar.ts | 10 ---------- lang/tomahawk_bg.ts | 12 +----------- lang/tomahawk_bn_IN.ts | 10 ---------- lang/tomahawk_ca.ts | 12 +----------- lang/tomahawk_cs.ts | 12 +----------- lang/tomahawk_de.ts | 12 +----------- lang/tomahawk_el.ts | 10 ---------- lang/tomahawk_en.ts | 10 ---------- lang/tomahawk_es.ts | 12 +----------- lang/tomahawk_fi.ts | 12 +----------- lang/tomahawk_fr.ts | 12 +----------- lang/tomahawk_gl.ts | 12 +----------- lang/tomahawk_hi_IN.ts | 10 ---------- lang/tomahawk_hu.ts | 10 ---------- lang/tomahawk_it.ts | 12 +----------- lang/tomahawk_ja.ts | 12 +----------- lang/tomahawk_lt.ts | 12 +----------- lang/tomahawk_pl.ts | 12 +----------- lang/tomahawk_pt_BR.ts | 14 ++------------ lang/tomahawk_ru.ts | 12 +----------- lang/tomahawk_sv.ts | 12 +----------- lang/tomahawk_tr.ts | 10 ---------- lang/tomahawk_zh_CN.ts | 12 +----------- lang/tomahawk_zh_TW.ts | 10 ---------- 24 files changed, 17 insertions(+), 257 deletions(-) diff --git a/lang/tomahawk_ar.ts b/lang/tomahawk_ar.ts index 785426ec7..75de15730 100644 --- a/lang/tomahawk_ar.ts +++ b/lang/tomahawk_ar.ts @@ -29,16 +29,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - حوار - - - - Description goes here - أضف الوصف هنا - Add Account diff --git a/lang/tomahawk_bg.ts b/lang/tomahawk_bg.ts index 25c4dee72..10dc5b54c 100644 --- a/lang/tomahawk_bg.ts +++ b/lang/tomahawk_bg.ts @@ -28,16 +28,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - - - - - Description goes here - - Add Account @@ -3490,7 +3480,7 @@ enter the displayed PIN number here: Copyright 2010 - 2013 - + Всички права - запазени. 2010 - 2013 diff --git a/lang/tomahawk_bn_IN.ts b/lang/tomahawk_bn_IN.ts index cad839415..97b42c8bf 100644 --- a/lang/tomahawk_bn_IN.ts +++ b/lang/tomahawk_bn_IN.ts @@ -28,16 +28,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - - - - - Description goes here - - Add Account diff --git a/lang/tomahawk_ca.ts b/lang/tomahawk_ca.ts index 9de03308f..6200b819d 100644 --- a/lang/tomahawk_ca.ts +++ b/lang/tomahawk_ca.ts @@ -28,16 +28,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - Diàleg - - - - Description goes here - Aquí va la descripció - Add Account @@ -3471,7 +3461,7 @@ introduïu el PIN aquí: Copyright 2010 - 2013 - + Copyright 2010 - 2013 diff --git a/lang/tomahawk_cs.ts b/lang/tomahawk_cs.ts index 2d385a166..c5d2e8f7e 100644 --- a/lang/tomahawk_cs.ts +++ b/lang/tomahawk_cs.ts @@ -29,16 +29,6 @@ se s vámi spojil? AccountFactoryWrapper - - - Dialog - Dialog - - - - Description goes here - Popis zde - Add Account @@ -3472,7 +3462,7 @@ služby Twitter zde zadejte tam zobrazené číslo PIN: Copyright 2010 - 2013 - + Autorské právo 2010 - 2013 diff --git a/lang/tomahawk_de.ts b/lang/tomahawk_de.ts index b64fe67ce..0dddeb3c2 100644 --- a/lang/tomahawk_de.ts +++ b/lang/tomahawk_de.ts @@ -29,16 +29,6 @@ erlauben sich mit dir zu verbinden? AccountFactoryWrapper - - - Dialog - Dialog - - - - Description goes here - Beschreibung hier - Add Account @@ -3470,7 +3460,7 @@ Tomahawk auf Twitter's Website authentifiziert hast: Copyright 2010 - 2013 - + Copright 2010 - 2013 diff --git a/lang/tomahawk_el.ts b/lang/tomahawk_el.ts index 10320f41d..f1dbc4567 100644 --- a/lang/tomahawk_el.ts +++ b/lang/tomahawk_el.ts @@ -28,16 +28,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - Διάλογος - - - - Description goes here - Η περιγραφή πάει εδώ - Add Account diff --git a/lang/tomahawk_en.ts b/lang/tomahawk_en.ts index 3d6cecea2..7276015b6 100644 --- a/lang/tomahawk_en.ts +++ b/lang/tomahawk_en.ts @@ -29,16 +29,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - Dialog - - - - Description goes here - Description goes here - Add Account diff --git a/lang/tomahawk_es.ts b/lang/tomahawk_es.ts index 05d1f4d0c..76e2ca722 100644 --- a/lang/tomahawk_es.ts +++ b/lang/tomahawk_es.ts @@ -29,16 +29,6 @@ conectarse a usted y transmitir música? AccountFactoryWrapper - - - Dialog - Diálogo - - - - Description goes here - Descripción - Add Account @@ -3475,7 +3465,7 @@ introduzca su número PIN aquí: Copyright 2010 - 2013 - + Copyright 2010 - 2013 diff --git a/lang/tomahawk_fi.ts b/lang/tomahawk_fi.ts index 8efe39b71..c11ba7a00 100644 --- a/lang/tomahawk_fi.ts +++ b/lang/tomahawk_fi.ts @@ -29,16 +29,6 @@ yhdistää ja toistaa sinulta virtaa? AccountFactoryWrapper - - - Dialog - Ikkuna - - - - Description goes here - Kuvaus tulee tähän - Add Account @@ -3478,7 +3468,7 @@ anna siellä näytetty PIN-koodi tähän: Copyright 2010 - 2013 - + Copyright 2010–2013 diff --git a/lang/tomahawk_fr.ts b/lang/tomahawk_fr.ts index 356b32c46..d99a59513 100644 --- a/lang/tomahawk_fr.ts +++ b/lang/tomahawk_fr.ts @@ -29,16 +29,6 @@ de se connecter et streamer de vous? AccountFactoryWrapper - - - Dialog - Dialog - - - - Description goes here - ici la description - Add Account @@ -3472,7 +3462,7 @@ saisissez le numéro PIN ici : Copyright 2010 - 2013 - + Droit d'auteur 2010 - 2013 diff --git a/lang/tomahawk_gl.ts b/lang/tomahawk_gl.ts index 5d0defb78..ebab640e0 100644 --- a/lang/tomahawk_gl.ts +++ b/lang/tomahawk_gl.ts @@ -28,16 +28,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - Diálogo - - - - Description goes here - A descrición vaia aquí - Add Account @@ -3473,7 +3463,7 @@ enter the displayed PIN number here: Copyright 2010 - 2013 - + Copyright 2010 - 2013 diff --git a/lang/tomahawk_hi_IN.ts b/lang/tomahawk_hi_IN.ts index 7b5585395..0426b9326 100644 --- a/lang/tomahawk_hi_IN.ts +++ b/lang/tomahawk_hi_IN.ts @@ -28,16 +28,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - - - - - Description goes here - - Add Account diff --git a/lang/tomahawk_hu.ts b/lang/tomahawk_hu.ts index b10cc8810..649dc0534 100644 --- a/lang/tomahawk_hu.ts +++ b/lang/tomahawk_hu.ts @@ -28,16 +28,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - - - - - Description goes here - - Add Account diff --git a/lang/tomahawk_it.ts b/lang/tomahawk_it.ts index 554c97f1e..485f93b56 100644 --- a/lang/tomahawk_it.ts +++ b/lang/tomahawk_it.ts @@ -28,16 +28,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - Interfaccia di dialogo - - - - Description goes here - Descrizione va qui - Add Account @@ -3462,7 +3452,7 @@ enter the displayed PIN number here: Copyright 2010 - 2013 - + Copyright 2010 - 2013 diff --git a/lang/tomahawk_ja.ts b/lang/tomahawk_ja.ts index dd05acf2d..32147d67a 100644 --- a/lang/tomahawk_ja.ts +++ b/lang/tomahawk_ja.ts @@ -28,16 +28,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - ダイアログ - - - - Description goes here - 内容 - Add Account @@ -3475,7 +3465,7 @@ enter the displayed PIN number here: Copyright 2010 - 2013 - + Copyright 2010 - 2013 diff --git a/lang/tomahawk_lt.ts b/lang/tomahawk_lt.ts index 074e6bb2e..08915318c 100644 --- a/lang/tomahawk_lt.ts +++ b/lang/tomahawk_lt.ts @@ -28,16 +28,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - - - - - Description goes here - Apibūdinimo vieta čia - Add Account @@ -3462,7 +3452,7 @@ enter the displayed PIN number here: Copyright 2010 - 2013 - + Autorinės teisės 2010 - 2013 diff --git a/lang/tomahawk_pl.ts b/lang/tomahawk_pl.ts index e40e38617..831d544a3 100644 --- a/lang/tomahawk_pl.ts +++ b/lang/tomahawk_pl.ts @@ -29,16 +29,6 @@ połączyć się i strumieniować od ciebie? AccountFactoryWrapper - - - Dialog - - - - - Description goes here - Tutaj pojawi się opis - Add Account @@ -3472,7 +3462,7 @@ wprowadź pokazany numer PIN tutaj: Copyright 2010 - 2013 - + Copyright 2010 - 2013 diff --git a/lang/tomahawk_pt_BR.ts b/lang/tomahawk_pt_BR.ts index 5eb206dda..122d437ee 100644 --- a/lang/tomahawk_pt_BR.ts +++ b/lang/tomahawk_pt_BR.ts @@ -29,16 +29,6 @@ se conecte e faça o stream de você? AccountFactoryWrapper - - - Dialog - Aba - - - - Description goes here - Descrição aqui - Add Account @@ -1123,7 +1113,7 @@ se conecte e faça o stream de você? A playlist by %1, created %2. - Uma lista de reprodução de %1, criada %2. {1,?} + Uma lista de reprodução de %1, criada %2. @@ -3472,7 +3462,7 @@ colocar o número PIN mostrado aqui: Copyright 2010 - 2013 - + Copyright 2010 - 2013 diff --git a/lang/tomahawk_ru.ts b/lang/tomahawk_ru.ts index b196af2e5..504cdfd6f 100644 --- a/lang/tomahawk_ru.ts +++ b/lang/tomahawk_ru.ts @@ -29,16 +29,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - Диалог - - - - Description goes here - Описание тут - Add Account @@ -3473,7 +3463,7 @@ enter the displayed PIN number here: Copyright 2010 - 2013 - + Авторское право 2010 - 2013 diff --git a/lang/tomahawk_sv.ts b/lang/tomahawk_sv.ts index de3aea74d..e17b65bb1 100644 --- a/lang/tomahawk_sv.ts +++ b/lang/tomahawk_sv.ts @@ -29,16 +29,6 @@ ansluta och strömma från dig? AccountFactoryWrapper - - - Dialog - Dialog - - - - Description goes here - Beskrivning här - Add Account @@ -3472,7 +3462,7 @@ anger du PIN-koden här: Copyright 2010 - 2013 - + Copyright 2010 - 2013 diff --git a/lang/tomahawk_tr.ts b/lang/tomahawk_tr.ts index 852809b39..8301a3179 100644 --- a/lang/tomahawk_tr.ts +++ b/lang/tomahawk_tr.ts @@ -28,16 +28,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - İletişim Kutusu - - - - Description goes here - Buraya açıklama gelecek - Add Account diff --git a/lang/tomahawk_zh_CN.ts b/lang/tomahawk_zh_CN.ts index 7ac2d5681..1930041e6 100644 --- a/lang/tomahawk_zh_CN.ts +++ b/lang/tomahawk_zh_CN.ts @@ -28,16 +28,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - 对话框 - - - - Description goes here - 注释于此处 - Add Account @@ -3473,7 +3463,7 @@ enter the displayed PIN number here: Copyright 2010 - 2013 - + 版权所有 2010 - 2013 diff --git a/lang/tomahawk_zh_TW.ts b/lang/tomahawk_zh_TW.ts index fbbb3dbe8..24b299b1d 100644 --- a/lang/tomahawk_zh_TW.ts +++ b/lang/tomahawk_zh_TW.ts @@ -28,16 +28,6 @@ connect and stream from you? AccountFactoryWrapper - - - Dialog - 對話框 - - - - Description goes here - 說明放在這裡 - Add Account From 04e813238411e469065ba651a00fd40efc3aeffb Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 9 Jan 2013 09:06:04 +0100 Subject: [PATCH 27/28] * Speed up item detection & size-hint calculation for huge collections. --- src/libtomahawk/Typedefs.h | 8 +++++ src/libtomahawk/playlist/PlayableModel.cpp | 31 +++++++++++++++---- src/libtomahawk/playlist/PlayableProxyModel.h | 2 +- src/libtomahawk/playlist/TreeItemDelegate.cpp | 16 +++++++--- 4 files changed, 45 insertions(+), 12 deletions(-) diff --git a/src/libtomahawk/Typedefs.h b/src/libtomahawk/Typedefs.h index 3d5f22785..fc0dc5c6b 100644 --- a/src/libtomahawk/Typedefs.h +++ b/src/libtomahawk/Typedefs.h @@ -78,6 +78,14 @@ namespace Tomahawk InfoSystemMode, }; + enum ModelTypes + { + TypeArtist = 0, + TypeAlbum, + TypeQuery, + TypeResult + }; + class ExternalResolver; typedef boost::function ResolverFactoryFunc; diff --git a/src/libtomahawk/playlist/PlayableModel.cpp b/src/libtomahawk/playlist/PlayableModel.cpp index 65e82ce24..4ac5cbcb2 100644 --- a/src/libtomahawk/playlist/PlayableModel.cpp +++ b/src/libtomahawk/playlist/PlayableModel.cpp @@ -24,14 +24,15 @@ #include #include -#include "audio/AudioEngine.h" -#include "utils/TomahawkUtils.h" -#include "Source.h" - #include "Artist.h" #include "Album.h" #include "Pipeline.h" #include "PlayableItem.h" +#include "PlayableProxyModel.h" +#include "Source.h" +#include "Typedefs.h" +#include "audio/AudioEngine.h" +#include "utils/TomahawkUtils.h" #include "utils/Logger.h" using namespace Tomahawk; @@ -274,11 +275,29 @@ PlayableModel::data( const QModelIndex& index, int role ) const { return QVariant(); } - - if ( role == Qt::TextAlignmentRole ) + else if ( role == Qt::TextAlignmentRole ) { return QVariant( columnAlignment( index.column() ) ); } + else if ( role == PlayableProxyModel::TypeRole ) + { + if ( entry->result() ) + { + return Tomahawk::TypeResult; + } + else if ( entry->query() ) + { + return Tomahawk::TypeQuery; + } + else if ( entry->artist() ) + { + return Tomahawk::TypeArtist; + } + else if ( entry->album() ) + { + return Tomahawk::TypeAlbum; + } + } if ( !entry->query().isNull() ) { diff --git a/src/libtomahawk/playlist/PlayableProxyModel.h b/src/libtomahawk/playlist/PlayableProxyModel.h index bb8b8924a..c3a0d7be0 100644 --- a/src/libtomahawk/playlist/PlayableProxyModel.h +++ b/src/libtomahawk/playlist/PlayableProxyModel.h @@ -36,7 +36,7 @@ public: { Detailed = 0, Short = 1, ShortWithAvatars = 2, Large = 3, Collection = 4 }; enum PlayableProxyModelRole - { StyleRole = Qt::UserRole + 1 }; + { StyleRole = Qt::UserRole + 1, TypeRole }; explicit PlayableProxyModel ( QObject* parent = 0 ); virtual ~PlayableProxyModel() {} diff --git a/src/libtomahawk/playlist/TreeItemDelegate.cpp b/src/libtomahawk/playlist/TreeItemDelegate.cpp index 38db070b9..7b66cf664 100644 --- a/src/libtomahawk/playlist/TreeItemDelegate.cpp +++ b/src/libtomahawk/playlist/TreeItemDelegate.cpp @@ -35,6 +35,7 @@ #include "PlayableItem.h" #include "TreeProxyModel.h" #include "TreeView.h" +#include "Typedefs.h" TreeItemDelegate::TreeItemDelegate( TreeView* parent, TreeProxyModel* proxy ) @@ -48,23 +49,28 @@ TreeItemDelegate::TreeItemDelegate( TreeView* parent, TreeProxyModel* proxy ) QSize TreeItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const { - QSize size = QStyledItemDelegate::sizeHint( option, index ); + QSize size; if ( index.isValid() ) { - PlayableItem* item = m_model->sourceModel()->itemFromIndex( m_model->mapToSource( index ) ); - if ( item ) + Tomahawk::ModelTypes type = (Tomahawk::ModelTypes)index.data( PlayableProxyModel::TypeRole ).toInt(); + switch ( type ) { - if ( item->album() ) + case Tomahawk::TypeAlbum: { size.setHeight( option.fontMetrics.height() * 3 ); return size; } - else if ( item->query() || item->result() ) + + case Tomahawk::TypeQuery: + case Tomahawk::TypeResult: { size.setHeight( option.fontMetrics.height() * 1.6 ); return size; } + + default: + break; } } From 93256dbea38058ff952584623e5b789afe175a51 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 9 Jan 2013 12:40:08 +0100 Subject: [PATCH 28/28] Fix spinner graphic being cut off on certain DPI values. --- src/widgets/AccountWidget.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/widgets/AccountWidget.cpp b/src/widgets/AccountWidget.cpp index 52ab83996..e20512546 100644 --- a/src/widgets/AccountWidget.cpp +++ b/src/widgets/AccountWidget.cpp @@ -71,20 +71,21 @@ AccountWidget::AccountWidget( QWidget* parent ) idContLayout->addWidget( m_idLabel ); m_spinnerWidget = new QWidget( idContainer ); - QSize spinnerSize = 16 > m_spinnerWidget->logicalDpiX() * .2 ? + QSize spinnerSize = 16 > TomahawkUtils::defaultFontHeight() ? QSize( 16, 16 ) : - QSize( m_spinnerWidget->logicalDpiX() * .15, - m_spinnerWidget->logicalDpiX() * .15 ); + QSize( TomahawkUtils::defaultFontHeight(), + TomahawkUtils::defaultFontHeight() ); m_spinnerWidget->setFixedSize( spinnerSize ); idContLayout->addWidget( m_spinnerWidget ); - m_spinnerWidget->setContentsMargins( 0, 0, 0, 0 ); - m_spinner = new AnimatedSpinner( m_spinnerWidget->size(), m_spinnerWidget ); + m_spinnerWidget->setContentsMargins( 0, 1, 0, 0 ); + m_spinner = new AnimatedSpinner( m_spinnerWidget->size() - QSize( 2, 2 ), m_spinnerWidget ); idContainer->setStyleSheet( QString( "QFrame {" "border: 1px solid #e9e9e9;" "border-radius: %1px;" "background: #e9e9e9;" "}" ).arg( idContainer->sizeHint().height() / 2 + 1 ) ); + idContainer->setMinimumHeight( spinnerSize.height() + 6 /*margins*/ ); m_statusToggle = new SlideSwitchButton( this ); m_statusToggle->setContentsMargins( 0, 0, 0, 0 );