X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/abf17941f7a052d25788d2f2f3c84e5aae935e29..f8dd060cadecd9f4c36b79d53dbae706dadf99f6:/src/dolphinmainwindow.cpp

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