Add libkmetadata detection and minor fixes

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index a25c61038194f1bc6fba2660bc5da3ecdaba4340..2585a7b82d9e9bad2cc97a4ea3da75e8c05b2793 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -19,6 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *\r
  ***************************************************************************/\r
 \r
+#include <config-kmetadata.h>\r
 #include "dolphinmainwindow.h"\r
 \r
 #include <assert.h>\r
@@ -33,9 +34,10 @@
 #include "dolphinsettings.h"\r
 #include "bookmarkssidebarpage.h"\r
 #include "infosidebarpage.h"\r
-#include "generalsettings.h"\r
+#include "dolphin_generalsettings.h"\r
 #include "viewpropertiesdialog.h"\r
 #include "viewproperties.h"\r
+#include "metadataloader.h"\r
 #include "mainwindowadaptor.h"\r
 \r
 #include <kaction.h>\r
@@ -153,17 +155,17 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
         QString seq = QKeySequence(Qt::ShiftModifier).toString();\r
         seq.chop(1); // chop superfluous '+'\r
         QAction* moveAction = popup.addAction(KIcon("goto"),\r
-                                              i18n("&Move Here") + "\t" + seq);\r
+                                              i18n("&Move Here") + '\t' + seq);\r
 \r
         seq = QKeySequence(Qt::ControlModifier).toString();\r
         seq.chop(1);\r
         QAction* copyAction = popup.addAction(KIcon("editcopy"),\r
-                                              i18n("&Copy Here") + "\t" + seq);\r
+                                              i18n("&Copy Here") + '\t' + seq);\r
 \r
         seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();\r
         seq.chop(1);\r
         QAction* linkAction = popup.addAction(KIcon("www"),\r
-                                              i18n("&Link Here") + "\t" + seq);\r
+                                              i18n("&Link Here") + '\t' + seq);\r
 \r
         popup.addSeparator();\r
         popup.addAction(KIcon("stop"), i18n("Cancel"));\r
@@ -360,28 +362,28 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 \r
 void DolphinMainWindow::saveProperties(KConfig* config)\r
 {\r
-    config->setGroup("Primary view");\r
-    config->writeEntry("Url", m_view[PrimaryIdx]->url().url());\r
-    config->writeEntry("Editable Url", m_view[PrimaryIdx]->isUrlEditable());\r
+    KConfigGroup primaryView = config->group("Primary view");\r
+    primaryView.writeEntry("Url", m_view[PrimaryIdx]->url().url());\r
+    primaryView.writeEntry("Editable Url", m_view[PrimaryIdx]->isUrlEditable());\r
     if (m_view[SecondaryIdx] != 0) {\r
-        config->setGroup("Secondary view");\r
-        config->writeEntry("Url", m_view[SecondaryIdx]->url().url());\r
-        config->writeEntry("Editable Url", m_view[SecondaryIdx]->isUrlEditable());\r
+        KConfigGroup secondaryView = config->group("Secondary view");\r
+        secondaryView.writeEntry("Url", m_view[SecondaryIdx]->url().url());\r
+        secondaryView.writeEntry("Editable Url", m_view[SecondaryIdx]->isUrlEditable());\r
     }\r
 }\r
 \r
 void DolphinMainWindow::readProperties(KConfig* config)\r
 {\r
-    config->setGroup("Primary view");\r
-    m_view[PrimaryIdx]->setUrl(config->readEntry("Url"));\r
-    m_view[PrimaryIdx]->setUrlEditable(config->readEntry("Editable Url", false));\r
+    const KConfigGroup primaryView = config->group("Primary view");\r
+    m_view[PrimaryIdx]->setUrl(primaryView.readEntry("Url"));\r
+    m_view[PrimaryIdx]->setUrlEditable(primaryView.readEntry("Editable Url", false));\r
     if (config->hasGroup("Secondary view")) {\r
-        config->setGroup("Secondary view");\r
+        const KConfigGroup secondaryView = config->group("Secondary view");\r
         if (m_view[SecondaryIdx] == 0) {\r
             toggleSplitView();\r
         }\r
-        m_view[SecondaryIdx]->setUrl(config->readEntry("Url"));\r
-        m_view[SecondaryIdx]->setUrlEditable(config->readEntry("Editable Url", false));\r
+        m_view[SecondaryIdx]->setUrl(secondaryView.readEntry("Url"));\r
+        m_view[SecondaryIdx]->setUrlEditable(secondaryView.readEntry("Editable Url", false));\r
     }\r
     else if (m_view[SecondaryIdx] != 0) {\r
         toggleSplitView();\r
@@ -427,7 +429,7 @@ void DolphinMainWindow::deleteItems()
 \r
     const bool del = KMessageBox::warningContinueCancel(this,\r
                                                         text,\r
-                                                        QString::null,\r
+                                                        QString(),\r
                                                         KGuiItem(i18n("Delete"), KIcon("editdelete"))\r
                                                        ) == KMessageBox::Continue;\r
     if (del) {\r
@@ -590,7 +592,7 @@ void DolphinMainWindow::updatePasteAction()
             pasteAction->setText(i18n("Paste 1 File"));\r
         }\r
         else {\r
-            pasteAction->setText(i18n("Paste %1 Files").arg(count));\r
+            pasteAction->setText(i18n("Paste %1 Files", count));\r
         }\r
     }\r
     else {\r
@@ -952,6 +954,10 @@ void DolphinMainWindow::init()
         // assure a proper default size if Dolphin runs the first time\r
         resize(640, 480);\r
     }\r
+    #ifdef HAVE_KMETADATA\r
+    if (!DolphinApplication::app()->metadataLoader()->storageUp())\r
+        activeView()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error);\r
+    #endif\r
 }\r
 \r
 void DolphinMainWindow::loadSettings()\r