Revert the 2.0 decision to always use KB for file-sizes

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 83d80012cbca8c36b8da3dfa489a5894c218f45c..872853642a01c157f886afab194097b1f76aa16f 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -20,6 +20,8 @@
 
 #include "dolphinview.h"
 
 
 #include "dolphinview.h"
 

+#include <config-nepomuk.h>
+

 #include <QAbstractItemView>
 #include <QApplication>
 #include <QBoxLayout>
 #include <QAbstractItemView>
 #include <QApplication>
 #include <QBoxLayout>


@@ -41,6 +43,7 @@
 #include <KLocale>
 #include <kitemviews/kfileitemmodel.h>
 #include <kitemviews/kfileitemlistview.h>
 #include <KLocale>
 #include <kitemviews/kfileitemmodel.h>
 #include <kitemviews/kfileitemlistview.h>

+#include <kitemviews/kitemlistheader.h>

 #include <kitemviews/kitemlistselectionmanager.h>
 #include <kitemviews/kitemlistview.h>
 #include <kitemviews/kitemlistcontroller.h>
 #include <kitemviews/kitemlistselectionmanager.h>
 #include <kitemviews/kitemlistview.h>
 #include <kitemviews/kitemlistcontroller.h>


@@ -56,7 +59,6 @@
 #include <KToggleAction>
 #include <KUrl>
 
 #include <KToggleAction>
 #include <KUrl>
 

-#include "additionalinfoaccessor.h"

 #include "dolphindirlister.h"
 #include "dolphinnewfilemenuobserver.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphindirlister.h"
 #include "dolphinnewfilemenuobserver.h"
 #include "dolphin_detailsmodesettings.h"


@@ -70,9 +72,12 @@
 #include "views/tooltips/tooltipmanager.h"
 #include "zoomlevelinfo.h"
 
 #include "views/tooltips/tooltipmanager.h"
 #include "zoomlevelinfo.h"
 

+#ifdef HAVE_NEPOMUK
+    #include <Nepomuk/ResourceManager>
+#endif
+

 namespace {
     const int MaxModeEnum = DolphinView::CompactView;
 namespace {
     const int MaxModeEnum = DolphinView::CompactView;

-    const int MaxSortingEnum = DolphinView::SortByPath;

 };
 
 DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
 };
 
 DolphinView::DolphinView(const KUrl& url, QWidget* parent) :


@@ -81,9 +86,10 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     m_tabsForFiles(false),
     m_assureVisibleCurrentIndex(false),
     m_isFolderWritable(true),
     m_tabsForFiles(false),
     m_assureVisibleCurrentIndex(false),
     m_isFolderWritable(true),

+    m_dragging(false),

     m_url(url),
     m_mode(DolphinView::IconsView),
     m_url(url),
     m_mode(DolphinView::IconsView),

-    m_additionalInfoList(),
+    m_visibleRoles(),

     m_topLayout(0),
     m_dirLister(0),
     m_container(0),
     m_topLayout(0),
     m_dirLister(0),
     m_container(0),


@@ -143,7 +149,7 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     connect(controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
     connect(controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
     connect(controller, SIGNAL(headerContextMenuRequested(QPointF)), this, SLOT(slotHeaderContextMenuRequested(QPointF)));
     connect(controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
     connect(controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
     connect(controller, SIGNAL(headerContextMenuRequested(QPointF)), this, SLOT(slotHeaderContextMenuRequested(QPointF)));

-    connect(controller, SIGNAL(itemPressed(int,Qt::MouseButton)), this, SLOT(hideToolTip()));
+    connect(controller, SIGNAL(mouseButtonPressed(int,Qt::MouseButtons)), this, SLOT(slotMouseButtonPressed(int,Qt::MouseButtons)));

     connect(controller, SIGNAL(itemHovered(int)), this, SLOT(slotItemHovered(int)));
     connect(controller, SIGNAL(itemUnhovered(int)), this, SLOT(slotItemUnhovered(int)));
     connect(controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
     connect(controller, SIGNAL(itemHovered(int)), this, SLOT(slotItemHovered(int)));
     connect(controller, SIGNAL(itemUnhovered(int)), this, SLOT(slotItemUnhovered(int)));
     connect(controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*)));


@@ -155,10 +161,15 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     }
 
     KItemListView* view = controller->view();
     }
 
     KItemListView* view = controller->view();

+    view->installEventFilter(this);

     connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
             this, SLOT(slotSortOrderChangedByHeader(Qt::SortOrder,Qt::SortOrder)));
     connect(view, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
             this, SLOT(slotSortRoleChangedByHeader(QByteArray,QByteArray)));
     connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
             this, SLOT(slotSortOrderChangedByHeader(Qt::SortOrder,Qt::SortOrder)));
     connect(view, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
             this, SLOT(slotSortRoleChangedByHeader(QByteArray,QByteArray)));

+    connect(view, SIGNAL(visibleRolesChanged(QList<QByteArray>,QList<QByteArray>)),
+            this, SLOT(slotVisibleRolesChangedByHeader(QList<QByteArray>,QList<QByteArray>)));
+    connect(view->header(), SIGNAL(columnWidthChanged(QByteArray,qreal,qreal)),
+            this, SLOT(slotHeaderColumnWidthChanged(QByteArray,qreal,qreal)));

 
     KItemListSelectionManager* selectionManager = controller->selectionManager();
     connect(selectionManager, SIGNAL(selectionChanged(QSet<int>,QSet<int>)),
 
     KItemListSelectionManager* selectionManager = controller->selectionManager();
     connect(selectionManager, SIGNAL(selectionChanged(QSet<int>,QSet<int>)),


@@ -367,17 +378,17 @@ int DolphinView::zoomLevel() const
     return m_container->zoomLevel();
 }
 
     return m_container->zoomLevel();
 }
 

-void DolphinView::setSorting(Sorting sorting)
+void DolphinView::setSortRole(const QByteArray& role)

 {
 {

-    if (sorting != this->sorting()) {
-        updateSorting(sorting);
+    if (role != sortRole()) {
+        updateSortRole(role);

     }
 }
 
     }
 }
 

-DolphinView::Sorting DolphinView::sorting() const
+QByteArray DolphinView::sortRole() const

 {
 {

-    KItemModelBase* model = m_container->controller()->model();
-    return sortingForSortRole(model->sortRole());
+    const KItemModelBase* model = m_container->controller()->model();
+    return model->sortRole();

 }
 
 void DolphinView::setSortOrder(Qt::SortOrder order)
 }
 
 void DolphinView::setSortOrder(Qt::SortOrder order)


@@ -406,22 +417,22 @@ bool DolphinView::sortFoldersFirst() const
     return model->sortFoldersFirst();
 }
 
     return model->sortFoldersFirst();
 }
 

-void DolphinView::setAdditionalInfoList(const QList<AdditionalInfo>& info)
+void DolphinView::setVisibleRoles(const QList<QByteArray>& roles)

 {
 {

-    const QList<AdditionalInfo> previousList = info;
+    const QList<QByteArray> previousRoles = roles;

 
     ViewProperties props(url());
 
     ViewProperties props(url());

-    props.setAdditionalInfoList(info);
+    props.setVisibleRoles(roles);

 
 

-    m_additionalInfoList = info;
-    applyAdditionalInfoListToView();
+    m_visibleRoles = roles;
+    m_container->setVisibleRoles(roles);

 
 

-    emit additionalInfoListChanged(m_additionalInfoList, previousList);
+    emit visibleRolesChanged(m_visibleRoles, previousRoles);

 }
 
 }
 

-QList<DolphinView::AdditionalInfo> DolphinView::additionalInfoList() const
+QList<QByteArray> DolphinView::visibleRoles() const

 {
 {

-    return m_additionalInfoList;
+    return m_visibleRoles;

 }
 
 void DolphinView::reload()
 }
 
 void DolphinView::reload()


@@ -446,11 +457,24 @@ void DolphinView::stopLoading()
     m_dirLister->stop();
 }
 
     m_dirLister->stop();
 }
 

-void DolphinView::refresh()
+void DolphinView::readSettings()

 {
 {

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

     GeneralSettings::self()->readConfig();
     GeneralSettings::self()->readConfig();

-    m_container->refresh();
+    m_container->readSettings();

     applyViewProperties();
     applyViewProperties();

+
+    const int newZoomLevel = m_container->zoomLevel();
+    if (newZoomLevel != oldZoomLevel) {
+        emit zoomLevelChanged(newZoomLevel, oldZoomLevel);
+    }
+}
+
+void DolphinView::writeSettings()
+{
+    GeneralSettings::self()->writeConfig();
+    m_container->writeSettings();

 }
 
 void DolphinView::setNameFilter(const QString& nameFilter)
 }
 
 void DolphinView::setNameFilter(const QString& nameFilter)


@@ -515,9 +539,12 @@ QString DolphinView::statusBarText() const
 
     if (fileCount > 0 && folderCount > 0) {
         summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
 
     if (fileCount > 0 && folderCount > 0) {
         summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",

-                        foldersText, filesText, fileSizeText(totalFileSize));
+                        foldersText, filesText,
+                        KGlobal::locale()->formatByteSize(totalFileSize));

     } else if (fileCount > 0) {
     } else if (fileCount > 0) {

-        summary = i18nc("@info:status files (size)", "%1 (%2)", filesText, fileSizeText(totalFileSize));
+        summary = i18nc("@info:status files (size)", "%1 (%2)",
+                        filesText,
+                        KGlobal::locale()->formatByteSize(totalFileSize));

     } else if (folderCount > 0) {
         summary = foldersText;
     }
     } else if (folderCount > 0) {
         summary = foldersText;
     }


@@ -661,6 +688,22 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
         }
         break;
 
         }
         break;
 

+    case QEvent::GraphicsSceneDragEnter:
+        if (watched == m_container->controller()->view()) {
+            m_dragging = true;
+        }
+        break;
+
+    case QEvent::GraphicsSceneDragLeave:
+        if (watched == m_container->controller()->view()) {
+            m_dragging = false;
+        }
+        break;
+
+    case QEvent::GraphicsSceneDrop:
+        if (watched == m_container->controller()->view()) {
+            m_dragging = false;
+        }

     default:
         break;
     }
     default:
         break;
     }


@@ -681,6 +724,12 @@ void DolphinView::wheelEvent(QWheelEvent* event)
     }
 }
 
     }
 }
 

+void DolphinView::hideEvent(QHideEvent* event)
+{
+    hideToolTip();
+    QWidget::hideEvent(event);
+}
+

 void DolphinView::activate()
 {
     setActive(true);
 void DolphinView::activate()
 {
     setActive(true);


@@ -737,59 +786,147 @@ void DolphinView::slotViewContextMenuRequested(const QPointF& pos)
 
 void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
 {
 
 void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
 {

-    QWeakPointer<KMenu> menu = new KMenu(QApplication::activeWindow());
+    ViewProperties props(url());
+
+    QPointer<KMenu> menu = new KMenu(QApplication::activeWindow());

 
     KItemListView* view = m_container->controller()->view();
     const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();
 
 
     KItemListView* view = m_container->controller()->view();
     const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();
 

+    bool nepomukRunning = false;
+    bool indexingEnabled = false;
+#ifdef HAVE_NEPOMUK
+    nepomukRunning = (Nepomuk::ResourceManager::instance()->init() == 0);
+    if (nepomukRunning) {
+        KConfig config("nepomukserverrc");
+        indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);
+    }
+#endif
+
+    QString groupName;
+    QMenu* groupMenu = 0;
+

     // Add all roles to the menu that can be shown or hidden by the user
     // Add all roles to the menu that can be shown or hidden by the user

-    const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
-    const QList<DolphinView::AdditionalInfo> keys = infoAccessor.keys();
-    foreach (const DolphinView::AdditionalInfo info, keys) {
-        const QByteArray& role = infoAccessor.role(info);
-        if (role != "name") {
-            const QString text = fileItemModel()->roleDescription(role);
-
-            QAction* action = menu.data()->addAction(text);
-            action->setCheckable(true);
-            action->setChecked(visibleRolesSet.contains(role));
-            action->setData(info);
+    const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation();
+    foreach (const KFileItemModel::RoleInfo& info, rolesInfo) {
+        if (info.role == "name") {
+            // It should not be possible to hide the "name" role
+            continue;

         }
         }

-    }

 
 

-    QAction* action = menu.data()->exec(pos.toPoint());
-    if (action) {
-        // Show or hide the selected role
-        const DolphinView::AdditionalInfo info =
-            static_cast<DolphinView::AdditionalInfo>(action->data().toInt());
+        const QString text = fileItemModel()->roleDescription(info.role);
+        QAction* action = 0;
+        if (info.group.isEmpty()) {
+            action = menu->addAction(text);
+        } else {
+            if (!groupMenu || info.group != groupName) {
+                groupName = info.group;
+                groupMenu = menu->addMenu(groupName);
+            }

 
 

-        ViewProperties props(url());
-        QList<DolphinView::AdditionalInfo> infoList = props.additionalInfoList();
+            action = groupMenu->addAction(text);
+        }

 
 

-        const QByteArray selectedRole = infoAccessor.role(info);
-        QList<QByteArray> visibleRoles = view->visibleRoles();
+        action->setCheckable(true);
+        action->setChecked(visibleRolesSet.contains(info.role));
+        action->setData(info.role);

 
 

-        if (action->isChecked()) {
-            const int index = keys.indexOf(info) + 1;
-            visibleRoles.insert(index, selectedRole);
-            infoList.insert(index, info);
+        const bool enable = (!info.requiresNepomuk && !info.requiresIndexer) ||
+                            (info.requiresNepomuk && nepomukRunning) ||
+                            (info.requiresIndexer && indexingEnabled);
+        action->setEnabled(enable);
+    }
+
+    menu->addSeparator();
+
+    QActionGroup* widthsGroup = new QActionGroup(menu);
+    const bool autoColumnWidths = props.headerColumnWidths().isEmpty();
+
+    QAction* autoAdjustWidthsAction = menu->addAction(i18nc("@action:inmenu", "Automatic Column Widths"));
+    autoAdjustWidthsAction->setCheckable(true);
+    autoAdjustWidthsAction->setChecked(autoColumnWidths);
+    autoAdjustWidthsAction->setActionGroup(widthsGroup);
+
+    QAction* customWidthsAction = menu->addAction(i18nc("@action:inmenu", "Custom Column Widths"));
+    customWidthsAction->setCheckable(true);
+    customWidthsAction->setChecked(!autoColumnWidths);
+    customWidthsAction->setActionGroup(widthsGroup);
+
+    QAction* action = menu->exec(pos.toPoint());
+    if (menu && action) {
+        KItemListHeader* header = view->header();
+
+        if (action == autoAdjustWidthsAction) {
+            // Clear the column-widths from the viewproperties and turn on
+            // the automatic resizing of the columns
+            props.setHeaderColumnWidths(QList<int>());
+            header->setAutomaticColumnResizing(true);
+        } else if (action == customWidthsAction) {
+            // Apply the current column-widths as custom column-widths and turn
+            // off the automatic resizing of the columns
+            QList<int> columnWidths;
+            foreach (const QByteArray& role, view->visibleRoles()) {
+                columnWidths.append(header->columnWidth(role));
+            }
+            props.setHeaderColumnWidths(columnWidths);
+            header->setAutomaticColumnResizing(false);

         } else {
         } else {

-            visibleRoles.removeOne(selectedRole);
-            infoList.removeOne(info);
+            // Show or hide the selected role
+            const QByteArray selectedRole = action->data().toByteArray();
+
+            QList<QByteArray> visibleRoles = view->visibleRoles();
+            if (action->isChecked()) {
+                visibleRoles.append(selectedRole);
+            } else {
+                visibleRoles.removeOne(selectedRole);
+            }
+
+            view->setVisibleRoles(visibleRoles);
+            props.setVisibleRoles(visibleRoles);
+
+            QList<int> columnWidths;
+            if (!header->automaticColumnResizing()) {
+                foreach (const QByteArray& role, view->visibleRoles()) {
+                    columnWidths.append(header->columnWidth(role));
+                }
+            }
+            props.setHeaderColumnWidths(columnWidths);

         }
         }

+    }
+
+    delete menu;
+}
+
+void DolphinView::slotHeaderColumnWidthChanged(const QByteArray& role, qreal current, qreal previous)
+{
+    Q_UNUSED(previous);
+
+    const QList<QByteArray> visibleRoles = m_container->visibleRoles();

 
 

-        view->setVisibleRoles(visibleRoles);
-        props.setAdditionalInfoList(infoList);
+    ViewProperties props(url());
+    QList<int> columnWidths = props.headerColumnWidths();
+    if (columnWidths.count() != visibleRoles.count()) {
+        columnWidths.clear();
+        columnWidths.reserve(visibleRoles.count());
+        const KItemListHeader* header = m_container->controller()->view()->header();
+        foreach (const QByteArray& role, visibleRoles) {
+            const int width = header->columnWidth(role);
+            columnWidths.append(width);
+        }

     }
 
     }
 

-    delete menu.data();
+    const int roleIndex = visibleRoles.indexOf(role);
+    Q_ASSERT(roleIndex >= 0 && roleIndex < columnWidths.count());
+    columnWidths[roleIndex] = current;
+
+    props.setHeaderColumnWidths(columnWidths);

 }
 
 void DolphinView::slotItemHovered(int index)
 {
     const KFileItem item = fileItemModel()->fileItem(index);
 
 }
 
 void DolphinView::slotItemHovered(int index)
 {
     const KFileItem item = fileItemModel()->fileItem(index);
 

-    if (GeneralSettings::showToolTips() && QApplication::mouseButtons() == Qt::NoButton) {
+    if (GeneralSettings::showToolTips() && !m_dragging) {

         QRectF itemRect = m_container->controller()->view()->itemContextRect(index);
         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);
         QRectF itemRect = m_container->controller()->view()->itemContextRect(index);
         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);


@@ -809,13 +946,16 @@ void DolphinView::slotItemUnhovered(int index)
 
 void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {
 
 void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {

+    KUrl destUrl;

     KFileItem destItem = fileItemModel()->fileItem(index);
     KFileItem destItem = fileItemModel()->fileItem(index);

-    if (destItem.isNull()) {
+    if (destItem.isNull() || (!destItem.isDir() && !destItem.isDesktopFile())) {
+        // Use the URL of the view as drop target if the item is no directory
+        // or desktop-file

         destItem = fileItemModel()->rootItem();
         destItem = fileItemModel()->rootItem();

-        if (destItem.isNull()) {
-            kWarning() << "No destination item available for drop operation.";
-            return;
-        }
+        destUrl = url();
+    } else {
+        // The item represents a directory or desktop-file
+        destUrl = destItem.url();

     }
 
     QDropEvent dropEvent(event->pos().toPoint(),
     }
 
     QDropEvent dropEvent(event->pos().toPoint(),


@@ -824,10 +964,15 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
                          event->buttons(),
                          event->modifiers());
 
                          event->buttons(),
                          event->modifiers());
 

-    const QString error = DragAndDropHelper::dropUrls(destItem, &dropEvent);
+    const QString error = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent);

     if (!error.isEmpty()) {
         emit errorMessage(error);
     }
     if (!error.isEmpty()) {
         emit errorMessage(error);
     }

+
+    if (destUrl == url()) {
+        // Mark the dropped urls as selected.
+        markPastedUrlsAsSelected(event->mimeData());
+    }

 }
 
 void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
 }
 
 void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)


@@ -843,6 +988,22 @@ void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* prev
     m_versionControlObserver->setModel(fileItemModel);
 }
 
     m_versionControlObserver->setModel(fileItemModel);
 }
 

+void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons)
+{
+    hideToolTip();
+
+    if (itemIndex < 0) {
+        // Trigger the history navigation only when clicking on the viewport:
+        // Above an item the XButtons provide a simple way to select items in
+        // the singleClick mode.
+        if (buttons & Qt::XButton1) {
+            emit goBackRequested();
+        } else if (buttons & Qt::XButton2) {
+            emit goForwardRequested();
+        }
+    }
+}
+

 void DolphinView::slotSelectionChanged(const QSet<int>& current, const QSet<int>& previous)
 {
     const int currentCount = current.count();
 void DolphinView::slotSelectionChanged(const QSet<int>& current, const QSet<int>& previous)
 {
     const int currentCount = current.count();


@@ -863,25 +1024,15 @@ void DolphinView::emitSelectionChangedSignal()
     emit selectionChanged(selectedItems());
 }
 
     emit selectionChanged(selectedItems());
 }
 

-void DolphinView::dropUrls(const KFileItem& destItem,
-                           const KUrl& destPath,
-                           QDropEvent* event)
-{
-    Q_UNUSED(destItem);
-    Q_UNUSED(destPath);
-    markPastedUrlsAsSelected(event->mimeData());
-    //DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);
-}
-
-void DolphinView::updateSorting(DolphinView::Sorting sorting)
+void DolphinView::updateSortRole(const QByteArray& role)

 {
     ViewProperties props(url());
 {
     ViewProperties props(url());

-    props.setSorting(sorting);
+    props.setSortRole(role);

 
     KItemModelBase* model = m_container->controller()->model();
 
     KItemModelBase* model = m_container->controller()->model();

-    model->setSortRole(sortRoleForSorting(sorting));
+    model->setSortRole(role);

 
 

-    emit sortingChanged(sorting);
+    emit sortRoleChanged(role);

 }
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
 }
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)


@@ -1026,6 +1177,8 @@ void DolphinView::updateViewState()
     }
 
     if (!m_selectedUrls.isEmpty()) {
     }
 
     if (!m_selectedUrls.isEmpty()) {

+        clearSelection();
+

         KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
         QSet<int> selectedItems = selectionManager->selectedItems();
         const KFileItemModel* model = fileItemModel();
         KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
         QSet<int> selectedItems = selectionManager->selectedItems();
         const KFileItemModel* model = fileItemModel();


@@ -1083,9 +1236,7 @@ void DolphinView::slotDirListerStarted(const KUrl& url)
 void DolphinView::slotLoadingCompleted()
 {
     // Update the view-state. This has to be done using a Qt::QueuedConnection
 void DolphinView::slotLoadingCompleted()
 {
     // Update the view-state. This has to be done using a Qt::QueuedConnection

-    // because the view might not be in its final state yet (the view also
-    // listens to the completed()-signal from KDirLister and the order of
-    // of slots is undefined).
+    // because the view might not be in its final state yet.

     QTimer::singleShot(0, this, SLOT(updateViewState()));
 
     emit finishedPathLoading(url());
     QTimer::singleShot(0, this, SLOT(updateViewState()));
 
     emit finishedPathLoading(url());


@@ -1121,10 +1272,25 @@ void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const Q
     Q_ASSERT(fileItemModel()->sortRole() == current);
 
     ViewProperties props(url());
     Q_ASSERT(fileItemModel()->sortRole() == current);
 
     ViewProperties props(url());

-    const Sorting sorting = sortingForSortRole(current);
-    props.setSorting(sorting);
+    props.setSortRole(current);
+
+    emit sortRoleChanged(current);
+}
+
+void DolphinView::slotVisibleRolesChangedByHeader(const QList<QByteArray>& current,
+                                                  const QList<QByteArray>& previous)
+{
+    Q_UNUSED(previous);
+    Q_ASSERT(m_container->controller()->view()->visibleRoles() == current);
+
+    const QList<QByteArray> previousVisibleRoles = m_visibleRoles;
+
+    m_visibleRoles = current;
+
+    ViewProperties props(url());
+    props.setVisibleRoles(m_visibleRoles);

 
 

-    emit sortingChanged(sorting);
+    emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles);

 }
 
 KFileItemModel* DolphinView::fileItemModel() const
 }
 
 KFileItemModel* DolphinView::fileItemModel() const


@@ -1156,19 +1322,6 @@ void DolphinView::applyViewProperties()
 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {
 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {

-        // Prevent an animated transition of the position and size of the items when switching
-        // the view-mode by temporary clearing the model and updating it again after the view mode
-        // has been modified.
-        const bool restoreModel = (model->count() > 0);
-        if (restoreModel) {
-            const int currentItemIndex = m_container->controller()->selectionManager()->currentItem();
-            if (currentItemIndex >= 0) {
-                m_currentItemUrl = model->fileItem(currentItemIndex).url();
-            }
-            m_selectedUrls = selectedItems().urlList();
-            model->clear();
-        }
-

         const Mode previousMode = m_mode;
         m_mode = mode;
 
         const Mode previousMode = m_mode;
         m_mode = mode;
 


@@ -1189,10 +1342,6 @@ void DolphinView::applyViewProperties()
         if (m_container->zoomLevel() != oldZoomLevel) {
             emit zoomLevelChanged(m_container->zoomLevel(), oldZoomLevel);
         }
         if (m_container->zoomLevel() != oldZoomLevel) {
             emit zoomLevelChanged(m_container->zoomLevel(), oldZoomLevel);
         }

-
-        if (restoreModel) {
-            loadDirectory(url());
-        }

     }
 
     const bool hiddenFilesShown = props.hiddenFilesShown();
     }
 
     const bool hiddenFilesShown = props.hiddenFilesShown();


@@ -1207,11 +1356,10 @@ void DolphinView::applyViewProperties()
         emit groupedSortingChanged(groupedSorting);
     }
 
         emit groupedSortingChanged(groupedSorting);
     }
 

-    const DolphinView::Sorting sorting = props.sorting();
-    const QByteArray newSortRole = sortRoleForSorting(sorting);
-    if (newSortRole != model->sortRole()) {
-        model->setSortRole(newSortRole);
-        emit sortingChanged(sorting);
+    const QByteArray sortRole = props.sortRole();
+    if (sortRole != model->sortRole()) {
+        model->setSortRole(sortRole);
+        emit sortRoleChanged(sortRole);

     }
 
     const Qt::SortOrder sortOrder = props.sortOrder();
     }
 
     const Qt::SortOrder sortOrder = props.sortOrder();


@@ -1226,12 +1374,12 @@ void DolphinView::applyViewProperties()
         emit sortFoldersFirstChanged(sortFoldersFirst);
     }
 
         emit sortFoldersFirstChanged(sortFoldersFirst);
     }
 

-    const QList<DolphinView::AdditionalInfo> infoList = props.additionalInfoList();
-    if (infoList != m_additionalInfoList) {
-        const QList<DolphinView::AdditionalInfo> previousList = m_additionalInfoList;
-        m_additionalInfoList = infoList;
-        applyAdditionalInfoListToView();
-        emit additionalInfoListChanged(m_additionalInfoList, previousList);
+    const QList<QByteArray> visibleRoles = props.visibleRoles();
+    if (visibleRoles != m_visibleRoles) {
+        const QList<QByteArray> previousVisibleRoles = m_visibleRoles;
+        m_visibleRoles = visibleRoles;
+        m_container->setVisibleRoles(visibleRoles);
+        emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles);

     }
 
     const bool previewsShown = props.previewsShown();
     }
 
     const bool previewsShown = props.previewsShown();


@@ -1247,22 +1395,25 @@ void DolphinView::applyViewProperties()
         }
     }
 
         }
     }
 

-    m_container->endTransaction();
-}
-
-void DolphinView::applyAdditionalInfoListToView()
-{
-    const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
-
-    QList<QByteArray> visibleRoles;
-    visibleRoles.reserve(m_additionalInfoList.count() + 1);
-    visibleRoles.append("name");
-
-    foreach (AdditionalInfo info, m_additionalInfoList) {
-        visibleRoles.append(infoAccessor.role(info));
+    KItemListView* itemListView = m_container->controller()->view();
+    if (itemListView->isHeaderVisible()) {
+        KItemListHeader* header = itemListView->header();
+        const QList<int> headerColumnWidths = props.headerColumnWidths();
+        const int rolesCount = m_visibleRoles.count();
+        if (headerColumnWidths.count() == rolesCount) {
+            header->setAutomaticColumnResizing(false);
+
+            QHash<QByteArray, qreal> columnWidths;
+            for (int i = 0; i < rolesCount; ++i) {
+                columnWidths.insert(m_visibleRoles[i], headerColumnWidths[i]);
+            }
+            header->setColumnWidths(columnWidths);
+        } else {
+            header->setAutomaticColumnResizing(true);
+        }

     }
 
     }
 

-    m_container->setVisibleRoles(visibleRoles);
+    m_container->endTransaction();

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


@@ -1299,8 +1450,13 @@ QMimeData* DolphinView::selectionMimeData() const
 
 void DolphinView::markPastedUrlsAsSelected(const QMimeData* mimeData)
 {
 
 void DolphinView::markPastedUrlsAsSelected(const QMimeData* mimeData)
 {

-    const KUrl::List urls = KUrl::List::fromMimeData(mimeData);
-    markUrlsAsSelected(urls);
+    const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
+    KUrl::List destUrls;
+    foreach (const KUrl& source, sourceUrls) {
+        KUrl destination(url().url() + "/" + source.fileName());
+        destUrls << destination;
+    }
+    markUrlsAsSelected(destUrls);

 }
 
 void DolphinView::updateWritableState()
 }
 
 void DolphinView::updateWritableState()


@@ -1318,62 +1474,4 @@ void DolphinView::updateWritableState()
     }
 }
 
     }
 }
 

-QByteArray DolphinView::sortRoleForSorting(Sorting sorting) const
-{
-    switch (sorting) {
-    case SortByName:        return "name";
-    case SortBySize:        return "size";
-    case SortByDate:        return "date";
-    case SortByPermissions: return "permissions";
-    case SortByOwner:       return "owner";
-    case SortByGroup:       return "group";
-    case SortByType:        return "type";
-    case SortByDestination: return "destination";
-    case SortByPath:        return "path";
-    default: break;
-    }
-
-    return QByteArray();
-}
-
-DolphinView::Sorting DolphinView::sortingForSortRole(const QByteArray& sortRole) const
-{
-    static QHash<QByteArray, DolphinView::Sorting> sortHash;
-    if (sortHash.isEmpty()) {
-        sortHash.insert("name", SortByName);
-        sortHash.insert("size", SortBySize);
-        sortHash.insert("date", SortByDate);
-        sortHash.insert("permissions", SortByPermissions);
-        sortHash.insert("owner", SortByOwner);
-        sortHash.insert("group", SortByGroup);
-        sortHash.insert("type", SortByType);
-        sortHash.insert("destination", SortByDestination);
-        sortHash.insert("path", SortByPath);
-    }
-    return sortHash.value(sortRole);
-}
-
-QString DolphinView::fileSizeText(KIO::filesize_t fileSize)
-{
-    const KLocale* locale = KGlobal::locale();
-    const unsigned int multiplier = (locale->binaryUnitDialect() == KLocale::MetricBinaryDialect)
-                                    ? 1000 : 1024;
-
-    QString text;
-    if (fileSize < multiplier) {
-        // Show the size in bytes
-        text = locale->formatByteSize(fileSize, 0, KLocale::DefaultBinaryDialect, KLocale::UnitByte);
-    } else if (fileSize < multiplier * multiplier) {
-        // Show the size in kilobytes and always round up. This is done
-        // for consistency with the values shown e.g. in the "Size" column
-        // of the details-view.
-        fileSize += (multiplier / 2) - 1;
-        text = locale->formatByteSize(fileSize, 0, KLocale::DefaultBinaryDialect, KLocale::UnitKiloByte);
-    } else {
-        // Show the size in the best fitting unit having one decimal
-        text = locale->formatByteSize(fileSize, 1);
-    }
-    return text;
-}
-

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