Hello community, here is the log from the commit of package libnepomukwidgets for openSUSE:Factory checked in at 2013-05-16 18:04:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnepomukwidgets (Old) and /work/SRC/openSUSE:Factory/.libnepomukwidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libnepomukwidgets" Changes: -------- --- /work/SRC/openSUSE:Factory/libnepomukwidgets/libnepomukwidgets.changes 2013-04-14 10:33:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libnepomukwidgets.new/libnepomukwidgets.changes 2013-05-16 18:04:59.000000000 +0200 @@ -1,0 +2,8 @@ +Sat May 4 17:03:36 UTC 2013 - [email protected] + +- Update to 4.10.3 + * Bugfix release + * See http://www.kde.org/announcements/announce-4.10.3.php + * resolves bnc#818500 + +------------------------------------------------------------------- Old: ---- nepomuk-widgets-4.10.2.tar.xz New: ---- nepomuk-widgets-4.10.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnepomukwidgets.spec ++++++ --- /var/tmp/diff_new_pack.3dWGba/_old 2013-05-16 18:05:00.000000000 +0200 +++ /var/tmp/diff_new_pack.3dWGba/_new 2013-05-16 18:05:00.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.2 +Version: 4.10.3 Release: 0 Source0: nepomuk-widgets-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ nepomuk-widgets-4.10.2.tar.xz -> nepomuk-widgets-4.10.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-widgets-4.10.2/ui/filemetadataprovider.cpp new/nepomuk-widgets-4.10.3/ui/filemetadataprovider.cpp --- old/nepomuk-widgets-4.10.2/ui/filemetadataprovider.cpp 2013-03-29 08:00:42.000000000 +0100 +++ new/nepomuk-widgets-4.10.3/ui/filemetadataprovider.cpp 2013-05-03 06:41:19.000000000 +0200 @@ -98,6 +98,9 @@ void indexFile( const QUrl& url ); bool m_readOnly; + + /// Set to true when the file has been specially indexed and does not exist in the db + bool m_realTimeIndexing; QList<KFileItem> m_fileItems; QHash<QUrl, Variant> m_data; @@ -108,6 +111,7 @@ FileMetaDataProvider::Private::Private(FileMetaDataProvider* parent) : m_readOnly(false), m_fileItems(), + m_realTimeIndexing(false), m_data(), q(parent) { @@ -340,6 +344,7 @@ { d->m_fileItems = items; d->m_data.clear(); + d->m_realTimeIndexing = false; if (items.isEmpty()) { return; @@ -360,6 +365,7 @@ IndexedDataRetriever *ret = new IndexedDataRetriever( url.toLocalFile(), this ); connect( ret, SIGNAL(finished(KJob*)), this, SLOT(slotLoadingFinished(KJob*)) ); ret->start(); + d->m_realTimeIndexing = true; return; } else { @@ -531,6 +537,11 @@ #endif } +bool FileMetaDataProvider::realTimeIndexing() +{ + return d->m_realTimeIndexing; +} + } #include "filemetadataprovider_p.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-widgets-4.10.2/ui/filemetadataprovider_p.h new/nepomuk-widgets-4.10.3/ui/filemetadataprovider_p.h --- old/nepomuk-widgets-4.10.2/ui/filemetadataprovider_p.h 2013-03-29 08:00:42.000000000 +0100 +++ new/nepomuk-widgets-4.10.3/ui/filemetadataprovider_p.h 2013-05-03 06:41:19.000000000 +0200 @@ -101,6 +101,13 @@ */ QHash<QUrl, Variant> data() const; + /** + * Returns true if the items do not exist in the database and + * have just been indexed. This means, that we should not allow + * others to search through these items cause they do not exist + * in the database. + */ + bool realTimeIndexing(); Q_SIGNALS: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-widgets-4.10.2/ui/filemetadatawidget.cpp new/nepomuk-widgets-4.10.3/ui/filemetadatawidget.cpp --- old/nepomuk-widgets-4.10.2/ui/filemetadatawidget.cpp 2013-03-01 07:26:59.000000000 +0100 +++ new/nepomuk-widgets-4.10.3/ui/filemetadatawidget.cpp 2013-05-03 06:41:19.000000000 +0200 @@ -142,6 +142,7 @@ // Filter the data QHash<QUrl, Variant> data = m_filter->filter( m_provider->data() ); + m_widgetFactory->setNoLinks( m_provider->realTimeIndexing() ); // Iterate through all remaining items embed the label // and the value as new row in the widget diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-widgets-4.10.2/ui/widgetfactory.cpp new/nepomuk-widgets-4.10.3/ui/widgetfactory.cpp --- old/nepomuk-widgets-4.10.2/ui/widgetfactory.cpp 2013-03-01 07:26:59.000000000 +0100 +++ new/nepomuk-widgets-4.10.3/ui/widgetfactory.cpp 2013-05-03 06:41:19.000000000 +0200 @@ -72,6 +72,7 @@ WidgetFactory::WidgetFactory(QObject* parent) : QObject(parent) , m_readOnly( false ) + , m_noLinks( false ) { } @@ -107,10 +108,11 @@ QString string = value.toString(); if( !prop.toString().startsWith("kfileitem#") ) { - if( ResourceManager::instance()->initialized() ) - string = Utils::formatPropertyValue( prop, value, resources, Utils::WithKioLinks ); - else + bool initialized = ResourceManager::instance()->initialized(); + if( m_noLinks || !initialized ) string = Utils::formatPropertyValue( prop, value, resources, Utils::NoPropertyFormatFlags ); + else + string = Utils::formatPropertyValue( prop, value, resources, Utils::WithKioLinks ); } widget = createValueWidget( string, parent ); } @@ -291,6 +293,11 @@ m_readOnly = value; } +void WidgetFactory::setNoLinks(bool value) +{ + m_noLinks = value; +} + void WidgetFactory::setUris(const QList< QUrl >& uris) { m_uris = uris; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-widgets-4.10.2/ui/widgetfactory.h new/nepomuk-widgets-4.10.3/ui/widgetfactory.h --- old/nepomuk-widgets-4.10.2/ui/widgetfactory.h 2013-03-01 07:26:59.000000000 +0100 +++ new/nepomuk-widgets-4.10.3/ui/widgetfactory.h 2013-05-03 06:41:19.000000000 +0200 @@ -46,6 +46,7 @@ QList<QUrl> uris(); void setReadOnly(bool value); + void setNoLinks(bool value); QWidget* createWidget(const QUrl& prop, const Variant& value, QWidget* parent); @@ -77,6 +78,7 @@ QList<QUrl> m_uris; QList<Tag> m_prevTags; bool m_readOnly; + bool m_noLinks; }; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
