Hello community, here is the log from the commit of package libnepomukwidgets for openSUSE:Factory checked in at 2013-04-14 10:33:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnepomukwidgets (Old) and /work/SRC/openSUSE:Factory/.libnepomukwidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libnepomukwidgets", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libnepomukwidgets/libnepomukwidgets.changes 2013-03-14 15:36:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libnepomukwidgets.new/libnepomukwidgets.changes 2013-04-14 10:33:07.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 1 19:21:52 UTC 2013 - [email protected] + +- Update to 4.10.2 \n * Bugfixes + +------------------------------------------------------------------- Old: ---- nepomuk-widgets-4.10.1.tar.xz New: ---- nepomuk-widgets-4.10.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnepomukwidgets.spec ++++++ --- /var/tmp/diff_new_pack.uNVRWC/_old 2013-04-14 10:33:08.000000000 +0200 +++ /var/tmp/diff_new_pack.uNVRWC/_new 2013-04-14 10:33:08.000000000 +0200 @@ -32,7 +32,7 @@ License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/KDE Url: http://nepomuk.kde.org/ -Version: 4.10.1 +Version: 4.10.2 Release: 0 Source0: nepomuk-widgets-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ nepomuk-widgets-4.10.1.tar.xz -> nepomuk-widgets-4.10.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-widgets-4.10.1/test/tagwidgetapp.cpp new/nepomuk-widgets-4.10.2/test/tagwidgetapp.cpp --- old/nepomuk-widgets-4.10.1/test/tagwidgetapp.cpp 2013-03-01 07:26:59.000000000 +0100 +++ new/nepomuk-widgets-4.10.2/test/tagwidgetapp.cpp 2013-03-29 08:00:42.000000000 +0100 @@ -1,3 +1,23 @@ +/* + This file is part of the Nepomuk KDE project. + Copyright (C) 2010 Sebastian Trueg <[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/>. +*/ #include "tagwidgettest.h" #include <QApplication> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-widgets-4.10.1/test/tagwidgettest.cpp new/nepomuk-widgets-4.10.2/test/tagwidgettest.cpp --- old/nepomuk-widgets-4.10.1/test/tagwidgettest.cpp 2013-03-01 07:26:59.000000000 +0100 +++ new/nepomuk-widgets-4.10.2/test/tagwidgettest.cpp 2013-03-29 08:00:42.000000000 +0100 @@ -1,3 +1,23 @@ +/* + This file is part of the Nepomuk KDE project. + Copyright (C) 2010 Sebastian Trueg <[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/>. +*/ #include "tagwidgettest.h" #include "tagwidget.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-widgets-4.10.1/test/tagwidgettest.h new/nepomuk-widgets-4.10.2/test/tagwidgettest.h --- old/nepomuk-widgets-4.10.1/test/tagwidgettest.h 2013-03-01 07:26:59.000000000 +0100 +++ new/nepomuk-widgets-4.10.2/test/tagwidgettest.h 2013-03-29 08:00:42.000000000 +0100 @@ -1,3 +1,23 @@ +/* + This file is part of the Nepomuk KDE project. + Copyright (C) 2010 Sebastian Trueg <[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/>. +*/ #ifndef TAGWIDGETTEST_H #define TAGWIDGETTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-widgets-4.10.1/ui/filemetadataprovider.cpp new/nepomuk-widgets-4.10.2/ui/filemetadataprovider.cpp --- old/nepomuk-widgets-4.10.1/ui/filemetadataprovider.cpp 2013-03-01 07:26:59.000000000 +0100 +++ new/nepomuk-widgets-4.10.2/ui/filemetadataprovider.cpp 2013-03-29 08:00:42.000000000 +0100 @@ -51,6 +51,7 @@ #include <QEvent> #include <QLabel> +#include <QTimer> // Required includes for subDirectoriesCount(): #ifdef Q_WS_WIN @@ -77,6 +78,7 @@ void slotLoadingFinished(KJob* job); void insertBasicData(); + void insertNepomukEditableData(); /** * Checks for the existance of \p uri in \p allProperties, and accordingly @@ -187,6 +189,7 @@ if( resources.size() == 1 ) { m_data = resources.first().properties(); + insertBasicData(); } else { // @@ -239,7 +242,7 @@ } } - insertBasicData(); + insertNepomukEditableData(); emit q->loadingFinished(); } @@ -250,6 +253,7 @@ m_data = ret->data(); insertBasicData(); + insertNepomukEditableData(); emit q->loadingFinished(); } @@ -286,8 +290,15 @@ } } m_data.insert(KUrl("kfileitem#totalSize"), KIO::convertSize(totalSize)); + + // When we have more than 1 item, the basic data should be emitted before + // the Resource data, cause the ResourceData might take considerable time + emit q->loadingFinished(); } +} +void FileMetaDataProvider::Private::insertNepomukEditableData() +{ // Insert tags, ratings and comments, if Nepomuk activated bool nepomukActivated = ResourceManager::instance()->initialized(); if( nepomukActivated && !m_readOnly ) { @@ -298,8 +309,10 @@ if( !m_data.contains(NAO::description()) ) m_data.insert( NAO::description(), Variant() ); } + } + void FileMetaDataProvider::Private::indexFile(const QUrl& url) { const QString exe = KStandardDirs::findExe(QLatin1String("nepomukindexer")); @@ -377,6 +390,12 @@ connect( loader, SIGNAL(finished(ResourceLoader*)), this, SLOT(slotLoadingFinished(ResourceLoader*)) ); loader->start(); + + // When multiple urls are being shown, we load the basic data first cause loading + // all the ResourceData will take some time + if( urls.size() > 1 ) { + QTimer::singleShot( 0, this, SLOT(insertBasicData()) ); + } } QString FileMetaDataProvider::label(const KUrl& metaDataUri) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-widgets-4.10.1/ui/filemetadataprovider_p.h new/nepomuk-widgets-4.10.2/ui/filemetadataprovider_p.h --- old/nepomuk-widgets-4.10.1/ui/filemetadataprovider_p.h 2013-03-01 07:26:59.000000000 +0100 +++ new/nepomuk-widgets-4.10.2/ui/filemetadataprovider_p.h 2013-03-29 08:00:42.000000000 +0100 @@ -106,20 +106,18 @@ /** * Is emitted after the loading triggered by KFileMetaDataProvider::setItems() * has been finished. + * + * Can be emitted multiple times to indicate data changes */ void loadingFinished(); - void urlActivated(const KUrl& url); - - void dataChangeStarted(); - void dataChangeFinished(); - private: class Private; Private* const d; Q_PRIVATE_SLOT(d, void slotLoadingFinished(ResourceLoader* loader)) Q_PRIVATE_SLOT(d, void slotLoadingFinished(KJob* job)) + Q_PRIVATE_SLOT(d, void insertBasicData()); }; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
