Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index 8089cfd2b1451dbc4596b2d5c05eb59e0cf8b813..f5fd5e83670b4dd38801a7bef7478b789c531246 100644 (file)
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -19,8 +19,12 @@
 
 #include "dolphincontroller.h"
 
 
 #include "dolphincontroller.h"
 

-DolphinController::DolphinController(QObject* parent) :
-    QObject(parent)
+DolphinController::DolphinController(DolphinView* dolphinView) :
+    QObject(dolphinView),
+    m_zoomInPossible(false),
+    m_zoomOutPossible(false),
+    m_url(),
+    m_dolphinView(dolphinView)

 {
 }
 
 {
 }
 


@@ -28,21 +32,37 @@ 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)
 {
     emit activated();
     emit requestContextMenu(pos);
 }
 
 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,
 {
     emit activated();
 }
 
 void DolphinController::indicateDroppedUrls(const KUrl::List& urls,

-                                            const QPoint& pos)
+                                            const KUrl& destPath,
+                                            const KFileItem& destItem)

 {
 {

-    emit urlsDropped(urls, pos);
+    emit urlsDropped(urls, destPath, destItem);

 }
 
 
 }
 
 


@@ -56,14 +76,39 @@ void DolphinController::indicateSortOrderChange(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
     emit sortOrderChanged(order);
 }
 

-void DolphinController::triggerItem(const QModelIndex& index)
+void DolphinController::indicateAdditionalInfoChange(const KFileItemDelegate::InformationList& info)
+{
+    emit additionalInfoChanged(info);
+}
+
+void DolphinController::indicateActivationChange(bool active)
+{
+    emit activationChanged(active);
+}
+
+void DolphinController::triggerZoomIn()
+{
+    emit zoomIn();
+}
+
+void DolphinController::triggerZoomOut()
+{
+    emit zoomOut();
+}
+
+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"
 }
 
 #include "dolphincontroller.moc"