X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/293e65797afd44a530df3435a8cc5b1b024aa3bb..81fcd720a2cc095262e52b8a40dd1472d774a415:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 65ec4c9d3..6053ac189 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -28,10 +28,10 @@ #include #include +#include #include #include #include -#include #include #include #include @@ -57,13 +57,12 @@ DolphinView::DolphinView(QWidget* parent, const KUrl& url, KDirLister* dirLister, KDirModel* dirModel, - DolphinSortFilterProxyModel* proxyModel, - Mode mode) : + DolphinSortFilterProxyModel* proxyModel) : QWidget(parent), m_active(true), - m_blockContentsMovedSignal(false), + m_loadingDirectory(false), m_initializeColumnView(false), - m_mode(mode), + m_mode(DolphinView::IconsView), m_topLayout(0), m_controller(0), m_iconsView(0), @@ -90,6 +89,8 @@ DolphinView::DolphinView(QWidget* parent, m_controller = new DolphinController(this); m_controller->setUrl(url); + connect(m_controller, SIGNAL(urlChanged(const KUrl&)), + this, SIGNAL(urlChanged(const KUrl&))); connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)), this, SLOT(openContextMenu(const QPoint&))); connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const QModelIndex&, QWidget*)), @@ -107,7 +108,7 @@ DolphinView::DolphinView(QWidget* parent, connect(m_controller, SIGNAL(viewportEntered()), this, SLOT(clearHoverInformation())); - createView(); + applyViewProperties(url); m_topLayout->addWidget(itemView()); } @@ -133,19 +134,7 @@ void DolphinView::setActive(bool active) m_active = active; - QColor color = KGlobalSettings::baseColor(); - 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) { @@ -171,16 +160,16 @@ void DolphinView::setMode(Mode mode) // to go back to the root URL of the column view automatically. // Otherwise there it would not be possible to turn off the column view // without focusing the first column. - // TODO: reactivate again after DolphinView/DolphinViewController split works - //setUrl(m_dirLister->url()); - //m_controller->setUrl(m_dirLister->url()); + setUrl(m_dirLister->url()); + 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 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 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 list = selectedItems(); + for ( QList::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); @@ -337,7 +338,7 @@ void DolphinView::setContentsPosition(int x, int y) view->horizontalScrollBar()->setValue(x); view->verticalScrollBar()->setValue(y); - m_blockContentsMovedSignal = false; + m_loadingDirectory = false; } QPoint DolphinView::contentsPosition() const @@ -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 @@ -417,7 +419,23 @@ void DolphinView::reload() void DolphinView::refresh() { createView(); + applyViewProperties(m_controller->url()); reload(); + updateViewportColor(); +} + +void DolphinView::setUrl(const KUrl& url) +{ + if (m_controller->url() == url) { + return; + } + + m_controller->setUrl(url); + + applyViewProperties(url); + + startDirLister(url); + emit urlChanged(url); } void DolphinView::mouseReleaseEvent(QMouseEvent* event) @@ -445,29 +463,22 @@ 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; } - // Prefer the local path over the URL. This assures that the - // volume space information is correct. Assuming that the URL is media:/sda1, - // and the local path is /windows/C: For the URL the space info is related - // to the root partition (and hence wrong) and for the local path the space - // info is related to the windows partition (-> correct). - const QString localPath(item->localPath()); - KUrl url; - if (localPath.isEmpty()) { - url = item->url(); - } else { - url = localPath; - } + // The stuff below should be moved to ViewContainer and be just a signal? + + // Prefer the local path over the URL. + bool 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); @@ -479,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& items) { if (m_controller->showPreview()) { - - // Must turn QList to QList... - QList 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&))); } @@ -533,15 +538,15 @@ void DolphinView::startDirLister(const KUrl& url, bool reload) if (!url.isValid()) { const QString location(url.pathOrUrl()); if (location.isEmpty()) { - emit errorMessage(i18n("The location is empty.")); + emit errorMessage(i18nc("@info:status", "The location is empty.")); } else { - emit errorMessage(i18n("The location '%1' is invalid.", location)); + emit errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location)); } return; } m_cutItemsCache.clear(); - m_blockContentsMovedSignal = true; + m_loadingDirectory = true; m_dirLister->stop(); @@ -583,27 +588,28 @@ void DolphinView::startDirLister(const KUrl& url, bool reload) } } -void DolphinView::setUrl(const KUrl& url) +KUrl DolphinView::viewPropertiesUrl() const { - if (m_controller->url() == url) { - return; + if (isColumnViewActive()) { + return m_dirLister->url(); } - m_controller->setUrl(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(); @@ -616,6 +622,11 @@ void DolphinView::setUrl(const KUrl& url) m_initializeColumnView = true; } } + if (itemView() == 0) { + createView(); + } + Q_ASSERT(itemView() != 0); + Q_ASSERT(m_fileItemDelegate != 0); const bool showHiddenFiles = props.showHiddenFiles(); if (showHiddenFiles != m_dirLister->showingDotFiles()) { @@ -663,12 +674,9 @@ void DolphinView::setUrl(const KUrl& url) m_controller->setShowPreview(showPreview); emit showPreviewChanged(); } - - startDirLister(url); - emit urlChanged(url); } -void DolphinView::changeSelection(const KFileItemList& selection) +void DolphinView::changeSelection(const QList& selection) { clearSelection(); if (selection.isEmpty()) { @@ -677,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); } } @@ -691,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)) { @@ -705,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); } @@ -734,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); @@ -744,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); @@ -754,7 +762,12 @@ void DolphinView::updateSortOrder(Qt::SortOrder order) void DolphinView::emitContentsMoved() { - if (!m_blockContentsMovedSignal) { + // only emit the contents moved signal if: + // - no directory loading is ongoing (this would reset the contents position + // always to (0, 0)) + // - if the Column View is active: the column view does an automatic + // positioning during the loading operation, which must be remembered + if (!m_loadingDirectory || isColumnViewActive()) { const QPoint pos(contentsPosition()); emit contentsMoved(pos.x(), pos.y()); } @@ -785,15 +798,15 @@ void DolphinView::showHoverInformation(const QModelIndex& index) return; } - const KFileItem* item = fileItem(index); - if (item != 0) { - emit requestItemInfo(item->url()); + const KFileItem item = fileItem(index); + if (!item.isNull()) { + emit requestItemInfo(item); } } void DolphinView::clearHoverInformation() { - emit requestItemInfo(KUrl()); + emit requestItemInfo(KFileItem()); } @@ -858,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) { @@ -919,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(value)); QPixmap pixmap = icon.pixmap(128, 128); @@ -942,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"