Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 7d24ebca596598d5e5454a6b83aff6d954782a0c..86b864583dd7c41c6e80b8f76ab55e24b963c443 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -22,9 +22,9 @@
 
 #include <assert.h>
 
 
 #include <assert.h>
 

-#include <QItemSelectionModel>
-#include <Q3ValueList>  // TODO
+#include <QApplication>

 #include <QDropEvent>
 #include <QDropEvent>

+#include <QItemSelectionModel>

 #include <QMouseEvent>
 #include <QVBoxLayout>
 
 #include <QMouseEvent>
 #include <QVBoxLayout>
 


@@ -37,6 +37,7 @@
 #include <konq_operations.h>
 #include <kurl.h>
 
 #include <konq_operations.h>
 #include <kurl.h>
 

+#include "dolphincontroller.h"

 #include "dolphinstatusbar.h"
 #include "dolphinmainwindow.h"
 #include "dolphindirlister.h"
 #include "dolphinstatusbar.h"
 #include "dolphinmainwindow.h"
 #include "dolphindirlister.h"


@@ -49,13 +50,12 @@
 #include "urlnavigator.h"
 #include "viewproperties.h"
 
 #include "urlnavigator.h"
 #include "viewproperties.h"
 

-DolphinView::DolphinView(DolphinMainWindow *mainWindow,
-                         QWidget *parent,
+DolphinView::DolphinView(DolphinMainWindow* mainWindow,
+                         QWidget* parent,

                          const KUrl& url,
                          Mode mode,
                          bool showHiddenFiles) :
     QWidget(parent),
                          const KUrl& url,
                          Mode mode,
                          bool showHiddenFiles) :
     QWidget(parent),

-    m_refreshing(false),

     m_showProgress(false),
     m_mode(mode),
     m_iconSize(0),
     m_showProgress(false),
     m_mode(mode),
     m_iconSize(0),


@@ -64,6 +64,7 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow,
     m_mainWindow(mainWindow),
     m_topLayout(0),
     m_urlNavigator(0),
     m_mainWindow(mainWindow),
     m_topLayout(0),
     m_urlNavigator(0),

+    m_controller(0),

     m_iconsView(0),
     m_detailsView(0),
     m_filterBar(0),
     m_iconsView(0),
     m_detailsView(0),
     m_filterBar(0),


@@ -78,9 +79,18 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow,
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 

+    connect(m_mainWindow, SIGNAL(activeViewChanged()),
+            this, SLOT(updateActivationState()));
+

     m_urlNavigator = new UrlNavigator(url, this);
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(loadDirectory(const KUrl&)));
     m_urlNavigator = new UrlNavigator(url, this);
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(loadDirectory(const KUrl&)));

+    connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
+            this, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
+    connect(m_urlNavigator, SIGNAL(activated()),
+            this, SLOT(requestActivation()));
+    connect(this, SIGNAL(contentsMoved(int, int)),
+            m_urlNavigator, SLOT(storeContentsPosition(int, int)));

 
     m_statusBar = new DolphinStatusBar(this);
 
 
     m_statusBar = new DolphinStatusBar(this);
 


@@ -91,17 +101,17 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow,
     m_dirLister->setDelayedMimeTypes(true);
 
     connect(m_dirLister, SIGNAL(clear()),
     m_dirLister->setDelayedMimeTypes(true);
 
     connect(m_dirLister, SIGNAL(clear()),

-            this, SLOT(slotClear()));
+            this, SLOT(updateStatusBar()));

     connect(m_dirLister, SIGNAL(percent(int)),
     connect(m_dirLister, SIGNAL(percent(int)),

-            this, SLOT(slotPercent(int)));
+            this, SLOT(updateProgress(int)));

     connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)),
     connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)),

-            this, SLOT(slotDeleteItem(KFileItem*)));
+            this, SLOT(updateStatusBar()));

     connect(m_dirLister, SIGNAL(completed()),
     connect(m_dirLister, SIGNAL(completed()),

-            this, SLOT(slotCompleted()));
+            this, SLOT(updateItemCount()));

     connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
     connect(m_dirLister, SIGNAL(infoMessage(const QString&)),

-            this, SLOT(slotInfoMessage(const QString&)));
+            this, SLOT(showInfoMessage(const QString&)));

     connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
     connect(m_dirLister, SIGNAL(errorMessage(const QString&)),

-            this, SLOT(slotErrorMessage(const QString&)));
+            this, SLOT(showErrorMessage(const QString&)));

 
     m_dirModel = new KDirModel();
     m_dirModel->setDirLister(m_dirLister);
 
     m_dirModel = new KDirModel();
     m_dirModel->setDirLister(m_dirLister);


@@ -110,6 +120,22 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow,
     m_proxyModel = new DolphinSortFilterProxyModel(this);
     m_proxyModel->setSourceModel(m_dirModel);
 
     m_proxyModel = new DolphinSortFilterProxyModel(this);
     m_proxyModel->setSourceModel(m_dirModel);
 

+    m_controller = new DolphinController(this);
+    connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
+            this, SLOT(openContextMenu(const QPoint&)));
+    connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const QPoint&)),
+            this, SLOT(dropUrls(const KUrl::List&, const QPoint&)));
+    connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)),
+            this, SLOT(updateSorting(DolphinView::Sorting)));
+    connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)),
+            this, SLOT(updateSortOrder(Qt::SortOrder)));
+    connect(m_controller, SIGNAL(itemTriggered(const QModelIndex&)),
+            this, SLOT(triggerItem(const QModelIndex&)));
+    connect(m_controller, SIGNAL(selectionChanged()),
+            this, SLOT(emitSelectionChangedSignal()));
+    connect(m_controller, SIGNAL(activated()),
+            this, SLOT(requestActivation()));
+

     createView();
 
     m_iconSize = K3Icon::SizeMedium;
     createView();
 
     m_iconSize = K3Icon::SizeMedium;


@@ -117,8 +143,8 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow,
     m_filterBar = new FilterBar(this);
     m_filterBar->hide();
     connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
     m_filterBar = new FilterBar(this);
     m_filterBar->hide();
     connect(m_filterBar, SIGNAL(filterChanged(const QString&)),

-           this, SLOT(slotChangeNameFilter(const QString&)));
-    connect(m_filterBar, SIGNAL(closed()),
+           this, SLOT(changeNameFilter(const QString&)));
+    connect(m_filterBar, SIGNAL(closeRequest()),

             this, SLOT(closeFilterBar()));
 
     m_topLayout->addWidget(m_urlNavigator);
             this, SLOT(closeFilterBar()));
 
     m_topLayout->addWidget(m_urlNavigator);


@@ -138,6 +164,7 @@ DolphinView::~DolphinView()
 void DolphinView::setUrl(const KUrl& url)
 {
     m_urlNavigator->setUrl(url);
 void DolphinView::setUrl(const KUrl& url)
 {
     m_urlNavigator->setUrl(url);

+    m_controller->setUrl(url);

 }
 
 const KUrl& DolphinView::url() const
 }
 
 const KUrl& DolphinView::url() const


@@ -145,20 +172,15 @@ const KUrl& DolphinView::url() const
     return m_urlNavigator->url();
 }
 
     return m_urlNavigator->url();
 }
 

-void DolphinView::requestActivation()
-{
-    mainWindow()->setActiveView(this);
-}
-

 bool DolphinView::isActive() const
 {
 bool DolphinView::isActive() const
 {

-    return (mainWindow()->activeView() == this);
+    return m_mainWindow->activeView() == this;

 }
 
 void DolphinView::setMode(Mode mode)
 {
     if (mode == m_mode) {
 }
 
 void DolphinView::setMode(Mode mode)
 {
     if (mode == m_mode) {

-        return;         // the wished mode is already set
+        return; // the wished mode is already set

     }
 
     m_mode = mode;
     }
 
     m_mode = mode;


@@ -247,8 +269,11 @@ void DolphinView::renameSelectedItems()
             assert(replaceIndex >= 0);
             for (int i = 0; i < urlsCount; ++i) {
                 const KUrl& source = urls[i];
             assert(replaceIndex >= 0);
             for (int i = 0; i < urlsCount; ++i) {
                 const KUrl& source = urls[i];

+                QString number;
+                number.setNum(i + 1);
+

                 QString name(newName);
                 QString name(newName);

-                name.replace(replaceIndex, 1, renameIndexPresentation(i + 1, urlsCount));
+                name.replace(replaceIndex, 1, number);

 
                 if (source.fileName() != name) {
                     KUrl dest(source.upUrl());
 
                 if (source.fileName() != name) {
                     KUrl dest(source.upUrl());


@@ -318,12 +343,12 @@ DolphinStatusBar* DolphinView::statusBar() const
 int DolphinView::contentsX() const
 {
 
 int DolphinView::contentsX() const
 {
 

-    return 0; //scrollView()->contentsX();
+    return itemView()->horizontalScrollBar()->value();

 }
 
 int DolphinView::contentsY() const
 {
 }
 
 int DolphinView::contentsY() const
 {

-    return 0; //scrollView()->contentsY();
+    return itemView()->verticalScrollBar()->value();

 }
 
 void DolphinView::refreshSettings()
 }
 
 void DolphinView::refreshSettings()


@@ -331,29 +356,6 @@ void DolphinView::refreshSettings()
     startDirLister(m_urlNavigator->url());
 }
 
     startDirLister(m_urlNavigator->url());
 }
 

-void DolphinView::updateStatusBar()
-{
-    // As the item count information is less important
-    // in comparison with other messages, it should only
-    // be shown if:
-    // - the status bar is empty or
-    // - shows already the item count information or
-    // - shows only a not very important information
-    // - if any progress is given don't show the item count info at all
-    const QString msg(m_statusBar->message());
-    const bool updateStatusBarMsg = (msg.isEmpty() ||
-                                     (msg == m_statusBar->defaultText()) ||
-                                     (m_statusBar->type() == DolphinStatusBar::Information)) &&
-                                    (m_statusBar->progress() == 100);
-
-    const QString text(hasSelection() ? selectionStatusBarText() : defaultStatusBarText());
-    m_statusBar->setDefaultText(text);
-
-    if (updateStatusBarMsg) {
-        m_statusBar->setMessage(text, DolphinStatusBar::Default);
-    }
-}
-

 void DolphinView::emitRequestItemInfo(const KUrl& url)
 {
     emit requestItemInfo(url);
 void DolphinView::emitRequestItemInfo(const KUrl& url)
 {
     emit requestItemInfo(url);


@@ -392,12 +394,7 @@ bool DolphinView::isZoomOutPossible() const
 void DolphinView::setSorting(Sorting sorting)
 {
     if (sorting != this->sorting()) {
 void DolphinView::setSorting(Sorting sorting)
 {
     if (sorting != this->sorting()) {

-        ViewProperties props(url());
-        props.setSorting(sorting);
-
-        m_proxyModel->setSorting(sorting);
-
-        emit sortingChanged(sorting);
+        updateSorting(sorting);

     }
 }
 
     }
 }
 


@@ -409,12 +406,7 @@ DolphinView::Sorting DolphinView::sorting() const
 void DolphinView::setSortOrder(Qt::SortOrder order)
 {
     if (sortOrder() != order) {
 void DolphinView::setSortOrder(Qt::SortOrder order)
 {
     if (sortOrder() != order) {

-        ViewProperties props(url());
-        props.setSortOrder(order);
-
-        m_proxyModel->setSortOrder(order);
-
-        emit sortOrderChanged(order);
+        updateSortOrder(order);

     }
 }
 
     }
 }
 


@@ -448,7 +440,7 @@ void DolphinView::setUrlEditable(bool editable)
     m_urlNavigator->editUrl(editable);
 }
 
     m_urlNavigator->editUrl(editable);
 }
 

-const Q3ValueList<UrlNavigator::HistoryElem> DolphinView::urlHistory(int& index) const
+const QLinkedList<UrlNavigator::HistoryElem> DolphinView::urlHistory(int& index) const

 {
     return m_urlNavigator->history(index);
 }
 {
     return m_urlNavigator->history(index);
 }


@@ -505,12 +497,6 @@ KFileItem* DolphinView::fileItem(const QModelIndex index) const
     return m_dirModel->itemForIndex(dirModelIndex);
 }
 
     return m_dirModel->itemForIndex(dirModelIndex);
 }
 

-void DolphinView::openContextMenu(KFileItem* fileInfo, const QPoint& pos)
-{
-    DolphinContextMenu contextMenu(this, fileInfo, pos);
-    contextMenu.open();
-}
-

 void DolphinView::rename(const KUrl& source, const QString& newName)
 {
     bool ok = false;
 void DolphinView::rename(const KUrl& source, const QString& newName)
 {
     bool ok = false;


@@ -577,27 +563,6 @@ void DolphinView::reload()
     startDirLister(m_urlNavigator->url(), true);
 }
 
     startDirLister(m_urlNavigator->url(), true);
 }
 

-void DolphinView::slotUrlListDropped(QDropEvent* /* event */,
-                                     const KUrl::List& urls,
-                                     const KUrl& url)
-{
-    KUrl destination(url);
-    if (destination.isEmpty()) {
-        destination = m_urlNavigator->url();
-    }
-    else {
-        // Check whether the destination Url is a directory. If this is not the
-        // case, use the navigator Url as destination (otherwise the destination,
-        // which represents a file, would be replaced by a copy- or move-operation).
-        KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, destination);
-        if (!fileItem.isDir()) {
-            destination = m_urlNavigator->url();
-        }
-    }
-
-    mainWindow()->dropUrls(urls, destination);
-}
-

 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);


@@ -642,25 +607,30 @@ void DolphinView::loadDirectory(const KUrl& url)
 
     startDirLister(url);
     emit urlChanged(url);
 
     startDirLister(url);
     emit urlChanged(url);

+
+    m_statusBar->clear();

 }
 
 void DolphinView::triggerItem(const QModelIndex& index)
 {
 }
 
 void DolphinView::triggerItem(const QModelIndex& index)
 {

+    const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
+    if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {
+        // items are selected by the user, hence don't trigger the
+        // item specified by 'index'
+        return;
+    }
+

     KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index));
     if (item == 0) {
         return;
     }
 
     if (item->isDir()) {
     KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index));
     if (item == 0) {
         return;
     }
 
     if (item->isDir()) {

-        // Prefer the local path over the Url. This assures that the
-        // volume space information is correct. Assuming that the Url is media:/sda1,
-        // and the local path is /windows/C: For the Url the space info is related
+        // Prefer the local path over the URL. This assures that the
+        // volume space information is correct. Assuming that the URL is media:/sda1,
+        // and the local path is /windows/C: For the URL the space info is related

         // to the root partition (and hence wrong) and for the local path the space
         // info is related to the windows partition (-> correct).
         // to the root partition (and hence wrong) and for the local path the space
         // info is related to the windows partition (-> correct).

-        //m_dirLister->stop();
-        //m_dirLister->openUrl(item->url());
-        //return;
-

         const QString localPath(item->localPath());
         if (localPath.isEmpty()) {
             setUrl(item->url());
         const QString localPath(item->localPath());
         if (localPath.isEmpty()) {
             setUrl(item->url());


@@ -674,41 +644,15 @@ void DolphinView::triggerItem(const QModelIndex& index)
     }
 }
 
     }
 }
 

-void DolphinView::slotPercent(int percent)
+void DolphinView::updateProgress(int percent)

 {
     if (m_showProgress) {
         m_statusBar->setProgress(percent);
     }
 }
 
 {
     if (m_showProgress) {
         m_statusBar->setProgress(percent);
     }
 }
 

-void DolphinView::slotClear()
+void DolphinView::updateItemCount()

 {
 {

-    //fileView()->clearView();
-    updateStatusBar();
-}
-
-void DolphinView::slotDeleteItem(KFileItem* item)
-{
-    //fileView()->removeItem(item);
-    updateStatusBar();
-}
-
-void DolphinView::slotCompleted()
-{
-    m_refreshing = true;
-
-    //KFileView* view = fileView();
-    //view->clearView();
-
-    // TODO: in Qt4 the code should get a lot
-    // simpler and nicer due to Interview...
-    /*if (m_iconsView != 0) {
-        m_iconsView->beginItemUpdates();
-    }
-    if (m_iconsView != 0) {
-        m_iconsView->beginItemUpdates();
-    }*/
-

     if (m_showProgress) {
         m_statusBar->setProgressText(QString::null);
         m_statusBar->setProgress(100);
     if (m_showProgress) {
         m_statusBar->setProgressText(QString::null);
         m_statusBar->setProgress(100);


@@ -724,7 +668,6 @@ void DolphinView::slotCompleted()
 
     while (it != end) {
         KFileItem* item = *it;
 
     while (it != end) {
         KFileItem* item = *it;

-        //view->insertItem(item);

         if (item->isDir()) {
             ++m_folderCount;
         }
         if (item->isDir()) {
             ++m_folderCount;
         }


@@ -736,32 +679,32 @@ void DolphinView::slotCompleted()
 
     updateStatusBar();
 
 
     updateStatusBar();
 

-    /*if (m_iconsView != 0) {
-        // Prevent a flickering of the icon view widget by giving a small
-        // timeslot to swallow asynchronous update events.
-        m_iconsView->setUpdatesEnabled(false);
-        QTimer::singleShot(10, this, SLOT(slotDelayedUpdate()));
-    }
-
-    if (m_iconsView != 0) {
-        m_iconsView->endItemUpdates();
-        m_refreshing = false;
-    }*/
+    QTimer::singleShot(0, this, SLOT(restoreContentsPos()));

 }
 
 }
 

-void DolphinView::slotInfoMessage(const QString& msg)
+void DolphinView::restoreContentsPos()

 {
 {

-    m_statusBar->setMessage(msg, DolphinStatusBar::Information);
+    int index = 0;
+    const QLinkedList<UrlNavigator::HistoryElem> history = urlHistory(index);
+    if (!history.isEmpty()) {
+        QAbstractItemView* view = itemView();
+        // TODO: view->setCurrentItem(history[index].currentFileName());
+
+        QLinkedList<UrlNavigator::HistoryElem>::const_iterator it = history.begin();
+        it += index;
+        view->horizontalScrollBar()->setValue((*it).contentsX());
+        view->verticalScrollBar()->setValue((*it).contentsY());
+    }

 }
 
 }
 

-void DolphinView::slotErrorMessage(const QString& msg)
+void DolphinView::showInfoMessage(const QString& msg)

 {
 {

-    m_statusBar->setMessage(msg, DolphinStatusBar::Error);
+    m_statusBar->setMessage(msg, DolphinStatusBar::Information);

 }
 
 }
 

-void DolphinView::slotGrabActivation()
+void DolphinView::showErrorMessage(const QString& msg)

 {
 {

-    mainWindow()->setActiveView(this);
+    m_statusBar->setMessage(msg, DolphinStatusBar::Error);

 }
 
 void DolphinView::emitSelectionChangedSignal()
 }
 
 void DolphinView::emitSelectionChangedSignal()


@@ -775,16 +718,6 @@ void DolphinView::closeFilterBar()
     emit showFilterBarChanged(false);
 }
 
     emit showFilterBarChanged(false);
 }
 

-void DolphinView::slotContentsMoving(int x, int y)
-{
-    if (!m_refreshing) {
-        // Only emit a 'contents moved' signal if the user
-        // moved the content by adjusting the sliders. Adjustments
-        // resulted by refreshing a directory should not be respected.
-        emit contentsMoved(x, y);
-    }
-}
-

 void DolphinView::startDirLister(const KUrl& url, bool reload)
 {
     if (!url.isValid()) {
 void DolphinView::startDirLister(const KUrl& url, bool reload)
 {
     if (!url.isValid()) {


@@ -810,57 +743,25 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
         m_statusBar->setProgress(0);
     }
 
         m_statusBar->setProgress(0);
     }
 

-    m_refreshing = true;

     m_dirLister->stop();
     m_dirLister->openUrl(url, false, reload);
 }
 
 QString DolphinView::defaultStatusBarText() const
 {
     m_dirLister->stop();
     m_dirLister->openUrl(url, false, reload);
 }
 
 QString DolphinView::defaultStatusBarText() const
 {

-    // TODO: the following code is not suitable for languages where multiple forms
-    // of plurals are given (e. g. in Poland three forms of plurals exist).
-    const int itemCount = m_folderCount + m_fileCount;
-
-    QString text;
-    if (itemCount == 1) {
-        text = i18n("1 Item");
-    }
-    else {
-        text = i18n("%1 Items",itemCount);
-    }
-
-    text += " (";
-
-    if (m_folderCount == 1) {
-        text += i18n("1 Folder");
-    }
-    else {
-        text += i18n("%1 Folders",m_folderCount);
-    }
-
-    text += ", ";
-
-    if (m_fileCount == 1) {
-        text += i18n("1 File");
-    }
-    else {
-        text += i18n("%1 Files",m_fileCount);
-    }
-
-    text += ")";
-
-    return text;
+    return KIO::itemsSummaryString(m_fileCount + m_folderCount,
+                                   m_fileCount,
+                                   m_folderCount,
+                                   0, false);

 }
 
 QString DolphinView::selectionStatusBarText() const
 {
 }
 
 QString DolphinView::selectionStatusBarText() const
 {

-    // TODO: the following code is not suitable for languages where multiple forms
-    // of plurals are given (e. g. in Poland three forms of plurals exist).

     QString text;
     const KFileItemList list = selectedItems();
     if (list.isEmpty()) {
     QString text;
     const KFileItemList list = selectedItems();
     if (list.isEmpty()) {

-        // TODO: assert(!list.isEmpty()) should be used, as this method is only invoked if
-        // DolphinView::hasSelection() is true. Inconsistent behavior?
+        // when an item is triggered, it is temporary selected but selectedItems()
+        // will return an empty list

         return QString();
     }
 
         return QString();
     }
 


@@ -881,48 +782,22 @@ QString DolphinView::selectionStatusBarText() const
         ++it;
     }
 
         ++it;
     }
 

-    if (folderCount == 1) {
-        text = i18n("1 Folder selected");
-    }
-    else if (folderCount > 1) {
-        text = i18n("%1 Folders selected",folderCount);
-    }
-
-    if ((fileCount > 0) && (folderCount > 0)) {
-        text += ", ";
+    if (folderCount > 0) {
+        text = i18np("1 Folder selected", "%1 Folders selected", folderCount);
+        if (fileCount > 0) {
+            text += ", ";
+        }

     }
 
     }
 

-    const QString sizeText(KIO::convertSize(byteSize));
-    if (fileCount == 1) {
-        text += i18n("1 File selected (%1)",sizeText);
-    }
-    else if (fileCount > 1) {
-        text += i18n("%1 Files selected (%1)",fileCount,sizeText);
+    if (fileCount > 0) {
+        const QString sizeText(KIO::convertSize(byteSize));
+        text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText);

     }
 
     return text;
 }
 
     }
 
     return text;
 }
 

-QString DolphinView::renameIndexPresentation(int index, int itemCount) const
-{
-    // assure that the string reprentation for all indicess have the same
-    // number of characters based on the given number of items
-    QString str(QString::number(index));
-    int chrCount = 1;
-    while (itemCount >= 10) {
-        ++chrCount;
-        itemCount /= 10;
-    }
-    str.reserve(chrCount);
-
-    const int insertCount = chrCount - str.length();
-    for (int i = 0; i < insertCount; ++i) {
-        str.insert(0, '0');
-    }
-    return str;
-}
-
-void DolphinView::slotShowFilterBar(bool show)
+void DolphinView::showFilterBar(bool show)

 {
     assert(m_filterBar != 0);
     if (show) {
 {
     assert(m_filterBar != 0);
     if (show) {


@@ -933,12 +808,35 @@ void DolphinView::slotShowFilterBar(bool show)
     }
 }
 
     }
 }
 

-void DolphinView::declareViewActive()
+void DolphinView::updateStatusBar()
+{
+    // As the item count information is less important
+    // in comparison with other messages, it should only
+    // be shown if:
+    // - the status bar is empty or
+    // - shows already the item count information or
+    // - shows only a not very important information
+    // - if any progress is given don't show the item count info at all
+    const QString msg(m_statusBar->message());
+    const bool updateStatusBarMsg = (msg.isEmpty() ||
+                                     (msg == m_statusBar->defaultText()) ||
+                                     (m_statusBar->type() == DolphinStatusBar::Information)) &&
+                                    (m_statusBar->progress() == 100);
+
+    const QString text(hasSelection() ? selectionStatusBarText() : defaultStatusBarText());
+    m_statusBar->setDefaultText(text);
+
+    if (updateStatusBarMsg) {
+        m_statusBar->setMessage(text, DolphinStatusBar::Default);
+    }
+}
+
+void DolphinView::requestActivation()

 {
 {

-    mainWindow()->setActiveView( this );
+    m_mainWindow->setActiveView(this);

 }
 
 }
 

-void DolphinView::slotChangeNameFilter(const QString& nameFilter)
+void DolphinView::changeNameFilter(const QString& nameFilter)

 {
     // The name filter of KDirLister does a 'hard' filtering, which
     // means that only the items are shown where the names match
 {
     // The name filter of KDirLister does a 'hard' filtering, which
     // means that only the items are shown where the names match


@@ -963,12 +861,81 @@ void DolphinView::slotChangeNameFilter(const QString& nameFilter)
 #endif
 }
 
 #endif
 }
 

+void DolphinView::openContextMenu(const QPoint& pos)
+{
+    KFileItem* item = 0;
+
+    const QModelIndex index = itemView()->indexAt(pos);
+    if (index.isValid()) {
+        item = fileItem(index);
+    }
+
+    DolphinContextMenu contextMenu(this, item);
+    contextMenu.open();
+}
+
+void DolphinView::dropUrls(const KUrl::List& urls,
+                           const QPoint& pos)
+{
+    KFileItem* directory = 0;
+    const QModelIndex index = itemView()->indexAt(pos);
+    if (index.isValid()) {
+        KFileItem* item = fileItem(index);
+        assert(item != 0);
+        if (item->isDir()) {
+            // the URLs are dropped above a directory
+            directory = item;
+        }
+    }
+
+    const KUrl& destination = (directory == 0) ? url() :
+                                                 directory->url();
+    dropUrls(urls, destination);
+}
+
+void DolphinView::dropUrls(const KUrl::List& urls,
+                           const KUrl& destination)
+{
+    m_mainWindow->dropUrls(urls, destination);
+}
+
+
+void DolphinView::updateSorting(DolphinView::Sorting sorting)
+{
+    ViewProperties props(url());
+    props.setSorting(sorting);
+
+    m_proxyModel->setSorting(sorting);
+
+    emit sortingChanged(sorting);
+}
+
+void DolphinView::updateSortOrder(Qt::SortOrder order)
+{
+    ViewProperties props(url());
+    props.setSortOrder(order);
+
+    m_proxyModel->setSortOrder(order);
+
+    emit sortOrderChanged(order);
+}
+
+void DolphinView::emitContentsMoved()
+{
+    emit contentsMoved(contentsX(), contentsY());
+}
+
+void DolphinView::updateActivationState()
+{
+    m_urlNavigator->setActive(isActive());
+}
+

 void DolphinView::createView()
 {
     // delete current view
     QAbstractItemView* view = itemView();
     if (view != 0) {
 void DolphinView::createView()
 {
     // delete current view
     QAbstractItemView* view = itemView();
     if (view != 0) {

-        m_topLayout->remove(view);
+        m_topLayout->removeWidget(view);

         view->close();
         view->deleteLater();
         m_iconsView = 0;
         view->close();
         view->deleteLater();
         m_iconsView = 0;


@@ -981,22 +948,17 @@ void DolphinView::createView()
     // ... and recreate it representing the current mode
     switch (m_mode) {
         case IconsView:
     // ... and recreate it representing the current mode
     switch (m_mode) {
         case IconsView:

-            m_iconsView = new DolphinIconsView(this);
-            m_iconsView->setViewMode(QListView::IconMode);
-            m_iconsView->setSpacing(32);
+            m_iconsView = new DolphinIconsView(this, m_controller);

             view = m_iconsView;
             view = m_iconsView;

-            // TODO: read out view settings

             break;
 
         case DetailsView:
             break;
 
         case DetailsView:

-            m_detailsView = new DolphinDetailsView(this);
+            m_detailsView = new DolphinDetailsView(this, m_controller);

             view = m_detailsView;
             view = m_detailsView;

-            // TODO: read out view settings

             break;
     }
 
     view->setModel(m_proxyModel);
             break;
     }
 
     view->setModel(m_proxyModel);

-

     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
     KFileItemDelegate* delegate = new KFileItemDelegate(this);
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
     KFileItemDelegate* delegate = new KFileItemDelegate(this);


@@ -1004,25 +966,14 @@ void DolphinView::createView()
     view->setItemDelegate(delegate);
 
     new KMimeTypeResolver(view, m_dirModel);
     view->setItemDelegate(delegate);
 
     new KMimeTypeResolver(view, m_dirModel);

-
-    connect(view, SIGNAL(clicked(const QModelIndex&)),
-            this, SLOT(triggerItem(const QModelIndex&)));
-    connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
-            this, SLOT(emitSelectionChangedSignal()));
-

     m_topLayout->insertWidget(1, view);
     m_topLayout->insertWidget(1, view);

-}

 
 

-int DolphinView::columnIndex(Sorting sorting) const
-{
-    int index = 0;
-    switch (sorting) {
-        case SortByName: index = KDirModel::Name; break;
-        case SortBySize: index = KDirModel::Size; break;
-        case SortByDate: index = KDirModel::ModifiedTime; break;
-        default: assert(false);
-    }
-    return index;
+    connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
+            m_controller, SLOT(indicateSelectionChange()));
+    connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
+            this, SLOT(emitContentsMoved()));
+    connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
+            this, SLOT(emitContentsMoved()));

 }
 
 void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
 }
 
 void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)