X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/df7c2385eca7184e349af7265f585ebdabe66ab2..aeaec1c2d18a13e0dd7f36acc93042dc0b6ee7c6:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index fefec95a1..a7e03deeb 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -22,7 +22,10 @@ #include "dolphinsortfilterproxymodel.h" #include "dolphinview.h" #include "dolphinmodel.h" +#include "dolphinnewmenuobserver.h" +#include "dolphinremoteencoding.h" +#include #include #include @@ -35,17 +38,21 @@ #include #include #include -#include #include +#include +#include +#include +#include +#include + +#include "settings/dolphinsettings.h" #include #include #include K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin();) -// The componentdata name must be dolphinpart so that dolphinpart.rc is found -// Alternatively we would have to install it as dolphin/dolphinpart.rc -K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart")) +K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin")) DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args) : KParts::ReadOnlyPart(parent) @@ -59,12 +66,14 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL m_dirLister = new KDirLister; m_dirLister->setAutoUpdate(true); - m_dirLister->setMainWindow(parentWidget->window()); + if (parentWidget) { + m_dirLister->setMainWindow(parentWidget->window()); + } m_dirLister->setDelayedMimeTypes(true); - //connect(m_dirLister, SIGNAL(started(KUrl)), this, SLOT(slotStarted())); connect(m_dirLister, SIGNAL(completed(KUrl)), this, SLOT(slotCompleted(KUrl))); connect(m_dirLister, SIGNAL(canceled(KUrl)), this, SLOT(slotCanceled(KUrl))); + connect(m_dirLister, SIGNAL(percent(int)), this, SLOT(updateProgress(int))); m_dolphinModel = new DolphinModel(this); m_dolphinModel->setDirLister(m_dirLister); @@ -72,41 +81,53 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL m_proxyModel = new DolphinSortFilterProxyModel(this); m_proxyModel->setSourceModel(m_dolphinModel); - m_view = new DolphinView(parentWidget, - KUrl(), - m_dirLister, - m_dolphinModel, - m_proxyModel); + m_view = new DolphinView(parentWidget, KUrl(), m_proxyModel); m_view->setTabsForFilesEnabled(true); setWidget(m_view); setXMLFile("dolphinpart.rc"); connect(m_view, SIGNAL(infoMessage(QString)), - this, SLOT(slotInfoMessage(QString))); + this, SLOT(slotMessage(QString))); + connect(m_view, SIGNAL(operationCompletedMessage(QString)), + this, SLOT(slotMessage(QString))); connect(m_view, SIGNAL(errorMessage(QString)), this, SLOT(slotErrorMessage(QString))); connect(m_view, SIGNAL(itemTriggered(KFileItem)), this, SLOT(slotItemTriggered(KFileItem))); connect(m_view, SIGNAL(tabRequested(KUrl)), this, SLOT(createNewWindow(KUrl))); - connect(m_view, SIGNAL(requestContextMenu(KFileItem,KUrl)), - this, SLOT(slotOpenContextMenu(KFileItem,KUrl))); + connect(m_view, SIGNAL(requestContextMenu(KFileItem,KUrl,QList)), + this, SLOT(slotOpenContextMenu(KFileItem,KUrl,QList))); connect(m_view, SIGNAL(selectionChanged(KFileItemList)), m_extension, SIGNAL(selectionInfo(KFileItemList))); connect(m_view, SIGNAL(selectionChanged(KFileItemList)), this, SLOT(slotSelectionChanged(KFileItemList))); connect(m_view, SIGNAL(requestItemInfo(KFileItem)), this, SLOT(slotRequestItemInfo(KFileItem))); - connect(m_view, SIGNAL(urlChanged(KUrl)), - this, SLOT(slotUrlChanged(KUrl))); connect(m_view, SIGNAL(requestUrlChange(KUrl)), this, SLOT(slotRequestUrlChange(KUrl))); connect(m_view, SIGNAL(modeChanged()), this, SIGNAL(viewModeChanged())); // relay signal + connect(m_view, SIGNAL(redirection(KUrl, KUrl)), + this, SLOT(slotRedirection(KUrl, KUrl))); + + // Watch for changes that should result in updates to the + // status bar text. + connect(m_dirLister, SIGNAL(itemsDeleted(const KFileItemList&)), + this, SLOT(updateStatusBar())); + connect(m_dirLister, SIGNAL(clear()), + this, SLOT(updateStatusBar())); + connect(m_view, SIGNAL(selectionChanged(const KFileItemList)), + this, SLOT(updateStatusBar())); m_actionHandler = new DolphinViewActionHandler(actionCollection(), this); m_actionHandler->setCurrentView(m_view); + connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory())); + + m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler); + connect(this, SIGNAL(aboutToOpenURL()), + m_remoteEncoding, SLOT(slotAboutToOpenUrl())); QClipboard* clipboard = QApplication::clipboard(); connect(clipboard, SIGNAL(dataChanged()), @@ -116,30 +137,33 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL m_actionHandler->updateViewActions(); slotSelectionChanged(KFileItemList()); // initially disable selection-dependent actions - // TODO sort_by_* actions - // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror // (sort of spacial navigation) loadPlugins(this, this, componentData()); + } DolphinPart::~DolphinPart() { + DolphinSettings::instance().save(); + DolphinNewMenuObserver::instance().detach(m_newMenu); delete m_dirLister; } void DolphinPart::createActions() { + // Edit menu + + m_newMenu = new KNewMenu(actionCollection(), widget(), "new_menu"); + DolphinNewMenuObserver::instance().attach(m_newMenu); + connect(m_newMenu->menu(), SIGNAL(aboutToShow()), + this, SLOT(updateNewMenu())); + 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 @@ -163,6 +187,16 @@ void DolphinPart::createActions() createGoAction("go_autostart", "", i18nc("@action:inmenu Go", "Autostart"), KGlobalSettings::autostartPath(), goActionGroup); + + // Tools menu + if (KAuthorized::authorizeKAction("shell_access")) { + KAction* action = actionCollection()->addAction("open_terminal"); + action->setIcon(KIcon("utilities-terminal")); + action->setText(i18nc("@action:inmenu Tools", "Open &Terminal")); + connect(action, SIGNAL(triggered()), SLOT(slotOpenTerminal())); + action->setShortcut(Qt::Key_F4); + } + } void DolphinPart::createGoAction(const char* name, const char* iconName, @@ -185,24 +219,38 @@ void DolphinPart::slotGoTriggered(QAction* action) void DolphinPart::slotSelectionChanged(const KFileItemList& selection) { const bool hasSelection = !selection.isEmpty(); + + QAction* renameAction = actionCollection()->action("rename"); + QAction* moveToTrashAction = actionCollection()->action("move_to_trash"); + QAction* deleteAction = actionCollection()->action("delete"); + QAction* editMimeTypeAction = actionCollection()->action("editMimeType"); + QAction* propertiesAction = actionCollection()->action("properties"); + QAction* deleteWithTrashShortcut = actionCollection()->action("delete_shortcut"); // see DolphinViewActionHandler + if (!hasSelection) { stateChanged("has_no_selection"); + + emit m_extension->enableAction("cut", false); + emit m_extension->enableAction("copy", false); + deleteWithTrashShortcut->setEnabled(false); + editMimeTypeAction->setEnabled(false); } else { stateChanged("has_selection"); - } - 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); - } + // TODO share this code with DolphinMainWindow::updateEditActions (and the desktop code) + // in libkonq + KFileItemListProperties capabilities(selection); + const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving(); + + renameAction->setEnabled(capabilities.supportsMoving()); + moveToTrashAction->setEnabled(enableMoveToTrash); + deleteAction->setEnabled(capabilities.supportsDeleting()); + deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash); + editMimeTypeAction->setEnabled(true); + propertiesAction->setEnabled(true); + emit m_extension->enableAction("cut", capabilities.supportsMoving()); + emit m_extension->enableAction("copy", true); } - - emit m_extension->enableAction("cut", hasSelection); - emit m_extension->enableAction("copy", hasSelection); } void DolphinPart::updatePasteAction() @@ -238,6 +286,7 @@ bool DolphinPart::openUrl(const KUrl& url) emit started(0); // get the wheel to spin m_dirLister->setNameFilter(m_nameFilter); m_view->setUrl(url); + updatePasteAction(); emit aboutToOpenURL(); if (reload) m_view->reload(); @@ -255,7 +304,7 @@ void DolphinPart::slotCanceled(const KUrl& url) slotCompleted(url); } -void DolphinPart::slotInfoMessage(const QString& msg) +void DolphinPart::slotMessage(const QString& msg) { emit setStatusBarText(msg); } @@ -268,6 +317,11 @@ void DolphinPart::slotErrorMessage(const QString& msg) void DolphinPart::slotRequestItemInfo(const KFileItem& item) { emit m_extension->mouseOverInfo(item); + if (item.isNull()) { + updateStatusBar(); + } else { + ReadOnlyPart::setStatusBarText(item.getStatusBarInfo()); + } } void DolphinPart::slotItemTriggered(const KFileItem& item) @@ -286,13 +340,12 @@ void DolphinPart::createNewWindow(const KUrl& url) { // TODO: Check issue N176832 for the missing QAIV signal; task 177399 - maybe this code // should be moved into DolphinPart::slotItemTriggered() - KFileItem item(S_IFDIR, (mode_t)-1, url); - KParts::OpenUrlArguments args; - args.setMimeType(item.mimetype()); - emit m_extension->createNewWindow(url, args); + emit m_extension->createNewWindow(url); } -void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&) +void DolphinPart::slotOpenContextMenu(const KFileItem& _item, + const KUrl&, + const QList& customActions) { KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems | KParts::BrowserExtension::ShowProperties @@ -305,36 +358,36 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&) item = m_dirLister->rootItem(); if (item.isNull()) item = KFileItem( S_IFDIR, (mode_t)-1, url() ); + else + item.setUrl(url()); // ensure we use the view url, not the canonical path (#213799) } + // TODO: We should change the signature of the slots (and signals) for being able + // to tell for which items we want a popup. + const KFileItemList items = (m_view->selectedItems().count() ? m_view->selectedItems() + : KFileItemList() << item); + KFileItemListProperties capabilities(items); + KParts::BrowserExtension::ActionGroupMap actionGroups; QList editActions; + editActions += customActions; + if (!_item.isNull()) { // only for context menu on one or more items - bool sDeleting = true; - bool sMoving = true; + bool supportsDeleting = capabilities.supportsDeleting(); + bool supportsMoving = capabilities.supportsMoving(); - // If the parent directory of the selected item is writable, moving - // and deleting are possible. - KFileItem parentDir = m_dirLister->rootItem(); - if (!parentDir.isWritable()) { + if (!supportsDeleting) { popupFlags |= KParts::BrowserExtension::NoDeletion; - sDeleting = false; - sMoving = false; } - - if ( sMoving ) + + if (supportsMoving) { editActions.append(actionCollection()->action("rename")); + } - bool addTrash = false; + bool addTrash = capabilities.isLocal() && supportsMoving; bool addDel = false; - - bool isIntoTrash = _item.url().protocol() == "trash"; - - if ( sMoving && !isIntoTrash ) - addTrash = true; - - if ( sDeleting ) { + if (supportsDeleting) { if ( !item.isLocalFile() ) addDel = true; else if (QApplication::keyboardModifiers() & Qt::ShiftModifier) { @@ -342,9 +395,9 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&) addDel = true; } else { - KConfigGroup configGroup( KGlobal::config(), "KDE" ); - if ( configGroup.readEntry( "ShowDeleteCommand", false) ) - addDel = true; + KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals); + KConfigGroup configGroup(globalConfig, "KDE"); + addDel = configGroup.readEntry("ShowDeleteCommand", false); } } @@ -352,13 +405,17 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&) editActions.append(actionCollection()->action("move_to_trash")); if (addDel) editActions.append(actionCollection()->action("delete")); - actionGroups.insert("editactions", editActions); + + // Normally KonqPopupMenu only shows the "Create new" submenu in the current view + // since otherwise the created file would not be visible. + // But in treeview mode we should allow it. + if (m_view->itemsExpandable()) + popupFlags |= KParts::BrowserExtension::ShowCreateDirectory; + } - // TODO: We should change the signature of the slots (and signals) for being able - // to tell for which items we want a popup. - KFileItemList items = (m_view->selectedItems().count() ? m_view->selectedItems() - : KFileItemList() << item); + actionGroups.insert("editactions", editActions); + emit m_extension->popupMenu(QCursor::pos(), items, KParts::OpenUrlArguments(), @@ -367,10 +424,14 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&) actionGroups); } -void DolphinPart::slotUrlChanged(const KUrl& url) +void DolphinPart::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) { - QString prettyUrl = url.pathOrUrl(); - emit m_extension->setLocationBarUrl(prettyUrl); + //kDebug() << oldUrl << newUrl << "currentUrl=" << url(); + if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash /* #207572 */)) { + KParts::ReadOnlyPart::setUrl(newUrl); + const QString prettyUrl = newUrl.pathOrUrl(); + emit m_extension->setLocationBarUrl(prettyUrl); + } } void DolphinPart::slotRequestUrlChange(const KUrl& url) @@ -385,6 +446,18 @@ void DolphinPart::slotRequestUrlChange(const KUrl& url) //// +void DolphinPartBrowserExtension::restoreState(QDataStream &stream) +{ + KParts::BrowserExtension::restoreState(stream); + m_part->view()->restoreState(stream); +} + +void DolphinPartBrowserExtension::saveState(QDataStream &stream) +{ + KParts::BrowserExtension::saveState(stream); + m_part->view()->saveState(stream); +} + void DolphinPartBrowserExtension::cut() { m_part->view()->cutSelectedItems(); @@ -400,6 +473,11 @@ void DolphinPartBrowserExtension::paste() m_part->view()->paste(); } +void DolphinPartBrowserExtension::pasteTo(const KUrl&) +{ + m_part->view()->pasteIntoFolder(); +} + void DolphinPartBrowserExtension::reparseConfiguration() { m_part->view()->refresh(); @@ -415,15 +493,6 @@ void DolphinPart::slotEditMimeType() } } -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); @@ -444,4 +513,48 @@ void DolphinPart::setNameFilter(const QString& nameFilter) // TODO save/restore name filter in saveState/restoreState like KonqDirPart did in kde3? } +void DolphinPart::slotOpenTerminal() +{ + QString dir(QDir::homePath()); + + KUrl u(url()); + + // If the given directory is not local, it can still be the URL of an + // ioslave using UDS_LOCAL_PATH which to be converted first. + u = KIO::NetAccess::mostLocalUrl(u, widget()); + + //If the URL is local after the above conversion, set the directory. + if (u.isLocalFile()) { + dir = u.toLocalFile(); + } + + KToolInvocation::invokeTerminal(QString(), dir); +} + +void DolphinPart::updateNewMenu() +{ + // As requested by KNewMenu : + m_newMenu->slotCheckUpToDate(); + m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles()); + // And set the files that the menu apply on : + m_newMenu->setPopupFiles(url()); +} + +void DolphinPart::updateStatusBar() +{ + emit ReadOnlyPart::setStatusBarText(m_view->statusBarText()); +} + +void DolphinPart::updateProgress(int percent) +{ + m_extension->loadingProgress(percent); +} + +void DolphinPart::createDirectory() +{ + m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles()); + m_newMenu->setPopupFiles(url()); + m_newMenu->createDirectory(); +} + #include "dolphinpart.moc"