So I guess that is the behaviour that we really want :)

[dolphin.git] / src / dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index 151d2720854b039e98bc7c507177511c5c02b2e0..f5fd5e83670b4dd38801a7bef7478b789c531246 100644 (file)
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -19,15 +19,33 @@
 
 #include "dolphincontroller.h"
 
-DolphinController::DolphinController(QObject* parent) :
-        QObject(parent),
-        m_showPreview(false),
-        m_zoomInPossible(false),
-        m_zoomOutPossible(false)
-{}
+DolphinController::DolphinController(DolphinView* dolphinView) :
+    QObject(dolphinView),
+    m_zoomInPossible(false),
+    m_zoomOutPossible(false),
+    m_url(),
+    m_dolphinView(dolphinView)
+{
+}
 
 DolphinController::~DolphinController()
-{}
+{
+}
+
+void DolphinController::setUrl(const KUrl& url)
+{
+    if (m_url != url) {
+        m_url = url;
+        emit urlChanged(url);
+    }
+}
+
+void DolphinController::triggerUrlChangeRequest(const KUrl& url)
+{
+    if (m_url != url) {
+        emit requestUrlChange(url);
+    }
+}
 
 void DolphinController::triggerContextMenuRequest(const QPoint& pos)
 {
@@ -35,16 +53,16 @@ void DolphinController::triggerContextMenuRequest(const QPoint& pos)
     emit requestContextMenu(pos);
 }
 
-void DolphinController::triggerActivation()
+void DolphinController::requestActivation()
 {
     emit activated();
 }
 
 void DolphinController::indicateDroppedUrls(const KUrl::List& urls,
-        const QModelIndex& index,
-        QWidget* source)
+                                            const KUrl& destPath,
+                                            const KFileItem& destItem)
 {
-    emit urlsDropped(urls, index, source);
+    emit urlsDropped(urls, destPath, destItem);
 }
 
 
@@ -58,12 +76,14 @@ void DolphinController::indicateSortOrderChange(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
-void DolphinController::setShowPreview(bool showPreview)
+void DolphinController::indicateAdditionalInfoChange(const KFileItemDelegate::InformationList& info)
 {
-    if (m_showPreview != showPreview) {
-        m_showPreview = showPreview;
-        emit showPreviewChanged(showPreview);
-    }
+    emit additionalInfoChanged(info);
+}
+
+void DolphinController::indicateActivationChange(bool active)
+{
+    emit activationChanged(active);
 }
 
 void DolphinController::triggerZoomIn()
@@ -76,14 +96,19 @@ void DolphinController::triggerZoomOut()
     emit zoomOut();
 }
 
-void DolphinController::triggerItem(const QModelIndex& index)
+void DolphinController::triggerItem(const KFileItem& item)
+{
+    emit itemTriggered(item);
+}
+
+void DolphinController::emitItemEntered(const KFileItem& item)
 {
-    emit itemTriggered(index);
+    emit itemEntered(item);
 }
 
-void DolphinController::indicateSelectionChange()
+void DolphinController::emitViewportEntered()
 {
-    emit selectionChanged();
+    emit viewportEntered();
 }
 
 #include "dolphincontroller.moc"