Simplify the DolphinController: The "show hidden files" state can be retrieved by...

[dolphin.git] / src / dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index 7723fd8ef693582e40d8d906ceeee86b96df051b..bdb97170b4e2c1c3567369f26131b1f181e5290a 100644 (file)
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -21,13 +21,13 @@
 
 #include <QPainter>
 
-DolphinController::DolphinController(QObject* parent) :
-    QObject(parent),
+DolphinController::DolphinController(DolphinView* dolphinView) :
+    QObject(dolphinView),
     m_showPreview(false),
     m_zoomInPossible(false),
     m_zoomOutPossible(false),
-    m_additionalInfoCount(0),
-    m_url()
+    m_url(),
+    m_dolphinView(dolphinView)
 {
 }
 
@@ -43,23 +43,30 @@ void DolphinController::setUrl(const KUrl& url)
     }
 }
 
+void DolphinController::triggerUrlChangeRequest(const KUrl& url)
+{
+    if (m_url != url) {
+        emit requestUrlChange(url);
+    }
+}
+
 void DolphinController::triggerContextMenuRequest(const QPoint& pos)
 {
     emit activated();
     emit requestContextMenu(pos);
 }
 
-void DolphinController::triggerActivation()
+void DolphinController::requestActivation()
 {
     emit activated();
 }
 
 void DolphinController::indicateDroppedUrls(const KUrl::List& urls,
                                             const KUrl& destPath,
-                                            const QModelIndex& destIndex,
+                                            const KFileItem& destItem,
                                             QWidget* source)
 {
-    emit urlsDropped(urls, destPath, destIndex, source);
+    emit urlsDropped(urls, destPath, destItem, source);
 }
 
 
@@ -73,6 +80,11 @@ void DolphinController::indicateSortOrderChange(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
+void DolphinController::indicateAdditionalInfoChange(const KFileItemDelegate::InformationList& info)
+{
+    emit additionalInfoChanged(info);
+}
+
 void DolphinController::setShowPreview(bool show)
 {
     if (m_showPreview != show) {
@@ -81,12 +93,9 @@ void DolphinController::setShowPreview(bool show)
     }
 }
 
-void DolphinController::setAdditionalInfoCount(int count)
+void DolphinController::indicateActivationChange(bool active)
 {
-    if (m_additionalInfoCount != count) {
-        m_additionalInfoCount = count;
-        emit additionalInfoCountChanged(count);
-    }
+    emit activationChanged(active);
 }
 
 void DolphinController::triggerZoomIn()
@@ -126,14 +135,14 @@ void DolphinController::drawHoverIndication(QWidget* widget,
     painter.restore();
 }
 
-void DolphinController::triggerItem(const QModelIndex& index)
+void DolphinController::triggerItem(const KFileItem& item)
 {
-    emit itemTriggered(index);
+    emit itemTriggered(item);
 }
 
-void DolphinController::emitItemEntered(const QModelIndex& index)
+void DolphinController::emitItemEntered(const KFileItem& item)
 {
-    emit itemEntered(index);
+    emit itemEntered(item);
 }
 
 void DolphinController::emitViewportEntered()