Merge branch 'master' of git.kde.org:dolphin

5 files changed, 23 insertions, 12 deletions

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index c3df3a9a8..4105628ee 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -75,10 +75,6 @@
 #endif
 #include <KFormat>
 
-namespace {
-    const int MaxModeEnum = DolphinView::CompactView;
-}
-
 DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     QWidget(parent),
     m_active(true),
@@ -728,6 +724,15 @@ void DolphinView::stopLoading()
 bool DolphinView::eventFilter(QObject* watched, QEvent* event)
 {
     switch (event->type()) {
+    case QEvent::KeyPress:
+        if (GeneralSettings::useTabForSwitchingSplitView()) {
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            if (keyEvent->key() == Qt::Key_Tab && keyEvent->modifiers() == Qt::NoModifier) {
+                toggleActiveViewRequested();
+                return true;
+            }
+        }
+        break;
     case QEvent::FocusIn:
         if (watched == m_container) {
             setActive(true);
@@ -1031,7 +1036,7 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
         destUrl = url();
     } else {
         // The item represents a directory or desktop-file
-        destUrl = destItem.url();
+        destUrl = destItem.mostLocalUrl();
     }
 
     QDropEvent dropEvent(event->pos().toPoint(),
@@ -1278,7 +1283,7 @@ QUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh
             if (desktopFile.hasLinkType()) {
                 const QString linkUrl = desktopFile.readUrl();
                 if (!linkUrl.startsWith(QLatin1String("http"))) {
-                    return linkUrl;
+                    return QUrl::fromUserInput(linkUrl);
                 }
             }
         }
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index d1a5d5005..0b0d8196d 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -546,6 +546,11 @@ signals:
      */
     void goForwardRequested();
 
+    /**
+     * Is emitted when the user wants to move the focus to another view.
+     */
+    void toggleActiveViewRequested();
+
 protected:
     /** Changes the zoom level if Control is pressed during a wheel event. */
     virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE;
diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp
index 8fbca290d..0d58717d4 100644
--- a/src/views/tooltips/filemetadatatooltip.cpp
+++ b/src/views/tooltips/filemetadatatooltip.cpp
@@ -48,7 +48,7 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
     m_fileMetaDataWidget(0)
 {
     setAttribute(Qt::WA_TranslucentBackground);
-    setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint);
+    setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint);
 
     // Create widget for file preview
     m_preview = new QLabel(this);
@@ -174,8 +174,6 @@ void FileMetaDataToolTip::paintEvent(QPaintEvent* event)
 
 void FileMetaDataToolTip::showEvent(QShowEvent *)
 {
-#pragma message("TODO: port Plasma::WindowEffects::overrideShadow")
-    //Plasma::WindowEffects::overrideShadow(winId(), true);
     KWindowEffects::enableBlurBehind(winId(), true, mask());
 }
 
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
index 80a17efc6..cdec01b9d 100644
--- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
+++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
@@ -6,10 +6,12 @@ Comment[ast]=Complementu de control de versiones pa vistes de ficheros
 Comment[ca]=Connector de control de versions per a les vistes de fitxers
 Comment[ca@valencia]=Connector de control de versions per a les vistes de fitxers
 Comment[cs]=Modul pro správu verzí pro pohledy na soubory
+Comment[da]=Versionsstyringsplugin til filvisninger
 Comment[de]=Versionskontroll-Modul für Dateiansichten
 Comment[el]=Πρόσθετο ελέγχου εκδόσεων για προβολές αρχείων
 Comment[en_GB]=Version Control Plugin for File Views
 Comment[es]=Complemento de control de versiones para las vistas de archivos
+Comment[et]=Failivaadete versioonihaldusplugin
 Comment[fi]=Versionhallintaliitännäinen tiedostonäkymille
 Comment[fr]=Module externe pour le contrôle de version applicable aux vues de fichiers
 Comment[gl]=Complemento de control de versión para vistas de ficheiros.
@@ -23,6 +25,7 @@ Comment[lt]=Versijų kontrolės papildinys failų tvarkyklėms
 Comment[nb]=Versjonskontrollmodul for filvisninger
 Comment[nl]=Plugin voor versiecontrole op bestandoverzichten
 Comment[nn]=Versjonskontroll-tillegg for filvisingar
+Comment[pa]=ਫਾਇਲ ਝਲਕ ਲਈ ਵਰਜਨ ਕੰਟਰੋਲ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka systemu zarządzania wersjami dla widoku plików
 Comment[pt]='Plugin' de Controlo de Versões para as Áreas de Ficheiros
 Comment[pt_BR]=Extensão de controle de versões para as visualizações de arquivos
diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h
index d710bf3c2..1696f975c 100644
--- a/src/views/versioncontrol/kversioncontrolplugin.h
+++ b/src/views/versioncontrol/kversioncontrolplugin.h
@@ -165,16 +165,16 @@ public:
     /**
      * Is invoked after the version control information has been
      * received. It is assured that
-     * KVersionControlPluginV2::beginInfoRetrieval() has been
+     * KVersionControlPlugin::beginRetrieval() has been
      * invoked before.
      */
     virtual void endRetrieval() = 0;
 
     /**
      * @return The version for the item \p item.
-     *         It is assured that KVersionControlPlugin::beginInfoRetrieval() has been
+     *         It is assured that KVersionControlPlugin::beginRetrieval() has been
      *         invoked before and that the file is part of the directory specified
-     *         in beginInfoRetrieval().
+     *         in beginRetrieval().
      */
     virtual ItemVersion itemVersion(const KFileItem& item) const = 0;