X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bbc814c7fa79b545ceef3e6f7eaf00398eef896c..be9746e87bb6a42e641dbf36c528a60fb564420a:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index bb84d32c0..8d3bf1e2f 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -22,15 +22,16 @@ #include #include -#include -#include -#include -#include +#include +#include +#include #include #include #include +#include #include +#include #include #include #include @@ -43,105 +44,55 @@ #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 "filterbar.h" +#include "dolphinitemcategorizer.h" #include "renamedialog.h" -#include "urlnavigator.h" #include "viewproperties.h" #include "dolphinsettings.h" #include "dolphin_generalsettings.h" -DolphinView::DolphinView(DolphinMainWindow* mainWindow, - QWidget* parent, +DolphinView::DolphinView(QWidget* parent, const KUrl& url, + KDirLister* dirLister, + KDirModel* dirModel, + DolphinSortFilterProxyModel* proxyModel, Mode mode, bool showHiddenFiles) : QWidget(parent), - m_showProgress(false), + m_active(true), m_blockContentsMovedSignal(false), + m_initializeColumnView(false), m_mode(mode), - m_iconSize(0), - m_folderCount(0), - m_fileCount(0), - 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), - m_dirLister(0), - m_proxyModel(0) + m_dirModel(dirModel), + 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 UrlNavigator(DolphinSettings::instance().bookmarkManager(), url, this); - m_urlNavigator->setUrlEditable(DolphinSettings::instance().generalSettings()->editableUrl()); - m_urlNavigator->setHomeUrl(DolphinSettings::instance().generalSettings()->homeUrl()); - m_urlNavigator->setShowHiddenFiles(showHiddenFiles); - connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(loadDirectory(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(storeContentsPosition(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())); + this, SLOT(restoreContentsPos())); connect(m_dirLister, SIGNAL(completed()), this, SLOT(updateCutItems())); connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)), this, SLOT(generatePreviews(const KFileItemList&))); - connect(m_dirLister, SIGNAL(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_proxyModel = new DolphinSortFilterProxyModel(this); - m_proxyModel->setSourceModel(m_dirModel); m_controller = new DolphinController(this); + m_controller->setUrl(url); connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)), this, SLOT(openContextMenu(const QPoint&))); connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const QModelIndex&, QWidget*)), @@ -152,48 +103,62 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, 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())); + this, SLOT(activate())); + 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(); - 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); 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 isColumnViewActive() ? m_dirLister->url() : url(); +} + +void DolphinView::setActive(bool active) { - return m_urlNavigator->url(); + if (active == m_active) { + return; + } + + m_active = active; + + QColor color = KGlobalSettings::baseColor(); + if (active) { + emit urlChanged(url()); + emit selectionChanged(selectedItems()); + } else { + color.setAlpha(0); + } + + QWidget* viewport = itemView()->viewport(); + QPalette palette; + palette.setColor(viewport->backgroundRole(), color); + viewport->setPalette(palette); + + update(); + + if (active) { + emit activated(); + } } bool DolphinView::isActive() const { - return m_mainWindow->activeView() == this; + return m_active; } void DolphinView::setMode(Mode mode) @@ -204,11 +169,21 @@ void DolphinView::setMode(Mode mode) m_mode = mode; - ViewProperties props(m_urlNavigator->url()); + 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. + // TODO: reactivate again after DolphinView/DolphinViewController split works + //setUrl(m_dirLister->url()); + //m_controller->setUrl(m_dirLister->url()); + } + + ViewProperties props(url()); props.setViewMode(m_mode); createView(); - startDirLister(m_urlNavigator->url()); + startDirLister(url()); emit modeChanged(); } @@ -220,13 +195,13 @@ DolphinView::Mode DolphinView::mode() const void DolphinView::setShowPreview(bool show) { - ViewProperties props(m_urlNavigator->url()); + ViewProperties props(url()); props.setShowPreview(show); m_controller->setShowPreview(show); - emit showPreviewChanged(); - reload(); + + startDirLister(url(), true); } bool DolphinView::showPreview() const @@ -240,16 +215,13 @@ void DolphinView::setShowHiddenFiles(bool show) return; } - ViewProperties props(m_urlNavigator->url()); + ViewProperties props(url()); props.setShowHiddenFiles(show); - props.save(); m_dirLister->setShowingDotFiles(show); - m_urlNavigator->setShowHiddenFiles(show); - emit showHiddenFilesChanged(); - reload(); + startDirLister(url(), true); } bool DolphinView::showHiddenFiles() const @@ -257,9 +229,49 @@ 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(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(); + // TODO: temporary deactivate due to DolphinView/DolphinViewController split + + /*DolphinView* view = 0; //mainWindow()->activeView(); const KUrl::List urls = selectedUrls(); if (urls.count() > 1) { // More than one item has been selected for renaming. Open @@ -273,8 +285,7 @@ void DolphinView::renameSelectedItems() if (newName.isEmpty()) { view->statusBar()->setMessage(dialog.errorString(), DolphinStatusBar::Error); - } - else { + } 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('#')); @@ -302,8 +313,7 @@ void DolphinView::renameSelectedItems() ++it; } } - } - else { + } else { // Only one item has been selected for renaming. Use the custom // renaming mechanism from the views. Q_ASSERT(urls.count() == 1); @@ -320,14 +330,13 @@ void DolphinView::renameSelectedItems() if (newName.isEmpty()) { view->statusBar()->setMessage(dialog.errorString(), DolphinStatusBar::Error); - } - else { + } else { const KUrl& oldUrl = urls.first(); KUrl newUrl = oldUrl; newUrl.setFileName(newName); m_mainWindow->rename(oldUrl, newUrl); } - } + }*/ } void DolphinView::selectAll() @@ -340,11 +349,6 @@ void DolphinView::invertSelection() selectAll(QItemSelectionModel::Toggle); } -DolphinStatusBar* DolphinView::statusBar() const -{ - return m_statusBar; -} - int DolphinView::contentsX() const { return itemView()->horizontalScrollBar()->value(); @@ -355,21 +359,6 @@ int DolphinView::contentsY() const return itemView()->verticalScrollBar()->value(); } -void DolphinView::emitRequestItemInfo(const KUrl& url) -{ - emit requestItemInfo(url); -} - -bool DolphinView::isFilterBarVisible() const -{ - return m_filterBar->isVisible(); -} - -bool DolphinView::isUrlEditable() const -{ - return m_urlNavigator->isUrlEditable(); -} - void DolphinView::zoomIn() { m_controller->triggerZoomIn(); @@ -416,13 +405,14 @@ Qt::SortOrder DolphinView::sortOrder() const void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info) { - ViewProperties props(m_urlNavigator->url()); + ViewProperties props(url()); props.setAdditionalInfo(info); + m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation); m_fileItemDelegate->setAdditionalInformation(info); emit additionalInfoChanged(info); - reload(); + startDirLister(url(), true); } KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const @@ -430,31 +420,6 @@ KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const return m_fileItemDelegate->additionalInformation(); } -void DolphinView::goBack() -{ - m_urlNavigator->goBack(); -} - -void DolphinView::goForward() -{ - m_urlNavigator->goForward(); -} - -void DolphinView::goUp() -{ - m_urlNavigator->goUp(); -} - -void DolphinView::goHome() -{ - m_urlNavigator->goHome(); -} - -void DolphinView::setUrlEditable(bool editable) -{ - m_urlNavigator->setUrlEditable(editable); -} - bool DolphinView::hasSelection() const { return itemView()->selectionModel()->hasSelection(); @@ -523,9 +488,7 @@ void DolphinView::rename(const KUrl& source, const QString& newName) KUrl dest(source.upUrl()); dest.addPath(newName); - const bool destExists = KIO::NetAccess::exists(dest, - false, - mainWindow()->activeView()); + const bool destExists = KIO::NetAccess::exists(dest, false, this); if (destExists) { // the destination already exists, hence ask the user // how to proceed... @@ -535,25 +498,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); @@ -561,98 +522,45 @@ 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), - DolphinStatusBar::OperationCompleted); + // XYDZ + //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); - reload(); + } else { + // XYDZ + //m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.", source.fileName(), destFileName), + // DolphinStatusBar::Error); } } void DolphinView::reload() { - startDirLister(m_urlNavigator->url(), true); + setUrl(url()); + startDirLister(url(), true); } -void DolphinView::mouseReleaseEvent(QMouseEvent* event) +void DolphinView::refresh() { - QWidget::mouseReleaseEvent(event); - mainWindow()->setActiveView(this); + createView(); + reload(); } -DolphinMainWindow* DolphinView::mainWindow() const +void DolphinView::mouseReleaseEvent(QMouseEvent* event) { - return m_mainWindow; + QWidget::mouseReleaseEvent(event); + setActive(true);; } - -void DolphinView::loadDirectory(const KUrl& url) +void DolphinView::activate() { - 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 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(); + setActive(true); } void DolphinView::triggerItem(const QModelIndex& index) { if (!isValidNameIndex(index)) { + clearSelection(); + showHoverInformation(index); return; } @@ -677,98 +585,65 @@ void DolphinView::triggerItem(const QModelIndex& index) KUrl url; if (localPath.isEmpty()) { url = item->url(); - } - else { + } else { url = localPath; } if (item->isDir()) { setUrl(url); - } - else if (item->isFile()) { + } else if (item->isFile()) { // allow to browse through ZIP and tar files KMimeType::Ptr mime = item->mimeTypePtr(); 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")) { + } 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 { + } else { item->run(); } - } - else { + } else { item->run(); } } -void DolphinView::updateProgress(int percent) -{ - if (m_showProgress) { - m_statusBar->setProgress(percent); - } -} - -void DolphinView::updateItemCount() +void DolphinView::generatePreviews(const KFileItemList& items) { - 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(); + if (m_controller->showPreview()) { - m_fileCount = 0; - m_folderCount = 0; + // Must turn QList to QList... + QList itemsToPreview; + foreach( KFileItem* it, items ) + itemsToPreview.append( *it ); - while (it != end) { - KFileItem* item = *it; - if (item->isDir()) { - ++m_folderCount; - } - else { - ++m_fileCount; - } - ++it; + KIO::PreviewJob* job = KIO::filePreview(itemsToPreview, 128); + connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), + this, SLOT(showPreview(const KFileItem&, const QPixmap&))); } - - updateStatusBar(); - - m_blockContentsMovedSignal = false; - QTimer::singleShot(0, this, SLOT(restoreContentsPos())); } -void DolphinView::generatePreviews(const KFileItemList& items) +void DolphinView::showPreview(const KFileItem& item, const QPixmap& pixmap) { - if (m_controller->showPreview()) { - KIO::PreviewJob* job = KIO::filePreview(items, 128); - connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)), - this, SLOT(showPreview(const KFileItem*, const QPixmap&))); + 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; } -} -void DolphinView::showPreview(const KFileItem* item, const QPixmap& pixmap) -{ - Q_ASSERT(item != 0); - const QModelIndex idx = m_dirModel->indexForItem(*item); + 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)) { + 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 { + } else { m_dirModel->setData(idx, QIcon(pixmap), Qt::DecorationRole); } } @@ -776,68 +651,59 @@ void DolphinView::showPreview(const KFileItem* item, const QPixmap& pixmap) void DolphinView::restoreContentsPos() { - KUrl currentUrl = m_urlNavigator->url(); - if (!currentUrl.isEmpty()) { + m_blockContentsMovedSignal = false; + if (!url().isEmpty()) { QAbstractItemView* view = itemView(); - // TODO: view->setCurrentItem(m_urlNavigator->currentFileName()); - QPoint pos = m_urlNavigator->savedPosition(); + // TODO #1: view->setCurrentItem(m_urlNavigator->currentFileName()); + // TODO #2: temporary deactivated due to DolphinView/DolphinViewController split + //QPoint pos = m_urlNavigator->savedPosition(); + QPoint pos(0, 0); view->horizontalScrollBar()->setValue(pos.x()); view->verticalScrollBar()->setValue(pos.y()); } } -void DolphinView::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) { if (!url.isValid()) { - const QString location(url.pathOrUrl()); - if (location.isEmpty()) { - m_statusBar->setMessage(i18n("The location is empty."), DolphinStatusBar::Error); - } - else { - m_statusBar->setMessage(i18n("The location '%1' is invalid.",location), - DolphinStatusBar::Error); - } + // TODO: temporary deactivated due to DolphinView/DolphinViewController split + + //const QString location(url.pathOrUrl()); + //if (location.isEmpty()) { + // m_statusBar->setMessage(i18n("The location is empty."), DolphinStatusBar::Error); + //} else { + // m_statusBar->setMessage(i18n("The location '%1' is invalid.", location), + // DolphinStatusBar::Error); + //} 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 directory...")); - if (m_showProgress) { - m_statusBar->setProgressText(i18n("Loading directory...")); - m_statusBar->setProgress(0); - } + + // TODO: temporary deactivated due to DolphinView/DolphinViewController split + //const QString progressText(m_statusBar->progressText()); + //m_showProgress = progressText.isEmpty() || + // (progressText == i18n("Loading folder...")); + //if (m_showProgress) { + // m_statusBar->setProgressText(i18n("Loading folder...")); + // m_statusBar->setProgress(0); + //} m_cutItemsCache.clear(); m_blockContentsMovedSignal = true; m_dirLister->stop(); bool openDir = true; - bool keepOldDirs = isColumnViewActive(); + bool keepOldDirs = isColumnViewActive() && !m_initializeColumnView; + m_initializeColumnView = false; + if (keepOldDirs) { if (reload) { keepOldDirs = false; @@ -846,19 +712,17 @@ void DolphinView::startDirLister(const KUrl& url, bool reload) if (dirListerUrl.isValid()) { const KUrl::List dirs = m_dirLister->directories(); KUrl url; - foreach (url, dirs) { + foreach(url, dirs) { m_dirLister->updateDirectory(url); } openDir = false; } - } - else if (m_dirLister->directories().contains(url)) { + } 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 { + } 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 @@ -874,93 +738,92 @@ void DolphinView::startDirLister(const KUrl& url, bool reload) } } -QString DolphinView::defaultStatusBarText() const -{ - return KIO::itemsSummaryString(m_fileCount + m_folderCount, - m_fileCount, - m_folderCount, - 0, false); -} - -QString DolphinView::selectionStatusBarText() const +void DolphinView::setUrl(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 (m_controller->url() == url) { + 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(); + m_controller->setUrl(url); + + const ViewProperties props(url); + + const Mode mode = props.viewMode(); + bool changeMode = (m_mode != mode); + if (changeMode && isColumnViewActive()) { + // The column view is active. Only change the + // mode if the current URL is no child of the column view. + if (m_dirLister->url().isParentOf(url)) { + changeMode = false; } - ++it; } - if (folderCount > 0) { - text = i18np("1 Folder selected", "%1 Folders selected", folderCount); - if (fileCount > 0) { - text += ", "; + 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; } } - if (fileCount > 0) { - const QString sizeText(KIO::convertSize(byteSize)); - text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText); + const bool showHiddenFiles = props.showHiddenFiles(); + if (showHiddenFiles != m_dirLister->showingDotFiles()) { + m_dirLister->setShowingDotFiles(showHiddenFiles); + emit showHiddenFilesChanged(); } - return text; -} + 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(); + } -void DolphinView::showFilterBar(bool show) -{ - Q_ASSERT(m_filterBar != 0); - if (show) { - m_filterBar->show(); + const DolphinView::Sorting sorting = props.sorting(); + if (sorting != m_proxyModel->sorting()) { + m_proxyModel->setSorting(sorting); + emit sortingChanged(sorting); } - else { - m_filterBar->hide(); + + const Qt::SortOrder sortOrder = props.sortOrder(); + if (sortOrder != m_proxyModel->sortOrder()) { + m_proxyModel->setSortOrder(sortOrder); + emit sortOrderChanged(sortOrder); } -} -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 QString text(hasSelection() ? selectionStatusBarText() : defaultStatusBarText()); - m_statusBar->setDefaultText(text); - - if (updateStatusBarMsg) { - m_statusBar->setMessage(text, DolphinStatusBar::Default); + KFileItemDelegate::AdditionalInformation info = props.additionalInfo(); + if (info != m_fileItemDelegate->additionalInformation()) { + m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation); + m_fileItemDelegate->setAdditionalInformation(info); + emit additionalInfoChanged(info); } -} -void DolphinView::requestActivation() -{ - m_mainWindow->setActiveView(this); + const bool showPreview = props.showPreview(); + if (showPreview != m_controller->showPreview()) { + m_controller->setShowPreview(showPreview); + emit showPreviewChanged(); + } + + startDirLister(url); + emit urlChanged(url); + + // TODO: temporary deactivated due to DolphinView/DolphinViewController split + //m_statusBar->clear(); } void DolphinView::changeSelection(const KFileItemList& selection) @@ -969,10 +832,10 @@ 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) { + foreach(KFileItem* item, selection) { url = item->url().upUrl(); if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) { QModelIndex index = m_proxyModel->mapFromSource(m_dirModel->indexForItem(*item)); @@ -984,31 +847,6 @@ 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; @@ -1018,8 +856,7 @@ void DolphinView::openContextMenu(const QPoint& pos) item = fileItem(index); } - DolphinContextMenu contextMenu(m_mainWindow, item, url()); - contextMenu.open(); + emit requestContextMenu(item, url()); } void DolphinView::dropUrls(const KUrl::List& urls, @@ -1042,15 +879,15 @@ void DolphinView::dropUrls(const KUrl::List& urls, return; } - const KUrl& destination = (directory == 0) ? url() : - directory->url(); + 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); + emit urlsDropped(urls, destination); } void DolphinView::updateSorting(DolphinView::Sorting sorting) @@ -1080,15 +917,6 @@ void DolphinView::emitContentsMoved() } } -void DolphinView::updateActivationState() -{ - m_urlNavigator->setActive(isActive()); - if(isActive()) { - emit urlChanged(url()); - emit selectionChanged(selectedItems()); - } -} - void DolphinView::updateCutItems() { // restore the icons of all previously selected items to the @@ -1108,6 +936,28 @@ void DolphinView::updateCutItems() applyCutItemEffect(); } +void DolphinView::showHoverInformation(const QModelIndex& index) +{ + if (hasSelection()) { + return; + } + + const KFileItem* item = fileItem(index); + if (item != 0) { + // TODO: temporary deactivated due to DolphinView/DolphinViewController split + //m_statusBar->setMessage(item->getStatusBarInfo(), DolphinStatusBar::Default); + emit requestItemInfo(item->url()); + } +} + +void DolphinView::clearHoverInformation() +{ + // TODO: temporary deactivated due to DolphinView/DolphinViewController split + //m_statusBar->clear(); + emit requestItemInfo(KUrl()); +} + + void DolphinView::createView() { // delete current view @@ -1115,6 +965,11 @@ 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; @@ -1129,20 +984,20 @@ void DolphinView::createView() // ... and recreate it representing the current mode 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; + 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(view != 0); @@ -1157,7 +1012,7 @@ void DolphinView::createView() 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)), @@ -1171,7 +1026,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); @@ -1181,8 +1036,7 @@ QAbstractItemView* DolphinView::itemView() const { if (m_detailsView != 0) { return m_detailsView; - } - else if (m_columnView != 0) { + } else if (m_columnView != 0) { return m_columnView; } @@ -1202,7 +1056,7 @@ bool DolphinView::isCutItem(const KFileItem& item) const const KUrl& itemUrl = item.url(); KUrl::List::const_iterator it = cutUrls.begin(); const KUrl::List::const_iterator end = cutUrls.end(); - while (it != end){ + while (it != end) { if (*it == itemUrl) { return true; }