X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/9442ea96f5e96be9f3a4895c243579d46d2152c5..9c7ccd477a32ad52ff0126024ffbad0f6ea164b5:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 207b236ee..073ab5589 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -450,11 +450,7 @@ void DolphinView::activate() void DolphinView::triggerItem(const QModelIndex& index) { - if (!isValidNameIndex(index)) { - clearSelection(); - showHoverInformation(index); - return; - } + Q_ASSERT(index.isValid()); const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) { @@ -463,38 +459,12 @@ void DolphinView::triggerItem(const QModelIndex& index) return; } - KFileItem item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index)); + const KFileItem item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index)); if (item.isNull()) { return; } - // The stuff below should be moved to ViewContainer and be just a signal? - - // Prefer the local path over the URL. - bool isLocal; - KUrl url = item.mostLocalUrl(isLocal); - - if (item.isDir()) { - setUrl(url); - } else if (item.isFile()) { - // allow to browse through ZIP and tar files - KMimeType::Ptr mime = item.mimeTypePtr(); - if (mime->is("application/zip")) { - url.setProtocol("zip"); - setUrl(url); - } else if (mime->is("application/x-tar") || - mime->is("application/x-tarz") || - mime->is("application/x-bzip-compressed-tar") || - mime->is("application/x-compressed-tar") || - mime->is("application/x-tzo")) { - url.setProtocol("tar"); - setUrl(url); - } else { - item.run(); - } - } else { - item.run(); - } + emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart } void DolphinView::generatePreviews(const QList& items)