1) Make sure that size qprogressbar is really updated after each change

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index f5a972d374418161afda0649673667a052904de4..bfca285cf7ad9fcdbcd0faac4330ecc02b3ea523 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -57,6 +57,7 @@
 #include "dolphin_generalsettings.h"
 #include "iconmanager.h"
 #include "renamedialog.h"
 #include "dolphin_generalsettings.h"
 #include "iconmanager.h"
 #include "renamedialog.h"

+#include "tooltipmanager.h"

 #include "viewproperties.h"
 
 DolphinView::DolphinView(QWidget* parent,
 #include "viewproperties.h"
 
 DolphinView::DolphinView(QWidget* parent,


@@ -69,6 +70,8 @@ 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_mode(DolphinView::IconsView),
     m_topLayout(0),
     m_controller(0),
     m_mode(DolphinView::IconsView),
     m_topLayout(0),
     m_controller(0),


@@ -80,9 +83,11 @@ DolphinView::DolphinView(QWidget* parent,
     m_dolphinModel(dolphinModel),
     m_dirLister(dirLister),
     m_proxyModel(proxyModel),
     m_dolphinModel(dolphinModel),
     m_dirLister(dirLister),
     m_proxyModel(proxyModel),

-    m_iconManager(0)
+    m_iconManager(0),
+    m_toolTipManager(0),
+    m_rootUrl(),
+    m_currentItemUrl()

 {
 {

-    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);


@@ -90,14 +95,10 @@ DolphinView::DolphinView(QWidget* parent,
     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(requestContextMenu(const QPoint&)),
             this, SLOT(openContextMenu(const QPoint&)));


@@ -111,6 +112,8 @@ DolphinView::DolphinView(QWidget* parent,
             this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&)));
     connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)),
             this, SLOT(triggerItem(const KFileItem&)));
             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&)),


@@ -118,6 +121,11 @@ 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, SLOT(slotRedirection(KUrl, KUrl)));
+    connect(m_dirLister, SIGNAL(completed()),
+            this, SLOT(restoreCurrentItem()));
+

     applyViewProperties(url);
     m_topLayout->addWidget(itemView());
 }
     applyViewProperties(url);
     m_topLayout->addWidget(itemView());
 }


@@ -143,7 +151,6 @@ void DolphinView::setActive(bool active)
     }
 
     m_active = active;
     }
 
     m_active = active;

-    m_selectionModel->clearSelection();

 
     QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
     if (active) {
 
     QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
     if (active) {


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

+        itemView()->setFocus();

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


@@ -214,69 +222,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;
-    m_iconManager->setShowPreview(show);
-    emit showPreviewChanged();
-
-    loadDirectory(viewPropsUrl);
-}
-

 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);
-}
-

 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


@@ -349,7 +304,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);


@@ -363,7 +318,7 @@ 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;


@@ -516,7 +471,7 @@ void DolphinView::setNameFilter(const QString& nameFilter)
 
 void DolphinView::calculateItemCount(int& fileCount, int& folderCount)
 {
 
 void DolphinView::calculateItemCount(int& fileCount, int& folderCount)
 {

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

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


@@ -527,181 +482,291 @@ void DolphinView::calculateItemCount(int& fileCount, int& folderCount)
 
 void DolphinView::setUrl(const KUrl& url)
 {
 
 void DolphinView::setUrl(const KUrl& url)
 {

+    // remember current item candidate (see restoreCurrentItem())
+    m_currentItemUrl = url;

     updateView(url, KUrl());
 }
 
     updateView(url, KUrl());
 }
 

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

 {
 {

-    QWidget::mouseReleaseEvent(event);
-    setActive(true);
+    clearSelection();
+    if (selection.isEmpty()) {
+        return;
+    }
+    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);
+        }
+    }
+    itemView()->selectionModel()->select(new_selection,
+                                         QItemSelectionModel::ClearAndSelect
+                                         | QItemSelectionModel::Current);

 }
 
 }
 

-void DolphinView::wheelEvent(QWheelEvent* event)
+void DolphinView::renameSelectedItems()

 {
 {

-    if (event->modifiers() & Qt::ControlModifier) {
-        const int delta = event->delta();
-        if ((delta > 0) && isZoomInPossible()) {
-            zoomIn();
-        } else if ((delta < 0) && isZoomOutPossible()) {
-            zoomOut();
+    const KFileItemList items = selectedItems();
+    if (items.count() > 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());
+        } else {
+            // 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('#'));
+
+            // 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);
+                    emit doingOperation(KIO::FileUndoManager::Rename);
+                }
+            }
+        }
+    } else if (DolphinSettings::instance().generalSettings()->renameInline()) {
+        Q_ASSERT(items.count() == 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(items.count() == 1);
+
+        RenameDialog dialog(this, items);
+        if (dialog.exec() == QDialog::Rejected) {
+            return;
+        }
+
+        const QString& newName = dialog.newName();
+        if (newName.isEmpty()) {
+            emit errorMessage(dialog.errorString());
+        } else {
+            const KUrl& oldUrl = items.first().url();
+            KUrl newUrl = oldUrl;
+            newUrl.setFileName(newName);
+            KonqOperations::rename(this, oldUrl, newUrl);
+            emit doingOperation(KIO::FileUndoManager::Rename);

         }
         }

-        event->accept();

     }
 }
 
     }
 }
 

-bool DolphinView::eventFilter(QObject* watched, QEvent* event)
+void DolphinView::trashSelectedItems()

 {
 {

-    if ((watched == itemView()) && (event->type() == QEvent::FocusIn)) {
-        m_controller->requestActivation();
-    }
-
-    return QWidget::eventFilter(watched, event);
+    emit doingOperation(KIO::FileUndoManager::Trash);
+    KonqOperations::del(this, KonqOperations::TRASH, selectedUrls());

 }
 
 }
 

-void DolphinView::activate()
+void DolphinView::deleteSelectedItems()

 {
 {

-    setActive(true);
+    const KUrl::List list = selectedUrls();
+    const bool del = KonqOperations::askDeleteConfirmation(list,
+                     KonqOperations::DEL,
+                     KonqOperations::DEFAULT_CONFIRMATION,
+                     this);
+
+    if (del) {
+        KIO::Job* job = KIO::del(list);
+        connect(job, SIGNAL(result(KJob*)),
+                this, SLOT(slotDeleteFileFinished(KJob*)));
+    }

 }
 
 }
 

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

 {
 {

-    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;
-    }
+    QMimeData* mimeData = new QMimeData();
+    const KUrl::List kdeUrls = selectedUrls();
+    const KUrl::List mostLocalUrls;
+    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
+    QApplication::clipboard()->setMimeData(mimeData);
+}

 
 

-    if (item.isNull()) {
-        return;
-    }
+void DolphinView::copySelectedItems()
+{
+    QMimeData* mimeData = new QMimeData();
+    const KUrl::List kdeUrls = selectedUrls();
+    const KUrl::List mostLocalUrls;
+    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false);
+    QApplication::clipboard()->setMimeData(mimeData);
+}

 
 

-    emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
+void DolphinView::paste()
+{
+    pasteToUrl(url());

 }
 
 }
 

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

 {
 {

-    emit selectionChanged(DolphinView::selectedItems());
+    const KFileItemList items = selectedItems();
+    if ((items.count() == 1) && items.first().isDir()) {
+        pasteToUrl(items.first().url());
+    }

 }
 
 }
 

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

 {
 {

-    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));
-        }
+    if (m_showPreview == show) {

         return;
     }
 
         return;
     }
 

-    m_loadingDirectory = true;
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setShowPreview(show);

 
 

-    m_dirLister->stop();
-    m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
+    m_showPreview = show;
+    m_iconManager->setShowPreview(show);
+    emit showPreviewChanged();

 
 

-    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);
-        }
-    }
+    loadDirectory(viewPropsUrl);

 }
 
 }
 

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

 {
 {

-    if (isColumnViewActive()) {
-        return m_columnView->rootUrl();
+    if (m_dirLister->showingDotFiles() == show) {
+        return;

     }
 
     }
 

-    return url();
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setShowHiddenFiles(show);
+
+    m_dirLister->setShowingDotFiles(show);
+    emit showHiddenFilesChanged();
+
+    loadDirectory(viewPropsUrl);

 }
 
 }
 

-void DolphinView::applyViewProperties(const KUrl& url)
+void DolphinView::setCategorizedSorting(bool categorized)

 {
 {

-    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 (categorized == categorizedSorting()) {

         return;
     }
 
         return;
     }
 

-    const ViewProperties props(url);
+    // setCategorizedSorting(true) may only get invoked
+    // if the view supports categorized sorting
+    Q_ASSERT(!categorized || supportsCategorizedSorting());

 
 

-    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);
+    ViewProperties props(viewPropertiesUrl());
+    props.setCategorizedSorting(categorized);
+    props.save();

 
 

-    const bool showHiddenFiles = props.showHiddenFiles();
-    if (showHiddenFiles != m_dirLister->showingDotFiles()) {
-        m_dirLister->setShowingDotFiles(showHiddenFiles);
-        emit showHiddenFilesChanged();
-    }
+    m_storedCategorizedSorting = categorized;
+    m_proxyModel->setCategorizedModel(categorized);

 
 

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

 
 

-    const DolphinView::Sorting sorting = props.sorting();
-    if (sorting != m_proxyModel->sorting()) {
-        m_proxyModel->setSorting(sorting);
-        emit sortingChanged(sorting);
-    }
+void DolphinView::toggleSortOrder()
+{
+    const Qt::SortOrder order = (sortOrder() == Qt::AscendingOrder) ?
+                                Qt::DescendingOrder :
+                                Qt::AscendingOrder;
+    setSortOrder(order);
+}

 
 

-    const Qt::SortOrder sortOrder = props.sortOrder();
-    if (sortOrder != m_proxyModel->sortOrder()) {
-        m_proxyModel->setSortOrder(sortOrder);
-        emit sortOrderChanged(sortOrder);
+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);

     }
     }

+}

 
 

-    KFileItemDelegate::InformationList info = props.additionalInfo();
-    if (info != m_fileItemDelegate->showInformation()) {
-        m_fileItemDelegate->setShowInformation(info);
-        emit additionalInfoChanged();
+
+void DolphinView::mouseReleaseEvent(QMouseEvent* event)
+{
+    QWidget::mouseReleaseEvent(event);
+    setActive(true);
+}
+
+void DolphinView::wheelEvent(QWheelEvent* event)
+{
+    if (event->modifiers() & Qt::ControlModifier) {
+        const int delta = event->delta();
+        if ((delta > 0) && isZoomInPossible()) {
+            zoomIn();
+        } else if ((delta < 0) && isZoomOutPossible()) {
+            zoomOut();
+        }
+        event->accept();

     }
     }

+}

 
 

-    const bool showPreview = props.showPreview();
-    if (showPreview != m_showPreview) {
-        m_showPreview = showPreview;
-        m_iconManager->setShowPreview(showPreview);
-        emit showPreviewChanged();
+bool DolphinView::eventFilter(QObject* watched, QEvent* event)
+{
+    if ((watched == itemView()) && (event->type() == QEvent::FocusIn)) {
+        m_controller->requestActivation();

     }
     }

+
+    return QWidget::eventFilter(watched, event);

 }
 
 }
 

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

 {
 {

-    clearSelection();
-    if (selection.isEmpty()) {
+    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;
     }
         return;
     }

-    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);
-        }
+
+    // TODO: the m_isContextMenuOpen check is a workaround for Qt-issue 207192
+    if (item.isNull() || m_isContextMenuOpen) {
+        return;

     }
     }

-    itemView()->selectionModel()->select(new_selection,
-                                         QItemSelectionModel::ClearAndSelect
-                                         | QItemSelectionModel::Current);
+
+    if (m_toolTipManager != 0) {
+        m_toolTipManager->hideTip();
+    }
+    emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
+}
+
+void DolphinView::emitSelectionChangedSignal()
+{
+    emit selectionChanged(DolphinView::selectedItems());

 }
 
 void DolphinView::openContextMenu(const QPoint& pos)
 }
 
 void DolphinView::openContextMenu(const QPoint& pos)


@@ -713,7 +778,13 @@ void DolphinView::openContextMenu(const QPoint& pos)
         item = fileItem(index);
     }
 
         item = fileItem(index);
     }
 

+    if (m_toolTipManager != 0) {
+        m_toolTipManager->hideTip();
+    }
+
+    m_isContextMenuOpen = true; // TODO: workaround for Qt-issue 207192

     emit requestContextMenu(item, url());
     emit requestContextMenu(item, url());

+    m_isContextMenuOpen = false;

 }
 
 void DolphinView::dropUrls(const KUrl::List& urls,
 }
 
 void DolphinView::dropUrls(const KUrl::List& urls,


@@ -734,8 +805,8 @@ void DolphinView::dropUrls(const KUrl::List& urls,
 {
     DolphinDropController dropController(this);
     // forward doingOperation signal up to the mainwindow
 {
     DolphinDropController dropController(this);
     // forward doingOperation signal up to the mainwindow

-    connect(&dropController, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)),
-            this, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)));
+    connect(&dropController, SIGNAL(doingOperation(KIO::FileUndoManager::CommandType)),
+            this, SIGNAL(doingOperation(KIO::FileUndoManager::CommandType)));

     dropController.dropUrls(urls, destination);
 }
 
     dropController.dropUrls(urls, destination);
 }
 


@@ -759,14 +830,6 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
     emit sortOrderChanged(order);
 }
 

-void DolphinView::toggleSortOrder()
-{
-    const Qt::SortOrder order = (sortOrder() == Qt::AscendingOrder) ?
-                                Qt::DescendingOrder :
-                                Qt::AscendingOrder;
-    setSortOrder(order);
-}
-

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


@@ -830,25 +893,39 @@ void DolphinView::updateAdditionalInfoActions(KActionCollection* collection)
     }
 }
 
     }
 }
 

-void DolphinView::toggleAdditionalInfo(QAction* action)
+QPair<bool, QString> DolphinView::pasteInfo() const

 {
 {

-    const KFileItemDelegate::Information info =
-        static_cast<KFileItemDelegate::Information>(action->data().toInt());
-
-    KFileItemDelegate::InformationList list = additionalInfo();
+    QPair<bool, QString> ret;
+    QClipboard* clipboard = QApplication::clipboard();
+    const QMimeData* mimeData = clipboard->mimeData();

 
 

-    const bool show = action->isChecked();
+    KUrl::List urls = KUrl::List::fromMimeData(mimeData);
+    if (!urls.isEmpty()) {
+        ret.first = true;
+        if (urls.count() == 1) {
+            const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, urls.first(), true);
+            ret.second = item.isDir() ? i18nc("@action:inmenu", "Paste One Folder") :
+                                        i18nc("@action:inmenu", "Paste One File");

 
 

-    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);
+        } else {
+            ret.second = i18ncp("@action:inmenu", "Paste One Item", "Paste %1 Items", urls.count());
+        }
+    } else {
+        ret.first = false;
+        ret.second = i18nc("@action:inmenu", "Paste");

     }
     }

+
+    return ret;
+}
+
+void DolphinView::setTabsForFilesEnabled(bool tabsForFiles)
+{
+    m_tabsForFiles = tabsForFiles;
+}
+
+bool DolphinView::isTabsForFilesEnabled() const
+{
+    return m_tabsForFiles;

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


@@ -866,17 +943,134 @@ void DolphinView::emitContentsMoved()
 
 void DolphinView::showHoverInformation(const KFileItem& item)
 {
 
 void DolphinView::showHoverInformation(const KFileItem& item)
 {

-    if (hasSelection() || !m_active) {
+    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 {
+        emit errorMessage(job->errorString());
+    }
+}
+
+
+void DolphinView::restoreCurrentItem()
+{
+    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();
+        }
+    }
+}
+
+void DolphinView::loadDirectory(const KUrl& url, bool reload)
+{
+    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;
+
+    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

 {
 {

-    if (m_active) {
-        emit requestItemInfo(KFileItem());
+    if (isColumnViewActive()) {
+        return m_columnView->rootUrl();
+    }
+
+    return url();
+}
+
+void DolphinView::applyViewProperties(const KUrl& url)
+{
+    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) {
+        m_mode = mode;
+        createView();
+        emit modeChanged();
+    }
+    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);
+    }
+
+    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_iconManager->setShowPreview(showPreview);
+        emit showPreviewChanged();

     }
 }
 
     }
 }
 


@@ -931,6 +1125,10 @@ void DolphinView::createView()
     m_iconManager = new IconManager(view, m_proxyModel);
     m_iconManager->setShowPreview(m_showPreview);
 
     m_iconManager = new IconManager(view, m_proxyModel);
     m_iconManager->setShowPreview(m_showPreview);
 

+    if (DolphinSettings::instance().generalSettings()->showToolTips()) {
+        m_toolTipManager = new ToolTipManager(view, m_proxyModel);
+    }
+

     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&)),


@@ -954,6 +1152,7 @@ void DolphinView::deleteView()
         m_columnView = 0;
         m_fileItemDelegate = 0;
         m_iconManager = 0;
         m_columnView = 0;
         m_fileItemDelegate = 0;
         m_iconManager = 0;

+        m_toolTipManager = 0;

     }
 }
 
     }
 }
 


@@ -986,198 +1185,33 @@ bool DolphinView::isCutItem(const KFileItem& item) const
     return false;
 }
 
     return false;
 }
 

-void DolphinView::renameSelectedItems()
-{
-    const KFileItemList items = selectedItems();
-    if (items.count() > 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());
-        } else {
-            // TODO: check how this can be integrated into KonqFileUndoManager/KonqOperations
-            // as one operation instead of n rename operations like it is done now...
-            Q_ASSERT(newName.contains('#'));
-
-            // iterate through all selected items and rename them...
-            int index = 1;
-            foreach (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);
-                    emit doingOperation(KonqFileUndoManager::RENAME);
-                }
-            }
-        }
-    } else {
-        // Only one item has been selected for renaming. Use the custom
-        // renaming mechanism from the views.
-        Q_ASSERT(items.count() == 1);
-
-        // TODO: Think about using KFileItemDelegate as soon as it supports editing.
-        // Currently the RenameDialog is used, but I'm not sure whether inline renaming
-        // is a benefit for the user at all -> let's wait for some input first...
-        RenameDialog dialog(this, items);
-        if (dialog.exec() == QDialog::Rejected) {
-            return;
-        }
-
-        const QString& newName = dialog.newName();
-        if (newName.isEmpty()) {
-            emit errorMessage(dialog.errorString());
-        } else {
-            const KUrl& oldUrl = items.first().url();
-            KUrl newUrl = oldUrl;
-            newUrl.setFileName(newName);
-            KonqOperations::rename(this, oldUrl, newUrl);
-            emit doingOperation(KonqFileUndoManager::RENAME);
-        }
-    }
-}
-
-void DolphinView::trashSelectedItems()
-{
-    emit doingOperation(KonqFileUndoManager::TRASH);
-    KonqOperations::del(this, KonqOperations::TRASH, selectedUrls());
-}
-
-void DolphinView::deleteSelectedItems()
-{
-    const KUrl::List list = selectedUrls();
-    const bool del = KonqOperations::askDeleteConfirmation(list,
-                     KonqOperations::DEL,
-                     KonqOperations::DEFAULT_CONFIRMATION,
-                     this);
-
-    if (del) {
-        KIO::Job* job = KIO::del(list);
-        connect(job, SIGNAL(result(KJob*)),
-                this, SLOT(slotDeleteFileFinished(KJob*)));
-    }
-}
-
-void DolphinView::slotDeleteFileFinished(KJob* job)
-{
-    if (job->error() == 0) {
-        emit operationCompletedMessage(i18nc("@info:status", "Delete operation completed."));
-    } else {
-        emit errorMessage(job->errorString());
-    }
-}
-
-void DolphinView::cutSelectedItems()
-{
-    QMimeData* mimeData = new QMimeData();
-    const KUrl::List kdeUrls = selectedUrls();
-    const KUrl::List mostLocalUrls;
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
-    QApplication::clipboard()->setMimeData(mimeData);
-}
-
-void DolphinView::copySelectedItems()
-{
-    QMimeData* mimeData = new QMimeData();
-    const KUrl::List kdeUrls = selectedUrls();
-    const KUrl::List mostLocalUrls;
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false);
-    QApplication::clipboard()->setMimeData(mimeData);
-}
-
-void DolphinView::paste()
+void DolphinView::pasteToUrl(const KUrl& url)

 {
     QClipboard* clipboard = QApplication::clipboard();
     const QMimeData* mimeData = clipboard->mimeData();
 
     const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
 {
     QClipboard* clipboard = QApplication::clipboard();
     const QMimeData* mimeData = clipboard->mimeData();
 
     const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);

-
-    // per default the pasting is done into the current URL of the view
-    KUrl destUrl = url();
-
-    // check whether the pasting should be done into a selected directory
-    const KUrl::List selectedUrls = this->selectedUrls();
-    if (selectedUrls.count() == 1) {
-        const KFileItem fileItem(S_IFDIR,
-                                 KFileItem::Unknown,
-                                 selectedUrls.first(),
-                                 true);
-        if (fileItem.isDir()) {
-            // only one item is selected which is a directory, hence paste
-            // into this directory
-            destUrl = selectedUrls.first();
-            if (sourceUrls.contains(destUrl)) {
-                const QString text = i18nc("@info", "The folder <filename>%1</filename> is pasted into itself. Is this intended?", fileItem.name());
-                int result = KMessageBox::questionYesNo(window(),
-                                                        text,
-                                                        i18nc("@title:window", "Paste into Folder"),
-                                                        KGuiItem(i18nc("@label", "Paste"), "dialog-ok"),
-                                                        KGuiItem(i18nc("@label", "Cancel"), "dialog-cancel"));
-                if (result == KMessageBox::No) {
-                    return;
-                }
-            }
-        }
-    }
-

     if (KonqMimeData::decodeIsCutSelection(mimeData)) {
     if (KonqMimeData::decodeIsCutSelection(mimeData)) {

-        KonqOperations::copy(this, KonqOperations::MOVE, sourceUrls, destUrl);
-        emit doingOperation(KonqFileUndoManager::MOVE);
+        KonqOperations::copy(this, KonqOperations::MOVE, sourceUrls, url);
+        emit doingOperation(KIO::FileUndoManager::Move);

         clipboard->clear();
     } else {
         clipboard->clear();
     } else {

-        KonqOperations::copy(this, KonqOperations::COPY, sourceUrls, destUrl);
-        emit doingOperation(KonqFileUndoManager::COPY);
+        KonqOperations::copy(this, KonqOperations::COPY, sourceUrls, url);
+        emit doingOperation(KIO::FileUndoManager::Copy);

     }
 }
 
     }
 }
 

-QPair<bool, QString> DolphinView::pasteInfo() const
+void DolphinView::slotRequestUrlChange(const KUrl& url)

 {
 {

-    QPair<bool, QString> ret;
-    QClipboard* clipboard = QApplication::clipboard();
-    const QMimeData* mimeData = clipboard->mimeData();
-
-    KUrl::List urls = KUrl::List::fromMimeData(mimeData);
-    if (!urls.isEmpty()) {
-        ret.first = true;
-        if (urls.count() == 1) {
-            const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, urls.first(), true);
-            ret.second = item.isDir() ? i18nc("@action:inmenu", "Paste One Folder") :
-                                        i18nc("@action:inmenu", "Paste One File");
-
-        } else {
-            ret.second = i18ncp("@action:inmenu", "Paste One Item", "Paste %1 Items", urls.count());
-        }
-    } else {
-        ret.first = false;
-        ret.second = i18nc("@action:inmenu", "Paste");
-    }
+    emit requestUrlChange(url);
+    m_controller->setUrl(url);
+}

 
 

-    if (ret.first) {
-        const KFileItemList items = selectedItems();
-        const uint count = items.count();
-        if (count > 1) {
-            // pasting should not be allowed when more than one file
-            // is selected
-            ret.first = false;
-        } else if (count == 1) {
-            // Only one file is selected. Pasting is only allowed if this
-            // file is a directory.
-            ret.first = items.first().isDir();
-        }
+void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
+{
+    if (oldUrl == m_controller->url()) {
+        m_controller->setUrl(newUrl);

     }
     }

-    return ret;

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