X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d4287eb8e36ead543eb595bfcaa217fa0edd2654..ca7aaecbdbddb27f7442e69d2770b97b4307f338:/src/dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index 57d4a76fb..abbae6ec7 100644
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -18,15 +18,17 @@
  ***************************************************************************/
 
 #include "dolphincontroller.h"
+#include "zoomlevelinfo.h"
 
 #include <kdirmodel.h>
 #include <QAbstractProxyModel>
 #include <QApplication>
+#include <QClipboard>
+#include <QDir>
 
 DolphinController::DolphinController(DolphinView* dolphinView) :
     QObject(dolphinView),
-    m_zoomInPossible(false),
-    m_zoomOutPossible(false),
+    m_zoomLevel(0),
     m_openTab(false),
     m_url(),
     m_dolphinView(dolphinView),
@@ -55,9 +57,13 @@ void DolphinController::setItemView(QAbstractItemView* view)
 
     m_itemView = view;
 
-    // TODO: this is a workaround until  Qt-issue 176832 has been fixed
-    connect(m_itemView, SIGNAL(pressed(const QModelIndex&)),
-            this, SLOT(updateOpenTabState()));
+    if (m_itemView != 0) {
+        m_zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_itemView->iconSize());
+        
+        // TODO: this is a workaround until  Qt-issue 176832 has been fixed
+        connect(m_itemView, SIGNAL(pressed(const QModelIndex&)),
+                this, SLOT(updateOpenTabState()));
+    }
 }
 
 void DolphinController::triggerUrlChangeRequest(const KUrl& url)
@@ -106,14 +112,14 @@ void DolphinController::indicateActivationChange(bool active)
     emit activationChanged(active);
 }
 
-void DolphinController::triggerZoomIn()
-{
-    emit zoomIn();
-}
-
-void DolphinController::triggerZoomOut()
+void DolphinController::setZoomLevel(int level)
 {
-    emit zoomOut();
+    Q_ASSERT(level >= ZoomLevelInfo::minimumLevel());
+    Q_ASSERT(level <= ZoomLevelInfo::maximumLevel());
+    if (level != m_zoomLevel) {
+        m_zoomLevel = level;
+        emit zoomLevelChanged(m_zoomLevel);
+    }
 }
 
 void DolphinController::handleKeyPressEvent(QKeyEvent* event)
@@ -133,6 +139,20 @@ void DolphinController::handleKeyPressEvent(QKeyEvent* event)
     }
 }
 
+void DolphinController::replaceUrlByClipboard()
+{
+    const QClipboard* clipboard = QApplication::clipboard();
+    QString text;
+    if (clipboard->mimeData(QClipboard::Selection)->hasText()) {
+        text = clipboard->mimeData(QClipboard::Selection)->text();
+    } else if (clipboard->mimeData(QClipboard::Clipboard)->hasText()) {
+        text = clipboard->mimeData(QClipboard::Clipboard)->text();
+    }
+    if (!text.isEmpty() && QDir::isAbsolutePath(text)) {
+        m_dolphinView->setUrl(KUrl(text));
+    }
+}
+
 KFileItem DolphinController::itemForIndex(const QModelIndex& index) const
 {
     Q_ASSERT(m_itemView != 0);
@@ -158,7 +178,7 @@ void DolphinController::triggerItem(const QModelIndex& index)
     } else {
         m_itemView->clearSelection();
         if (!openTab) {
-            emit itemEntered(item);
+            emit itemEntered(KFileItem());
         }
     }
 }