Hello community, here is the log from the commit of package milou5 for openSUSE:Factory checked in at 2018-06-13 15:31:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/milou5 (Old) and /work/SRC/openSUSE:Factory/.milou5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "milou5" Wed Jun 13 15:31:35 2018 rev:64 rq:615752 version:5.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/milou5/milou5.changes 2018-05-08 13:35:05.682414976 +0200 +++ /work/SRC/openSUSE:Factory/.milou5.new/milou5.changes 2018-06-13 15:31:38.849660050 +0200 @@ -1,0 +2,32 @@ +Thu Jun 7 20:03:51 CEST 2018 - [email protected] + +- Update to 5.13.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.13.0.php +- Changes since 5.12.90: + * None + +------------------------------------------------------------------- +Sat May 19 14:16:37 CEST 2018 - [email protected] + +- Update to 5.12.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.12.90.php +- Changes since 5.12.5: + * [SourcesModel] Check changed file name before reloading configuration + * Remove duplicated (X-KDE-)ServiceTypes entry + * Fix typos in comments + * Do not ue Qt module includes + * Merge applet package's /code subdir into /ui subdir + * Use KF5_MIN_VERSION also for ECM, now that it's part of KF + * Use non-deprecated KDEInstallDirs variables + * No const signals + * Bump minimal cmake version to 3.0 + * Use more explicit + * Use nullptr + * Use override + * Remove unnecessary dependency on QtScript + +------------------------------------------------------------------- Old: ---- milou-5.12.5.tar.xz New: ---- milou-5.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ milou5.spec ++++++ --- /var/tmp/diff_new_pack.5kMMZp/_old 2018-06-13 15:31:39.653630450 +0200 +++ /var/tmp/diff_new_pack.5kMMZp/_new 2018-06-13 15:31:39.657630304 +0200 @@ -18,13 +18,13 @@ %bcond_without lang Name: milou5 -Version: 5.12.5 +Version: 5.13.0 Release: 0 Summary: Dedicated search application built on top of Baloo License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/KDE Url: https://projects.kde.org/milou -Source: http://download.kde.org/stable/plasma/%{version}/milou-%{version}.tar.xz +Source: milou-%{version}.tar.xz BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -37,13 +37,9 @@ BuildRequires: cmake(KF5WindowSystem) >= 5.25.0 BuildRequires: cmake(Qt5Qml) >= 5.4.0 BuildRequires: cmake(Qt5Quick) >= 5.4.0 -BuildRequires: cmake(Qt5Script) >= 5.4.0 BuildRequires: cmake(Qt5Test) >= 5.4.0 BuildRequires: cmake(Qt5Widgets) >= 5.4.0 -%if %{with lang} Recommends: %{name}-lang -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A dedicated search application built on top of Baloo @@ -70,8 +66,7 @@ /sbin/ldconfig %files -%defattr(-,root,root) -%doc COPYING* +%license COPYING* %{_kf5_libdir}/libmilou.so.* %{_kf5_qmldir}/ %{_kf5_plasmadir}/ ++++++ milou-5.12.5.tar.xz -> milou-5.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/CMakeLists.txt new/milou-5.13.0/CMakeLists.txt --- old/milou-5.12.5/CMakeLists.txt 2018-05-01 14:56:23.000000000 +0200 +++ new/milou-5.13.0/CMakeLists.txt 2018-06-07 16:12:35.000000000 +0200 @@ -1,16 +1,16 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.0) project(Milou) -set(PROJECT_VERSION "5.12.5") +set(PROJECT_VERSION "5.13.0") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.9.0") set(KF5_MIN_VERSION "5.42.0") -find_package(ECM 1.2.0 REQUIRED NO_MODULE) +find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Script Qml Quick Widgets Test) +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Qml Quick Widgets Test) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Declarative Service Plasma Runner) include(FeatureSummary) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/CMakeLists.txt new/milou-5.13.0/lib/CMakeLists.txt --- old/milou-5.12.5/lib/CMakeLists.txt 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/CMakeLists.txt 2018-06-07 16:08:18.000000000 +0200 @@ -28,11 +28,11 @@ install( FILES miloupreviewplugin.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR}) + DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}) generate_export_header(milou BASE_NAME MILOU EXPORT_FILE_NAME milou_export.h) -install(TARGETS milou EXPORT MilouLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) +install(TARGETS milou EXPORT MilouLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) add_subdirectory(qml) add_subdirectory(previews) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/draghelper.cpp new/milou-5.13.0/lib/draghelper.cpp --- old/milou-5.12.5/lib/draghelper.cpp 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/draghelper.cpp 2018-06-07 16:08:18.000000000 +0200 @@ -64,7 +64,7 @@ Q_ARG(QQuickItem*, item), Q_ARG(QMimeData*, mimeData), Q_ARG(QIcon, icon)); } -void DragHelper::doDrag(QQuickItem *item, QMimeData *mimeData, const QIcon &icon) const +void DragHelper::doDrag(QQuickItem *item, QMimeData *mimeData, const QIcon &icon) { QDrag *drag = new QDrag(item); drag->setMimeData(mimeData); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/draghelper.h new/milou-5.13.0/lib/draghelper.h --- old/milou-5.12.5/lib/draghelper.h 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/draghelper.h 2018-06-07 16:08:18.000000000 +0200 @@ -36,8 +36,8 @@ Q_PROPERTY(int dragIconSize READ dragIconSize WRITE setDragIconSize NOTIFY dragIconSizeChanged) public: - DragHelper(QObject *parent = 0); - ~DragHelper(); + explicit DragHelper(QObject *parent = nullptr); + ~DragHelper() override; int dragIconSize() const; void setDragIconSize(int size); @@ -46,12 +46,12 @@ Q_INVOKABLE void startDrag(QQuickItem* item, QMimeData *mimeData, const QIcon &icon = QIcon()); Q_SIGNALS: - void dragIconSizeChanged() const; - void dropped() const; + void dragIconSizeChanged(); + void dropped(); private: int m_dragIconSize; - Q_INVOKABLE void doDrag(QQuickItem* item, QMimeData *mimeData, const QIcon &icon = QIcon()) const; + Q_INVOKABLE void doDrag(QQuickItem* item, QMimeData *mimeData, const QIcon &icon = QIcon()); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/mousehelper.h new/milou-5.13.0/lib/mousehelper.h --- old/milou-5.12.5/lib/mousehelper.h 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/mousehelper.h 2018-06-07 16:08:18.000000000 +0200 @@ -35,7 +35,7 @@ public: explicit MouseHelper(QObject* parent = nullptr); - ~MouseHelper(); + ~MouseHelper() override; Q_INVOKABLE QPointF globalMousePosition() const; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/preview.cpp new/milou-5.13.0/lib/preview.cpp --- old/milou-5.12.5/lib/preview.cpp 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/preview.cpp 2018-06-07 16:08:18.000000000 +0200 @@ -36,8 +36,8 @@ Preview::Preview(QQuickItem* parent) : QQuickItem(parent) , m_loaded(false) - , m_declarativeItem(0) - , m_filePlugin(0) + , m_declarativeItem(nullptr) + , m_filePlugin(nullptr) { //setFlag(QGraphicsItem::ItemHasNoContents, false); @@ -118,7 +118,7 @@ { if (m_declarativeItem) { m_declarativeItem->deleteLater(); - m_declarativeItem = 0; + m_declarativeItem = nullptr; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/preview.h new/milou-5.13.0/lib/preview.h --- old/milou-5.12.5/lib/preview.h 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/preview.h 2018-06-07 16:08:18.000000000 +0200 @@ -39,8 +39,8 @@ Q_PROPERTY(bool loaded READ loaded) public: - Preview(QQuickItem* parent = 0); - virtual ~Preview(); + explicit Preview(QQuickItem* parent = nullptr); + ~Preview() override; QString mimetype() const; void setMimetype(const QString& mime); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/previewplugin.cpp new/milou-5.13.0/lib/previewplugin.cpp --- old/milou-5.12.5/lib/previewplugin.cpp 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/previewplugin.cpp 2018-06-07 16:08:18.000000000 +0200 @@ -29,7 +29,7 @@ PreviewPlugin::PreviewPlugin(QObject* parent) : QObject(parent) - , m_context(0) + , m_context(nullptr) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/previewplugin.h new/milou-5.13.0/lib/previewplugin.h --- old/milou-5.12.5/lib/previewplugin.h 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/previewplugin.h 2018-06-07 16:08:18.000000000 +0200 @@ -36,7 +36,7 @@ Q_OBJECT public: explicit PreviewPlugin(QObject* parent); - virtual ~PreviewPlugin(); + ~PreviewPlugin() override; /** * Return a list of mimetype which this plugin supports. These mimetypes @@ -86,7 +86,7 @@ protected: /** - * Highlights all the occurance of highlight in the document + * Highlights all the occurrences of highlight in the document */ void highlight(const QTextDocument* doc) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/previews/CMakeLists.txt new/milou-5.13.0/lib/previews/CMakeLists.txt --- old/milou-5.12.5/lib/previews/CMakeLists.txt 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/previews/CMakeLists.txt 2018-06-07 16:08:18.000000000 +0200 @@ -9,11 +9,11 @@ install( FILES miloutextpreview.desktop -DESTINATION ${SERVICES_INSTALL_DIR}) +DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) install( TARGETS miloutextplugin -DESTINATION ${PLUGIN_INSTALL_DIR}) +DESTINATION ${KDE_INSTALL_PLUGINDIR}) # # Images @@ -28,11 +28,11 @@ # #install( #FILES milouimagepreview.desktop -#DESTINATION ${SERVICES_INSTALL_DIR}) +#DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) # #install( #TARGETS milouimageplugin -#DESTINATION ${PLUGIN_INSTALL_DIR}) +#DESTINATION ${KDE_INSTALL_PLUGINDIR}) # # Emails @@ -51,11 +51,11 @@ # # install( # FILES milouemailpreview.desktop -# DESTINATION ${SERVICES_INSTALL_DIR}) +# DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) # # install( # TARGETS milouemailplugin -# DESTINATION ${PLUGIN_INSTALL_DIR}) +# DESTINATION ${KDE_INSTALL_PLUGINDIR}) endif() # @@ -73,11 +73,11 @@ # #install( #FILES milouokularpreview.desktop -#DESTINATION ${SERVICES_INSTALL_DIR}) +#DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) # #install( #TARGETS milouokularplugin -#DESTINATION ${PLUGIN_INSTALL_DIR}) +#DESTINATION ${KDE_INSTALL_PLUGINDIR}) # # Audio @@ -93,11 +93,11 @@ # # install( # FILES milouaudiopreview.desktop -# DESTINATION ${SERVICES_INSTALL_DIR}) +# DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) # # install( # TARGETS milouaudioplugin -# DESTINATION ${PLUGIN_INSTALL_DIR}) +# DESTINATION ${KDE_INSTALL_PLUGINDIR}) # # # # # General Files @@ -113,11 +113,11 @@ # # install( # FILES miloufilepreview.desktop -# DESTINATION ${SERVICES_INSTALL_DIR}) +# DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) # # install( # TARGETS miloufileplugin -# DESTINATION ${PLUGIN_INSTALL_DIR}) +# DESTINATION ${KDE_INSTALL_PLUGINDIR}) # # # # # Applications @@ -132,11 +132,11 @@ # # install( # FILES milouapplicationpreview.desktop -# DESTINATION ${SERVICES_INSTALL_DIR}) +# DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) # # install( # TARGETS milouapplicationplugin -# DESTINATION ${PLUGIN_INSTALL_DIR}) +# DESTINATION ${KDE_INSTALL_PLUGINDIR}) # # # # # Bookmarks @@ -151,8 +151,8 @@ # # install( # FILES miloubookmarkpreview.desktop -# DESTINATION ${SERVICES_INSTALL_DIR}) +# DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) # # install( # TARGETS miloubookmarkplugin -# DESTINATION ${PLUGIN_INSTALL_DIR}) +# DESTINATION ${KDE_INSTALL_PLUGINDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/previews/textplugin.h new/milou-5.13.0/lib/previews/textplugin.h --- old/milou-5.12.5/lib/previews/textplugin.h 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/previews/textplugin.h 2018-06-07 16:08:18.000000000 +0200 @@ -31,10 +31,10 @@ public: explicit TextPlugin(QObject* parent, const QVariantList&); - QStringList mimetypes() Q_DECL_OVERRIDE { + QStringList mimetypes() override { return QStringList() << QLatin1String("text/"); } - void generatePreview() Q_DECL_OVERRIDE; + void generatePreview() override; }; #endif // TEXTVIEW_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/previews/videos/CMakeLists.txt new/milou-5.13.0/lib/previews/videos/CMakeLists.txt --- old/milou-5.12.5/lib/previews/videos/CMakeLists.txt 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/previews/videos/CMakeLists.txt 2018-06-07 16:08:18.000000000 +0200 @@ -9,8 +9,8 @@ install( FILES milouvideopreview.desktop -DESTINATION ${SERVICES_INSTALL_DIR}) +DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) install( TARGETS milouvideoplugin -DESTINATION ${PLUGIN_INSTALL_DIR}) +DESTINATION ${KDE_INSTALL_PLUGINDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/qml/CMakeLists.txt new/milou-5.13.0/lib/qml/CMakeLists.txt --- old/milou-5.12.5/lib/qml/CMakeLists.txt 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/qml/CMakeLists.txt 2018-06-07 16:08:18.000000000 +0200 @@ -11,8 +11,8 @@ milou ) -install (TARGETS milouqmlplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/milou) -install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/milou) +install (TARGETS milouqmlplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/milou) +install (FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/milou) install (FILES ResultDelegate.qml ResultsView.qml globals.js ResultsListViewDelegate.qml ResultsListView.qml - DESTINATION ${QML_INSTALL_DIR}/org/kde/milou) + DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/milou) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/qml/qmlplugins.cpp new/milou-5.13.0/lib/qml/qmlplugins.cpp --- old/milou-5.12.5/lib/qml/qmlplugins.cpp 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/qml/qmlplugins.cpp 2018-06-07 16:08:18.000000000 +0200 @@ -27,7 +27,7 @@ #include "draghelper.h" #include "mousehelper.h" -#include <QtQml/qqml.h> +#include <QQmlEngine> void QmlPlugins::initializeEngine(QQmlEngine *, const char *) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/qml/qmlplugins.h new/milou-5.13.0/lib/qml/qmlplugins.h --- old/milou-5.12.5/lib/qml/qmlplugins.h 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/qml/qmlplugins.h 2018-06-07 16:08:18.000000000 +0200 @@ -30,8 +30,8 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE; - void registerTypes(const char *uri) Q_DECL_OVERRIDE; + void initializeEngine(QQmlEngine *engine, const char *uri) override; + void registerTypes(const char *uri) override; }; #endif // _MILOU_QML_PLUGINS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/sourcesmodel.cpp new/milou-5.13.0/lib/sourcesmodel.cpp --- old/milou-5.12.5/lib/sourcesmodel.cpp 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/sourcesmodel.cpp 2018-06-07 16:08:18.000000000 +0200 @@ -42,8 +42,8 @@ this, SLOT(slotMatchesChanged(QList<Plasma::QueryMatch>))); KDirWatch* watch = KDirWatch::self(); - connect(watch, SIGNAL(created(QString)), this, SLOT(reloadConfiguration())); - connect(watch, SIGNAL(dirty(QString)), this, SLOT(reloadConfiguration())); + connect(watch, &KDirWatch::created, this, &SourcesModel::slotSettingsFileChanged); + connect(watch, &KDirWatch::dirty, this, &SourcesModel::slotSettingsFileChanged); watch->addFile(QStandardPaths::locate(QStandardPaths::ConfigLocation, "krunnerrc")); m_resetTimer.setSingleShot(true); @@ -84,7 +84,7 @@ } } - return Plasma::QueryMatch(0); + return Plasma::QueryMatch(nullptr); } QVariant SourcesModel::data(const QModelIndex& index, int role) const @@ -347,6 +347,15 @@ m_duplicates[m.text()]++; } +void SourcesModel::slotSettingsFileChanged(const QString &path) +{ + if (!path.endsWith(QLatin1String("krunnerrc"))) { + return; + } + + reloadConfiguration(); +} + void SourcesModel::clear() { beginResetModel(); @@ -371,7 +380,7 @@ if (!info.isEmpty()) { // FIXME: pretty lame way to decide if this is a query prototype // Copied from kde4 krunner interface.cpp - if (match.runner() == 0) { + if (match.runner() == nullptr) { // lame way of checking to see if this is a Help Button generated match! int index = info.indexOf(QStringLiteral(":q:")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/sourcesmodel.h new/milou-5.13.0/lib/sourcesmodel.h --- old/milou-5.12.5/lib/sourcesmodel.h 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/sourcesmodel.h 2018-06-07 16:08:18.000000000 +0200 @@ -44,8 +44,8 @@ Q_PROPERTY(QIcon runnerIcon READ runnerIcon NOTIFY runnerChanged) public: - explicit SourcesModel(QObject* parent = 0); - virtual ~SourcesModel(); + explicit SourcesModel(QObject* parent = nullptr); + ~SourcesModel() override; enum Roles { TypeRole = Qt::UserRole + 1, @@ -57,9 +57,9 @@ PreviewLabelRole }; - QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; - bool hasChildren(const QModelIndex&) const Q_DECL_OVERRIDE { + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; + bool hasChildren(const QModelIndex&) const override { return false; } @@ -72,7 +72,7 @@ QString queryString() const; int queryLimit() const; - QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE; + QHash<int, QByteArray> roleNames() const override; signals: /** @@ -103,6 +103,7 @@ void slotMatchesChanged(const QList<Plasma::QueryMatch>& list); void slotMatchAdded(const Plasma::QueryMatch& match); void slotResetTimeout(); + void slotSettingsFileChanged(const QString &path); public: // A list of all the types that are being shown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/test/modeltest.h new/milou-5.13.0/lib/test/modeltest.h --- old/milou-5.12.5/lib/test/modeltest.h 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/test/modeltest.h 2018-06-07 16:08:18.000000000 +0200 @@ -52,7 +52,7 @@ Q_OBJECT public: - ModelTest( QAbstractItemModel *model, QObject *parent = 0 ); + ModelTest( QAbstractItemModel *model, QObject *parent = nullptr ); private Q_SLOTS: void nonDestructiveBasicTest(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/lib/test/widgettest.cpp new/milou-5.13.0/lib/test/widgettest.cpp --- old/milou-5.12.5/lib/test/widgettest.cpp 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/lib/test/widgettest.cpp 2018-06-07 16:08:18.000000000 +0200 @@ -38,7 +38,7 @@ void main(); public: - explicit TestObject(QWidget* parent = 0, Qt::WindowFlags f = 0) + explicit TestObject(QWidget* parent = nullptr, Qt::WindowFlags f = {}) : QWidget(parent, f) { QTimer::singleShot(0, this, SLOT(main())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/plasmoid/package/contents/code/globals.js new/milou-5.13.0/plasmoid/package/contents/code/globals.js --- old/milou-5.12.5/plasmoid/package/contents/code/globals.js 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/plasmoid/package/contents/code/globals.js 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -/* - * This file is part of the KDE Milou Project - * Copyright (C) 2014 Vishesh Handa <[email protected]> - * - * This library 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 2.1 of the License, or (at your option) version 3, or any - * later version accepted by the membership of KDE e.V. (or its - * successor approved by the membership of KDE e.V.), which shall - * act as a proxy defined in Section 6 of version 3 of the license. - * - * This library 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 library. If not, see <http://www.gnu.org/licenses/>. - * - */ - -// This is the width of the side component which displays the categories -// of the results, such as "Applications", "Audio", "Video", etc -var CategoryWidth = units.gridUnit * 10; -var CategoryRightMargin = units.largeSpacing; - -// The Maximum and Minimum width of the Plasmoid -var PlasmoidWidth = units.gridUnit * 35; - -// The size in which the Plasmoid switches between compact and full -var SwitchWidth = units.gridUnit * 20; - -var IconSize = units.iconSizes.small - -// This title size is only used in the Audio plugin -// var TitleSize = isHighDPI ? TitleSizeHighDPI : TitleSizeNormal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/plasmoid/package/contents/ui/SearchField.qml new/milou-5.13.0/plasmoid/package/contents/ui/SearchField.qml --- old/milou-5.12.5/plasmoid/package/contents/ui/SearchField.qml 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/plasmoid/package/contents/ui/SearchField.qml 2018-06-07 16:08:18.000000000 +0200 @@ -23,7 +23,7 @@ import QtQuick 2.1 import org.kde.plasma.components 2.0 as PlasmaComponents -import "../code/globals.js" as Globals +import "globals.js" as Globals /* * The SearchField is a simple " Search |___input___|" widget. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/plasmoid/package/contents/ui/globals.js new/milou-5.13.0/plasmoid/package/contents/ui/globals.js --- old/milou-5.12.5/plasmoid/package/contents/ui/globals.js 1970-01-01 01:00:00.000000000 +0100 +++ new/milou-5.13.0/plasmoid/package/contents/ui/globals.js 2018-06-07 16:08:18.000000000 +0200 @@ -0,0 +1,37 @@ +/* + * This file is part of the KDE Milou Project + * Copyright (C) 2014 Vishesh Handa <[email protected]> + * + * This library 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 2.1 of the License, or (at your option) version 3, or any + * later version accepted by the membership of KDE e.V. (or its + * successor approved by the membership of KDE e.V.), which shall + * act as a proxy defined in Section 6 of version 3 of the license. + * + * This library 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 library. If not, see <http://www.gnu.org/licenses/>. + * + */ + +// This is the width of the side component which displays the categories +// of the results, such as "Applications", "Audio", "Video", etc +var CategoryWidth = units.gridUnit * 10; +var CategoryRightMargin = units.largeSpacing; + +// The Maximum and Minimum width of the Plasmoid +var PlasmoidWidth = units.gridUnit * 35; + +// The size in which the Plasmoid switches between compact and full +var SwitchWidth = units.gridUnit * 20; + +var IconSize = units.iconSizes.small + +// This title size is only used in the Audio plugin +// var TitleSize = isHighDPI ? TitleSizeHighDPI : TitleSizeNormal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/plasmoid/package/contents/ui/main.qml new/milou-5.13.0/plasmoid/package/contents/ui/main.qml --- old/milou-5.12.5/plasmoid/package/contents/ui/main.qml 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/plasmoid/package/contents/ui/main.qml 2018-06-07 16:08:18.000000000 +0200 @@ -28,7 +28,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.milou 0.1 as Milou -import "../code/globals.js" as Globals +import "globals.js" as Globals Item { id: mainWidget @@ -49,7 +49,7 @@ id: wrapper // - // The +20 is so that the minimumHeight is always atleast 20+. If the height + // The +20 is so that the minimumHeight is always at least 20+. If the height // is too small then Plasma will ignore the fact that it is a PopupApplet // and put the SearchField directly in the panel. // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/plasmoid/package/contents/ui/previews/Audio.qml new/milou-5.13.0/plasmoid/package/contents/ui/previews/Audio.qml --- old/milou-5.12.5/plasmoid/package/contents/ui/previews/Audio.qml 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/plasmoid/package/contents/ui/previews/Audio.qml 2018-06-07 16:08:18.000000000 +0200 @@ -26,7 +26,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.qtextracomponents 2.0 as QtExtra -import "../../code/globals.js" as Globals +import "../globals.js" as Globals Item { property string title diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/plasmoid/package/metadata.desktop new/milou-5.13.0/plasmoid/package/metadata.desktop --- old/milou-5.12.5/plasmoid/package/metadata.desktop 2018-05-01 14:55:23.000000000 +0200 +++ new/milou-5.13.0/plasmoid/package/metadata.desktop 2018-06-07 16:08:18.000000000 +0200 @@ -84,15 +84,15 @@ Comment[x-test]=xxSearch and Launchxx Comment[zh_CN]=搜索和启动 Comment[zh_TW]=搜尋並啟動 -Type=Service -ServiceTypes=Plasma/Applet Icon=nepomuk +Type=Service +X-KDE-ServiceTypes=Plasma/Applet + X-Plasma-API=declarativeappletscript X-Plasma-MainScript=ui/main.qml X-Plasma-DropUrlPatterns=run:/ -X-KDE-ServiceTypes=Plasma/Applet X-KDE-PluginInfo-Name=org.kde.milou X-KDE-PluginInfo-Category=Utilities diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/po/eu/milou.po new/milou-5.13.0/po/eu/milou.po --- old/milou-5.12.5/po/eu/milou.po 2018-05-01 14:55:50.000000000 +0200 +++ new/milou-5.13.0/po/eu/milou.po 2018-06-07 16:10:01.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: milou\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-12-04 03:13+0100\n" -"PO-Revision-Date: 2018-03-18 12:02+0100\n" +"PO-Revision-Date: 2018-03-18 11:55+0100\n" "Last-Translator: Iñigo Salvador Azurmendi <[email protected]>\n" "Language-Team: Basque <[email protected]>\n" "Language: eu\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/po/zh_CN/milou.po new/milou-5.13.0/po/zh_CN/milou.po --- old/milou-5.12.5/po/zh_CN/milou.po 2018-05-01 14:56:22.000000000 +0200 +++ new/milou-5.13.0/po/zh_CN/milou.po 2018-06-07 16:12:31.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-12-04 03:13+0100\n" -"PO-Revision-Date: 2018-04-26 06:06-0400\n" +"PO-Revision-Date: 2018-05-18 06:18-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -19,7 +19,7 @@ "X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" -"X-Crowdin-File: /kf5-stable/messages/kde-workspace/milou.pot\n" +"X-Crowdin-File: /kf5-trunk/messages/kde-workspace/milou.pot\n" #: previews/audioplugin.cpp:59 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/po/zh_CN/plasma_applet_org.kde.milou.po new/milou-5.13.0/po/zh_CN/plasma_applet_org.kde.milou.po --- old/milou-5.12.5/po/zh_CN/plasma_applet_org.kde.milou.po 2018-05-01 14:56:22.000000000 +0200 +++ new/milou-5.13.0/po/zh_CN/plasma_applet_org.kde.milou.po 2018-06-07 16:12:31.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:21+0100\n" -"PO-Revision-Date: 2018-04-26 06:06-0400\n" +"PO-Revision-Date: 2018-05-18 06:19-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -18,7 +18,7 @@ "X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" -"X-Crowdin-File: /kf5-stable/messages/kde-workspace/plasma_applet_org.kde." +"X-Crowdin-File: /kf5-trunk/messages/kde-workspace/plasma_applet_org.kde." "milou.pot\n" #: applet.cpp:69 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.12.5/po/zh_TW/milou.po new/milou-5.13.0/po/zh_TW/milou.po --- old/milou-5.12.5/po/zh_TW/milou.po 2018-05-01 14:56:23.000000000 +0200 +++ new/milou-5.13.0/po/zh_TW/milou.po 2018-06-07 16:12:35.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-12-04 03:13+0100\n" -"PO-Revision-Date: 2018-04-24 21:21+0800\n" +"PO-Revision-Date: 2018-03-25 12:09+0800\n" "Last-Translator: pan93412 <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\n"
