fix default tab prev/next shortcuts

take into accound the whole list, not just the first shortcut

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index df04cee69d8cf552dd1194cc5324f5da0e9b0a6f..eece5b8785892779e4926d7dccb3c1450de5c24c 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1118,12 +1118,10 @@ void DolphinMainWindow::setupActions()
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 
     // not in menu actions
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 
     // not in menu actions

-    QList<QKeySequence> nextTabKeys;
-    nextTabKeys.append(KStandardShortcut::tabNext().first()); //TODO: is this correct
+    QList<QKeySequence> nextTabKeys = KStandardShortcut::tabNext();

     nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab));
 
     nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab));
 

-    QList<QKeySequence> prevTabKeys;
-    prevTabKeys.append(KStandardShortcut::tabPrev().first()); //TODO: is this correct
+    QList<QKeySequence> prevTabKeys = KStandardShortcut::tabPrev();

     prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab));
 
     QAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
     prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab));
 
     QAction* activateNextTab = actionCollection()->addAction("activate_next_tab");

diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp
index 9e0f5152b4c8a74013325539d5ae0a2b44c6271f..c81e666c829a0730b9a484bc0faef45b2fb326eb 100644 (file)
--- a/src/settings/general/configurepreviewplugindialog.cpp
+++ b/src/settings/general/configurepreviewplugindialog.cpp
@@ -76,6 +76,4 @@ void ConfigurePreviewPluginDialog::slotOk()
     QApplication::changeOverrideCursor(Qt::BusyCursor);
     KIO::NetAccess::del(QUrl::fromLocalFile(QDir::homePath() + "/.thumbnails/"), this);
     QApplication::restoreOverrideCursor();
     QApplication::changeOverrideCursor(Qt::BusyCursor);
     KIO::NetAccess::del(QUrl::fromLocalFile(QDir::homePath() + "/.thumbnails/"), this);
     QApplication::restoreOverrideCursor();

-

 }
 }

-