X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/12c6facfcef36b5ac1e4195fb256265f7fdeee60..11289b4fc3efbc074b668d4516cd896f8ade9761:/src/treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 7756c227c..04cef91ae 100644
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -23,13 +23,20 @@
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
 #include "dolphinsettings.h"
+#include "dolphin_folderspanelsettings.h"
+#include "dolphin_generalsettings.h"
+#include "draganddrophelper.h"
+#include "folderexpander.h"
+#include "renamedialog.h"
 #include "sidebartreeview.h"
 #include "treeviewcontextmenu.h"
 
 #include <kfileplacesmodel.h>
 #include <kdirlister.h>
 #include <kfileitem.h>
+#include <konq_operations.h>
 
+#include <QApplication>
 #include <QItemSelection>
 #include <QTreeView>
 #include <QBoxLayout>
@@ -40,17 +47,20 @@
 TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     SidebarPage(parent),
     m_setLeafVisible(false),
-    m_horizontalPos(0),
+    m_mouseButtons(Qt::NoButton),
     m_dirLister(0),
     m_dolphinModel(0),
     m_proxyModel(0),
     m_treeView(0),
     m_leafDir()
 {
+    setLayoutDirection(Qt::LeftToRight);
 }
 
 TreeViewSidebarPage::~TreeViewSidebarPage()
 {
+    FoldersPanelSettings::self()->writeConfig();
+
     delete m_proxyModel;
     m_proxyModel = 0;
     delete m_dolphinModel;
@@ -63,6 +73,41 @@ 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::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);
+            }
+        }
+    }
+}
+
 void TreeViewSidebarPage::setUrl(const KUrl& url)
 {
     if (!url.isValid() || (url == SidebarPage::url())) {
@@ -90,19 +135,17 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
         m_dirLister = new KDirLister();
         m_dirLister->setDirOnlyMode(true);
         m_dirLister->setAutoUpdate(true);
-        m_dirLister->setMainWindow(topLevelWidget());
+        m_dirLister->setMainWindow(window());
         m_dirLister->setDelayedMimeTypes(true);
         m_dirLister->setAutoErrorHandlingEnabled(false, this);
-
-        connect(m_dirLister, SIGNAL(completed()),
-                this, SLOT(triggerLoadSubTree()));
+        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(triggerExpanding()));
+                this, SLOT(expandToDir(const QModelIndex&)));
 
         Q_ASSERT(m_proxyModel == 0);
         m_proxyModel = new DolphinSortFilterProxyModel(this);
@@ -113,11 +156,15 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
         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 KUrl::List&, const QModelIndex&)),
-                this, SLOT(dropUrls(const KUrl::List&, 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()));
 
         QVBoxLayout* layout = new QVBoxLayout(this);
         layout->setMargin(0);
@@ -132,16 +179,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();
 }
@@ -151,69 +196,28 @@ 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());
+        emit changeUrl(item.url(), m_mouseButtons);
     }
 }
 
-void TreeViewSidebarPage::dropUrls(const KUrl::List& urls,
-                                   const QModelIndex& index)
+void TreeViewSidebarPage::dropUrls(const QModelIndex& index, QDropEvent* event)
 {
     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());
+            DragAndDropHelper::instance().dropUrls(item, item.url(), event, this);
         }
     }
 }
 
-void TreeViewSidebarPage::triggerExpanding()
-{
-    // 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()
+void TreeViewSidebarPage::expandToDir(const QModelIndex& index)
 {
-    // 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);
+    m_treeView->setExpanded(index, 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;
-    }
-
-    const QModelIndex index = m_dolphinModel->indexForUrl(m_leafDir);
-    if (index.isValid()) {
-        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);
@@ -223,17 +227,20 @@ void TreeViewSidebarPage::scrollToLeaf()
     }
 }
 
+void TreeViewSidebarPage::updateMouseButtons()
+{
+    m_mouseButtons = QApplication::mouseButtons();
+}
+
 void TreeViewSidebarPage::loadTree(const KUrl& url)
 {
     Q_ASSERT(m_dirLister != 0);
     m_leafDir = url;
 
-    m_horizontalPos = m_treeView->horizontalScrollBar()->value();
-
     KUrl baseUrl = url;
     if (url.isLocalFile()) {
         // use the root directory as base for local URLs
-        baseUrl = KUrl("file:///");
+        baseUrl = QDir::rootPath();
     } else {
         // clear the path for non-local URLs and use it as base
         baseUrl = url;
@@ -243,9 +250,8 @@ void TreeViewSidebarPage::loadTree(const KUrl& url)
     if (m_dirLister->url() != baseUrl) {
         m_dirLister->stop();
         m_dirLister->openUrl(baseUrl, KDirLister::Reload);
-    } else {
-        loadSubTree();
     }
+    m_dolphinModel->expandToUrl(m_leafDir);
 }
 
 void TreeViewSidebarPage::selectLeafDirectory()
@@ -266,9 +272,7 @@ void TreeViewSidebarPage::selectLeafDirectory()
     }
 
     QItemSelectionModel* selModel = m_treeView->selectionModel();
-    selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
-
-    m_treeView->horizontalScrollBar()->setValue(m_horizontalPos);
+    selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::ClearAndSelect);
 }
 
 #include "treeviewsidebarpage.moc"