X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f8302197daca5667aa3d4963528ce09e344eb27f..e6dcf5e8ffd8c4fe9a011aba92783d6ad1a7a63c:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index a0871ce06..f144109cb 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -18,15 +18,21 @@ */ #include "dolphinpart.h" +#include +#include #include "dolphinsortfilterproxymodel.h" #include "dolphinview.h" #include "dolphinmodel.h" +#include + #include #include +#include #include #include #include +#include #include #include @@ -42,6 +48,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,6 +93,10 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi this, SLOT(slotUrlChanged(KUrl))); connect(m_view, SIGNAL(modeChanged()), this, SLOT(updateViewActions())); + connect(m_view, SIGNAL(sortOrderChanged(Qt::SortOrder)), + this, SLOT(slotSortOrderChanged(Qt::SortOrder))); + connect(m_view, SIGNAL(additionalInfoChanged()), + this, SLOT(slotAdditionalInfoChanged())); QClipboard* clipboard = QApplication::clipboard(); connect(clipboard, SIGNAL(dataChanged()), @@ -91,21 +104,16 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi createActions(); updateViewActions(); + slotSelectionChanged(KFileItemList()); // initially disable selection-dependent actions - // TODO provide these actions in the menu, merged with the existing view-mode-actions somehow + // 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 - - // TODO updating the trash and del actions too - or removing special handling of those from konq? } DolphinPart::~DolphinPart() @@ -121,28 +129,97 @@ void DolphinPart::createActions() viewModeActions->addAction(DolphinView::columnsModeAction(actionCollection())); connect(viewModeActions, SIGNAL(triggered(QAction*)), this, SLOT(slotViewModeActionTriggered(QAction*))); - KAction* renameAction = new KAction(i18nc("@action:inmenu", "Rename..."), this); + KAction* renameAction = DolphinView::createRenameAction(actionCollection()); connect(renameAction, SIGNAL(triggered()), m_view, SLOT(renameSelectedItems())); - renameAction->setEnabled(false); - renameAction->setShortcut(Qt::Key_F2); - actionCollection()->addAction("rename", renameAction); + + KAction* moveToTrashAction = DolphinView::createMoveToTrashAction(actionCollection()); + connect(moveToTrashAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), + this, SLOT(slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers))); + + KAction* deleteAction = DolphinView::createDeleteAction(actionCollection()); + connect(deleteAction, SIGNAL(triggered()), m_view, SLOT(deleteSelectedItems())); + + 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 + + // TODO sort_by_* + + KAction* sortDescending = DolphinView::createSortDescendingAction(actionCollection()); + connect(sortDescending, SIGNAL(triggered()), m_view, SLOT(toggleSortOrder())); + + QActionGroup* showInformationActionGroup = DolphinView::createAdditionalInformationActionGroup(actionCollection()); + connect(showInformationActionGroup, SIGNAL(triggered(QAction*)), m_view, SLOT(toggleAdditionalInfo(QAction*))); + + // Go menu + + KAction* newDirAction = DolphinView::createNewDirAction(actionCollection()); + connect(newDirAction, SIGNAL(triggered()), SLOT(createDir())); + + 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); +} + +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); +} + +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"); } else { stateChanged("has_selection"); + } - QAction* renameAction = actionCollection()->action("rename"); - Q_ASSERT(renameAction); - if (renameAction) { - renameAction->setEnabled(true); + QStringList actions; + actions << "rename" << "move_to_trash" << "delete" << "editMimeType" << "properties"; + foreach(const QString& actionName, actions) { + QAction* action = actionCollection()->action(actionName); + Q_ASSERT(action); + if (action) { + action->setEnabled(hasSelection); } } + emit m_extension->enableAction("cut", hasSelection); emit m_extension->enableAction("copy", hasSelection); } @@ -165,7 +242,7 @@ void DolphinPart::updateViewActions() 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) @@ -178,10 +255,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; } @@ -213,21 +290,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); } } @@ -250,16 +336,45 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&) KParts::BrowserExtension::ActionGroupMap actionGroups; QList editActions; - editActions.append(actionCollection()->action("rename")); - actionGroups.insert("editactions", editActions); - - KFileItemList items; items.append(item); - emit m_extension->popupMenu(QCursor::pos(), - items, - KParts::OpenUrlArguments(), - KParts::BrowserArguments(), - popupFlags, - actionGroups); + + if (!item.isNull()) { // only for context menu on one or more items + // TODO if ( sMoving ) + editActions.append(actionCollection()->action("rename")); + + bool addTrash = false; + bool addDel = false; + + // TODO if ( sMoving && !isIntoTrash && !isTrashLink ) + addTrash = true; + + /* TODO if ( sDeleting ) */ { + if ( !item.isLocalFile() ) + addDel = true; + else if (QApplication::keyboardModifiers() & Qt::ShiftModifier) { + addTrash = false; + addDel = true; + } + else { + KConfigGroup configGroup( KGlobal::config(), "KDE" ); + if ( configGroup.readEntry( "ShowDeleteCommand", false) ) + addDel = true; + } + } + + if (addTrash) + editActions.append(actionCollection()->action("move_to_trash")); + if (addDel) + editActions.append(actionCollection()->action("delete")); + actionGroups.insert("editactions", editActions); + + KFileItemList items; items.append(item); + emit m_extension->popupMenu(QCursor::pos(), + items, + KParts::OpenUrlArguments(), + KParts::BrowserArguments(), + popupFlags, + actionGroups); + } } void DolphinPart::slotViewModeActionTriggered(QAction* action) @@ -273,8 +388,8 @@ 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(); } } @@ -295,4 +410,51 @@ void DolphinPartBrowserExtension::paste() m_part->view()->paste(); } +//// + +void DolphinPart::slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers modifiers) +{ + // 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(); +} + +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::createDir() +{ + KonqOperations::newDir(m_view, url()); +} + +void DolphinPart::slotSortOrderChanged(Qt::SortOrder order) +{ + KToggleAction* descending = static_cast(actionCollection()->action("descending")); + const bool sortDescending = (order == Qt::DescendingOrder); + descending->setChecked(sortDescending); +} + +void DolphinPart::slotAdditionalInfoChanged() +{ + m_view->updateAdditionalInfoActions(actionCollection()); +} + #include "dolphinpart.moc"