Добавил обложки и названия плейлистам

levovix0 · Jun 1, 2021 · bd770e7 · bd770e7
1 parent 7ae9b9f
commit bd770e7
Show file tree

Hide file tree

Showing 8 changed files with 180 additions and 92 deletions.
diff --git a/PlaylistEntry.qml b/PlaylistEntry.qml
@@ -11,7 +11,7 @@ Item {
 
   property real _anim_n: 0
   property real _anim2_n: 0
-  property YPlaylist playlist
+  property var playlist
 
   signal play()
   signal pause()
@@ -132,7 +132,7 @@ Item {
     horizontalAlignment: Text.AlignHCenter
     wrapMode: Text.WordWrap
 
-    text: playlist == null? qsTr("some playlist") : playlist.name
+    text: playlist == null? qsTr("Some playlist") : playlist.name
 
     MouseArea {
       id: _textMouse

diff --git a/main.cpp b/main.cpp
@@ -66,6 +66,7 @@ int main(int argc, char *argv[])
   qmlRegisterType<Clipboard>("DMusic", 1, 0, "Clipboard");
   qmlRegisterType<DFileDialog>("DMusic", 1, 0, "DFileDialog");
   qmlRegisterType<YPlaylist>("DMusic", 1, 0, "YPlaylist");
+  qmlRegisterType<YLikedTracks>("DMusic", 1, 0, "YLikedTracks");
 
   qmlRegisterSingletonType<Messages>("DMusic", 1, 0, "Messages", &Messages::qmlInstance);
   qmlRegisterSingletonType<YClient>("DMusic", 1, 0, "YClient", &YClient::qmlInstance);

diff --git a/main.qml b/main.qml
@@ -54,7 +54,7 @@ Window {
 
     function afterLogin() {
       _userDailyPlaylist.playlist = YClient.userDailyPlaylist()
-      _userLikedPlaylist.playlist = YClient.userLikedTracksPlaylist()
+      _userLikedPlaylist.playlist = YClient.userLikedTracks()
     }
 
     function autologin() {
@@ -242,7 +242,6 @@ Window {
       anchors.leftMargin: 25
       anchors.topMargin: 25
 
-//      onPlay: _player.player.play(YClient.playlist(3))
       onPlay: YClient.playPlaylist(playlist)
     }
 

diff --git a/qml.qrc b/qml.qrc
@@ -63,5 +63,6 @@
         <file>resources/player/like.svg</file>
         <file>resources/player/liked.svg</file>
         <file>Message.qml</file>
+        <file>resources/covers/like.png</file>
     </qresource>
 </RCC>
diff --git a/resources/covers/like.png b/resources/covers/like.png
diff --git a/translations/russian.ts b/translations/russian.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AudioPlayer</name>
     <message>
-        <location filename="../AudioPlayer.cpp" line="115"/>
+        <location filename="../AudioPlayer.cpp" line="118"/>
         <source>Failed to load track</source>
         <translation>Не удалось загрузить трек</translation>
     </message>
@@ -52,6 +52,14 @@
         <translation>Не удалось инициализировать discord pressence</translation>
     </message>
 </context>
+<context>
+    <name>PlaylistEntry</name>
+    <message>
+        <location filename="../PlaylistEntry.qml" line="135"/>
+        <source>Some playlist</source>
+        <translation>Какой-то плейлист</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -65,7 +73,7 @@
         <translation>Ошибка автоматической установки модуля python &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="34"/>
+        <location filename="../main.cpp" line="36"/>
         <source>DMusic - music player
 usage: %1 [options]
 
@@ -111,103 +119,134 @@ usage: %1 [options]
 <context>
     <name>YClient</name>
     <message>
-        <location filename="../yapi.cpp" line="589"/>
+        <location filename="../yapi.cpp" line="679"/>
         <source>Failed to initialize yandex music client</source>
         <translation>Не удалось инициализировать клиент Яндекс.Музыки</translation>
     </message>
     <message>
-        <location filename="../yapi.cpp" line="675"/>
+        <source>Failed to load Yandex.Music user liked tracks (playlist with id 3)</source>
+        <translation type="vanished">Не удалось загрузить понравившиеся треки пользователя Яндекс.Музыки</translation>
+    </message>
+    <message>
+        <location filename="../yapi.cpp" line="751"/>
+        <source>Failed to load Yandex.Music user liked tracks</source>
+        <translation>Не удалось загрузить понравившиеся треки пользователя Яндекс.Музыки</translation>
+    </message>
+    <message>
+        <location filename="../yapi.cpp" line="774"/>
         <source>Failed to load Yandex.Music playlist (id: %1)</source>
         <translation>Не удалось загрузить плейлист Яндекс.Музыки (id: %1)</translation>
     </message>
     <message>
-        <location filename="../yapi.cpp" line="701"/>
+        <location filename="../yapi.cpp" line="794"/>
         <source>Failed to load Yandex.Music daily playlist</source>
         <translation>Не удалось загрузить плейлист дня Яндекс.Музыки</translation>
     </message>
 </context>
+<context>
+    <name>YLikedTracks</name>
+    <message>
+        <location filename="../yapi.cpp" line="612"/>
+        <source>Favorites</source>
+        <translation>Мне нравится</translation>
+    </message>
+    <message>
+        <location filename="../yapi.cpp" line="631"/>
+        <source>Failed to load Yandex.Music user liked tracks</source>
+        <translation>Не удалось загрузить понравившиеся треки пользователя Яндекс.Музыки</translation>
+    </message>
+    <message>
+        <location filename="../yapi.cpp" line="624"/>
+        <source>Yandex music api is not initialized</source>
+        <translation>Api Яндекс.Музыки не инициализировано</translation>
+    </message>
+    <message>
+        <source>Failed to load Yandex.Music user liked tracks (playlist with id 3)</source>
+        <translation type="obsolete">Не удалось загрузить понравившиеся треки пользователя Яндекс.Музыки</translation>
+    </message>
+</context>
 <context>
     <name>YTrack</name>
     <message>
-        <location filename="../yapi.cpp" line="173"/>
+        <location filename="../yapi.cpp" line="174"/>
         <source>Failed to get Yandex.Music track media (id: %1)</source>
         <translation>Не удалось загрузить медиа для трека Яндекс.Музыки (id: %1)</translation>
     </message>
     <message>
-        <location filename="../yapi.cpp" line="388"/>
+        <location filename="../yapi.cpp" line="389"/>
         <source>Failed to load Yandex.Music track (id: %1)</source>
         <translation>Не удалось загрузить трек Яндекс.Музыки (id: %1)</translation>
     </message>
 </context>
 <context>
     <name>main</name>
     <message>
-        <location filename="../main.qml" line="112"/>
+        <location filename="../main.qml" line="118"/>
         <source>Play</source>
         <extracomment>Play button</extracomment>
         <translation>Прослушать</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="98"/>
+        <location filename="../main.qml" line="104"/>
         <source>Play playlist</source>
         <translation>Прослушать плейлист</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="85"/>
+        <location filename="../main.qml" line="91"/>
         <source>ID</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../main.qml" line="125"/>
+        <location filename="../main.qml" line="131"/>
         <source>Play downloaded</source>
         <translation>Прослушать скачанное</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="137"/>
+        <location filename="../main.qml" line="143"/>
         <source>Play custom</source>
         <translation>Прослушать добавленный</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="151"/>
+        <location filename="../main.qml" line="157"/>
         <source>Title</source>
         <translation>Заголовок</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="161"/>
+        <location filename="../main.qml" line="167"/>
         <source>Artists</source>
         <translation>Авторы</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="171"/>
+        <location filename="../main.qml" line="177"/>
         <source>Extra</source>
         <translation>Дополнительная информация</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="176"/>
-        <location filename="../main.qml" line="198"/>
+        <location filename="../main.qml" line="182"/>
+        <location filename="../main.qml" line="204"/>
         <source>Chose media</source>
         <translation>Выберите медиафайл</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="177"/>
-        <location filename="../main.qml" line="198"/>
+        <location filename="../main.qml" line="183"/>
+        <location filename="../main.qml" line="204"/>
         <source>Audio (*.mp3 *.wav *.ogg *.m4a)</source>
         <translation>Звук (*.mp3 *.wav *.ogg *.m4a)</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="187"/>
-        <location filename="../main.qml" line="200"/>
+        <location filename="../main.qml" line="193"/>
+        <location filename="../main.qml" line="206"/>
         <source>Chose cover</source>
         <translation>Выберите обложку</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="188"/>
-        <location filename="../main.qml" line="200"/>
+        <location filename="../main.qml" line="194"/>
+        <location filename="../main.qml" line="206"/>
         <source>Image (*.jpg *.png *.svg)</source>
         <translation>Изображение (*.jpg *.png *.svg)</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="216"/>
+        <location filename="../main.qml" line="222"/>
         <source>Add custom track</source>
         <translation>Добавить трек</translation>
     </message>