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?</source> <translation>غلاف</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation>نعتذر, لم نستطيع إيجاد ألبومات أخرى لهذا الفنان!</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation>نعتذر، لم نستطيع إيجاد فنانين!</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation>نعتذر، لم نستطيع إيجاد أغاني مشهورة جدا لهذا الفنان!</translation> </message> @@ -661,68 +661,68 @@ connect and stream from you?</source> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation>فنان</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation>عنوان</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation>مؤلف</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation>البوم</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation>اغنية</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation>مدة</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation>معدل البت</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation>عمر</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation>سنة</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation>حجم</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation>أصل</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation>علامة</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation>إسم</translation> </message> @@ -3456,19 +3456,19 @@ enter the displayed PIN number here:</source> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation>جميع الفنانين</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation>مجموعتي الخاصة</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation>مجموعة %1</translation> </message> @@ -3557,37 +3557,37 @@ You can re-send a sync message at any time simply by sending another tweet using <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation>بعد إجراء مسح مجموعة أغانيك الخاصة ستجد أغانيك هنا.</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation>هذه المجموعة فارغة.</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation>سوبر كولكشن</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation>مكتبات مجمعة لكل اصحابك المتصلين</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation>جميع الألبومات الجديدة</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation>الأغاني التي إستمعت إليها مؤخرا</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation>جميع الأغاني التي استمع إليها أصدقائك مؤخرا</translation> </message> 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?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation>Съжалявам, но не откривам нито един албум за този артист!</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation>Съжалявам, но не откривам нито един подобен на този артист!</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation>Съжалявам, но не откривам нито една хитова песен на този артист!</translation> </message> @@ -663,68 +663,68 @@ Tomahaw създаде доклад относно това и изпращай <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation>Артист</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation>Име</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation>Композитор</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation>Албум</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation>Песен</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation>Продължителност</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation>Качество</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation>Възраст</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation>Година</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation>Големина</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation>Източник</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation>Резултат</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation>Име</translation> </message> @@ -3466,19 +3466,19 @@ enter the displayed PIN number here:</source> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation>Всички артисти</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation>Моята колекция</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation>Колекцията на %1</translation> </message> @@ -3568,38 +3568,38 @@ You can re-send a sync message at any time simply by sending another tweet using <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation>След като бъде сканирана колекцията ти, ще откриеш твоите песни точно тук.</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation>Празна колекция.</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation>Супер колекция /Сборен излед от локалните и наличните в колекциите на приятелите ти/</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation>Обща колекция с всичките ми приятели на линия</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation>Всички налични албуми</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation>Наскоро изпълени песни</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation>Наскоро изпълнени песни от всичките ти приятели</translation> </message> 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?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation type="unfinished"/> </message> @@ -660,68 +660,68 @@ connect and stream from you?</source> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation>Artista</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation>Cançó</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation>Compositor</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation>Àlbum</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation>Número</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation>Durada</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation>Bitrate</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation>Edat</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation>Any</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation>Mida</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation>Origen</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation>Puntuació</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation>Nom</translation> </message> @@ -3455,19 +3455,19 @@ introduïu el PIN aquí:</translation> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation>Tots els Artistes</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation>La meva Col·lecció</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation>Col·lecció de %1</translation> </message> @@ -3556,37 +3556,37 @@ Podeu reenviar un missatge de sincronisme en qualsevol moment simplement enviant <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation>SuperCol·lecció</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation>Biblioteques combinades de tots els amis en línia</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation>Tots els àlbums disponibles</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation>Cançons Escoltades Recentment</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation>Cançons escoltades recentment pels amics</translation> </message> diff --git a/lang/tomahawk_de.ts b/lang/tomahawk_de.ts index e4babff34..4adccc327 100644 --- a/lang/tomahawk_de.ts +++ b/lang/tomahawk_de.ts @@ -208,17 +208,17 @@ erlauben sich mit dir zu verbinden?</translation> <translation>Cover</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation>Sorry, wir konnten keine Alben für diesen Künstler finden!</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation>Sorry, wir konnten keine ähnlichen Künstler finden!</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation>Sorry, wir konnten keine Lieder für diesen Künstler finden!</translation> </message> @@ -661,68 +661,68 @@ erlauben sich mit dir zu verbinden?</translation> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation>Künstler</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation>Titel</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation>Komponent</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation>Album</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation>Lied</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation>Bitrate</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation>Alter</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation>Jahr</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation>Größe</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation>Quelle</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation>Wertung</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation>Name</translation> </message> @@ -2765,7 +2765,7 @@ Versuch die Filter anzupassen für neue Lieder.</translation> <message> <location filename="../src/libtomahawk/Query.cpp" line="728"/> <source> and </source> - <translation>und</translation> + <translation> und </translation> </message> <message> <location filename="../src/libtomahawk/Query.cpp" line="736"/> @@ -3451,19 +3451,19 @@ Tomahawk auf Twitter's Website authentifiziert hast:</translation> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation>Alle Künstler</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation>Meine Sammlung</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation>Sammlung von %1</translation> </message> @@ -3547,37 +3547,37 @@ You can re-send a sync message at any time simply by sending another tweet using <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation>Nachdem du deine Musik Sammlung gescannt hast, findest du all deine Lieder genau hier.</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation>Diese Sammlung ist leer.</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation>SuperCollection</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation>Kombinierte Sammlung all deiner Freunde</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation>Alle verfügbaren Alben</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation>Zuletzt gehörte Lieder</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation>Zuletzt gehörte Lieder all deiner Freunde</translation> </message> 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?</translation> <translation>Cover</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation>Sorry, we could not find any albums for this artist!</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation>Sorry, we could not find any related artists!</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation>Sorry, we could not find any top hits for this artist!</translation> </message> @@ -661,68 +661,68 @@ connect and stream from you?</translation> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation>Artist</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation>Title</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation>Composer</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation>Album</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation>Track</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation>Bitrate</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation>Age</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation>Year</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation>Size</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation>Origin</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation>Score</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation>Name</translation> </message> @@ -3456,19 +3456,19 @@ enter the displayed PIN number here:</translation> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation>All Artists</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation>My Collection</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation>Collection of %1</translation> </message> @@ -3557,37 +3557,37 @@ You can re-send a sync message at any time simply by sending another tweet using <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation>After you have scanned your music collection you will find your tracks right here.</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation>This collection is empty.</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation>SuperCollection</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation>Combined libraries of all your online friends</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation>All available albums</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation>Recently Played Tracks</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation>Recently played tracks from all your friends</translation> </message> 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?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation type="unfinished"/> </message> @@ -660,68 +660,68 @@ connect and stream from you?</source> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation type="unfinished"/> </message> @@ -3454,19 +3454,19 @@ introduzca su número PIN aquí:</translation> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation>Todos los artistas</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation>Mi colección</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation>Colección de %1</translation> </message> @@ -3555,37 +3555,37 @@ Puede reenviar el mensaje de sincronización en cualquier momento simplemente en <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation>SuperColección</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation>Bibliotecas combinadas de todos tus amigos conectados</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation>Todos los álbumes disponibles</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation>Temas Escuchados Recientemente</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation>Temas escuchados recientemente por mis amigos</translation> </message> 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?</translation> <translation>Pochette</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation>Désolé, on a pas pu trouver aucun album pour cet artiste!</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation>Désolé, on a rien trouvé par rapport a cet artite!</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation>Désolé, on a pas pu trouver aucun top hit pour cet artiste! </translation> </message> @@ -661,68 +661,68 @@ de se connecter et streamer de vous?</translation> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation>Artiste</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation>Titre</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation>Compositeur</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation>Album</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation>Piste</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation>Bitrate</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation>Age</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation>Année</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation>Taille</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation>Origine</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation>Score</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation>Nom</translation> </message> @@ -3456,19 +3456,19 @@ saisissez le numéro PIN ici :</translation> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation>Tous les artistes</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation>Ma Collection</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation>Collection de %1</translation> </message> @@ -3557,37 +3557,37 @@ Vous pouvez envoyer un message de synchronisation quand vous le souhaitez en env <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation>Après avoir scanné votre collection musicale, vous trouverez tous vos titres ici.</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation>La collection est vide.</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation>SuperCollection</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation>Collections regroupant toutes celles de vos amis en ligne</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation>Tous les albums disponibles</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation>Derniers titres joués</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation>Derniers titres joués par vos amis</translation> </message> 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?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation>このアーティストのアルバムは見つかりませんでした。</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation type="unfinished"/> </message> @@ -661,68 +661,68 @@ connect and stream from you?</source> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation>アーティスト</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation>タイトル</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation>作曲者</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation>アルバム</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation>トラック</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation>時間</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation>ビットレート</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation>変更日</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation>年</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation>サイズ</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation>音源</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation>スコア</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation>名前</translation> </message> @@ -3446,19 +3446,19 @@ Meta+Ctrl+Z</translation> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation>すべてのアーティスト</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation>マイコレクション</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation>%1のコレクション</translation> </message> @@ -3547,38 +3547,38 @@ Twitterを使っている友達にTomahawkを接続したいなら、ツイー <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation>コレクションのスキャンが完了したら、トラックはここに表示されます。</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation>このコレクションには何も入っていません。</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation>スーパーコレクション</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation>オンラインの友達全員のライブラリ</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation>すべてのアルバム </translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation>最近再生したトラック</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation>友達の最近再生したトラック</translation> </message> 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?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation type="unfinished"/> </message> @@ -660,68 +660,68 @@ connect and stream from you?</source> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation type="unfinished"/> </message> @@ -3450,19 +3450,19 @@ wprowadź pokazany numer PIN tutaj:</translation> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation>Wszyscy Artyści</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation>Moja Kolekcja</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation>Kolekcja %1</translation> </message> @@ -3551,37 +3551,37 @@ Zawsze możesz ponownie wysłać wiadomość synchronizacyjną - po prostu wyśl <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation>SuperKolekcja</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation>Połączone biblioteki wszystkich twoich znajomych online</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation>Wszystkie dostępne albumy</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation type="unfinished"/> </message> 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?</source> <translation>Capa</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation>Desculpe, mas não conseguimos encontrar outros álbuns para este artista!</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation>Desculpe, mas não conseguimos encontrar outros artistas relacionados a este!</translation> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation>Desculpe, mas não conseguimos encontrar outras faixas mais tocadas deste artista!</translation> </message> @@ -660,68 +660,68 @@ connect and stream from you?</source> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation>Artista</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation>Título</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation>Compositor</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation>Álbum</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation>Faixa</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation>Taxa de bits</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation>Idade</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation>Ano</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation>Tamanho</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation>Origem</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation>Pontuação</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation>Nome</translation> </message> @@ -3455,19 +3455,19 @@ colocar o número PIN mostrado aqui:</translation> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation>Todos artistas</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation>Minha biblioteca</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation>Biblioteca de %1</translation> </message> @@ -3556,37 +3556,37 @@ Você pode enviar uma outra mensagem de sincronia a qualquer momento simplesment <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation>Depois de escanear sua biblioteca de músicas as faixas irão aparecer aqui.</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation>Esta coleção esta vazia.</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation>SuperColeção</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation>Bibliotecas combinadas de todos os seus amigos online</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation>Todos os álbuns disponíveis</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation>Faixas Reproduzidas Recentemente</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation>Faixas reproduzidas recentemente por todos os seus amigos</translation> </message> 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?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation type="unfinished"/> </message> @@ -660,68 +660,68 @@ connect and stream from you?</source> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation>Исполнитель</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation>Название</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation>Композитор</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation>Альбом</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation>Песня</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation>Продолжительность</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation>Битрей</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation>Год</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation>Размер</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation>Количество воспроизведений </translation> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation>Имя</translation> </message> @@ -3449,19 +3449,19 @@ enter the displayed PIN number here:</source> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation>Все исполнители</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation>Моя коллекция</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation>Коллекция из %1</translation> </message> @@ -3549,37 +3549,37 @@ You can re-send a sync message at any time simply by sending another tweet using <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation>Коллекция пуста</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation>Общая коллекция</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation>Комбинированные библиотек всех ваших друзей онлайн</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation>Доступные альбомы</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation type="unfinished"/> </message> 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?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation type="unfinished"/> </message> @@ -660,68 +660,68 @@ connect and stream from you?</source> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation type="unfinished"/> </message> @@ -3444,19 +3444,19 @@ enter the displayed PIN number here:</source> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation>Alla artister</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation>Min samling</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation>Samling av %1</translation> </message> @@ -3540,37 +3540,37 @@ You can re-send a sync message at any time simply by sending another tweet using <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation>Alla tillgängliga album</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation type="unfinished"/> </message> 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?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation type="unfinished"/> </message> @@ -660,68 +660,68 @@ connect and stream from you?</source> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation type="unfinished"/> </message> @@ -3443,19 +3443,19 @@ enter the displayed PIN number here:</source> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation type="unfinished"/> </message> @@ -3539,37 +3539,37 @@ You can re-send a sync message at any time simply by sending another tweet using <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation type="unfinished"/> </message> 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?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation type="unfinished"/> </message> @@ -660,68 +660,68 @@ connect and stream from you?</source> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation type="unfinished"/> </message> @@ -3443,19 +3443,19 @@ enter the displayed PIN number here:</source> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation type="unfinished"/> </message> @@ -3539,37 +3539,37 @@ You can re-send a sync message at any time simply by sending another tweet using <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation>最近播放曲目</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation>所有朋友最近播放的曲目</translation> </message> 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?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="68"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/> <source>Sorry, we could not find any albums for this artist!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="73"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/> <source>Sorry, we could not find any related artists!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="79"/> + <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/> <source>Sorry, we could not find any top hits for this artist!</source> <translation type="unfinished"/> </message> @@ -660,68 +660,68 @@ connect and stream from you?</source> <context> <name>PlayableModel</name> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Artist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Title</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Composer</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Album</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Track</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/> <source>Duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Bitrate</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Age</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Year</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Size</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Origin</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> <source>Score</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="51"/> - <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="325"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/> + <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/> <source>Name</source> <translation type="unfinished"/> </message> @@ -3443,19 +3443,19 @@ enter the displayed PIN number here:</source> <context> <name>TreeModel</name> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="150"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/> <source>All Artists</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="268"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="293"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/> <source>My Collection</source> <translation>我的收藏</translation> </message> <message> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="270"/> - <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="295"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/> + <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/> <source>Collection of %1</source> <translation type="unfinished"/> </message> @@ -3539,37 +3539,37 @@ You can re-send a sync message at any time simply by sending another tweet using <context> <name>ViewManager</name> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="310"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="317"/> <source>After you have scanned your music collection you will find your tracks right here.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="312"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="319"/> <source>This collection is empty.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="397"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="404"/> <source>SuperCollection</source> <translation>超級收藏</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="398"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="405"/> <source>Combined libraries of all your online friends</source> <translation>聯合您所有線上朋友的音樂庫</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="399"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="406"/> <source>All available albums</source> <translation>所有現有專輯</translation> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="487"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="494"/> <source>Recently Played Tracks</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libtomahawk/ViewManager.cpp" line="488"/> + <location filename="../src/libtomahawk/ViewManager.cpp" line="495"/> <source>Recently played tracks from all your friends</source> <translation type="unfinished"/> </message> diff --git a/src/libtomahawk/AlbumPlaylistInterface.h b/src/libtomahawk/AlbumPlaylistInterface.h index 14d6efd19..b2c9d471c 100644 --- a/src/libtomahawk/AlbumPlaylistInterface.h +++ b/src/libtomahawk/AlbumPlaylistInterface.h @@ -43,7 +43,6 @@ public: QList<Tomahawk::query_ptr> tracks(); virtual int trackCount() const { return m_queries.count(); } - virtual int unfilteredTrackCount() const { return m_queries.count(); } virtual Tomahawk::result_ptr siblingItem( int itemsAway ); @@ -56,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/ArtistPlaylistInterface.h b/src/libtomahawk/ArtistPlaylistInterface.h index 03b1b36bd..655832d1f 100644 --- a/src/libtomahawk/ArtistPlaylistInterface.h +++ b/src/libtomahawk/ArtistPlaylistInterface.h @@ -42,7 +42,6 @@ public: virtual QList<Tomahawk::query_ptr> tracks(); virtual int trackCount() const { return m_queries.count(); } - virtual int unfilteredTrackCount() const { return m_queries.count(); } virtual Tomahawk::result_ptr siblingItem( int itemsAway ); @@ -55,8 +54,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..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; @@ -66,9 +65,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 @@ -81,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 4db326431..d2101d024 100644 --- a/src/libtomahawk/PlaylistPlaylistInterface.h +++ b/src/libtomahawk/PlaylistPlaylistInterface.h @@ -44,7 +44,6 @@ public: virtual QList<Tomahawk::query_ptr> tracks(); - virtual int unfilteredTrackCount() const; virtual int trackCount() const; virtual bool hasNextItem() { return false; } @@ -55,8 +54,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/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(); diff --git a/src/libtomahawk/SourcePlaylistInterface.h b/src/libtomahawk/SourcePlaylistInterface.h index cc09e4dc9..79311ef5f 100644 --- a/src/libtomahawk/SourcePlaylistInterface.h +++ b/src/libtomahawk/SourcePlaylistInterface.h @@ -42,7 +42,6 @@ public: QList<Tomahawk::query_ptr> tracks(); virtual int trackCount() const { return 1; } - virtual int unfilteredTrackCount() const { return 1; } virtual Tomahawk::result_ptr siblingItem( int itemsAway ); virtual bool sourceValid(); @@ -59,7 +58,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/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp index 444346cea..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; } @@ -566,8 +558,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 ); } @@ -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,30 +752,17 @@ 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 ) ) ); 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() ) - 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/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 2398c9e04..20e7566d0 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 ); + 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 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 ) ) ); } } 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..0b0197f2c 100644 --- a/src/libtomahawk/playlist/GridView.cpp +++ b/src/libtomahawk/playlist/GridView.cpp @@ -347,3 +347,12 @@ GridView::onCustomContextMenu( const QPoint& pos ) m_contextMenu->exec( viewport()->mapToGlobal( pos ) ); } + + +bool +GridView::setFilter( const QString& filter ) +{ + ViewPage::setFilter( filter ); + m_proxyModel->setFilter( filter ); + return true; +} 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/PlayableProxyModel.cpp b/src/libtomahawk/playlist/PlayableProxyModel.cpp index b281a2d9b..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() ) ); } @@ -578,3 +572,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/PlayableProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp index 96df71e03..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 { @@ -66,19 +59,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..34bb995a1 100644 --- a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h +++ b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h @@ -41,7 +41,6 @@ public: virtual QList<Tomahawk::query_ptr> tracks(); - virtual int unfilteredTrackCount() const; virtual int trackCount() const; virtual Tomahawk::result_ptr currentItem() const; @@ -50,7 +49,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/TrackView.cpp b/src/libtomahawk/playlist/TrackView.cpp index 2d655bbde..f2218d58b 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,12 @@ TrackView::jumpToCurrentTrack() scrollTo( proxyModel()->currentIndex(), QAbstractItemView::PositionAtCenter ); return true; } + + +bool +TrackView::setFilter( const QString& filter ) +{ + ViewPage::setFilter( filter ); + m_proxyModel->setFilter( filter ); + return true; +} 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/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: diff --git a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp index 294cba009..ca8f5b234 100644 --- a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp @@ -56,25 +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 -{ - 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 2367f5e06..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(); @@ -50,12 +49,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; } diff --git a/src/libtomahawk/playlist/TreeView.cpp b/src/libtomahawk/playlist/TreeView.cpp index 16755e5d6..c34b79ae1 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,12 @@ TreeView::guid() const return m_guid; } + + +bool +TreeView::setFilter( const QString& filter ) +{ + ViewPage::setFilter( filter ); + m_proxyModel->setFilter( filter ); + return true; +} 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; } 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 ); 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 ) { diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index 630b5978d..442a25977 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -57,12 +57,10 @@ 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 ) ); - connect( m_tracksModel, SIGNAL( loadingStarted() ), SLOT( onLoadingStarted() ) ); - connect( m_tracksModel, SIGNAL( loadingFinished() ), SLOT( onLoadingFinished() ) ); - load( album ); } @@ -80,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<Tomahawk::album_ptr>& albums ); void onAlbumCoverUpdated(); - void onLoadingStarted(); - void onLoadingFinished(); - private: Ui::AlbumInfoWidget* ui;