X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/be9746e87bb6a42e641dbf36c528a60fb564420a..093efca22dfd247f06e2a669ad968300e71ef08d:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 8d3bf1e2f..8b36e4ec3 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -28,10 +28,9 @@ #include #include -#include +#include #include #include -#include #include #include #include @@ -42,12 +41,12 @@ #include #include +#include "dolphinmodel.h" #include "dolphincolumnview.h" #include "dolphincontroller.h" #include "dolphinsortfilterproxymodel.h" #include "dolphindetailsview.h" #include "dolphiniconsview.h" -#include "dolphinitemcategorizer.h" #include "renamedialog.h" #include "viewproperties.h" #include "dolphinsettings.h" @@ -56,22 +55,20 @@ DolphinView::DolphinView(QWidget* parent, const KUrl& url, KDirLister* dirLister, - KDirModel* dirModel, - DolphinSortFilterProxyModel* proxyModel, - Mode mode, - bool showHiddenFiles) : + DolphinModel* dolphinModel, + 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), m_detailsView(0), m_columnView(0), m_fileItemDelegate(0), - m_dirModel(dirModel), + m_dolphinModel(dolphinModel), m_dirLister(dirLister), m_proxyModel(proxyModel) { @@ -84,19 +81,19 @@ DolphinView::DolphinView(QWidget* parent, connect(clipboard, SIGNAL(dataChanged()), this, SLOT(updateCutItems())); - connect(m_dirLister, SIGNAL(completed()), - this, SLOT(restoreContentsPos())); 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&)), + this, SLOT(generatePreviews(const QList&))); 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*)), - this, SLOT(dropUrls(const KUrl::List&, const QModelIndex&, QWidget*))); + connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&, const QModelIndex&, QWidget*)), + this, SLOT(dropUrls(const KUrl::List&, const KUrl&, const QModelIndex&, QWidget*))); connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)), this, SLOT(updateSorting(DolphinView::Sorting))); connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)), @@ -110,7 +107,7 @@ DolphinView::DolphinView(QWidget* parent, connect(m_controller, SIGNAL(viewportEntered()), this, SLOT(clearHoverInformation())); - createView(); + applyViewProperties(url); m_topLayout->addWidget(itemView()); } @@ -136,19 +133,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) { @@ -174,16 +159,27 @@ 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()); + + // Not all view modes support categorized sorting. Adjust the sorting model + // if changing the view mode results in a change of the categorized sorting + // capabilities. + const bool categorized = props.categorizedSorting() && supportsCategorizedSorting(); + if (categorized != categorizedSorting()) { + m_proxyModel->setCategorizedModel(categorized); + m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder()); + emit categorizedSortingChanged(); + } + + startDirLister(viewPropsUrl); emit modeChanged(); } @@ -195,13 +191,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 @@ -215,13 +212,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 @@ -231,35 +229,27 @@ bool DolphinView::showHiddenFiles() const void DolphinView::setCategorizedSorting(bool categorized) { - if (!supportsCategorizedSorting() || (categorized == categorizedSorting())) { + if (categorized == categorizedSorting()) { return; } - Q_ASSERT(m_iconsView != 0); - if (categorized) { - Q_ASSERT(m_iconsView->itemCategorizer() == 0); - m_iconsView->setItemCategorizer(new DolphinItemCategorizer()); - } else { - KItemCategorizer* categorizer = m_iconsView->itemCategorizer(); - m_iconsView->setItemCategorizer(0); - delete categorizer; - } + // setCategorizedSorting(true) may only get invoked + // if the view supports categorized sorting + Q_ASSERT(!categorized || supportsCategorizedSorting()); - ViewProperties props(url()); + ViewProperties props(viewPropertiesUrl()); props.setCategorizedSorting(categorized); props.save(); + m_proxyModel->setCategorizedModel(categorized); + m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder()); + emit categorizedSortingChanged(); } bool DolphinView::categorizedSorting() const { - if (!supportsCategorizedSorting()) { - return false; - } - - Q_ASSERT(m_iconsView != 0); - return m_iconsView->itemCategorizer() != 0; + return m_proxyModel->isCategorizedModel(); } bool DolphinView::supportsCategorizedSorting() const @@ -267,96 +257,100 @@ bool DolphinView::supportsCategorizedSorting() const return m_iconsView != 0; } -void DolphinView::renameSelectedItems() +void DolphinView::selectAll() { - // TODO: temporary deactivate due to DolphinView/DolphinViewController split - - /*DolphinView* view = 0; //mainWindow()->activeView(); - const KUrl::List urls = selectedUrls(); - if (urls.count() > 1) { - // More than one item has been selected for renaming. Open - // a rename dialog and rename all items afterwards. - RenameDialog dialog(urls); - if (dialog.exec() == QDialog::Rejected) { - return; - } + itemView()->selectAll(); +} - const QString& newName = dialog.newName(); - if (newName.isEmpty()) { - view->statusBar()->setMessage(dialog.errorString(), - DolphinStatusBar::Error); - } else { - // TODO: check how this can be integrated into KonqUndoManager/KonqOperations - // as one operation instead of n rename operations like it is done now... - Q_ASSERT(newName.contains('#')); - - // iterate through all selected items and rename them... - const int replaceIndex = newName.indexOf('#'); - Q_ASSERT(replaceIndex >= 0); - int index = 1; - - KUrl::List::const_iterator it = urls.begin(); - KUrl::List::const_iterator end = urls.end(); - while (it != end) { - const KUrl& oldUrl = *it; - QString number; - number.setNum(index++); - - QString name(newName); - name.replace(replaceIndex, 1, number); - - if (oldUrl.fileName() != name) { - KUrl newUrl = oldUrl; - newUrl.setFileName(name); - m_mainWindow->rename(oldUrl, newUrl); - } - ++it; - } - } +void DolphinView::invertSelection() +{ + if (isColumnViewActive()) { + // QAbstractItemView does not offer a virtual method invertSelection() + // as counterpart to QAbstractItemView::selectAll(). This makes it + // necessary to delegate the inverting of the selection to the + // column view, as only the selection of the active column should get + // inverted. + m_columnView->invertSelection(); } else { - // Only one item has been selected for renaming. Use the custom - // renaming mechanism from the views. - Q_ASSERT(urls.count() == 1); - - // TODO: Think about using KFileItemDelegate as soon as it supports editing. - // Currently the RenameDialog is used, but I'm not sure whether inline renaming - // is a benefit for the user at all -> let's wait for some input first... - RenameDialog dialog(urls); - if (dialog.exec() == QDialog::Rejected) { - return; - } + QItemSelectionModel* selectionModel = itemView()->selectionModel(); + const QAbstractItemModel* itemModel = selectionModel->model(); - const QString& newName = dialog.newName(); - if (newName.isEmpty()) { - view->statusBar()->setMessage(dialog.errorString(), - DolphinStatusBar::Error); - } else { - const KUrl& oldUrl = urls.first(); - KUrl newUrl = oldUrl; - newUrl.setFileName(newName); - m_mainWindow->rename(oldUrl, newUrl); + const QModelIndex topLeft = itemModel->index(0, 0); + const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1, + itemModel->columnCount() - 1); + + const QItemSelection selection(topLeft, bottomRight); + selectionModel->select(selection, QItemSelectionModel::Toggle); + } +} + +bool DolphinView::hasSelection() const +{ + return itemView()->selectionModel()->hasSelection(); +} + +void DolphinView::clearSelection() +{ + itemView()->selectionModel()->clear(); +} + +QList DolphinView::selectedItems() const +{ + const QAbstractItemView* view = itemView(); + + // Our view has a selection, we will map them back to the DolphinModel + // and then fill the KFileItemList. + Q_ASSERT((view != 0) && (view->selectionModel() != 0)); + + const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection()); + QList itemList; + + const QModelIndexList indexList = selection.indexes(); + foreach (QModelIndex index, indexList) { + KFileItem item = m_dolphinModel->itemForIndex(index); + if (!item.isNull()) { + itemList.append(item); } - }*/ + } + + return itemList; } -void DolphinView::selectAll() +KUrl::List DolphinView::selectedUrls() const { - selectAll(QItemSelectionModel::Select); + KUrl::List urls; + const QList list = selectedItems(); + for ( QList::const_iterator it = list.begin(), end = list.end(); + it != end; ++it ) { + urls.append((*it).url()); + } + return urls; } -void DolphinView::invertSelection() +KFileItem DolphinView::fileItem(const QModelIndex& index) const { - selectAll(QItemSelectionModel::Toggle); + const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index); + return m_dolphinModel->itemForIndex(dolphinModelIndex); } -int DolphinView::contentsX() const +void DolphinView::setContentsPosition(int x, int y) { - return itemView()->horizontalScrollBar()->value(); + QAbstractItemView* view = itemView(); + + // the ColumnView takes care itself for the horizontal scrolling + if (!isColumnViewActive()) { + view->horizontalScrollBar()->setValue(x); + } + view->verticalScrollBar()->setValue(y); + + m_loadingDirectory = false; } -int DolphinView::contentsY() const +QPoint DolphinView::contentsPosition() const { - return itemView()->verticalScrollBar()->value(); + const int x = itemView()->horizontalScrollBar()->value(); + const int y = itemView()->verticalScrollBar()->value(); + return QPoint(x, y); } void DolphinView::zoomIn() @@ -405,14 +399,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 @@ -420,136 +415,56 @@ KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const return m_fileItemDelegate->additionalInformation(); } -bool DolphinView::hasSelection() const -{ - return itemView()->selectionModel()->hasSelection(); -} - -void DolphinView::clearSelection() -{ - itemView()->selectionModel()->clear(); -} - -KFileItemList DolphinView::selectedItems() const -{ - const QAbstractItemView* view = itemView(); - - // Our view has a selection, we will map them back to the DirModel - // and then fill the KFileItemList. - Q_ASSERT((view != 0) && (view->selectionModel() != 0)); - - const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection()); - KFileItemList 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) { - itemList.append(item); - } - } - - return itemList; -} - -KUrl::List DolphinView::selectedUrls() const +void DolphinView::reload() { - 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; - } - - return urls; + setUrl(url()); + startDirLister(url(), true); } -KFileItem* DolphinView::fileItem(const QModelIndex index) const +void DolphinView::refresh() { - const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index); - return m_dirModel->itemForIndex(dirModelIndex); + createView(); + applyViewProperties(m_controller->url()); + reload(); + updateViewportColor(); } -void DolphinView::rename(const KUrl& source, const QString& newName) +void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl) { - bool ok = false; - - if (newName.isEmpty() || (source.fileName() == newName)) { + if (m_controller->url() == url) { return; } - KUrl dest(source.upUrl()); - dest.addPath(newName); - - const bool destExists = KIO::NetAccess::exists(dest, false, this); - if (destExists) { - // the destination already exists, hence ask the user - // how to proceed... - KIO::RenameDialog renameDialog(this, - i18n("File Already Exists"), - source.path(), - dest.path(), - KIO::M_OVERWRITE); - switch (renameDialog.exec()) { - case KIO::R_OVERWRITE: - // the destination should be overwritten - ok = KIO::NetAccess::file_move(source, dest, -1, true); - break; - - case KIO::R_RENAME: { - // a new name for the destination has been used - KUrl newDest(renameDialog.newDestUrl()); - ok = KIO::NetAccess::file_move(source, newDest); - break; - } - - default: - // the renaming operation has been canceled - return; - } - } else { - // no destination exists, hence just move the file to - // do the renaming - ok = KIO::NetAccess::file_move(source, dest); - } + const bool restoreColumnView = !rootUrl.isEmpty() + && !rootUrl.equals(url, KUrl::CompareWithoutTrailingSlash) + && rootUrl.isParentOf(url); - const QString destFileName = dest.fileName(); - if (ok) { - // XYDZ - //m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.", source.fileName(), destFileName), - // DolphinStatusBar::OperationCompleted); + m_controller->setUrl(url); // emits urlChanged, which we forward - KonqOperations::rename(this, source, destFileName); + if (restoreColumnView) { + applyViewProperties(rootUrl); + Q_ASSERT(itemView() == m_columnView); + startDirLister(rootUrl); + m_columnView->showColumn(url); } else { - // XYDZ - //m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.", source.fileName(), destFileName), - // DolphinStatusBar::Error); + applyViewProperties(url); + startDirLister(url); } -} -void DolphinView::reload() -{ - setUrl(url()); - startDirLister(url(), true); + itemView()->setFocus(); + + emit startedPathLoading(url); } -void DolphinView::refresh() +void DolphinView::setUrl(const KUrl& url) { - createView(); - reload(); + updateView(url, KUrl()); } void DolphinView::mouseReleaseEvent(QMouseEvent* event) { QWidget::mouseReleaseEvent(event); - setActive(true);; + setActive(true); } void DolphinView::activate() { @@ -558,11 +473,7 @@ void DolphinView::activate() void DolphinView::triggerItem(const QModelIndex& index) { - if (!isValidNameIndex(index)) { - clearSelection(); - showHoverInformation(index); - return; - } + Q_ASSERT(index.isValid()); const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) { @@ -571,57 +482,19 @@ void DolphinView::triggerItem(const QModelIndex& index) return; } - KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index)); - if (item == 0) { - return; - } + const KFileItem item = m_dolphinModel->itemForIndex(m_proxyModel->mapToSource(index)); - // 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; + if (item.isNull()) { + return; } - if (item->isDir()) { - setUrl(url); - } else if (item->isFile()) { - // allow to browse through ZIP and tar files - KMimeType::Ptr mime = item->mimeTypePtr(); - if (mime->is("application/zip")) { - url.setProtocol("zip"); - setUrl(url); - } else if (mime->is("application/x-tar") || - mime->is("application/x-tarz") || - mime->is("application/x-bzip-compressed-tar") || - mime->is("application/x-compressed-tar") || - mime->is("application/x-tzo")) { - url.setProtocol("tar"); - setUrl(url); - } else { - item->run(); - } - } else { - item->run(); - } + emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart } -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&))); } @@ -636,33 +509,19 @@ void DolphinView::showPreview(const KFileItem& item, const QPixmap& pixmap) return; } - const QModelIndex idx = m_dirModel->indexForItem(item); + const QModelIndex idx = m_dolphinModel->indexForItem(item); if (idx.isValid() && (idx.column() == 0)) { const QMimeData* mimeData = QApplication::clipboard()->mimeData(); if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) { KIconEffect iconEffect; const QPixmap cutPixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState); - m_dirModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole); + m_dolphinModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole); } else { - m_dirModel->setData(idx, QIcon(pixmap), Qt::DecorationRole); + m_dolphinModel->setData(idx, QIcon(pixmap), Qt::DecorationRole); } } } -void DolphinView::restoreContentsPos() -{ - m_blockContentsMovedSignal = false; - if (!url().isEmpty()) { - QAbstractItemView* view = itemView(); - // TODO #1: view->setCurrentItem(m_urlNavigator->currentFileName()); - // TODO #2: temporary deactivated due to DolphinView/DolphinViewController split - //QPoint pos = m_urlNavigator->savedPosition(); - QPoint pos(0, 0); - view->horizontalScrollBar()->setValue(pos.x()); - view->verticalScrollBar()->setValue(pos.y()); - } -} - void DolphinView::emitSelectionChangedSignal() { emit selectionChanged(DolphinView::selectedItems()); @@ -671,94 +530,70 @@ void DolphinView::emitSelectionChangedSignal() void DolphinView::startDirLister(const KUrl& url, bool reload) { if (!url.isValid()) { - // TODO: temporary deactivated due to DolphinView/DolphinViewController split - - //const QString location(url.pathOrUrl()); - //if (location.isEmpty()) { - // m_statusBar->setMessage(i18n("The location is empty."), DolphinStatusBar::Error); - //} else { - // m_statusBar->setMessage(i18n("The location '%1' is invalid.", location), - // DolphinStatusBar::Error); - //} + const QString location(url.pathOrUrl()); + if (location.isEmpty()) { + emit errorMessage(i18nc("@info:status", "The location is empty.")); + } else { + emit errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location)); + } return; } - // Only show the directory loading progress if the status bar does - // not contain another progress information. This means that - // the directory loading progress information has the lowest priority. - - // TODO: temporary deactivated due to DolphinView/DolphinViewController split - //const QString progressText(m_statusBar->progressText()); - //m_showProgress = progressText.isEmpty() || - // (progressText == i18n("Loading folder...")); - //if (m_showProgress) { - // m_statusBar->setProgressText(i18n("Loading folder...")); - // m_statusBar->setProgress(0); - //} - m_cutItemsCache.clear(); - m_blockContentsMovedSignal = true; + m_loadingDirectory = true; + m_dirLister->stop(); - bool openDir = true; bool keepOldDirs = isColumnViewActive() && !m_initializeColumnView; m_initializeColumnView = false; if (keepOldDirs) { + // keeping old directories is only necessary for hierarchical views + // like the column view if (reload) { - keepOldDirs = false; - - const KUrl& dirListerUrl = m_dirLister->url(); - if (dirListerUrl.isValid()) { - const KUrl::List dirs = m_dirLister->directories(); - KUrl url; - foreach(url, dirs) { - m_dirLister->updateDirectory(url); - } - openDir = false; - } + // for the column view it is not enough to reload the directory lister, + // so this task is delegated to the column view directly + m_columnView->reload(); } else if (m_dirLister->directories().contains(url)) { // The dir lister contains the directory already, so - // KDirLister::openUrl() may not been invoked twice. + // KDirLister::openUrl() may not get invoked twice. m_dirLister->updateDirectory(url); - openDir = false; } else { 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; + m_dirLister->openUrl(url, false, false); } } + } else { + m_dirLister->openUrl(url, false, reload); } +} - if (openDir) { - m_dirLister->openUrl(url, keepOldDirs, reload); +KUrl DolphinView::viewPropertiesUrl() const +{ + if (isColumnViewActive()) { + return m_dirLister->url(); } + + return url(); } -void DolphinView::setUrl(const KUrl& url) +void DolphinView::applyViewProperties(const KUrl& url) { - if (m_controller->url() == 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; } - m_controller->setUrl(url); - 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(); @@ -771,6 +606,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()) { @@ -778,19 +618,10 @@ void DolphinView::setUrl(const KUrl& url) emit showHiddenFilesChanged(); } - const bool categorized = props.categorizedSorting(); + const bool categorized = props.categorizedSorting() && supportsCategorizedSorting(); if (categorized != categorizedSorting()) { - if (supportsCategorizedSorting()) { - Q_ASSERT(m_iconsView != 0); - if (categorized) { - Q_ASSERT(m_iconsView->itemCategorizer() == 0); - m_iconsView->setItemCategorizer(new DolphinItemCategorizer()); - } else { - KItemCategorizer* categorizer = m_iconsView->itemCategorizer(); - m_iconsView->setItemCategorizer(0); - delete categorizer; - } - } + m_proxyModel->setCategorizedModel(categorized); + m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder()); emit categorizedSortingChanged(); } @@ -818,15 +649,9 @@ void DolphinView::setUrl(const KUrl& url) m_controller->setShowPreview(showPreview); emit showPreviewChanged(); } - - startDirLister(url); - emit urlChanged(url); - - // TODO: temporary deactivated due to DolphinView/DolphinViewController split - //m_statusBar->clear(); } -void DolphinView::changeSelection(const KFileItemList& selection) +void DolphinView::changeSelection(const QList& selection) { clearSelection(); if (selection.isEmpty()) { @@ -835,10 +660,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_dolphinModel->indexForItem(item)); new_selection.select(index, index); } } @@ -849,7 +674,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)) { @@ -860,27 +685,28 @@ void DolphinView::openContextMenu(const QPoint& pos) } void DolphinView::dropUrls(const KUrl::List& urls, - const QModelIndex& index, + const KUrl& destPath, + const QModelIndex& destIndex, QWidget* source) { - KFileItem* directory = 0; - if (isValidNameIndex(index)) { - KFileItem* item = fileItem(index); - Q_ASSERT(item != 0); - if (item->isDir()) { + KFileItem directory; + if (isValidNameIndex(destIndex)) { + KFileItem item = fileItem(destIndex); + 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()) ? + destPath : directory.url(); dropUrls(urls, destination); } @@ -892,7 +718,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); @@ -902,7 +728,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); @@ -912,8 +738,14 @@ void DolphinView::updateSortOrder(Qt::SortOrder order) void DolphinView::emitContentsMoved() { - if (!m_blockContentsMovedSignal) { - emit contentsMoved(contentsX(), contentsY()); + // 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()); } } @@ -924,9 +756,9 @@ void DolphinView::updateCutItems() QList::const_iterator it = m_cutItemsCache.begin(); QList::const_iterator end = m_cutItemsCache.end(); while (it != end) { - const QModelIndex index = m_dirModel->indexForUrl((*it).url); + const QModelIndex index = m_dolphinModel->indexForUrl((*it).url); if (index.isValid()) { - m_dirModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole); + m_dolphinModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole); } ++it; } @@ -942,19 +774,15 @@ void DolphinView::showHoverInformation(const QModelIndex& index) return; } - const KFileItem* item = fileItem(index); - if (item != 0) { - // TODO: temporary deactivated due to DolphinView/DolphinViewController split - //m_statusBar->setMessage(item->getStatusBarInfo(), DolphinStatusBar::Default); - emit requestItemInfo(item->url()); + const KFileItem item = fileItem(index); + if (!item.isNull()) { + emit requestItemInfo(item); } } void DolphinView::clearHoverInformation() { - // TODO: temporary deactivated due to DolphinView/DolphinViewController split - //m_statusBar->clear(); - emit requestItemInfo(KUrl()); + emit requestItemInfo(KFileItem()); } @@ -965,11 +793,6 @@ void DolphinView::createView() if (view != 0) { m_topLayout->removeWidget(view); view->close(); - if (view == m_iconsView) { - KItemCategorizer* categorizer = m_iconsView->itemCategorizer(); - m_iconsView->setItemCategorizer(0); - delete categorizer; - } view->deleteLater(); view = 0; m_iconsView = 0; @@ -984,10 +807,11 @@ void DolphinView::createView() // ... and recreate it representing the current mode switch (m_mode) { - case IconsView: + case IconsView: { m_iconsView = new DolphinIconsView(this, m_controller); view = m_iconsView; break; + } case DetailsView: m_detailsView = new DolphinDetailsView(this, m_controller); @@ -1008,7 +832,7 @@ void DolphinView::createView() view->setModel(m_proxyModel); view->setSelectionMode(QAbstractItemView::ExtendedSelection); - new KMimeTypeResolver(view, m_dirModel); + new KMimeTypeResolver(view, m_dolphinModel); m_topLayout->insertWidget(1, view); connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), @@ -1017,19 +841,7 @@ void DolphinView::createView() this, SLOT(emitContentsMoved())); connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)), 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); + view->setFocus(); } QAbstractItemView* DolphinView::itemView() const @@ -1045,7 +857,7 @@ QAbstractItemView* DolphinView::itemView() const bool DolphinView::isValidNameIndex(const QModelIndex& index) const { - return index.isValid() && (index.column() == KDirModel::Name); + return index.isValid() && (index.column() == DolphinModel::Name); } bool DolphinView::isCutItem(const KFileItem& item) const @@ -1079,10 +891,11 @@ void DolphinView::applyCutItemEffect() while (it != end) { KFileItem* item = *it; if (isCutItem(*item)) { - const QModelIndex index = m_dirModel->indexForItem(*item); - const KFileItem* item = m_dirModel->itemForIndex(index); - const QVariant value = m_dirModel->data(index, Qt::DecorationRole); - if ((value.type() == QVariant::Icon) && (item != 0)) { + const QModelIndex index = m_dolphinModel->indexForItem(*item); + // Huh? the item is already known + //const KFileItem item = m_dolphinModel->itemForIndex(index); + const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole); + if (value.type() == QVariant::Icon) { const QIcon icon(qvariant_cast(value)); QPixmap pixmap = icon.pixmap(128, 128); @@ -1096,11 +909,27 @@ void DolphinView::applyCutItemEffect() // apply icon effect to the cut item KIconEffect iconEffect; pixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState); - m_dirModel->setData(index, QIcon(pixmap), Qt::DecorationRole); + m_dolphinModel->setData(index, QIcon(pixmap), Qt::DecorationRole); } } ++it; } } +void DolphinView::updateViewportColor() +{ + QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color(); + if (m_active) { + emit urlChanged(url()); // Hmm, this is a hack; the url hasn't really changed. + emit selectionChanged(selectedItems()); + } else { + color.setAlpha(0); + } + + QWidget* viewport = itemView()->viewport(); + QPalette palette; + palette.setColor(viewport->backgroundRole(), color); + viewport->setPalette(palette); +} + #include "dolphinview.moc"