Fixed compilation issue if HAVE_NEPOMUK is not set. This #ifdef HAVE_NEPOMUK stuff is really a pain :-(

svn path=/trunk/KDE/kdebase/apps/; revision=1036067

3 files changed, 58 insertions, 42 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 596490ae9..3186489b4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -114,6 +114,7 @@ set(dolphin_SRCS
     panels/information/informationpanel.cpp
     panels/information/informationpanelcontent.cpp
     panels/information/metadatawidget.cpp
+    panels/information/metadataconfigurationdialog.cpp
     panels/information/phononwidget.cpp
     panels/folders/ktreeview.cpp
     panels/places/placespanel.cpp
@@ -154,7 +155,6 @@ set(dolphin_SRCS
   ${dolphin_SRCS}
   panels/information/commentwidget.cpp
   panels/information/edittagsdialog.cpp
-  panels/information/metadataconfigurationdialog.cpp
   panels/information/nepomukmassupdatejob.cpp
   panels/information/taggingwidget.cpp
 )
diff --git a/src/panels/information/metadataconfigurationdialog.cpp b/src/panels/information/metadataconfigurationdialog.cpp
index 42343780f..aa9ae5d96 100644
--- a/src/panels/information/metadataconfigurationdialog.cpp
+++ b/src/panels/information/metadataconfigurationdialog.cpp
@@ -23,10 +23,13 @@
 
 #include <klocale.h>
 
-#define DISABLE_NEPOMUK_LEGACY
-#include <Nepomuk/Resource>
-#include <Nepomuk/Types/Property>
-#include <Nepomuk/Variant>
+#include <config-nepomuk.h>
+#ifdef HAVE_NEPOMUK
+    #define DISABLE_NEPOMUK_LEGACY
+    #include <Nepomuk/Resource>
+    #include <Nepomuk/Types/Property>
+    #include <Nepomuk/Variant>
+#endif
 
 #include <QLabel>
 #include <QListWidget>
@@ -100,10 +103,12 @@ void MetaDataConfigurationDialog::loadMetaData()
     fixedItems.append(FixedItem("size",        i18nc("@item::inlistbox", "Size")));
     fixedItems.append(FixedItem("modified",    i18nc("@item::inlistbox", "Modified")));
     fixedItems.append(FixedItem("owner",       i18nc("@item::inlistbox", "Owner")));
-    fixedItems.append(FixedItem("permissions", i18nc("@item::inlistbox", "Permission")));
+    fixedItems.append(FixedItem("permissions", i18nc("@item::inlistbox", "Permissions")));
+#ifdef HAVE_NEPOMUK
     fixedItems.append(FixedItem("rating",      i18nc("@item::inlistbox", "Rating")));
     fixedItems.append(FixedItem("tags",        i18nc("@item::inlistbox", "Tags")));
     fixedItems.append(FixedItem("comment",     i18nc("@item::inlistbox", "Comment")));
+#endif
 
     foreach (const FixedItem& fixedItem, fixedItems) {
         const QString key = fixedItem.first;
@@ -115,6 +120,7 @@ void MetaDataConfigurationDialog::loadMetaData()
 
     }
 
+#ifdef HAVE_NEPOMUK
     // Get all meta information labels that are available for
     // the currently shown file item and add them to the list.
     Nepomuk::Resource res(m_url);
@@ -126,14 +132,15 @@ void MetaDataConfigurationDialog::loadMetaData()
 
         // Meta information provided by Nepomuk that is already
         // available from KFileItem should not be configurable.
-        bool skip = (key == "fileExtension") ||
+        bool skip = (key == "contentSize") ||
+                    (key == "fileExtension") ||
                     (key == "name") ||
-                    (key == "sourceModified") ||
+                    (key == "lastModified") ||
                     (key == "size") ||
-                    (key == "mime type");
+                    (key == "mimeType");
         if (!skip) {
             // const QString label = tunedLabel(prop.label());
-            const QString label = prop.label();
+            const QString label = prop.label() + " --- " + key;
             QListWidgetItem* item = new QListWidgetItem(label, m_metaDataList);
             item->setData(Qt::UserRole, key);
             const bool show = settings.readEntry(key, true);
@@ -142,6 +149,7 @@ void MetaDataConfigurationDialog::loadMetaData()
 
         ++it;
     }
+#endif
 }
 
 #include "metadataconfigurationdialog_p.moc"
diff --git a/src/panels/information/metadatawidget.cpp b/src/panels/information/metadatawidget.cpp
index 108728c79..090a23cb2 100644
--- a/src/panels/information/metadatawidget.cpp
+++ b/src/panels/information/metadatawidget.cpp
@@ -20,6 +20,10 @@
 
 #include "metadatawidget.h"
 
+#include "metadataconfigurationdialog_p.h"
+
+#include <kconfig.h>
+#include <kconfiggroup.h>
 #include <kfileitem.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
@@ -35,13 +39,9 @@
     #define DISABLE_NEPOMUK_LEGACY
 
     #include "commentwidget_p.h"
-    #include "metadataconfigurationdialog_p.h"
     #include "nepomukmassupdatejob_p.h"
     #include "taggingwidget_p.h"
 
-    #include <kconfig.h>
-    #include <kconfiggroup.h>
-
     #include <Nepomuk/KRatingWidget>
     #include <Nepomuk/Resource>
     #include <Nepomuk/Types/Property>
@@ -70,6 +70,13 @@ public:
     void setRowVisible(QWidget* infoWidget, bool visible);
 
     /**
+     * Initializes the configuration file "kmetainformationrc"
+     * with proper default settings for the first start in
+     * an uninitialized environment.
+     */
+    void initMetaInfoSettings();
+
+    /**
      * Parses the configuration file "kmetainformationrc" and
      * updates the visibility of all rows.
      */
@@ -217,6 +224,7 @@ MetaDataWidget::Private::Private(MetaDataWidget* parent) :
     connect(m_loadFilesThread, SIGNAL(finished()), q, SLOT(slotLoadingFinished()));
 #endif
 
+    initMetaInfoSettings();
     updateRowsVisibility();
 }
 
@@ -271,6 +279,34 @@ void MetaDataWidget::Private::setRowVisible(QWidget* infoWidget, bool visible)
     }
 }
 
+
+void MetaDataWidget::Private::initMetaInfoSettings()
+{
+    KConfig config("kmetainformationrc", KConfig::NoGlobals);
+    KConfigGroup settings = config.group("Show");
+    if (!settings.readEntry("initialized", false)) {
+        // The resource file is read the first time. Assure
+        // that some meta information is disabled per default.
+
+        static const char* disabledProperties[] = {
+            "asText", "contentSize", "created", "depth", "description", "fileExtension",
+            "fileName", "fileSize", "isPartOf", "lastModified", "mimeType", "name",
+            "parentUrl", "permissions", "plainTextContent", "owner", "sourceModified",
+            "url",
+            0 // mandatory last entry
+        };
+
+        int i = 0;
+        while (disabledProperties[i] != 0) {
+            settings.writeEntry(disabledProperties[i], false);
+            ++i;
+        }
+
+        // mark the group as initialized
+        settings.writeEntry("initialized", true);
+    }
+}
+
 void MetaDataWidget::Private::updateRowsVisibility()
 {   
     KConfig config("kmetainformationrc", KConfig::NoGlobals);
@@ -418,7 +454,6 @@ void MetaDataWidget::Private::LoadFilesThread::run()
 
     KConfig config("kmetainformationrc", KConfig::NoGlobals);
     KConfigGroup settings = config.group("Show");
-    initMetaInfoSettings(settings);
 
     bool first = true;
     unsigned int rating = 0;
@@ -484,31 +519,6 @@ void MetaDataWidget::Private::LoadFilesThread::run()
     m_sharedData->files = files;
 }
 
-void MetaDataWidget::Private::LoadFilesThread::initMetaInfoSettings(KConfigGroup& group)
-{
-    if (!group.readEntry("initialized", false)) {
-        // The resource file is read the first time. Assure
-        // that some meta information is disabled per default.
-
-        static const char* disabledProperties[] = {
-            "asText", "contentSize", "depth", "fileExtension",
-            "fileName", "fileSize", "isPartOf", "mimetype", "name",
-            "parentUrl", "plainTextContent", "sourceModified",
-            "url",
-            0 // mandatory last entry
-        };
-
-        int i = 0;
-        while (disabledProperties[i] != 0) {
-            group.writeEntry(disabledProperties[i], false);
-            ++i;
-        }
-
-        // mark the group as initialized
-        group.writeEntry("initialized", true);
-    }
-}
-
 QString MetaDataWidget::Private::LoadFilesThread::tunedLabel(const QString& label) const
 {
     QString tunedLabel;
@@ -594,7 +604,6 @@ void MetaDataWidget::setItems(const KFileItemList& items)
 
 void MetaDataWidget::openConfigurationDialog()
 {
-#ifdef HAVE_NEPOMUK
     if (d->m_fileItems.count() > 1) {
         return;
     }
@@ -610,7 +619,6 @@ void MetaDataWidget::openConfigurationDialog()
         d->updateRowsVisibility();
     }
     dialog.saveDialogSize(dialogConfig, KConfigBase::Persistent);
-#endif
 }
 
 unsigned int MetaDataWidget::rating() const