X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f37ecd6ecfab9bc1d2929504b4f6e4363f8137b9..220d0d522dd3aca740c4c2d0c1f91f277f2405fd:/src/panels/folders/folderspanel.cpp

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 72d9a0952..0760200b6 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006-2010 by Peter Penz <peter.penz19@gmail.com>        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -19,40 +19,38 @@
 
 #include "folderspanel.h"
 
-#include "dolphinmodel.h"
-#include "dolphinsortfilterproxymodel.h"
-#include "dolphinview.h"
-#include "settings/dolphinsettings.h"
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"
-#include "draganddrophelper.h"
-#include "folderexpander.h"
-#include "renamedialog.h"
-#include "paneltreeview.h"
 #include "treeviewcontextmenu.h"
+#include "foldersitemlistwidget.h"
 
-#include <kfileplacesmodel.h>
-#include <kdirlister.h>
-#include <kfileitem.h>
+#include <kitemviews/kitemlistselectionmanager.h>
+#include <kitemviews/kfileitemlistview.h>
+#include <kitemviews/kfileitemlistwidget.h>
+#include <kitemviews/kitemlistcontainer.h>
+#include <kitemviews/kitemlistcontroller.h>
+#include <kitemviews/kfileitemmodel.h>
+
+#include <KFileItem>
 #include <konq_operations.h>
 
 #include <QApplication>
-#include <QItemSelection>
-#include <QTreeView>
 #include <QBoxLayout>
-#include <QModelIndex>
-#include <QScrollBar>
+#include <QDropEvent>
+#include <QGraphicsSceneDragDropEvent>
+#include <QGraphicsView>
+#include <QPropertyAnimation>
 #include <QTimer>
 
+#include <views/draganddrophelper.h>
+
+#include <KDebug>
+
 FoldersPanel::FoldersPanel(QWidget* parent) :
     Panel(parent),
-    m_setLeafVisible(false),
-    m_mouseButtons(Qt::NoButton),
-    m_dirLister(0),
-    m_dolphinModel(0),
-    m_proxyModel(0),
-    m_treeView(0),
-    m_leafDir()
+    m_updateCurrentItem(false),
+    m_controller(0),
+    m_model(0)
 {
     setLayoutDirection(Qt::LeftToRight);
 }
@@ -61,64 +59,54 @@ FoldersPanel::~FoldersPanel()
 {
     FoldersPanelSettings::self()->writeConfig();
 
-    delete m_proxyModel;
-    m_proxyModel = 0;
-    delete m_dolphinModel;
-    m_dolphinModel = 0;
-    m_dirLister = 0; // deleted by m_dolphinModel
+    if (m_controller) {
+        KItemListView* view = m_controller->view();
+        m_controller->setView(0);
+        delete view;
+    }
 }
 
-QSize FoldersPanel::sizeHint() const
+void FoldersPanel::setShowHiddenFiles(bool show)
 {
-    return QSize(200, 400);
+    FoldersPanelSettings::setHiddenFilesShown(show);
+    m_model->setShowHiddenFiles(show);
 }
 
-void FoldersPanel::setShowHiddenFiles(bool show)
+bool FoldersPanel::showHiddenFiles() const
 {
-    FoldersPanelSettings::setShowHiddenFiles(show);
-    if (m_dirLister != 0) {
-        m_dirLister->setShowingDotFiles(show);
-        m_dirLister->openUrl(m_dirLister->url(), KDirLister::Reload);
-    }
+    return FoldersPanelSettings::hiddenFilesShown();
 }
 
-bool FoldersPanel::showHiddenFiles() const
+void FoldersPanel::setAutoScrolling(bool enable)
+{
+    // TODO: Not supported yet in Dolphin 2.0
+    FoldersPanelSettings::setAutoScrolling(enable);
+}
+
+bool FoldersPanel::autoScrolling() const
 {
-    return FoldersPanelSettings::showHiddenFiles();
+    return FoldersPanelSettings::autoScrolling();
 }
 
 void FoldersPanel::rename(const KFileItem& item)
 {
-    if (DolphinSettings::instance().generalSettings()->renameInline()) {
-        const QModelIndex dirIndex = m_dolphinModel->indexForItem(item);
-        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
-        m_treeView->edit(proxyIndex);
-    } else {
-        KFileItemList items;
-        items.append(item);
-        RenameDialog dialog(this, items);
-        if (dialog.exec() == QDialog::Accepted) {
-            const QString& newName = dialog.newName();
-            if (!newName.isEmpty()) {
-                KUrl newUrl = item.url();
-                newUrl.setFileName(newName);
-                KonqOperations::rename(this, item.url(), newUrl);
-            }
-        }
-    }
+    const int index = m_model->index(item);
+    m_controller->view()->editRole(index, "text");
 }
 
-void FoldersPanel::setUrl(const KUrl& url)
+bool FoldersPanel::urlChanged()
 {
-    if (!url.isValid() || (url == Panel::url())) {
-        return;
+    if (!url().isValid() || url().protocol().contains("search")) {
+        // Skip results shown by a search, as possible identical
+        // directory names are useless without parent-path information.
+        return false;
     }
 
-    Panel::setUrl(url);
-    if (m_dirLister != 0) {
-        m_setLeafVisible = true;
-        loadTree(url);
+    if (m_controller) {
+        loadTree(url());
     }
+
+    return true;
 }
 
 void FoldersPanel::showEvent(QShowEvent* event)
@@ -128,152 +116,204 @@ void FoldersPanel::showEvent(QShowEvent* event)
         return;
     }
 
-    if (m_dirLister == 0) {
-        // Postpone the creating of the dir lister to the first show event.
-        // This assures that no performance and memory overhead is given when the TreeView is not
-        // used at all (see FoldersPanel::setUrl()).
-        m_dirLister = new KDirLister();
-        m_dirLister->setDirOnlyMode(true);
-        m_dirLister->setAutoUpdate(true);
-        m_dirLister->setMainWindow(window());
-        m_dirLister->setDelayedMimeTypes(true);
-        m_dirLister->setAutoErrorHandlingEnabled(false, this);
-        m_dirLister->setShowingDotFiles(FoldersPanelSettings::showHiddenFiles());
-
-        Q_ASSERT(m_dolphinModel == 0);
-        m_dolphinModel = new DolphinModel(this);
-        m_dolphinModel->setDirLister(m_dirLister);
-        m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory);
-        connect(m_dolphinModel, SIGNAL(expand(const QModelIndex&)),
-                this, SLOT(expandToDir(const QModelIndex&)));
-
-        Q_ASSERT(m_proxyModel == 0);
-        m_proxyModel = new DolphinSortFilterProxyModel(this);
-        m_proxyModel->setSourceModel(m_dolphinModel);
-
-        Q_ASSERT(m_treeView == 0);
-        m_treeView = new PanelTreeView(this);
-        m_treeView->setModel(m_proxyModel);
-        m_proxyModel->setSorting(DolphinView::SortByName);
-        m_proxyModel->setSortOrder(Qt::AscendingOrder);
-
-        new FolderExpander(m_treeView, m_proxyModel);
-
-        connect(m_treeView, SIGNAL(clicked(const QModelIndex&)),
-                this, SLOT(updateActiveView(const QModelIndex&)));
-        connect(m_treeView, SIGNAL(urlsDropped(const QModelIndex&, QDropEvent*)),
-                this, SLOT(dropUrls(const QModelIndex&, QDropEvent*)));
-        connect(m_treeView, SIGNAL(pressed(const QModelIndex&)),
-                this, SLOT(updateMouseButtons()));
+    if (!m_controller) {
+        // Postpone the creating of the controller to the first show event.
+        // This assures that no performance and memory overhead is given when the folders panel is not
+        // used at all and stays invisible.
+        KFileItemListView* view  = new KFileItemListView();
+        view->setWidgetCreator(new KItemListWidgetCreator<FoldersItemListWidget>());
+        view->setSupportsItemExpanding(true);
+        // Set the opacity to 0 initially. The opacity will be increased after the loading of the initial tree
+        // has been finished in slotLoadingCompleted(). This prevents an unnecessary animation-mess when
+        // opening the folders panel.
+        view->setOpacity(0);
+
+        connect(view, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
+                this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
+
+        m_model = new KFileItemModel(this);
+        m_model->setShowDirectoriesOnly(true);
+        m_model->setShowHiddenFiles(FoldersPanelSettings::hiddenFilesShown());
+        // Use a QueuedConnection to give the view the possibility to react first on the
+        // finished loading.
+        connect(m_model, SIGNAL(directoryLoadingCompleted()), this, SLOT(slotLoadingCompleted()), Qt::QueuedConnection);
+
+        m_controller = new KItemListController(m_model, view, this);
+        m_controller->setSelectionBehavior(KItemListController::SingleSelection);
+        m_controller->setAutoActivationDelay(750);
+        m_controller->setSingleClickActivation(true);
+
+        connect(m_controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int)));
+        connect(m_controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
+        connect(m_controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
+        connect(m_controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
+        connect(m_controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
+
+        KItemListContainer* container = new KItemListContainer(m_controller, this);
+        container->setEnabledFrame(false);
 
         QVBoxLayout* layout = new QVBoxLayout(this);
         layout->setMargin(0);
-        layout->addWidget(m_treeView);
+        layout->addWidget(container);
     }
 
     loadTree(url());
     Panel::showEvent(event);
 }
 
-void FoldersPanel::contextMenuEvent(QContextMenuEvent* event)
+void FoldersPanel::keyPressEvent(QKeyEvent* event)
 {
-    Panel::contextMenuEvent(event);
-
-    KFileItem item;
-    const QModelIndex index = m_treeView->indexAt(event->pos());
-    if (index.isValid()) {
-        const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
-        item = m_dolphinModel->itemForIndex(dolphinModelIndex);
-        emit changeSelection(KFileItemList());
+    const int key = event->key();
+    if ((key == Qt::Key_Enter) || (key == Qt::Key_Return)) {
+        event->accept();
+    } else {
+        Panel::keyPressEvent(event);
     }
+}
 
-    TreeViewContextMenu contextMenu(this, item);
-    contextMenu.open();
+void FoldersPanel::slotItemActivated(int index)
+{
+    const KFileItem item = m_model->fileItem(index);
+    if (!item.isNull()) {
+        emit folderActivated(item.url());
+    }
 }
 
-void FoldersPanel::updateActiveView(const QModelIndex& index)
+void FoldersPanel::slotItemMiddleClicked(int index)
 {
-    const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
-    const KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
+    const KFileItem item = m_model->fileItem(index);
     if (!item.isNull()) {
-        emit changeUrl(item.url(), m_mouseButtons);
+        emit folderMiddleClicked(item.url());
+    }
+}
+
+void FoldersPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
+{
+    Q_UNUSED(pos);
+
+    const KFileItem fileItem = m_model->fileItem(index);
+
+    QWeakPointer<TreeViewContextMenu> contextMenu = new TreeViewContextMenu(this, fileItem);
+    contextMenu.data()->open();
+    if (contextMenu.data()) {
+        delete contextMenu.data();
     }
 }
 
-void FoldersPanel::dropUrls(const QModelIndex& index, QDropEvent* event)
+void FoldersPanel::slotViewContextMenuRequested(const QPointF& pos)
 {
-    if (index.isValid()) {
-        const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
-        KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
-        Q_ASSERT(!item.isNull());
-        if (item.isDir()) {
-            DragAndDropHelper::instance().dropUrls(item, item.url(), event, this);
+    Q_UNUSED(pos);
+
+    QWeakPointer<TreeViewContextMenu> contextMenu = new TreeViewContextMenu(this, KFileItem());
+    contextMenu.data()->open();
+    if (contextMenu.data()) {
+        delete contextMenu.data();
+    }
+}
+
+void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
+{
+    if (index >= 0) {
+        KFileItem destItem = m_model->fileItem(index);
+        if (destItem.isNull()) {
+            return;
+        }
+
+        QDropEvent dropEvent(event->pos().toPoint(),
+                             event->possibleActions(),
+                             event->mimeData(),
+                             event->buttons(),
+                             event->modifiers());
+
+        const QString error = DragAndDropHelper::dropUrls(destItem, destItem.url(), &dropEvent);
+        if (!error.isEmpty()) {
+            emit errorMessage(error);
         }
     }
 }
 
-void FoldersPanel::expandToDir(const QModelIndex& index)
+void FoldersPanel::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value)
 {
-    m_treeView->setExpanded(index, true);
-    selectLeafDirectory();
-    m_treeView->resizeColumnToContents(DolphinModel::Name);
+    if (role == "text") {
+        const KFileItem item = m_model->fileItem(index);
+        const QString newName = value.toString();
+        if (!newName.isEmpty() && newName != item.text() && newName != QLatin1String(".") && newName != QLatin1String("..")) {
+            KonqOperations::rename(this, item.url(), newName);
+        }
+    }
 }
 
-void FoldersPanel::scrollToLeaf()
+void FoldersPanel::slotLoadingCompleted()
 {
-    const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
-    const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
-    if (proxyIndex.isValid()) {
-        m_treeView->scrollTo(proxyIndex);
+    if (m_controller->view()->opacity() == 0) {
+        // The loading of the initial tree after opening the Folders panel
+        // has been finished. Trigger the increasing of the opacity after
+        // a short delay to give the view the chance to finish its internal
+        // animations.
+        // TODO: Check whether it makes sense to allow accessing the
+        // view-internal delay for usecases like this.
+        QTimer::singleShot(250, this, SLOT(startFadeInAnimation()));
     }
+
+    if (!m_updateCurrentItem) {
+        return;
+    }
+
+    const int index = m_model->index(url());
+    updateCurrentItem(index);
+    m_updateCurrentItem = false;
 }
 
-void FoldersPanel::updateMouseButtons()
+void FoldersPanel::startFadeInAnimation()
 {
-    m_mouseButtons = QApplication::mouseButtons();
+    QPropertyAnimation* anim = new QPropertyAnimation(m_controller->view(), "opacity", this);
+    anim->setStartValue(0);
+    anim->setEndValue(1);
+    anim->setEasingCurve(QEasingCurve::InOutQuad);
+    anim->start(QAbstractAnimation::DeleteWhenStopped);
+    anim->setDuration(200);
 }
 
 void FoldersPanel::loadTree(const KUrl& url)
 {
-    Q_ASSERT(m_dirLister != 0);
-    m_leafDir = url;
+    Q_ASSERT(m_controller);
+
+    m_updateCurrentItem = false;
 
     KUrl baseUrl;
     if (url.isLocalFile()) {
-        // use the root directory as base for local URLs (#150941)
+        // Use the root directory as base for local URLs (#150941)
         baseUrl = QDir::rootPath();
     } else {
-        // clear the path for non-local URLs and use it as base
+        // Clear the path for non-local URLs and use it as base
         baseUrl = url;
         baseUrl.setPath(QString('/'));
     }
 
-    if (m_dirLister->url() != baseUrl) {
-        m_dirLister->stop();
-        m_dirLister->openUrl(baseUrl, KDirLister::Reload);
+    if (m_model->directory() != baseUrl) {
+        m_updateCurrentItem = true;
+        m_model->refreshDirectory(baseUrl);
     }
-    m_dolphinModel->expandToUrl(m_leafDir);
-}
 
-void FoldersPanel::selectLeafDirectory()
-{
-    const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
-    const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
-    if (!proxyIndex.isValid()) {
-        return;
+    const int index = m_model->index(url);
+    if (index >= 0) {
+        updateCurrentItem(index);
+    } else {
+        m_updateCurrentItem = true;
+        m_model->expandParentDirectories(url);
+        // slotLoadingCompleted() will be invoked after the model has
+        // expanded the url
     }
+}
 
-    if (m_setLeafVisible) {
-        // Invoke m_treeView->scrollTo(proxyIndex) asynchronously by
-        // scrollToLeaf(). This assures that the scrolling is done after
-        // the horizontal scrollbar gets visible (otherwise the scrollbar
-        // might hide the leaf).
-        QTimer::singleShot(100, this, SLOT(scrollToLeaf()));
-        m_setLeafVisible = false;
-    }
+void FoldersPanel::updateCurrentItem(int index)
+{
+    KItemListSelectionManager* selectionManager = m_controller->selectionManager();
+    selectionManager->setCurrentItem(index);
+    selectionManager->clearSelection();
+    selectionManager->setSelected(index);
 
-    QItemSelectionModel* selModel = m_treeView->selectionModel();
-    selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::ClearAndSelect);
+    m_controller->view()->scrollToItem(index);
 }
 
 #include "folderspanel.moc"