X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/dc3e19744dedef4b185eb0becb00a28c74381c4c..2f0b7cc810b3b04de5194171cbb126e4e544da90:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index eddd220d3..9320cd4cf 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -20,23 +20,30 @@ #include "dolphinview.h" -#include - -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include #include +#include #include #include +#include #include +#include #include #include +#include "dolphincolumnview.h" +#include "dolphincontroller.h" #include "dolphinstatusbar.h" #include "dolphinmainwindow.h" #include "dolphindirlister.h" @@ -44,10 +51,13 @@ #include "dolphindetailsview.h" #include "dolphiniconsview.h" #include "dolphincontextmenu.h" +#include "dolphinitemcategorizer.h" #include "filterbar.h" #include "renamedialog.h" -#include "urlnavigator.h" +#include "kurlnavigator.h" #include "viewproperties.h" +#include "dolphinsettings.h" +#include "dolphin_generalsettings.h" DolphinView::DolphinView(DolphinMainWindow* mainWindow, QWidget* parent, @@ -56,6 +66,8 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, bool showHiddenFiles) : QWidget(parent), m_showProgress(false), + m_blockContentsMovedSignal(false), + m_initializeColumnView(false), m_mode(mode), m_iconSize(0), m_folderCount(0), @@ -63,8 +75,11 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, m_mainWindow(mainWindow), 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), @@ -77,9 +92,27 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, m_topLayout->setSpacing(0); m_topLayout->setMargin(0); - m_urlNavigator = new UrlNavigator(url, this); + 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); + + const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + m_urlNavigator->setUrlEditable(settings->editableUrl()); + m_urlNavigator->setHomeUrl(settings->homeUrl()); + connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(loadDirectory(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); @@ -97,6 +130,10 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, 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&)), @@ -109,14 +146,34 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, m_proxyModel = new DolphinSortFilterProxyModel(this); m_proxyModel->setSourceModel(m_dirModel); + 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(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(activated()), + this, SLOT(requestActivation())); + connect(m_controller, SIGNAL(itemEntered(const QModelIndex&)), + this, SLOT(showHoverInformation(const QModelIndex&))); + connect(m_controller, SIGNAL(viewportEntered()), + this, SLOT(clearHoverInformation())); + createView(); m_iconSize = K3Icon::SizeMedium; m_filterBar = new FilterBar(this); - m_filterBar->hide(); + m_filterBar->setVisible(settings->filterBar()); connect(m_filterBar, SIGNAL(filterChanged(const QString&)), - this, SLOT(changeNameFilter(const QString&))); + this, SLOT(changeNameFilter(const QString&))); connect(m_filterBar, SIGNAL(closeRequest()), this, SLOT(closeFilterBar())); @@ -124,8 +181,6 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, m_topLayout->addWidget(itemView()); m_topLayout->addWidget(m_filterBar); m_topLayout->addWidget(m_statusBar); - - loadDirectory(m_urlNavigator->url()); } DolphinView::~DolphinView() @@ -137,6 +192,7 @@ DolphinView::~DolphinView() void DolphinView::setUrl(const KUrl& url) { m_urlNavigator->setUrl(url); + m_controller->setUrl(url); } const KUrl& DolphinView::url() const @@ -144,14 +200,14 @@ const KUrl& DolphinView::url() const return m_urlNavigator->url(); } -void DolphinView::requestActivation() +KUrl DolphinView::rootUrl() const { - mainWindow()->setActiveView(this); + return isColumnViewActive() ? m_dirLister->url() : url(); } bool DolphinView::isActive() const { - return (mainWindow()->activeView() == this); + return m_mainWindow->activeView() == this; } void DolphinView::setMode(Mode mode) @@ -162,6 +218,14 @@ void DolphinView::setMode(Mode mode) m_mode = mode; + if (isColumnViewActive()) { + // When changing the mode in the column view, it makes sense + // 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()); + } + ViewProperties props(m_urlNavigator->url()); props.setViewMode(m_mode); @@ -181,15 +245,15 @@ void DolphinView::setShowPreview(bool show) ViewProperties props(m_urlNavigator->url()); props.setShowPreview(show); - // TODO: wait until previews are possible with KFileItemDelegate - + m_controller->setShowPreview(show); emit showPreviewChanged(); + + startDirLister(m_urlNavigator->url(), true); } bool DolphinView::showPreview() const { - // TODO: wait until previews are possible with KFileItemDelegate - return true; + return m_controller->showPreview(); } void DolphinView::setShowHiddenFiles(bool show) @@ -200,13 +264,11 @@ void DolphinView::setShowHiddenFiles(bool show) ViewProperties props(m_urlNavigator->url()); props.setShowHiddenFiles(show); - props.save(); m_dirLister->setShowingDotFiles(show); - emit showHiddenFilesChanged(); - reload(); + startDirLister(m_urlNavigator->url(), true); } bool DolphinView::showHiddenFiles() const @@ -214,8 +276,47 @@ bool DolphinView::showHiddenFiles() const return m_dirLister->showingDotFiles(); } +void DolphinView::setCategorizedSorting(bool categorized) +{ + if (!supportsCategorizedSorting() || (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; + } + + ViewProperties props(m_urlNavigator->url()); + props.setCategorizedSorting(categorized); + props.save(); + + emit categorizedSortingChanged(); +} + +bool DolphinView::categorizedSorting() const +{ + if (!supportsCategorizedSorting()) { + return false; + } + + Q_ASSERT(m_iconsView != 0); + return m_iconsView->itemCategorizer() != 0; +} + +bool DolphinView::supportsCategorizedSorting() const +{ + return m_iconsView != 0; +} + void DolphinView::renameSelectedItems() { + DolphinView* view = mainWindow()->activeView(); const KUrl::List urls = selectedUrls(); if (urls.count() > 1) { // More than one item has been selected for renaming. Open @@ -225,80 +326,61 @@ void DolphinView::renameSelectedItems() return; } - DolphinView* view = mainWindow()->activeView(); const QString& newName = dialog.newName(); if (newName.isEmpty()) { - view->statusBar()->setMessage(i18n("The new item name is invalid."), + view->statusBar()->setMessage(dialog.errorString(), DolphinStatusBar::Error); - } - else { + } else { // TODO: check how this can be integrated into KonqUndoManager/KonqOperations - - //UndoManager& undoMan = UndoManager::instance(); - //undoMan.beginMacro(); - - assert(newName.contains('#')); - - const int urlsCount = urls.count(); + // 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('#'); - assert(replaceIndex >= 0); - for (int i = 0; i < urlsCount; ++i) { - const KUrl& source = urls[i]; + 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(i + 1); + number.setNum(index++); QString name(newName); name.replace(replaceIndex, 1, number); - if (source.fileName() != name) { - KUrl dest(source.upUrl()); - dest.addPath(name); - - const bool destExists = KIO::NetAccess::exists(dest, false, view); - if (destExists) { - view->statusBar()->setMessage(i18n("Renaming failed (item '%1' already exists).",name), - DolphinStatusBar::Error); - break; - } - else if (KIO::NetAccess::file_move(source, dest)) { - // TODO: From the users point of view he executed one 'rename n files' operation, - // but internally we store it as n 'rename 1 file' operations for the undo mechanism. - //DolphinCommand command(DolphinCommand::Rename, source, dest); - //undoMan.addCommand(command); - } + if (oldUrl.fileName() != name) { + KUrl newUrl = oldUrl; + newUrl.setFileName(name); + m_mainWindow->rename(oldUrl, newUrl); } + ++it; } - - //undoMan.endMacro(); } - } - else { + } else { // Only one item has been selected for renaming. Use the custom // renaming mechanism from the views. - assert(urls.count() == 1); - // TODO: - /*if (m_mode == DetailsView) { - Q3ListViewItem* item = m_iconsView->firstChild(); - while (item != 0) { - if (item->isSelected()) { - m_iconsView->rename(item, DolphinDetailsView::NameColumn); - break; - } - item = item->nextSibling(); - } + 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; + } + + 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); } - else { - KFileIconViewItem* item = static_cast(m_iconsView->firstItem()); - while (item != 0) { - if (item->isSelected()) { - item->rename(); - break; - } - item = static_cast(item->nextItem()); - } - }*/ } } @@ -319,7 +401,6 @@ DolphinStatusBar* DolphinView::statusBar() const int DolphinView::contentsX() const { - return itemView()->horizontalScrollBar()->value(); } @@ -328,19 +409,9 @@ int DolphinView::contentsY() const return itemView()->verticalScrollBar()->value(); } -void DolphinView::refreshSettings() -{ - startDirLister(m_urlNavigator->url()); -} - -void DolphinView::emitRequestItemInfo(const KUrl& url) -{ - emit requestItemInfo(url); -} - bool DolphinView::isFilterBarVisible() const { - return m_filterBar->isVisible(); + return m_filterBar->isVisible(); } bool DolphinView::isUrlEditable() const @@ -350,33 +421,28 @@ bool DolphinView::isUrlEditable() const void DolphinView::zoomIn() { - //itemEffectsManager()->zoomIn(); + m_controller->triggerZoomIn(); } void DolphinView::zoomOut() { - //itemEffectsManager()->zoomOut(); + m_controller->triggerZoomOut(); } bool DolphinView::isZoomInPossible() const { - return false; //itemEffectsManager()->isZoomInPossible(); + return m_controller->isZoomInPossible(); } bool DolphinView::isZoomOutPossible() const { - return false; //itemEffectsManager()->isZoomOutPossible(); + return m_controller->isZoomOutPossible(); } void DolphinView::setSorting(Sorting sorting) { if (sorting != this->sorting()) { - ViewProperties props(url()); - props.setSorting(sorting); - - m_proxyModel->setSorting(sorting); - - emit sortingChanged(sorting); + updateSorting(sorting); } } @@ -388,12 +454,7 @@ DolphinView::Sorting DolphinView::sorting() const void DolphinView::setSortOrder(Qt::SortOrder order) { if (sortOrder() != order) { - ViewProperties props(url()); - props.setSortOrder(order); - - m_proxyModel->setSortOrder(order); - - emit sortOrderChanged(order); + updateSortOrder(order); } } @@ -402,6 +463,23 @@ Qt::SortOrder DolphinView::sortOrder() const return m_proxyModel->sortOrder(); } +void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info) +{ + ViewProperties props(m_urlNavigator->url()); + props.setAdditionalInfo(info); + + m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation); + m_fileItemDelegate->setAdditionalInformation(info); + + emit additionalInfoChanged(info); + startDirLister(m_urlNavigator->url(), true); +} + +KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const +{ + return m_fileItemDelegate->additionalInformation(); +} + void DolphinView::goBack() { m_urlNavigator->goBack(); @@ -424,17 +502,17 @@ void DolphinView::goHome() void DolphinView::setUrlEditable(bool editable) { - m_urlNavigator->editUrl(editable); + m_urlNavigator->setUrlEditable(editable); } -const QLinkedList DolphinView::urlHistory(int& index) const +bool DolphinView::hasSelection() const { - return m_urlNavigator->history(index); + return itemView()->selectionModel()->hasSelection(); } -bool DolphinView::hasSelection() const +void DolphinView::clearSelection() { - return itemView()->selectionModel()->hasSelection(); + itemView()->selectionModel()->clear(); } KFileItemList DolphinView::selectedItems() const @@ -443,7 +521,7 @@ KFileItemList DolphinView::selectedItems() const // Our view has a selection, we will map them back to the DirModel // and then fill the KFileItemList. - assert((view != 0) && (view->selectionModel() != 0)); + Q_ASSERT((view != 0) && (view->selectionModel() != 0)); const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection()); KFileItemList itemList; @@ -451,7 +529,7 @@ KFileItemList DolphinView::selectedItems() const const QModelIndexList indexList = selection.indexes(); QModelIndexList::const_iterator end = indexList.end(); for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) { - assert((*it).isValid()); + Q_ASSERT((*it).isValid()); KFileItem* item = m_dirModel->itemForIndex(*it); if (item != 0) { @@ -484,12 +562,6 @@ KFileItem* DolphinView::fileItem(const QModelIndex index) const return m_dirModel->itemForIndex(dirModelIndex); } -void DolphinView::openContextMenu(KFileItem* fileInfo, const QPoint& pos) -{ - DolphinContextMenu contextMenu(this, fileInfo, pos); - contextMenu.open(); -} - void DolphinView::rename(const KUrl& source, const QString& newName) { bool ok = false; @@ -502,8 +574,8 @@ void DolphinView::rename(const KUrl& source, const QString& newName) dest.addPath(newName); const bool destExists = KIO::NetAccess::exists(dest, - false, - mainWindow()->activeView()); + false, + mainWindow()->activeView()); if (destExists) { // the destination already exists, hence ask the user // how to proceed... @@ -513,25 +585,23 @@ void DolphinView::rename(const KUrl& source, const QString& newName) 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; - } + case KIO::R_OVERWRITE: + // the destination should be overwritten + ok = KIO::NetAccess::file_move(source, dest, -1, true); + break; - default: - // the renaming operation has been canceled - reload(); - return; + 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; } - } - else { + + 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); @@ -539,26 +609,27 @@ void DolphinView::rename(const KUrl& source, const QString& newName) const QString destFileName = dest.fileName(); if (ok) { - m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.",source.fileName(), destFileName), + 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), + } else { + m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.", source.fileName(), destFileName), DolphinStatusBar::Error); - reload(); } } void DolphinView::reload() { - startDirLister(m_urlNavigator->url(), true); + const KUrl& url = m_urlNavigator->url(); + changeDirectory(url); + startDirLister(url, true); } -void DolphinView::declareViewActive() +void DolphinView::refresh() { - mainWindow()->setActiveView( this ); + createView(); + reload(); } void DolphinView::mouseReleaseEvent(QMouseEvent* event) @@ -572,15 +643,36 @@ DolphinMainWindow* DolphinView::mainWindow() const return m_mainWindow; } -void DolphinView::loadDirectory(const KUrl& url) +void DolphinView::changeDirectory(const KUrl& url) { + if (!isActive()) { + requestActivation(); + } + const ViewProperties props(url); const Mode mode = props.viewMode(); - if (m_mode != mode) { + 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(); + + if (m_mode == ColumnView) { + // The mode has been changed to the Column View. When starting the dir + // lister with DolphinView::startDirLister() it is important to give a + // hint that the dir lister may not keep the current directory + // although this is the default for showing a hierarchy. + m_initializeColumnView = true; + } } const bool showHiddenFiles = props.showHiddenFiles(); @@ -589,6 +681,22 @@ void DolphinView::loadDirectory(const KUrl& url) 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); @@ -601,7 +709,18 @@ void DolphinView::loadDirectory(const KUrl& url) emit sortOrderChanged(sortOrder); } - // TODO: handle previews (props.showPreview()) + KFileItemDelegate::AdditionalInformation info = props.additionalInfo(); + if (info != m_fileItemDelegate->additionalInformation()) { + m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation); + 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); @@ -611,6 +730,10 @@ void DolphinView::loadDirectory(const KUrl& url) 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 @@ -623,21 +746,38 @@ void DolphinView::triggerItem(const QModelIndex& index) 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()) { - // 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()); - if (localPath.isEmpty()) { - setUrl(item->url()); - } - else { - setUrl(KUrl(localPath)); + 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 { + } else { item->run(); } } @@ -652,7 +792,7 @@ void DolphinView::updateProgress(int percent) void DolphinView::updateItemCount() { if (m_showProgress) { - m_statusBar->setProgressText(QString::null); + m_statusBar->setProgressText(QString()); m_statusBar->setProgress(100); m_showProgress = false; } @@ -668,8 +808,7 @@ void DolphinView::updateItemCount() KFileItem* item = *it; if (item->isDir()) { ++m_folderCount; - } - else { + } else { ++m_fileCount; } ++it; @@ -677,21 +816,56 @@ void DolphinView::updateItemCount() updateStatusBar(); + m_blockContentsMovedSignal = false; QTimer::singleShot(0, this, SLOT(restoreContentsPos())); } +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); + connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), + this, SLOT(showPreview(const KFileItem&, const QPixmap&))); + } +} + +void DolphinView::showPreview(const KFileItem& item, const QPixmap& pixmap) +{ + Q_ASSERT(!item.isNull()); + if (item.url().directory() != m_dirLister->url().path()) { + // the preview job is still working on items of an older URL, hence + // the item is not part of the directory model anymore + return; + } + + const QModelIndex idx = m_dirModel->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); + } else { + m_dirModel->setData(idx, QIcon(pixmap), Qt::DecorationRole); + } + } +} + void DolphinView::restoreContentsPos() { - int index = 0; - const QLinkedList history = urlHistory(index); - if (!history.isEmpty()) { + KUrl currentUrl = m_urlNavigator->url(); + if (!currentUrl.isEmpty()) { QAbstractItemView* view = itemView(); - // TODO: view->setCurrentItem(history[index].currentFileName()); - - QLinkedList::const_iterator it = history.begin(); - it += index; - view->horizontalScrollBar()->setValue((*it).contentsX()); - view->verticalScrollBar()->setValue((*it).contentsY()); + // TODO: view->setCurrentItem(m_urlNavigator->currentFileName()); + QPoint pos = m_urlNavigator->savedPosition(); + view->horizontalScrollBar()->setValue(pos.x()); + view->verticalScrollBar()->setValue(pos.y()); } } @@ -707,7 +881,7 @@ void DolphinView::showErrorMessage(const QString& msg) void DolphinView::emitSelectionChangedSignal() { - emit selectionChanged(); + emit selectionChanged(DolphinView::selectedItems()); } void DolphinView::closeFilterBar() @@ -722,9 +896,8 @@ void DolphinView::startDirLister(const KUrl& url, bool reload) 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), + } else { + m_statusBar->setMessage(i18n("The location '%1' is invalid.", location), DolphinStatusBar::Error); } return; @@ -735,62 +908,69 @@ void DolphinView::startDirLister(const KUrl& url, bool reload) // the directory loading progress information has the lowest priority. const QString progressText(m_statusBar->progressText()); m_showProgress = progressText.isEmpty() || - (progressText == i18n("Loading directory...")); + (progressText == i18n("Loading folder...")); if (m_showProgress) { - m_statusBar->setProgressText(i18n("Loading directory...")); + m_statusBar->setProgressText(i18n("Loading folder...")); m_statusBar->setProgress(0); } + m_cutItemsCache.clear(); + m_blockContentsMovedSignal = true; m_dirLister->stop(); - m_dirLister->openUrl(url, false, reload); -} -QString DolphinView::defaultStatusBarText() const -{ - // TODO: the following code is not suitable for languages where multiple forms - // of plurals are given (e. g. in Poland three forms of plurals exist). - const int itemCount = m_folderCount + m_fileCount; + bool openDir = true; + bool keepOldDirs = isColumnViewActive() && !m_initializeColumnView; + m_initializeColumnView = false; - QString text; - if (itemCount == 1) { - text = i18n("1 Item"); - } - else { - text = i18n("%1 Items",itemCount); - } + if (keepOldDirs) { + if (reload) { + keepOldDirs = false; - text += " ("; - - if (m_folderCount == 1) { - text += i18n("1 Folder"); - } - else { - text += i18n("%1 Folders",m_folderCount); + 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; + } 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; + } + } } - text += ", "; - - if (m_fileCount == 1) { - text += i18n("1 File"); + if (openDir) { + m_dirLister->openUrl(url, keepOldDirs, reload); } - else { - text += i18n("%1 Files",m_fileCount); - } - - text += ")"; +} - return text; +QString DolphinView::defaultStatusBarText() const +{ + return KIO::itemsSummaryString(m_fileCount + m_folderCount, + m_fileCount, + m_folderCount, + 0, false); } QString DolphinView::selectionStatusBarText() const { - // TODO: the following code is not suitable for languages where multiple forms - // of plurals are given (e. g. in Poland three forms of plurals exist). QString text; const KFileItemList list = selectedItems(); if (list.isEmpty()) { - // TODO: assert(!list.isEmpty()) should be used, as this method is only invoked if - // DolphinView::hasSelection() is true. Inconsistent behavior? + // when an item is triggered, it is temporary selected but selectedItems() + // will return an empty list return QString(); } @@ -799,35 +979,27 @@ QString DolphinView::selectionStatusBarText() const KIO::filesize_t byteSize = 0; KFileItemList::const_iterator it = list.begin(); const KFileItemList::const_iterator end = list.end(); - while (it != end){ + while (it != end) { KFileItem* item = *it; if (item->isDir()) { ++folderCount; - } - else { + } else { ++fileCount; byteSize += item->size(); } ++it; } - if (folderCount == 1) { - text = i18n("1 Folder selected"); - } - else if (folderCount > 1) { - text = i18n("%1 Folders selected",folderCount); - } - - if ((fileCount > 0) && (folderCount > 0)) { - text += ", "; + if (folderCount > 0) { + text = i18np("1 Folder selected", "%1 Folders selected", folderCount); + if (fileCount > 0) { + text += ", "; + } } - const QString sizeText(KIO::convertSize(byteSize)); - if (fileCount == 1) { - text += i18n("1 File selected (%1)",sizeText); - } - else if (fileCount > 1) { - text += i18n("%1 Files selected (%1)",fileCount,sizeText); + if (fileCount > 0) { + const QString sizeText(KIO::convertSize(byteSize)); + text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText); } return text; @@ -835,11 +1007,10 @@ QString DolphinView::selectionStatusBarText() const void DolphinView::showFilterBar(bool show) { - assert(m_filterBar != 0); + Q_ASSERT(m_filterBar != 0); if (show) { m_filterBar->show(); - } - else { + } else { m_filterBar->hide(); } } @@ -867,6 +1038,32 @@ void DolphinView::updateStatusBar() } } +void DolphinView::requestActivation() +{ + m_mainWindow->setActiveView(this); +} + +void DolphinView::changeSelection(const KFileItemList& selection) +{ + clearSelection(); + if (selection.isEmpty()) { + return; + } + KUrl baseUrl = url(); + KUrl url; + QItemSelection new_selection; + foreach(KFileItem* item, selection) { + url = item->url().upUrl(); + if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) { + QModelIndex index = m_proxyModel->mapFromSource(m_dirModel->indexForItem(*item)); + new_selection.select(index, index); + } + } + itemView()->selectionModel()->select(new_selection, + QItemSelectionModel::ClearAndSelect + | QItemSelectionModel::Current); +} + void DolphinView::changeNameFilter(const QString& nameFilter) { // The name filter of KDirLister does a 'hard' filtering, which @@ -888,10 +1085,142 @@ void DolphinView::changeNameFilter(const QString& nameFilter) m_dirLister->setNameFilter(adjustedFilter); m_dirLister->emitChanges(); #else - m_proxyModel->setFilterRegExp( nameFilter ); + m_proxyModel->setFilterRegExp(nameFilter); #endif } +void DolphinView::openContextMenu(const QPoint& pos) +{ + KFileItem* item = 0; + + const QModelIndex index = itemView()->indexAt(pos); + if (isValidNameIndex(index)) { + item = fileItem(index); + } + + DolphinContextMenu contextMenu(m_mainWindow, item, url()); + contextMenu.open(); +} + +void DolphinView::dropUrls(const KUrl::List& urls, + const QModelIndex& index, + 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; + } + } + + if ((directory == 0) && (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(); + dropUrls(urls, destination); +} + +void DolphinView::dropUrls(const KUrl::List& urls, + const KUrl& destination) +{ + m_mainWindow->dropUrls(urls, destination); +} + +void DolphinView::updateSorting(DolphinView::Sorting sorting) +{ + ViewProperties props(url()); + props.setSorting(sorting); + + m_proxyModel->setSorting(sorting); + + emit sortingChanged(sorting); +} + +void DolphinView::updateSortOrder(Qt::SortOrder order) +{ + ViewProperties props(url()); + props.setSortOrder(order); + + m_proxyModel->setSortOrder(order); + + emit sortOrderChanged(order); +} + +void DolphinView::emitContentsMoved() +{ + if (!m_blockContentsMovedSignal) { + emit contentsMoved(contentsX(), contentsY()); + } +} + +void DolphinView::updateActivationState() +{ + m_urlNavigator->setActive(isActive()); + + QColor color = KGlobalSettings::baseColor(); + if (isActive()) { + emit urlChanged(url()); + emit selectionChanged(selectedItems()); + } else { + // darken the background if the view is inactive + // TODO: does not work for a black background + color = color.darker(105); + } + + QWidget* viewport = itemView()->viewport(); + QPalette palette; + palette.setColor(viewport->backgroundRole(), color); + viewport->setPalette(palette); + + update(); +} + +void DolphinView::updateCutItems() +{ + // restore the icons of all previously selected items to the + // original state... + 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); + if (index.isValid()) { + m_dirModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole); + } + ++it; + } + m_cutItemsCache.clear(); + + // ... and apply an item effect to all currently cut items + applyCutItemEffect(); +} + +void DolphinView::showHoverInformation(const QModelIndex& index) +{ + if (hasSelection()) { + return; + } + + const KFileItem* item = fileItem(index); + if (item != 0) { + m_statusBar->setMessage(item->getStatusBarInfo(), DolphinStatusBar::Default); + emit requestItemInfo(item->url()); + } +} + +void DolphinView::clearHoverInformation() +{ + m_statusBar->clear(); + emit requestItemInfo(KUrl()); +} + + void DolphinView::createView() { // delete current view @@ -899,59 +1228,58 @@ 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; m_detailsView = 0; + m_columnView = 0; + m_fileItemDelegate = 0; } - assert(m_iconsView == 0); - assert(m_detailsView == 0); + Q_ASSERT(m_iconsView == 0); + Q_ASSERT(m_detailsView == 0); + Q_ASSERT(m_columnView == 0); // ... and recreate it representing the current mode switch (m_mode) { - case IconsView: - m_iconsView = new DolphinIconsView(this); - m_iconsView->setViewMode(QListView::IconMode); - m_iconsView->setSpacing(32); - view = m_iconsView; - // TODO: read out view settings - break; - - case DetailsView: - m_detailsView = new DolphinDetailsView(this); - view = m_detailsView; - // TODO: read out view settings - break; + 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; } - view->setModel(m_proxyModel); + Q_ASSERT(view != 0); - view->setSelectionMode(QAbstractItemView::ExtendedSelection); + m_fileItemDelegate = new KFileItemDelegate(view); + view->setItemDelegate(m_fileItemDelegate); - KFileItemDelegate* delegate = new KFileItemDelegate(this); - delegate->setAdditionalInformation(KFileItemDelegate::FriendlyMimeType); - view->setItemDelegate(delegate); + view->setModel(m_proxyModel); + view->setSelectionMode(QAbstractItemView::ExtendedSelection); new KMimeTypeResolver(view, m_dirModel); - - connect(view, SIGNAL(clicked(const QModelIndex&)), - this, SLOT(triggerItem(const QModelIndex&))); - connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), - this, SLOT(emitSelectionChangedSignal())); - m_topLayout->insertWidget(1, view); -} -int DolphinView::columnIndex(Sorting sorting) const -{ - int index = 0; - switch (sorting) { - case SortByName: index = KDirModel::Name; break; - case SortBySize: index = KDirModel::Size; break; - case SortByDate: index = KDirModel::ModifiedTime; break; - default: assert(false); - } - return index; + connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), + m_controller, SLOT(indicateSelectionChange())); + connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)), + this, SLOT(emitContentsMoved())); + connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)), + this, SLOT(emitContentsMoved())); } void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags) @@ -961,7 +1289,7 @@ void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags) const QModelIndex topLeft = itemModel->index(0, 0); const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1, - itemModel->columnCount() - 1); + itemModel->columnCount() - 1); QItemSelection selection(topLeft, bottomRight); selectionModel->select(selection, flags); @@ -969,11 +1297,73 @@ void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags) QAbstractItemView* DolphinView::itemView() const { - assert((m_iconsView == 0) || (m_detailsView == 0)); if (m_detailsView != 0) { return m_detailsView; + } else if (m_columnView != 0) { + return m_columnView; } + 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(); + const KUrl::List cutUrls = KUrl::List::fromMimeData(mimeData); + + const KUrl& itemUrl = item.url(); + KUrl::List::const_iterator it = cutUrls.begin(); + const KUrl::List::const_iterator end = cutUrls.end(); + while (it != end) { + if (*it == itemUrl) { + return true; + } + ++it; + } + + return false; +} + +void DolphinView::applyCutItemEffect() +{ + const QMimeData* mimeData = QApplication::clipboard()->mimeData(); + if (!KonqMimeData::decodeIsCutSelection(mimeData)) { + return; + } + + KFileItemList items(m_dirLister->items()); + 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 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.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); + } + } + ++it; + } +} + #include "dolphinview.moc"