X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/afe7ee85836e824744dcab8b43f3999f1d6fa178..a8a050952df82d8f9cc1191f410fca7c6a219da3:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index df967fe72..16caae9d6 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -18,12 +18,18 @@ */ #include "dolphinpart.h" +#include "dolphinviewactionhandler.h" #include "dolphinsortfilterproxymodel.h" #include "dolphinview.h" #include "dolphinmodel.h" +#include + +#include +#include #include #include +#include #include #include #include @@ -43,6 +49,9 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi setComponentData( DolphinPartFactory::componentData() ); m_extension = new DolphinPartBrowserExtension(this); + // make sure that other apps using this part find Dolphin's view-file-columns icons + KIconLoader::global()->addAppDir("dolphin"); + m_dirLister = new KDirLister; m_dirLister->setAutoUpdate(true); m_dirLister->setMainWindow(parentWidget->topLevelWidget()); @@ -84,28 +93,23 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi connect(m_view, SIGNAL(urlChanged(KUrl)), this, SLOT(slotUrlChanged(KUrl))); connect(m_view, SIGNAL(modeChanged()), - this, SLOT(updateViewActions())); + this, SIGNAL(viewModeChanged())); // relay signal + + m_actionHandler = new DolphinViewActionHandler(actionCollection(), this); + m_actionHandler->setCurrentView(m_view); QClipboard* clipboard = QApplication::clipboard(); connect(clipboard, SIGNAL(dataChanged()), this, SLOT(updatePasteAction())); createActions(); - updateViewActions(); + m_actionHandler->updateViewActions(); slotSelectionChanged(KFileItemList()); // initially disable selection-dependent actions - // TODO provide the viewmode 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) - - // TODO MMB-click should do something like KonqDirPart::mmbClicked } DolphinPart::~DolphinPart() @@ -115,26 +119,59 @@ DolphinPart::~DolphinPart() 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*))); - - KAction* renameAction = DolphinView::createRenameAction(actionCollection()); - connect(renameAction, SIGNAL(triggered()), m_view, SLOT(renameSelectedItems())); + KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" ); + editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) ); + connect(editMimeTypeAction, SIGNAL(triggered()), SLOT(slotEditMimeType())); + + KAction *propertiesAction = actionCollection()->addAction( "properties" ); + propertiesAction->setText( i18nc("@action:inmenu Edit", "Properties") ); + propertiesAction->setShortcut(Qt::ALT+Qt::Key_Return); + connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties())); + + // View menu: all done by DolphinViewActionHandler + + // Go menu + + QActionGroup* goActionGroup = new QActionGroup(this); + connect(goActionGroup, SIGNAL(triggered(QAction*)), + this, SLOT(slotGoTriggered(QAction*))); + + createGoAction("go_applications", "start-here-kde", + i18nc("@action:inmenu Go", "App&lications"), QString("programs:/"), + goActionGroup); + createGoAction("go_network_folders", "folder-remote", + i18nc("@action:inmenu Go", "&Network Folders"), QString("remote:/"), + goActionGroup); + createGoAction("go_settings", "preferences-system", + i18nc("@action:inmenu Go", "Sett&ings"), QString("settings:/"), + goActionGroup); + createGoAction("go_trash", "user-trash", + i18nc("@action:inmenu Go", "Trash"), QString("trash:/"), + goActionGroup); + createGoAction("go_autostart", "", + i18nc("@action:inmenu Go", "Autostart"), KGlobalSettings::autostartPath(), + goActionGroup); +} - KAction* moveToTrashAction = DolphinView::createMoveToTrashAction(actionCollection()); - connect(moveToTrashAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), - this, SLOT(slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers))); +void DolphinPart::createGoAction(const char* name, const char* iconName, + const QString& text, const QString& url, + QActionGroup* actionGroup) +{ + KAction* action = actionCollection()->addAction(name); + action->setIcon(KIcon(iconName)); + action->setText(text); + action->setData(url); + action->setActionGroup(actionGroup); +} - KAction* deleteAction = DolphinView::createDeleteAction(actionCollection()); - connect(deleteAction, SIGNAL(triggered()), m_view, SLOT(deleteSelectedItems())); +void DolphinPart::slotGoTriggered(QAction* action) +{ + const QString url = action->data().toString(); + emit m_extension->openUrlRequest(KUrl(url)); } void DolphinPart::slotSelectionChanged(const KFileItemList& selection) { - // Yes, DolphinMainWindow has very similar code :/ const bool hasSelection = !selection.isEmpty(); if (!hasSelection) { stateChanged("has_no_selection"); @@ -143,7 +180,7 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection) } QStringList actions; - actions << "rename" << "move_to_trash" << "delete"; + actions << "rename" << "move_to_trash" << "delete" << "editMimeType" << "properties"; foreach(const QString& actionName, actions) { QAction* action = actionCollection()->action(actionName); Q_ASSERT(action); @@ -163,18 +200,9 @@ void DolphinPart::updatePasteAction() emit m_extension->setActionText( "paste", pasteInfo.second ); } -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"); + return new KAboutData("dolphinpart", "dolphin", ki18nc("@title", "Dolphin Part"), "0.1"); } bool DolphinPart::openUrl(const KUrl& url) @@ -187,10 +215,10 @@ bool DolphinPart::openUrl(const KUrl& url) const QString prettyUrl = url.pathOrUrl(); emit setWindowCaption(prettyUrl); emit m_extension->setLocationBarUrl(prettyUrl); + emit started(0); // get the wheel to spin m_view->setUrl(url); if (reload) m_view->reload(); - emit started(0); // get the wheel to spin return true; } @@ -222,21 +250,30 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item) void DolphinPart::slotItemTriggered(const KFileItem& item) { - qDebug() << QApplication::mouseButtons(); + KParts::OpenUrlArguments args; + args.setMimeType(item.mimetype()); + + // Ideally, konqueror should be changed to not require trustedSource for directory views, + // since the idea was not to need BrowserArguments for non-browser stuff... + KParts::BrowserArguments browserArgs; + browserArgs.trustedSource = true; + + // MMB click support. + // TODO: this doesn't work, mouseButtons() is always 0. + // Issue N176832 for the missing QAIV signal; task 177399 + kDebug() << QApplication::mouseButtons(); if (QApplication::mouseButtons() & Qt::MidButton) { - qDebug() << "MMB!!" << item.mimetype(); + kDebug() << "MMB!!" << item.mimetype(); if (item.mimeTypePtr()->is("inode/directory")) { - KParts::OpenUrlArguments args; - args.setMimeType( item.mimetype() ); - emit m_extension->createNewWindow( item.url(), args ); + emit m_extension->createNewWindow(item.url(), args); } else { - qDebug() << "run()"; + kDebug() << "run()"; item.run(); } } else { // Left button. [Right button goes to slotOpenContextMenu before triggered can be emitted] - qDebug() << "LMB"; - emit m_extension->openUrlRequest(item.url()); + kDebug() << "LMB"; + emit m_extension->openUrlRequest(item.url(), args, browserArgs); } } @@ -300,19 +337,13 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&) } } -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); + openUrl(url); + emit m_extension->openUrlNotify(); } } @@ -335,15 +366,33 @@ void DolphinPartBrowserExtension::paste() //// -void DolphinPart::slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers modifiers) +void DolphinPart::slotEditMimeType() +{ + const KFileItemList items = m_view->selectedItems(); + if (!items.isEmpty()) { + KonqOperations::editMimeType(items.first().mimetype(), m_view); + } +} + +void DolphinPart::slotProperties() +{ + const KFileItemList items = m_view->selectedItems(); + if (!items.isEmpty()) { + KPropertiesDialog dialog(items.first().url(), m_view); + dialog.exec(); + } +} + +void DolphinPart::setCurrentViewMode(const QString& viewModeName) +{ + QAction* action = actionCollection()->action(viewModeName); + Q_ASSERT(action); + action->trigger(); +} + +QString DolphinPart::currentViewMode() const { - // Note: kde3's konq_mainwindow.cpp used to check - // reason == KAction::PopupMenuActivation && ... - // but this isn't supported anymore - if (modifiers & Qt::ShiftModifier) - m_view->deleteSelectedItems(); - else - m_view->trashSelectedItems(); + return m_actionHandler->currentViewModeActionName(); } #include "dolphinpart.moc"