/***************************************************************************
- * Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at> *
+ * Copyright (C) 2006-2009 by Peter Penz <peter.penz@gmx.at> *
* Copyright (C) 2006 by Gregor Kališnik <gregor@podnapisi.net> *
* *
* This program is free software; you can redistribute it and/or modify *
#include "dolphinview.h"
+#include <QAbstractItemView>
#include <QApplication>
#include <QClipboard>
#include <QKeyEvent>
#include <kactioncollection.h>
#include <kcolorscheme.h>
#include <kdirlister.h>
-#include <kfilepreviewgenerator.h>
#include <kiconeffect.h>
#include <kfileitem.h>
#include <klocale.h>
#include <kurl.h>
#include "dolphinmodel.h"
-#include "dolphincolumnview.h"
+#include "dolphincolumnviewcontainer.h"
#include "dolphincontroller.h"
#include "dolphindetailsview.h"
#include "dolphinfileitemdelegate.h"
#include "dolphiniconsview.h"
#include "dolphin_generalsettings.h"
#include "draganddrophelper.h"
-#include "folderexpander.h"
#include "renamedialog.h"
-#include "tooltips/tooltipmanager.h"
#include "settings/dolphinsettings.h"
#include "viewproperties.h"
#include "zoomlevelinfo.h"
DolphinView::DolphinView(QWidget* parent,
const KUrl& url,
- KDirLister* dirLister,
- DolphinModel* dolphinModel,
DolphinSortFilterProxyModel* proxyModel) :
QWidget(parent),
m_active(true),
m_mode(DolphinView::IconsView),
m_topLayout(0),
m_controller(0),
- m_iconsView(0),
- m_detailsView(0),
- m_columnView(0),
- m_fileItemDelegate(0),
+ m_viewAccessor(proxyModel),
m_selectionModel(0),
- m_dolphinModel(dolphinModel),
- m_dirLister(dirLister),
- m_proxyModel(proxyModel),
- m_previewGenerator(0),
- m_toolTipManager(0),
+ m_selectionChangedTimer(0),
m_rootUrl(),
m_activeItemUrl(),
m_createdItemUrl(),
m_selectedItems(),
- m_newFileNames(),
- m_expandedDragSource(0)
+ m_newFileNames()
{
m_topLayout = new QVBoxLayout(this);
m_topLayout->setSpacing(0);
connect(m_controller, SIGNAL(viewportEntered()),
this, SLOT(clearHoverInformation()));
- connect(m_dirLister, SIGNAL(redirection(KUrl, KUrl)),
+ KDirLister* dirLister = m_viewAccessor.dirLister();
+ connect(dirLister, SIGNAL(redirection(KUrl, KUrl)),
this, SIGNAL(redirection(KUrl, KUrl)));
- connect(m_dirLister, SIGNAL(completed()),
+ connect(dirLister, SIGNAL(completed()),
this, SLOT(slotDirListerCompleted()));
- connect(m_dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),
+ connect(dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),
this, SLOT(slotRefreshItems()));
// When a new item has been created by the "Create New..." menu, the item should
connect(&DolphinNewMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
this, SLOT(observeCreatedItem(const KUrl&)));
- applyViewProperties(url);
- m_topLayout->addWidget(itemView());
+ m_selectionChangedTimer = new QTimer(this);
+ m_selectionChangedTimer->setSingleShot(true);
+ m_selectionChangedTimer->setInterval(300);
+ connect(m_selectionChangedTimer, SIGNAL(timeout()),
+ this, SLOT(emitSelectionChangedSignal()));
+
+ applyViewProperties();
+ m_topLayout->addWidget(m_viewAccessor.itemView());
}
DolphinView::~DolphinView()
{
- delete m_expandedDragSource;
- m_expandedDragSource = 0;
}
const KUrl& DolphinView::url() const
KUrl DolphinView::rootUrl() const
{
- return isColumnViewActive() ? m_columnView->rootUrl() : url();
+ const KUrl viewUrl = url();
+ const KUrl root = m_viewAccessor.rootUrl();
+ if (root.isEmpty() || !root.isParentOf(viewUrl)) {
+ return viewUrl;
+ }
+ return root;
}
void DolphinView::setActive(bool active)
QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
if (active) {
- emit selectionChanged(selectedItems());
+ emitSelectionChangedSignal();
} else {
color.setAlpha(150);
}
- QWidget* viewport = itemView()->viewport();
+ QWidget* viewport = m_viewAccessor.itemView()->viewport();
QPalette palette;
palette.setColor(viewport->backgroundRole(), color);
viewport->setPalette(palette);
update();
if (active) {
- itemView()->setFocus();
+ m_viewAccessor.itemView()->setFocus();
emit activated();
}
deleteView();
- const KUrl viewPropsUrl = viewPropertiesUrl();
+ const KUrl viewPropsUrl = rootUrl();
ViewProperties props(viewPropsUrl);
props.setViewMode(m_mode);
createView();
// the file item delegate has been recreated, apply the current
// additional information manually
const KFileItemDelegate::InformationList infoList = props.additionalInfo();
- m_fileItemDelegate->setShowInformation(infoList);
+ m_viewAccessor.itemDelegate()->setShowInformation(infoList);
emit additionalInfoChanged();
// Not all view modes support categorized sorting. Adjust the sorting model
// capabilities.
m_storedCategorizedSorting = props.categorizedSorting();
const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
- if (categorized != m_proxyModel->isCategorizedModel()) {
- m_proxyModel->setCategorizedModel(categorized);
+ if (categorized != m_viewAccessor.proxyModel()->isCategorizedModel()) {
+ m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
emit categorizedSortingChanged();
}
emit modeChanged();
updateZoomLevel(oldZoomLevel);
- if (m_showPreview) {
+ if (m_showPreview) {
loadDirectory(viewPropsUrl);
}
}
bool DolphinView::showHiddenFiles() const
{
- return m_dirLister->showingDotFiles();
+ return m_viewAccessor.dirLister()->showingDotFiles();
}
bool DolphinView::categorizedSorting() const
{
// If all view modes would support categorized sorting, returning
- // m_proxyModel->isCategorizedModel() would be the way to go. As
+ // m_viewAccessor.proxyModel()->isCategorizedModel() would be the way to go. As
// currently only the icons view supports caterized sorting, we remember
// the stored view properties state in m_storedCategorizedSorting and
// return this state. The application takes care to disable the corresponding
bool DolphinView::supportsCategorizedSorting() const
{
- return m_iconsView != 0;
+ return m_viewAccessor.supportsCategorizedSorting();
}
void DolphinView::selectAll()
{
- QAbstractItemView* view = itemView();
+ QAbstractItemView* view = m_viewAccessor.itemView();
// TODO: there seems to be a bug in QAbstractItemView::selectAll(); if
// the Ctrl-key is pressed (e. g. for Ctrl+A), selectAll() inverts the
// selection instead of selecting all items. This is bypassed for KDE 4.0
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 {
- QItemSelectionModel* selectionModel = itemView()->selectionModel();
- const QAbstractItemModel* itemModel = selectionModel->model();
+ QItemSelectionModel* selectionModel = m_viewAccessor.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);
+ 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);
- }
+ const QItemSelection selection(topLeft, bottomRight);
+ selectionModel->select(selection, QItemSelectionModel::Toggle);
}
bool DolphinView::hasSelection() const
{
- return itemView()->selectionModel()->hasSelection();
+ return m_viewAccessor.itemView()->selectionModel()->hasSelection();
}
void DolphinView::clearSelection()
{
- QItemSelectionModel* selModel = itemView()->selectionModel();
+ QItemSelectionModel* selModel = m_viewAccessor.itemView()->selectionModel();
const QModelIndex currentIndex = selModel->currentIndex();
selModel->setCurrentIndex(currentIndex, QItemSelectionModel::Current |
QItemSelectionModel::Clear);
KFileItemList DolphinView::selectedItems() const
{
- if (isColumnViewActive()) {
- return m_columnView->selectedItems();
- }
-
- const QAbstractItemView* view = itemView();
+ const QAbstractItemView* view = m_viewAccessor.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());
+ const QItemSelection selection = m_viewAccessor.proxyModel()->mapSelectionToSource(view->selectionModel()->selection());
KFileItemList itemList;
const QModelIndexList indexList = selection.indexes();
foreach (const QModelIndex &index, indexList) {
- KFileItem item = m_dolphinModel->itemForIndex(index);
+ KFileItem item = m_viewAccessor.dirModel()->itemForIndex(index);
if (!item.isNull()) {
itemList.append(item);
}
int DolphinView::selectedItemsCount() const
{
- if (isColumnViewActive()) {
- // TODO: get rid of this special case by adjusting the dir lister
- // to the current column
- return m_columnView->selectedItems().count();
- }
-
- return itemView()->selectionModel()->selection().count();
+ return m_viewAccessor.itemView()->selectionModel()->selectedIndexes().count();
}
void DolphinView::setContentsPosition(int x, int y)
{
- QAbstractItemView* view = itemView();
-
- // the ColumnView takes care itself for the horizontal scrolling
- if (!isColumnViewActive()) {
- view->horizontalScrollBar()->setValue(x);
- }
+ QAbstractItemView* view = m_viewAccessor.itemView();
+ view->horizontalScrollBar()->setValue(x);
view->verticalScrollBar()->setValue(y);
m_loadingDirectory = false;
QPoint DolphinView::contentsPosition() const
{
- const int x = itemView()->horizontalScrollBar()->value();
- const int y = itemView()->verticalScrollBar()->value();
+ const int x = m_viewAccessor.itemView()->horizontalScrollBar()->value();
+ const int y = m_viewAccessor.itemView()->verticalScrollBar()->value();
return QPoint(x, y);
}
if (level != zoomLevel()) {
m_controller->setZoomLevel(level);
- m_previewGenerator->updateIcons();
emit zoomLevelChanged(level);
}
}
DolphinView::Sorting DolphinView::sorting() const
{
- return m_proxyModel->sorting();
+ return m_viewAccessor.proxyModel()->sorting();
}
void DolphinView::setSortOrder(Qt::SortOrder order)
Qt::SortOrder DolphinView::sortOrder() const
{
- return m_proxyModel->sortOrder();
+ return m_viewAccessor.proxyModel()->sortOrder();
}
void DolphinView::setSortFoldersFirst(bool foldersFirst)
bool DolphinView::sortFoldersFirst() const
{
- return m_proxyModel->sortFoldersFirst();
+ return m_viewAccessor.proxyModel()->sortFoldersFirst();
}
void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info)
{
- const KUrl viewPropsUrl = viewPropertiesUrl();
+ const KUrl viewPropsUrl = rootUrl();
ViewProperties props(viewPropsUrl);
props.setAdditionalInfo(info);
- m_fileItemDelegate->setShowInformation(info);
+ m_viewAccessor.itemDelegate()->setShowInformation(info);
emit additionalInfoChanged();
- if (itemView() != m_detailsView) {
- // the details view requires no reloading of the directory, as it maps
- // the file item delegate info to its columns internally
+ if (m_viewAccessor.reloadOnAdditionalInfoChange()) {
loadDirectory(viewPropsUrl);
}
}
KFileItemDelegate::InformationList DolphinView::additionalInfo() const
{
- return m_fileItemDelegate->showInformation();
+ return m_viewAccessor.itemDelegate()->showInformation();
}
void DolphinView::reload()
m_active = true;
createView();
- applyViewProperties(m_controller->url());
+ applyViewProperties();
reload();
setActive(oldActivationState);
void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)
{
+ Q_UNUSED(rootUrl); // TODO: remove after columnview-cleanup has been finished
+
if (m_controller->url() == url) {
return;
}
- m_previewGenerator->cancelPreviews();
m_controller->setUrl(url); // emits urlChanged, which we forward
+ m_viewAccessor.prepareUrlChange(url);
+ applyViewProperties();
+ loadDirectory(url);
- if (!rootUrl.isEmpty() && rootUrl.isParentOf(url)) {
- applyViewProperties(rootUrl);
- loadDirectory(rootUrl);
- if (itemView() == m_columnView) {
- m_columnView->setRootUrl(rootUrl);
- m_columnView->showColumn(url);
- }
- } else {
- applyViewProperties(url);
- loadDirectory(url);
- }
+ // When changing the URL there is no need to keep the version
+ // data of the previous URL.
+ m_viewAccessor.dirModel()->clearVersionData();
emit startedPathLoading(url);
}
void DolphinView::setNameFilter(const QString& nameFilter)
{
- m_proxyModel->setFilterRegExp(nameFilter);
-
- if (isColumnViewActive()) {
- // adjusting the directory lister is not enough in the case of the
- // column view, as each column has its own directory lister internally...
- m_columnView->setNameFilter(nameFilter);
- }
+ m_controller->setNameFilter(nameFilter);
}
void DolphinView::calculateItemCount(int& fileCount,
int& folderCount,
KIO::filesize_t& totalFileSize) const
{
- foreach (const KFileItem& item, m_dirLister->items()) {
+ foreach (const KFileItem& item, m_viewAccessor.dirLister()->items()) {
if (item.isDir()) {
++folderCount;
} else {
return text;
}
+QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) const
+{
+ return m_controller->versionControlActions(items);
+}
+
void DolphinView::setUrl(const KUrl& url)
{
m_newFileNames.clear();
foreach(const KFileItem& item, selection) {
url = item.url().upUrl();
if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
- QModelIndex index = m_proxyModel->mapFromSource(m_dolphinModel->indexForItem(item));
+ QModelIndex index = m_viewAccessor.proxyModel()->mapFromSource(m_viewAccessor.dirModel()->indexForItem(item));
newSelection.select(index, index);
}
}
- itemView()->selectionModel()->select(newSelection,
+ m_viewAccessor.itemView()->selectionModel()->select(newSelection,
QItemSelectionModel::ClearAndSelect
| QItemSelectionModel::Current);
}
}
} else if (DolphinSettings::instance().generalSettings()->renameInline()) {
Q_ASSERT(itemCount == 1);
-
- if (isColumnViewActive()) {
- m_columnView->editItem(items.first());
- } else {
- const QModelIndex dirIndex = m_dolphinModel->indexForItem(items.first());
- const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
- itemView()->edit(proxyIndex);
- }
+ const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForItem(items.first());
+ const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
+ m_viewAccessor.itemView()->edit(proxyIndex);
} else {
Q_ASSERT(itemCount == 1);
return;
}
- const KUrl viewPropsUrl = viewPropertiesUrl();
+ const KUrl viewPropsUrl = rootUrl();
ViewProperties props(viewPropsUrl);
props.setShowPreview(show);
m_showPreview = show;
- m_previewGenerator->setPreviewShown(show);
-
const int oldZoomLevel = m_controller->zoomLevel();
emit showPreviewChanged();
// 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:
updateZoomLevel(oldZoomLevel);
-
- loadDirectory(viewPropsUrl);
}
void DolphinView::setShowHiddenFiles(bool show)
{
- if (m_dirLister->showingDotFiles() == show) {
+ if (m_viewAccessor.dirLister()->showingDotFiles() == show) {
return;
}
- const KUrl viewPropsUrl = viewPropertiesUrl();
+ const KUrl viewPropsUrl = rootUrl();
ViewProperties props(viewPropsUrl);
props.setShowHiddenFiles(show);
- m_dirLister->setShowingDotFiles(show);
+ m_viewAccessor.dirLister()->setShowingDotFiles(show);
emit showHiddenFilesChanged();
-
- loadDirectory(viewPropsUrl);
}
void DolphinView::setCategorizedSorting(bool categorized)
// if the view supports categorized sorting
Q_ASSERT(!categorized || supportsCategorizedSorting());
- ViewProperties props(viewPropertiesUrl());
+ ViewProperties props(rootUrl());
props.setCategorizedSorting(categorized);
props.save();
m_storedCategorizedSorting = categorized;
- m_proxyModel->setCategorizedModel(categorized);
+ m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
emit categorizedSortingChanged();
}
{
switch (event->type()) {
case QEvent::FocusIn:
- if (watched == itemView()) {
+ if (watched == m_viewAccessor.itemView()) {
m_controller->requestActivation();
}
break;
- case QEvent::MouseButtonPress:
- if ((watched == itemView()->viewport()) && (m_expandedDragSource != 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.
- m_expandedDragSource->deleteLater();
- m_expandedDragSource = 0;
- }
- break;
-
case QEvent::DragEnter:
- if (watched == itemView()->viewport()) {
+ if (watched == m_viewAccessor.itemView()->viewport()) {
setActive(true);
}
break;
case QEvent::KeyPress:
- if (watched == itemView()) {
- if (m_toolTipManager != 0) {
- m_toolTipManager->hideTip();
- }
-
+ if (watched == m_viewAccessor.itemView()) {
// clear the selection when Escape has been pressed
QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
if (keyEvent->key() == Qt::Key_Escape) {
return;
}
- if (m_toolTipManager != 0) {
- m_toolTipManager->hideTip();
- }
emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
}
+void DolphinView::emitDelayedSelectionChangedSignal()
+{
+ // Invoke emitSelectionChangedSignal() with a delay of 300 ms. This assures
+ // that fast selection changes don't result in expensive operations to
+ // collect all file items for the signal (see DolphinView::selectedItems()).
+ m_selectionChangedTimer->start();
+}
+
void DolphinView::emitSelectionChangedSignal()
{
emit selectionChanged(DolphinView::selectedItems());
const QList<QAction*>& customActions)
{
KFileItem item;
- if (isColumnViewActive()) {
- item = m_columnView->itemAt(pos);
- } else {
- const QModelIndex index = itemView()->indexAt(pos);
- if (index.isValid() && (index.column() == DolphinModel::Name)) {
- const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
- item = m_dolphinModel->itemForIndex(dolphinModelIndex);
- }
- }
-
- if (m_toolTipManager != 0) {
- m_toolTipManager->hideTip();
+ const QModelIndex index = m_viewAccessor.itemView()->indexAt(pos);
+ if (index.isValid() && (index.column() == DolphinModel::Name)) {
+ const QModelIndex dolphinModelIndex = m_viewAccessor.proxyModel()->mapToSource(index);
+ item = m_viewAccessor.dirModel()->itemForIndex(dolphinModelIndex);
}
m_isContextMenuOpen = true; // TODO: workaround for Qt-issue 207192
void DolphinView::updateSorting(DolphinView::Sorting sorting)
{
- ViewProperties props(viewPropertiesUrl());
+ ViewProperties props(rootUrl());
props.setSorting(sorting);
- m_proxyModel->setSorting(sorting);
+ m_viewAccessor.proxyModel()->setSorting(sorting);
emit sortingChanged(sorting);
}
void DolphinView::updateSortOrder(Qt::SortOrder order)
{
- ViewProperties props(viewPropertiesUrl());
+ ViewProperties props(rootUrl());
props.setSortOrder(order);
- m_proxyModel->setSortOrder(order);
+ m_viewAccessor.proxyModel()->setSortOrder(order);
emit sortOrderChanged(order);
}
void DolphinView::updateSortFoldersFirst(bool foldersFirst)
{
- ViewProperties props(viewPropertiesUrl());
+ ViewProperties props(rootUrl());
props.setSortFoldersFirst(foldersFirst);
- m_proxyModel->setSortFoldersFirst(foldersFirst);
+ m_viewAccessor.proxyModel()->setSortFoldersFirst(foldersFirst);
emit sortFoldersFirstChanged(foldersFirst);
}
void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)
{
- ViewProperties props(viewPropertiesUrl());
+ ViewProperties props(rootUrl());
props.setAdditionalInfo(info);
props.save();
- m_fileItemDelegate->setShowInformation(info);
+ m_viewAccessor.itemDelegate()->setShowInformation(info);
emit additionalInfoChanged();
}
showGroupInfo->setEnabled(enable);
showMimeInfo->setEnabled(enable);
- foreach (KFileItemDelegate::Information info, m_fileItemDelegate->showInformation()) {
+ foreach (KFileItemDelegate::Information info, m_viewAccessor.itemDelegate()->showInformation()) {
switch (info) {
case KFileItemDelegate::Size:
showSizeInfo->setChecked(true);
bool DolphinView::itemsExpandable() const
{
- return (m_detailsView != 0) && m_detailsView->itemsExpandable();
-}
-
-void DolphinView::deleteWhenNotDragSource(QAbstractItemView *view)
-{
- if (view == 0)
- return;
-
- if (DragAndDropHelper::instance().isDragSource(view)) {
- // We must store for later deletion.
- if (m_expandedDragSource != 0) {
- // The old stored view is obviously not the drag source anymore.
- m_expandedDragSource->deleteLater();
- m_expandedDragSource = 0;
- }
- view->hide();
- m_expandedDragSource = view;
- }
- else {
- view->deleteLater();
- }
+ return m_viewAccessor.itemsExpandable();
}
void DolphinView::observeCreatedItem(const KUrl& url)
{
m_createdItemUrl = url;
- connect(m_dolphinModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+ connect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)),
this, SLOT(selectAndScrollToCreatedItem()));
}
void DolphinView::selectAndScrollToCreatedItem()
{
- const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_createdItemUrl);
+ const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_createdItemUrl);
if (dirIndex.isValid()) {
- const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
- itemView()->setCurrentIndex(proxyIndex);
+ const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
+ m_viewAccessor.itemView()->setCurrentIndex(proxyIndex);
}
- disconnect(m_dolphinModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+ disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)),
this, SLOT(selectAndScrollToCreatedItem()));
m_createdItemUrl = KUrl();
}
void DolphinView::restoreSelection()
{
- disconnect(m_dirLister, SIGNAL(completed()), this, SLOT(restoreSelection()));
+ disconnect(m_viewAccessor.dirLister(), SIGNAL(completed()), this, SLOT(restoreSelection()));
changeSelection(m_selectedItems);
}
void DolphinView::emitContentsMoved()
{
- // 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()) {
+ // only emit the contents moved signal if no directory loading is ongoing
+ // (this would reset the contents position always to (0, 0))
+ if (!m_loadingDirectory) {
const QPoint pos(contentsPosition());
emit contentsMoved(pos.x(), pos.y());
}
{
if (!m_activeItemUrl.isEmpty()) {
// assure that the current item remains visible
- const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_activeItemUrl);
+ const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_activeItemUrl);
if (dirIndex.isValid()) {
- const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
- QAbstractItemView* view = itemView();
+ const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
+ QAbstractItemView* view = m_viewAccessor.itemView();
const bool clearSelection = !hasSelection();
view->setCurrentIndex(proxyIndex);
if (clearSelection) {
if (!m_newFileNames.isEmpty()) {
// select all newly added items created by a paste operation or
// a drag & drop operation
- QItemSelectionModel* selectionModel = itemView()->selectionModel();
- const int rowCount = m_proxyModel->rowCount();
+ const int rowCount = m_viewAccessor.proxyModel()->rowCount();
+ QItemSelection selection;
for (int row = 0; row < rowCount; ++row) {
- const QModelIndex proxyIndex = m_proxyModel->index(row, 0);
- const QModelIndex dirIndex = m_proxyModel->mapToSource(proxyIndex);
- const KUrl url = m_dolphinModel->itemForIndex(dirIndex).url();
+ const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->index(row, 0);
+ const QModelIndex dirIndex = m_viewAccessor.proxyModel()->mapToSource(proxyIndex);
+ const KUrl url = m_viewAccessor.dirModel()->itemForIndex(dirIndex).url();
if (m_newFileNames.contains(url.fileName())) {
- selectionModel->select(proxyIndex, QItemSelectionModel::Select);
+ selection.merge(QItemSelection(proxyIndex, proxyIndex), QItemSelectionModel::Select);
}
}
+ m_viewAccessor.itemView()->selectionModel()->select(selection, QItemSelectionModel::Select);
m_newFileNames.clear();
}
{
if (m_assureVisibleCurrentIndex) {
m_assureVisibleCurrentIndex = false;
- itemView()->scrollTo(itemView()->currentIndex());
+ m_viewAccessor.itemView()->scrollTo(m_viewAccessor.itemView()->currentIndex());
}
}
if (reload) {
m_selectedItems = selectedItems();
- connect(m_dirLister, SIGNAL(completed()), this, SLOT(restoreSelection()));
+ connect(m_viewAccessor.dirLister(), SIGNAL(completed()), this, SLOT(restoreSelection()));
}
- m_dirLister->stop();
- m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
-
- if (isColumnViewActive()) {
- // adjusting the directory lister is not enough in the case of the
- // column view, as each column has its own directory lister internally...
- if (reload) {
- m_columnView->reload();
- } else {
- m_columnView->showColumn(url);
- }
- }
+ m_viewAccessor.dirLister()->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
}
-KUrl DolphinView::viewPropertiesUrl() const
-{
- if (isColumnViewActive()) {
- return m_columnView->rootUrl();
- }
-
- return url();
-}
-
-void DolphinView::applyViewProperties(const KUrl& url)
+void DolphinView::applyViewProperties()
{
if (m_ignoreViewProperties) {
return;
}
- if (isColumnViewActive() && rootUrl().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 ViewProperties props(rootUrl());
const Mode mode = props.viewMode();
if (m_mode != mode) {
updateZoomLevel(oldZoomLevel);
}
- if (itemView() == 0) {
+ if (m_viewAccessor.itemView() == 0) {
createView();
}
- Q_ASSERT(itemView() != 0);
- Q_ASSERT(m_fileItemDelegate != 0);
+ Q_ASSERT(m_viewAccessor.itemView() != 0);
+ Q_ASSERT(m_viewAccessor.itemDelegate() != 0);
const bool showHiddenFiles = props.showHiddenFiles();
- if (showHiddenFiles != m_dirLister->showingDotFiles()) {
- m_dirLister->setShowingDotFiles(showHiddenFiles);
+ if (showHiddenFiles != m_viewAccessor.dirLister()->showingDotFiles()) {
+ m_viewAccessor.dirLister()->setShowingDotFiles(showHiddenFiles);
emit showHiddenFilesChanged();
}
m_storedCategorizedSorting = props.categorizedSorting();
const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
- if (categorized != m_proxyModel->isCategorizedModel()) {
- m_proxyModel->setCategorizedModel(categorized);
+ if (categorized != m_viewAccessor.proxyModel()->isCategorizedModel()) {
+ m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
emit categorizedSortingChanged();
}
const DolphinView::Sorting sorting = props.sorting();
- if (sorting != m_proxyModel->sorting()) {
- m_proxyModel->setSorting(sorting);
+ if (sorting != m_viewAccessor.proxyModel()->sorting()) {
+ m_viewAccessor.proxyModel()->setSorting(sorting);
emit sortingChanged(sorting);
}
const Qt::SortOrder sortOrder = props.sortOrder();
- if (sortOrder != m_proxyModel->sortOrder()) {
- m_proxyModel->setSortOrder(sortOrder);
+ if (sortOrder != m_viewAccessor.proxyModel()->sortOrder()) {
+ m_viewAccessor.proxyModel()->setSortOrder(sortOrder);
emit sortOrderChanged(sortOrder);
}
const bool sortFoldersFirst = props.sortFoldersFirst();
- if (sortFoldersFirst != m_proxyModel->sortFoldersFirst()) {
- m_proxyModel->setSortFoldersFirst(sortFoldersFirst);
+ if (sortFoldersFirst != m_viewAccessor.proxyModel()->sortFoldersFirst()) {
+ m_viewAccessor.proxyModel()->setSortFoldersFirst(sortFoldersFirst);
emit sortFoldersFirstChanged(sortFoldersFirst);
}
KFileItemDelegate::InformationList info = props.additionalInfo();
- if (info != m_fileItemDelegate->showInformation()) {
- m_fileItemDelegate->setShowInformation(info);
+ if (info != m_viewAccessor.itemDelegate()->showInformation()) {
+ m_viewAccessor.itemDelegate()->setShowInformation(info);
emit additionalInfoChanged();
}
const bool showPreview = props.showPreview();
if (showPreview != m_showPreview) {
m_showPreview = showPreview;
- m_previewGenerator->setPreviewShown(showPreview);
-
const int oldZoomLevel = m_controller->zoomLevel();
emit showPreviewChanged();
void DolphinView::createView()
{
deleteView();
- Q_ASSERT(m_iconsView == 0);
- Q_ASSERT(m_detailsView == 0);
- Q_ASSERT(m_columnView == 0);
-
- QAbstractItemView* view = 0;
- switch (m_mode) {
- case IconsView: {
- m_iconsView = new DolphinIconsView(this, m_controller);
- view = m_iconsView;
- break;
- }
-
- case DetailsView:
- m_detailsView = new DolphinDetailsView(this, m_controller);
- view = m_detailsView;
- break;
-
- case ColumnView:
- m_columnView = new DolphinColumnView(this, m_controller);
- view = m_columnView;
- break;
- }
+ Q_ASSERT(m_viewAccessor.itemView() == 0);
+ m_viewAccessor.createView(this, m_controller, m_mode);
+ QAbstractItemView* view = m_viewAccessor.itemView();
Q_ASSERT(view != 0);
view->installEventFilter(this);
view->viewport()->installEventFilter(this);
- setFocusProxy(view);
-
- if (m_mode != ColumnView) {
- // Give the view the ability to auto-expand its directories on hovering
- // (the column view takes care about this itself). If the details view
- // uses expandable folders, the auto-expanding should be used always.
- DolphinSettings& settings = DolphinSettings::instance();
- const bool enabled = settings.generalSettings()->autoExpandFolders() ||
- ((m_detailsView != 0) && settings.detailsModeSettings()->expandableFolders());
-
- FolderExpander* folderExpander = new FolderExpander(view, m_proxyModel);
- folderExpander->setEnabled(enabled);
- connect(folderExpander, SIGNAL(enterDir(const QModelIndex&)),
- m_controller, SLOT(triggerItem(const QModelIndex&)));
- }
- else {
- // Listen out for requests to delete the current column.
- connect(m_columnView, SIGNAL(requestColumnDeletion(QAbstractItemView*)),
- this, SLOT(deleteWhenNotDragSource(QAbstractItemView*)));
- }
m_controller->setItemView(view);
+ connect(m_controller, SIGNAL(selectionChanged()),
+ this, SLOT(emitDelayedSelectionChangedSignal()));
- m_fileItemDelegate = new DolphinFileItemDelegate(view);
- m_fileItemDelegate->setShowToolTipWhenElided(false);
- m_fileItemDelegate->setMinimizedNameColumn(m_mode == DetailsView);
- view->setItemDelegate(m_fileItemDelegate);
-
- view->setModel(m_proxyModel);
+ // When changing the view mode, the selection is lost due to reinstantiating
+ // a new item view with a custom selection model. Pass the ownership of the
+ // selection model to DolphinView, so that it can be shared by all item views.
if (m_selectionModel != 0) {
view->setSelectionModel(m_selectionModel);
} else {
m_selectionModel = view->selectionModel();
}
-
- // reparent the selection model, as it should not be deleted
- // when deleting the model
m_selectionModel->setParent(this);
- view->setSelectionMode(QAbstractItemView::ExtendedSelection);
-
- m_previewGenerator = new KFilePreviewGenerator(view);
- m_previewGenerator->setPreviewShown(m_showPreview);
-
- if (DolphinSettings::instance().generalSettings()->showToolTips()) {
- m_toolTipManager = new ToolTipManager(view, m_proxyModel);
- connect(m_controller, SIGNAL(hideToolTip()),
- m_toolTipManager, SLOT(hideTip()));
- }
-
- m_topLayout->insertWidget(1, view);
-
- connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
- this, SLOT(emitSelectionChangedSignal()));
connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
this, SLOT(emitContentsMoved()));
connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
this, SLOT(emitContentsMoved()));
+
+ setFocusProxy(m_viewAccessor.layoutTarget());
+ m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());
}
void DolphinView::deleteView()
{
- QAbstractItemView* view = itemView();
+ QAbstractItemView* view = m_viewAccessor.itemView();
if (view != 0) {
// It's important to set the keyboard focus to the parent
// before deleting the view: Otherwise when having a split
m_topLayout->removeWidget(view);
view->close();
- // m_previewGenerator's parent is not always destroyed, and we
- // don't want two active at once - manually delete.
- delete m_previewGenerator;
- m_previewGenerator = 0;
-
disconnect(view);
m_controller->disconnect(view);
view->disconnect();
- deleteWhenNotDragSource(view);
- view = 0;
-
- m_iconsView = 0;
- m_detailsView = 0;
- m_columnView = 0;
- m_fileItemDelegate = 0;
- m_toolTipManager = 0;
- }
-}
-
-QAbstractItemView* DolphinView::itemView() const
-{
- if (m_detailsView != 0) {
- return m_detailsView;
- } else if (m_columnView != 0) {
- return m_columnView;
+ m_viewAccessor.deleteView();
}
-
- return m_iconsView;
}
void DolphinView::pasteToUrl(const KUrl& url)
void DolphinView::updateZoomLevel(int oldZoomLevel)
{
- const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(itemView()->iconSize());
+ const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize());
if (oldZoomLevel != newZoomLevel) {
m_controller->setZoomLevel(newZoomLevel);
emit zoomLevelChanged(newZoomLevel);
QMimeData* DolphinView::selectionMimeData() const
{
- if (isColumnViewActive()) {
- return m_columnView->selectionMimeData();
- }
-
- const QAbstractItemView* view = itemView();
+ const QAbstractItemView* view = m_viewAccessor.itemView();
Q_ASSERT((view != 0) && (view->selectionModel() != 0));
- const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
- return m_dolphinModel->mimeData(selection.indexes());
+ const QItemSelection selection = m_viewAccessor.proxyModel()->mapSelectionToSource(view->selectionModel()->selection());
+ return m_viewAccessor.dirModel()->mimeData(selection.indexes());
}
void DolphinView::addNewFileNames(const QMimeData* mimeData)
}
}
+DolphinView::ViewAccessor::ViewAccessor(DolphinSortFilterProxyModel* proxyModel) :
+ m_iconsView(0),
+ m_detailsView(0),
+ m_columnsContainer(0),
+ m_proxyModel(proxyModel),
+ m_dragSource(0)
+{
+}
+
+DolphinView::ViewAccessor::~ViewAccessor()
+{
+ delete m_dragSource;
+ m_dragSource = 0;
+}
+
+void DolphinView::ViewAccessor::createView(QWidget* parent,
+ DolphinController* controller,
+ Mode mode)
+{
+ Q_ASSERT(itemView() == 0);
+
+ switch (mode) {
+ case IconsView:
+ m_iconsView = new DolphinIconsView(parent, controller, m_proxyModel);
+ break;
+
+ case DetailsView:
+ m_detailsView = new DolphinDetailsView(parent, controller, m_proxyModel);
+ break;
+
+ case ColumnView:
+ m_columnsContainer = new DolphinColumnViewContainer(parent, controller);
+ break;
+
+ default:
+ Q_ASSERT(false);
+ }
+}
+
+void DolphinView::ViewAccessor::deleteView()
+{
+ QAbstractItemView* view = itemView();
+ if (view != 0) {
+ if (DragAndDropHelper::instance().isDragSource(view)) {
+ // The view is a drag source (the feature "Open folders
+ // during drag operations" is used). Deleting the view
+ // during an ongoing drag operation is not allowed, so
+ // this will postponed.
+ if (m_dragSource != 0) {
+ // the old stored view is obviously not the drag source anymore
+ m_dragSource->deleteLater();
+ m_dragSource = 0;
+ }
+ view->hide();
+ m_dragSource = view;
+ } else {
+ view->deleteLater();
+ }
+ }
+
+ m_iconsView = 0;
+ m_detailsView = 0;
+
+ m_columnsContainer->deleteLater();
+ m_columnsContainer = 0;
+}
+
+
+void DolphinView::ViewAccessor::prepareUrlChange(const KUrl& url)
+{
+ if (m_columnsContainer != 0) {
+ m_columnsContainer->showColumn(url);
+ }
+}
+
+QAbstractItemView* DolphinView::ViewAccessor::itemView() const
+{
+ if (m_iconsView != 0) {
+ return m_iconsView;
+ }
+
+ if (m_detailsView != 0) {
+ return m_detailsView;
+ }
+
+ if (m_columnsContainer != 0) {
+ return m_columnsContainer->activeColumn();
+ }
+
+ return 0;
+}
+
+KFileItemDelegate* DolphinView::ViewAccessor::itemDelegate() const
+{
+ return static_cast<KFileItemDelegate*>(itemView()->itemDelegate());
+}
+
+QWidget* DolphinView::ViewAccessor::layoutTarget() const
+{
+ if (m_columnsContainer != 0) {
+ return m_columnsContainer;
+ }
+ return itemView();
+}
+
+KUrl DolphinView::ViewAccessor::rootUrl() const
+{
+ return (m_columnsContainer != 0) ? m_columnsContainer->rootUrl() : KUrl();
+}
+
+bool DolphinView::ViewAccessor::supportsCategorizedSorting() const
+{
+ return m_iconsView != 0;
+}
+
+bool DolphinView::ViewAccessor::itemsExpandable() const
+{
+ return (m_detailsView != 0) && m_detailsView->itemsExpandable();
+}
+
+bool DolphinView::ViewAccessor::reloadOnAdditionalInfoChange() const
+{
+ // the details view requires no reloading of the directory, as it maps
+ // the file item delegate info to its columns internally
+ return m_detailsView != 0;
+}
+
+DolphinModel* DolphinView::ViewAccessor::dirModel() const
+{
+ return static_cast<DolphinModel*>(proxyModel()->sourceModel());
+}
+
+DolphinSortFilterProxyModel* DolphinView::ViewAccessor::proxyModel() const
+{
+ if (m_columnsContainer != 0) {
+ return static_cast<DolphinSortFilterProxyModel*>(m_columnsContainer->activeColumn()->model());
+ }
+ return m_proxyModel;
+}
+
+KDirLister* DolphinView::ViewAccessor::dirLister() const
+{
+ return dirModel()->dirLister();
+}
+
#include "dolphinview.moc"
projects / dolphin.git / blobdiff