From f500efdaf980ad0729dadce6f1e12e3f5be476a8 Mon Sep 17 00:00:00 2001 From: Tomahawk CI Date: Mon, 2 Jul 2012 22:17:43 +0000 Subject: [PATCH 01/16] Automatic merge of Transifex translations --- lang/tomahawk_ar.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_bg.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_ca.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_de.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_en.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_es.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_fr.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_ja.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_pl.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_pt_BR.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_ru.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_sv.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_tr.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_zh_CN.ts | 58 +++++++++++++++++++++--------------------- lang/tomahawk_zh_TW.ts | 58 +++++++++++++++++++++--------------------- 15 files changed, 435 insertions(+), 435 deletions(-) diff --git a/lang/tomahawk_ar.ts b/lang/tomahawk_ar.ts index 38b82ab7a..6ad3f1286 100644 --- a/lang/tomahawk_ar.ts +++ b/lang/tomahawk_ar.ts @@ -208,17 +208,17 @@ connect and stream from you? غلاف - + 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! نعتذر، لم نستطيع إيجاد أغاني مشهورة جدا لهذا الفنان! @@ -661,68 +661,68 @@ connect and stream from you? PlayableModel - + Artist فنان - + Title عنوان - + Composer مؤلف - + Album البوم - + Track اغنية - + Duration مدة - + Bitrate معدل البت - + Age عمر - + Year سنة - + Size حجم - + Origin أصل - + Score علامة - - + + Name إسم @@ -3456,19 +3456,19 @@ enter the displayed PIN number here: TreeModel - + All Artists جميع الفنانين - - + + My Collection مجموعتي الخاصة - - + + Collection of %1 مجموعة %1 @@ -3557,37 +3557,37 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + 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 مكتبات مجمعة لكل اصحابك المتصلين - + All available albums جميع الألبومات الجديدة - + Recently Played Tracks الأغاني التي إستمعت إليها مؤخرا - + Recently played tracks from all your friends جميع الأغاني التي استمع إليها أصدقائك مؤخرا diff --git a/lang/tomahawk_bg.ts b/lang/tomahawk_bg.ts index 7ac5a77db..9c8adb73c 100644 --- a/lang/tomahawk_bg.ts +++ b/lang/tomahawk_bg.ts @@ -207,17 +207,17 @@ connect and stream from you? - + 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! Съжалявам, но не откривам нито една хитова песен на този артист! @@ -663,68 +663,68 @@ Tomahaw създаде доклад относно това и изпращай PlayableModel - + Artist Артист - + Title Име - + Composer Композитор - + Album Албум - + Track Песен - + Duration Продължителност - + Bitrate Качество - + Age Възраст - + Year Година - + Size Големина - + Origin Източник - + Score Резултат - - + + Name Име @@ -3466,19 +3466,19 @@ enter the displayed PIN number here: TreeModel - + All Artists Всички артисти - - + + My Collection Моята колекция - - + + Collection of %1 Колекцията на %1 @@ -3568,38 +3568,38 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + 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 Обща колекция с всичките ми приятели на линия - + All available albums Всички налични албуми - + Recently Played Tracks Наскоро изпълени песни - + Recently played tracks from all your friends Наскоро изпълнени песни от всичките ти приятели diff --git a/lang/tomahawk_ca.ts b/lang/tomahawk_ca.ts index 7b44df220..d23f22602 100644 --- a/lang/tomahawk_ca.ts +++ b/lang/tomahawk_ca.ts @@ -207,17 +207,17 @@ connect and stream from you? - + 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! @@ -660,68 +660,68 @@ connect and stream from you? PlayableModel - + Artist Artista - + Title Cançó - + Composer Compositor - + Album Àlbum - + Track Número - + Duration Durada - + Bitrate Bitrate - + Age Edat - + Year Any - + Size Mida - + Origin Origen - + Score Puntuació - - + + Name Nom @@ -3455,19 +3455,19 @@ introduïu el PIN aquí: TreeModel - + All Artists Tots els Artistes - - + + My Collection La meva Col·lecció - - + + Collection of %1 Col·lecció de %1 @@ -3556,37 +3556,37 @@ Podeu reenviar un missatge de sincronisme en qualsevol moment simplement enviant ViewManager - + 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 - + All available albums Tots els àlbums disponibles - + Recently Played Tracks Cançons Escoltades Recentment - + Recently played tracks from all your friends Cançons escoltades recentment pels amics diff --git a/lang/tomahawk_de.ts b/lang/tomahawk_de.ts index e4babff34..cb4b375f8 100644 --- a/lang/tomahawk_de.ts +++ b/lang/tomahawk_de.ts @@ -208,17 +208,17 @@ erlauben sich mit dir zu verbinden? Cover - + 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! @@ -661,68 +661,68 @@ erlauben sich mit dir zu verbinden? PlayableModel - + Artist Künstler - + Title Titel - + Composer Komponent - + Album Album - + Track Lied - + Duration Dauer - + Bitrate Bitrate - + Age Alter - + Year Jahr - + Size Größe - + Origin Quelle - + Score Wertung - - + + Name Name @@ -3451,19 +3451,19 @@ Tomahawk auf Twitter's Website authentifiziert hast: TreeModel - + All Artists Alle Künstler - - + + My Collection Meine Sammlung - - + + Collection of %1 Sammlung von %1 @@ -3547,37 +3547,37 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + 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 - + All available albums Alle verfügbaren Alben - + Recently Played Tracks Zuletzt gehörte Lieder - + Recently played tracks from all your friends Zuletzt gehörte Lieder all deiner Freunde diff --git a/lang/tomahawk_en.ts b/lang/tomahawk_en.ts index e39879d2b..55ce19cba 100644 --- a/lang/tomahawk_en.ts +++ b/lang/tomahawk_en.ts @@ -208,17 +208,17 @@ connect and stream from you? Cover - + 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! @@ -661,68 +661,68 @@ connect and stream from you? PlayableModel - + Artist Artist - + Title Title - + Composer Composer - + Album Album - + Track Track - + Duration Duration - + Bitrate Bitrate - + Age Age - + Year Year - + Size Size - + Origin Origin - + Score Score - - + + Name Name @@ -3456,19 +3456,19 @@ enter the displayed PIN number here: TreeModel - + All Artists All Artists - - + + My Collection My Collection - - + + Collection of %1 Collection of %1 @@ -3557,37 +3557,37 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + 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 - + All available albums All available albums - + Recently Played Tracks Recently Played Tracks - + Recently played tracks from all your friends Recently played tracks from all your friends diff --git a/lang/tomahawk_es.ts b/lang/tomahawk_es.ts index e3cfa763d..f250ce99c 100644 --- a/lang/tomahawk_es.ts +++ b/lang/tomahawk_es.ts @@ -207,17 +207,17 @@ connect and stream from you? - + 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! @@ -660,68 +660,68 @@ connect and stream from you? PlayableModel - + Artist - + Title - + Composer - + Album - + Track - + Duration - + Bitrate - + Age - + Year - + Size - + Origin - + Score - - + + Name @@ -3454,19 +3454,19 @@ introduzca su número PIN aquí: TreeModel - + All Artists Todos los artistas - - + + My Collection Mi colección - - + + Collection of %1 Colección de %1 @@ -3555,37 +3555,37 @@ Puede reenviar el mensaje de sincronización en cualquier momento simplemente en ViewManager - + After you have scanned your music collection you will find your tracks right here. - + This collection is empty. - + SuperCollection SuperColección - + Combined libraries of all your online friends Bibliotecas combinadas de todos tus amigos conectados - + All available albums Todos los álbumes disponibles - + Recently Played Tracks Temas Escuchados Recientemente - + Recently played tracks from all your friends Temas escuchados recientemente por mis amigos diff --git a/lang/tomahawk_fr.ts b/lang/tomahawk_fr.ts index 163827f89..7256b2ff0 100644 --- a/lang/tomahawk_fr.ts +++ b/lang/tomahawk_fr.ts @@ -208,17 +208,17 @@ de se connecter et streamer de vous? Pochette - + 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! @@ -661,68 +661,68 @@ de se connecter et streamer de vous? PlayableModel - + Artist Artiste - + Title Titre - + Composer Compositeur - + Album Album - + Track Piste - + Duration Durée - + Bitrate Bitrate - + Age Age - + Year Année - + Size Taille - + Origin Origine - + Score Score - - + + Name Nom @@ -3456,19 +3456,19 @@ saisissez le numéro PIN ici : TreeModel - + All Artists Tous les artistes - - + + My Collection Ma Collection - - + + Collection of %1 Collection de %1 @@ -3557,37 +3557,37 @@ Vous pouvez envoyer un message de synchronisation quand vous le souhaitez en env ViewManager - + 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 - + All available albums Tous les albums disponibles - + Recently Played Tracks Derniers titres joués - + Recently played tracks from all your friends Derniers titres joués par vos amis diff --git a/lang/tomahawk_ja.ts b/lang/tomahawk_ja.ts index 86e89c70c..d20b56f53 100644 --- a/lang/tomahawk_ja.ts +++ b/lang/tomahawk_ja.ts @@ -207,17 +207,17 @@ connect and stream from you? - + 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! @@ -661,68 +661,68 @@ connect and stream from you? PlayableModel - + Artist アーティスト - + Title タイトル - + Composer 作曲者 - + Album アルバム - + Track トラック - + Duration 時間 - + Bitrate ビットレート - + Age 変更日 - + Year 年 - + Size サイズ - + Origin 音源 - + Score スコア - - + + Name 名前 @@ -3446,19 +3446,19 @@ Meta+Ctrl+Z TreeModel - + All Artists すべてのアーティスト - - + + My Collection マイコレクション - - + + Collection of %1 %1のコレクション @@ -3547,38 +3547,38 @@ Twitterを使っている友達にTomahawkを接続したいなら、ツイー ViewManager - + 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 オンラインの友達全員のライブラリ - + All available albums すべてのアルバム - + Recently Played Tracks 最近再生したトラック - + Recently played tracks from all your friends 友達の最近再生したトラック diff --git a/lang/tomahawk_pl.ts b/lang/tomahawk_pl.ts index 6be5385bb..1bd38a500 100644 --- a/lang/tomahawk_pl.ts +++ b/lang/tomahawk_pl.ts @@ -207,17 +207,17 @@ connect and stream from you? - + 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! @@ -660,68 +660,68 @@ connect and stream from you? PlayableModel - + Artist - + Title - + Composer - + Album - + Track - + Duration - + Bitrate - + Age - + Year - + Size - + Origin - + Score - - + + Name @@ -3450,19 +3450,19 @@ wprowadź pokazany numer PIN tutaj: TreeModel - + All Artists Wszyscy Artyści - - + + My Collection Moja Kolekcja - - + + Collection of %1 Kolekcja %1 @@ -3551,37 +3551,37 @@ Zawsze możesz ponownie wysłać wiadomość synchronizacyjną - po prostu wyśl ViewManager - + 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 - + All available albums Wszystkie dostępne albumy - + Recently Played Tracks - + Recently played tracks from all your friends diff --git a/lang/tomahawk_pt_BR.ts b/lang/tomahawk_pt_BR.ts index c88bcd476..8ad6ec4ca 100644 --- a/lang/tomahawk_pt_BR.ts +++ b/lang/tomahawk_pt_BR.ts @@ -207,17 +207,17 @@ connect and stream from you? Capa - + 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! @@ -660,68 +660,68 @@ connect and stream from you? PlayableModel - + Artist Artista - + Title Título - + Composer Compositor - + Album Álbum - + Track Faixa - + Duration Duração - + Bitrate Taxa de bits - + Age Idade - + Year Ano - + Size Tamanho - + Origin Origem - + Score Pontuação - - + + Name Nome @@ -3455,19 +3455,19 @@ colocar o número PIN mostrado aqui: TreeModel - + All Artists Todos artistas - - + + My Collection Minha biblioteca - - + + Collection of %1 Biblioteca de %1 @@ -3556,37 +3556,37 @@ Você pode enviar uma outra mensagem de sincronia a qualquer momento simplesment ViewManager - + 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 - + All available albums Todos os álbuns disponíveis - + Recently Played Tracks Faixas Reproduzidas Recentemente - + Recently played tracks from all your friends Faixas reproduzidas recentemente por todos os seus amigos diff --git a/lang/tomahawk_ru.ts b/lang/tomahawk_ru.ts index ee72c72fc..bed56d77e 100644 --- a/lang/tomahawk_ru.ts +++ b/lang/tomahawk_ru.ts @@ -207,17 +207,17 @@ connect and stream from you? - + 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! @@ -660,68 +660,68 @@ connect and stream from you? PlayableModel - + Artist Исполнитель - + Title Название - + Composer Композитор - + Album Альбом - + Track Песня - + Duration Продолжительность - + Bitrate Битрей - + Age - + Year Год - + Size Размер - + Origin - + Score Количество воспроизведений - - + + Name Имя @@ -3449,19 +3449,19 @@ enter the displayed PIN number here: TreeModel - + All Artists Все исполнители - - + + My Collection Моя коллекция - - + + Collection of %1 Коллекция из %1 @@ -3549,37 +3549,37 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + 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 Комбинированные библиотек всех ваших друзей онлайн - + All available albums Доступные альбомы - + Recently Played Tracks - + Recently played tracks from all your friends diff --git a/lang/tomahawk_sv.ts b/lang/tomahawk_sv.ts index 78aa8eef4..7fa76e1fc 100644 --- a/lang/tomahawk_sv.ts +++ b/lang/tomahawk_sv.ts @@ -207,17 +207,17 @@ connect and stream from you? - + 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! @@ -660,68 +660,68 @@ connect and stream from you? PlayableModel - + Artist - + Title - + Composer - + Album - + Track - + Duration - + Bitrate - + Age - + Year - + Size - + Origin - + Score - - + + Name @@ -3444,19 +3444,19 @@ enter the displayed PIN number here: TreeModel - + All Artists Alla artister - - + + My Collection Min samling - - + + Collection of %1 Samling av %1 @@ -3540,37 +3540,37 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + 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 - + All available albums Alla tillgängliga album - + Recently Played Tracks - + Recently played tracks from all your friends diff --git a/lang/tomahawk_tr.ts b/lang/tomahawk_tr.ts index f5f0ff044..dea8ad762 100644 --- a/lang/tomahawk_tr.ts +++ b/lang/tomahawk_tr.ts @@ -207,17 +207,17 @@ connect and stream from you? - + 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! @@ -660,68 +660,68 @@ connect and stream from you? PlayableModel - + Artist - + Title - + Composer - + Album - + Track - + Duration - + Bitrate - + Age - + Year - + Size - + Origin - + Score - - + + Name @@ -3443,19 +3443,19 @@ enter the displayed PIN number here: TreeModel - + All Artists - - + + My Collection - - + + Collection of %1 @@ -3539,37 +3539,37 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + 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 - + All available albums - + Recently Played Tracks - + Recently played tracks from all your friends diff --git a/lang/tomahawk_zh_CN.ts b/lang/tomahawk_zh_CN.ts index ce8c4bb54..79b20b82b 100644 --- a/lang/tomahawk_zh_CN.ts +++ b/lang/tomahawk_zh_CN.ts @@ -207,17 +207,17 @@ connect and stream from you? - + 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! @@ -660,68 +660,68 @@ connect and stream from you? PlayableModel - + Artist - + Title - + Composer - + Album - + Track - + Duration - + Bitrate - + Age - + Year - + Size - + Origin - + Score - - + + Name @@ -3443,19 +3443,19 @@ enter the displayed PIN number here: TreeModel - + All Artists - - + + My Collection - - + + Collection of %1 @@ -3539,37 +3539,37 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + 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 - + All available albums - + Recently Played Tracks 最近播放曲目 - + Recently played tracks from all your friends 所有朋友最近播放的曲目 diff --git a/lang/tomahawk_zh_TW.ts b/lang/tomahawk_zh_TW.ts index f4300410a..84e8a7249 100644 --- a/lang/tomahawk_zh_TW.ts +++ b/lang/tomahawk_zh_TW.ts @@ -207,17 +207,17 @@ connect and stream from you? - + 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! @@ -660,68 +660,68 @@ connect and stream from you? PlayableModel - + Artist - + Title - + Composer - + Album - + Track - + Duration - + Bitrate - + Age - + Year - + Size - + Origin - + Score - - + + Name @@ -3443,19 +3443,19 @@ enter the displayed PIN number here: TreeModel - + All Artists - - + + My Collection 我的收藏 - - + + Collection of %1 @@ -3539,37 +3539,37 @@ You can re-send a sync message at any time simply by sending another tweet using ViewManager - + 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 聯合您所有線上朋友的音樂庫 - + All available albums 所有現有專輯 - + Recently Played Tracks - + Recently played tracks from all your friends From a2f880d16079167ddcb23775884d82943f99df99 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 02:44:59 +0200 Subject: [PATCH 02/16] * Removed filter/setFilter methods from PlaylistInterfaces. --- src/libtomahawk/AlbumPlaylistInterface.h | 2 -- src/libtomahawk/ArtistPlaylistInterface.h | 2 -- src/libtomahawk/PlaylistInterface.h | 3 --- src/libtomahawk/PlaylistPlaylistInterface.h | 2 -- src/libtomahawk/SourcePlaylistInterface.h | 1 - .../PlayableProxyModelPlaylistInterface.cpp | 13 ------------- .../playlist/PlayableProxyModelPlaylistInterface.h | 1 - .../playlist/TreeProxyModelPlaylistInterface.cpp | 9 --------- .../playlist/TreeProxyModelPlaylistInterface.h | 6 ------ 9 files changed, 39 deletions(-) diff --git a/src/libtomahawk/AlbumPlaylistInterface.h b/src/libtomahawk/AlbumPlaylistInterface.h index 14d6efd19..b1caf14ff 100644 --- a/src/libtomahawk/AlbumPlaylistInterface.h +++ b/src/libtomahawk/AlbumPlaylistInterface.h @@ -56,8 +56,6 @@ public: virtual void setRepeatMode( PlaylistModes::RepeatMode ) {} virtual void setShuffled( bool ) {} - virtual void setFilter( const QString& /*pattern*/ ) {} - signals: void tracksLoaded( Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection ); diff --git a/src/libtomahawk/ArtistPlaylistInterface.h b/src/libtomahawk/ArtistPlaylistInterface.h index 03b1b36bd..920923512 100644 --- a/src/libtomahawk/ArtistPlaylistInterface.h +++ b/src/libtomahawk/ArtistPlaylistInterface.h @@ -55,8 +55,6 @@ public: virtual void setRepeatMode( PlaylistModes::RepeatMode ) {} virtual void setShuffled( bool ) {} - virtual void setFilter( const QString& /*pattern*/ ) {} - signals: void tracksLoaded( Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection ); diff --git a/src/libtomahawk/PlaylistInterface.h b/src/libtomahawk/PlaylistInterface.h index 380c80430..b0efdb923 100644 --- a/src/libtomahawk/PlaylistInterface.h +++ b/src/libtomahawk/PlaylistInterface.h @@ -66,9 +66,6 @@ public: virtual PlaylistModes::LatchMode latchMode() const { return m_latchMode; } virtual void setLatchMode( PlaylistModes::LatchMode latchMode ) { m_latchMode = latchMode; } - virtual QString filter() const { return m_filter; } - virtual void setFilter( const QString& pattern ) { m_filter = pattern; } - virtual void reset() {} //TODO: Get rid of the next two functions once all playlsitinterfaces are factored out diff --git a/src/libtomahawk/PlaylistPlaylistInterface.h b/src/libtomahawk/PlaylistPlaylistInterface.h index 4db326431..c234a951a 100644 --- a/src/libtomahawk/PlaylistPlaylistInterface.h +++ b/src/libtomahawk/PlaylistPlaylistInterface.h @@ -55,8 +55,6 @@ public: virtual PlaylistModes::RepeatMode repeatMode() const { return PlaylistModes::NoRepeat; } virtual bool shuffled() const { return false; } - virtual void setFilter( const QString& /*pattern*/ ) {} - public slots: virtual void setRepeatMode( PlaylistModes::RepeatMode ) {} virtual void setShuffled( bool ) {} diff --git a/src/libtomahawk/SourcePlaylistInterface.h b/src/libtomahawk/SourcePlaylistInterface.h index cc09e4dc9..ccfc45e1b 100644 --- a/src/libtomahawk/SourcePlaylistInterface.h +++ b/src/libtomahawk/SourcePlaylistInterface.h @@ -59,7 +59,6 @@ public: virtual void setLatchMode( PlaylistModes::LatchMode latchMode ) { m_latchMode = latchMode; emit latchModeChanged( latchMode ); } virtual bool shuffled() const { return false; } - virtual void setFilter( const QString& /*pattern*/ ) {} virtual QWeakPointer< Tomahawk::Source > source() const; diff --git a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp index 96df71e03..d47b88be0 100644 --- a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp @@ -66,19 +66,6 @@ PlayableProxyModelPlaylistInterface::filter() const } -void -PlayableProxyModelPlaylistInterface::setFilter( const QString& pattern ) -{ - if ( m_proxyModel.isNull() ) - return; - - m_proxyModel.data()->setFilterRegExp( pattern ); - m_proxyModel.data()->emitFilterChanged( pattern ); - - emit trackCountChanged( trackCount() ); -} - - QList< Tomahawk::query_ptr > PlayableProxyModelPlaylistInterface::tracks() { diff --git a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h index bc785aa58..d26c1d1c3 100644 --- a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h +++ b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h @@ -50,7 +50,6 @@ public: virtual bool hasNextItem(); virtual QString filter() const; - virtual void setFilter( const QString& pattern ); virtual PlaylistModes::RepeatMode repeatMode() const { return m_repeatMode; } virtual bool shuffled() const { return m_shuffled; } diff --git a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp index 294cba009..824589a55 100644 --- a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp @@ -56,15 +56,6 @@ TreeProxyModelPlaylistInterface::filter() const } -void -TreeProxyModelPlaylistInterface::setFilter( const QString& pattern ) -{ - if ( m_proxyModel.isNull() ) - return; - m_proxyModel.data()->newFilterFromPlaylistInterface( pattern ); -} - - int TreeProxyModelPlaylistInterface::unfilteredTrackCount() const { diff --git a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h index 2367f5e06..67137fe1a 100644 --- a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h +++ b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h @@ -50,12 +50,6 @@ public: virtual Tomahawk::result_ptr siblingItem( int direction, bool readOnly ); virtual QString filter() const; - virtual void setFilter( const QString& pattern ); - - virtual QString vanillaFilter() const { return PlaylistInterface::filter(); } - virtual void setVanillaFilter( const QString &filter ) { PlaylistInterface::setFilter( filter ); } - - virtual void sendTrackCount() { emit trackCountChanged( trackCount() ); } virtual PlaylistModes::RepeatMode repeatMode() const { return m_repeatMode; } virtual bool shuffled() const { return m_shuffled; } From f5512d7b9599e8db7cf293b6ce44093b7eaa87c6 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 02:45:24 +0200 Subject: [PATCH 03/16] * Added filter/setFilter methods to ViewPage. --- src/libtomahawk/ViewPage.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libtomahawk/ViewPage.h b/src/libtomahawk/ViewPage.h index 2398c9e04..7fa6ee669 100644 --- a/src/libtomahawk/ViewPage.h +++ b/src/libtomahawk/ViewPage.h @@ -64,6 +64,9 @@ public: virtual bool showFilter() const { return false; } virtual bool queueVisible() const { return true; } + virtual QString filter() const { return m_filter; } + virtual bool setFilter( const QString& filter ) { m_filter = filter; } + virtual bool jumpToCurrentTrack() = 0; virtual bool isTemporaryPage() const { return false; } @@ -82,6 +85,9 @@ public: * * See DynamicWidget for an example */ + +private: + QString m_filter; }; }; // ns From 752c1b38a0e058b46554dfd8478633740f233675 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 02:47:46 +0200 Subject: [PATCH 04/16] * Implemented new ViewPage API for various classes. --- src/libtomahawk/playlist/FlexibleView.cpp | 13 +++++++++++++ src/libtomahawk/playlist/FlexibleView.h | 1 + src/libtomahawk/playlist/GridView.cpp | 8 ++++++++ src/libtomahawk/playlist/GridView.h | 1 + src/libtomahawk/playlist/TrackView.cpp | 12 ++++++++++-- src/libtomahawk/playlist/TrackView.h | 1 + src/libtomahawk/playlist/TreeView.cpp | 12 ++++++++++-- src/libtomahawk/playlist/TreeView.h | 1 + 8 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/playlist/FlexibleView.cpp b/src/libtomahawk/playlist/FlexibleView.cpp index 73d5b8474..faf09383d 100644 --- a/src/libtomahawk/playlist/FlexibleView.cpp +++ b/src/libtomahawk/playlist/FlexibleView.cpp @@ -235,3 +235,16 @@ FlexibleView::jumpToCurrentTrack() m_gridView->jumpToCurrentTrack(); return true; } + + +bool +FlexibleView::setFilter( const QString& filter ) +{ + ViewPage::setFilter( filter ); + + m_trackView->setFilter( filter ); + m_detailedView->setFilter( filter ); + m_gridView->setFilter( filter ); + + return true; +} diff --git a/src/libtomahawk/playlist/FlexibleView.h b/src/libtomahawk/playlist/FlexibleView.h index 838842c46..85e229849 100644 --- a/src/libtomahawk/playlist/FlexibleView.h +++ b/src/libtomahawk/playlist/FlexibleView.h @@ -53,6 +53,7 @@ public: // virtual void setShowModes( bool b ) { m_showModes = b; } virtual bool showModes() const { return false; } + virtual bool setFilter( const QString& filter ); virtual bool jumpToCurrentTrack(); void setTrackView( TrackView* view ); diff --git a/src/libtomahawk/playlist/GridView.cpp b/src/libtomahawk/playlist/GridView.cpp index 912db36e0..e5036f439 100644 --- a/src/libtomahawk/playlist/GridView.cpp +++ b/src/libtomahawk/playlist/GridView.cpp @@ -347,3 +347,11 @@ GridView::onCustomContextMenu( const QPoint& pos ) m_contextMenu->exec( viewport()->mapToGlobal( pos ) ); } + + +bool +GridView::setFilter( const QString& filter ) +{ + ViewPage::setFilter( filter ); + m_proxyModel->setFilter( filter ); +} diff --git a/src/libtomahawk/playlist/GridView.h b/src/libtomahawk/playlist/GridView.h index e3cbd7a5c..e2d733641 100644 --- a/src/libtomahawk/playlist/GridView.h +++ b/src/libtomahawk/playlist/GridView.h @@ -71,6 +71,7 @@ public: virtual bool showModes() const { return true; } + virtual bool setFilter( const QString& filter ); virtual bool jumpToCurrentTrack() { return false; } public slots: diff --git a/src/libtomahawk/playlist/TrackView.cpp b/src/libtomahawk/playlist/TrackView.cpp index 2d655bbde..1626b6d8a 100644 --- a/src/libtomahawk/playlist/TrackView.cpp +++ b/src/libtomahawk/playlist/TrackView.cpp @@ -503,9 +503,9 @@ TrackView::onFilterChanged( const QString& ) if ( selectedIndexes().count() ) scrollTo( selectedIndexes().at( 0 ), QAbstractItemView::PositionAtCenter ); - if ( !proxyModel()->playlistInterface()->filter().isEmpty() && !proxyModel()->playlistInterface()->trackCount() && model()->trackCount() ) + if ( !filter().isEmpty() && !proxyModel()->playlistInterface()->trackCount() && model()->trackCount() ) { - m_overlay->setText( tr( "Sorry, your filter '%1' did not match any results." ).arg( proxyModel()->playlistInterface()->filter() ) ); + m_overlay->setText( tr( "Sorry, your filter '%1' did not match any results." ).arg( filter() ) ); m_overlay->show(); } else @@ -743,3 +743,11 @@ TrackView::jumpToCurrentTrack() scrollTo( proxyModel()->currentIndex(), QAbstractItemView::PositionAtCenter ); return true; } + + +bool +TrackView::setFilter( const QString& filter ) +{ + ViewPage::setFilter( filter ); + m_proxyModel->setFilter( filter ); +} diff --git a/src/libtomahawk/playlist/TrackView.h b/src/libtomahawk/playlist/TrackView.h index 24f119a7e..737aaad9d 100644 --- a/src/libtomahawk/playlist/TrackView.h +++ b/src/libtomahawk/playlist/TrackView.h @@ -72,6 +72,7 @@ public: virtual bool showModes() const { return true; } virtual bool showFilter() const { return true; } + virtual bool setFilter( const QString& filter ); virtual bool jumpToCurrentTrack(); QModelIndex hoveredIndex() const { return m_hoveredIndex; } diff --git a/src/libtomahawk/playlist/TreeView.cpp b/src/libtomahawk/playlist/TreeView.cpp index 16755e5d6..5a9817aa5 100644 --- a/src/libtomahawk/playlist/TreeView.cpp +++ b/src/libtomahawk/playlist/TreeView.cpp @@ -293,9 +293,9 @@ TreeView::onFilterChangeFinished() if ( selectedIndexes().count() ) scrollTo( selectedIndexes().at( 0 ), QAbstractItemView::PositionAtCenter ); - if ( !proxyModel()->playlistInterface()->filter().isEmpty() && !proxyModel()->playlistInterface()->trackCount() && model()->trackCount() ) + if ( !filter().isEmpty() && !proxyModel()->playlistInterface()->trackCount() && model()->trackCount() ) { - m_overlay->setText( tr( "Sorry, your filter '%1' did not match any results." ).arg( proxyModel()->playlistInterface()->filter() ) ); + m_overlay->setText( tr( "Sorry, your filter '%1' did not match any results." ).arg( filter() ) ); m_overlay->show(); } else @@ -529,3 +529,11 @@ TreeView::guid() const return m_guid; } + + +bool +TreeView::setFilter( const QString& filter ) +{ + ViewPage::setFilter( filter ); + m_proxyModel->setFilter( filter ); +} diff --git a/src/libtomahawk/playlist/TreeView.h b/src/libtomahawk/playlist/TreeView.h index 27099db55..33f717903 100644 --- a/src/libtomahawk/playlist/TreeView.h +++ b/src/libtomahawk/playlist/TreeView.h @@ -76,6 +76,7 @@ public: virtual void setShowModes( bool b ) { m_showModes = b; } virtual bool showModes() const { return m_showModes; } + virtual bool setFilter( const QString& filter ); virtual bool jumpToCurrentTrack(); QModelIndex hoveredIndex() const { return m_hoveredIndex; } From dc0316018a6e036787c6662eff0f7dd383a8ec5e Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 02:48:08 +0200 Subject: [PATCH 05/16] * Fixed default implementation of ViewPage's setFilter method. --- src/libtomahawk/ViewPage.cpp | 7 +++++++ src/libtomahawk/ViewPage.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/ViewPage.cpp b/src/libtomahawk/ViewPage.cpp index 6ff2f7ccd..88a211fdf 100644 --- a/src/libtomahawk/ViewPage.cpp +++ b/src/libtomahawk/ViewPage.cpp @@ -23,3 +23,10 @@ using namespace Tomahawk; + +bool +ViewPage::setFilter( const QString& filter ) +{ + m_filter = filter; + return false; +} diff --git a/src/libtomahawk/ViewPage.h b/src/libtomahawk/ViewPage.h index 7fa6ee669..20e7566d0 100644 --- a/src/libtomahawk/ViewPage.h +++ b/src/libtomahawk/ViewPage.h @@ -65,7 +65,7 @@ public: virtual bool queueVisible() const { return true; } virtual QString filter() const { return m_filter; } - virtual bool setFilter( const QString& filter ) { m_filter = filter; } + virtual bool setFilter( const QString& filter ); virtual bool jumpToCurrentTrack() = 0; From 6a23954539dc887f0354a5f4cf8be6724d2cf1fc Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 02:49:31 +0200 Subject: [PATCH 06/16] * Added setFilter methods to proxy models. --- src/libtomahawk/playlist/PlayableProxyModel.cpp | 11 +++++++++++ src/libtomahawk/playlist/PlayableProxyModel.h | 5 ++--- src/libtomahawk/playlist/TreeProxyModel.cpp | 12 ++---------- src/libtomahawk/playlist/TreeProxyModel.h | 5 ++--- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/libtomahawk/playlist/PlayableProxyModel.cpp b/src/libtomahawk/playlist/PlayableProxyModel.cpp index b281a2d9b..65a674c81 100644 --- a/src/libtomahawk/playlist/PlayableProxyModel.cpp +++ b/src/libtomahawk/playlist/PlayableProxyModel.cpp @@ -578,3 +578,14 @@ PlayableProxyModel::updateDetailedInfo( const QModelIndex& index ) item->query()->loadSocialActions(); } } + + +void +PlayableProxyModel::setFilter( const QString& pattern ) +{ + if ( pattern != filterRegExp().pattern() ) + { + setFilterRegExp( pattern ); + emit filterChanged( pattern ); + } +} diff --git a/src/libtomahawk/playlist/PlayableProxyModel.h b/src/libtomahawk/playlist/PlayableProxyModel.h index 79b496317..3c689f167 100644 --- a/src/libtomahawk/playlist/PlayableProxyModel.h +++ b/src/libtomahawk/playlist/PlayableProxyModel.h @@ -66,8 +66,6 @@ public: virtual int maxVisibleItems() const { return m_maxVisibleItems; } virtual void setMaxVisibleItems( int items ); - virtual void emitFilterChanged( const QString &pattern ) { emit filterChanged( pattern ); } - virtual PlayableItem* itemFromIndex( const QModelIndex& index ) const { return sourceModel()->itemFromIndex( index ); } virtual Tomahawk::playlistinterface_ptr playlistInterface(); @@ -78,7 +76,8 @@ public: virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const; virtual QVariant headerData( int section, Qt::Orientation orientation, int role ) const; - void updateDetailedInfo( const QModelIndex& index ); + virtual void setFilter( const QString& pattern ); + virtual void updateDetailedInfo( const QModelIndex& index ); signals: void filterChanged( const QString& filter ); diff --git a/src/libtomahawk/playlist/TreeProxyModel.cpp b/src/libtomahawk/playlist/TreeProxyModel.cpp index 8d181af65..19a6a8065 100644 --- a/src/libtomahawk/playlist/TreeProxyModel.cpp +++ b/src/libtomahawk/playlist/TreeProxyModel.cpp @@ -92,7 +92,7 @@ TreeProxyModel::onModelReset() void -TreeProxyModel::newFilterFromPlaylistInterface( const QString& pattern ) +TreeProxyModel::setFilter( const QString& pattern ) { emit filteringStarted(); @@ -170,16 +170,8 @@ TreeProxyModel::filterFinished() { m_artistsFilterCmd = 0; - if ( qobject_cast< Tomahawk::TreeProxyModelPlaylistInterface* >( m_playlistInterface.data() )->vanillaFilter() != m_filter ) - { - emit filterChanged( m_filter ); - } - - qobject_cast< Tomahawk::TreeProxyModelPlaylistInterface* >( m_playlistInterface )->setVanillaFilter( m_filter ); setFilterRegExp( m_filter ); - - qobject_cast< Tomahawk::TreeProxyModelPlaylistInterface* >( m_playlistInterface )->sendTrackCount(); - + emit filterChanged( m_filter ); emit filteringFinished(); } diff --git a/src/libtomahawk/playlist/TreeProxyModel.h b/src/libtomahawk/playlist/TreeProxyModel.h index bca8676b0..ef49a702a 100644 --- a/src/libtomahawk/playlist/TreeProxyModel.h +++ b/src/libtomahawk/playlist/TreeProxyModel.h @@ -42,11 +42,10 @@ public: virtual ~TreeProxyModel() {} virtual void setSourcePlayableModel( TreeModel* model ); - - virtual void newFilterFromPlaylistInterface( const QString& pattern ); - virtual Tomahawk::playlistinterface_ptr playlistInterface(); + virtual void setFilter( const QString& pattern ); + signals: protected: From b8cc0ddbcd75e8620d41a518984463be7adb8308 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 02:49:49 +0200 Subject: [PATCH 07/16] * Don't load social actions twice. --- src/libtomahawk/Query.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp index ed3816598..456137c49 100644 --- a/src/libtomahawk/Query.cpp +++ b/src/libtomahawk/Query.cpp @@ -601,6 +601,9 @@ Query::playbackCount( const source_ptr& source ) void Query::loadSocialActions() { + if ( m_socialActionsLoaded ) + return; + m_socialActionsLoaded = true; query_ptr q = m_ownRef.toStrongRef(); From c32800c1191202e5d739af50016585926166d12b Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 02:50:08 +0200 Subject: [PATCH 08/16] * Use new ViewPage API in ViewManager. --- src/libtomahawk/ViewManager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp index 444346cea..e03bf2f8e 100644 --- a/src/libtomahawk/ViewManager.cpp +++ b/src/libtomahawk/ViewManager.cpp @@ -566,8 +566,8 @@ ViewManager::setFilter( const QString& filter ) void ViewManager::applyFilter() { - if ( currentPlaylistInterface() && currentPlaylistInterface()->filter() != m_filter ) - currentPlaylistInterface()->setFilter( m_filter ); + if ( m_currentPage ) + m_currentPage->setFilter( m_filter ); } @@ -778,14 +778,14 @@ ViewManager::updateView() connect( currentPlaylistInterface().data(), SIGNAL( shuffleModeChanged( bool ) ), SIGNAL( shuffleModeChanged( bool ) ) ); - m_infobar->setFilter( currentPlaylistInterface()->filter() ); + m_infobar->setFilter( currentPage()->filter() ); } if ( currentPage()->showStatsBar() && currentPlaylistInterface() ) { emit numTracksChanged( currentPlaylistInterface()->unfilteredTrackCount() ); - if ( !currentPlaylistInterface()->filter().isEmpty() ) + if ( !currentPage()->filter().isEmpty() ) emit numShownChanged( currentPlaylistInterface()->trackCount() ); else emit numShownChanged( currentPlaylistInterface()->unfilteredTrackCount() ); From b0c14d6217dca8dbbdb78e13ea979728822e6ee7 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 03:13:46 +0200 Subject: [PATCH 09/16] * Don't load view states for empty guids. --- src/libtomahawk/playlist/ViewHeader.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/playlist/ViewHeader.cpp b/src/libtomahawk/playlist/ViewHeader.cpp index ddae1323b..b29f34b5f 100644 --- a/src/libtomahawk/playlist/ViewHeader.cpp +++ b/src/libtomahawk/playlist/ViewHeader.cpp @@ -60,7 +60,8 @@ ViewHeader::visibleSectionCount() const void ViewHeader::onSectionsChanged() { - TomahawkSettings::instance()->setPlaylistColumnSizes( m_guid, saveState() ); + if ( !m_guid.isEmpty() ) + TomahawkSettings::instance()->setPlaylistColumnSizes( m_guid, saveState() ); } @@ -70,7 +71,10 @@ ViewHeader::checkState() if ( !count() || m_init ) return false; - QByteArray state = TomahawkSettings::instance()->playlistColumnSizes( m_guid ); + QByteArray state; + if ( !m_guid.isEmpty() ) + state = TomahawkSettings::instance()->playlistColumnSizes( m_guid ); + if ( !state.isEmpty() ) { restoreState( state ); From 2278f5d668029979d1caede86fec45de92eef59f Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 03:13:55 +0200 Subject: [PATCH 10/16] * Style fixes. --- src/libtomahawk/playlist/CustomPlaylistView.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/playlist/CustomPlaylistView.cpp b/src/libtomahawk/playlist/CustomPlaylistView.cpp index 045967a05..f29bac29b 100644 --- a/src/libtomahawk/playlist/CustomPlaylistView.cpp +++ b/src/libtomahawk/playlist/CustomPlaylistView.cpp @@ -28,25 +28,28 @@ using namespace Tomahawk; CustomPlaylistView::CustomPlaylistView( CustomPlaylistView::PlaylistType type, const source_ptr& s, QWidget* parent ) - : PlaylistView ( parent ) + : PlaylistView( parent ) , m_type( type ) , m_source( s ) , m_model( new PlaylistModel( this ) ) { // Generate the tracks, add them to the playlist proxyModel()->setStyle( PlayableProxyModel::Large ); + setPlaylistModel( m_model ); generateTracks(); if ( m_type == SourceLovedTracks ) - connect( m_source.data(), SIGNAL( socialAttributesChanged( QString ) ), this, SLOT( socialAttributesChanged( QString ) ) ); + { + connect( m_source.data(), SIGNAL( socialAttributesChanged( QString ) ), SLOT( socialAttributesChanged( QString ) ) ); + } else if ( m_type == TopLovedTracks ) { - connect( SourceList::instance()->getLocal().data(), SIGNAL( socialAttributesChanged( QString ) ), this, SLOT( socialAttributesChanged( QString ) ) ); + connect( SourceList::instance()->getLocal().data(), SIGNAL( socialAttributesChanged( QString ) ), SLOT( socialAttributesChanged( QString ) ) ); foreach ( const source_ptr& s, SourceList::instance()->sources( true ) ) - connect( s.data(), SIGNAL( socialAttributesChanged( QString ) ), this, SLOT( socialAttributesChanged( QString ) ) ); + connect( s.data(), SIGNAL( socialAttributesChanged( QString ) ), SLOT( socialAttributesChanged( QString ) ) ); - connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), this, SLOT( sourceAdded( Tomahawk::source_ptr ) ) ); + connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( sourceAdded( Tomahawk::source_ptr ) ) ); } } From 392197608f5a2cc9719b02d1cc093c3c907b244a Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 03:31:03 +0200 Subject: [PATCH 11/16] * Removed obsolete 'unfilteredTrackCount' PlaylistInterface method / signal. --- src/libtomahawk/AlbumPlaylistInterface.h | 1 - src/libtomahawk/ArtistPlaylistInterface.h | 1 - src/libtomahawk/PlaylistInterface.h | 4 +-- src/libtomahawk/PlaylistPlaylistInterface.cpp | 7 ----- src/libtomahawk/PlaylistPlaylistInterface.h | 1 - src/libtomahawk/SourcePlaylistInterface.h | 1 - src/libtomahawk/ViewManager.cpp | 31 ++----------------- src/libtomahawk/ViewManager.h | 5 --- .../playlist/PlayableProxyModel.cpp | 6 ---- .../PlayableProxyModelPlaylistInterface.cpp | 7 ----- .../PlayableProxyModelPlaylistInterface.h | 1 - .../TreeProxyModelPlaylistInterface.cpp | 10 ------ .../TreeProxyModelPlaylistInterface.h | 1 - src/libtomahawk/widgets/WhatsHotWidget_p.h | 2 -- 14 files changed, 3 insertions(+), 75 deletions(-) diff --git a/src/libtomahawk/AlbumPlaylistInterface.h b/src/libtomahawk/AlbumPlaylistInterface.h index b1caf14ff..b2c9d471c 100644 --- a/src/libtomahawk/AlbumPlaylistInterface.h +++ b/src/libtomahawk/AlbumPlaylistInterface.h @@ -43,7 +43,6 @@ public: QList tracks(); virtual int trackCount() const { return m_queries.count(); } - virtual int unfilteredTrackCount() const { return m_queries.count(); } virtual Tomahawk::result_ptr siblingItem( int itemsAway ); diff --git a/src/libtomahawk/ArtistPlaylistInterface.h b/src/libtomahawk/ArtistPlaylistInterface.h index 920923512..655832d1f 100644 --- a/src/libtomahawk/ArtistPlaylistInterface.h +++ b/src/libtomahawk/ArtistPlaylistInterface.h @@ -42,7 +42,6 @@ public: virtual QList tracks(); virtual int trackCount() const { return m_queries.count(); } - virtual int unfilteredTrackCount() const { return m_queries.count(); } virtual Tomahawk::result_ptr siblingItem( int itemsAway ); diff --git a/src/libtomahawk/PlaylistInterface.h b/src/libtomahawk/PlaylistInterface.h index b0efdb923..e61b8c60c 100644 --- a/src/libtomahawk/PlaylistInterface.h +++ b/src/libtomahawk/PlaylistInterface.h @@ -42,7 +42,6 @@ public: virtual QList< Tomahawk::query_ptr > tracks() = 0; virtual bool isFinished() const { return m_finished; } - virtual int unfilteredTrackCount() const = 0; virtual int trackCount() const = 0; virtual Tomahawk::result_ptr currentItem() const = 0; @@ -78,10 +77,9 @@ public slots: virtual void setShuffled( bool enabled ) = 0; signals: + void trackCountChanged( unsigned int tracks ); void repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode ); void shuffleModeChanged( bool enabled ); - void trackCountChanged( unsigned int tracks ); - void sourceTrackCountChanged( unsigned int tracks ); void latchModeChanged( Tomahawk::PlaylistModes::LatchMode mode ); void nextTrackReady(); diff --git a/src/libtomahawk/PlaylistPlaylistInterface.cpp b/src/libtomahawk/PlaylistPlaylistInterface.cpp index fa1954fcc..99ec12de9 100644 --- a/src/libtomahawk/PlaylistPlaylistInterface.cpp +++ b/src/libtomahawk/PlaylistPlaylistInterface.cpp @@ -40,13 +40,6 @@ PlaylistPlaylistInterface::~PlaylistPlaylistInterface() } -int -PlaylistPlaylistInterface::unfilteredTrackCount() const -{ - return ( m_playlist.isNull() ? 0 : m_playlist.data()->entries().count() ); -} - - int PlaylistPlaylistInterface::trackCount() const { diff --git a/src/libtomahawk/PlaylistPlaylistInterface.h b/src/libtomahawk/PlaylistPlaylistInterface.h index c234a951a..d2101d024 100644 --- a/src/libtomahawk/PlaylistPlaylistInterface.h +++ b/src/libtomahawk/PlaylistPlaylistInterface.h @@ -44,7 +44,6 @@ public: virtual QList tracks(); - virtual int unfilteredTrackCount() const; virtual int trackCount() const; virtual bool hasNextItem() { return false; } diff --git a/src/libtomahawk/SourcePlaylistInterface.h b/src/libtomahawk/SourcePlaylistInterface.h index ccfc45e1b..79311ef5f 100644 --- a/src/libtomahawk/SourcePlaylistInterface.h +++ b/src/libtomahawk/SourcePlaylistInterface.h @@ -42,7 +42,6 @@ public: QList tracks(); virtual int trackCount() const { return 1; } - virtual int unfilteredTrackCount() const { return 1; } virtual Tomahawk::result_ptr siblingItem( int itemsAway ); virtual bool sourceValid(); diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp index e03bf2f8e..b83a1d5c2 100644 --- a/src/libtomahawk/ViewManager.cpp +++ b/src/libtomahawk/ViewManager.cpp @@ -189,8 +189,6 @@ ViewManager::show( const Tomahawk::playlist_ptr& playlist ) } setPage( view ); - emit numSourcesChanged( SourceList::instance()->count() ); - return view; } @@ -212,8 +210,6 @@ ViewManager::show( const Tomahawk::dynplaylist_ptr& playlist ) else showQueue();*/ - emit numSourcesChanged( SourceList::instance()->count() ); - return m_dynamicWidgets.value( playlist ).data(); } @@ -352,8 +348,6 @@ ViewManager::show( const Tomahawk::collection_ptr& collection ) setPage( aview ); } - emit numSourcesChanged( 1 ); - return shown; } @@ -422,8 +416,6 @@ ViewManager::showSuperCollection() setPage( m_superGridView ); } - emit numSourcesChanged( m_superCollections.count() ); - return shown; } @@ -723,17 +715,11 @@ ViewManager::unlinkPlaylist() { if ( currentPlaylistInterface() ) { - disconnect( currentPlaylistInterface().data(), SIGNAL( sourceTrackCountChanged( unsigned int ) ), - this, SIGNAL( numTracksChanged( unsigned int ) ) ); - - disconnect( currentPlaylistInterface().data(), SIGNAL( trackCountChanged( unsigned int ) ), - this, SIGNAL( numShownChanged( unsigned int ) ) ); - disconnect( currentPlaylistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ), - this, SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) ); + this, SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) ); disconnect( currentPlaylistInterface().data(), SIGNAL( shuffleModeChanged( bool ) ), - this, SIGNAL( shuffleModeChanged( bool ) ) ); + this, SIGNAL( shuffleModeChanged( bool ) ) ); } } @@ -766,12 +752,6 @@ ViewManager::updateView() { if ( currentPlaylistInterface() ) { - connect( currentPlaylistInterface().data(), SIGNAL( sourceTrackCountChanged( unsigned int ) ), - SIGNAL( numTracksChanged( unsigned int ) ) ); - - connect( currentPlaylistInterface().data(), SIGNAL( trackCountChanged( unsigned int ) ), - SIGNAL( numShownChanged( unsigned int ) ) ); - connect( currentPlaylistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) ); @@ -783,13 +763,6 @@ ViewManager::updateView() if ( currentPage()->showStatsBar() && currentPlaylistInterface() ) { - emit numTracksChanged( currentPlaylistInterface()->unfilteredTrackCount() ); - - if ( !currentPage()->filter().isEmpty() ) - emit numShownChanged( currentPlaylistInterface()->trackCount() ); - else - emit numShownChanged( currentPlaylistInterface()->unfilteredTrackCount() ); - emit repeatModeChanged( currentPlaylistInterface()->repeatMode() ); emit shuffleModeChanged( currentPlaylistInterface()->shuffled() ); emit modeChanged( currentPlaylistInterface()->viewMode() ); diff --git a/src/libtomahawk/ViewManager.h b/src/libtomahawk/ViewManager.h index 1f6e7f2b4..478b626f6 100644 --- a/src/libtomahawk/ViewManager.h +++ b/src/libtomahawk/ViewManager.h @@ -110,11 +110,6 @@ public: bool isTomahawkLoaded() const { return m_loaded; } signals: - void numSourcesChanged( unsigned int sources ); - void numTracksChanged( unsigned int tracks ); - void numArtistsChanged( unsigned int artists ); - void numShownChanged( unsigned int shown ); - void repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode ); void shuffleModeChanged( bool enabled ); diff --git a/src/libtomahawk/playlist/PlayableProxyModel.cpp b/src/libtomahawk/playlist/PlayableProxyModel.cpp index 65a674c81..507f3120a 100644 --- a/src/libtomahawk/playlist/PlayableProxyModel.cpp +++ b/src/libtomahawk/playlist/PlayableProxyModel.cpp @@ -75,9 +75,6 @@ PlayableProxyModel::setSourcePlayableModel( PlayableModel* sourceModel ) { if ( m_model ) { - if ( m_model->metaObject()->indexOfSignal( "trackCountChanged(uint)" ) > -1 ) - disconnect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), this, SIGNAL( sourceTrackCountChanged( unsigned int ) ) ); - disconnect( m_model, SIGNAL( loadingStarted() ), this, SIGNAL( loadingStarted() ) ); disconnect( m_model, SIGNAL( loadingFinished() ), this, SIGNAL( loadingFinished() ) ); } @@ -86,9 +83,6 @@ PlayableProxyModel::setSourcePlayableModel( PlayableModel* sourceModel ) if ( m_model ) { - if ( m_model->metaObject()->indexOfSignal( "trackCountChanged(uint)" ) > -1 ) - connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), playlistInterface().data(), SIGNAL( sourceTrackCountChanged( unsigned int ) ) ); - connect( m_model, SIGNAL( loadingStarted() ), SIGNAL( loadingStarted() ) ); connect( m_model, SIGNAL( loadingFinished() ), SIGNAL( loadingFinished() ) ); } diff --git a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp index d47b88be0..58f29419c 100644 --- a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp @@ -45,13 +45,6 @@ PlayableProxyModelPlaylistInterface::~PlayableProxyModelPlaylistInterface() } -int -PlayableProxyModelPlaylistInterface::unfilteredTrackCount() const -{ - return ( m_proxyModel.isNull() ? 0 : m_proxyModel.data()->sourceModel()->trackCount() ); -} - - int PlayableProxyModelPlaylistInterface::trackCount() const { diff --git a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h index d26c1d1c3..34bb995a1 100644 --- a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h +++ b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h @@ -41,7 +41,6 @@ public: virtual QList tracks(); - virtual int unfilteredTrackCount() const; virtual int trackCount() const; virtual Tomahawk::result_ptr currentItem() const; diff --git a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp index 824589a55..ca8f5b234 100644 --- a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp @@ -56,16 +56,6 @@ TreeProxyModelPlaylistInterface::filter() const } -int -TreeProxyModelPlaylistInterface::unfilteredTrackCount() const -{ - if ( m_proxyModel.isNull() ) - return 0; - TreeProxyModel* proxyModel = m_proxyModel.data(); - return proxyModel->sourceModel()->rowCount( QModelIndex() ); -} - - int TreeProxyModelPlaylistInterface::trackCount() const { diff --git a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h index 67137fe1a..4e0e47dc1 100644 --- a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h +++ b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h @@ -41,7 +41,6 @@ public: virtual QList< Tomahawk::query_ptr > tracks() { Q_ASSERT( FALSE ); QList< Tomahawk::query_ptr > queries; return queries; } - virtual int unfilteredTrackCount() const; virtual int trackCount() const; virtual bool hasNextItem(); diff --git a/src/libtomahawk/widgets/WhatsHotWidget_p.h b/src/libtomahawk/widgets/WhatsHotWidget_p.h index 8d830eb31..e75d4aa62 100644 --- a/src/libtomahawk/widgets/WhatsHotWidget_p.h +++ b/src/libtomahawk/widgets/WhatsHotWidget_p.h @@ -54,7 +54,6 @@ public: // Any one is fine, we keep them all synched virtual PlaylistModes::RepeatMode repeatMode() const { return m_w->ui->tracksViewLeft->proxyModel()->playlistInterface()->repeatMode(); } - virtual bool shuffled() const { return m_w->ui->tracksViewLeft->proxyModel()->playlistInterface()->shuffled(); } // Do nothing @@ -62,7 +61,6 @@ public: virtual Tomahawk::result_ptr siblingItem( int ) { return Tomahawk::result_ptr(); } virtual int trackCount() const { return 0; } virtual QList< Tomahawk::query_ptr > tracks() { return QList< Tomahawk::query_ptr >(); } - virtual int unfilteredTrackCount() const { return 0; } virtual bool hasChildInterface( Tomahawk::playlistinterface_ptr other ) { From 5991467d40897ca651fb49a796300b4aff4b97c0 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 03:47:01 +0200 Subject: [PATCH 12/16] * Show tracks on Album page collection-style again. --- src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index 630b5978d..482fb7eb6 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -57,6 +57,7 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par ui->tracksView->setTreeModel( m_tracksModel ); ui->tracksView->setRootIsDecorated( false ); ui->tracksView->setEmptyTip( tr( "Sorry, we could not find any tracks for this album!" ) ); + ui->tracksView->proxyModel()->setStyle( PlayableProxyModel::Collection ); m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, QSize( 48, 48 ) ); From 658f0bf9bc71d9548f5b0834692ad0fba47a0550 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 04:15:28 +0200 Subject: [PATCH 13/16] * Removed obsolete loading methods in AlbumInfoWidget. --- .../widgets/infowidgets/AlbumInfoWidget.cpp | 15 --------------- .../widgets/infowidgets/AlbumInfoWidget.h | 3 --- 2 files changed, 18 deletions(-) diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index 482fb7eb6..442a25977 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -61,9 +61,6 @@ AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* par m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, QSize( 48, 48 ) ); - connect( m_tracksModel, SIGNAL( loadingStarted() ), SLOT( onLoadingStarted() ) ); - connect( m_tracksModel, SIGNAL( loadingFinished() ), SLOT( onLoadingFinished() ) ); - load( album ); } @@ -81,18 +78,6 @@ AlbumInfoWidget::playlistInterface() const } -void -AlbumInfoWidget::onLoadingStarted() -{ -} - - -void -AlbumInfoWidget::onLoadingFinished() -{ -} - - bool AlbumInfoWidget::isBeingPlayed() const { diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h index 4bfe66fb0..c73862973 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h @@ -97,9 +97,6 @@ private slots: void gotAlbums( const QList& albums ); void onAlbumCoverUpdated(); - void onLoadingStarted(); - void onLoadingFinished(); - private: Ui::AlbumInfoWidget* ui; From 3c30b08c36fd59de8ba498fa6fbe9a8bf4ce335b Mon Sep 17 00:00:00 2001 From: Stefan Derkits Date: Tue, 3 Jul 2012 13:36:13 +0200 Subject: [PATCH 14/16] quick & dirty fix for compilation issues (non-void methods not returning anything) --- src/libtomahawk/playlist/GridView.cpp | 1 + src/libtomahawk/playlist/TrackView.cpp | 1 + src/libtomahawk/playlist/TreeView.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/src/libtomahawk/playlist/GridView.cpp b/src/libtomahawk/playlist/GridView.cpp index e5036f439..3c324a147 100644 --- a/src/libtomahawk/playlist/GridView.cpp +++ b/src/libtomahawk/playlist/GridView.cpp @@ -354,4 +354,5 @@ GridView::setFilter( const QString& filter ) { ViewPage::setFilter( filter ); m_proxyModel->setFilter( filter ); + return false; } diff --git a/src/libtomahawk/playlist/TrackView.cpp b/src/libtomahawk/playlist/TrackView.cpp index 1626b6d8a..65d9bed57 100644 --- a/src/libtomahawk/playlist/TrackView.cpp +++ b/src/libtomahawk/playlist/TrackView.cpp @@ -750,4 +750,5 @@ TrackView::setFilter( const QString& filter ) { ViewPage::setFilter( filter ); m_proxyModel->setFilter( filter ); + return false; } diff --git a/src/libtomahawk/playlist/TreeView.cpp b/src/libtomahawk/playlist/TreeView.cpp index 5a9817aa5..3ab17ec71 100644 --- a/src/libtomahawk/playlist/TreeView.cpp +++ b/src/libtomahawk/playlist/TreeView.cpp @@ -536,4 +536,5 @@ TreeView::setFilter( const QString& filter ) { ViewPage::setFilter( filter ); m_proxyModel->setFilter( filter ); + return false; } From 9e5f5eb7507dc640a2e65f6e0ea9ac83f130c879 Mon Sep 17 00:00:00 2001 From: Thierry Goeckel Date: Tue, 3 Jul 2012 15:27:47 +0200 Subject: [PATCH 15/16] Nitpicky fix adding spaces left and right of 'und' in German Top Loved Tracks translation. --- lang/tomahawk_de.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/tomahawk_de.ts b/lang/tomahawk_de.ts index cb4b375f8..4adccc327 100644 --- a/lang/tomahawk_de.ts +++ b/lang/tomahawk_de.ts @@ -2765,7 +2765,7 @@ Versuch die Filter anzupassen für neue Lieder. and - und + und From fc36c5ae91028334fe99b97ded7b72354f4d15d8 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 16:16:53 +0200 Subject: [PATCH 16/16] * Return true after setting the filter. --- src/libtomahawk/playlist/GridView.cpp | 2 +- src/libtomahawk/playlist/TrackView.cpp | 2 +- src/libtomahawk/playlist/TreeView.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/playlist/GridView.cpp b/src/libtomahawk/playlist/GridView.cpp index 3c324a147..0b0197f2c 100644 --- a/src/libtomahawk/playlist/GridView.cpp +++ b/src/libtomahawk/playlist/GridView.cpp @@ -354,5 +354,5 @@ GridView::setFilter( const QString& filter ) { ViewPage::setFilter( filter ); m_proxyModel->setFilter( filter ); - return false; + return true; } diff --git a/src/libtomahawk/playlist/TrackView.cpp b/src/libtomahawk/playlist/TrackView.cpp index 65d9bed57..f2218d58b 100644 --- a/src/libtomahawk/playlist/TrackView.cpp +++ b/src/libtomahawk/playlist/TrackView.cpp @@ -750,5 +750,5 @@ TrackView::setFilter( const QString& filter ) { ViewPage::setFilter( filter ); m_proxyModel->setFilter( filter ); - return false; + return true; } diff --git a/src/libtomahawk/playlist/TreeView.cpp b/src/libtomahawk/playlist/TreeView.cpp index 3ab17ec71..c34b79ae1 100644 --- a/src/libtomahawk/playlist/TreeView.cpp +++ b/src/libtomahawk/playlist/TreeView.cpp @@ -536,5 +536,5 @@ TreeView::setFilter( const QString& filter ) { ViewPage::setFilter( filter ); m_proxyModel->setFilter( filter ); - return false; + return true; }