X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/205bf2035d30517e781271bbcae8e4c102d71871..ed68687614472e18904c4a3f613d01df2f5bb90e:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 0a7516c45..9d33329e5 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -18,78 +18,87 @@ ***************************************************************************/ #include "dolphinviewcontainer.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 +#include +#include "dolphin_generalsettings.h" #include "dolphinmodel.h" #include "dolphincolumnview.h" -#include "dolphincontroller.h" -#include "dolphinstatusbar.h" +#include "dolphinviewcontroller.h" #include "dolphinmainwindow.h" #include "dolphindirlister.h" #include "dolphinsortfilterproxymodel.h" #include "dolphindetailsview.h" #include "dolphiniconsview.h" -#include "dolphincontextmenu.h" +#include "draganddrophelper.h" #include "filterbar.h" -#include "renamedialog.h" -#include "kurlnavigator.h" +#include "settings/dolphinsettings.h" +#include "statusbar/dolphinstatusbar.h" +#include "viewmodecontroller.h" #include "viewproperties.h" -#include "dolphinsettings.h" -#include "dolphin_generalsettings.h" -DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, - QWidget* parent, - const KUrl& url) : +DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : QWidget(parent), - m_showProgress(false), - m_mainWindow(mainWindow), + m_isFolderWritable(false), m_topLayout(0), m_urlNavigator(0), m_view(0), m_filterBar(0), m_statusBar(0), + m_statusBarTimer(0), m_dirLister(0), m_proxyModel(0) { hide(); - setFocusPolicy(Qt::StrongFocus); + m_topLayout = new QVBoxLayout(this); m_topLayout->setSpacing(0); m_topLayout->setMargin(0); m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this); - connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)), - m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&))); + connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl&, QDropEvent*)), + this, SLOT(dropUrls(const KUrl&, QDropEvent*))); connect(m_urlNavigator, SIGNAL(activated()), this, SLOT(activate())); + connect(m_urlNavigator->editor(), SIGNAL(completionModeChanged(KGlobalSettings::Completion)), + this, SLOT(saveUrlCompletionMode(KGlobalSettings::Completion))); const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); m_urlNavigator->setUrlEditable(settings->editableUrl()); - m_urlNavigator->setHomeUrl(settings->homeUrl()); + m_urlNavigator->setShowFullPath(settings->showFullPath()); + m_urlNavigator->setHomeUrl(KUrl(settings->homeUrl())); + KUrlComboBox* editor = m_urlNavigator->editor(); + editor->setCompletionMode(KGlobalSettings::Completion(settings->urlCompletionMode())); m_dirLister = new DolphinDirLister(); m_dirLister->setAutoUpdate(true); - m_dirLister->setMainWindow(this); + m_dirLister->setMainWindow(window()); m_dirLister->setDelayedMimeTypes(true); m_dolphinModel = new DolphinModel(this); @@ -98,57 +107,71 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_proxyModel = new DolphinSortFilterProxyModel(this); m_proxyModel->setSourceModel(m_dolphinModel); + m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); + connect(m_dirLister, SIGNAL(started(KUrl)), + this, SLOT(initializeProgress())); connect(m_dirLister, SIGNAL(clear()), - this, SLOT(updateStatusBar())); + this, SLOT(delayedStatusBarUpdate())); connect(m_dirLister, SIGNAL(percent(int)), this, SLOT(updateProgress(int))); - connect(m_dirLister, SIGNAL(deleteItem(const KFileItem&)), - this, SLOT(updateStatusBar())); + connect(m_dirLister, SIGNAL(itemsDeleted(const KFileItemList&)), + this, SLOT(delayedStatusBarUpdate())); connect(m_dirLister, SIGNAL(completed()), this, SLOT(slotDirListerCompleted())); connect(m_dirLister, SIGNAL(infoMessage(const QString&)), this, SLOT(showInfoMessage(const QString&))); connect(m_dirLister, SIGNAL(errorMessage(const QString&)), this, SLOT(showErrorMessage(const QString&))); + connect(m_dirLister, SIGNAL(urlIsFileError(const KUrl&)), + this, SLOT(openFile(const KUrl&))); - m_view = new DolphinView(this, - url, - m_dirLister, - m_dolphinModel, - m_proxyModel); + m_view = new DolphinView(this, url, m_proxyModel); connect(m_view, SIGNAL(urlChanged(const KUrl&)), m_urlNavigator, SLOT(setUrl(const KUrl&))); - connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&)), - this, SLOT(openContextMenu(KFileItem, const KUrl&))); - connect(m_view, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)), - m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&))); - connect(m_view, SIGNAL(contentsMoved(int, int)), - this, SLOT(saveContentsPos(int, int))); connect(m_view, SIGNAL(requestItemInfo(KFileItem)), this, SLOT(showItemInfo(KFileItem))); connect(m_view, SIGNAL(errorMessage(const QString&)), this, SLOT(showErrorMessage(const QString&))); connect(m_view, SIGNAL(infoMessage(const QString&)), this, SLOT(showInfoMessage(const QString&))); + connect(m_view, SIGNAL(operationCompletedMessage(const QString&)), + this, SLOT(showOperationCompletedMessage(const QString&))); connect(m_view, SIGNAL(itemTriggered(KFileItem)), this, SLOT(slotItemTriggered(KFileItem))); - connect(m_view, SIGNAL(startedPathLoading(const KUrl&)), - this, SLOT(saveRootUrl(const KUrl&))); + connect(m_view, SIGNAL(redirection(KUrl, KUrl)), + this, SLOT(redirect(KUrl, KUrl))); + connect(m_view, SIGNAL(selectionChanged(const KFileItemList&)), + this, SLOT(delayedStatusBarUpdate())); connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(restoreView(const KUrl&))); + this, SLOT(slotUrlNavigatorLocationChanged(const KUrl&))); + connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(const KUrl&)), + this, SLOT(saveViewState())); + connect(m_urlNavigator, SIGNAL(historyChanged()), + this, SLOT(slotHistoryChanged())); + + // initialize status bar + m_statusBar = new DolphinStatusBar(this, m_view); + m_statusBarTimer = new QTimer(this); + m_statusBarTimer->setSingleShot(true); + m_statusBarTimer->setInterval(300); + connect(m_statusBarTimer, SIGNAL(timeout()), + this, SLOT(updateStatusBar())); - m_statusBar = new DolphinStatusBar(this, url); - connect(m_view, SIGNAL(urlChanged(const KUrl&)), - m_statusBar, SLOT(updateSpaceInfoContent(const KUrl&))); + KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self(); + connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)), + this, SLOT(delayedStatusBarUpdate())); + // initialize filter bar m_filterBar = new FilterBar(this); m_filterBar->setVisible(settings->filterBar()); connect(m_filterBar, SIGNAL(filterChanged(const QString&)), this, SLOT(setNameFilter(const QString&))); connect(m_filterBar, SIGNAL(closeRequest()), this, SLOT(closeFilterBar())); + connect(m_view, SIGNAL(urlChanged(const KUrl&)), + m_filterBar, SLOT(clear())); m_topLayout->addWidget(m_urlNavigator); m_topLayout->addWidget(m_view); @@ -158,24 +181,27 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, DolphinViewContainer::~DolphinViewContainer() { - delete m_dirLister; - m_dirLister = 0; -} + m_dirLister->disconnect(); -void DolphinViewContainer::setUrl(const KUrl& url) -{ - m_urlNavigator->setUrl(url); + delete m_proxyModel; + m_proxyModel = 0; + delete m_dolphinModel; + m_dolphinModel = 0; + m_dirLister = 0; // deleted by m_dolphinModel } -const KUrl& DolphinViewContainer::url() const +KUrl DolphinViewContainer::url() const { - return m_urlNavigator->url(); + return m_urlNavigator->locationUrl(); } void DolphinViewContainer::setActive(bool active) { m_urlNavigator->setActive(active); m_view->setActive(active); + if (active) { + emit writeStateChanged(m_isFolderWritable); + } } bool DolphinViewContainer::isActive() const @@ -184,129 +210,131 @@ bool DolphinViewContainer::isActive() const return m_view->isActive(); } -void DolphinViewContainer::renameSelectedItems() +void DolphinViewContainer::refresh() { - DolphinViewContainer* view = m_mainWindow->activeViewContainer(); - const KFileItemList items = m_view->selectedItems(); - if (items.count() > 1) { - // More than one item has been selected for renaming. Open - // a rename dialog and rename all items afterwards. - RenameDialog dialog(this, items); - if (dialog.exec() == QDialog::Rejected) { - return; - } + m_view->refresh(); + m_statusBar->refresh(); +} - const QString& newName = dialog.newName(); - if (newName.isEmpty()) { - view->statusBar()->setMessage(dialog.errorString(), - DolphinStatusBar::Error); - } else { - // TODO: check how this can be integrated into KonqFileUndoManager/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; - - KFileItemList::const_iterator it = items.begin(); - KFileItemList::const_iterator end = items.end(); - while (it != end) { - const KUrl& oldUrl = (*it).url(); - 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; - } - } - } else { - // Only one item has been selected for renaming. Use the custom - // renaming mechanism from the views. - Q_ASSERT(items.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(this, items); - if (dialog.exec() == QDialog::Rejected) { - return; - } +bool DolphinViewContainer::isFilterBarVisible() const +{ + return m_filterBar->isVisible(); +} - const QString& newName = dialog.newName(); - if (newName.isEmpty()) { - view->statusBar()->setMessage(dialog.errorString(), - DolphinStatusBar::Error); - } else { - const KUrl& oldUrl = items.first().url(); - KUrl newUrl = oldUrl; - newUrl.setFileName(newName); - m_mainWindow->rename(oldUrl, newUrl); +void DolphinViewContainer::setUrl(const KUrl& newUrl) +{ + if (newUrl != m_urlNavigator->locationUrl()) { + m_urlNavigator->setLocationUrl(newUrl); + // Temporary disable the 'File'->'Create New...' menu until + // the write permissions can be checked in a fast way at + // DolphinViewContainer::slotDirListerCompleted(). + m_isFolderWritable = false; + if (isActive()) { + emit writeStateChanged(false); } } } -bool DolphinViewContainer::isFilterBarVisible() const +void DolphinViewContainer::showFilterBar(bool show) { - return m_filterBar->isVisible(); + Q_ASSERT(m_filterBar != 0); + if (show) { + m_filterBar->show(); + } else { + closeFilterBar(); + } } -bool DolphinViewContainer::isUrlEditable() const +void DolphinViewContainer::delayedStatusBarUpdate() { - return m_urlNavigator->isUrlEditable(); + // Invoke updateStatusBar() with a small delay. This assures that + // when a lot of delayedStatusBarUpdates() are done in a short time, + // no bottleneck is given. + m_statusBarTimer->start(); } -KFileItem DolphinViewContainer::fileItem(const QModelIndex& index) const +void DolphinViewContainer::updateStatusBar() { - const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index); - return m_dolphinModel->itemForIndex(dolphinModelIndex); + // 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 = m_view->statusBarText(); + m_statusBar->setDefaultText(text); + + if (updateStatusBarMsg) { + m_statusBar->setMessage(text, DolphinStatusBar::Default); + } } -void DolphinViewContainer::updateProgress(int percent) +void DolphinViewContainer::initializeProgress() { - if (!m_showProgress) { - // 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()); - const QString loadingText(i18nc("@info:progress", "Loading folder...")); - m_showProgress = progressText.isEmpty() || (progressText == loadingText); - if (m_showProgress) { - m_statusBar->setProgressText(loadingText); - m_statusBar->setProgress(0); - } + if (url().protocol() == "nepomuksearch") { + // The Nepomuk IO-slave does not provide progress information right away. Give + // an immediate hint to the user that a searching is done: + m_statusBar->setProgressText(i18nc("@info", "Searching...")); + m_statusBar->setProgress(-1); } + } - if (m_showProgress) { - m_statusBar->setProgress(percent); +void DolphinViewContainer::updateProgress(int percent) +{ + if (m_statusBar->progressText().isEmpty()) { + m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder...")); } + m_statusBar->setProgress(percent); } void DolphinViewContainer::slotDirListerCompleted() { - if (m_showProgress) { + if (!m_statusBar->progressText().isEmpty()) { m_statusBar->setProgressText(QString()); m_statusBar->setProgress(100); - m_showProgress = false; } - updateStatusBar(); + if ((url().protocol() == "nepomuksearch") && (m_dirLister->items().count() == 0)) { + // The dir lister has been completed on a Nepomuk-URI and no items have been found. Instead + // of showing the default status bar information ("0 items") a more helpful information is given: + m_statusBar->setMessage(i18nc("@info:status", "No items found."), DolphinStatusBar::Information); + } else { + updateStatusBar(); + } - QTimer::singleShot(100, this, SLOT(restoreContentsPos())); + // Enable the 'File'->'Create New...' menu only if the directory + // supports writing. + KFileItem item = m_dirLister->rootItem(); + if (item.isNull()) { + // it is unclear whether writing is supported + m_isFolderWritable = true; + } else { + KFileItemListProperties capabilities(KFileItemList() << item); + m_isFolderWritable = capabilities.supportsWriting(); + } + + if (isActive()) { + emit writeStateChanged(m_isFolderWritable); + } } void DolphinViewContainer::showItemInfo(const KFileItem& item) { if (item.isNull()) { - m_statusBar->clear(); + // Only clear the status bar if unimportant messages are shown. + // This prevents that information- or error-messages get hidden + // by moving the mouse above the viewport or when closing the + // context menu. + if (m_statusBar->type() == DolphinStatusBar::Default) { + m_statusBar->clear(); + } } else { m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default); } @@ -322,162 +350,166 @@ void DolphinViewContainer::showErrorMessage(const QString& msg) m_statusBar->setMessage(msg, DolphinStatusBar::Error); } +void DolphinViewContainer::showOperationCompletedMessage(const QString& msg) +{ + m_statusBar->setMessage(msg, DolphinStatusBar::OperationCompleted); +} + void DolphinViewContainer::closeFilterBar() { m_filterBar->hide(); + m_filterBar->clear(); + m_view->setFocus(); emit showFilterBarChanged(false); } -QString DolphinViewContainer::defaultStatusBarText() const +void DolphinViewContainer::setNameFilter(const QString& nameFilter) { - int folderCount = 0; - int fileCount = 0; - m_view->calculateItemCount(fileCount, folderCount); - return KIO::itemsSummaryString(fileCount + folderCount, - fileCount, - folderCount, - 0, false); + m_view->setNameFilter(nameFilter); + delayedStatusBarUpdate(); } -QString DolphinViewContainer::selectionStatusBarText() const +void DolphinViewContainer::activate() { - QString text; - const KFileItemList list = m_view->selectedItems(); - if (list.isEmpty()) { - // when an item is triggered, it is temporary selected but selectedItems() - // will return an empty list - return QString(); - } - - 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) { - const KFileItem& item = *it; - if (item.isDir()) { - ++folderCount; - } else { - ++fileCount; - byteSize += item.size(); - } - ++it; - } - - if (folderCount > 0) { - text = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount); - if (fileCount > 0) { - text += ", "; - } - } - - if (fileCount > 0) { - const QString sizeText(KIO::convertSize(byteSize)); - text += i18ncp("@info:status", "1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText); - } - - return text; + setActive(true); } -void DolphinViewContainer::showFilterBar(bool show) +void DolphinViewContainer::saveViewState() { - Q_ASSERT(m_filterBar != 0); - m_filterBar->setVisible(show); + QByteArray locationState; + QDataStream stream(&locationState, QIODevice::WriteOnly); + m_view->saveState(stream); + m_urlNavigator->saveLocationState(locationState); } -void DolphinViewContainer::updateStatusBar() +void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url) { - // 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(m_view->hasSelection() ? selectionStatusBarText() : defaultStatusBarText()); - m_statusBar->setDefaultText(text); + if (KProtocolManager::supportsListing(url)) { + m_view->setUrl(url); + if (isActive()) { + // When an URL has been entered, the view should get the focus. + // The focus must be requested asynchronously, as changing the URL might create + // a new view widget. Using QTimer::singleShow() works reliable, however + // QMetaObject::invokeMethod() with a queued connection does not work, which might + // indicate that we should pass a hint to DolphinView::updateView() + // regarding the focus instead. To test: Enter an URL and press CTRL+Enter. + // Expected result: The view should get the focus. + QTimer::singleShot(0, this, SLOT(requestFocus())); + } + } else if (KProtocolManager::isSourceProtocol(url)) { + QString app = "konqueror"; + if (url.protocol().startsWith(QLatin1String("http"))) { + showErrorMessage(i18nc("@info:status", + "Dolphin does not support web pages, the web browser has been launched")); + const KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "General"); + const QString browser = config.readEntry("BrowserApplication"); + if (!browser.isEmpty()) { + app = browser; + if (app.startsWith('!')) { + // a literal command has been configured, remove the '!' prefix + app = app.mid(1); + } + } + } else { + showErrorMessage(i18nc("@info:status", + "Protocol not supported by Dolphin, Konqueror has been launched")); + } - if (updateStatusBarMsg) { - m_statusBar->setMessage(text, DolphinStatusBar::Default); + const QString secureUrl = KShell::quoteArg(url.pathOrUrl()); + const QString command = app + ' ' + secureUrl; + KRun::runCommand(command, app, app, this); + } else { + showErrorMessage(i18nc("@info:status", "Invalid protocol")); } } -void DolphinViewContainer::setNameFilter(const QString& nameFilter) +void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event) { - m_view->setNameFilter(nameFilter); - updateStatusBar(); + DragAndDropHelper::instance().dropUrls(KFileItem(), destination, event, this); } -void DolphinViewContainer::openContextMenu(const KFileItem& item, - const KUrl& url) +void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl) { - DolphinContextMenu contextMenu(m_mainWindow, item, url); - contextMenu.open(); -} + Q_UNUSED(oldUrl); + const bool block = m_urlNavigator->signalsBlocked(); + m_urlNavigator->blockSignals(true); -void DolphinViewContainer::saveContentsPos(int x, int y) -{ - m_urlNavigator->savePosition(x, y); -} + // Assure that the location state is reset for redirection URLs. This + // allows to skip redirection URLs when going back or forward in the + // URL history. + m_urlNavigator->saveLocationState(QByteArray()); + m_urlNavigator->setLocationUrl(newUrl); -void DolphinViewContainer::restoreContentsPos() -{ - if (!url().isEmpty()) { - const QPoint pos = m_urlNavigator->savedPosition(); - m_view->setContentsPosition(pos.x(), pos.y()); - } + m_urlNavigator->blockSignals(block); } -void DolphinViewContainer::activate() +void DolphinViewContainer::requestFocus() { - setActive(true); + m_view->setFocus(); } -void DolphinViewContainer::restoreView(const KUrl& url) +void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion completion) { - m_view->updateView(url, m_urlNavigator->savedRootUrl()); + DolphinSettings& settings = DolphinSettings::instance(); + settings.generalSettings()->setUrlCompletionMode(completion); + settings.save(); } -void DolphinViewContainer::saveRootUrl(const KUrl& url) +void DolphinViewContainer::slotHistoryChanged() { - Q_UNUSED(url); - m_urlNavigator->saveRootUrl(m_view->rootUrl()); + QByteArray locationState = m_urlNavigator->locationState(); + + if (!locationState.isEmpty()) { + QDataStream stream(&locationState, QIODevice::ReadOnly); + m_view->restoreState(stream); + } } void DolphinViewContainer::slotItemTriggered(const KFileItem& item) { - // Prefer the local path over the URL. - bool isLocal; - KUrl url = item.mostLocalUrl(isLocal); + KUrl url = item.targetUrl(); if (item.isDir()) { m_view->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"); + return; + } + + const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + const bool browseThroughArchives = settings->browseThroughArchives(); + if (browseThroughArchives && item.isFile() && url.isLocalFile()) { + // Generic mechanism for redirecting to tar:// when clicking on a tar file, + // zip:// when clicking on a zip file, etc. + // The .protocol file specifies the mimetype that the kioslave handles. + // Note that we don't use mimetype inheritance since we don't want to + // open OpenDocument files as zip folders... + const QString protocol = KProtocolManager::protocolForArchiveMimetype(item.mimetype()); + if (!protocol.isEmpty()) { + url.setProtocol(protocol); m_view->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"); + return; + } + } + + if (item.mimetype() == "application/x-desktop") { + // redirect to the url in Type=Link desktop files + KDesktopFile desktopFile(url.toLocalFile()); + if (desktopFile.hasLinkType()) { + url = desktopFile.readUrl(); m_view->setUrl(url); - } else { - item.run(); + return; } - } else { - item.run(); } + + item.run(); +} + +void DolphinViewContainer::openFile(const KUrl& url) +{ + // Using m_dolphinModel for getting the file item instance is not possible + // here: openFile() is triggered by an error of the directory lister + // job, so the file item must be received "manually". + const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + slotItemTriggered(item); } #include "dolphinviewcontainer.moc"