Add libkmetadata detection and minor fixes

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 1a02ddea08349b131a2f120045006c7dd6e03b38..5ec8c901eecb9b86432aee5c7c7ba1725d7c5b29 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -20,42 +20,42 @@
 
 #include "dolphinview.h"
 
 
 #include "dolphinview.h"
 

-#include <QItemSelectionModel>
-#include <Q3ValueList>
+#include <assert.h>
+
+#include <QApplication>

 #include <QDropEvent>
 #include <QDropEvent>

+#include <QItemSelectionModel>

 #include <QMouseEvent>
 #include <QVBoxLayout>
 
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>
 #include <QMouseEvent>
 #include <QVBoxLayout>
 
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>

-#include <kurl.h>

 #include <klocale.h>
 #include <kio/netaccess.h>
 #include <klocale.h>
 #include <kio/netaccess.h>

-#include <kio/renamedlg.h>
+#include <kio/renamedialog.h>

 #include <kmimetyperesolver.h>
 #include <kmimetyperesolver.h>

-#include <assert.h>
+#include <konq_operations.h>
+#include <kurl.h>

 
 

-#include "urlnavigator.h"
+#include "dolphincontroller.h"

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

-#include "viewproperties.h"

 #include "dolphindetailsview.h"
 #include "dolphiniconsview.h"
 #include "dolphincontextmenu.h"
 #include "dolphindetailsview.h"
 #include "dolphiniconsview.h"
 #include "dolphincontextmenu.h"

-#include "undomanager.h"
-#include "renamedialog.h"
-#include "progressindicator.h"

 #include "filterbar.h"
 #include "filterbar.h"

+#include "renamedialog.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,7 +64,9 @@ 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_iconsView(0),

+    m_detailsView(0),

     m_filterBar(0),
     m_statusBar(0),
     m_dirModel(0),
     m_filterBar(0),
     m_statusBar(0),
     m_dirModel(0),


@@ -77,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);
 


@@ -87,56 +98,61 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow,
     m_dirLister->setAutoUpdate(true);
     m_dirLister->setMainWindow(this);
     m_dirLister->setShowingDotFiles(showHiddenFiles);
     m_dirLister->setAutoUpdate(true);
     m_dirLister->setMainWindow(this);
     m_dirLister->setShowingDotFiles(showHiddenFiles);

+    m_dirLister->setDelayedMimeTypes(true);
+

     connect(m_dirLister, SIGNAL(clear()),
     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&)));
-
-    m_iconsView = new DolphinIconsView(this);
-    applyModeToView();
+            this, SLOT(showErrorMessage(const QString&)));

 
     m_dirModel = new KDirModel();
     m_dirModel->setDirLister(m_dirLister);
 
     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_proxyModel = new DolphinSortFilterProxyModel(this);
     m_proxyModel->setSourceModel(m_dirModel);
 

-    m_iconsView->setModel(m_dirModel);   // TODO: using m_proxyModel crashed when clicking on an item
-
-    KFileItemDelegate* delegate = new KFileItemDelegate(this);
-    m_iconsView->setItemDelegate(delegate);
+    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()));

 
 

-    m_dirLister->setDelayedMimeTypes(true);
-    new KMimeTypeResolver(m_iconsView, m_dirModel);
+    createView();

 
     m_iconSize = K3Icon::SizeMedium;
 
     m_filterBar = new FilterBar(this);
     m_filterBar->hide();
     connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
 
     m_iconSize = K3Icon::SizeMedium;
 
     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);

-    m_topLayout->addWidget(m_iconsView);
+    m_topLayout->addWidget(itemView());

     m_topLayout->addWidget(m_filterBar);
     m_topLayout->addWidget(m_statusBar);
 
     m_topLayout->addWidget(m_filterBar);
     m_topLayout->addWidget(m_statusBar);
 

-    connect(m_iconsView, SIGNAL(clicked(const QModelIndex&)),
-            this, SLOT(triggerItem(const QModelIndex&)));
-    connect(m_iconsView->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
-            this, SLOT(emitSelectionChangedSignal()));
-
-    startDirLister(m_urlNavigator->url());
+    loadDirectory(m_urlNavigator->url());

 }
 
 DolphinView::~DolphinView()
 }
 
 DolphinView::~DolphinView()


@@ -148,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


@@ -155,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;


@@ -176,7 +188,7 @@ void DolphinView::setMode(Mode mode)
     ViewProperties props(m_urlNavigator->url());
     props.setViewMode(m_mode);
 
     ViewProperties props(m_urlNavigator->url());
     props.setViewMode(m_mode);
 

-    applyModeToView();
+    createView();

     startDirLister(m_urlNavigator->url());
 
     emit modeChanged();
     startDirLister(m_urlNavigator->url());
 
     emit modeChanged();


@@ -187,6 +199,22 @@ DolphinView::Mode DolphinView::mode() const
     return m_mode;
 }
 
     return m_mode;
 }
 

+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) {
 void DolphinView::setShowHiddenFiles(bool show)
 {
     if (m_dirLister->showingDotFiles() == show) {


@@ -209,14 +237,6 @@ bool DolphinView::showHiddenFiles() const
     return m_dirLister->showingDotFiles();
 }
 
     return m_dirLister->showingDotFiles();
 }
 

-void DolphinView::setViewProperties(const ViewProperties& props)
-{
-    setMode(props.viewMode());
-    setSorting(props.sorting());
-    setSortOrder(props.sortOrder());
-    setShowHiddenFiles(props.showHiddenFiles());
-}
-

 void DolphinView::renameSelectedItems()
 {
     const KUrl::List urls = selectedUrls();
 void DolphinView::renameSelectedItems()
 {
     const KUrl::List urls = selectedUrls();


@@ -235,25 +255,25 @@ void DolphinView::renameSelectedItems()
                                           DolphinStatusBar::Error);
         }
         else {
                                           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();
 
             assert(newName.contains('#'));
 
             const int urlsCount = urls.count();

-            ProgressIndicator* progressIndicator =
-                new  ProgressIndicator(mainWindow(),
-                                       i18n("Renaming items..."),
-                                       i18n("Renaming finished."),
-                                       urlsCount);

 
             // iterate through all selected items and rename them...
             const int replaceIndex = newName.indexOf('#');
             assert(replaceIndex >= 0);
             for (int i = 0; i < urlsCount; ++i) {
                 const KUrl& source = urls[i];
 
             // iterate through all selected items and rename them...
             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);
                 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());


@@ -261,8 +281,6 @@ void DolphinView::renameSelectedItems()
 
                     const bool destExists = KIO::NetAccess::exists(dest, false, view);
                     if (destExists) {
 
                     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;
                         view->statusBar()->setMessage(i18n("Renaming failed (item '%1' already exists).",name),
                                                       DolphinStatusBar::Error);
                         break;


@@ -270,17 +288,13 @@ 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.
                     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 {
         }
     }
     else {


@@ -329,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()


@@ -342,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);


@@ -403,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);

     }
 }
 
     }
 }
 


@@ -420,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);

     }
 }
 
     }
 }
 


@@ -459,33 +440,38 @@ 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);
 }
 
 bool DolphinView::hasSelection() const
 {
 {
     return m_urlNavigator->history(index);
 }
 
 bool DolphinView::hasSelection() const
 {

-    return m_iconsView->selectionModel()->hasSelection();
+    return itemView()->selectionModel()->hasSelection();

 }
 
 KFileItemList DolphinView::selectedItems() const
 {
 }
 
 KFileItemList DolphinView::selectedItems() const
 {

-    QItemSelectionModel* selModel = m_iconsView->selectionModel();
-    assert(selModel != 0);
+    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;
     KFileItemList itemList;

-    if (selModel->hasSelection()) {
-       const QModelIndexList indexList = selModel->selectedIndexes();
-
-        QModelIndexList::const_iterator end = indexList.end();
-        for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) {
-           KFileItem* item = m_dirModel->itemForIndex(*it);
-           if (item != 0) {
-               itemList.append(item);
-           }
+
+    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;
 }
 
     return itemList;
 }
 


@@ -505,15 +491,10 @@ KUrl::List DolphinView::selectedUrls() const
     return urls;
 }
 
     return urls;
 }
 

-const KFileItem* DolphinView::currentFileItem() const
+KFileItem* DolphinView::fileItem(const QModelIndex index) const

 {
 {

-    return 0; // fileView()->currentFileItem();
-}
-
-void DolphinView::openContextMenu(KFileItem* fileInfo, const QPoint& pos)
-{
-    DolphinContextMenu contextMenu(this, fileInfo, pos);
-    contextMenu.open();
+    const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
+    return m_dirModel->itemForIndex(dirModelIndex);

 }
 
 void DolphinView::rename(const KUrl& source, const QString& newName)
 }
 
 void DolphinView::rename(const KUrl& source, const QString& newName)


@@ -533,11 +514,11 @@ void DolphinView::rename(const KUrl& source, const QString& newName)
     if (destExists) {
         // the destination already exists, hence ask the user
         // how to proceed...
     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
         switch (renameDialog.exec()) {
             case KIO::R_OVERWRITE:
                 // the destination should be overwritten


@@ -563,15 +544,15 @@ void DolphinView::rename(const KUrl& source, const QString& newName)
         ok = KIO::NetAccess::file_move(source, dest);
     }
 
         ok = KIO::NetAccess::file_move(source, dest);
     }
 

+    const QString destFileName = dest.fileName();

     if (ok) {
     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);
 
                                 DolphinStatusBar::OperationCompleted);
 

-        DolphinCommand command(DolphinCommand::Rename, source, dest);
-        UndoManager::instance().addCommand(command);
+        KonqOperations::rename(this, source, destFileName);

     }
     else {
     }
     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();
     }
                                 DolphinStatusBar::Error);
         reload();
     }


@@ -582,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);


@@ -617,51 +577,60 @@ DolphinMainWindow* DolphinView::mainWindow() const
 void DolphinView::loadDirectory(const KUrl& url)
 {
     const ViewProperties props(url);
 void DolphinView::loadDirectory(const KUrl& url)
 {
     const ViewProperties props(url);

-    setMode(props.viewMode());
+
+    const Mode mode = props.viewMode();
+    if (m_mode != mode) {
+        m_mode = mode;
+        createView();
+        emit modeChanged();
+    }

 
     const bool showHiddenFiles = props.showHiddenFiles();
 
     const bool showHiddenFiles = props.showHiddenFiles();

-    setShowHiddenFiles(showHiddenFiles);
-    m_dirLister->setShowingDotFiles(showHiddenFiles);
+    if (showHiddenFiles != m_dirLister->showingDotFiles()) {
+        m_dirLister->setShowingDotFiles(showHiddenFiles);
+        emit showHiddenFilesChanged();
+    }

 
 

-    setSorting(props.sorting());
-    setSortOrder(props.sortOrder());
+    const DolphinView::Sorting sorting = props.sorting();
+    if (sorting != m_proxyModel->sorting()) {
+        m_proxyModel->setSorting(sorting);
+        emit sortingChanged(sorting);
+    }
+
+    const Qt::SortOrder sortOrder = props.sortOrder();
+    if (sortOrder != m_proxyModel->sortOrder()) {
+        m_proxyModel->setSortOrder(sortOrder);
+        emit sortOrderChanged(sortOrder);
+    }
+
+    // TODO: handle previews (props.showPreview())

 
     startDirLister(url);
     emit urlChanged(url);
 
     startDirLister(url);
     emit urlChanged(url);

-}

 
 

-void DolphinView::triggerIconsViewItem(Q3IconViewItem* item)
-{
-    /* 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()));
-        mainWindow()->setActiveView(this);
-    }
+    m_statusBar->clear();

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

-    KFileItem* item = m_dirModel->itemForIndex(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()) {
     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());


@@ -675,72 +644,17 @@ void DolphinView::triggerItem(const QModelIndex& index)
     }
 }
 
     }
 }
 

-void DolphinView::updateUrl()
-{
-    //KFileView* fileView = (m_iconsView != 0) ? static_cast<KFileView*>(m_iconsView) :
-    //                                           static_cast<KFileView*>(m_iconsView);
-
-    KFileItem* fileItem = 0; // TODO: fileView->currentFileItem();
-    if (fileItem == 0) {
-        return;
-    }
-
-    if (fileItem->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());
-        if (localPath.isEmpty()) {
-            setUrl(fileItem->url());
-        }
-        else {
-            setUrl(KUrl(localPath));
-        }
-    }
-    else {
-        fileItem->run();
-    }
-}
-
-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()
-{
-    //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_iconsView != 0) {
-        m_iconsView->beginItemUpdates();
-    }*/
-

     if (m_showProgress) {
     if (m_showProgress) {

-        m_statusBar->setProgressText(QString::null);
+        m_statusBar->setProgressText(QString());

         m_statusBar->setProgress(100);
         m_showProgress = false;
     }
         m_statusBar->setProgress(100);
         m_showProgress = false;
     }


@@ -754,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;
         }


@@ -766,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()


@@ -805,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()) {


@@ -840,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();
     }
 


@@ -911,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) {


@@ -963,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


@@ -979,44 +847,138 @@ void DolphinView::slotChangeNameFilter(const QString& nameFilter)
     adjustedFilter.insert(0, '*');
     adjustedFilter.append('*');
 
     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();
     m_dirLister->setNameFilter(adjustedFilter);
     m_dirLister->emitChanges();

+#else
+    m_proxyModel->setFilterRegExp( nameFilter );
+#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::applyModeToView()
+void DolphinView::dropUrls(const KUrl::List& urls,
+                           const KUrl& destination)

 {
 {

-    //m_iconsView->setAlternatingRowColors(true);
-    m_iconsView->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    m_mainWindow->dropUrls(urls, destination);
+}

 
 

-    // TODO: the following code just tries to test some QListView capabilities
+
+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) {
+        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:
     switch (m_mode) {
         case IconsView:

-            m_iconsView->setViewMode(QListView::IconMode);
-            m_iconsView->setGridSize(QSize(128, 64));
+            m_iconsView = new DolphinIconsView(this, m_controller);
+            view = m_iconsView;

             break;
 
         case DetailsView:
             break;
 
         case DetailsView:

-            m_iconsView->setViewMode(QListView::ListMode);
-            m_iconsView->setGridSize(QSize(256, 24));
+            m_detailsView = new DolphinDetailsView(this, m_controller);
+            view = m_detailsView;

             break;
     }
             break;
     }

-}

 
 

-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;
+    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);
+    m_topLayout->insertWidget(1, view);
+
+    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)
 {

-    QItemSelectionModel* selectionModel = m_iconsView->selectionModel();
+    QItemSelectionModel* selectionModel = itemView()->selectionModel();

     const QAbstractItemModel* itemModel = selectionModel->model();
 
     const QModelIndex topLeft = itemModel->index(0, 0);
     const QAbstractItemModel* itemModel = selectionModel->model();
 
     const QModelIndex topLeft = itemModel->index(0, 0);


@@ -1027,4 +989,13 @@ void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
     selectionModel->select(selection, flags);
 }
 
     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"
 #include "dolphinview.moc"