Simplify DolphinController: don't remember the show-preview state in the controller...

[dolphin.git] / src / dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index 59cc20f0f9133052dffc40b504d7786831f069d4..897d4266bc8b2eca039b594c8818de735cba9f57 100644 (file)
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -21,14 +21,12 @@
 
 #include <QPainter>
 
-DolphinController::DolphinController(QObject* parent) :
-    QObject(parent),
-    m_showHiddenFiles(false),
-    m_showPreview(false),
+DolphinController::DolphinController(DolphinView* dolphinView) :
+    QObject(dolphinView),
     m_zoomInPossible(false),
     m_zoomOutPossible(false),
-    m_additionalInfoCount(0),
-    m_url()
+    m_url(),
+    m_dolphinView(dolphinView)
 {
 }
 
@@ -44,23 +42,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);
 }
 
 
@@ -74,28 +79,14 @@ void DolphinController::indicateSortOrderChange(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
-void DolphinController::setShowHiddenFiles(bool show)
+void DolphinController::indicateAdditionalInfoChange(const KFileItemDelegate::InformationList& info)
 {
-    if (m_showHiddenFiles != show) {
-        m_showHiddenFiles = show;
-        emit showHiddenFilesChanged(show);
-    }
+    emit additionalInfoChanged(info);
 }
 
-void DolphinController::setShowPreview(bool show)
+void DolphinController::indicateActivationChange(bool active)
 {
-    if (m_showPreview != show) {
-        m_showPreview = show;
-        emit showPreviewChanged(show);
-    }
-}
-
-void DolphinController::setAdditionalInfoCount(int count)
-{
-    if (m_additionalInfoCount != count) {
-        m_additionalInfoCount = count;
-        emit additionalInfoCountChanged(count);
-    }
+    emit activationChanged(active);
 }
 
 void DolphinController::triggerZoomIn()