consider the protocol and directory capabilities for file actions like Rename, Delete...

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 3196fe7bd77395e8ee03d8405db8103aecbce3c4..c4a793cbd90c54e0d300020354a713d89d2f0b79 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -23,6 +23,7 @@
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
 #include "dolphinsettings.h"
+#include "dolphin_folderspanelsettings.h"
 #include "sidebartreeview.h"
 #include "treeviewcontextmenu.h"
 
@@ -34,10 +35,13 @@
 #include <QTreeView>
 #include <QBoxLayout>
 #include <QModelIndex>
+#include <QScrollBar>
+#include <QTimer>
 
 TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     SidebarPage(parent),
     m_setLeafVisible(false),
+    m_horizontalPos(0),
     m_dirLister(0),
     m_dolphinModel(0),
     m_proxyModel(0),
@@ -48,6 +52,8 @@ TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
 
 TreeViewSidebarPage::~TreeViewSidebarPage()
 {
+    FoldersPanelSettings::self()->writeConfig();
+
     delete m_proxyModel;
     m_proxyModel = 0;
     delete m_dolphinModel;
@@ -60,6 +66,20 @@ QSize TreeViewSidebarPage::sizeHint() const
     return QSize(200, 400);
 }
 
+void TreeViewSidebarPage::setShowHiddenFiles(bool show)
+{
+    FoldersPanelSettings::setShowHiddenFiles(show);
+    if (m_dirLister != 0) {
+        m_dirLister->setShowingDotFiles(show);
+        m_dirLister->openUrl(m_dirLister->url(), KDirLister::Reload);
+    }
+}
+
+bool TreeViewSidebarPage::showHiddenFiles() const
+{
+    return FoldersPanelSettings::showHiddenFiles();
+}
+
 void TreeViewSidebarPage::setUrl(const KUrl& url)
 {
     if (!url.isValid() || (url == SidebarPage::url())) {
@@ -87,9 +107,10 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
         m_dirLister = new KDirLister();
         m_dirLister->setDirOnlyMode(true);
         m_dirLister->setAutoUpdate(true);
-        m_dirLister->setMainWindow(this);
+        m_dirLister->setMainWindow(window());
         m_dirLister->setDelayedMimeTypes(true);
         m_dirLister->setAutoErrorHandlingEnabled(false, this);
+        m_dirLister->setShowingDotFiles(FoldersPanelSettings::showHiddenFiles());
 
         connect(m_dirLister, SIGNAL(completed()),
                 this, SLOT(triggerLoadSubTree()));
@@ -129,16 +150,14 @@ void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event)
 {
     SidebarPage::contextMenuEvent(event);
 
+    KFileItem item;
     const QModelIndex index = m_treeView->indexAt(event->pos());
-    if (!index.isValid()) {
-        // only open a context menu above a directory item
-        return;
+    if (index.isValid()) {
+        const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
+        item = m_dolphinModel->itemForIndex(dolphinModelIndex);
+        emit changeSelection(KFileItemList());
     }
 
-    const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
-    KFileItem item = m_dolphinModel->itemForIndex(dolphinModelIndex);
-
-    emit changeSelection(KFileItemList());
     TreeViewContextMenu contextMenu(this, item);
     contextMenu.open();
 }
@@ -211,25 +230,30 @@ void TreeViewSidebarPage::loadSubTree()
     }
 }
 
+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::loadTree(const KUrl& url)
 {
     Q_ASSERT(m_dirLister != 0);
     m_leafDir = url;
 
-    // adjust the root of the tree to the base place
-    KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
-    KUrl baseUrl = placesModel->url(placesModel->closestItem(url));
-    if (!baseUrl.isValid()) {
-        // it's possible that no closest item is available and hence an
-        // empty URL is returned
-        if (url.isLocalFile()) {
-            // use the root directory as base for local URLs
-            baseUrl = KUrl("file:///");
-        } else {
-            // clear the path for non-local URLs and use it as base
-            baseUrl = url;
-            baseUrl.setPath(QString());
-        }
+    m_horizontalPos = m_treeView->horizontalScrollBar()->value();
+
+    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) {
@@ -244,14 +268,23 @@ void TreeViewSidebarPage::selectLeafDirectory()
 {
     const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
     const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+    if (!proxyIndex.isValid()) {
+        return;
+    }
 
     if (m_setLeafVisible) {
-        m_treeView->scrollTo(proxyIndex);
+        // 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;
     }
 
     QItemSelectionModel* selModel = m_treeView->selectionModel();
     selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
+
+    m_treeView->horizontalScrollBar()->setValue(m_horizontalPos);
 }
 
 #include "treeviewsidebarpage.moc"