X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/95ac842f2973b64380a93fbe5e46e94646bf5a38..817f3952e2bed820ea3b50dfdfe91ccb99dcb748:/src/treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index d5f5f4053..20216b13c 100644
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -24,12 +24,16 @@
 #include "dolphinview.h"
 #include "dolphinsettings.h"
 #include "dolphin_folderspanelsettings.h"
+#include "dolphin_generalsettings.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>
@@ -81,6 +85,28 @@ 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())) {
@@ -132,6 +158,8 @@ 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&)));