when changing the view mode if the preview is turned on, the directory must get reloa...

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 3196fe7bd77395e8ee03d8405db8103aecbce3c4..04cef91ae440f901c8c6467255b7c200a1043c86 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -23,31 +23,44 @@
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
 #include "dolphinsettings.h"
 #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 "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>
 #include <QModelIndex>
 #include <QItemSelection>
 #include <QTreeView>
 #include <QBoxLayout>
 #include <QModelIndex>

+#include <QScrollBar>
+#include <QTimer>

 
 TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     SidebarPage(parent),
     m_setLeafVisible(false),
 
 TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     SidebarPage(parent),
     m_setLeafVisible(false),

+    m_mouseButtons(Qt::NoButton),

     m_dirLister(0),
     m_dolphinModel(0),
     m_proxyModel(0),
     m_treeView(0),
     m_leafDir()
 {
     m_dirLister(0),
     m_dolphinModel(0),
     m_proxyModel(0),
     m_treeView(0),
     m_leafDir()
 {

+    setLayoutDirection(Qt::LeftToRight);

 }
 
 TreeViewSidebarPage::~TreeViewSidebarPage()
 {
 }
 
 TreeViewSidebarPage::~TreeViewSidebarPage()
 {

+    FoldersPanelSettings::self()->writeConfig();
+

     delete m_proxyModel;
     m_proxyModel = 0;
     delete m_dolphinModel;
     delete m_proxyModel;
     m_proxyModel = 0;
     delete m_dolphinModel;


@@ -60,6 +73,41 @@ QSize TreeViewSidebarPage::sizeHint() const
     return QSize(200, 400);
 }
 
     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())) {
 void TreeViewSidebarPage::setUrl(const KUrl& url)
 {
     if (!url.isValid() || (url == SidebarPage::url())) {


@@ -87,19 +135,17 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
         m_dirLister = new KDirLister();
         m_dirLister->setDirOnlyMode(true);
         m_dirLister->setAutoUpdate(true);
         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->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&)),
 
         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);
 
         Q_ASSERT(m_proxyModel == 0);
         m_proxyModel = new DolphinSortFilterProxyModel(this);


@@ -110,11 +156,15 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
         m_treeView->setModel(m_proxyModel);
         m_proxyModel->setSorting(DolphinView::SortByName);
         m_proxyModel->setSortOrder(Qt::AscendingOrder);
         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(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);
 
         QVBoxLayout* layout = new QVBoxLayout(this);
         layout->setMargin(0);


@@ -129,16 +179,14 @@ void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event)
 {
     SidebarPage::contextMenuEvent(event);
 
 {
     SidebarPage::contextMenuEvent(event);
 

+    KFileItem item;

     const QModelIndex index = m_treeView->indexAt(event->pos());
     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();
 }
     TreeViewContextMenu contextMenu(this, item);
     contextMenu.open();
 }


@@ -148,67 +196,40 @@ void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
     const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
     const KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
     if (!item.isNull()) {
     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()) {
 {
     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();
 }
 
     selectLeafDirectory();
 }
 

-
-void TreeViewSidebarPage::loadSubTree()
+void TreeViewSidebarPage::scrollToLeaf()

 {
 {

-    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 dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
+    const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+    if (proxyIndex.isValid()) {
+        m_treeView->scrollTo(proxyIndex);

     }
     }

+}

 
 

-    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::updateMouseButtons()
+{
+    m_mouseButtons = QApplication::mouseButtons();

 }
 
 void TreeViewSidebarPage::loadTree(const KUrl& url)
 }
 
 void TreeViewSidebarPage::loadTree(const KUrl& url)


@@ -216,42 +237,42 @@ void TreeViewSidebarPage::loadTree(const KUrl& url)
     Q_ASSERT(m_dirLister != 0);
     m_leafDir = 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());
-        }
+    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);
     }
 
     if (m_dirLister->url() != baseUrl) {
         m_dirLister->stop();
         m_dirLister->openUrl(baseUrl, KDirLister::Reload);

-    } else {
-        loadSubTree();

     }
     }

+    m_dolphinModel->expandToUrl(m_leafDir);

 }
 
 void TreeViewSidebarPage::selectLeafDirectory()
 {
     const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
     const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
 }
 
 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) {
 
     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();
         m_setLeafVisible = false;
     }
 
     QItemSelectionModel* selModel = m_treeView->selectionModel();

-    selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
+    selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::ClearAndSelect);

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