From 9c7ccd477a32ad52ff0126024ffbad0f6ea164b5 Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 28 Aug 2007 17:50:54 +0000 Subject: [PATCH] Clicking on items in dolphin part finally implemented. Fixed connect() error in dolphinstatusbar [unrelated]. svn path=/trunk/KDE/kdebase/apps/; revision=705835 --- src/dolphincontroller.h | 1 + src/dolphindetailsview.cpp | 19 +++++++++++++++++-- src/dolphindetailsview.h | 5 +++++ src/dolphinpart.cpp | 16 +++++++++++----- src/dolphinpart.h | 1 + src/dolphinstatusbar.cpp | 3 --- src/dolphinview.cpp | 36 +++--------------------------------- src/dolphinview.h | 5 +++++ src/dolphinviewcontainer.cpp | 33 +++++++++++++++++++++++++++++++++ src/dolphinviewcontainer.h | 5 +++++ 10 files changed, 81 insertions(+), 43 deletions(-) diff --git a/src/dolphincontroller.h b/src/dolphincontroller.h index 356daead5..d91e7f5c1 100644 --- a/src/dolphincontroller.h +++ b/src/dolphincontroller.h @@ -162,6 +162,7 @@ signals: * Is emitted if the item with the index \a index should be triggered. * Usually triggering on a directory opens the directory, triggering * on a file opens the corresponding application. + * Emitted with an invalid \a index when clicking on the viewport itself. */ void itemTriggered(const QModelIndex& index); diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index ef3146c20..1aec30cca 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -71,10 +71,10 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr if (KGlobalSettings::singleClick()) { connect(this, SIGNAL(clicked(const QModelIndex&)), - controller, SLOT(triggerItem(const QModelIndex&))); + this, SLOT(slotItemActivated(const QModelIndex&))); } else { connect(this, SIGNAL(doubleClicked(const QModelIndex&)), - controller, SLOT(triggerItem(const QModelIndex&))); + this, SLOT(slotItemActivated(const QModelIndex&))); } connect(this, SIGNAL(entered(const QModelIndex&)), this, SLOT(slotEntered(const QModelIndex&))); @@ -391,4 +391,19 @@ QRect DolphinDetailsView::elasticBandRect() const return QRect(topLeft, m_elasticBandDestination).normalized(); } +static bool isValidNameIndex(const QModelIndex& index) +{ + return index.isValid() && (index.column() == KDirModel::Name); +} + +void DolphinDetailsView::slotItemActivated(const QModelIndex& index) +{ + if (!isValidNameIndex(index)) { + clearSelection(); + m_controller->emitItemEntered(index); + } else { + m_controller->triggerItem(index); + } +} + #include "dolphindetailsview.moc" diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h index b3944b4a1..fdd93b03c 100644 --- a/src/dolphindetailsview.h +++ b/src/dolphindetailsview.h @@ -103,6 +103,11 @@ private slots: void zoomIn(); void zoomOut(); + /** + * Called by QTreeView when an item is activated (clicked or double-clicked) + */ + void slotItemActivated(const QModelIndex& index); + private: bool isZoomInPossible() const; bool isZoomOutPossible() const; diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 2a88fe6b8..22f7940bd 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -66,8 +66,12 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi m_proxyModel); setWidget(m_view); - connect(m_view, SIGNAL(infoMessage(QString)), this, SLOT(slotInfoMessage(QString))); - connect(m_view, SIGNAL(errorMessage(QString)), this, SLOT(slotErrorMessage(QString))); + connect(m_view, SIGNAL(infoMessage(QString)), + this, SLOT(slotInfoMessage(QString))); + connect(m_view, SIGNAL(errorMessage(QString)), + this, SLOT(slotErrorMessage(QString))); + connect(m_view, SIGNAL(itemTriggered(KFileItem)), + this, SLOT(slotItemTriggered(KFileItem))); // TODO connect to urlsDropped // TOOD connect to requestContextMenu connect(m_view, SIGNAL(selectionChanged(QList)), m_extension, SIGNAL(selectionInfo(QList))); @@ -77,9 +81,6 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror // (sort of spacial navigation) - // TODO when clicking on a file we want to emit m_extension->openUrlRequest(url, args) - // to be able to embed the viewer - // TODO MMB-click should do something like KonqDirPart::mmbClicked // TODO updating the paste action @@ -135,4 +136,9 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item) emit m_extension->mouseOverInfo(&item); } +void DolphinPart::slotItemTriggered(const KFileItem& item) +{ + emit m_extension->openUrlRequest(item.url()); +} + #include "dolphinpart.moc" diff --git a/src/dolphinpart.h b/src/dolphinpart.h index d6d126cc7..a9806d595 100644 --- a/src/dolphinpart.h +++ b/src/dolphinpart.h @@ -52,6 +52,7 @@ private Q_SLOTS: void slotInfoMessage(const QString& msg); void slotErrorMessage(const QString& msg); void slotRequestItemInfo(const KFileItem& item); + void slotItemTriggered(const KFileItem& item); private: DolphinView* m_view; diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp index edf242e66..b2c621dbd 100644 --- a/src/dolphinstatusbar.cpp +++ b/src/dolphinstatusbar.cpp @@ -58,9 +58,6 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, const KUrl& url) : setMinimumHeight(barHeight); m_messageLabel->setMinimumTextHeight(barHeight); m_spaceInfo->setFixedHeight(barHeight); - - connect(parent, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(updateSpaceInfoContent(const KUrl&))); } 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) diff --git a/src/dolphinview.h b/src/dolphinview.h index cd6bd977a..aae342574 100644 --- a/src/dolphinview.h +++ b/src/dolphinview.h @@ -318,6 +318,11 @@ signals: /** Is emitted if URL of the view has been changed to \a url. */ void urlChanged(const KUrl& url); + /** + * Is emitted when clicking on an item + */ + void itemTriggered(const KFileItem& item); + /** * Is emitted if the view mode (IconsView, DetailsView, * PreviewsView) has been changed. diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index dad35463e..514e9e7b3 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -139,11 +139,15 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, this, SLOT(showErrorMessage(const QString&))); connect(m_view, SIGNAL(infoMessage(const QString&)), this, SLOT(showInfoMessage(const QString&))); + connect(m_view, SIGNAL(itemTriggered(KFileItem)), + this, SLOT(slotItemTriggered(KFileItem))); connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), m_view, SLOT(setUrl(const KUrl&))); m_statusBar = new DolphinStatusBar(this, url); + connect(m_view, SIGNAL(urlChanged(const KUrl&)), + m_statusBar, SLOT(updateSpaceInfoContent(const KUrl&))); m_filterBar = new FilterBar(this); m_filterBar->setVisible(settings->filterBar()); @@ -475,4 +479,33 @@ void DolphinViewContainer::activate() setActive(true); } +void DolphinViewContainer::slotItemTriggered(const KFileItem& item) +{ + // Prefer the local path over the URL. + bool isLocal; + KUrl url = item.mostLocalUrl(isLocal); + + 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"); + 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"); + m_view->setUrl(url); + } else { + item.run(); + } + } else { + item.run(); + } +} + #include "dolphinviewcontainer.moc" diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index 95be9134c..2e4993316 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -151,6 +151,11 @@ private slots: */ void updateItemCount(); + /** + * Handles clicking on an item + */ + void slotItemTriggered(const KFileItem& item); + /** * Shows the information for the item \a item inside the statusbar. If the * item is null, the default statusbar information is shown. -- 2.47.3