fixed some activation issues in combination with split views

[dolphin.git] / src / dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index 151d2720854b039e98bc7c507177511c5c02b2e0..378c1b4ba86d443999d824ea36d84c70ea003bbe 100644 (file)
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -20,14 +20,17 @@
 #include "dolphincontroller.h"
 
 DolphinController::DolphinController(QObject* parent) :
-        QObject(parent),
-        m_showPreview(false),
-        m_zoomInPossible(false),
-        m_zoomOutPossible(false)
-{}
+    QObject(parent),
+    m_showPreview(false),
+    m_showAdditionalInfo(false),
+    m_zoomInPossible(false),
+    m_zoomOutPossible(false)
+{
+}
 
 DolphinController::~DolphinController()
-{}
+{
+}
 
 void DolphinController::triggerContextMenuRequest(const QPoint& pos)
 {
@@ -58,11 +61,19 @@ void DolphinController::indicateSortOrderChange(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
-void DolphinController::setShowPreview(bool showPreview)
+void DolphinController::setShowPreview(bool show)
 {
-    if (m_showPreview != showPreview) {
-        m_showPreview = showPreview;
-        emit showPreviewChanged(showPreview);
+    if (m_showPreview != show) {
+        m_showPreview = show;
+        emit showPreviewChanged(show);
+    }
+}
+
+void DolphinController::setShowAdditionalInfo(bool show)
+{
+    if (m_showAdditionalInfo != show) {
+        m_showAdditionalInfo = show;
+        emit showAdditionalInfoChanged(show);
     }
 }
 
@@ -81,9 +92,14 @@ void DolphinController::triggerItem(const QModelIndex& index)
     emit itemTriggered(index);
 }
 
-void DolphinController::indicateSelectionChange()
+void DolphinController::emitItemEntered(const QModelIndex& index)
+{
+    emit itemEntered(index);
+}
+
+void DolphinController::emitViewportEntered()
 {
-    emit selectionChanged();
+    emit viewportEntered();
 }
 
 #include "dolphincontroller.moc"