X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7308c7d03e182795d6b64d85a3f0725d8af32436..b1c9b5126d:/src/dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index edc5dad98..b128c9033 100644
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "dolphincontroller.h"
+#include "zoomlevelinfo.h"
 
 #include <kdirmodel.h>
 #include <QAbstractProxyModel>
@@ -25,10 +26,11 @@
 #include <QClipboard>
 #include <QDir>
 
+Qt::MouseButtons DolphinController::m_mouseButtons = Qt::NoButton;
+
 DolphinController::DolphinController(DolphinView* dolphinView) :
     QObject(dolphinView),
     m_zoomLevel(0),
-    m_openTab(false),
     m_url(),
     m_dolphinView(dolphinView),
     m_itemView(0)
@@ -51,26 +53,17 @@ void DolphinController::setItemView(QAbstractItemView* view)
 {
     if (m_itemView != 0) {
         disconnect(m_itemView, SIGNAL(pressed(const QModelIndex&)),
-                   this, SLOT(updateOpenTabState()));
+                   this, SLOT(updateMouseButtonState()));
     }
 
     m_itemView = view;
 
     if (m_itemView != 0) {
-        switch (m_itemView->iconSize().height()) {
-        case KIconLoader::SizeSmallMedium:      m_zoomLevel = 0; break;
-        case KIconLoader::SizeMedium:           m_zoomLevel = 1; break;
-        case KIconLoader::SizeLarge:            m_zoomLevel = 2; break;
-        case KIconLoader::SizeHuge:             m_zoomLevel = 3; break;
-        case KIconLoader::SizeEnormous:         m_zoomLevel = 4; break;
-        case KIconLoader::SizeEnormous * 3 / 2: m_zoomLevel = 5; break;
-        case KIconLoader::SizeEnormous * 2:     m_zoomLevel = 6; break;
-        default: Q_ASSERT(false);               m_zoomLevel = 2; break;
-        }
-        
+        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()));
+                this, SLOT(updateMouseButtonState()));
     }
 }
 
@@ -81,10 +74,11 @@ void DolphinController::triggerUrlChangeRequest(const KUrl& url)
     }
 }
 
-void DolphinController::triggerContextMenuRequest(const QPoint& pos)
+void DolphinController::triggerContextMenuRequest(const QPoint& pos,
+                                                  const QList<QAction*>& customActions)
 {
     emit activated();
-    emit requestContextMenu(pos);
+    emit requestContextMenu(pos, customActions);
 }
 
 void DolphinController::requestActivation()
@@ -92,11 +86,11 @@ void DolphinController::requestActivation()
     emit activated();
 }
 
-void DolphinController::indicateDroppedUrls(const KUrl::List& urls,
+void DolphinController::indicateDroppedUrls(const KFileItem& destItem,
                                             const KUrl& destPath,
-                                            const KFileItem& destItem)
+                                            QDropEvent* event)
 {
-    emit urlsDropped(urls, destPath, destItem);
+    emit urlsDropped(destItem, destPath, event);
 }
 
 
@@ -122,30 +116,14 @@ void DolphinController::indicateActivationChange(bool active)
 
 void DolphinController::setZoomLevel(int level)
 {
-    Q_ASSERT(level >= zoomLevelMinimum());
-    Q_ASSERT(level <= zoomLevelMaximum());
+    Q_ASSERT(level >= ZoomLevelInfo::minimumLevel());
+    Q_ASSERT(level <= ZoomLevelInfo::maximumLevel());
     if (level != m_zoomLevel) {
         m_zoomLevel = level;
         emit zoomLevelChanged(m_zoomLevel);
     }
 }
 
-int DolphinController::iconSizeForZoomLevel(int level)
-{
-    int size = KIconLoader::SizeMedium;
-    switch (level) {
-    case 0: size = KIconLoader::SizeSmallMedium; break;
-    case 1: size = KIconLoader::SizeMedium; break;
-    case 2: size = KIconLoader::SizeLarge; break;
-    case 3: size = KIconLoader::SizeHuge; break;
-    case 4: size = KIconLoader::SizeEnormous; break;
-    case 5: size = KIconLoader::SizeEnormous * 3 / 2; break;
-    case 6: size = KIconLoader::SizeEnormous * 2; break;
-    default: Q_ASSERT(false); break;
-    }
-    return size;
-}
-
 void DolphinController::handleKeyPressEvent(QKeyEvent* event)
 {
     Q_ASSERT(m_itemView != 0);
@@ -153,12 +131,13 @@ void DolphinController::handleKeyPressEvent(QKeyEvent* event)
     const QItemSelectionModel* selModel = m_itemView->selectionModel();
     const QModelIndex currentIndex = selModel->currentIndex();
     const bool trigger = currentIndex.isValid()
-                         && (event->key() == Qt::Key_Return)
+                         && ((event->key() == Qt::Key_Return)
+                            || (event->key() == Qt::Key_Enter))
                          && (selModel->selectedIndexes().count() > 0);
     if (trigger) {
         const QModelIndexList indexList = selModel->selectedIndexes();
         foreach (const QModelIndex& index, indexList) {
-            triggerItem(index);
+            emit itemTriggered(itemForIndex(index));
         }
     }
 }
@@ -177,6 +156,16 @@ void DolphinController::replaceUrlByClipboard()
     }
 }
 
+void DolphinController::emitHideToolTip()
+{
+    emit hideToolTip();
+}
+
+void DolphinController::emitItemTriggered(const KFileItem& item)
+{
+    emit itemTriggered(item);
+}
+
 KFileItem DolphinController::itemForIndex(const QModelIndex& index) const
 {
     Q_ASSERT(m_itemView != 0);
@@ -189,24 +178,30 @@ KFileItem DolphinController::itemForIndex(const QModelIndex& index) const
 
 void DolphinController::triggerItem(const QModelIndex& index)
 {
-    const bool openTab = m_openTab;
-    m_openTab = false;
-
-    const KFileItem item = itemForIndex(index);
-    if (index.isValid() && (index.column() == KDirModel::Name)) {
-        if (openTab && (item.isDir() || m_dolphinView->isTabsForFilesEnabled())) {
-            emit tabRequested(item.url());
-        } else {
+    if (m_mouseButtons & Qt::LeftButton) {
+        const KFileItem item = itemForIndex(index);
+        if (index.isValid() && (index.column() == KDirModel::Name)) {
             emit itemTriggered(item);
-        }
-    } else {
-        m_itemView->clearSelection();
-        if (!openTab) {
+        } else {
+            m_itemView->clearSelection();
             emit itemEntered(KFileItem());
         }
     }
 }
 
+void DolphinController::requestTab(const QModelIndex& index)
+{
+    if (m_mouseButtons & Qt::MidButton) {
+        const KFileItem item = itemForIndex(index);
+        const bool validRequest = index.isValid() &&
+                                  (index.column() == KDirModel::Name) &&
+                                  (item.isDir() || m_dolphinView->isTabsForFilesEnabled());
+        if (validRequest) {
+            emit tabRequested(item.url());
+        }
+    }
+}
+
 void DolphinController::emitItemEntered(const QModelIndex& index)
 {
     KFileItem item = itemForIndex(index);
@@ -220,9 +215,9 @@ void DolphinController::emitViewportEntered()
     emit viewportEntered();
 }
 
-void DolphinController::updateOpenTabState()
+void DolphinController::updateMouseButtonState()
 {
-    m_openTab = QApplication::mouseButtons() & Qt::MidButton;
+    m_mouseButtons = QApplication::mouseButtons();
 }
 
 #include "dolphincontroller.moc"