* Use Nepomuk for getting the meta data instead of KFileMetaInfo.

[dolphin.git] / src / dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index 9732316873e589349cd6edfc83721ac0fd864900..b128c90335e2c89804458b7a0ac88f1b86f9b47d 100644 (file)
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -26,10 +26,11 @@
 #include <QClipboard>
 #include <QDir>
 
 #include <QClipboard>
 #include <QDir>
 

+Qt::MouseButtons DolphinController::m_mouseButtons = Qt::NoButton;
+

 DolphinController::DolphinController(DolphinView* dolphinView) :
     QObject(dolphinView),
     m_zoomLevel(0),
 DolphinController::DolphinController(DolphinView* dolphinView) :
     QObject(dolphinView),
     m_zoomLevel(0),

-    m_openTab(false),

     m_url(),
     m_dolphinView(dolphinView),
     m_itemView(0)
     m_url(),
     m_dolphinView(dolphinView),
     m_itemView(0)


@@ -52,17 +53,17 @@ void DolphinController::setItemView(QAbstractItemView* view)
 {
     if (m_itemView != 0) {
         disconnect(m_itemView, SIGNAL(pressed(const QModelIndex&)),
 {
     if (m_itemView != 0) {
         disconnect(m_itemView, SIGNAL(pressed(const QModelIndex&)),

-                   this, SLOT(updateOpenTabState()));
+                   this, SLOT(updateMouseButtonState()));

     }
 
     m_itemView = view;
 
     if (m_itemView != 0) {
         m_zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_itemView->iconSize());
     }
 
     m_itemView = view;
 
     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&)),
         // 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()));

     }
 }
 
     }
 }
 


@@ -73,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 activated();

-    emit requestContextMenu(pos);
+    emit requestContextMenu(pos, customActions);

 }
 
 void DolphinController::requestActivation()
 }
 
 void DolphinController::requestActivation()


@@ -129,12 +131,13 @@ void DolphinController::handleKeyPressEvent(QKeyEvent* event)
     const QItemSelectionModel* selModel = m_itemView->selectionModel();
     const QModelIndex currentIndex = selModel->currentIndex();
     const bool trigger = currentIndex.isValid()
     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) {
                          && (selModel->selectedIndexes().count() > 0);
     if (trigger) {
         const QModelIndexList indexList = selModel->selectedIndexes();
         foreach (const QModelIndex& index, indexList) {

-            triggerItem(index);
+            emit itemTriggered(itemForIndex(index));

         }
     }
 }
         }
     }
 }


@@ -153,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);
 KFileItem DolphinController::itemForIndex(const QModelIndex& index) const
 {
     Q_ASSERT(m_itemView != 0);


@@ -165,24 +178,30 @@ KFileItem DolphinController::itemForIndex(const QModelIndex& index) const
 
 void DolphinController::triggerItem(const QModelIndex& index)
 {
 
 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);
             emit itemTriggered(item);

-        }
-    } else {
-        m_itemView->clearSelection();
-        if (!openTab) {
+        } else {
+            m_itemView->clearSelection();

             emit itemEntered(KFileItem());
         }
     }
 }
 
             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);
 void DolphinController::emitItemEntered(const QModelIndex& index)
 {
     KFileItem item = itemForIndex(index);


@@ -196,9 +215,9 @@ void DolphinController::emitViewportEntered()
     emit viewportEntered();
 }
 
     emit viewportEntered();
 }
 

-void DolphinController::updateOpenTabState()
+void DolphinController::updateMouseButtonState()

 {
 {

-    m_openTab = QApplication::mouseButtons() & Qt::MidButton;
+    m_mouseButtons = QApplication::mouseButtons();

 }
 
 #include "dolphincontroller.moc"
 }
 
 #include "dolphincontroller.moc"