Hello community, here is the log from the commit of package elisa for openSUSE:Factory checked in at 2020-06-14 18:25:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/elisa (Old) and /work/SRC/openSUSE:Factory/.elisa.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "elisa" Sun Jun 14 18:25:38 2020 rev:15 rq:813589 version:20.04.2 Changes: -------- --- /work/SRC/openSUSE:Factory/elisa/elisa.changes 2020-05-23 17:21:37.462653014 +0200 +++ /work/SRC/openSUSE:Factory/.elisa.new.3606/elisa.changes 2020-06-14 18:25:45.684699692 +0200 @@ -1,0 +2,12 @@ +Tue Jun 9 12:14:07 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 20.04.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/releases/2020-06-apps-update +- Changes since 20.04.1: + * fix most issues in Elisa own code detected by Clazy + * avoid Elisa prevent session close + * fix qml interface not showing up on Windows due to platform specific qml + +------------------------------------------------------------------- Old: ---- elisa-20.04.1.tar.xz elisa-20.04.1.tar.xz.sig New: ---- elisa-20.04.2.tar.xz elisa-20.04.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ elisa.spec ++++++ --- /var/tmp/diff_new_pack.IK5zcD/_old 2020-06-14 18:25:46.612702686 +0200 +++ /var/tmp/diff_new_pack.IK5zcD/_new 2020-06-14 18:25:46.612702686 +0200 @@ -20,7 +20,7 @@ %define kf5_version 5.48.0 %bcond_without lang Name: elisa -Version: 20.04.1 +Version: 20.04.2 Release: 0 Summary: Music player and collection organizer License: LGPL-3.0-or-later ++++++ elisa-20.04.1.tar.xz -> elisa-20.04.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/CMakeLists.txt new/elisa-20.04.2/CMakeLists.txt --- old/elisa-20.04.1/CMakeLists.txt 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/CMakeLists.txt 2020-06-08 20:14:12.000000000 +0200 @@ -3,7 +3,7 @@ # KDE Applications version, managed by release script. set(RELEASE_SERVICE_VERSION_MAJOR "20") set(RELEASE_SERVICE_VERSION_MINOR "04") -set(RELEASE_SERVICE_VERSION_MICRO "1") +set(RELEASE_SERVICE_VERSION_MICRO "2") set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(elisa diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/autotests/mediaplaylisttest.cpp new/elisa-20.04.2/autotests/mediaplaylisttest.cpp --- old/elisa-20.04.1/autotests/mediaplaylisttest.cpp 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/autotests/mediaplaylisttest.cpp 2020-06-08 20:14:12.000000000 +0200 @@ -1806,8 +1806,6 @@ connect(&myDatabaseContent, &DatabaseInterface::tracksAdded, &myListener, &TracksListener::tracksAdded); - QVariantList entries; - myPlayList.enqueueRestoredEntries( QVariantList({QStringList({{},QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), QStringLiteral("1"), QStringLiteral("1"),{}}), QStringList({{},QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), QStringLiteral("1"), QStringLiteral("1"),{}}), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/org.kde.elisa.appdata.xml new/elisa-20.04.2/org.kde.elisa.appdata.xml --- old/elisa-20.04.1/org.kde.elisa.appdata.xml 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/org.kde.elisa.appdata.xml 2020-06-08 20:14:12.000000000 +0200 @@ -155,9 +155,9 @@ <project_group>KDE</project_group> <content_rating type="oars-1.0"/> <releases> + <release version="20.04.2" date="2020-06-11"/> <release version="20.04.1" date="2020-05-14"/> <release version="20.04.0" date="2020-04-23"/> <release version="19.12.3" date="2020-03-05"/> - <release version="19.12.2" date="2020-02-06"/> </releases> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/po/cs/elisa.po new/elisa-20.04.2/po/cs/elisa.po --- old/elisa-20.04.1/po/cs/elisa.po 2020-05-12 03:28:26.000000000 +0200 +++ new/elisa-20.04.2/po/cs/elisa.po 2020-06-09 02:48:59.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-04-29 09:18+0200\n" -"PO-Revision-Date: 2020-04-23 16:29+0200\n" +"PO-Revision-Date: 2020-05-02 20:00+0200\n" "Last-Translator: Vit Pelcak <v...@pelcak.org>\n" "Language-Team: Czech <kde-i18n-...@kde.org>\n" "Language: cs\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 19.12.3\n" +"X-Generator: Lokalize 20.04.0\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -379,6 +379,10 @@ "the file also does not work.\n" "Please report this as a bug." msgstr "" +"Tohle je daleko pomalejší než rychlé hledání.\n" +"Prosím, aktivujte jej pouze pokud Elisa nemůže najít vaši hudbu a ani " +"hledání souboru nepomáhá.\n" +"Prosím, nahlaste to jako chybu." #: qml/FileScanningConfiguration.qml:140 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/po/fi/elisa.po new/elisa-20.04.2/po/fi/elisa.po --- old/elisa-20.04.1/po/fi/elisa.po 2020-05-12 03:28:26.000000000 +0200 +++ new/elisa-20.04.2/po/fi/elisa.po 2020-06-09 02:48:59.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-04-29 09:18+0200\n" -"PO-Revision-Date: 2020-01-13 18:16+0200\n" +"PO-Revision-Date: 2020-06-05 13:33+0300\n" "Last-Translator: Tommi Nieminen <transla...@legisign.org>\n" "Language-Team: Finnish <kde-i18n-...@kde.org>\n" "Language: fi\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 18.12.3\n" +"X-Generator: Lokalize 20.04.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -75,16 +75,14 @@ msgstr "Radiot" #: main.cpp:119 -#, fuzzy, kde-format -#| msgid "A Simple Music Player written with KDE Frameworks" +#, kde-format msgid "A Simple Music Player made with love by the KDE community" -msgstr "Yksinkertainen KDE Frameworksillä kirjoitettu musiikkisoitin" +msgstr "KDE-yhteisön rakkaudella luoma yksinkertainen musiikkisoitin" #: main.cpp:121 -#, fuzzy, kde-format -#| msgid "(c) 2015-2019, Elisa contributors" +#, kde-format msgid "(c) 2015-2020, Elisa contributors" -msgstr "© 2015–19 Elisan avustajat" +msgstr "© 2015–2020 Elisan avustajat" #: main.cpp:123 #, kde-format @@ -119,19 +117,19 @@ #: main.cpp:131 #, kde-format msgid "Support for online radios" -msgstr "" +msgstr "Verkkoradiotuki" #: models/editabletrackmetadatamodel.cpp:91 #, kde-format msgctxt "Error message when track URL is invalid" msgid "Invalid URL." -msgstr "" +msgstr "Virheellinen verkko-osoite." #: models/editabletrackmetadatamodel.cpp:101 #, kde-format msgctxt "Error message when track title is empty" msgid "Empty title." -msgstr "" +msgstr "Tyhjä otsikko." #: models/trackmetadatamodel.cpp:109 #, kde-format @@ -257,7 +255,7 @@ #, kde-format msgctxt "Image address for radio metadata view" msgid "Image Address" -msgstr "" +msgstr "Kuvan osoite" #: models/viewsmodel.cpp:45 #, kde-format @@ -341,22 +339,22 @@ #: qml/ElisaConfigurationDialog.qml:28 #, kde-format msgid "Configure" -msgstr "" +msgstr "Asetukset" #: qml/ElisaConfigurationDialog.qml:67 #, kde-format msgid "General" -msgstr "" +msgstr "Perusasetukset" #: qml/ElisaConfigurationDialog.qml:82 #, kde-format msgid "Music Search Configuration" -msgstr "" +msgstr "Musiikkihaun asetukset" #: qml/ElisaConfigurationDialog.qml:102 #, kde-format msgid "OK" -msgstr "" +msgstr "OK" #: qml/ElisaConfigurationDialog.qml:108 qml/MediaTrackMetadataView.qml:222 #, kde-format @@ -366,12 +364,12 @@ #: qml/ElisaConfigurationDialog.qml:116 #, kde-format msgid "Cancel" -msgstr "" +msgstr "Peru" #: qml/FileScanningConfiguration.qml:30 #, kde-format msgid "Force filesystem indexing" -msgstr "" +msgstr "Pakota tiedostojärjestelmän indeksointi" #: qml/FileScanningConfiguration.qml:38 #, kde-format @@ -381,6 +379,10 @@ "the file also does not work.\n" "Please report this as a bug." msgstr "" +"Tämä on paljon hitaampaa kuin pikahaun käyttäminen!\n" +"Aktivoi tämä vain, ellei Elisa löydä musiikkia eikä tiedostonkaan etsiminen " +"toimi.\n" +"Ilmoita tästä ohjelmavirheenä." #: qml/FileScanningConfiguration.qml:140 #, kde-format @@ -395,12 +397,12 @@ #: qml/GeneralConfiguration.qml:33 #, kde-format msgid "Show progress on Task Manager entries" -msgstr "" +msgstr "Näytä edistyminen tehtävänhallinnassa" #: qml/GeneralConfiguration.qml:41 #, kde-format msgid "Keep running in System Tray when main window is closed" -msgstr "" +msgstr "Pysy käynnissä ilmoitusalueella, kun pääikkuna suljetaan" #: qml/GridBrowserDelegate.qml:147 qml/ListBrowserDelegate.qml:263 #: qml/PlayListEntry.qml:233 @@ -634,7 +636,7 @@ #, kde-format msgctxt "Form validation error message for track data" msgid "Data are not valid. %1" -msgstr "" +msgstr "Tiedot eivät kelpaa. %1" #: qml/MediaTrackMetadataView.qml:199 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/po/fr/elisa.po new/elisa-20.04.2/po/fr/elisa.po --- old/elisa-20.04.1/po/fr/elisa.po 2020-05-12 03:28:26.000000000 +0200 +++ new/elisa-20.04.2/po/fr/elisa.po 2020-06-09 02:48:59.000000000 +0200 @@ -3,6 +3,7 @@ # Johan Claude-Breuninger <johan.claudebreunin...@gmail.com>, 2017, 2018. # Matthieu Gallien <mgall...@mgallien.fr>, 2017. # Simon Depiets <sdepi...@gmail.com>, 2018, 2019, 2020. +# Xavier Besnard <xavier.besn...@neuf.fr>, 2020. # msgid "" msgstr "" @@ -17,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 20.07.70\n" +"X-Generator: Lokalize 20.04.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/po/ko/elisa.po new/elisa-20.04.2/po/ko/elisa.po --- old/elisa-20.04.1/po/ko/elisa.po 2020-05-12 03:28:27.000000000 +0200 +++ new/elisa-20.04.2/po/ko/elisa.po 2020-06-09 02:48:59.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: elisa\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-04-29 09:18+0200\n" -"PO-Revision-Date: 2020-04-01 02:01+0200\n" +"PO-Revision-Date: 2020-06-07 03:10+0200\n" "Last-Translator: Shinjo Park <k...@peremen.name>\n" "Language-Team: Korean <kde...@kde.org>\n" "Language: ko\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 19.04.3\n" +"X-Generator: Lokalize 19.12.3\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -608,7 +608,7 @@ "Add some songs to get started. You can browse your music using the views on " "the left." msgstr "" -"시작하려면 노래를 추가하십시오. 왼쪽에 있는 보기를 사용하여 음악을 탐색할 수 " +"시작하려면 노래를 추가하십시오. 왼쪽에 있는 보기에서 음악을 탐색할 수 " "있습니다." #: qml/MediaPlayListView.qml:311 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/po/nn/elisa.po new/elisa-20.04.2/po/nn/elisa.po --- old/elisa-20.04.1/po/nn/elisa.po 2020-05-12 03:28:27.000000000 +0200 +++ new/elisa-20.04.2/po/nn/elisa.po 2020-06-09 02:48:59.000000000 +0200 @@ -14,7 +14,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 19.12.3\n" +"X-Generator: Lokalize 20.04.0\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/android/PlatformIntegration.qml new/elisa-20.04.2/src/android/PlatformIntegration.qml --- old/elisa-20.04.1/src/android/PlatformIntegration.qml 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/android/PlatformIntegration.qml 2020-06-08 20:14:12.000000000 +0200 @@ -27,6 +27,9 @@ property var player property var headerBarManager property var manageMediaPlayerControl + property bool showSystemTrayIcon + property var elisaMainWindow + property bool forceCloseWindow: false signal raisePlayer() } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/databaseinterface.cpp new/elisa-20.04.2/src/databaseinterface.cpp --- old/elisa-20.04.1/src/databaseinterface.cpp 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/databaseinterface.cpp 2020-06-08 20:14:12.000000000 +0200 @@ -3316,7 +3316,7 @@ checkDatabaseSchema(); } -void DatabaseInterface::dropTable(QString query) +void DatabaseInterface::dropTable(const QString &query) { QSqlQuery dropQueryQuery(d->mTracksDatabase); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/databaseinterface.h new/elisa-20.04.2/src/databaseinterface.h --- old/elisa-20.04.1/src/databaseinterface.h 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/databaseinterface.h 2020-06-08 20:14:12.000000000 +0200 @@ -333,7 +333,7 @@ void manageNewDatabaseVersion(); - void dropTable(QString table); + void dropTable(const QString &table); void setDatabaseVersionInTable(int version); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/elisaapplication.cpp new/elisa-20.04.2/src/elisaapplication.cpp --- old/elisa-20.04.1/src/elisaapplication.cpp 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/elisaapplication.cpp 2020-06-08 20:14:12.000000000 +0200 @@ -46,7 +46,7 @@ #include <KCoreAddons/KAboutData> #include <QQmlApplicationEngine> -#include <QCoreApplication> +#include <QGuiApplication> #include <QDesktopServices> #include <QDialog> #include <QPointer> @@ -114,6 +114,9 @@ connect(&d->mConfigFileWatcher, &QFileSystemWatcher::fileChanged, this, &ElisaApplication::configChanged); + + connect(static_cast<QGuiApplication*>(QCoreApplication::instance()), &QGuiApplication::commitDataRequest, + this, &ElisaApplication::commitDataRequest); } ElisaApplication::~ElisaApplication() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/elisaapplication.h new/elisa-20.04.2/src/elisaapplication.h --- old/elisa-20.04.1/src/elisaapplication.h 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/elisaapplication.h 2020-06-08 20:14:12.000000000 +0200 @@ -40,6 +40,7 @@ class ManageHeaderBar; class QQmlApplicationEngine; class ElisaApplicationPrivate; +class QSessionManager; class ELISALIB_EXPORT ElisaApplication : public QObject { @@ -151,6 +152,8 @@ void showSystemTrayIconChanged(); + void commitDataRequest(QSessionManager &manager); + public Q_SLOTS: void appHelpActivated(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/embeddedcoverageimageprovider.cpp new/elisa-20.04.2/src/embeddedcoverageimageprovider.cpp --- old/elisa-20.04.1/src/embeddedcoverageimageprovider.cpp 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/embeddedcoverageimageprovider.cpp 2020-06-08 20:14:12.000000000 +0200 @@ -22,6 +22,8 @@ class AsyncImageResponse : public QQuickImageResponse, public QRunnable { + Q_OBJECT + public: AsyncImageResponse(QString id, QSize requestedSize) : QQuickImageResponse(), mId(std::move(id)), mRequestedSize(requestedSize) @@ -63,3 +65,5 @@ pool.start(response.get()); return response.release(); } + +#include "embeddedcoverageimageprovider.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/filewriter.cpp new/elisa-20.04.2/src/filewriter.cpp --- old/elisa-20.04.1/src/filewriter.cpp 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/filewriter.cpp 2020-06-08 20:14:12.000000000 +0200 @@ -30,22 +30,6 @@ #include <KFileMetaData/WriteData> #include <QHash> -static const QHash<DataTypes::ColumnsRoles, KFileMetaData::Property::Property> propertyTranslation = { - {DataTypes::ColumnsRoles::ArtistRole, KFileMetaData::Property::Artist}, - {DataTypes::ColumnsRoles::AlbumArtistRole, KFileMetaData::Property::AlbumArtist}, - {DataTypes::ColumnsRoles::GenreRole, KFileMetaData::Property::Genre}, - {DataTypes::ColumnsRoles::ComposerRole, KFileMetaData::Property::Composer}, - {DataTypes::ColumnsRoles::LyricistRole, KFileMetaData::Property::Lyricist}, - {DataTypes::ColumnsRoles::TitleRole, KFileMetaData::Property::Title}, - {DataTypes::ColumnsRoles::AlbumRole, KFileMetaData::Property::Album}, - {DataTypes::ColumnsRoles::TrackNumberRole, KFileMetaData::Property::TrackNumber}, - {DataTypes::ColumnsRoles::DiscNumberRole, KFileMetaData::Property::DiscNumber}, - {DataTypes::ColumnsRoles::YearRole, KFileMetaData::Property::ReleaseYear}, - {DataTypes::ColumnsRoles::LyricsRole, KFileMetaData::Property::Lyrics}, - {DataTypes::ColumnsRoles::CommentRole, KFileMetaData::Property::Comment}, - {DataTypes::ColumnsRoles::RatingRole, KFileMetaData::Property::Rating}, -}; - #endif class FileWriterPrivate @@ -54,6 +38,22 @@ #if defined KF5FileMetaData_FOUND && KF5FileMetaData_FOUND KFileMetaData::WriterCollection mAllWriters; + + const QHash<DataTypes::ColumnsRoles, KFileMetaData::Property::Property> mPropertyTranslation = { + {DataTypes::ColumnsRoles::ArtistRole, KFileMetaData::Property::Artist}, + {DataTypes::ColumnsRoles::AlbumArtistRole, KFileMetaData::Property::AlbumArtist}, + {DataTypes::ColumnsRoles::GenreRole, KFileMetaData::Property::Genre}, + {DataTypes::ColumnsRoles::ComposerRole, KFileMetaData::Property::Composer}, + {DataTypes::ColumnsRoles::LyricistRole, KFileMetaData::Property::Lyricist}, + {DataTypes::ColumnsRoles::TitleRole, KFileMetaData::Property::Title}, + {DataTypes::ColumnsRoles::AlbumRole, KFileMetaData::Property::Album}, + {DataTypes::ColumnsRoles::TrackNumberRole, KFileMetaData::Property::TrackNumber}, + {DataTypes::ColumnsRoles::DiscNumberRole, KFileMetaData::Property::DiscNumber}, + {DataTypes::ColumnsRoles::YearRole, KFileMetaData::Property::ReleaseYear}, + {DataTypes::ColumnsRoles::LyricsRole, KFileMetaData::Property::Lyrics}, + {DataTypes::ColumnsRoles::CommentRole, KFileMetaData::Property::Comment}, + {DataTypes::ColumnsRoles::RatingRole, KFileMetaData::Property::Rating}, + }; #endif QMimeDatabase mMimeDb; @@ -66,7 +66,7 @@ FileWriter::~FileWriter() = default; -bool FileWriter::writeSingleMetaDataToFile(const QUrl &url, const DataTypes::ColumnsRoles role, const QVariant data) +bool FileWriter::writeSingleMetaDataToFile(const QUrl &url, const DataTypes::ColumnsRoles role, const QVariant &data) { #if defined KF5FileMetaData_FOUND && KF5FileMetaData_FOUND @@ -87,8 +87,8 @@ } KFileMetaData::Writer *writer = writerList.first(); KFileMetaData::WriteData writeData(localFileName, mimetype); - auto translatedKey = propertyTranslation.find(role); - if (translatedKey != propertyTranslation.end()) { + auto translatedKey = d->mPropertyTranslation.find(role); + if (translatedKey != d->mPropertyTranslation.end()) { writeData.add(translatedKey.value(), data); } writer->write(writeData); @@ -144,8 +144,8 @@ auto rangeBegin = data.constKeyValueBegin(); while (rangeBegin != data.constKeyValueEnd()) { auto key = (*rangeBegin).first; - auto translatedKey = propertyTranslation.find(key); - if (translatedKey != propertyTranslation.end()) { + auto translatedKey = d->mPropertyTranslation.find(key); + if (translatedKey != d->mPropertyTranslation.end()) { writeData.add(translatedKey.value(), (*rangeBegin).second); } rangeBegin++; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/filewriter.h new/elisa-20.04.2/src/filewriter.h --- old/elisa-20.04.1/src/filewriter.h 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/filewriter.h 2020-06-08 20:14:12.000000000 +0200 @@ -34,7 +34,7 @@ ~FileWriter(); - bool writeSingleMetaDataToFile(const QUrl &url, const DataTypes::ColumnsRoles role, const QVariant data); + bool writeSingleMetaDataToFile(const QUrl &url, const DataTypes::ColumnsRoles role, const QVariant &data); bool writeAllMetaDataToFile(const QUrl &url, const DataTypes::TrackDataType &data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/modeldataloader.cpp new/elisa-20.04.2/src/modeldataloader.cpp --- old/elisa-20.04.1/src/modeldataloader.cpp 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/modeldataloader.cpp 2020-06-08 20:14:12.000000000 +0200 @@ -448,12 +448,12 @@ } } -void ModelDataLoader::updateFileMetaData(DataTypes::TrackDataType trackDataType, const QUrl &url) +void ModelDataLoader::updateFileMetaData(const TrackDataType &trackDataType, const QUrl &url) { d->mFileWriter.writeAllMetaDataToFile(url, trackDataType); } -void ModelDataLoader::updateSingleFileMetaData(const QUrl &url, DataTypes::ColumnsRoles role, QVariant data) +void ModelDataLoader::updateSingleFileMetaData(const QUrl &url, DataTypes::ColumnsRoles role, const QVariant &data) { d->mFileWriter.writeSingleMetaDataToFile(url, role, data); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/modeldataloader.h new/elisa-20.04.2/src/modeldataloader.h --- old/elisa-20.04.1/src/modeldataloader.h 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/modeldataloader.h 2020-06-08 20:14:12.000000000 +0200 @@ -125,9 +125,9 @@ void loadFrequentlyPlayedData(ElisaUtils::PlayListEntryType dataType); - void updateFileMetaData(ModelDataLoader::TrackDataType trackDataType, const QUrl &url); + void updateFileMetaData(const ModelDataLoader::TrackDataType &trackDataType, const QUrl &url); - void updateSingleFileMetaData(const QUrl &url, DataTypes::ColumnsRoles role, QVariant data); + void updateSingleFileMetaData(const QUrl &url, DataTypes::ColumnsRoles role, const QVariant &data); private Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/musiclistenersmanager.cpp new/elisa-20.04.2/src/musiclistenersmanager.cpp --- old/elisa-20.04.1/src/musiclistenersmanager.cpp 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/musiclistenersmanager.cpp 2020-06-08 20:14:12.000000000 +0200 @@ -347,7 +347,7 @@ //resolve symlinks QStringList allRootPaths; - for (const auto &onePath : inputRootPath) { + for (const auto &onePath : qAsConst(inputRootPath)) { auto workPath = onePath; if (workPath.startsWith(QLatin1String("file:/"))) { auto urlPath = QUrl{workPath}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/qml/PlatformIntegration.qml new/elisa-20.04.2/src/qml/PlatformIntegration.qml --- old/elisa-20.04.1/src/qml/PlatformIntegration.qml 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/qml/PlatformIntegration.qml 2020-06-08 20:14:12.000000000 +0200 @@ -30,6 +30,7 @@ property alias showProgressOnTaskBar: mpris2Interface.showProgressOnTaskBar property bool showSystemTrayIcon property var elisaMainWindow + property bool forceCloseWindow: false signal raisePlayer() @@ -37,13 +38,21 @@ target: elisaMainWindow onClosing: { - if (systemTrayIcon.available && showSystemTrayIcon) { + if (systemTrayIcon.available && showSystemTrayIcon && !forceCloseWindow) { close.accepted = false elisaMainWindow.hide() } } } + Connections { + target: elisa + + onCommitDataRequest: { + forceCloseWindow = true + } + } + NativeMenu.MenuBar { NativeApplicationMenu { id: globalMenu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/resources.qrc new/elisa-20.04.2/src/resources.qrc --- old/elisa-20.04.1/src/resources.qrc 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/resources.qrc 2020-06-08 20:14:12.000000000 +0200 @@ -46,7 +46,6 @@ <qresource prefix="/qml/+windows"> <file alias="Theme.qml">windows/WindowsTheme.qml</file> <file alias="PlatformIntegration.qml">windows/PlatformIntegration.qml</file> - <file alias="LabelWithToolTip.qml">windows/LabelWithToolTip.qml</file> </qresource> <qresource prefix="/qml/+android"> <file alias="ElisaMainWindow.qml">android/ElisaMainWindow.qml</file> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/trackslistener.cpp new/elisa-20.04.2/src/trackslistener.cpp --- old/elisa-20.04.1/src/trackslistener.cpp 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/trackslistener.cpp 2020-06-08 20:14:12.000000000 +0200 @@ -319,7 +319,7 @@ Q_EMIT tracksListAdded(newDatabaseId, entryTitle, ElisaUtils::Genre, newTracks); } -void TracksListener::updateSingleFileMetaData(const QUrl &url, DataTypes::ColumnsRoles role, QVariant data) +void TracksListener::updateSingleFileMetaData(const QUrl &url, DataTypes::ColumnsRoles role, const QVariant &data) { d->mFileWriter.writeSingleMetaDataToFile(url, role, data); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/trackslistener.h new/elisa-20.04.2/src/trackslistener.h --- old/elisa-20.04.1/src/trackslistener.h 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/trackslistener.h 2020-06-08 20:14:12.000000000 +0200 @@ -74,7 +74,7 @@ void newUrlInList(const QUrl &entryUrl, ElisaUtils::PlayListEntryType databaseIdType); - void updateSingleFileMetaData(const QUrl &url, DataTypes::ColumnsRoles role, QVariant data); + void updateSingleFileMetaData(const QUrl &url, DataTypes::ColumnsRoles role, const QVariant &data); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/windows/LabelWithToolTip.qml new/elisa-20.04.2/src/windows/LabelWithToolTip.qml --- old/elisa-20.04.1/src/windows/LabelWithToolTip.qml 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/windows/LabelWithToolTip.qml 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -/* - * Copyright 2017 Matthieu Gallien <matthieu_gall...@yahoo.fr> - * - * This program is free software: you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see <https://www.gnu.org/licenses/>. - */ - -import QtQuick 2.7 -import QtQuick.Controls 2.2 -import QtGraphicalEffects 1.0 -import QtQuick.Window 2.2 -import org.kde.kirigami 2.5 as Kirigami - -Label { - id: theLabel - - Loader { - anchors.fill: parent - - active: theLabel.truncated - visible: theLabel.truncated - - MouseArea { - anchors.fill: parent - hoverEnabled: true - - ToolTip { - delay: Qt.styleHints.mousePressAndHoldInterval - visible: parent.containsMouse && theLabel.truncated - text: theLabel.text - - enter: Transition { NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad; from: 0.0; to: 1.0; duration: Kirigami.Units.longDuration; } } - exit: Transition { NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad; from: 1.0; to: 0.0; duration: Kirigami.Units.longDuration; } } - } - } - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-20.04.1/src/windows/PlatformIntegration.qml new/elisa-20.04.2/src/windows/PlatformIntegration.qml --- old/elisa-20.04.1/src/windows/PlatformIntegration.qml 2020-05-11 23:39:13.000000000 +0200 +++ new/elisa-20.04.2/src/windows/PlatformIntegration.qml 2020-06-08 20:14:12.000000000 +0200 @@ -28,6 +28,9 @@ property var headerBarManager property var manageMediaPlayerControl property alias showProgressOnTaskBar: progressBar.active + property var elisaMainWindow + property bool showSystemTrayIcon + property bool forceCloseWindow: false signal raisePlayer()
