]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/dolphinview.cpp
SVN_SILENT: removed trailing spaces
[dolphin.git] / src / dolphinview.cpp
index 1300d99378bddc7e9817b221109bdf1748d6dbe0..969da773dcd4e677444daa0f52851a16464df8b0 100644 (file)
@@ -33,6 +33,7 @@
 #include <kdirlister.h>
 #include <kfilepreviewgenerator.h>
 #include <kiconeffect.h>
+#include <kfileitem.h>
 #include <klocale.h>
 #include <kio/deletejob.h>
 #include <kio/netaccess.h>
@@ -44,6 +45,7 @@
 #include <konq_fileitemcapabilities.h>
 #include <konq_operations.h>
 #include <konqmimedata.h>
+#include <kstringhandler.h>
 #include <ktoggleaction.h>
 #include <kurl.h>
 
 #include "viewproperties.h"
 #include "zoomlevelinfo.h"
 
+/**
+ * Helper function for sorting items with qSort() in
+ * DolphinView::renameSelectedItems().
+ */
+bool lessThan(const KFileItem& item1, const KFileItem& item2)
+{
+    return KStringHandler::naturalCompare(item1.name(), item2.name()) < 0;
+}
+
 DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,
                          KDirLister* dirLister,
@@ -90,7 +101,8 @@ DolphinView::DolphinView(QWidget* parent,
     m_previewGenerator(0),
     m_toolTipManager(0),
     m_rootUrl(),
-    m_currentItemUrl()
+    m_currentItemUrl(),
+    m_expandedViews()
 {
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
@@ -136,6 +148,7 @@ DolphinView::DolphinView(QWidget* parent,
 
 DolphinView::~DolphinView()
 {
+    deleteExpandedViews();
 }
 
 const KUrl& DolphinView::url() const
@@ -220,7 +233,11 @@ void DolphinView::setMode(Mode mode)
     }
 
     emit modeChanged();
+
     updateZoomLevel(oldZoomLevel);
+    if (m_showPreview) {
+        loadDirectory(viewPropsUrl);
+    }
 }
 
 DolphinView::Mode DolphinView::mode() const
@@ -372,7 +389,7 @@ void DolphinView::setZoomLevel(int level)
     } else if (level > ZoomLevelInfo::maximumLevel()) {
         level = ZoomLevelInfo::maximumLevel();
     }
-    
+
     if (level != zoomLevel()) {
         m_controller->setZoomLevel(level);
         m_previewGenerator->updatePreviews();
@@ -485,32 +502,36 @@ void DolphinView::setNameFilter(const QString& nameFilter)
     }
 }
 
-void DolphinView::calculateItemCount(int& fileCount, int& folderCount) const
+void DolphinView::calculateItemCount(int& fileCount,
+                                     int& folderCount,
+                                     KIO::filesize_t& totalFileSize) const
 {
     foreach (const KFileItem& item, m_dirLister->items()) {
         if (item.isDir()) {
             ++folderCount;
         } else {
             ++fileCount;
+            totalFileSize += item.size();
         }
     }
 }
 
 QString DolphinView::statusBarText() const
-{    
+{
+    QString text;
+    int folderCount = 0;
+    int fileCount = 0;
+    KIO::filesize_t totalFileSize = 0;
+
     if (hasSelection()) {
         // give a summary of the status of the selected files
-        QString text;
         const KFileItemList list = selectedItems();
         if (list.isEmpty()) {
             // when an item is triggered, it is temporary selected but selectedItems()
             // will return an empty list
-            return QString();
+            return text;
         }
 
-        int fileCount = 0;
-        int folderCount = 0;
-        KIO::filesize_t byteSize = 0;
         KFileItemList::const_iterator it = list.begin();
         const KFileItemList::const_iterator end = list.end();
         while (it != end) {
@@ -519,33 +540,39 @@ QString DolphinView::statusBarText() const
                 ++folderCount;
             } else {
                 ++fileCount;
-                byteSize += item.size();
+                totalFileSize += item.size();
             }
             ++it;
         }
 
-        if (folderCount > 0) {
-            text = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
-            if (fileCount > 0) {
-                text += ", ";
+        if (folderCount + fileCount == 1) {
+            // if only one item is selected, show the filename
+            const QString name = list.first().name();
+            text = (folderCount == 1) ? i18nc("@info:status", "<filename>%1</filename> selected", name) :
+                                        i18nc("@info:status", "<filename>%1</filename> selected (%2)",
+                                              name, KIO::convertSize(totalFileSize));
+        } else {
+            // at least 2 items are selected
+            const QString foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
+            const QString filesText = i18ncp("@info:status", "1 File selected", "%1 Files selected", fileCount);
+            if ((folderCount > 0) && (fileCount > 0)) {
+                text = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
+                             foldersText, filesText, KIO::convertSize(totalFileSize));
+            } else if (fileCount > 0) {
+                text = i18nc("@info:status files (size)", "%1 (%2)", filesText, KIO::convertSize(totalFileSize));
+            } else {
+                Q_ASSERT(folderCount > 0);
+                text = foldersText;
             }
         }
-
-        if (fileCount > 0) {
-            const QString sizeText(KIO::convertSize(byteSize));
-            text += i18ncp("@info:status", "1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText);
-        }
-        return text;
     } else {
-        // Give a summary of the status of the current folder.
-        int folderCount = 0;
-        int fileCount = 0;
-        calculateItemCount(fileCount, folderCount);
-        return KIO::itemsSummaryString(fileCount + folderCount,
-                                       fileCount,
-                                       folderCount,
-                                       0, false);
+        calculateItemCount(fileCount, folderCount, totalFileSize);
+        text = KIO::itemsSummaryString(fileCount + folderCount,
+                                       fileCount, folderCount,
+                                       totalFileSize, true);
     }
+
+    return text;
 }
 
 void DolphinView::setUrl(const KUrl& url)
@@ -578,12 +605,12 @@ void DolphinView::changeSelection(const KFileItemList& selection)
 
 void DolphinView::renameSelectedItems()
 {
-    const KFileItemList items = selectedItems();
+    KFileItemList items = selectedItems();
     const int itemCount = items.count();
     if (itemCount < 1) {
         return;
     }
-    
+
     if (itemCount > 1) {
         // More than one item has been selected for renaming. Open
         // a rename dialog and rename all items afterwards.
@@ -600,9 +627,13 @@ void DolphinView::renameSelectedItems()
             // as one operation instead of n rename operations like it is done now...
             Q_ASSERT(newName.contains('#'));
 
+            // currently the items are sorted by the selection order, resort
+            // them by the file name
+            qSort(items.begin(), items.end(), lessThan);
+
             // iterate through all selected items and rename them...
             int index = 1;
-            foreach (const KFileItem &item, items) {
+            foreach (const KFileItemitem, items) {
                 const KUrl& oldUrl = item.url();
                 QString number;
                 number.setNum(index++);
@@ -619,7 +650,7 @@ void DolphinView::renameSelectedItems()
         }
     } else if (DolphinSettings::instance().generalSettings()->renameInline()) {
         Q_ASSERT(itemCount == 1);
-        
+
         if (isColumnViewActive()) {
             m_columnView->editItem(items.first());
         } else {
@@ -629,7 +660,7 @@ void DolphinView::renameSelectedItems()
         }
     } else {
         Q_ASSERT(itemCount == 1);
-        
+
         RenameDialog dialog(this, items);
         if (dialog.exec() == QDialog::Rejected) {
             return;
@@ -670,19 +701,14 @@ void DolphinView::deleteSelectedItems()
 
 void DolphinView::cutSelectedItems()
 {
-    QMimeData* mimeData = new QMimeData();
-    const KUrl::List kdeUrls = simplifiedSelectedUrls();
-    const KUrl::List mostLocalUrls;
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
+    QMimeData* mimeData = selectionMimeData();
+    KonqMimeData::addIsCutSelection(mimeData, true);
     QApplication::clipboard()->setMimeData(mimeData);
 }
 
 void DolphinView::copySelectedItems()
 {
-    QMimeData* mimeData = new QMimeData();
-    const KUrl::List kdeUrls = selectedUrls();
-    const KUrl::List mostLocalUrls;
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false);
+    QMimeData* mimeData = selectionMimeData();
     QApplication::clipboard()->setMimeData(mimeData);
 }
 
@@ -711,10 +737,10 @@ void DolphinView::setShowPreview(bool show)
 
     m_showPreview = show;
     m_previewGenerator->setPreviewShown(show);
-    
+
     const int oldZoomLevel = m_controller->zoomLevel();
     emit showPreviewChanged();
-    
+
     // Enabling or disabling the preview might change the icon size of the view.
     // As the view does not emit a signal when the icon size has been changed,
     // the used zoom level of the controller must be adjusted manually:
@@ -810,8 +836,32 @@ void DolphinView::wheelEvent(QWheelEvent* event)
 
 bool DolphinView::eventFilter(QObject* watched, QEvent* event)
 {
-    if ((watched == itemView()) && (event->type() == QEvent::FocusIn)) {
-        m_controller->requestActivation();
+    switch (event->type()) {
+    case QEvent::FocusIn:
+        if (watched == itemView()) {
+            m_controller->requestActivation();
+        }
+        break;
+
+    case QEvent::MouseButtonPress:
+        if ((watched == itemView()->viewport()) && (m_expandedViews.count() > 0)) {
+            // Listening to a mousebutton press event to delete expanded views is a
+            // workaround, as it seems impossible for the FolderExpander to know when
+            // a dragging outside a view has been finished. However it works quite well:
+            // A mousebutton press event indicates that a drag operation must be
+            // finished already.
+            deleteExpandedViews();
+        }
+        break;
+
+    case QEvent::DragEnter:
+        if (watched == itemView()->viewport()) {
+            setActive(true);
+        }
+        break;
+
+    default:
+        break;
     }
 
     return QWidget::eventFilter(watched, event);
@@ -873,7 +923,7 @@ void DolphinView::dropUrls(const KFileItem& destItem,
                            const KUrl& destPath,
                            QDropEvent* event)
 {
-    DragAndDropHelper::dropUrls(destItem, destPath, event, this);
+    DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);
 }
 
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
@@ -997,6 +1047,11 @@ bool DolphinView::isTabsForFilesEnabled() const
     return m_tabsForFiles;
 }
 
+bool DolphinView::itemsExpandable() const
+{
+    return (m_detailsView != 0) && m_detailsView->itemsExpandable();
+}
+
 void DolphinView::emitContentsMoved()
 {
     // only emit the contents moved signal if:
@@ -1049,6 +1104,16 @@ void DolphinView::restoreCurrentItem()
     }
 }
 
+void DolphinView::enterDir(const QModelIndex& index, QAbstractItemView* view)
+{
+    // Deleting a view that is the root of a drag operation is not allowed, otherwise
+    // the dragging gets automatically cancelled by Qt. So before entering a new
+    // directory, the current view is remembered in m_expandedViews and deleted
+    // later when the drag operation has been finished (see DolphinView::eventFilter()).
+    m_expandedViews.append(view);
+    m_controller->triggerItem(index);
+}
+
 void DolphinView::loadDirectory(const KUrl& url, bool reload)
 {
     if (!url.isValid()) {
@@ -1100,11 +1165,11 @@ void DolphinView::applyViewProperties(const KUrl& url)
     const Mode mode = props.viewMode();
     if (m_mode != mode) {
         const int oldZoomLevel = m_controller->zoomLevel();
-        
+
         m_mode = mode;
         createView();
         emit modeChanged();
-        
+
         updateZoomLevel(oldZoomLevel);
     }
     if (itemView() == 0) {
@@ -1148,10 +1213,10 @@ void DolphinView::applyViewProperties(const KUrl& url)
     if (showPreview != m_showPreview) {
         m_showPreview = showPreview;
         m_previewGenerator->setPreviewShown(showPreview);
-        
+
         const int oldZoomLevel = m_controller->zoomLevel();
         emit showPreviewChanged();
-        
+
         // Enabling or disabling the preview might change the icon size of the view.
         // As the view does not emit a signal when the icon size has been changed,
         // the used zoom level of the controller must be adjusted manually:
@@ -1187,6 +1252,7 @@ void DolphinView::createView()
 
     Q_ASSERT(view != 0);
     view->installEventFilter(this);
+    view->viewport()->installEventFilter(this);
 
     if (m_mode != ColumnView) {
         // Give the view the ability to auto-expand its directories on hovering
@@ -1198,8 +1264,8 @@ void DolphinView::createView()
 
         FolderExpander* folderExpander = new FolderExpander(view, m_proxyModel);
         folderExpander->setEnabled(enabled);
-        connect(folderExpander, SIGNAL(enterDir(const QModelIndex&)),
-                m_controller, SLOT(triggerItem(const QModelIndex&)));
+        connect(folderExpander, SIGNAL(enterDir(const QModelIndex&, QAbstractItemView*)),
+                this, SLOT(enterDir(const QModelIndex&, QAbstractItemView*)));
     }
 
     m_controller->setItemView(view);
@@ -1253,8 +1319,25 @@ void DolphinView::deleteView()
 
         m_topLayout->removeWidget(view);
         view->close();
-        view->deleteLater();
+
+        disconnect(view);
+        m_controller->disconnect(view);
+        view->disconnect();
+
+        bool deleteView = true;
+        foreach (const QAbstractItemView* expandedView, m_expandedViews) {
+            if (view == expandedView) {
+                // the current view got already expanded and must stay alive
+                // until the dragging has been completed
+                deleteView = false;
+                break;
+            }
+        }
+        if (deleteView) {
+            view->deleteLater();
+        }
         view = 0;
+
         m_iconsView = 0;
         m_detailsView = 0;
         m_columnView = 0;
@@ -1320,14 +1403,32 @@ KUrl::List DolphinView::simplifiedSelectedUrls() const
 {
     KUrl::List list = selectedUrls();
     if (itemsExpandable() ) {
-        list = KonqOperations::simplifiedUrlList(list);
+        list = KDirModel::simplifiedUrlList(list);
     }
     return list;
 }
 
-bool DolphinView::itemsExpandable() const
+void DolphinView::deleteExpandedViews()
 {
-    return (m_detailsView != 0) && m_detailsView->itemsExpandable();
+    const QAbstractItemView* view = itemView();
+    foreach (QAbstractItemView* expandedView, m_expandedViews) {
+        if (expandedView != view) {
+            expandedView->deleteLater();
+        }
+    }
+    m_expandedViews.clear();
+}
+
+QMimeData* DolphinView::selectionMimeData() const
+{
+    if (isColumnViewActive()) {
+        return m_columnView->selectionMimeData();
+    }
+
+    const QAbstractItemView* view = itemView();
+    Q_ASSERT((view != 0) && (view->selectionModel() != 0));
+    const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
+    return m_dolphinModel->mimeData(selection.indexes());
 }
 
 #include "dolphinview.moc"