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

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index b1fcc8daa87655d9a055d68dde1f9d09a8bd6fa8..d5f5f40532a284f9933d35c68a90a5d766648170 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -19,202 +19,276 @@
 
 #include "treeviewsidebarpage.h"
 
 
 #include "treeviewsidebarpage.h"
 

-#include "bookmarkselector.h"
-#include "dolphinmainwindow.h"
+#include "dolphinmodel.h"

 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"

+#include "dolphinsettings.h"
+#include "dolphin_folderspanelsettings.h"

 #include "sidebartreeview.h"
 #include "sidebartreeview.h"

+#include "treeviewcontextmenu.h"

 
 

+#include <kfileplacesmodel.h>

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

-#include <kdirmodel.h>

 #include <kfileitem.h>
 
 #include <kfileitem.h>
 

-#include <QHeaderView>
-#include <QItemSelectionModel>
+#include <QApplication>
+#include <QItemSelection>

 #include <QTreeView>
 #include <QTreeView>

-#include <QVBoxLayout>
-
-// TODO: currently when using a proxy model the strange effect occurs
-// that items get duplicated. Activate the following define to have the proxy
-// model:
-//#define USE_PROXY_MODEL
-
-TreeViewSidebarPage::TreeViewSidebarPage(DolphinMainWindow* mainWindow,
-                                         QWidget* parent) :
-    SidebarPage(mainWindow, parent),
+#include <QBoxLayout>
+#include <QModelIndex>
+#include <QScrollBar>
+#include <QTimer>
+
+TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
+    SidebarPage(parent),
+    m_setLeafVisible(false),
+    m_mouseButtons(Qt::NoButton),

     m_dirLister(0),
     m_dirLister(0),

-    m_dirModel(0),
+    m_dolphinModel(0),

     m_proxyModel(0),
     m_treeView(0),
     m_proxyModel(0),
     m_treeView(0),

-    m_selectedUrl()
+    m_leafDir()

 {
 {

-    Q_ASSERT(mainWindow != 0);
-
-    m_dirLister = new KDirLister();
-    m_dirLister->setDirOnlyMode(true);
-    m_dirLister->setAutoUpdate(true);
-    m_dirLister->setMainWindow(this);
-    m_dirLister->setDelayedMimeTypes(true);
-    m_dirLister->setAutoErrorHandlingEnabled(false, this);
-
-    m_dirModel = new KDirModel();
-    m_dirModel->setDirLister(m_dirLister);
-    m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory);
-
-
-#if defined(USE_PROXY_MODEL)
-    m_proxyModel = new DolphinSortFilterProxyModel(this);
-    m_proxyModel->setSourceModel(m_dirModel);
-
-    m_treeView = new SidebarTreeView(mainWindow, this);
-    m_treeView->setModel(m_proxyModel);
+}

 
 

-    m_proxyModel->setSorting(DolphinView::SortByName);
-    m_proxyModel->setSortOrder(Qt::Ascending);
-#else
-    m_treeView = new SidebarTreeView(mainWindow, this);
-    m_treeView->setModel(m_dirModel);
-#endif
+TreeViewSidebarPage::~TreeViewSidebarPage()
+{
+    FoldersPanelSettings::self()->writeConfig();

 
 

-    connect(m_treeView, SIGNAL(clicked(const QModelIndex&)),
-            this, SLOT(updateActiveView(const QModelIndex&)));
-    connect(m_treeView, SIGNAL(doubleClicked(const QModelIndex&)),
-            this, SLOT(slotDoubleClicked(const QModelIndex&)));
+    delete m_proxyModel;
+    m_proxyModel = 0;
+    delete m_dolphinModel;
+    m_dolphinModel = 0;
+    m_dirLister = 0; // deleted by m_dolphinModel
+}

 
 

-    QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->addWidget(m_treeView);
+QSize TreeViewSidebarPage::sizeHint() const
+{
+    return QSize(200, 400);

 }
 
 }
 

-TreeViewSidebarPage::~TreeViewSidebarPage()
+void TreeViewSidebarPage::setShowHiddenFiles(bool show)

 {
 {

-    delete m_dirLister;
-    m_dirLister = 0;
+    FoldersPanelSettings::setShowHiddenFiles(show);
+    if (m_dirLister != 0) {
+        m_dirLister->setShowingDotFiles(show);
+        m_dirLister->openUrl(m_dirLister->url(), KDirLister::Reload);
+    }

 }
 
 }
 

-void TreeViewSidebarPage::activeViewChanged()
+bool TreeViewSidebarPage::showHiddenFiles() const

 {
 {

-    connectToActiveView();
+    return FoldersPanelSettings::showHiddenFiles();

 }
 
 }
 

-void TreeViewSidebarPage::showEvent(QShowEvent* event)
+void TreeViewSidebarPage::setUrl(const KUrl& url)

 {
 {

-    SidebarPage::showEvent(event);
-    connectToActiveView();
+    if (!url.isValid() || (url == SidebarPage::url())) {
+        return;
+    }
+
+    SidebarPage::setUrl(url);
+    if (m_dirLister != 0) {
+        m_setLeafVisible = true;
+        loadTree(url);
+    }

 }
 
 }
 

-void TreeViewSidebarPage::updateSelection(const KUrl& url)
+void TreeViewSidebarPage::showEvent(QShowEvent* event)

 {
 {

-    if (!url.isValid() || (url == m_selectedUrl)) {
+    if (event->spontaneous()) {
+        SidebarPage::showEvent(event);

         return;
     }
 
         return;
     }
 

-    m_selectedUrl = url;
+    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 TreeViewSidebarPage::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());

 
 

-    // adjust the root of the tree to the base bookmark
-    const KUrl baseUrl = BookmarkSelector::baseBookmark(url).url();
-    if (m_dirLister->url() != baseUrl) {
-        m_dirLister->stop();
-        m_dirLister->openUrl(baseUrl);
+        connect(m_dirLister, SIGNAL(completed()),
+                this, SLOT(triggerLoadSubTree()));
+
+        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(triggerExpanding()));
+
+        Q_ASSERT(m_proxyModel == 0);
+        m_proxyModel = new DolphinSortFilterProxyModel(this);
+        m_proxyModel->setSourceModel(m_dolphinModel);
+
+        Q_ASSERT(m_treeView == 0);
+        m_treeView = new SidebarTreeView(this);
+        m_treeView->setModel(m_proxyModel);
+        m_proxyModel->setSorting(DolphinView::SortByName);
+        m_proxyModel->setSortOrder(Qt::AscendingOrder);
+
+        connect(m_treeView, SIGNAL(clicked(const QModelIndex&)),
+                this, SLOT(updateActiveView(const QModelIndex&)));
+        connect(m_treeView, SIGNAL(urlsDropped(const KUrl::List&, const QModelIndex&)),
+                this, SLOT(dropUrls(const KUrl::List&, const QModelIndex&)));
+        connect(m_treeView, SIGNAL(pressed(const QModelIndex&)),
+                this, SLOT(updateMouseButtons()));
+
+        QVBoxLayout* layout = new QVBoxLayout(this);
+        layout->setMargin(0);
+        layout->addWidget(m_treeView);

     }
 
     }
 

-    // select the folder which contains the given URL
-    QItemSelectionModel* selModel = m_treeView->selectionModel();
-    selModel->clearSelection();
+    loadTree(url());
+    SidebarPage::showEvent(event);
+}

 
 

-    const KFileItem item(S_IFDIR, KFileItem::Unknown, url);
+void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event)
+{
+    SidebarPage::contextMenuEvent(event);

 
 

-    const QModelIndex index = m_dirModel->indexForItem(item);
+    KFileItem item;
+    const QModelIndex index = m_treeView->indexAt(event->pos());

     if (index.isValid()) {
     if (index.isValid()) {

-#if defined(USE_PROXY_MODEL)
-        // the item with the given URL is already part of the model
-        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(index);
-        m_treeView->scrollTo(proxyIndex);
-        selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
-#else
-        m_treeView->scrollTo(index);
-        selModel->setCurrentIndex(index, QItemSelectionModel::Select);
-#endif
+        const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
+        item = m_dolphinModel->itemForIndex(dolphinModelIndex);
+        emit changeSelection(KFileItemList());

     }
     }

-    else {
-        // The item with the given URL is not loaded by the model yet. Iterate
-        // backward to the base URL and trigger the loading of the items for
-        // each hierarchy level.
-        connect(m_dirLister, SIGNAL(completed()),
-                this, SLOT(expandSelectionParent()));

 
 

-        KUrl parentUrl = url.upUrl();
-        while (!parentUrl.isParentOf(baseUrl)) {
-            m_dirLister->openUrl(parentUrl, true, false);
-            parentUrl = parentUrl.upUrl();
+    TreeViewContextMenu contextMenu(this, item);
+    contextMenu.open();
+}
+
+void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
+{
+    const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
+    const KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
+    if (!item.isNull()) {
+        emit changeUrl(item.url(), m_mouseButtons);
+    }
+}
+
+void TreeViewSidebarPage::dropUrls(const KUrl::List& urls,
+                                   const QModelIndex& index)
+{
+    if (index.isValid()) {
+        const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
+        KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
+        Q_ASSERT(!item.isNull());
+        if (item.isDir()) {
+            emit urlsDropped(urls, item.url());

         }
     }
 }
 
         }
     }
 }
 

-void TreeViewSidebarPage::expandSelectionParent()
+void TreeViewSidebarPage::triggerExpanding()

 {
 {

-    disconnect(m_dirLister, SIGNAL(completed()),
-               this, SLOT(expandSelectionParent()));
+    // the expanding of the folders may not be done in the context
+    // of this slot
+    QMetaObject::invokeMethod(this, "expandToLeafDir", Qt::QueuedConnection);
+}
+
+void TreeViewSidebarPage::triggerLoadSubTree()
+{
+    // the loading of the sub tree may not be done in the context
+    // of this slot
+    QMetaObject::invokeMethod(this, "loadSubTree", Qt::QueuedConnection);
+}
+
+void TreeViewSidebarPage::expandToLeafDir()
+{
+    // expand all directories until the parent directory of m_leafDir
+    const KUrl parentUrl = m_leafDir.upUrl();
+    QModelIndex dirIndex = m_dolphinModel->indexForUrl(parentUrl);
+    QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+    m_treeView->setExpanded(proxyIndex, true);
+    selectLeafDirectory();
+}
+
+
+void TreeViewSidebarPage::loadSubTree()
+{
+    m_treeView->selectionModel()->clearSelection();
+
+    if (m_leafDir.isParentOf(m_dirLister->url())) {
+        // The leaf directory is not a child of the base URL, hence
+        // no sub directory must be loaded or selected.
+        return;
+    }

 
 

-    // expand the parent folder of the selected item
-    const KFileItem parentItem(S_IFDIR, KFileItem::Unknown, m_selectedUrl.upUrl());
-    QModelIndex index = m_dirModel->indexForItem(parentItem);
+    const QModelIndex index = m_dolphinModel->indexForUrl(m_leafDir);

     if (index.isValid()) {
     if (index.isValid()) {

-#if defined(USE_PROXY_MODEL)
-        QModelIndex proxyIndex = m_proxyModel->mapFromSource(index);
-        m_treeView->setExpanded(proxyIndex, true);
-#else
-        m_treeView->setExpanded(index, true);
-#endif
-
-        // select the item and assure that the item is visible
-        const KFileItem selectedItem(S_IFDIR, KFileItem::Unknown, m_selectedUrl);
-        index = m_dirModel->indexForItem(selectedItem);
-        if (index.isValid()) {
-#if defined(USE_PROXY_MODEL)
-            proxyIndex = m_proxyModel->mapFromSource(index);
-            m_treeView->scrollTo(proxyIndex);
-
-            QItemSelectionModel* selModel = m_treeView->selectionModel();
-            selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
-#else
-            m_treeView->scrollTo(index);
-
-            QItemSelectionModel* selModel = m_treeView->selectionModel();
-            selModel->setCurrentIndex(index, QItemSelectionModel::Select);
-#endif
+        selectLeafDirectory();
+    } else {
+        // Load all sub directories that need to get expanded for making
+        // the leaf directory visible. The slot triggerExpanding() will
+        // get invoked if the expanding has been finished.
+        m_dolphinModel->expandToUrl(m_leafDir);
+    }
+}

 
 

-        }
+void TreeViewSidebarPage::scrollToLeaf()
+{
+    const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
+    const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+    if (proxyIndex.isValid()) {
+        m_treeView->scrollTo(proxyIndex);

     }
 }
 
     }
 }
 

-void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
+void TreeViewSidebarPage::updateMouseButtons()

 {
 {

-#if defined(USE_PROXY_MODEL)
-    const QModelIndex& dirIndex = m_proxyModel->mapToSource(index);
-    const KFileItem* item = m_dirModel->itemForIndex(dirIndex);
-#else
-    const KFileItem* item = m_dirModel->itemForIndex(index);
-#endif
-    if (item != 0) {
-        const KUrl& url = item->url();
-        mainWindow()->activeView()->setUrl(url);
+    m_mouseButtons = QApplication::mouseButtons();
+}
+
+void TreeViewSidebarPage::loadTree(const KUrl& url)
+{
+    Q_ASSERT(m_dirLister != 0);
+    m_leafDir = url;
+
+    KUrl baseUrl = url;
+    if (url.isLocalFile()) {
+        // use the root directory as base for local URLs
+        baseUrl = QDir::rootPath();
+    } else {
+        // 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);
+    } else {
+        loadSubTree();

     }
 }
 
     }
 }
 

-void TreeViewSidebarPage::connectToActiveView()
+void TreeViewSidebarPage::selectLeafDirectory()

 {
 {

-    const QWidget* parent = parentWidget();
-    if ((parent == 0) || parent->isHidden()) {
+    const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
+    const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+    if (!proxyIndex.isValid()) {

         return;
     }
 
         return;
     }
 

-    const DolphinView* view = mainWindow()->activeView();
-    const KUrl& url = view->url();
-
-    connect(view, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(updateSelection(const KUrl&)));
+    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;
+    }

 
 

-    updateSelection(url);
+    QItemSelectionModel* selModel = m_treeView->selectionModel();
+    selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);

 }
 
 #include "treeviewsidebarpage.moc"
 }
 
 #include "treeviewsidebarpage.moc"