increase the readability of the code

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 930c380d9d0b7591ed61d45fee72e4c34acaf9b8..d5f5f40532a284f9933d35c68a90a5d766648170 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"
 
@@ -30,6 +31,7 @@
 #include <kdirlister.h>
 #include <kfileitem.h>
 
+#include <QApplication>
 #include <QItemSelection>
 #include <QTreeView>
 #include <QBoxLayout>
@@ -40,7 +42,7 @@
 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),
@@ -51,6 +53,8 @@ TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
 
 TreeViewSidebarPage::~TreeViewSidebarPage()
 {
+    FoldersPanelSettings::self()->writeConfig();
+
     delete m_proxyModel;
     m_proxyModel = 0;
     delete m_dolphinModel;
@@ -63,6 +67,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())) {
@@ -93,6 +111,7 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
         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()));
@@ -118,6 +137,8 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
                 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);
@@ -132,16 +153,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,7 +170,7 @@ 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);
     }
 }
 
@@ -223,17 +242,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;
@@ -267,8 +289,6 @@ void TreeViewSidebarPage::selectLeafDirectory()
 
     QItemSelectionModel* selModel = m_treeView->selectionModel();
     selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
-
-    m_treeView->horizontalScrollBar()->setValue(m_horizontalPos);
 }
 
 #include "treeviewsidebarpage.moc"