fixed issue that the video preview size was wrong during resizing the information...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 004b158ed643b2c3cfc56a513c5bb451f80cf3be..f2f23d27301da839a03cb323993ccf2cfaba164d 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -19,8 +19,6 @@
  ***************************************************************************/
 
 #include "dolphinview.h"
  ***************************************************************************/
 
 #include "dolphinview.h"

-#include <ktoggleaction.h>
-#include <kactioncollection.h>

 
 #include <QApplication>
 #include <QClipboard>
 
 #include <QApplication>
 #include <QClipboard>


@@ -30,29 +28,53 @@
 #include <QTimer>
 #include <QScrollBar>
 
 #include <QTimer>
 #include <QScrollBar>
 

+#include <kactioncollection.h>

 #include <kcolorscheme.h>
 #include <kdirlister.h>
 #include <kcolorscheme.h>
 #include <kdirlister.h>

-#include <kfileitemdelegate.h>
-#include <klocale.h>
+#include <kfilepreviewgenerator.h>

 #include <kiconeffect.h>
 #include <kiconeffect.h>

+#include <kfileitem.h>
+#include <klocale.h>
+#include <kio/deletejob.h>

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

-#include <kio/renamedialog.h>

 #include <kio/previewjob.h>
 #include <kio/previewjob.h>

+#include <kjob.h>
+#include <kmenu.h>
+#include <kmessagebox.h>

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

-#include <konqmimedata.h>
+#include <konq_fileitemcapabilities.h>

 #include <konq_operations.h>
 #include <konq_operations.h>

+#include <konqmimedata.h>
+#include <kstringhandler.h>
+#include <ktoggleaction.h>

 #include <kurl.h>
 
 #include "dolphinmodel.h"
 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"
 #include <kurl.h>
 
 #include "dolphinmodel.h"
 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"

-#include "dolphinsortfilterproxymodel.h"

 #include "dolphindetailsview.h"
 #include "dolphindetailsview.h"

+#include "dolphinfileitemdelegate.h"
+#include "dolphinnewmenuobserver.h"
+#include "dolphinsortfilterproxymodel.h"
+#include "dolphin_detailsmodesettings.h"

 #include "dolphiniconsview.h"
 #include "dolphiniconsview.h"

+#include "dolphin_generalsettings.h"
+#include "draganddrophelper.h"
+#include "folderexpander.h"

 #include "renamedialog.h"
 #include "renamedialog.h"

+#include "tooltips/tooltipmanager.h"
+#include "settings/dolphinsettings.h"

 #include "viewproperties.h"
 #include "viewproperties.h"

-#include "dolphinsettings.h"
-#include "dolphin_generalsettings.h"
+#include "zoomlevelinfo.h"
+
+/**
+ * Helper function for sorting items with qSort() in
+ * DolphinView::renameSelectedItems().
+ */
+bool lessThan(const KFileItem& item1, const KFileItem& item2)
+{
+    return KStringHandler::naturalCompare(item1.name(), item2.name()) < 0;
+}

 
 DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,
 
 DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,


@@ -64,6 +86,10 @@ DolphinView::DolphinView(QWidget* parent,
     m_showPreview(false),
     m_loadingDirectory(false),
     m_storedCategorizedSorting(false),
     m_showPreview(false),
     m_loadingDirectory(false),
     m_storedCategorizedSorting(false),

+    m_tabsForFiles(false),
+    m_isContextMenuOpen(false),
+    m_ignoreViewProperties(false),
+    m_assureVisibleCurrentIndex(false),

     m_mode(DolphinView::IconsView),
     m_topLayout(0),
     m_controller(0),
     m_mode(DolphinView::IconsView),
     m_topLayout(0),
     m_controller(0),


@@ -71,48 +97,46 @@ DolphinView::DolphinView(QWidget* parent,
     m_detailsView(0),
     m_columnView(0),
     m_fileItemDelegate(0),
     m_detailsView(0),
     m_columnView(0),
     m_fileItemDelegate(0),

+    m_selectionModel(0),

     m_dolphinModel(dolphinModel),
     m_dirLister(dirLister),
     m_dolphinModel(dolphinModel),
     m_dirLister(dirLister),

-    m_proxyModel(proxyModel)
+    m_proxyModel(proxyModel),
+    m_previewGenerator(0),
+    m_toolTipManager(0),
+    m_rootUrl(),
+    m_currentItemUrl(),
+    m_createdItemUrl(),
+    m_selectedItems(),
+    m_expandedDragSource(0)

 {
 {

-    setFocusPolicy(Qt::StrongFocus);

     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 

-    QClipboard* clipboard = QApplication::clipboard();
-    connect(clipboard, SIGNAL(dataChanged()),
-            this, SLOT(updateCutItems()));
-
-    connect(m_dirLister, SIGNAL(completed()),
-            this, SLOT(updateCutItems()));
-    connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
-            this, SLOT(generatePreviews(const KFileItemList&)));
-

     m_controller = new DolphinController(this);
     m_controller->setUrl(url);
 
     m_controller = new DolphinController(this);
     m_controller->setUrl(url);
 

-    // Receiver of the DolphinView signal 'urlChanged()' don't need
-    // to care whether the internal controller changed the URL already or whether
-    // the controller just requested an URL change and will be updated later.
-    // In both cases the URL has been changed:

     connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
             this, SIGNAL(urlChanged(const KUrl&)));
     connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)),
     connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
             this, SIGNAL(urlChanged(const KUrl&)));
     connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)),

-            this, SIGNAL(urlChanged(const KUrl&)));
+            this, SLOT(slotRequestUrlChange(const KUrl&)));

 
 

-    connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
-            this, SLOT(openContextMenu(const QPoint&)));
-    connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&, const KFileItem&)),
-            this, SLOT(dropUrls(const KUrl::List&, const KUrl&, const KFileItem&)));
+    connect(m_controller, SIGNAL(requestContextMenu(const QPoint&, const QList<QAction*>&)),
+            this, SLOT(openContextMenu(const QPoint&, const QList<QAction*>&)));
+    connect(m_controller, SIGNAL(urlsDropped(const KFileItem&, const KUrl&, QDropEvent*)),
+            this, SLOT(dropUrls(const KFileItem&, const KUrl&, QDropEvent*)));

     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(sortingChanged(DolphinView::Sorting)),
             this, SLOT(updateSorting(DolphinView::Sorting)));
     connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(updateSortOrder(Qt::SortOrder)));

+    connect(m_controller, SIGNAL(sortFoldersFirstChanged(bool)),
+            this, SLOT(updateSortFoldersFirst(bool)));

     connect(m_controller, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
             this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&)));
     connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)),
             this, SLOT(triggerItem(const KFileItem&)));
     connect(m_controller, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
             this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&)));
     connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)),
             this, SLOT(triggerItem(const KFileItem&)));

+    connect(m_controller, SIGNAL(tabRequested(const KUrl&)),
+            this, SIGNAL(tabRequested(const KUrl&)));

     connect(m_controller, SIGNAL(activated()),
             this, SLOT(activate()));
     connect(m_controller, SIGNAL(itemEntered(const KFileItem&)),
     connect(m_controller, SIGNAL(activated()),
             this, SLOT(activate()));
     connect(m_controller, SIGNAL(itemEntered(const KFileItem&)),


@@ -120,12 +144,27 @@ DolphinView::DolphinView(QWidget* parent,
     connect(m_controller, SIGNAL(viewportEntered()),
             this, SLOT(clearHoverInformation()));
 
     connect(m_controller, SIGNAL(viewportEntered()),
             this, SLOT(clearHoverInformation()));
 

+    connect(m_dirLister, SIGNAL(redirection(KUrl, KUrl)),
+            this, SIGNAL(redirection(KUrl, KUrl)));
+    connect(m_dirLister, SIGNAL(completed()),
+            this, SLOT(restoreCurrentItem()));
+    connect(m_dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),
+            this, SLOT(slotRefreshItems()));
+
+    // When a new item has been created by the "Create New..." menu, the item should
+    // get selected and it must be assured that the item will get visible. As the
+    // creation is done asynchronously, several signals must be checked:
+    connect(&DolphinNewMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
+            this, SLOT(observeCreatedItem(const KUrl&)));
+

     applyViewProperties(url);
     m_topLayout->addWidget(itemView());
 }
 
 DolphinView::~DolphinView()
 {
     applyViewProperties(url);
     m_topLayout->addWidget(itemView());
 }
 
 DolphinView::~DolphinView()
 {

+    delete m_expandedDragSource;
+    m_expandedDragSource = 0;

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


@@ -165,6 +204,7 @@ void DolphinView::setActive(bool active)
     update();
 
     if (active) {
     update();
 
     if (active) {

+        itemView()->setFocus();

         emit activated();
     }
 
         emit activated();
     }
 


@@ -182,29 +222,21 @@ void DolphinView::setMode(Mode mode)
         return; // the wished mode is already set
     }
 
         return; // the wished mode is already set
     }
 

+    const int oldZoomLevel = m_controller->zoomLevel();

     m_mode = mode;
 
     m_mode = mode;
 

-    if (isColumnViewActive()) {
-        // When changing the mode in the column view, it makes sense
-        // to go back to the root URL of the column view automatically.
-        // Otherwise there it would not be possible to turn off the column view
-        // without focusing the first column.
-        const KUrl root = rootUrl();
-        setUrl(root);
-        m_controller->setUrl(root);
-    }
+    deleteView();

 
     const KUrl viewPropsUrl = viewPropertiesUrl();
     ViewProperties props(viewPropsUrl);
     props.setViewMode(m_mode);
 
     const KUrl viewPropsUrl = viewPropertiesUrl();
     ViewProperties props(viewPropsUrl);
     props.setViewMode(m_mode);

-

     createView();
 
     // the file item delegate has been recreated, apply the current
     // additional information manually
     const KFileItemDelegate::InformationList infoList = props.additionalInfo();
     m_fileItemDelegate->setShowInformation(infoList);
     createView();
 
     // the file item delegate has been recreated, apply the current
     // additional information manually
     const KFileItemDelegate::InformationList infoList = props.additionalInfo();
     m_fileItemDelegate->setShowInformation(infoList);

-    emit additionalInfoChanged(infoList);
+    emit additionalInfoChanged();

 
     // Not all view modes support categorized sorting. Adjust the sorting model
     // if changing the view mode results in a change of the categorized sorting
 
     // Not all view modes support categorized sorting. Adjust the sorting model
     // if changing the view mode results in a change of the categorized sorting


@@ -216,9 +248,12 @@ void DolphinView::setMode(Mode mode)
         emit categorizedSortingChanged();
     }
 
         emit categorizedSortingChanged();
     }
 

-    loadDirectory(viewPropsUrl);
-

     emit modeChanged();
     emit modeChanged();

+
+    updateZoomLevel(oldZoomLevel);
+    if (m_showPreview) {
+        loadDirectory(viewPropsUrl);
+    }

 }
 
 DolphinView::Mode DolphinView::mode() const
 }
 
 DolphinView::Mode DolphinView::mode() const


@@ -226,69 +261,16 @@ DolphinView::Mode DolphinView::mode() const
     return m_mode;
 }
 
     return m_mode;
 }
 

-void DolphinView::setShowPreview(bool show)
-{
-    if (m_showPreview == show) {
-        return;
-    }
-
-    const KUrl viewPropsUrl = viewPropertiesUrl();
-    ViewProperties props(viewPropsUrl);
-    props.setShowPreview(show);
-
-    m_showPreview = show;
-
-    emit showPreviewChanged();
-
-    loadDirectory(viewPropsUrl, true);
-}
-

 bool DolphinView::showPreview() const
 {
     return m_showPreview;
 }
 
 bool DolphinView::showPreview() const
 {
     return m_showPreview;
 }
 

-void DolphinView::setShowHiddenFiles(bool show)
-{
-    if (m_dirLister->showingDotFiles() == show) {
-        return;
-    }
-
-    const KUrl viewPropsUrl = viewPropertiesUrl();
-    ViewProperties props(viewPropsUrl);
-    props.setShowHiddenFiles(show);
-
-    m_dirLister->setShowingDotFiles(show);
-    emit showHiddenFilesChanged();
-
-    loadDirectory(viewPropsUrl, true);
-}
-

 bool DolphinView::showHiddenFiles() const
 {
     return m_dirLister->showingDotFiles();
 }
 
 bool DolphinView::showHiddenFiles() const
 {
     return m_dirLister->showingDotFiles();
 }
 

-void DolphinView::setCategorizedSorting(bool categorized)
-{
-    if (categorized == categorizedSorting()) {
-        return;
-    }
-
-    // setCategorizedSorting(true) may only get invoked
-    // if the view supports categorized sorting
-    Q_ASSERT(!categorized || supportsCategorizedSorting());
-
-    ViewProperties props(viewPropertiesUrl());
-    props.setCategorizedSorting(categorized);
-    props.save();
-
-    m_storedCategorizedSorting = categorized;
-    m_proxyModel->setCategorizedModel(categorized);
-
-    emit categorizedSortingChanged();
-}
-

 bool DolphinView::categorizedSorting() const
 {
     // If all view modes would support categorized sorting, returning
 bool DolphinView::categorizedSorting() const
 {
     // If all view modes would support categorized sorting, returning


@@ -308,7 +290,13 @@ bool DolphinView::supportsCategorizedSorting() const
 
 void DolphinView::selectAll()
 {
 
 void DolphinView::selectAll()
 {

-    itemView()->selectAll();
+    QAbstractItemView* view = itemView();
+    // TODO: there seems to be a bug in QAbstractItemView::selectAll(); if
+    // the Ctrl-key is pressed (e. g. for Ctrl+A), selectAll() inverts the
+    // selection instead of selecting all items. This is bypassed for KDE 4.0
+    // by invoking clearSelection() first.
+    view->clearSelection();
+    view->selectAll();

 }
 
 void DolphinView::invertSelection()
 }
 
 void DolphinView::invertSelection()


@@ -340,11 +328,18 @@ bool DolphinView::hasSelection() const
 
 void DolphinView::clearSelection()
 {
 
 void DolphinView::clearSelection()
 {

-    itemView()->selectionModel()->clear();
+    QItemSelectionModel* selModel = itemView()->selectionModel();
+    const QModelIndex currentIndex = selModel->currentIndex();
+    selModel->setCurrentIndex(currentIndex, QItemSelectionModel::Current |
+                                            QItemSelectionModel::Clear);

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

+    if (isColumnViewActive()) {
+        return m_columnView->selectedItems();
+    }
+

     const QAbstractItemView* view = itemView();
 
     // Our view has a selection, we will map them back to the DolphinModel
     const QAbstractItemView* view = itemView();
 
     // Our view has a selection, we will map them back to the DolphinModel


@@ -355,7 +350,7 @@ KFileItemList DolphinView::selectedItems() const
     KFileItemList itemList;
 
     const QModelIndexList indexList = selection.indexes();
     KFileItemList itemList;
 
     const QModelIndexList indexList = selection.indexes();

-    foreach (QModelIndex index, indexList) {
+    foreach (const QModelIndex &index, indexList) {

         KFileItem item = m_dolphinModel->itemForIndex(index);
         if (!item.isNull()) {
             itemList.append(item);
         KFileItem item = m_dolphinModel->itemForIndex(index);
         if (!item.isNull()) {
             itemList.append(item);


@@ -369,16 +364,21 @@ KUrl::List DolphinView::selectedUrls() const
 {
     KUrl::List urls;
     const KFileItemList list = selectedItems();
 {
     KUrl::List urls;
     const KFileItemList list = selectedItems();

-    foreach (KFileItem item, list) {
+    foreach (const KFileItem &item, list) {

         urls.append(item.url());
     }
     return urls;
 }
 
         urls.append(item.url());
     }
     return urls;
 }
 

-KFileItem DolphinView::fileItem(const QModelIndex& index) const
+int DolphinView::selectedItemsCount() const

 {
 {

-    const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
-    return m_dolphinModel->itemForIndex(dolphinModelIndex);
+    if (isColumnViewActive()) {
+        // TODO: get rid of this special case by adjusting the dir lister
+        // to the current column
+        return m_columnView->selectedItems().count();
+    }
+
+    return itemView()->selectionModel()->selection().count();

 }
 
 void DolphinView::setContentsPosition(int x, int y)
 }
 
 void DolphinView::setContentsPosition(int x, int y)


@@ -401,24 +401,24 @@ QPoint DolphinView::contentsPosition() const
     return QPoint(x, y);
 }
 
     return QPoint(x, y);
 }
 

-void DolphinView::zoomIn()
-{
-    m_controller->triggerZoomIn();
-}
-
-void DolphinView::zoomOut()
+void DolphinView::setZoomLevel(int level)

 {
 {

-    m_controller->triggerZoomOut();
-}
+    if (level < ZoomLevelInfo::minimumLevel()) {
+        level = ZoomLevelInfo::minimumLevel();
+    } else if (level > ZoomLevelInfo::maximumLevel()) {
+        level = ZoomLevelInfo::maximumLevel();
+    }

 
 

-bool DolphinView::isZoomInPossible() const
-{
-    return m_controller->isZoomInPossible();
+    if (level != zoomLevel()) {
+        m_controller->setZoomLevel(level);
+        m_previewGenerator->updateIcons();
+        emit zoomLevelChanged(level);
+    }

 }
 
 }
 

-bool DolphinView::isZoomOutPossible() const
+int DolphinView::zoomLevel() const

 {
 {

-    return m_controller->isZoomOutPossible();
+    return m_controller->zoomLevel();

 }
 
 void DolphinView::setSorting(Sorting sorting)
 }
 
 void DolphinView::setSorting(Sorting sorting)


@@ -445,6 +445,18 @@ Qt::SortOrder DolphinView::sortOrder() const
     return m_proxyModel->sortOrder();
 }
 
     return m_proxyModel->sortOrder();
 }
 

+void DolphinView::setSortFoldersFirst(bool foldersFirst)
+{
+    if (sortFoldersFirst() != foldersFirst) {
+        updateSortFoldersFirst(foldersFirst);
+    }
+}
+
+bool DolphinView::sortFoldersFirst() const
+{
+    return m_proxyModel->sortFoldersFirst();
+}
+

 void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info)
 {
     const KUrl viewPropsUrl = viewPropertiesUrl();
 void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info)
 {
     const KUrl viewPropsUrl = viewPropertiesUrl();


@@ -452,12 +464,12 @@ void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info)
     props.setAdditionalInfo(info);
     m_fileItemDelegate->setShowInformation(info);
 
     props.setAdditionalInfo(info);
     m_fileItemDelegate->setShowInformation(info);
 

-    emit additionalInfoChanged(info);
+    emit additionalInfoChanged();

 
     if (itemView() != m_detailsView) {
         // the details view requires no reloading of the directory, as it maps
         // the file item delegate info to its columns internally
 
     if (itemView() != m_detailsView) {
         // the details view requires no reloading of the directory, as it maps
         // the file item delegate info to its columns internally

-        loadDirectory(viewPropsUrl, true);
+        loadDirectory(viewPropsUrl);

     }
 }
 
     }
 }
 


@@ -474,7 +486,10 @@ void DolphinView::reload()
 
 void DolphinView::refresh()
 {
 
 void DolphinView::refresh()
 {

+    m_ignoreViewProperties = false;
+

     const bool oldActivationState = m_active;
     const bool oldActivationState = m_active;

+    const int oldZoomLevel = m_controller->zoomLevel();

     m_active = true;
 
     createView();
     m_active = true;
 
     createView();


@@ -482,6 +497,7 @@ void DolphinView::refresh()
     reload();
 
     setActive(oldActivationState);
     reload();
 
     setActive(oldActivationState);

+    updateZoomLevel(oldZoomLevel);

 }
 
 void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)
 }
 
 void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)


@@ -490,6 +506,7 @@ void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)
         return;
     }
 
         return;
     }
 

+    m_previewGenerator->cancelPreviews();

     m_controller->setUrl(url); // emits urlChanged, which we forward
 
     if (!rootUrl.isEmpty() && rootUrl.isParentOf(url)) {
     m_controller->setUrl(url); // emits urlChanged, which we forward
 
     if (!rootUrl.isEmpty() && rootUrl.isParentOf(url)) {


@@ -518,232 +535,455 @@ void DolphinView::setNameFilter(const QString& nameFilter)
     }
 }
 
     }
 }
 

-void DolphinView::calculateItemCount(int& fileCount, int& folderCount)
+void DolphinView::calculateItemCount(int& fileCount,
+                                     int& folderCount,
+                                     KIO::filesize_t& totalFileSize) const

 {
 {

-    foreach (KFileItem item, m_dirLister->items()) {
+    foreach (const KFileItem& item, m_dirLister->items()) {

         if (item.isDir()) {
             ++folderCount;
         } else {
             ++fileCount;
         if (item.isDir()) {
             ++folderCount;
         } else {
             ++fileCount;

+            totalFileSize += item.size();

         }
     }
 }
 
         }
     }
 }
 

-void DolphinView::setUrl(const KUrl& url)
+QString DolphinView::statusBarText() const

 {
 {

-    updateView(url, KUrl());
+    QString text;
+    int folderCount = 0;
+    int fileCount = 0;
+    KIO::filesize_t totalFileSize = 0;
+
+    if (hasSelection()) {
+        // give a summary of the status of the selected files
+        const KFileItemList list = selectedItems();
+        if (list.isEmpty()) {
+            // when an item is triggered, it is temporary selected but selectedItems()
+            // will return an empty list
+            return text;
+        }
+
+        KFileItemList::const_iterator it = list.begin();
+        const KFileItemList::const_iterator end = list.end();
+        while (it != end) {
+            const KFileItem& item = *it;
+            if (item.isDir()) {
+                ++folderCount;
+            } else {
+                ++fileCount;
+                totalFileSize += item.size();
+            }
+            ++it;
+        }
+
+        if (folderCount + fileCount == 1) {
+            // if only one item is selected, show the filename
+            const QString name = list.first().name();
+            text = (folderCount == 1) ? i18nc("@info:status", "<filename>%1</filename> selected", name) :
+                                        i18nc("@info:status", "<filename>%1</filename> selected (%2)",
+                                              name, KIO::convertSize(totalFileSize));
+        } else {
+            // at least 2 items are selected
+            const QString foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
+            const QString filesText = i18ncp("@info:status", "1 File selected", "%1 Files selected", fileCount);
+            if ((folderCount > 0) && (fileCount > 0)) {
+                text = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
+                             foldersText, filesText, KIO::convertSize(totalFileSize));
+            } else if (fileCount > 0) {
+                text = i18nc("@info:status files (size)", "%1 (%2)", filesText, KIO::convertSize(totalFileSize));
+            } else {
+                Q_ASSERT(folderCount > 0);
+                text = foldersText;
+            }
+        }
+    } else {
+        calculateItemCount(fileCount, folderCount, totalFileSize);
+        text = KIO::itemsSummaryString(fileCount + folderCount,
+                                       fileCount, folderCount,
+                                       totalFileSize, true);
+    }
+
+    return text;

 }
 
 }
 

-void DolphinView::mouseReleaseEvent(QMouseEvent* event)
+void DolphinView::setUrl(const KUrl& url)

 {
 {

-    QWidget::mouseReleaseEvent(event);
-    setActive(true);
+    // remember current item candidate (see restoreCurrentItem())
+    m_currentItemUrl = url;
+    updateView(url, KUrl());

 }
 }

-void DolphinView::activate()
+
+void DolphinView::changeSelection(const KFileItemList& selection)

 {
 {

-    setActive(true);
+    clearSelection();
+    if (selection.isEmpty()) {
+        return;
+    }
+    const KUrl& baseUrl = url();
+    KUrl url;
+    QItemSelection newSelection;
+    foreach(const KFileItem& item, selection) {
+        url = item.url().upUrl();
+        if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
+            QModelIndex index = m_proxyModel->mapFromSource(m_dolphinModel->indexForItem(item));
+            newSelection.select(index, index);
+        }
+    }
+    itemView()->selectionModel()->select(newSelection,
+                                         QItemSelectionModel::ClearAndSelect
+                                         | QItemSelectionModel::Current);

 }
 
 }
 

-void DolphinView::triggerItem(const KFileItem& item)
+void DolphinView::renameSelectedItems()

 {
 {

-    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'
+    KFileItemList items = selectedItems();
+    const int itemCount = items.count();
+    if (itemCount < 1) {

         return;
     }
 
         return;
     }
 

-    if (item.isNull()) {
-        return;
+    if (itemCount > 1) {
+        // More than one item has been selected for renaming. Open
+        // a rename dialog and rename all items afterwards.
+        RenameDialog dialog(this, items);
+        if (dialog.exec() == QDialog::Rejected) {
+            return;
+        }
+
+        const QString newName = dialog.newName();
+        if (newName.isEmpty()) {
+            emit errorMessage(dialog.errorString());
+            return;
+        }
+
+        // TODO: check how this can be integrated into KIO::FileUndoManager/KonqOperations
+        // as one operation instead of n rename operations like it is done now...
+        Q_ASSERT(newName.contains('#'));
+
+        // currently the items are sorted by the selection order, resort
+        // them by the file name
+        qSort(items.begin(), items.end(), lessThan);
+
+        // iterate through all selected items and rename them...
+        int index = 1;
+        foreach (const KFileItem& item, items) {
+            const KUrl& oldUrl = item.url();
+            QString number;
+            number.setNum(index++);
+
+            QString name = newName;
+            name.replace('#', number);
+
+            if (oldUrl.fileName() != name) {
+                KUrl newUrl = oldUrl;
+                newUrl.setFileName(name);
+                KonqOperations::rename(this, oldUrl, newUrl);
+            }
+        }
+    } else if (DolphinSettings::instance().generalSettings()->renameInline()) {
+        Q_ASSERT(itemCount == 1);
+
+        if (isColumnViewActive()) {
+            m_columnView->editItem(items.first());
+        } else {
+            const QModelIndex dirIndex = m_dolphinModel->indexForItem(items.first());
+            const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+            itemView()->edit(proxyIndex);
+        }
+    } else {
+        Q_ASSERT(itemCount == 1);
+
+        RenameDialog dialog(this, items);
+        if (dialog.exec() == QDialog::Rejected) {
+            return;
+        }
+
+        const QString& newName = dialog.newName();
+        if (newName.isEmpty()) {
+            emit errorMessage(dialog.errorString());
+            return;
+        }
+
+        const KUrl& oldUrl = items.first().url();
+        KUrl newUrl = oldUrl;
+        newUrl.setFileName(newName);
+        KonqOperations::rename(this, oldUrl, newUrl);

     }
 
     }
 

-    emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
+    // assure that the current index remains visible when KDirLister
+    // will notify the view about changed items
+    m_assureVisibleCurrentIndex = true;

 }
 
 }
 

-void DolphinView::generatePreviews(const KFileItemList& items)
+void DolphinView::trashSelectedItems()

 {
 {

-    if (m_controller->dolphinView()->showPreview()) {
-        KIO::PreviewJob* job = KIO::filePreview(items, 128);
-        connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
-                this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
-    }
+    const KUrl::List list = simplifiedSelectedUrls();
+    KonqOperations::del(this, KonqOperations::TRASH, list);

 }
 
 }
 

-void DolphinView::showPreview(const KFileItem& item, const QPixmap& pixmap)
+void DolphinView::deleteSelectedItems()

 {
 {

-    Q_ASSERT(!item.isNull());
-    if (item.url().directory() != m_dirLister->url().path()) {
-        // the preview job is still working on items of an older URL, hence
-        // the item is not part of the directory model anymore
-        return;
-    }
+    const KUrl::List list = simplifiedSelectedUrls();
+    const bool del = KonqOperations::askDeleteConfirmation(list,
+                     KonqOperations::DEL,
+                     KonqOperations::DEFAULT_CONFIRMATION,
+                     this);

 
 

-    const QModelIndex idx = m_dolphinModel->indexForItem(item);
-    if (idx.isValid() && (idx.column() == 0)) {
-        const QMimeData* mimeData = QApplication::clipboard()->mimeData();
-        if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) {
-            KIconEffect iconEffect;
-            const QPixmap cutPixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
-            m_dolphinModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole);
-        } else {
-            m_dolphinModel->setData(idx, QIcon(pixmap), Qt::DecorationRole);
-        }
+    if (del) {
+        KIO::Job* job = KIO::del(list);
+        connect(job, SIGNAL(result(KJob*)),
+                this, SLOT(slotDeleteFileFinished(KJob*)));

     }
 }
 
     }
 }
 

-void DolphinView::emitSelectionChangedSignal()
+void DolphinView::cutSelectedItems()

 {
 {

-    emit selectionChanged(DolphinView::selectedItems());
+    QMimeData* mimeData = selectionMimeData();
+    KonqMimeData::addIsCutSelection(mimeData, true);
+    QApplication::clipboard()->setMimeData(mimeData);

 }
 
 }
 

-void DolphinView::loadDirectory(const KUrl& url, bool reload)
+void DolphinView::copySelectedItems()

 {
 {

-    if (!url.isValid()) {
-        const QString location(url.pathOrUrl());
-        if (location.isEmpty()) {
-            emit errorMessage(i18nc("@info:status", "The location is empty."));
-        } else {
-            emit errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location));
-        }
-        return;
-    }
-
-    m_cutItemsCache.clear();
-    m_loadingDirectory = true;
+    QMimeData* mimeData = selectionMimeData();
+    QApplication::clipboard()->setMimeData(mimeData);
+}

 
 

-    m_dirLister->stop();
-    m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
+void DolphinView::paste()
+{
+    pasteToUrl(url());
+}

 
 

-    if (isColumnViewActive()) {
-        // adjusting the directory lister is not enough in the case of the
-        // column view, as each column has its own directory lister internally...
-        if (reload) {
-            m_columnView->reload();
-        } else {
-            m_columnView->showColumn(url);
-        }
+void DolphinView::pasteIntoFolder()
+{
+    const KFileItemList items = selectedItems();
+    if ((items.count() == 1) && items.first().isDir()) {
+        pasteToUrl(items.first().url());

     }
 }
 
     }
 }
 

-KUrl DolphinView::viewPropertiesUrl() const
+void DolphinView::setShowPreview(bool show)

 {
 {

-    if (isColumnViewActive()) {
-        return m_dirLister->url();
+    if (m_showPreview == show) {
+        return;

     }
 
     }
 

-    return url();
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setShowPreview(show);
+
+    m_showPreview = show;
+    m_previewGenerator->setPreviewShown(show);
+
+    const int oldZoomLevel = m_controller->zoomLevel();
+    emit showPreviewChanged();
+
+    // Enabling or disabling the preview might change the icon size of the view.
+    // As the view does not emit a signal when the icon size has been changed,
+    // the used zoom level of the controller must be adjusted manually:
+    updateZoomLevel(oldZoomLevel);
+
+    loadDirectory(viewPropsUrl);

 }
 
 }
 

-void DolphinView::applyViewProperties(const KUrl& url)
+void DolphinView::setShowHiddenFiles(bool show)

 {
 {

-    if (isColumnViewActive() && rootUrl().isParentOf(url)) {
-        // The column view is active, hence don't apply the view properties
-        // of sub directories (represented by columns) to the view. The
-        // view always represents the properties of the first column.
+    if (m_dirLister->showingDotFiles() == show) {

         return;
     }
 
         return;
     }
 

-    const ViewProperties props(url);
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setShowHiddenFiles(show);

 
 

-    const Mode mode = props.viewMode();
-    if (m_mode != mode) {
-        m_mode = mode;
-        createView();
-        emit modeChanged();
-    }
-    if (itemView() == 0) {
-        createView();
-    }
-    Q_ASSERT(itemView() != 0);
-    Q_ASSERT(m_fileItemDelegate != 0);
+    m_dirLister->setShowingDotFiles(show);
+    emit showHiddenFilesChanged();

 
 

-    const bool showHiddenFiles = props.showHiddenFiles();
-    if (showHiddenFiles != m_dirLister->showingDotFiles()) {
-        m_dirLister->setShowingDotFiles(showHiddenFiles);
-        emit showHiddenFilesChanged();
-    }
+    loadDirectory(viewPropsUrl);
+}

 
 

-    m_storedCategorizedSorting = props.categorizedSorting();
-    const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
-    if (categorized != m_proxyModel->isCategorizedModel()) {
-        m_proxyModel->setCategorizedModel(categorized);
-        emit categorizedSortingChanged();
+void DolphinView::setCategorizedSorting(bool categorized)
+{
+    if (categorized == categorizedSorting()) {
+        return;

     }
 
     }
 

-    const DolphinView::Sorting sorting = props.sorting();
-    if (sorting != m_proxyModel->sorting()) {
-        m_proxyModel->setSorting(sorting);
-        emit sortingChanged(sorting);
-    }
+    // setCategorizedSorting(true) may only get invoked
+    // if the view supports categorized sorting
+    Q_ASSERT(!categorized || supportsCategorizedSorting());

 
 

-    const Qt::SortOrder sortOrder = props.sortOrder();
-    if (sortOrder != m_proxyModel->sortOrder()) {
-        m_proxyModel->setSortOrder(sortOrder);
-        emit sortOrderChanged(sortOrder);
-    }
+    ViewProperties props(viewPropertiesUrl());
+    props.setCategorizedSorting(categorized);
+    props.save();

 
 

-    KFileItemDelegate::InformationList info = props.additionalInfo();
-    if (info != m_fileItemDelegate->showInformation()) {
-        m_fileItemDelegate->setShowInformation(info);
-        emit additionalInfoChanged(info);
-    }
+    m_storedCategorizedSorting = categorized;
+    m_proxyModel->setCategorizedModel(categorized);

 
 

-    const bool showPreview = props.showPreview();
-    if (showPreview != m_showPreview) {
-        m_showPreview = showPreview;
-        emit showPreviewChanged();
+    emit categorizedSortingChanged();
+}
+
+void DolphinView::toggleSortOrder()
+{
+    const Qt::SortOrder order = (sortOrder() == Qt::AscendingOrder) ?
+                                Qt::DescendingOrder :
+                                Qt::AscendingOrder;
+    setSortOrder(order);
+}
+
+void DolphinView::toggleSortFoldersFirst()
+{
+    setSortFoldersFirst(!sortFoldersFirst());
+}
+
+void DolphinView::toggleAdditionalInfo(QAction* action)
+{
+    const KFileItemDelegate::Information info =
+        static_cast<KFileItemDelegate::Information>(action->data().toInt());
+
+    KFileItemDelegate::InformationList list = additionalInfo();
+
+    const bool show = action->isChecked();
+
+    const int index = list.indexOf(info);
+    const bool containsInfo = (index >= 0);
+    if (show && !containsInfo) {
+        list.append(info);
+        setAdditionalInfo(list);
+    } else if (!show && containsInfo) {
+        list.removeAt(index);
+        setAdditionalInfo(list);
+        Q_ASSERT(list.indexOf(info) < 0);

     }
 }
 
     }
 }
 

-void DolphinView::changeSelection(const KFileItemList& selection)
+void DolphinView::mouseReleaseEvent(QMouseEvent* event)

 {
 {

-    clearSelection();
-    if (selection.isEmpty()) {
-        return;
+    QWidget::mouseReleaseEvent(event);
+    setActive(true);
+}
+
+void DolphinView::wheelEvent(QWheelEvent* event)
+{
+    if (event->modifiers() & Qt::ControlModifier) {
+        const int delta = event->delta();
+        const int level = zoomLevel();
+        if (delta > 0) {
+            setZoomLevel(level + 1);
+        } else if (delta < 0) {
+            setZoomLevel(level - 1);
+        }
+        event->accept();

     }
     }

-    const KUrl& baseUrl = url();
-    KUrl url;
-    QItemSelection new_selection;
-    foreach(const KFileItem& item, selection) {
-        url = item.url().upUrl();
-        if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
-            QModelIndex index = m_proxyModel->mapFromSource(m_dolphinModel->indexForItem(item));
-            new_selection.select(index, index);
+}
+
+bool DolphinView::eventFilter(QObject* watched, QEvent* event)
+{
+    switch (event->type()) {
+    case QEvent::FocusIn:
+        if (watched == itemView()) {
+            m_controller->requestActivation();
+        }
+        break;
+
+    case QEvent::MouseButtonPress:
+        if ((watched == itemView()->viewport()) && (m_expandedDragSource != 0)) {
+            // Listening to a mousebutton press event to delete expanded views is a
+            // workaround, as it seems impossible for the FolderExpander to know when
+            // a dragging outside a view has been finished. However it works quite well:
+            // A mousebutton press event indicates that a drag operation must be
+            // finished already.
+            m_expandedDragSource->deleteLater();
+            m_expandedDragSource = 0;
+        }
+        break;
+
+    case QEvent::DragEnter:
+        if (watched == itemView()->viewport()) {
+            setActive(true);

         }
         }

+        break;
+
+    case QEvent::KeyPress:
+        if (watched == itemView()) {
+            if (m_toolTipManager != 0) {
+                m_toolTipManager->hideTip();
+            }
+
+            // clear the selection when Escape has been pressed
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            if (keyEvent->key() == Qt::Key_Escape) {
+                clearSelection();
+            }
+        }
+        break;
+
+    default:
+        break;

     }
     }

-    itemView()->selectionModel()->select(new_selection,
-                                         QItemSelectionModel::ClearAndSelect
-                                         | QItemSelectionModel::Current);
+
+    return QWidget::eventFilter(watched, event);

 }
 
 }
 

-void DolphinView::openContextMenu(const QPoint& pos)
+void DolphinView::activate()

 {
 {

-    KFileItem item;
+    setActive(true);
+}
+
+void DolphinView::triggerItem(const KFileItem& item)
+{
+    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;
+    }

 
 

-    const QModelIndex index = itemView()->indexAt(pos);
-    if (index.isValid() && (index.column() == DolphinModel::Name)) {
-        item = fileItem(index);
+    // TODO: the m_isContextMenuOpen check is a workaround for Qt-issue 207192
+    if (item.isNull() || m_isContextMenuOpen) {
+        return;

     }
 
     }
 

-    emit requestContextMenu(item, url());
+    if (m_toolTipManager != 0) {
+        m_toolTipManager->hideTip();
+    }
+    emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart

 }
 
 }
 

-void DolphinView::dropUrls(const KUrl::List& urls,
-                           const KUrl& destPath,
-                           const KFileItem& destItem)
+void DolphinView::emitSelectionChangedSignal()

 {
 {

-    const KUrl& destination = !destItem.isNull() && destItem.isDir() ?
-                              destItem.url() : destPath;
-    const KUrl sourceDir = KUrl(urls.first().directory());
-    if (sourceDir != destination) {
-        dropUrls(urls, destination);
+    emit selectionChanged(DolphinView::selectedItems());
+}
+
+void DolphinView::openContextMenu(const QPoint& pos,
+                                  const QList<QAction*>& customActions)
+{
+    KFileItem item;
+    if (isColumnViewActive()) {
+        item = m_columnView->itemAt(pos);
+    } else {
+        const QModelIndex index = itemView()->indexAt(pos);
+        if (index.isValid() && (index.column() == DolphinModel::Name)) {
+            const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
+            item = m_dolphinModel->itemForIndex(dolphinModelIndex);
+        }

     }
     }

+
+    if (m_toolTipManager != 0) {
+        m_toolTipManager->hideTip();
+    }
+
+    m_isContextMenuOpen = true; // TODO: workaround for Qt-issue 207192
+    emit requestContextMenu(item, url(), customActions);
+    m_isContextMenuOpen = false;

 }
 
 }
 

-void DolphinView::dropUrls(const KUrl::List& urls,
-                           const KUrl& destination)
+void DolphinView::dropUrls(const KFileItem& destItem,
+                           const KUrl& destPath,
+                           QDropEvent* event)

 {
 {

-    emit urlsDropped(urls, destination);
+    DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);

 }
 
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 }
 
 void DolphinView::updateSorting(DolphinView::Sorting sorting)


@@ -766,15 +1006,143 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
     emit sortOrderChanged(order);
 }
 

+void DolphinView::updateSortFoldersFirst(bool foldersFirst)
+{
+    ViewProperties props(viewPropertiesUrl());
+    props.setSortFoldersFirst(foldersFirst);
+
+    m_proxyModel->setSortFoldersFirst(foldersFirst);
+
+    emit sortFoldersFirstChanged(foldersFirst);
+}
+

 void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)
 {
     ViewProperties props(viewPropertiesUrl());
     props.setAdditionalInfo(info);
 void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)
 {
     ViewProperties props(viewPropertiesUrl());
     props.setAdditionalInfo(info);

+    props.save();

 
     m_fileItemDelegate->setShowInformation(info);
 
 
     m_fileItemDelegate->setShowInformation(info);
 

-    emit additionalInfoChanged(info);
+    emit additionalInfoChanged();
+}
+
+void DolphinView::updateAdditionalInfoActions(KActionCollection* collection)
+{
+    const bool enable = (m_mode == DolphinView::DetailsView) ||
+                        (m_mode == DolphinView::IconsView);
+
+    QAction* showSizeInfo = collection->action("show_size_info");
+    QAction* showDateInfo = collection->action("show_date_info");
+    QAction* showPermissionsInfo = collection->action("show_permissions_info");
+    QAction* showOwnerInfo = collection->action("show_owner_info");
+    QAction* showGroupInfo = collection->action("show_group_info");
+    QAction* showMimeInfo = collection->action("show_mime_info");
+
+    showSizeInfo->setChecked(false);
+    showDateInfo->setChecked(false);
+    showPermissionsInfo->setChecked(false);
+    showOwnerInfo->setChecked(false);
+    showGroupInfo->setChecked(false);
+    showMimeInfo->setChecked(false);
+
+    showSizeInfo->setEnabled(enable);
+    showDateInfo->setEnabled(enable);
+    showPermissionsInfo->setEnabled(enable);
+    showOwnerInfo->setEnabled(enable);
+    showGroupInfo->setEnabled(enable);
+    showMimeInfo->setEnabled(enable);
+
+    foreach (KFileItemDelegate::Information info, m_fileItemDelegate->showInformation()) {
+        switch (info) {
+        case KFileItemDelegate::Size:
+            showSizeInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::ModificationTime:
+            showDateInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::Permissions:
+            showPermissionsInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::Owner:
+            showOwnerInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::OwnerAndGroup:
+            showGroupInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::FriendlyMimeType:
+            showMimeInfo->setChecked(true);
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+QPair<bool, QString> DolphinView::pasteInfo() const
+{
+    return KonqOperations::pasteInfo(url());
+}
+
+void DolphinView::setTabsForFilesEnabled(bool tabsForFiles)
+{
+    m_tabsForFiles = tabsForFiles;
+}
+
+bool DolphinView::isTabsForFilesEnabled() const
+{
+    return m_tabsForFiles;
+}
+
+bool DolphinView::itemsExpandable() const
+{
+    return (m_detailsView != 0) && m_detailsView->itemsExpandable();
+}
+
+void DolphinView::deleteWhenNotDragSource(QAbstractItemView *view)
+{
+    if (view == 0)
+        return;

 
 

+    if (DragAndDropHelper::instance().isDragSource(view)) {
+        // We must store for later deletion.
+        if (m_expandedDragSource != 0) {
+            // The old stored view is obviously not the drag source anymore.
+            m_expandedDragSource->deleteLater();
+            m_expandedDragSource = 0;
+        }
+        view->hide();
+        m_expandedDragSource = view;
+    }
+    else {
+        view->deleteLater();
+    }
+}
+
+void DolphinView::observeCreatedItem(const KUrl& url)
+{
+    m_createdItemUrl = url;
+    connect(m_dolphinModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+            this, SLOT(selectAndScrollToCreatedItem()));
+}
+
+void DolphinView::selectAndScrollToCreatedItem()
+{
+    const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_createdItemUrl);
+    if (dirIndex.isValid()) {
+        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+        itemView()->setCurrentIndex(proxyIndex);
+    }
+
+    disconnect(m_dolphinModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+               this, SLOT(selectAndScrollToCreatedItem()));
+    m_createdItemUrl = KUrl();
+}
+
+void DolphinView::restoreSelection()
+{
+    disconnect(m_dirLister, SIGNAL(completed()), this, SLOT(restoreSelection()));
+    changeSelection(m_selectedItems);

 }
 
 void DolphinView::emitContentsMoved()
 }
 
 void DolphinView::emitContentsMoved()


@@ -790,60 +1158,196 @@ void DolphinView::emitContentsMoved()
     }
 }
 
     }
 }
 

-void DolphinView::updateCutItems()
+void DolphinView::showHoverInformation(const KFileItem& item)
+{
+    emit requestItemInfo(item);
+}
+
+void DolphinView::clearHoverInformation()
+{
+    emit requestItemInfo(KFileItem());
+}
+
+void DolphinView::slotDeleteFileFinished(KJob* job)
+{
+    if (job->error() == 0) {
+        emit operationCompletedMessage(i18nc("@info:status", "Delete operation completed."));
+    } else if (job->error() != KIO::ERR_USER_CANCELED) {
+        emit errorMessage(job->errorString());
+    }
+}
+
+void DolphinView::slotRequestUrlChange(const KUrl& url)

 {
 {

-    // restore the icons of all previously selected items to the
-    // original state...
-    QList<CutItem>::const_iterator it = m_cutItemsCache.begin();
-    QList<CutItem>::const_iterator end = m_cutItemsCache.end();
-    while (it != end) {
-        const QModelIndex index = m_dolphinModel->indexForUrl((*it).url);
-        if (index.isValid()) {
-            m_dolphinModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole);
+    emit requestUrlChange(url);
+    m_controller->setUrl(url);
+}
+
+void DolphinView::restoreCurrentItem()
+{
+    if (!m_currentItemUrl.isEmpty()) {
+        const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_currentItemUrl);
+        if (dirIndex.isValid()) {
+            const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+            QAbstractItemView* view = itemView();
+            const bool clearSelection = !hasSelection();
+            view->setCurrentIndex(proxyIndex);
+            if (clearSelection) {
+                view->clearSelection();
+            }

         }
         }

-        ++it;
+        m_currentItemUrl.clear();

     }
     }

-    m_cutItemsCache.clear();
+}

 
 

-    // ... and apply an item effect to all currently cut items
-    applyCutItemEffect();
+void DolphinView::slotRefreshItems()
+{
+    if (m_assureVisibleCurrentIndex) {
+        m_assureVisibleCurrentIndex = false;
+        itemView()->scrollTo(itemView()->currentIndex());
+    }

 }
 
 }
 

-void DolphinView::showHoverInformation(const KFileItem& item)
+void DolphinView::loadDirectory(const KUrl& url, bool reload)

 {
 {

-    if (hasSelection()) {
+    if (!url.isValid()) {
+        const QString location(url.pathOrUrl());
+        if (location.isEmpty()) {
+            emit errorMessage(i18nc("@info:status", "The location is empty."));
+        } else {
+            emit errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location));
+        }

         return;
     }
 
         return;
     }
 

-    emit requestItemInfo(item);
+    m_loadingDirectory = true;
+
+    if (reload) {
+        m_selectedItems = selectedItems();
+        connect(m_dirLister, SIGNAL(completed()), this, SLOT(restoreSelection()));
+    }
+
+    m_dirLister->stop();
+    m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
+
+    if (isColumnViewActive()) {
+        // adjusting the directory lister is not enough in the case of the
+        // column view, as each column has its own directory lister internally...
+        if (reload) {
+            m_columnView->reload();
+        } else {
+            m_columnView->showColumn(url);
+        }
+    }

 }
 
 }
 

-void DolphinView::clearHoverInformation()
+KUrl DolphinView::viewPropertiesUrl() const

 {
 {

-    emit requestItemInfo(KFileItem());
-}
+    if (isColumnViewActive()) {
+        return m_columnView->rootUrl();
+    }

 
 

+    return url();
+}

 
 

-void DolphinView::createView()
+void DolphinView::applyViewProperties(const KUrl& url)

 {
 {

-    // delete current view
-    QAbstractItemView* view = itemView();
-    if (view != 0) {
-        m_topLayout->removeWidget(view);
-        view->close();
-        view->deleteLater();
-        view = 0;
-        m_iconsView = 0;
-        m_detailsView = 0;
-        m_columnView = 0;
-        m_fileItemDelegate = 0;
+    if (m_ignoreViewProperties) {
+        return;
+    }
+
+    if (isColumnViewActive() && rootUrl().isParentOf(url)) {
+        // The column view is active, hence don't apply the view properties
+        // of sub directories (represented by columns) to the view. The
+        // view always represents the properties of the first column.
+        return;
+    }
+
+    const ViewProperties props(url);
+
+    const Mode mode = props.viewMode();
+    if (m_mode != mode) {
+        const int oldZoomLevel = m_controller->zoomLevel();
+
+        m_mode = mode;
+        createView();
+        emit modeChanged();
+
+        updateZoomLevel(oldZoomLevel);

     }
     }

+    if (itemView() == 0) {
+        createView();
+    }
+    Q_ASSERT(itemView() != 0);
+    Q_ASSERT(m_fileItemDelegate != 0);

 
 

+    const bool showHiddenFiles = props.showHiddenFiles();
+    if (showHiddenFiles != m_dirLister->showingDotFiles()) {
+        m_dirLister->setShowingDotFiles(showHiddenFiles);
+        emit showHiddenFilesChanged();
+    }
+
+    m_storedCategorizedSorting = props.categorizedSorting();
+    const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
+    if (categorized != m_proxyModel->isCategorizedModel()) {
+        m_proxyModel->setCategorizedModel(categorized);
+        emit categorizedSortingChanged();
+    }
+
+    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);
+    }
+
+    const bool sortFoldersFirst = props.sortFoldersFirst();
+    if (sortFoldersFirst != m_proxyModel->sortFoldersFirst()) {
+        m_proxyModel->setSortFoldersFirst(sortFoldersFirst);
+        emit sortFoldersFirstChanged(sortFoldersFirst);
+    }
+
+    KFileItemDelegate::InformationList info = props.additionalInfo();
+    if (info != m_fileItemDelegate->showInformation()) {
+        m_fileItemDelegate->setShowInformation(info);
+        emit additionalInfoChanged();
+    }
+
+    const bool showPreview = props.showPreview();
+    if (showPreview != m_showPreview) {
+        m_showPreview = showPreview;
+        m_previewGenerator->setPreviewShown(showPreview);
+
+        const int oldZoomLevel = m_controller->zoomLevel();
+        emit showPreviewChanged();
+
+        // Enabling or disabling the preview might change the icon size of the view.
+        // As the view does not emit a signal when the icon size has been changed,
+        // the used zoom level of the controller must be adjusted manually:
+        updateZoomLevel(oldZoomLevel);
+    }
+
+    if (DolphinSettings::instance().generalSettings()->globalViewProps()) {
+        // During the lifetime of a DolphinView instance the global view properties
+        // should not be changed. This allows e. g. to split a view and use different
+        // view properties for each view.
+        m_ignoreViewProperties = true;
+    }
+}
+
+void DolphinView::createView()
+{
+    deleteView();

     Q_ASSERT(m_iconsView == 0);
     Q_ASSERT(m_detailsView == 0);
     Q_ASSERT(m_columnView == 0);
 
     Q_ASSERT(m_iconsView == 0);
     Q_ASSERT(m_detailsView == 0);
     Q_ASSERT(m_columnView == 0);
 

-    // ... and recreate it representing the current mode
+    QAbstractItemView* view = 0;

     switch (m_mode) {
     case IconsView: {
         m_iconsView = new DolphinIconsView(this, m_controller);
     switch (m_mode) {
     case IconsView: {
         m_iconsView = new DolphinIconsView(this, m_controller);


@@ -863,14 +1367,58 @@ void DolphinView::createView()
     }
 
     Q_ASSERT(view != 0);
     }
 
     Q_ASSERT(view != 0);

+    view->installEventFilter(this);
+    view->viewport()->installEventFilter(this);
+    setFocusProxy(view);
+
+    if (m_mode != ColumnView) {
+        // Give the view the ability to auto-expand its directories on hovering
+        // (the column view takes care about this itself). If the details view
+        // uses expandable folders, the auto-expanding should be used always.
+        DolphinSettings& settings = DolphinSettings::instance();
+        const bool enabled = settings.generalSettings()->autoExpandFolders() ||
+                            ((m_detailsView != 0) && settings.detailsModeSettings()->expandableFolders());
+
+        FolderExpander* folderExpander = new FolderExpander(view, m_proxyModel);
+        folderExpander->setEnabled(enabled);
+        connect(folderExpander, SIGNAL(enterDir(const QModelIndex&)),
+                m_controller, SLOT(triggerItem(const QModelIndex&)));
+    }
+    else {
+        // Listen out for requests to delete the current column.
+        connect(m_columnView, SIGNAL(requestColumnDeletion(QAbstractItemView*)),
+                this, SLOT(deleteWhenNotDragSource(QAbstractItemView*)));
+    }
+
+    m_controller->setItemView(view);

 
 

-    m_fileItemDelegate = new KFileItemDelegate(view);
+    m_fileItemDelegate = new DolphinFileItemDelegate(view);
+    m_fileItemDelegate->setShowToolTipWhenElided(false);
+    m_fileItemDelegate->setMinimizedNameColumn(m_mode == DetailsView);

     view->setItemDelegate(m_fileItemDelegate);
 
     view->setModel(m_proxyModel);
     view->setItemDelegate(m_fileItemDelegate);
 
     view->setModel(m_proxyModel);

+    if (m_selectionModel != 0) {
+        view->setSelectionModel(m_selectionModel);
+    } else {
+        m_selectionModel = view->selectionModel();
+    }
+
+    // reparent the selection model, as it should not be deleted
+    // when deleting the model
+    m_selectionModel->setParent(this);
+

     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 

-    new KMimeTypeResolver(view, m_dolphinModel);
+    m_previewGenerator = new KFilePreviewGenerator(view);
+    m_previewGenerator->setPreviewShown(m_showPreview);
+
+    if (DolphinSettings::instance().generalSettings()->showToolTips()) {
+        m_toolTipManager = new ToolTipManager(view, m_proxyModel);
+        connect(m_controller, SIGNAL(hideToolTip()),
+                m_toolTipManager, SLOT(hideTip()));
+    }
+

     m_topLayout->insertWidget(1, view);
 
     connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
     m_topLayout->insertWidget(1, view);
 
     connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),


@@ -881,6 +1429,40 @@ void DolphinView::createView()
             this, SLOT(emitContentsMoved()));
 }
 
             this, SLOT(emitContentsMoved()));
 }
 

+void DolphinView::deleteView()
+{
+    QAbstractItemView* view = itemView();
+    if (view != 0) {
+        // It's important to set the keyboard focus to the parent
+        // before deleting the view: Otherwise when having a split
+        // view the other view will get the focus and will request
+        // an activation (see DolphinView::eventFilter()).
+        setFocusProxy(0);
+        setFocus();
+
+        m_topLayout->removeWidget(view);
+        view->close();
+
+        // m_previewGenerator's parent is not always destroyed, and we
+        // don't want two active at once - manually delete.
+        delete m_previewGenerator;
+        m_previewGenerator = 0;
+
+        disconnect(view);
+        m_controller->disconnect(view);
+        view->disconnect();
+
+        deleteWhenNotDragSource(view);
+        view = 0;
+
+        m_iconsView = 0;
+        m_detailsView = 0;
+        m_columnView = 0;
+        m_fileItemDelegate = 0;
+        m_toolTipManager = 0;
+    }
+}
+

 QAbstractItemView* DolphinView::itemView() const
 {
     if (m_detailsView != 0) {
 QAbstractItemView* DolphinView::itemView() const
 {
     if (m_detailsView != 0) {


@@ -910,83 +1492,40 @@ bool DolphinView::isCutItem(const KFileItem& item) const
     return false;
 }
 
     return false;
 }
 

-void DolphinView::applyCutItemEffect()
+void DolphinView::pasteToUrl(const KUrl& url)

 {
 {

-    const QMimeData* mimeData = QApplication::clipboard()->mimeData();
-    if (!KonqMimeData::decodeIsCutSelection(mimeData)) {
-        return;
-    }
-
-    KFileItemList items(m_dirLister->items());
-    KFileItemList::const_iterator it = items.begin();
-    const KFileItemList::const_iterator end = items.end();
-    while (it != end) {
-        const KFileItem item = *it;
-        if (isCutItem(item)) {
-            const QModelIndex index = m_dolphinModel->indexForItem(item);
-            const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole);
-            if (value.type() == QVariant::Icon) {
-                const QIcon icon(qvariant_cast<QIcon>(value));
-                QPixmap pixmap = icon.pixmap(128, 128);
-
-                // remember current pixmap for the item to be able
-                // to restore it when other items get cut
-                CutItem cutItem;
-                cutItem.url = item.url();
-                cutItem.pixmap = pixmap;
-                m_cutItemsCache.append(cutItem);
-
-                // apply icon effect to the cut item
-                KIconEffect iconEffect;
-                pixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
-                m_dolphinModel->setData(index, QIcon(pixmap), Qt::DecorationRole);
-            }
-        }
-        ++it;
-    }
-}
-
-KToggleAction* DolphinView::iconsModeAction(KActionCollection* actionCollection)
-{
-    KToggleAction* iconsView = actionCollection->add<KToggleAction>("icons");
-    iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
-    iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
-    iconsView->setIcon(KIcon("fileview-icon"));
-    iconsView->setData(QVariant::fromValue(IconsView));
-    return iconsView;
+    KonqOperations::doPaste(this, url);

 }
 
 }
 

-KToggleAction* DolphinView::detailsModeAction(KActionCollection* actionCollection)
+void DolphinView::updateZoomLevel(int oldZoomLevel)

 {
 {

-    KToggleAction* detailsView = actionCollection->add<KToggleAction>("details");
-    detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
-    detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
-    detailsView->setIcon(KIcon("fileview-detailed"));
-    detailsView->setData(QVariant::fromValue(DetailsView));
-    return detailsView;
+    const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(itemView()->iconSize());
+    if (oldZoomLevel != newZoomLevel) {
+        m_controller->setZoomLevel(newZoomLevel);
+        emit zoomLevelChanged(newZoomLevel);
+    }

 }
 
 }
 

-KToggleAction* DolphinView::columnsModeAction(KActionCollection* actionCollection)
+KUrl::List DolphinView::simplifiedSelectedUrls() const

 {
 {

-    KToggleAction* columnView = actionCollection->add<KToggleAction>("columns");
-    columnView->setText(i18nc("@action:inmenu View Mode", "Columns"));
-    columnView->setShortcut(Qt::CTRL | Qt::Key_3);
-    columnView->setIcon(KIcon("fileview-column"));
-    columnView->setData(QVariant::fromValue(ColumnView));
-    return columnView;
+    KUrl::List list = selectedUrls();
+    if (itemsExpandable() ) {
+        list = KDirModel::simplifiedUrlList(list);
+    }
+    return list;

 }
 
 }
 

-QString DolphinView::currentViewModeActionName() const
+QMimeData* DolphinView::selectionMimeData() const

 {
 {

-    switch (m_mode) {
-    case DolphinView::IconsView:
-        return "icons";
-    case DolphinView::DetailsView:
-        return "details";
-    case DolphinView::ColumnView:
-        return "columns";
+    if (isColumnViewActive()) {
+        return m_columnView->selectionMimeData();

     }
     }

-    return QString(); // can't happen
+
+    const QAbstractItemView* view = itemView();
+    Q_ASSERT((view != 0) && (view->selectionModel() != 0));
+    const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
+    return m_dolphinModel->mimeData(selection.indexes());

 }
 
 }
 

+

 #include "dolphinview.moc"
 #include "dolphinview.moc"