Port away from DelegateRecycler

Component has been removed from Kirigami
Allow building with KF6
2023-10-16 10:56:52 +02:00 · 2023-08-06 21:25:54 +02:00 · 2023-08-06 16:37:54 +02:00 · 2023-08-06 16:36:39 +02:00 · 2023-08-03 02:04:21 +00:00 · 2023-07-31 02:05:26 +00:00
9 changed files with 87 additions and 29 deletions
@@ -6,21 +6,26 @@ cmake_minimum_required(VERSION 3.16.0)

 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "23")
-set(RELEASE_SERVICE_VERSION_MINOR "07")
-set(RELEASE_SERVICE_VERSION_MICRO "90")
+set(RELEASE_SERVICE_VERSION_MINOR "11")
+set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")

 project(audiotube VERSION ${RELEASE_SERVICE_VERSION})

 include(FeatureSummary)

-set(QT5_MIN_VERSION 5.15)
-set(KF5_MIN_VERSION 5.81)
+if (QT_MAJOR_VERSION_STREQUAL "6")
+	set(QT_MIN_VERSION "6.4.0")
+	set(KF_MIN_VERSION "5.240.0")
+else()
+	set(QT_MIN_VERSION "5.15")
+	set(KF_MIN_VERSION "5.81.0")
+endif()

 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

-find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)

 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)

@@ -39,8 +44,8 @@ ecm_setup_version(${PROJECT_VERSION}

 kde_enable_exceptions()

-find_package(Qt${QT_MAJOR_VERSION} ${QT5_MIN_VERSION} REQUIRED COMPONENTS Core Gui Qml QuickControls2 Svg Sql Widgets Concurrent DBus)
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 I18n CoreAddons Crash WindowSystem)
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Gui Qml QuickControls2 Svg Sql Widgets Concurrent DBus)
+find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 I18n CoreAddons Crash WindowSystem)
 find_package(pybind11 REQUIRED)
 find_package(Ytdlp REQUIRED RUNTIME)
 find_package(YTMusicAPI 1.0.2 REQUIRED RUNTIME)
@@ -12,8 +12,8 @@
        },
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/9d/19/59961b522e6757f0c9097e4493fa906031b95b3ebe9360b2c3083561a6b4/certifi-2023.5.7-py3-none-any.whl",
-            "sha256": "c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716"
+            "url": "https://files.pythonhosted.org/packages/4c/dd/2234eab22353ffc7d94e8d13177aaa050113286e93e7b40eae01fbf7c3d9/certifi-2023.7.22-py3-none-any.whl",
+            "sha256": "92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"
        },
        {
            "type": "file",
@@ -32,8 +32,8 @@
        },
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/65/9b/21628ca5bcf40f58c33f0fbb4927a1bb91e12f3c33a3cf8e29e03f6bc1d1/yt_dlp-2023.6.22-py2.py3-none-any.whl",
-            "sha256": "c559885322f7f492c1e7fc8f5a59e2a72e47719b59575599cf8b0e69ea70d0a8"
+            "url": "https://files.pythonhosted.org/packages/5c/da/ef08140cea3392288a8f6cd60f6f12510a4c5776eead53e90151f139af19/yt_dlp-2023.7.6-py2.py3-none-any.whl",
+            "sha256": "b33b3f68751f33dd8290f1f61f7a011679b3b512aa223df3bff496688bc0bd19"
        }
    ]
 }
@@ -7,13 +7,13 @@
    "sources": [
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/9d/19/59961b522e6757f0c9097e4493fa906031b95b3ebe9360b2c3083561a6b4/certifi-2023.5.7-py3-none-any.whl",
-            "sha256": "c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716"
+            "url": "https://files.pythonhosted.org/packages/4c/dd/2234eab22353ffc7d94e8d13177aaa050113286e93e7b40eae01fbf7c3d9/certifi-2023.7.22-py3-none-any.whl",
+            "sha256": "92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"
        },
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/ff/d7/8d757f8bd45be079d76309248845a04f09619a7b17d6dfc8c9ff6433cac2/charset-normalizer-3.1.0.tar.gz",
-            "sha256": "34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5"
+            "url": "https://files.pythonhosted.org/packages/2a/53/cf0a48de1bdcf6ff6e1c9a023f5f523dfe303e4024f216feac64b6eb7f67/charset-normalizer-3.2.0.tar.gz",
+            "sha256": "3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace"
        },
        {
            "type": "file",
@@ -27,13 +27,13 @@
        },
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/8a/03/ad9306a50d05c166e3456fe810f33cee2b8b2a7a6818ec5d4908c4ec6b36/urllib3-2.0.3-py3-none-any.whl",
-            "sha256": "48e7fafa40319d358848e1bc6809b208340fafe2096f1725d05d67443d0483d1"
+            "url": "https://files.pythonhosted.org/packages/9b/81/62fd61001fa4b9d0df6e31d47ff49cfa9de4af03adecf339c7bc30656b37/urllib3-2.0.4-py3-none-any.whl",
+            "sha256": "de7df1803967d2c2a98e4b11bb7d6bd9210474c46e8a0401514e3a42a75ebde4"
        },
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/50/1c/24829fa937a3555bf782491669ec74e0afbae5adbd724d5ce1fd542062d1/ytmusicapi-1.1.0-py3-none-any.whl",
-            "sha256": "d7923e9b789b7107c75bd8e9010640cf99ce08d472f42a9bd9402088acfc4d49"
+            "url": "https://files.pythonhosted.org/packages/28/e2/35adcefca140b4232387b5d7d119abe69c6d1c86d48c949a720c7ccb8bc7/ytmusicapi-1.1.1-py3-none-any.whl",
+            "sha256": "0c154a052c8f8e2310a51b1f391aa2ed1a2f6693a7ec343cc47b822de5e95783"
        }
    ]
 }
@@ -532,3 +532,31 @@ msgstr "Sense títol"
 #, kde-format
 msgid "No album"
 msgstr "Sense àlbum"
+
+#~ msgid "Export"
+#~ msgstr "Exporta"
+
+#~ msgid "Import Playlist from Url"
+#~ msgstr "Importa una llista de reproducció des d'un URL"
+
+#~ msgid "Import Playlist from File"
+#~ msgstr "Importa una llista de reproducció des d'un fitxer"
+
+#~ msgid "Export Playlist"
+#~ msgstr "Exporta una llista de reproducció"
+
+#~ msgid "m3u, m3u8 Playlist File (*.m3u *.m3u8)"
+#~ msgstr "Fitxer de llista de reproducció m3u, m3u8 (*.m3u *.m3u8)"
+
+#~ msgid "Import Playlists"
+#~ msgstr "Importa llistes de reproducció"
+
+#~ msgid "m3u, m3u8 Playlist Files (*.m3u *.m3u8)"
+#~ msgstr "Fitxers de llista de reproducció m3u, m3u8 (*.m3u *.m3u8)"
+
+#~ msgid "Saving Failed"
+#~ msgstr "Ha fallat en desar"
+
+#~ msgctxt "%1 is the path to a playlist file."
+#~ msgid "Failed to Import %1"
+#~ msgstr "Ha fallat en importar %1"
@@ -532,3 +532,31 @@ msgstr "Sense títol"
 #, kde-format
 msgid "No album"
 msgstr "Sense àlbum"
+
+#~ msgid "Export"
+#~ msgstr "Exporta"
+
+#~ msgid "Import Playlist from Url"
+#~ msgstr "Importa una llista de reproducció des d'un URL"
+
+#~ msgid "Import Playlist from File"
+#~ msgstr "Importa una llista de reproducció des d'un fitxer"
+
+#~ msgid "Export Playlist"
+#~ msgstr "Exporta una llista de reproducció"
+
+#~ msgid "m3u, m3u8 Playlist File (*.m3u *.m3u8)"
+#~ msgstr "Fitxer de llista de reproducció m3u, m3u8 (*.m3u *.m3u8)"
+
+#~ msgid "Import Playlists"
+#~ msgstr "Importa llistes de reproducció"
+
+#~ msgid "m3u, m3u8 Playlist Files (*.m3u *.m3u8)"
+#~ msgstr "Fitxers de llista de reproducció m3u, m3u8 (*.m3u *.m3u8)"
+
+#~ msgid "Saving Failed"
+#~ msgstr "No s'ha pogut guardar"
+
+#~ msgctxt "%1 is the path to a playlist file."
+#~ msgid "Failed to Import %1"
+#~ msgstr "No s'ha pogut importar %1"
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2023-07-09 00:59+0000\n"
-"PO-Revision-Date: 2023-08-02 12:45\n"
+"PO-Revision-Date: 2023-08-02 12:41\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
@@ -14,8 +14,8 @@ msgstr ""
 "X-Crowdin-Project: kdeorg\n"
 "X-Crowdin-Project-ID: 269464\n"
 "X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /kf5-stable/messages/audiotube/audiotube.pot\n"
-"X-Crowdin-File-ID: 41997\n"
+"X-Crowdin-File: /kf5-trunk/messages/audiotube/audiotube.pot\n"
+"X-Crowdin-File-ID: 25474\n"

 #: asyncytmusic.cpp:65
 #, kde-format
@@ -3,5 +3,5 @@
 #
 # SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL

-ytmusicapi==1.1.0
+ytmusicapi==1.1.1
 yt-dlp
@@ -43,10 +43,7 @@ Kirigami.ScrollablePage {
                        filterRegularExpression: searchLoader.filterExpression
                        sourceModel: Library.playbackHistory
                    }
-                    delegate: Kirigami.DelegateRecycler {
-                        Layout.alignment: Qt.AlignTop
-                        sourceComponent: searchAlbum
-                    }
+                    delegate: searchAlbum
                }
            }
        }
@@ -12,7 +12,7 @@
 #include <vector>
 #include <memory>

-constexpr auto TESTED_YTMUSICAPI_VERSION = "1.1.0";
+constexpr auto TESTED_YTMUSICAPI_VERSION = "1.1.1";

 struct YTMusicPrivate;

@@ -293,7 +293,7 @@ public:
    std::vector<search::SearchResultItem> search(const std::string &query,
                                                 const std::optional<std::string> &filter = std::nullopt,
                                                 const std::optional<std::string> &scope = std::nullopt,
-                                                 const int limit = 20,
+                                                 const int limit = 100,
                                                 const bool ignore_spelling = false) const;

    /// https://ytmusicapi.readthedocs.io/en/latest/reference.html#ytmusicapi.YTMusic.get_artist
Author	SHA1	Message	Date
Marco Martin	883d3871e6	Port away from DelegateRecycler Component has been removed from Kirigami	2023-10-16 10:56:52 +02:00
Bart Ribbers	5cbcb85cf5	Allow building with KF6	2023-08-06 21:25:54 +02:00
Jonah Brüchert	7677ba8bf5	Update ytmusicapi to 1.1.1	2023-08-06 16:37:54 +02:00
Jonah Brüchert	678111a144	Fetch up too 100 search results	2023-08-06 16:36:39 +02:00
l10n daemon script	825ab78b46	GIT_SILENT Sync po/docbooks with svn	2023-08-03 02:04:21 +00:00
l10n daemon script	b7ed9d6c2d	GIT_SILENT Sync po/docbooks with svn	2023-07-31 02:05:26 +00:00
l10n daemon script	cb9b3ef479	GIT_SILENT Sync po/docbooks with svn	2023-07-29 01:45:21 +00:00
l10n daemon script	d8f30ae36f	GIT_SILENT Sync po/docbooks with svn	2023-07-24 08:59:52 +00:00
l10n daemon script	930c1506a0	GIT_SILENT Sync po/docbooks with svn	2023-07-19 02:31:36 +00:00
Albert Astals Cid	aa393e4278	GIT_SILENT Upgrade release service version to 23.11.70.	2023-07-17 12:49:23 +02:00