don't lose the history of the URL navigator if the settings of the Icons View, Detail...

[dolphin.git] / src / metadatawidget.cpp

diff --git a/src/metadatawidget.cpp b/src/metadatawidget.cpp
index 85c1fa30f31d25cd82c053c4707615847c145ac4..1bab4abd7bde897f46377fb1617ca03e594fce77 100644 (file)
--- a/src/metadatawidget.cpp
+++ b/src/metadatawidget.cpp
@@ -23,18 +23,23 @@
 
 #include <klocale.h>
 
-#include <QLabel>
-#include <QGridLayout>
-#include <QTextEdit>
+#include <QtGui/QLabel>
+#include <QtGui/QGridLayout>
+#include <QtGui/QTextEdit>
 
 #ifdef HAVE_KMETADATA
-#include <kmetadatatagwidget.h>
+#include <kmetadata/kmetadatatagwidget.h>
 #include <kmetadata/resourcemanager.h>
-#include <kmetadata/file.h>
-#include <kratingwidget.h>
-#include <kmetadatatagwidget.h>
+#include <kmetadata/resource.h>
+#include <kmetadata/variant.h>
+#include <kmetadata/kratingwidget.h>
+#include <kmetadata/kmetadatatagwidget.h>
 #endif
 
+// FIXME: these should be replaced by using KMetaData::File once it is available again
+static const char* s_nfoFile = "http://ont.semanticdesktop.org/2007/03/22/nfo#File";
+static const char* s_nfoFileUrl = "http://ont.semanticdesktop.org/2007/03/22/nfo#fileUrl";
+
 
 bool MetaDataWidget::metaDataAvailable()
 {
@@ -65,7 +70,7 @@ public:
 
     KUrl fileUrl;
 
-    Nepomuk::KMetaData::File file;
+    Nepomuk::KMetaData::Resource file;
 
     QTextEdit* editComment;
     KRatingWidget* ratingWidget;
@@ -101,7 +106,7 @@ MetaDataWidget::MetaDataWidget(QWidget* parent)
     d->editComment->installEventFilter(this);
     d->editComment->viewport()->installEventFilter(this);
 #else
-    d = 0L;
+    d = 0;
 #endif
 }
 
@@ -115,12 +120,14 @@ MetaDataWidget::~MetaDataWidget()
 void MetaDataWidget::setFile(const KUrl& url)
 {
 #ifdef HAVE_KMETADATA
+    // FIXME: replace with KMetaData::File once we have it again
     d->fileUrl = url;
-    d->file = Nepomuk::KMetaData::File(url.url());
-    d->file.setLocation(url.url());
-    d->ratingWidget->setRating(d->file.getRating());
+    d->file = Nepomuk::KMetaData::Resource(url.url(), s_nfoFile);
+//    d->file.setLocation(url.url());
+    d->file.setProperty( s_nfoFileUrl, url.url() );
+    d->ratingWidget->setRating(d->file.rating());
     d->tagWidget->setTaggedResource(d->file);
-    d->loadComment(d->file.getComment());
+    d->loadComment(d->file.description());
 #endif
 }
 
@@ -137,7 +144,7 @@ void MetaDataWidget::setFiles(const KUrl::List urls)
 void MetaDataWidget::slotCommentChanged()
 {
 #ifdef HAVE_KMETADATA
-    d->file.setComment(d->editComment->toPlainText());
+    d->file.setDescription(d->editComment->toPlainText());
 #endif
 }
 
@@ -160,7 +167,7 @@ bool MetaDataWidget::eventFilter(QObject* obj, QEvent* event)
             d->loadComment(d->editComment->toPlainText());
         } else if (event->type() == QEvent::FocusIn) {
             d->editComment->setFontItalic(false);
-            if (d->file.getComment().isEmpty())
+            if (d->file.description().isEmpty())
                 d->editComment->setText(QString());
         }
     }