]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/dolphinview.cpp
Fixed issue that the filterbar and the menu state have not been synchronized (a not...
[dolphin.git] / src / dolphinview.cpp
index bcf17a6204d45f90a8eb5c538d622a69923cbd12..9b2286c8756953988f87f58d2a5f74b143b81db3 100644 (file)
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
 #include "dolphinview.h"
 
-#include <qlayout.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <assert.h>
+
 #include <QDropEvent>
+#include <QItemSelectionModel>
 #include <QMouseEvent>
-#include <Q3VBoxLayout>
-#include <kurl.h>
+#include <QVBoxLayout>
+
+#include <kdirmodel.h>
+#include <kfileitemdelegate.h>
 #include <klocale.h>
 #include <kio/netaccess.h>
-#include <kio/renamedlg.h>
-#include <assert.h>
+#include <kio/renamedialog.h>
+#include <kmimetyperesolver.h>
+#include <konq_operations.h>
+#include <kurl.h>
 
-#include "urlnavigator.h"
 #include "dolphinstatusbar.h"
-#include "dolphin.h"
+#include "dolphinmainwindow.h"
 #include "dolphindirlister.h"
-#include "viewproperties.h"
+#include "dolphinsortfilterproxymodel.h"
 #include "dolphindetailsview.h"
 #include "dolphiniconsview.h"
 #include "dolphincontextmenu.h"
-#include "undomanager.h"
-#include "renamedialog.h"
-#include "progressindicator.h"
-
 #include "filterbar.h"
+#include "renamedialog.h"
+#include "urlnavigator.h"
+#include "viewproperties.h"
 
-DolphinView::DolphinView(QWidget *parent,
+DolphinView::DolphinView(DolphinMainWindow* mainWindow,
+                         QWidget* parent,
                          const KUrl& url,
                          Mode mode,
                          bool showHiddenFiles) :
     QWidget(parent),
-    m_refreshing(false),
     m_showProgress(false),
     m_mode(mode),
-    m_iconsView(0),
-    m_detailsView(0),
-    m_statusBar(0),
     m_iconSize(0),
     m_folderCount(0),
     m_fileCount(0),
-    m_filterBar(0)
+    m_mainWindow(mainWindow),
+    m_topLayout(0),
+    m_urlNavigator(0),
+    m_iconsView(0),
+    m_detailsView(0),
+    m_filterBar(0),
+    m_statusBar(0),
+    m_dirModel(0),
+    m_dirLister(0),
+    m_proxyModel(0)
 {
+    hide();
     setFocusPolicy(Qt::StrongFocus);
-    m_topLayout = new Q3VBoxLayout(this);
-
-    Dolphin& dolphin = Dolphin::mainWin();
-
-    connect(this, SIGNAL(signalModeChanged()),
-            &dolphin, SLOT(slotViewModeChanged()));
-    connect(this, SIGNAL(signalShowHiddenFilesChanged()),
-            &dolphin, SLOT(slotShowHiddenFilesChanged()));
-    connect(this, SIGNAL(signalSortingChanged(DolphinView::Sorting)),
-            &dolphin, SLOT(slotSortingChanged(DolphinView::Sorting)));
-    connect(this, SIGNAL(signalSortOrderChanged(Qt::SortOrder)),
-            &dolphin, SLOT(slotSortOrderChanged(Qt::SortOrder)));
+    m_topLayout = new QVBoxLayout(this);
+    m_topLayout->setSpacing(0);
+    m_topLayout->setMargin(0);
 
     m_urlNavigator = new UrlNavigator(url, this);
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(slotUrlChanged(const KUrl&)));
-    connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
-            &dolphin, SLOT(slotUrlChanged(const KUrl&)));
-    connect(m_urlNavigator, SIGNAL(historyChanged()),
-            &dolphin, SLOT(slotHistoryChanged()));
+            this, SLOT(loadDirectory(const KUrl&)));
 
     m_statusBar = new DolphinStatusBar(this);
 
@@ -90,37 +86,45 @@ DolphinView::DolphinView(QWidget *parent,
     m_dirLister->setAutoUpdate(true);
     m_dirLister->setMainWindow(this);
     m_dirLister->setShowingDotFiles(showHiddenFiles);
+    m_dirLister->setDelayedMimeTypes(true);
+
     connect(m_dirLister, SIGNAL(clear()),
-            this, SLOT(slotClear()));
+            this, SLOT(updateStatusBar()));
     connect(m_dirLister, SIGNAL(percent(int)),
-            this, SLOT(slotPercent(int)));
+            this, SLOT(updateProgress(int)));
     connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)),
-            this, SLOT(slotDeleteItem(KFileItem*)));
+            this, SLOT(updateStatusBar()));
     connect(m_dirLister, SIGNAL(completed()),
-            this, SLOT(slotCompleted()));
+            this, SLOT(updateItemCount()));
     connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
-            this, SLOT(slotInfoMessage(const QString&)));
+            this, SLOT(showInfoMessage(const QString&)));
     connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
-            this, SLOT(slotErrorMessage(const QString&)));
-    connect(m_dirLister, SIGNAL(refreshItems(const KFileItemList&)),
-            this, SLOT(slotRefreshItems(const KFileItemList&)));
-    connect(m_dirLister, SIGNAL(redirection(const KUrl&, const KUrl&)),
-            this, SIGNAL(redirection(const KUrl&, const KUrl&)));
-    connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
-           this, SLOT(slotAddItems(const KFileItemList&)));
+            this, SLOT(showErrorMessage(const QString&)));
 
-    m_iconSize = K3Icon::SizeMedium;
+    m_dirModel = new KDirModel();
+    m_dirModel->setDirLister(m_dirLister);
+    m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory);
+
+    m_proxyModel = new DolphinSortFilterProxyModel(this);
+    m_proxyModel->setSourceModel(m_dirModel);
 
-    m_topLayout->addWidget(m_urlNavigator);
     createView();
 
+    m_iconSize = K3Icon::SizeMedium;
+
     m_filterBar = new FilterBar(this);
     m_filterBar->hide();
-    m_topLayout->addWidget(m_filterBar);
-    connect(m_filterBar, SIGNAL(signalFilterChanged(const QString&)),
-           this, SLOT(slotChangeNameFilter(const QString&)));
+    connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
+           this, SLOT(changeNameFilter(const QString&)));
+    connect(m_filterBar, SIGNAL(closeRequest()),
+            this, SLOT(closeFilterBar()));
 
+    m_topLayout->addWidget(m_urlNavigator);
+    m_topLayout->addWidget(itemView());
+    m_topLayout->addWidget(m_filterBar);
     m_topLayout->addWidget(m_statusBar);
+
+    loadDirectory(m_urlNavigator->url());
 }
 
 DolphinView::~DolphinView()
@@ -141,38 +145,29 @@ const KUrl& DolphinView::url() const
 
 void DolphinView::requestActivation()
 {
-    Dolphin::mainWin().setActiveView(this);
+    mainWindow()->setActiveView(this);
 }
 
 bool DolphinView::isActive() const
 {
-    return (Dolphin::mainWin().activeView() == this);
+    return (mainWindow()->activeView() == this);
 }
 
 void DolphinView::setMode(Mode mode)
 {
     if (mode == m_mode) {
-        return;         // the wished mode is already set
-    }
-
-    QWidget* view = (m_iconsView != 0) ? static_cast<QWidget*>(m_iconsView) :
-                                         static_cast<QWidget*>(m_detailsView);
-    if (view != 0) {
-        m_topLayout->remove(view);
-        view->close();
-        view->deleteLater();
-        m_iconsView = 0;
-        m_detailsView = 0;
+        return; // the wished mode is already set
     }
 
     m_mode = mode;
 
-    createView();
-
     ViewProperties props(m_urlNavigator->url());
     props.setViewMode(m_mode);
 
-    emit signalModeChanged();
+    createView();
+    startDirLister(m_urlNavigator->url());
+
+    emit modeChanged();
 }
 
 DolphinView::Mode DolphinView::mode() const
@@ -180,36 +175,44 @@ DolphinView::Mode DolphinView::mode() const
     return m_mode;
 }
 
-void DolphinView::setShowHiddenFilesEnabled(bool show)
+void DolphinView::setShowPreview(bool show)
+{
+    ViewProperties props(m_urlNavigator->url());
+    props.setShowPreview(show);
+
+    // TODO: wait until previews are possible with KFileItemDelegate
+
+    emit showPreviewChanged();
+}
+
+bool DolphinView::showPreview() const
+{
+    // TODO: wait until previews are possible with KFileItemDelegate
+    return true;
+}
+
+void DolphinView::setShowHiddenFiles(bool show)
 {
     if (m_dirLister->showingDotFiles() == show) {
         return;
     }
 
     ViewProperties props(m_urlNavigator->url());
-    props.setShowHiddenFilesEnabled(show);
+    props.setShowHiddenFiles(show);
     props.save();
 
     m_dirLister->setShowingDotFiles(show);
 
-    emit signalShowHiddenFilesChanged();
+    emit showHiddenFilesChanged();
 
     reload();
 }
 
-bool DolphinView::isShowHiddenFilesEnabled() const
+bool DolphinView::showHiddenFiles() const
 {
     return m_dirLister->showingDotFiles();
 }
 
-void DolphinView::setViewProperties(const ViewProperties& props)
-{
-    setMode(props.viewMode());
-    setSorting(props.sorting());
-    setSortOrder(props.sortOrder());
-    setShowHiddenFilesEnabled(props.isShowHiddenFilesEnabled());
-}
-
 void DolphinView::renameSelectedItems()
 {
     const KUrl::List urls = selectedUrls();
@@ -221,31 +224,32 @@ void DolphinView::renameSelectedItems()
             return;
         }
 
-        DolphinView* view = Dolphin::mainWin().activeView();
+        DolphinView* view = mainWindow()->activeView();
         const QString& newName = dialog.newName();
         if (newName.isEmpty()) {
             view->statusBar()->setMessage(i18n("The new item name is invalid."),
                                           DolphinStatusBar::Error);
         }
         else {
-            UndoManager& undoMan = UndoManager::instance();
-            undoMan.beginMacro();
+            // TODO: check how this can be integrated into KonqUndoManager/KonqOperations
+
+            //UndoManager& undoMan = UndoManager::instance();
+            //undoMan.beginMacro();
 
             assert(newName.contains('#'));
 
             const int urlsCount = urls.count();
-            ProgressIndicator* progressIndicator =
-                new  ProgressIndicator(i18n("Renaming items..."),
-                                       i18n("Renaming finished."),
-                                       urlsCount);
 
             // iterate through all selected items and rename them...
-            const int replaceIndex = newName.find('#');
+            const int replaceIndex = newName.indexOf('#');
             assert(replaceIndex >= 0);
             for (int i = 0; i < urlsCount; ++i) {
                 const KUrl& source = urls[i];
+                QString number;
+                number.setNum(i + 1);
+
                 QString name(newName);
-                name.replace(replaceIndex, 1, renameIndexPresentation(i + 1, urlsCount));
+                name.replace(replaceIndex, 1, number);
 
                 if (source.fileName() != name) {
                     KUrl dest(source.upUrl());
@@ -253,8 +257,6 @@ void DolphinView::renameSelectedItems()
 
                     const bool destExists = KIO::NetAccess::exists(dest, false, view);
                     if (destExists) {
-                        delete progressIndicator;
-                        progressIndicator = 0;
                         view->statusBar()->setMessage(i18n("Renaming failed (item '%1' already exists).",name),
                                                       DolphinStatusBar::Error);
                         break;
@@ -262,28 +264,25 @@ void DolphinView::renameSelectedItems()
                     else if (KIO::NetAccess::file_move(source, dest)) {
                         // TODO: From the users point of view he executed one 'rename n files' operation,
                         // but internally we store it as n 'rename 1 file' operations for the undo mechanism.
-                        DolphinCommand command(DolphinCommand::Rename, source, dest);
-                        undoMan.addCommand(command);
+                        //DolphinCommand command(DolphinCommand::Rename, source, dest);
+                        //undoMan.addCommand(command);
                     }
                 }
-
-                progressIndicator->execOperation();
             }
-            delete progressIndicator;
-            progressIndicator = 0;
 
-            undoMan.endMacro();
+            //undoMan.endMacro();
         }
     }
     else {
         // Only one item has been selected for renaming. Use the custom
         // renaming mechanism from the views.
         assert(urls.count() == 1);
-        if (m_mode == DetailsView) {
-            Q3ListViewItem* item = m_detailsView->firstChild();
+        // TODO:
+        /*if (m_mode == DetailsView) {
+            Q3ListViewItem* item = m_iconsView->firstChild();
             while (item != 0) {
                 if (item->isSelected()) {
-                    m_detailsView->rename(item, DolphinDetailsView::NameColumn);
+                    m_iconsView->rename(item, DolphinDetailsView::NameColumn);
                     break;
                 }
                 item = item->nextSibling();
@@ -298,18 +297,18 @@ void DolphinView::renameSelectedItems()
                 }
                 item = static_cast<KFileIconViewItem*>(item->nextItem());
             }
-        }
+        }*/
     }
 }
 
 void DolphinView::selectAll()
 {
-    fileView()->selectAll();
+    selectAll(QItemSelectionModel::Select);
 }
 
 void DolphinView::invertSelection()
 {
-    fileView()->invertSelection();
+    selectAll(QItemSelectionModel::Toggle);
 }
 
 DolphinStatusBar* DolphinView::statusBar() const
@@ -319,61 +318,28 @@ DolphinStatusBar* DolphinView::statusBar() const
 
 int DolphinView::contentsX() const
 {
-    return scrollView()->contentsX();
+
+    return 0; //scrollView()->contentsX();
 }
 
 int DolphinView::contentsY() const
 {
-    return scrollView()->contentsY();
+    return 0; //scrollView()->contentsY();
 }
 
 void DolphinView::refreshSettings()
 {
-    if (m_iconsView != 0) {
-        m_iconsView->refreshSettings();
-    }
-
-    if (m_detailsView != 0) {
-        // TODO: There is no usable interface in QListView/KFileDetailView
-        // to hide/show columns. The easiest approach is to delete
-        // the current instance and recreate a new one, which automatically
-        // refreshs the settings. If a proper interface is available in Qt4
-        // m_detailsView->refreshSettings() would be enough.
-        m_topLayout->remove(m_detailsView);
-        m_detailsView->close();
-        m_detailsView->deleteLater();
-        m_detailsView = 0;
-
-        createView();
-    }
+    startDirLister(m_urlNavigator->url());
 }
 
-void DolphinView::updateStatusBar()
+void DolphinView::emitRequestItemInfo(const KUrl& url)
 {
-    // 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);
-    }
+    emit requestItemInfo(url);
 }
 
-void DolphinView::requestItemInfo(const KUrl& url)
+bool DolphinView::isFilterBarVisible() const
 {
-    emit signalRequestItemInfo(url);
+  return m_filterBar->isVisible();
 }
 
 bool DolphinView::isUrlEditable() const
@@ -383,81 +349,56 @@ bool DolphinView::isUrlEditable() const
 
 void DolphinView::zoomIn()
 {
-    itemEffectsManager()->zoomIn();
+    //itemEffectsManager()->zoomIn();
 }
 
 void DolphinView::zoomOut()
 {
-    itemEffectsManager()->zoomOut();
+    //itemEffectsManager()->zoomOut();
 }
 
 bool DolphinView::isZoomInPossible() const
 {
-    return itemEffectsManager()->isZoomInPossible();
+    return false; //itemEffectsManager()->isZoomInPossible();
 }
 
 bool DolphinView::isZoomOutPossible() const
 {
-    return itemEffectsManager()->isZoomOutPossible();
+    return false; //itemEffectsManager()->isZoomOutPossible();
 }
 
 void DolphinView::setSorting(Sorting sorting)
 {
     if (sorting != this->sorting()) {
-        KFileView* view = fileView();
-        int spec = view->sorting() & ~QDir::Name & ~QDir::Size & ~QDir::Time & ~QDir::Unsorted;
-
-        switch (sorting) {
-            case SortByName: spec = spec | QDir::Name; break;
-            case SortBySize: spec = spec | QDir::Size; break;
-            case SortByDate: spec = spec | QDir::Time; break;
-            default: break;
-        }
-
         ViewProperties props(url());
         props.setSorting(sorting);
 
-        view->setSorting(static_cast<QDir::SortFlags>(spec));
+        m_proxyModel->setSorting(sorting);
 
-        emit signalSortingChanged(sorting);
+        emit sortingChanged(sorting);
     }
 }
 
 DolphinView::Sorting DolphinView::sorting() const
 {
-    const QDir::SortFlags spec = fileView()->sorting();
-
-    if (spec & QDir::Time) {
-        return SortByDate;
-    }
-
-    if (spec & QDir::Size) {
-        return SortBySize;
-    }
-
-    return SortByName;
+    return m_proxyModel->sorting();
 }
 
 void DolphinView::setSortOrder(Qt::SortOrder order)
 {
     if (sortOrder() != order) {
-        KFileView* view = fileView();
-        int sorting = view->sorting();
-        sorting = (order == Qt::Ascending) ? (sorting & ~QDir::Reversed) :
-                                             (sorting | QDir::Reversed);
-
         ViewProperties props(url());
         props.setSortOrder(order);
 
-        view->setSorting(static_cast<QDir::SortFlags>(sorting));
+        m_proxyModel->setSortOrder(order);
 
-        emit signalSortOrderChanged(order);
+        emit sortOrderChanged(order);
     }
 }
 
 Qt::SortOrder DolphinView::sortOrder() const
 {
-    return fileView()->isReversed() ? Qt::Descending : Qt::Ascending;
+    return m_proxyModel->sortOrder();
 }
 
 void DolphinView::goBack()
@@ -485,43 +426,61 @@ void DolphinView::setUrlEditable(bool 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);
 }
 
 bool DolphinView::hasSelection() const
 {
-    const KFileItemList* list = selectedItems();
-    return (list != 0) && !list->isEmpty();
+    return itemView()->selectionModel()->hasSelection();
 }
 
-const KFileItemList* DolphinView::selectedItems() const
+KFileItemList DolphinView::selectedItems() const
 {
-    return fileView()->selectedItems();
+    const QAbstractItemView* view = itemView();
+
+    // Our view has a selection, we will map them back to the DirModel
+    // and then fill the KFileItemList.
+    assert((view != 0) && (view->selectionModel() != 0));
+
+    const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
+    KFileItemList itemList;
+
+    const QModelIndexList indexList = selection.indexes();
+    QModelIndexList::const_iterator end = indexList.end();
+    for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) {
+        assert((*it).isValid());
+
+        KFileItem* item = m_dirModel->itemForIndex(*it);
+        if (item != 0) {
+            itemList.append(item);
+        }
+    }
+
+    return itemList;
 }
 
 KUrl::List DolphinView::selectedUrls() const
 {
     KUrl::List urls;
 
-    const KFileItemList* list = fileView()->selectedItems();
-    if (list != 0) {
-        KFileItemList::const_iterator it = list->begin();
-        const KFileItemList::const_iterator end = list->end();
-        while (it != end) {
-            KFileItem* item = *it;
-            urls.append(item->url());
-            ++it;
-        }
+    const KFileItemList list = selectedItems();
+    KFileItemList::const_iterator it = list.begin();
+    const KFileItemList::const_iterator end = list.end();
+    while (it != end) {
+        KFileItem* item = *it;
+        urls.append(item->url());
+        ++it;
     }
 
     return urls;
 }
 
-const KFileItem* DolphinView::currentFileItem() const
+KFileItem* DolphinView::fileItem(const QModelIndex index) const
 {
-    return fileView()->currentFileItem();
+    const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
+    return m_dirModel->itemForIndex(dirModelIndex);
 }
 
 void DolphinView::openContextMenu(KFileItem* fileInfo, const QPoint& pos)
@@ -543,15 +502,15 @@ void DolphinView::rename(const KUrl& source, const QString& newName)
 
     const bool destExists = KIO::NetAccess::exists(dest,
                                                    false,
-                                                   Dolphin::mainWin().activeView());
+                                                   mainWindow()->activeView());
     if (destExists) {
         // the destination already exists, hence ask the user
         // how to proceed...
-        KIO::RenameDlg renameDialog(this,
-                                    i18n("File Already Exists"),
-                                    source.path(),
-                                    dest.path(),
-                                    KIO::M_OVERWRITE);
+        KIO::RenameDialog renameDialog(this,
+                                       i18n("File Already Exists"),
+                                       source.path(),
+                                       dest.path(),
+                                       KIO::M_OVERWRITE);
         switch (renameDialog.exec()) {
             case KIO::R_OVERWRITE:
                 // the destination should be overwritten
@@ -577,15 +536,15 @@ void DolphinView::rename(const KUrl& source, const QString& newName)
         ok = KIO::NetAccess::file_move(source, dest);
     }
 
+    const QString destFileName = dest.fileName();
     if (ok) {
-        m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.",source.fileName(), dest.fileName()),
+        m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.",source.fileName(), destFileName),
                                 DolphinStatusBar::OperationCompleted);
 
-        DolphinCommand command(DolphinCommand::Rename, source, dest);
-        UndoManager::instance().addCommand(command);
+        KonqOperations::rename(this, source, destFileName);
     }
     else {
-        m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.",source.fileName(), dest.fileName()),
+        m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.",source.fileName(), destFileName),
                                 DolphinStatusBar::Error);
         reload();
     }
@@ -596,160 +555,94 @@ void DolphinView::reload()
     startDirLister(m_urlNavigator->url(), true);
 }
 
-void DolphinView::slotUrlListDropped(QDropEvent* /* event */,
-                                     const KUrl::List& urls,
-                                     const KUrl& url)
+void DolphinView::declareViewActive()
 {
-    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();
-        }
-    }
-
-    Dolphin::mainWin().dropUrls(urls, destination);
+    mainWindow()->setActiveView( this );
 }
 
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);
-    Dolphin::mainWin().setActiveView(this);
+    mainWindow()->setActiveView(this);
 }
 
-void DolphinView::slotUrlChanged(const KUrl& url)
+DolphinMainWindow* DolphinView::mainWindow() const
 {
-    const ViewProperties props(url);
-    setMode(props.viewMode());
-
-    const bool showHiddenFiles = props.isShowHiddenFilesEnabled();
-    setShowHiddenFilesEnabled(showHiddenFiles);
-    m_dirLister->setShowingDotFiles(showHiddenFiles);
-
-    setSorting(props.sorting());
-    setSortOrder(props.sortOrder());
-
-    startDirLister(url);
-
-    // The selectionChanged signal is not emitted when a new view object is
-    // created. The application does not care whether a view is represented by a
-    // different instance, hence inform the application that the selection might have
-    // changed so that it can update it's actions.
-    Dolphin::mainWin().slotSelectionChanged();
-
-    emit signalUrlChanged(url);
+    return m_mainWindow;
 }
 
-void DolphinView::triggerIconsViewItem(Q3IconViewItem* item)
+void DolphinView::loadDirectory(const KUrl& url)
 {
-    /* KDE4-TODO:
-    const Qt::ButtonState keyboardState = KApplication::keyboardMouseState();
-    const bool isSelectionActive = ((keyboardState & Qt::ShiftModifier) > 0) ||
-                                   ((keyboardState & Qt::ControlModifier) > 0);*/
-    const bool isSelectionActive = false;
-    if ((item != 0) && !isSelectionActive) {
-        // Updating the Url must be done outside the scope of this slot,
-        // as iconview items will get deleted.
-        QTimer::singleShot(0, this, SLOT(updateUrl()));
-        Dolphin::mainWin().setActiveView(this);
+    const ViewProperties props(url);
+
+    const Mode mode = props.viewMode();
+    if (m_mode != mode) {
+        m_mode = mode;
+        createView();
+        emit modeChanged();
     }
-}
 
-void DolphinView::triggerDetailsViewItem(Q3ListViewItem* item,
-                                         const QPoint& pos,
-                                         int /* column */)
-{
-    if (item == 0) {
-        return;
+    const bool showHiddenFiles = props.showHiddenFiles();
+    if (showHiddenFiles != m_dirLister->showingDotFiles()) {
+        m_dirLister->setShowingDotFiles(showHiddenFiles);
+        emit showHiddenFilesChanged();
     }
 
-    if (m_detailsView->isOnFilename(item, pos)) {
-        // Updating the Url must be done outside the scope of this slot,
-        // as listview items will get deleted.
-        QTimer::singleShot(0, this, SLOT(updateUrl()));
-        Dolphin::mainWin().setActiveView(this);
+    const DolphinView::Sorting sorting = props.sorting();
+    if (sorting != m_proxyModel->sorting()) {
+        m_proxyModel->setSorting(sorting);
+        emit sortingChanged(sorting);
     }
-    else {
-        m_detailsView->clearSelection();
+
+    const Qt::SortOrder sortOrder = props.sortOrder();
+    if (sortOrder != m_proxyModel->sortOrder()) {
+        m_proxyModel->setSortOrder(sortOrder);
+        emit sortOrderChanged(sortOrder);
     }
-}
 
-void DolphinView::triggerDetailsViewItem(Q3ListViewItem* item)
-{
-    const QPoint pos(0, item->itemPos());
-    triggerDetailsViewItem(item, pos, 0);
+    // TODO: handle previews (props.showPreview())
+
+    startDirLister(url);
+    emit urlChanged(url);
+
+    m_statusBar->clear();
 }
 
-void DolphinView::updateUrl()
+void DolphinView::triggerItem(const QModelIndex& index)
 {
-    KFileView* fileView = (m_iconsView != 0) ? static_cast<KFileView*>(m_iconsView) :
-                                               static_cast<KFileView*>(m_detailsView);
-
-    KFileItem* fileItem = fileView->currentFileItem();
-    if (fileItem == 0) {
+    KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index));
+    if (item == 0) {
         return;
     }
 
-    if (fileItem->isDir()) {
+    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
         // to the root partition (and hence wrong) and for the local path the space
         // info is related to the windows partition (-> correct).
-        const QString localPath(fileItem->localPath());
+        const QString localPath(item->localPath());
         if (localPath.isEmpty()) {
-            setUrl(fileItem->url());
+            setUrl(item->url());
         }
         else {
             setUrl(KUrl(localPath));
         }
     }
     else {
-        fileItem->run();
+        item->run();
     }
 }
 
-void DolphinView::slotPercent(int percent)
+void DolphinView::updateProgress(int percent)
 {
     if (m_showProgress) {
         m_statusBar->setProgress(percent);
     }
 }
 
-void DolphinView::slotClear()
-{
-    fileView()->clearView();
-    updateStatusBar();
-}
-
-void DolphinView::slotDeleteItem(KFileItem* item)
-{
-    fileView()->removeItem(item);
-    updateStatusBar();
-}
-
-void DolphinView::slotCompleted()
+void DolphinView::updateItemCount()
 {
-    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_detailsView != 0) {
-        m_detailsView->beginItemUpdates();
-    }
-
     if (m_showProgress) {
         m_statusBar->setProgressText(QString::null);
         m_statusBar->setProgress(100);
@@ -765,7 +658,6 @@ void DolphinView::slotCompleted()
 
     while (it != end) {
         KFileItem* item = *it;
-        view->insertItem(item);
         if (item->isDir()) {
             ++m_folderCount;
         }
@@ -776,135 +668,27 @@ void DolphinView::slotCompleted()
     }
 
     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_detailsView != 0) {
-        m_detailsView->endItemUpdates();
-        m_refreshing = false;
-    }
-}
-
-void DolphinView::slotDelayedUpdate()
-{
-    if (m_iconsView != 0) {
-        m_iconsView->setUpdatesEnabled(true);
-        m_iconsView->endItemUpdates();
-    }
-    m_refreshing = false;
 }
 
-void DolphinView::slotInfoMessage(const QString& msg)
+void DolphinView::showInfoMessage(const QString& msg)
 {
     m_statusBar->setMessage(msg, DolphinStatusBar::Information);
 }
 
-void DolphinView::slotErrorMessage(const QString& msg)
+void DolphinView::showErrorMessage(const QString& msg)
 {
     m_statusBar->setMessage(msg, DolphinStatusBar::Error);
 }
 
-void DolphinView::slotRefreshItems(const KFileItemList& /* list */)
+void DolphinView::emitSelectionChangedSignal()
 {
-    QTimer::singleShot(0, this, SLOT(reload()));
+    emit selectionChanged();
 }
 
-void DolphinView::slotAddItems(const KFileItemList& list)
+void DolphinView::closeFilterBar()
 {
-  fileView()->addItemList(list);
-  fileView()->updateView();
-}
-
-void DolphinView::slotGrabActivation()
-{
-    Dolphin::mainWin().setActiveView(this);
-}
-
-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::createView()
-{
-    assert(m_iconsView == 0);
-    assert(m_detailsView == 0);
-
-    switch (m_mode) {
-    case IconsView:
-    case PreviewsView: {
-        const DolphinIconsView::LayoutMode layoutMode = (m_mode == IconsView) ?
-                                                        DolphinIconsView::Icons :
-                                                        DolphinIconsView::Previews;
-        m_iconsView = new DolphinIconsView(this, layoutMode);
-        m_topLayout->insertWidget(1, m_iconsView);
-        setFocusProxy(m_iconsView);
-
-        connect(m_iconsView, SIGNAL(executed(Q3IconViewItem*)),
-                this, SLOT(triggerIconsViewItem(Q3IconViewItem*)));
-        connect(m_iconsView, SIGNAL(returnPressed(Q3IconViewItem*)),
-                this, SLOT(triggerIconsViewItem(Q3IconViewItem*)));
-        connect(m_iconsView, SIGNAL(signalRequestActivation()),
-                this, SLOT(slotGrabActivation()));
-
-        m_iconsView->endItemUpdates();
-        m_iconsView->show();
-        m_iconsView->setFocus();
-        break;
-    }
-
-    case DetailsView: {
-        m_detailsView = new DolphinDetailsView(this);
-        m_topLayout->insertWidget(1, m_detailsView);
-        setFocusProxy(m_detailsView);
-
-        connect(m_detailsView, SIGNAL(executed(Q3ListViewItem*, const QPoint&, int)),
-                this, SLOT(triggerDetailsViewItem(Q3ListViewItem*, const QPoint&, int)));
-        connect(m_detailsView, SIGNAL(returnPressed(Q3ListViewItem*)),
-                this, SLOT(triggerDetailsViewItem(Q3ListViewItem*)));
-        connect(m_detailsView, SIGNAL(signalRequestActivation()),
-                this, SLOT(slotGrabActivation()));
-        m_detailsView->show();
-        m_detailsView->setFocus();
-        break;
-    }
-
-    default:
-        break;
-    }
-
-    connect(scrollView(), SIGNAL(contentsMoving(int, int)),
-            this, SLOT(slotContentsMoving(int, int)));
-
-    startDirLister(m_urlNavigator->url());
-}
-
-KFileView* DolphinView::fileView() const
-{
-    return (m_mode == DetailsView) ? static_cast<KFileView*>(m_detailsView) :
-                                     static_cast<KFileView*>(m_iconsView);
-}
-
-Q3ScrollView* DolphinView::scrollView() const
-{
-    return (m_mode == DetailsView) ? static_cast<Q3ScrollView*>(m_detailsView) :
-                                     static_cast<Q3ScrollView*>(m_iconsView);
-}
-
-ItemEffectsManager* DolphinView::itemEffectsManager() const
-{
-    return (m_mode == DetailsView) ? static_cast<ItemEffectsManager*>(m_detailsView) :
-                                     static_cast<ItemEffectsManager*>(m_iconsView);
+    m_filterBar->hide();
+    emit showFilterBarChanged(false);
 }
 
 void DolphinView::startDirLister(const KUrl& url, bool reload)
@@ -932,7 +716,6 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
         m_statusBar->setProgress(0);
     }
 
-    m_refreshing = true;
     m_dirLister->stop();
     m_dirLister->openUrl(url, false, reload);
 }
@@ -979,14 +762,18 @@ 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();
-    assert((list != 0) && !list->isEmpty());
+    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?
+        return QString();
+    }
 
     int fileCount = 0;
     int folderCount = 0;
     KIO::filesize_t byteSize = 0;
-    KFileItemList::const_iterator it = list->begin();
-    const KFileItemList::const_iterator end = list->end();
+    KFileItemList::const_iterator it = list.begin();
+    const KFileItemList::const_iterator end = list.end();
     while (it != end){
         KFileItem* item = *it;
         if (item->isDir()) {
@@ -1021,26 +808,7 @@ QString DolphinView::selectionStatusBarText() const
     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) {
@@ -1051,7 +819,30 @@ void DolphinView::slotShowFilterBar(bool show)
     }
 }
 
-void DolphinView::slotChangeNameFilter(const QString& nameFilter)
+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::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
@@ -1062,26 +853,102 @@ void DolphinView::slotChangeNameFilter(const QString& nameFilter)
     adjustedFilter.insert(0, '*');
     adjustedFilter.append('*');
 
+    // Use the ProxyModel to filter:
+    // This code is #ifdefed as setNameFilter behaves
+    // slightly different than the QSortFilterProxyModel
+    // as it will not remove directories. I will ask
+    // our beloved usability experts for input
+    // -- z.
+#if 0
     m_dirLister->setNameFilter(adjustedFilter);
     m_dirLister->emitChanges();
+#else
+    m_proxyModel->setFilterRegExp( nameFilter );
+#endif
+}
 
-    // TODO: this is a workaround for QIconView: the item position
-    // stay as they are by filtering, only an inserting of an item
-    // results to an automatic adjusting of the item position. In Qt4/KDE4
-    // this workaround should get obsolete due to Interview.
-    KFileView* view = fileView();
-    if (view == m_iconsView) {
-        KFileItem* first = view->firstFileItem();
-        if (first != 0) {
-            view->removeItem(first);
-            view->insertItem(first);
-        }
+void DolphinView::createView()
+{
+    // delete current view
+    QAbstractItemView* view = itemView();
+    if (view != 0) {
+        m_topLayout->removeWidget(view);
+        view->close();
+        view->deleteLater();
+        m_iconsView = 0;
+        m_detailsView = 0;
+    }
+
+    assert(m_iconsView == 0);
+    assert(m_detailsView == 0);
+
+    // ... 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);
+            view = m_iconsView;
+            // TODO: read out view settings
+            break;
+
+        case DetailsView:
+            m_detailsView = new DolphinDetailsView(this);
+            view = m_detailsView;
+            // TODO: read out view settings
+            break;
+    }
+
+    view->setModel(m_proxyModel);
+
+    view->setSelectionMode(QAbstractItemView::ExtendedSelection);
+
+    KFileItemDelegate* delegate = new KFileItemDelegate(this);
+    delegate->setAdditionalInformation(KFileItemDelegate::FriendlyMimeType);
+    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);
+}
+
+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;
 }
 
-bool DolphinView::isFilterBarVisible()
+void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
 {
-  return m_filterBar->isVisible();
+    QItemSelectionModel* selectionModel = itemView()->selectionModel();
+    const QAbstractItemModel* itemModel = selectionModel->model();
+
+    const QModelIndex topLeft = itemModel->index(0, 0);
+    const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
+                                                     itemModel->columnCount() - 1);
+
+    QItemSelection selection(topLeft, bottomRight);
+    selectionModel->select(selection, flags);
+}
+
+QAbstractItemView* DolphinView::itemView() const
+{
+    assert((m_iconsView == 0) || (m_detailsView == 0));
+    if (m_detailsView != 0) {
+        return m_detailsView;
+    }
+    return m_iconsView;
 }
 
 #include "dolphinview.moc"