X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4ad6cc3e3d5b2c4a6dc0736b8219c2814ac11465..33ddc0e7913dfa5f90cbd0b231d766f39cd48b4b:/src/dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 0799ae8b9..207b236ee 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -84,8 +84,8 @@ DolphinView::DolphinView(QWidget* parent,
 
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(updateCutItems()));
-    connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
-            this, SLOT(generatePreviews(const KFileItemList&)));
+    connect(m_dirLister, SIGNAL(newItems(const QList<KFileItem>&)),
+            this, SLOT(generatePreviews(const QList<KFileItem>&)));
 
     m_controller = new DolphinController(this);
     m_controller->setUrl(url);
@@ -134,19 +134,7 @@ void DolphinView::setActive(bool active)
 
     m_active = active;
 
-    QColor color = KColorScheme(KColorScheme::View).background();
-    if (active) {
-        emit urlChanged(url());
-        emit selectionChanged(selectedItems());
-    } else {
-        color.setAlpha(0);
-    }
-
-    QWidget* viewport = itemView()->viewport();
-    QPalette palette;
-    palette.setColor(viewport->backgroundRole(), color);
-    viewport->setPalette(palette);
-
+    updateViewportColor();
     update();
 
     if (active) {
@@ -176,11 +164,12 @@ void DolphinView::setMode(Mode mode)
         m_controller->setUrl(m_dirLister->url());
     }
 
-    ViewProperties props(url());
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
     props.setViewMode(m_mode);
 
     createView();
-    startDirLister(url());
+    startDirLister(viewPropsUrl);
 
     emit modeChanged();
 }
@@ -192,13 +181,14 @@ DolphinView::Mode DolphinView::mode() const
 
 void DolphinView::setShowPreview(bool show)
 {
-    ViewProperties props(url());
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
     props.setShowPreview(show);
 
     m_controller->setShowPreview(show);
     emit showPreviewChanged();
 
-    startDirLister(url(), true);
+    startDirLister(viewPropsUrl, true);
 }
 
 bool DolphinView::showPreview() const
@@ -212,13 +202,14 @@ void DolphinView::setShowHiddenFiles(bool show)
         return;
     }
 
-    ViewProperties props(url());
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
     props.setShowHiddenFiles(show);
 
     m_dirLister->setShowingDotFiles(show);
     emit showHiddenFilesChanged();
 
-    startDirLister(url(), true);
+    startDirLister(viewPropsUrl, true);
 }
 
 bool DolphinView::showHiddenFiles() const
@@ -242,7 +233,7 @@ void DolphinView::setCategorizedSorting(bool categorized)
         delete categorizer;
     }
 
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setCategorizedSorting(categorized);
     props.save();
 
@@ -266,12 +257,27 @@ bool DolphinView::supportsCategorizedSorting() const
 
 void DolphinView::selectAll()
 {
-    selectAll(QItemSelectionModel::Select);
+    itemView()->selectAll();
 }
 
 void DolphinView::invertSelection()
 {
-    selectAll(QItemSelectionModel::Toggle);
+    if (isColumnViewActive()) {
+        // In opposite to QAbstractItemView::selectAll() there is no virtual method
+        // for adjusting the invertion of a selection. As the generic approach by using
+        // the selection model does not work for the column view, we delegate this task:
+        m_columnView->invertSelection();
+    } else {
+        QItemSelectionModel* selectionModel = itemView()->selectionModel();
+        const QAbstractItemModel* itemModel = selectionModel->model();
+
+        const QModelIndex topLeft = itemModel->index(0, 0);
+        const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
+                                                         itemModel->columnCount() - 1);
+
+        QItemSelection selection(topLeft, bottomRight);
+        selectionModel->select(selection, QItemSelectionModel::Toggle);
+    }
 }
 
 bool DolphinView::hasSelection() const
@@ -284,7 +290,7 @@ void DolphinView::clearSelection()
     itemView()->selectionModel()->clear();
 }
 
-KFileItemList DolphinView::selectedItems() const
+QList<KFileItem> DolphinView::selectedItems() const
 {
     const QAbstractItemView* view = itemView();
 
@@ -293,15 +299,15 @@ KFileItemList DolphinView::selectedItems() const
     Q_ASSERT((view != 0) && (view->selectionModel() != 0));
 
     const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
-    KFileItemList itemList;
+    QList<KFileItem> itemList;
 
     const QModelIndexList indexList = selection.indexes();
     QModelIndexList::const_iterator end = indexList.end();
     for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) {
         Q_ASSERT((*it).isValid());
 
-        KFileItem* item = m_dirModel->itemForIndex(*it);
-        if (item != 0) {
+        KFileItem item = m_dirModel->itemForIndex(*it);
+        if (!item.isNull()) {
             itemList.append(item);
         }
     }
@@ -312,20 +318,15 @@ KFileItemList DolphinView::selectedItems() const
 KUrl::List DolphinView::selectedUrls() const
 {
     KUrl::List urls;
-
-    const KFileItemList list = selectedItems();
-    KFileItemList::const_iterator it = list.begin();
-    const KFileItemList::const_iterator end = list.end();
-    while (it != end) {
-        KFileItem* item = *it;
-        urls.append(item->url());
-        ++it;
+    const QList<KFileItem> list = selectedItems();
+    for ( QList<KFileItem>::const_iterator it = list.begin(), end = list.end();
+          it != end; ++it ) {
+        urls.append((*it).url());
     }
-
     return urls;
 }
 
-KFileItem* DolphinView::fileItem(const QModelIndex index) const
+KFileItem DolphinView::fileItem(const QModelIndex& index) const
 {
     const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
     return m_dirModel->itemForIndex(dirModelIndex);
@@ -393,14 +394,15 @@ Qt::SortOrder DolphinView::sortOrder() const
 
 void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
 {
-    ViewProperties props(url());
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
     props.setAdditionalInfo(info);
 
     m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation);
     m_fileItemDelegate->setAdditionalInformation(info);
 
     emit additionalInfoChanged(info);
-    startDirLister(url(), true);
+    startDirLister(viewPropsUrl, true);
 }
 
 KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const
@@ -419,26 +421,21 @@ void DolphinView::refresh()
     createView();
     applyViewProperties(m_controller->url());
     reload();
+    updateViewportColor();
 }
 
 void DolphinView::setUrl(const KUrl& url)
 {
     if (m_controller->url() == url) {
-        // Although the view URL is equal to the controller URL,
-        // the view properties must be applied to the view.
-        // This assures a consistent state of the currently activated
-        // column and their view properties.
-        if (isColumnViewActive()) {
-            applyViewProperties(url);
-        }
-    } else {
-        m_controller->setUrl(url);
+        return;
+    }
 
-        applyViewProperties(url);
+    m_controller->setUrl(url);
 
-        startDirLister(url);
-        emit urlChanged(url);
-    }
+    applyViewProperties(url);
+
+    startDirLister(url);
+    emit urlChanged(url);
 }
 
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
@@ -466,8 +463,8 @@ void DolphinView::triggerItem(const QModelIndex& index)
         return;
     }
 
-    KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index));
-    if (item == 0) {
+    KFileItem item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index));
+    if (item.isNull()) {
         return;
     }
 
@@ -475,13 +472,13 @@ void DolphinView::triggerItem(const QModelIndex& index)
 
     // Prefer the local path over the URL.
     bool isLocal;
-    KUrl url = item->mostLocalUrl(isLocal);
+    KUrl url = item.mostLocalUrl(isLocal);
 
-    if (item->isDir()) {
+    if (item.isDir()) {
         setUrl(url);
-    } else if (item->isFile()) {
+    } else if (item.isFile()) {
         // allow to browse through ZIP and tar files
-        KMimeType::Ptr mime = item->mimeTypePtr();
+        KMimeType::Ptr mime = item.mimeTypePtr();
         if (mime->is("application/zip")) {
             url.setProtocol("zip");
             setUrl(url);
@@ -493,23 +490,17 @@ void DolphinView::triggerItem(const QModelIndex& index)
             url.setProtocol("tar");
             setUrl(url);
         } else {
-            item->run();
+            item.run();
         }
     } else {
-        item->run();
+        item.run();
     }
 }
 
-void DolphinView::generatePreviews(const KFileItemList& items)
+void DolphinView::generatePreviews(const QList<KFileItem>& items)
 {
     if (m_controller->showPreview()) {
-
-        // Must turn QList<KFileItem *> to QList<KFileItem>...
-        QList<KFileItem> itemsToPreview;
-        foreach( KFileItem* it, items )
-            itemsToPreview.append( *it );
-
-        KIO::PreviewJob* job = KIO::filePreview(itemsToPreview, 128);
+        KIO::PreviewJob* job = KIO::filePreview(items, 128);
         connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
                 this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
     }
@@ -585,7 +576,7 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
             const KUrl& dirListerUrl = m_dirLister->url();
             if ((dirListerUrl == url) || !m_dirLister->url().isParentOf(url)) {
                 // The current URL is not a child of the dir lister
-                // URL. This may happen when e. g. a bookmark has been selected
+                // URL. This may happen when e. g. a place has been selected
                 // and hence the view must be reset.
                 keepOldDirs = false;
             }
@@ -597,21 +588,28 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
     }
 }
 
+KUrl DolphinView::viewPropertiesUrl() const
+{
+    if (isColumnViewActive()) {
+        return m_dirLister->url();
+    }
+
+    return url();
+}
+
 void DolphinView::applyViewProperties(const KUrl& url)
 {
+    if (isColumnViewActive() && m_dirLister->url().isParentOf(url)) {
+        // The column view is active, hence don't apply the view properties
+        // of sub directories (represented by columns) to the view. The
+        // view always represents the properties of the first column.
+        return;
+    }
+
     const ViewProperties props(url);
 
     const Mode mode = props.viewMode();
-    bool changeMode = (m_mode != mode);
-    if (changeMode && isColumnViewActive()) {
-        // The column view is active. Only change the
-        // mode if the current URL is no child of the column view.
-        if (m_dirLister->url().isParentOf(url)) {
-            changeMode = false;
-        }
-    }
-
-    if (changeMode) {
+    if (m_mode != mode) {
         m_mode = mode;
         createView();
         emit modeChanged();
@@ -678,7 +676,7 @@ void DolphinView::applyViewProperties(const KUrl& url)
     }
 }
 
-void DolphinView::changeSelection(const KFileItemList& selection)
+void DolphinView::changeSelection(const QList<KFileItem>& selection)
 {
     clearSelection();
     if (selection.isEmpty()) {
@@ -687,10 +685,10 @@ void DolphinView::changeSelection(const KFileItemList& selection)
     const KUrl& baseUrl = url();
     KUrl url;
     QItemSelection new_selection;
-    foreach(KFileItem* item, selection) {
-        url = item->url().upUrl();
+    foreach(const KFileItem& item, selection) {
+        url = item.url().upUrl();
         if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
-            QModelIndex index = m_proxyModel->mapFromSource(m_dirModel->indexForItem(*item));
+            QModelIndex index = m_proxyModel->mapFromSource(m_dirModel->indexForItem(item));
             new_selection.select(index, index);
         }
     }
@@ -701,7 +699,7 @@ void DolphinView::changeSelection(const KFileItemList& selection)
 
 void DolphinView::openContextMenu(const QPoint& pos)
 {
-    KFileItem* item = 0;
+    KFileItem item;
 
     const QModelIndex index = itemView()->indexAt(pos);
     if (isValidNameIndex(index)) {
@@ -715,24 +713,24 @@ void DolphinView::dropUrls(const KUrl::List& urls,
                            const QModelIndex& index,
                            QWidget* source)
 {
-    KFileItem* directory = 0;
+    KFileItem directory;
     if (isValidNameIndex(index)) {
-        KFileItem* item = fileItem(index);
-        Q_ASSERT(item != 0);
-        if (item->isDir()) {
+        KFileItem item = fileItem(index);
+        Q_ASSERT(!item.isNull());
+        if (item.isDir()) {
             // the URLs are dropped above a directory
             directory = item;
         }
     }
 
-    if ((directory == 0) && (source == itemView())) {
+    if ((directory.isNull()) && (source == itemView())) {
         // The dropping is done into the same viewport where
         // the dragging has been started. Just ignore this...
         return;
     }
 
-    const KUrl& destination = (directory == 0) ?
-                              url() : directory->url();
+    const KUrl& destination = (directory.isNull()) ?
+                              url() : directory.url();
     dropUrls(urls, destination);
 }
 
@@ -744,7 +742,7 @@ void DolphinView::dropUrls(const KUrl::List& urls,
 
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setSorting(sorting);
 
     m_proxyModel->setSorting(sorting);
@@ -754,7 +752,7 @@ void DolphinView::updateSorting(DolphinView::Sorting sorting)
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
 {
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setSortOrder(order);
 
     m_proxyModel->setSortOrder(order);
@@ -800,9 +798,9 @@ void DolphinView::showHoverInformation(const QModelIndex& index)
         return;
     }
 
-    const KFileItem* item = fileItem(index);
-    if (item != 0) {
-        emit requestItemInfo(*item);
+    const KFileItem item = fileItem(index);
+    if (!item.isNull()) {
+        emit requestItemInfo(item);
     }
 }
 
@@ -873,19 +871,6 @@ void DolphinView::createView()
             this, SLOT(emitContentsMoved()));
 }
 
-void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
-{
-    QItemSelectionModel* selectionModel = itemView()->selectionModel();
-    const QAbstractItemModel* itemModel = selectionModel->model();
-
-    const QModelIndex topLeft = itemModel->index(0, 0);
-    const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
-                                    itemModel->columnCount() - 1);
-
-    QItemSelection selection(topLeft, bottomRight);
-    selectionModel->select(selection, flags);
-}
-
 QAbstractItemView* DolphinView::itemView() const
 {
     if (m_detailsView != 0) {
@@ -934,9 +919,10 @@ void DolphinView::applyCutItemEffect()
         KFileItem* item = *it;
         if (isCutItem(*item)) {
             const QModelIndex index = m_dirModel->indexForItem(*item);
-            const KFileItem* item = m_dirModel->itemForIndex(index);
+            // Huh? the item is already known
+            //const KFileItem item = m_dirModel->itemForIndex(index);
             const QVariant value = m_dirModel->data(index, Qt::DecorationRole);
-            if ((value.type() == QVariant::Icon) && (item != 0)) {
+            if (value.type() == QVariant::Icon) {
                 const QIcon icon(qvariant_cast<QIcon>(value));
                 QPixmap pixmap = icon.pixmap(128, 128);
 
@@ -957,4 +943,20 @@ void DolphinView::applyCutItemEffect()
     }
 }
 
+void DolphinView::updateViewportColor()
+{
+    QColor color = KColorScheme(KColorScheme::View).background();
+    if (m_active) {
+        emit urlChanged(url());
+        emit selectionChanged(selectedItems());
+    } else {
+        color.setAlpha(0);
+    }
+
+    QWidget* viewport = itemView()->viewport();
+    QPalette palette;
+    palette.setColor(viewport->backgroundRole(), color);
+    viewport->setPalette(palette);
+}
+
 #include "dolphinview.moc"