X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/61a4e8691d600a1d105142ce44570c4107600a04..bbf9faa05396d66b3dbe101a0c309459e3ffacb1:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 4c2c5f02d..c280b40d0 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -19,19 +19,20 @@ ***************************************************************************/ #include "dolphinview.h" +#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include #include #include -#include +#include +#include #include -#include #include #include #include @@ -42,159 +43,137 @@ #include #include +#include "dolphinmodel.h" #include "dolphincolumnview.h" #include "dolphincontroller.h" -#include "dolphinstatusbar.h" -#include "dolphinmainwindow.h" -#include "dolphindirlister.h" #include "dolphinsortfilterproxymodel.h" #include "dolphindetailsview.h" #include "dolphiniconsview.h" -#include "dolphincontextmenu.h" -#include "dolphinitemcategorizer.h" -#include "filterbar.h" #include "renamedialog.h" -#include "kurlnavigator.h" #include "viewproperties.h" #include "dolphinsettings.h" #include "dolphin_generalsettings.h" -DolphinView::DolphinView(DolphinMainWindow* mainWindow, - QWidget* parent, +DolphinView::DolphinView(QWidget* parent, const KUrl& url, - Mode mode, - bool showHiddenFiles) : + KDirLister* dirLister, + DolphinModel* dolphinModel, + DolphinSortFilterProxyModel* proxyModel) : QWidget(parent), - m_showProgress(false), - m_blockContentsMovedSignal(false), - m_mode(mode), - m_iconSize(0), - m_folderCount(0), - m_fileCount(0), - m_mainWindow(mainWindow), + m_active(true), + m_showPreview(false), + m_loadingDirectory(false), + m_storedCategorizedSorting(false), + m_mode(DolphinView::IconsView), m_topLayout(0), - m_urlNavigator(0), m_controller(0), m_iconsView(0), m_detailsView(0), m_columnView(0), m_fileItemDelegate(0), - m_filterBar(0), - m_statusBar(0), - m_dirModel(0), - m_dirLister(0), - m_proxyModel(0) + m_dolphinModel(dolphinModel), + m_dirLister(dirLister), + m_proxyModel(proxyModel) { - hide(); setFocusPolicy(Qt::StrongFocus); m_topLayout = new QVBoxLayout(this); m_topLayout->setSpacing(0); m_topLayout->setMargin(0); - connect(m_mainWindow, SIGNAL(activeViewChanged()), - this, SLOT(updateActivationState())); - QClipboard* clipboard = QApplication::clipboard(); connect(clipboard, SIGNAL(dataChanged()), this, SLOT(updateCutItems())); - m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this); - m_urlNavigator->setUrlEditable(DolphinSettings::instance().generalSettings()->editableUrl()); - m_urlNavigator->setHomeUrl(DolphinSettings::instance().generalSettings()->homeUrl()); - connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(changeDirectory(const KUrl&))); - connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)), - this, SLOT(dropUrls(const KUrl::List&, const KUrl&))); - connect(m_urlNavigator, SIGNAL(activated()), - this, SLOT(requestActivation())); - connect(this, SIGNAL(contentsMoved(int, int)), - m_urlNavigator, SLOT(savePosition(int, int))); - - m_statusBar = new DolphinStatusBar(this); - - m_dirLister = new DolphinDirLister(); - m_dirLister->setAutoUpdate(true); - m_dirLister->setMainWindow(this); - m_dirLister->setShowingDotFiles(showHiddenFiles); - m_dirLister->setDelayedMimeTypes(true); - - connect(m_dirLister, SIGNAL(clear()), - this, SLOT(updateStatusBar())); - connect(m_dirLister, SIGNAL(percent(int)), - this, SLOT(updateProgress(int))); - connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)), - this, SLOT(updateStatusBar())); - connect(m_dirLister, SIGNAL(completed()), - this, SLOT(updateItemCount())); connect(m_dirLister, SIGNAL(completed()), this, SLOT(updateCutItems())); connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)), this, SLOT(generatePreviews(const KFileItemList&))); - connect(m_dirLister, SIGNAL(infoMessage(const QString&)), - this, SLOT(showInfoMessage(const QString&))); - connect(m_dirLister, SIGNAL(errorMessage(const QString&)), - this, SLOT(showErrorMessage(const QString&))); - m_dirModel = new KDirModel(); - m_dirModel->setDirLister(m_dirLister); - m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory); + m_controller = new DolphinController(this); + m_controller->setUrl(url); - m_proxyModel = new DolphinSortFilterProxyModel(this); - m_proxyModel->setSourceModel(m_dirModel); + // Receiver of the DolphinView signal 'urlChanged()' don't need + // to care whether the internal controller changed the URL already or whether + // the controller just requested an URL change and will be updated later. + // In both cases the URL has been changed: + connect(m_controller, SIGNAL(urlChanged(const KUrl&)), + this, SIGNAL(urlChanged(const KUrl&))); + connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)), + this, SIGNAL(urlChanged(const KUrl&))); - m_controller = new DolphinController(this); 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 KFileItem&, QWidget*)), + this, SLOT(dropUrls(const KUrl::List&, const KUrl&, const KFileItem&, QWidget*))); connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)), this, SLOT(updateSorting(DolphinView::Sorting))); connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)), this, SLOT(updateSortOrder(Qt::SortOrder))); - connect(m_controller, SIGNAL(itemTriggered(const QModelIndex&)), - this, SLOT(triggerItem(const QModelIndex&))); - connect(m_controller, SIGNAL(selectionChanged()), - this, SLOT(emitSelectionChangedSignal())); + connect(m_controller, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)), + this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&))); + connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)), + this, SLOT(triggerItem(const KFileItem&))); connect(m_controller, SIGNAL(activated()), - this, SLOT(requestActivation())); + this, SLOT(activate())); + connect(m_controller, SIGNAL(itemEntered(const KFileItem&)), + this, SLOT(showHoverInformation(const KFileItem&))); + connect(m_controller, SIGNAL(viewportEntered()), + this, SLOT(clearHoverInformation())); - createView(); - - m_iconSize = K3Icon::SizeMedium; - - m_filterBar = new FilterBar(this); - m_filterBar->hide(); - connect(m_filterBar, SIGNAL(filterChanged(const QString&)), - this, SLOT(changeNameFilter(const QString&))); - connect(m_filterBar, SIGNAL(closeRequest()), - this, SLOT(closeFilterBar())); - - m_topLayout->addWidget(m_urlNavigator); + applyViewProperties(url); m_topLayout->addWidget(itemView()); - m_topLayout->addWidget(m_filterBar); - m_topLayout->addWidget(m_statusBar); } DolphinView::~DolphinView() { - delete m_dirLister; - m_dirLister = 0; } -void DolphinView::setUrl(const KUrl& url) +const KUrl& DolphinView::url() const { - m_urlNavigator->setUrl(url); - m_controller->setUrl(url); + return m_controller->url(); } -const KUrl& DolphinView::url() const +KUrl DolphinView::rootUrl() const { - return m_urlNavigator->url(); + return isColumnViewActive() ? m_columnView->rootUrl() : url(); +} + +void DolphinView::setActive(bool active) +{ + if (active == m_active) { + return; + } + + m_active = active; + + QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color(); + if (active) { + // TODO: emitting urlChanged() is a hack, as the URL hasn't really changed. It + // bypasses the problem when having a split view and changing the active view to + // update the some URL dependent states. A nicer approach should be no big deal... + emit urlChanged(url()); + emit selectionChanged(selectedItems()); + } else { + color.setAlpha(150); + } + + QWidget* viewport = itemView()->viewport(); + QPalette palette; + palette.setColor(viewport->backgroundRole(), color); + viewport->setPalette(palette); + + update(); + + if (active) { + emit activated(); + } + + m_controller->indicateActivationChange(active); } bool DolphinView::isActive() const { - return m_mainWindow->activeView() == this; + return m_active; } void DolphinView::setMode(Mode mode) @@ -210,14 +189,34 @@ 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. - setUrl(m_dirLister->url()); + const KUrl root = rootUrl(); + setUrl(root); + m_controller->setUrl(root); } - ViewProperties props(m_urlNavigator->url()); + const KUrl viewPropsUrl = viewPropertiesUrl(); + ViewProperties props(viewPropsUrl); props.setViewMode(m_mode); createView(); - startDirLister(m_urlNavigator->url()); + + // the file item delegate has been recreated, apply the current + // additional information manually + const KFileItemDelegate::InformationList infoList = props.additionalInfo(); + m_fileItemDelegate->setShowInformation(infoList); + emit additionalInfoChanged(infoList); + + // 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. + m_storedCategorizedSorting = props.categorizedSorting(); + const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting(); + if (categorized != m_proxyModel->isCategorizedModel()) { + m_proxyModel->setCategorizedModel(categorized); + emit categorizedSortingChanged(); + } + + loadDirectory(viewPropsUrl); emit modeChanged(); } @@ -229,18 +228,24 @@ DolphinView::Mode DolphinView::mode() const void DolphinView::setShowPreview(bool show) { - ViewProperties props(m_urlNavigator->url()); + if (m_showPreview == show) { + return; + } + + const KUrl viewPropsUrl = viewPropertiesUrl(); + ViewProperties props(viewPropsUrl); props.setShowPreview(show); - m_controller->setShowPreview(show); + m_showPreview = show; + emit showPreviewChanged(); - startDirLister(m_urlNavigator->url(), true); + loadDirectory(viewPropsUrl, true); } bool DolphinView::showPreview() const { - return m_controller->showPreview(); + return m_showPreview; } void DolphinView::setShowHiddenFiles(bool show) @@ -249,13 +254,14 @@ void DolphinView::setShowHiddenFiles(bool show) return; } - ViewProperties props(m_urlNavigator->url()); + const KUrl viewPropsUrl = viewPropertiesUrl(); + ViewProperties props(viewPropsUrl); props.setShowHiddenFiles(show); m_dirLister->setShowingDotFiles(show); emit showHiddenFilesChanged(); - startDirLister(m_urlNavigator->url(), true); + loadDirectory(viewPropsUrl, true); } bool DolphinView::showHiddenFiles() const @@ -265,35 +271,34 @@ 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(m_urlNavigator->url()); + ViewProperties props(viewPropertiesUrl()); props.setCategorizedSorting(categorized); props.save(); + m_storedCategorizedSorting = categorized; + m_proxyModel->setCategorizedModel(categorized); + emit categorizedSortingChanged(); } bool DolphinView::categorizedSorting() const { - if (!supportsCategorizedSorting()) { - return false; - } - - Q_ASSERT(m_iconsView != 0); - return m_iconsView->itemCategorizer() != 0; + // If all view modes would support categorized sorting, returning + // m_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 + // checkbox by checking DolphinView::supportsCategorizedSorting() to indicate + // that this setting is not applied to the current view mode. + return m_storedCategorizedSorting; } bool DolphinView::supportsCategorizedSorting() const @@ -301,114 +306,99 @@ bool DolphinView::supportsCategorizedSorting() const return m_iconsView != 0; } -void DolphinView::renameSelectedItems() +void DolphinView::selectAll() { - DolphinView* view = 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); } } -void DolphinView::selectAll() +bool DolphinView::hasSelection() const { - selectAll(QItemSelectionModel::Select); + return itemView()->selectionModel()->hasSelection(); } -void DolphinView::invertSelection() +void DolphinView::clearSelection() { - selectAll(QItemSelectionModel::Toggle); + itemView()->selectionModel()->clear(); } -DolphinStatusBar* DolphinView::statusBar() const +KFileItemList DolphinView::selectedItems() const { - return m_statusBar; -} + const QAbstractItemView* view = itemView(); -int DolphinView::contentsX() const -{ - return itemView()->horizontalScrollBar()->value(); + // 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()); + KFileItemList itemList; + + const QModelIndexList indexList = selection.indexes(); + foreach (QModelIndex index, indexList) { + KFileItem item = m_dolphinModel->itemForIndex(index); + if (!item.isNull()) { + itemList.append(item); + } + } + + return itemList; } -int DolphinView::contentsY() const +KUrl::List DolphinView::selectedUrls() const { - return itemView()->verticalScrollBar()->value(); + KUrl::List urls; + const KFileItemList list = selectedItems(); + foreach (KFileItem item, list) { + urls.append(item.url()); + } + return urls; } -void DolphinView::emitRequestItemInfo(const KUrl& url) +KFileItem DolphinView::fileItem(const QModelIndex& index) const { - emit requestItemInfo(url); + const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index); + return m_dolphinModel->itemForIndex(dolphinModelIndex); } -bool DolphinView::isFilterBarVisible() const +void DolphinView::setContentsPosition(int x, int y) { - return m_filterBar->isVisible(); + 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; } -bool DolphinView::isUrlEditable() const +QPoint DolphinView::contentsPosition() const { - return m_urlNavigator->isUrlEditable(); + const int x = itemView()->horizontalScrollBar()->value(); + const int y = itemView()->verticalScrollBar()->value(); + return QPoint(x, y); } void DolphinView::zoomIn() @@ -455,262 +445,107 @@ Qt::SortOrder DolphinView::sortOrder() const return m_proxyModel->sortOrder(); } -void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info) +void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info) { - ViewProperties props(m_urlNavigator->url()); + const KUrl viewPropsUrl = viewPropertiesUrl(); + ViewProperties props(viewPropsUrl); props.setAdditionalInfo(info); - - m_fileItemDelegate->setAdditionalInformation(info); + m_fileItemDelegate->setShowInformation(info); emit additionalInfoChanged(info); - startDirLister(m_urlNavigator->url(), true); -} - -KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const -{ - return m_fileItemDelegate->additionalInformation(); -} -void DolphinView::goBack() -{ - m_urlNavigator->goBack(); -} - -void DolphinView::goForward() -{ - m_urlNavigator->goForward(); + 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 + loadDirectory(viewPropsUrl, true); + } } -void DolphinView::goUp() +KFileItemDelegate::InformationList DolphinView::additionalInfo() const { - m_urlNavigator->goUp(); + return m_fileItemDelegate->showInformation(); } -void DolphinView::goHome() +void DolphinView::reload() { - m_urlNavigator->goHome(); + setUrl(url()); + loadDirectory(url(), true); } -void DolphinView::setUrlEditable(bool editable) +void DolphinView::refresh() { - m_urlNavigator->setUrlEditable(editable); -} + const bool oldActivationState = m_active; + m_active = true; -bool DolphinView::hasSelection() const -{ - return itemView()->selectionModel()->hasSelection(); -} + createView(); + applyViewProperties(m_controller->url()); + reload(); -void DolphinView::clearSelection() -{ - itemView()->selectionModel()->clear(); + setActive(oldActivationState); } -KFileItemList DolphinView::selectedItems() const +void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl) { - 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; + if (m_controller->url() == url) { + return; + } - 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()); + m_controller->setUrl(url); // emits urlChanged, which we forward - KFileItem* item = m_dirModel->itemForIndex(*it); - if (item != 0) { - itemList.append(item); + 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); } - return itemList; + emit startedPathLoading(url); } -KUrl::List DolphinView::selectedUrls() const +void DolphinView::setNameFilter(const QString& nameFilter) { - KUrl::List urls; + m_proxyModel->setFilterRegExp(nameFilter); - 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; + 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); } - - return urls; -} - -KFileItem* DolphinView::fileItem(const QModelIndex index) const -{ - const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index); - return m_dirModel->itemForIndex(dirModelIndex); } -void DolphinView::rename(const KUrl& source, const QString& newName) +void DolphinView::calculateItemCount(int& fileCount, int& folderCount) { - bool ok = false; - - if (newName.isEmpty() || (source.fileName() == newName)) { - return; - } - - KUrl dest(source.upUrl()); - dest.addPath(newName); - - const bool destExists = KIO::NetAccess::exists(dest, - false, - mainWindow()->activeView()); - 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; + foreach (KFileItem item, m_dirLister->items()) { + if (item.isDir()) { + ++folderCount; + } else { + ++fileCount; } - } else { - // no destination exists, hence just move the file to - // do the renaming - ok = KIO::NetAccess::file_move(source, dest); - } - - const QString destFileName = dest.fileName(); - if (ok) { - m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.", source.fileName(), destFileName), - DolphinStatusBar::OperationCompleted); - - KonqOperations::rename(this, source, destFileName); - } else { - m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.", source.fileName(), destFileName), - DolphinStatusBar::Error); } } -void DolphinView::reload() +void DolphinView::setUrl(const KUrl& url) { - const KUrl& url = m_urlNavigator->url(); - changeDirectory(url); - startDirLister(url, true); + updateView(url, KUrl()); } void DolphinView::mouseReleaseEvent(QMouseEvent* event) { QWidget::mouseReleaseEvent(event); - mainWindow()->setActiveView(this); + setActive(true); } - -DolphinMainWindow* DolphinView::mainWindow() const +void DolphinView::activate() { - return m_mainWindow; + setActive(true); } -void DolphinView::changeDirectory(const KUrl& url) +void DolphinView::triggerItem(const KFileItem& item) { - if (!isActive()) { - requestActivation(); - } - - 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) { - m_mode = mode; - createView(); - emit modeChanged(); - } - - const bool showHiddenFiles = props.showHiddenFiles(); - if (showHiddenFiles != m_dirLister->showingDotFiles()) { - m_dirLister->setShowingDotFiles(showHiddenFiles); - emit showHiddenFilesChanged(); - } - - const bool categorized = props.categorizedSorting(); - 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; - } - } - emit categorizedSortingChanged(); - } - - const DolphinView::Sorting sorting = props.sorting(); - if (sorting != m_proxyModel->sorting()) { - m_proxyModel->setSorting(sorting); - emit sortingChanged(sorting); - } - - const Qt::SortOrder sortOrder = props.sortOrder(); - if (sortOrder != m_proxyModel->sortOrder()) { - m_proxyModel->setSortOrder(sortOrder); - emit sortOrderChanged(sortOrder); - } - - KFileItemDelegate::AdditionalInformation info = props.additionalInfo(); - if (info != m_fileItemDelegate->additionalInformation()) { - m_fileItemDelegate->setAdditionalInformation(info); - - emit additionalInfoChanged(info); - } - - const bool showPreview = props.showPreview(); - if (showPreview != m_controller->showPreview()) { - m_controller->setShowPreview(showPreview); - emit showPreviewChanged(); - } - - startDirLister(url); - emit urlChanged(url); - - m_statusBar->clear(); -} - -void DolphinView::triggerItem(const QModelIndex& index) -{ - if (!isValidNameIndex(index)) { - return; - } - const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) { // items are selected by the user, hence don't trigger the @@ -718,95 +553,17 @@ void DolphinView::triggerItem(const QModelIndex& index) return; } - KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index)); - if (item == 0) { + 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; - } - - 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(); - } -} - -void DolphinView::updateProgress(int percent) -{ - if (m_showProgress) { - m_statusBar->setProgress(percent); - } -} - -void DolphinView::updateItemCount() -{ - if (m_showProgress) { - m_statusBar->setProgressText(QString()); - m_statusBar->setProgress(100); - m_showProgress = false; - } - - KFileItemList items(m_dirLister->items()); - KFileItemList::const_iterator it = items.begin(); - const KFileItemList::const_iterator end = items.end(); - - m_fileCount = 0; - m_folderCount = 0; - - while (it != end) { - KFileItem* item = *it; - if (item->isDir()) { - ++m_folderCount; - } else { - ++m_fileCount; - } - ++it; - } - - updateStatusBar(); - - m_blockContentsMovedSignal = false; - QTimer::singleShot(0, this, SLOT(restoreContentsPos())); + emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart } void DolphinView::generatePreviews(const KFileItemList& 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); + if (m_controller->dolphinView()->showPreview()) { + KIO::PreviewJob* job = KIO::filePreview(items, 128); connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), this, SLOT(showPreview(const KFileItem&, const QPixmap&))); } @@ -821,201 +578,121 @@ 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); + const QPixmap cutPixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState); + 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() -{ - KUrl currentUrl = m_urlNavigator->url(); - if (!currentUrl.isEmpty()) { - QAbstractItemView* view = itemView(); - // TODO: view->setCurrentItem(m_urlNavigator->currentFileName()); - QPoint pos = m_urlNavigator->savedPosition(); - view->horizontalScrollBar()->setValue(pos.x()); - view->verticalScrollBar()->setValue(pos.y()); - } -} - -void DolphinView::showInfoMessage(const QString& msg) -{ - m_statusBar->setMessage(msg, DolphinStatusBar::Information); -} - -void DolphinView::showErrorMessage(const QString& msg) -{ - m_statusBar->setMessage(msg, DolphinStatusBar::Error); -} - void DolphinView::emitSelectionChangedSignal() { emit selectionChanged(DolphinView::selectedItems()); } -void DolphinView::closeFilterBar() -{ - m_filterBar->hide(); - emit showFilterBarChanged(false); -} - -void DolphinView::startDirLister(const KUrl& url, bool reload) +void DolphinView::loadDirectory(const KUrl& url, bool reload) { if (!url.isValid()) { const QString location(url.pathOrUrl()); if (location.isEmpty()) { - m_statusBar->setMessage(i18n("The location is empty."), DolphinStatusBar::Error); + emit errorMessage(i18nc("@info:status", "The location is empty.")); } else { - m_statusBar->setMessage(i18n("The location '%1' is invalid.", location), - DolphinStatusBar::Error); + 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. - 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(); + m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags); - bool openDir = true; - bool keepOldDirs = isColumnViewActive(); - if (keepOldDirs) { + 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) { - 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; - } - } else if (m_dirLister->directories().contains(url)) { - // The dir lister contains the directory already, so - // KDirLister::openUrl() may not been invoked twice. - m_dirLister->updateDirectory(url); - openDir = false; + m_columnView->reload(); } 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 - // and hence the view must be reset. - keepOldDirs = false; - } + m_columnView->showColumn(url); } } - - if (openDir) { - m_dirLister->openUrl(url, keepOldDirs, reload); - } } -QString DolphinView::defaultStatusBarText() const +KUrl DolphinView::viewPropertiesUrl() const { - return KIO::itemsSummaryString(m_fileCount + m_folderCount, - m_fileCount, - m_folderCount, - 0, false); + if (isColumnViewActive()) { + return m_dirLister->url(); + } + + return url(); } -QString DolphinView::selectionStatusBarText() const +void DolphinView::applyViewProperties(const KUrl& url) { - QString text; - const KFileItemList list = selectedItems(); - if (list.isEmpty()) { - // when an item is triggered, it is temporary selected but selectedItems() - // will return an empty list - return QString(); + 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; } - int fileCount = 0; - int folderCount = 0; - KIO::filesize_t byteSize = 0; - KFileItemList::const_iterator it = list.begin(); - const KFileItemList::const_iterator end = list.end(); - while (it != end) { - KFileItem* item = *it; - if (item->isDir()) { - ++folderCount; - } else { - ++fileCount; - byteSize += item->size(); - } - ++it; - } + const ViewProperties props(url); - if (folderCount > 0) { - text = i18np("1 Folder selected", "%1 Folders selected", folderCount); - if (fileCount > 0) { - text += ", "; - } + const Mode mode = props.viewMode(); + if (m_mode != mode) { + m_mode = mode; + createView(); + emit modeChanged(); } - - if (fileCount > 0) { - const QString sizeText(KIO::convertSize(byteSize)); - text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText); + if (itemView() == 0) { + createView(); } + Q_ASSERT(itemView() != 0); + Q_ASSERT(m_fileItemDelegate != 0); - return text; -} + const bool showHiddenFiles = props.showHiddenFiles(); + if (showHiddenFiles != m_dirLister->showingDotFiles()) { + m_dirLister->setShowingDotFiles(showHiddenFiles); + emit showHiddenFilesChanged(); + } -void DolphinView::showFilterBar(bool show) -{ - Q_ASSERT(m_filterBar != 0); - if (show) { - m_filterBar->show(); - } else { - m_filterBar->hide(); + m_storedCategorizedSorting = props.categorizedSorting(); + const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting(); + if (categorized != m_proxyModel->isCategorizedModel()) { + m_proxyModel->setCategorizedModel(categorized); + emit categorizedSortingChanged(); } -} -void DolphinView::updateStatusBar() -{ - // As the item count information is less important - // in comparison with other messages, it should only - // be shown if: - // - the status bar is empty or - // - shows already the item count information or - // - shows only a not very important information - // - if any progress is given don't show the item count info at all - const QString msg(m_statusBar->message()); - const bool updateStatusBarMsg = (msg.isEmpty() || - (msg == m_statusBar->defaultText()) || - (m_statusBar->type() == DolphinStatusBar::Information)) && - (m_statusBar->progress() == 100); + const DolphinView::Sorting sorting = props.sorting(); + if (sorting != m_proxyModel->sorting()) { + m_proxyModel->setSorting(sorting); + emit sortingChanged(sorting); + } - const QString text(hasSelection() ? selectionStatusBarText() : defaultStatusBarText()); - m_statusBar->setDefaultText(text); + const Qt::SortOrder sortOrder = props.sortOrder(); + if (sortOrder != m_proxyModel->sortOrder()) { + m_proxyModel->setSortOrder(sortOrder); + emit sortOrderChanged(sortOrder); + } - if (updateStatusBarMsg) { - m_statusBar->setMessage(text, DolphinStatusBar::Default); + KFileItemDelegate::InformationList info = props.additionalInfo(); + if (info != m_fileItemDelegate->showInformation()) { + m_fileItemDelegate->setShowInformation(info); + emit additionalInfoChanged(info); } -} -void DolphinView::requestActivation() -{ - m_mainWindow->setActiveView(this); + const bool showPreview = props.showPreview(); + if (showPreview != m_showPreview) { + m_showPreview = showPreview; + emit showPreviewChanged(); + } } void DolphinView::changeSelection(const KFileItemList& selection) @@ -1024,13 +701,13 @@ void DolphinView::changeSelection(const KFileItemList& selection) if (selection.isEmpty()) { return; } - KUrl baseUrl = url(); + 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); } } @@ -1039,78 +716,49 @@ void DolphinView::changeSelection(const KFileItemList& selection) | QItemSelectionModel::Current); } -void DolphinView::changeNameFilter(const QString& nameFilter) -{ - // The name filter of KDirLister does a 'hard' filtering, which - // means that only the items are shown where the names match - // exactly the filter. This is non-transparent for the user, which - // just wants to have a 'soft' filtering: does the name contain - // the filter string? - QString adjustedFilter(nameFilter); - adjustedFilter.insert(0, '*'); - adjustedFilter.append('*'); - - // Use the ProxyModel to filter: - // This code is #ifdefed as setNameFilter behaves - // slightly different than the QSortFilterProxyModel - // as it will not remove directories. I will ask - // our beloved usability experts for input - // -- z. -#if 0 - m_dirLister->setNameFilter(adjustedFilter); - m_dirLister->emitChanges(); -#else - m_proxyModel->setFilterRegExp(nameFilter); -#endif -} - void DolphinView::openContextMenu(const QPoint& pos) { - KFileItem* item = 0; + KFileItem item; const QModelIndex index = itemView()->indexAt(pos); - if (isValidNameIndex(index)) { + if (index.isValid() && (index.column() == DolphinModel::Name)) { item = fileItem(index); } - DolphinContextMenu contextMenu(m_mainWindow, item, url()); - contextMenu.open(); + emit requestContextMenu(item, url()); } void DolphinView::dropUrls(const KUrl::List& urls, - const QModelIndex& index, + const KUrl& destPath, + const KFileItem& destItem, QWidget* source) { - KFileItem* directory = 0; - if (isValidNameIndex(index)) { - KFileItem* item = fileItem(index); - Q_ASSERT(item != 0); - if (item->isDir()) { - // the URLs are dropped above a directory - directory = item; + bool dropAboveDir = false; + if (!destItem.isNull()) { + dropAboveDir = destItem.isDir(); + if (!dropAboveDir) { + // the dropping is done above a file + return; } - } - - if ((directory == 0) && (source == itemView())) { - // The dropping is done into the same viewport where - // the dragging has been started. Just ignore this... + } else if (source == itemView()) { + // the dropping is done into the same viewport where the dragging + // has been started return; } - const KUrl& destination = (directory == 0) ? url() : - directory->url(); + const KUrl& destination = dropAboveDir ? destItem.url() : destPath; dropUrls(urls, destination); } void DolphinView::dropUrls(const KUrl::List& urls, const KUrl& destination) { - m_mainWindow->dropUrls(urls, destination); + emit urlsDropped(urls, destination); } void DolphinView::updateSorting(DolphinView::Sorting sorting) { - ViewProperties props(url()); + ViewProperties props(viewPropertiesUrl()); props.setSorting(sorting); m_proxyModel->setSorting(sorting); @@ -1120,7 +768,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); @@ -1128,19 +776,27 @@ void DolphinView::updateSortOrder(Qt::SortOrder order) emit sortOrderChanged(order); } -void DolphinView::emitContentsMoved() +void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info) { - if (!m_blockContentsMovedSignal) { - emit contentsMoved(contentsX(), contentsY()); - } + ViewProperties props(viewPropertiesUrl()); + props.setAdditionalInfo(info); + + m_fileItemDelegate->setShowInformation(info); + + emit additionalInfoChanged(info); + } -void DolphinView::updateActivationState() +void DolphinView::emitContentsMoved() { - m_urlNavigator->setActive(isActive()); - if (isActive()) { - emit urlChanged(url()); - emit selectionChanged(selectedItems()); + // 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()); } } @@ -1151,9 +807,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; } @@ -1163,6 +819,21 @@ void DolphinView::updateCutItems() applyCutItemEffect(); } +void DolphinView::showHoverInformation(const KFileItem& item) +{ + if (hasSelection()) { + return; + } + + emit requestItemInfo(item); +} + +void DolphinView::clearHoverInformation() +{ + emit requestItemInfo(KFileItem()); +} + + void DolphinView::createView() { // delete current view @@ -1170,11 +841,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; @@ -1189,10 +855,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); @@ -1213,30 +880,17 @@ 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&)), - m_controller, SLOT(indicateSelectionChange())); + this, SLOT(emitSelectionChangedSignal())); connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)), 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); -} - QAbstractItemView* DolphinView::itemView() const { if (m_detailsView != 0) { @@ -1248,11 +902,6 @@ QAbstractItemView* DolphinView::itemView() const return m_iconsView; } -bool DolphinView::isValidNameIndex(const QModelIndex& index) const -{ - return index.isValid() && (index.column() == KDirModel::Name); -} - bool DolphinView::isCutItem(const KFileItem& item) const { const QMimeData* mimeData = QApplication::clipboard()->mimeData(); @@ -1282,30 +931,72 @@ void DolphinView::applyCutItemEffect() KFileItemList::const_iterator it = items.begin(); const KFileItemList::const_iterator end = items.end(); 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 KFileItem item = *it; + if (isCutItem(item)) { + const QModelIndex index = m_dolphinModel->indexForItem(item); + 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); // remember current pixmap for the item to be able // to restore it when other items get cut CutItem cutItem; - cutItem.url = item->url(); + cutItem.url = item.url(); cutItem.pixmap = pixmap; m_cutItemsCache.append(cutItem); // 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); + pixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState); + m_dolphinModel->setData(index, QIcon(pixmap), Qt::DecorationRole); } } ++it; } } +KToggleAction* DolphinView::iconsModeAction(KActionCollection* actionCollection) +{ + KToggleAction* iconsView = actionCollection->add("icons"); + iconsView->setText(i18nc("@action:inmenu View Mode", "Icons")); + iconsView->setShortcut(Qt::CTRL | Qt::Key_1); + iconsView->setIcon(KIcon("fileview-icon")); + iconsView->setData(QVariant::fromValue(IconsView)); + return iconsView; +} + +KToggleAction* DolphinView::detailsModeAction(KActionCollection* actionCollection) +{ + KToggleAction* detailsView = actionCollection->add("details"); + detailsView->setText(i18nc("@action:inmenu View Mode", "Details")); + detailsView->setShortcut(Qt::CTRL | Qt::Key_2); + detailsView->setIcon(KIcon("fileview-detailed")); + detailsView->setData(QVariant::fromValue(DetailsView)); + return detailsView; +} + +KToggleAction* DolphinView::columnsModeAction(KActionCollection* actionCollection) +{ + KToggleAction* columnView = actionCollection->add("columns"); + columnView->setText(i18nc("@action:inmenu View Mode", "Columns")); + columnView->setShortcut(Qt::CTRL | Qt::Key_3); + columnView->setIcon(KIcon("fileview-column")); + columnView->setData(QVariant::fromValue(ColumnView)); + return columnView; +} + +QString DolphinView::currentViewModeActionName() const +{ + switch (m_mode) { + case DolphinView::IconsView: + return "icons"; + case DolphinView::DetailsView: + return "details"; + case DolphinView::ColumnView: + return "columns"; + } + return QString(); // can't happen +} + #include "dolphinview.moc"