X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/9c7ccd477a32ad52ff0126024ffbad0f6ea164b5..2a3035088bff8287fb92fd8dbd93aabe8aaa90d2:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 22f7940bd..2f52447ec 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -18,14 +18,18 @@ */ #include "dolphinpart.h" +#include +#include +#include #include "dolphinsortfilterproxymodel.h" #include "dolphinview.h" +#include "dolphinmodel.h" #include -#include #include #include #include +#include typedef KParts::GenericFactory DolphinPartFactory; K_EXPORT_COMPONENT_FACTORY(dolphinpart, DolphinPartFactory) @@ -53,30 +57,46 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi connect(m_dirLister, SIGNAL(completed(KUrl)), this, SLOT(slotCompleted(KUrl))); connect(m_dirLister, SIGNAL(canceled(KUrl)), this, SLOT(slotCanceled(KUrl))); - m_dirModel = new KDirModel(this); - m_dirModel->setDirLister(m_dirLister); + m_dolphinModel = new DolphinModel(this); + m_dolphinModel->setDirLister(m_dirLister); m_proxyModel = new DolphinSortFilterProxyModel(this); - m_proxyModel->setSourceModel(m_dirModel); + m_proxyModel->setSourceModel(m_dolphinModel); m_view = new DolphinView(parentWidget, KUrl(), m_dirLister, - m_dirModel, + m_dolphinModel, m_proxyModel); setWidget(m_view); + setXMLFile("dolphinpart.rc"); + 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))); + connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&)), + this, SLOT(slotOpenContextMenu(KFileItem, const KUrl&))); + connect(m_view, SIGNAL(selectionChanged(KFileItemList)), + m_extension, SIGNAL(selectionInfo(KFileItemList))); + connect(m_view, SIGNAL(requestItemInfo(KFileItem)), + this, SLOT(slotRequestItemInfo(KFileItem))); + connect(m_view, SIGNAL(urlChanged(const KUrl&)), + this, SLOT(slotUrlChanged(const KUrl&))); + + createActions(); + updateViewActions(); - connect(m_view, SIGNAL(requestItemInfo(KFileItem)), this, SLOT(slotRequestItemInfo(KFileItem))); + // TODO provide these actions in the menu, merged with the existing view-mode-actions somehow + // [Q_PROPERTY introspection?] + + // TODO sort_by_* actions + // TODO show_*_info actions + + // TODO connect to urlsDropped // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror // (sort of spacial navigation) @@ -86,6 +106,8 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi // TODO updating the paste action // if (paste) emit m_extension->setActionText( "paste", actionText ); // emit m_extension->enableAction( "paste", paste ); + + // TODO updating the trash and del actions too - or removing special handling of those from konq? } DolphinPart::~DolphinPart() @@ -93,6 +115,24 @@ DolphinPart::~DolphinPart() delete m_dirLister; } +void DolphinPart::createActions() +{ + QActionGroup* viewModeActions = new QActionGroup(this); + viewModeActions->addAction(DolphinView::iconsModeAction(actionCollection())); + viewModeActions->addAction(DolphinView::detailsModeAction(actionCollection())); + viewModeActions->addAction(DolphinView::columnsModeAction(actionCollection())); + connect(viewModeActions, SIGNAL(triggered(QAction*)), this, SLOT(slotViewModeActionTriggered(QAction*))); +} + +void DolphinPart::updateViewActions() +{ + QAction* action = actionCollection()->action(m_view->currentViewModeActionName()); + if (action != 0) { + KToggleAction* toggleAction = static_cast(action); + toggleAction->setChecked(true); + } +} + KAboutData* DolphinPart::createAboutData() { return new KAboutData("dolphinpart", 0, ki18nc("@title", "Dolphin Part"), "0.1"); @@ -100,11 +140,16 @@ KAboutData* DolphinPart::createAboutData() bool DolphinPart::openUrl(const KUrl& url) { + const bool reload = arguments().reload(); + if (m_view->url() == url && !reload) { // DolphinView won't do anything in that case, so don't emit started + return true; + } + setUrl(url); // remember it at the KParts level const QString prettyUrl = url.pathOrUrl(); - setWindowCaption(prettyUrl); - m_extension->setLocationBarUrl(prettyUrl); + emit setWindowCaption(prettyUrl); + emit m_extension->setLocationBarUrl(prettyUrl); m_view->setUrl(url); - if (arguments().reload()) + if (reload) m_view->reload(); emit started(0); // get the wheel to spin return true; @@ -133,12 +178,64 @@ void DolphinPart::slotErrorMessage(const QString& msg) void DolphinPart::slotRequestItemInfo(const KFileItem& item) { - emit m_extension->mouseOverInfo(&item); + emit m_extension->mouseOverInfo(item); } void DolphinPart::slotItemTriggered(const KFileItem& item) { - emit m_extension->openUrlRequest(item.url()); + qDebug() << QApplication::mouseButtons(); + if (QApplication::mouseButtons() & Qt::MidButton) { + qDebug() << "MMB!!" << item.mimetype(); + if (item.mimeTypePtr()->is("inode/directory")) { + KParts::OpenUrlArguments args; + args.setMimeType( item.mimetype() ); + emit m_extension->createNewWindow( item.url(), args ); + } else { + qDebug() << "run()"; + item.run(); + } + } else { + // Left button. [Right button goes to slotOpenContextMenu before triggered can be emitted] + qDebug() << "LMB"; + emit m_extension->openUrlRequest(item.url()); + } +} + +void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&) +{ + KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems + | KParts::BrowserExtension::ShowProperties + | KParts::BrowserExtension::ShowUrlOperations; + // TODO KonqKfmIconView had if ( !rootItem->isWritable() ) + // popupFlags |= KParts::BrowserExtension::NoDeletion; + + KFileItem item(_item); + + if (item.isNull()) { // viewport context menu + popupFlags |= KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp; + // TODO get m_dirLister->rootItem if possible. or via kdirmodel? + // and use this as fallback: + item = KFileItem( S_IFDIR, (mode_t)-1, url() ); + } + + KFileItemList items; items.append(item); + emit m_extension->popupMenu( QCursor::pos(), items, KParts::OpenUrlArguments(), KParts::BrowserArguments(), popupFlags ); +} + +void DolphinPart::slotViewModeActionTriggered(QAction* action) +{ + const DolphinView::Mode mode = action->data().value(); + m_view->setMode(mode); +} + +void DolphinPart::slotUrlChanged(const KUrl& url) +{ + if (m_view->url() != url) { + // If the view URL is not equal to 'url', then an inner URL change has + // been done (e. g. by activating an existing column in the column view). + // From the hosts point of view this must be handled like changing the URL. + emit m_extension->openUrlRequest(url); + } } #include "dolphinpart.moc"