X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a5cf21ff06aff44cde563eaceae3c6cef452ee48..18a976c435e85fa2556b1a1abb6de41392003d7d:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index a8254552e..908173193 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -18,45 +18,55 @@ */ #include "dolphinpart.h" +#include "dolphinremoveaction.h" -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include +#include -#include "settings/dolphinsettings.h" +#if KDE_IS_VERSION(4, 9, 2) +#include "dolphinpart_ext.h" +#endif + +#include "dolphinnewfilemenu.h" #include "views/dolphinview.h" #include "views/dolphinviewactionhandler.h" -#include "views/dolphinsortfilterproxymodel.h" -#include "views/dolphinmodel.h" -#include "views/dolphinnewmenuobserver.h" +#include "views/dolphinnewfilemenuobserver.h" #include "views/dolphinremoteencoding.h" +#include "kitemviews/kfileitemmodel.h" +#include "kitemviews/private/kfileitemmodeldirlister.h" #include #include #include +#include +#include K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin();) K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin")) DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args) : KParts::ReadOnlyPart(parent) + ,m_openTerminalAction(0) + ,m_removeAction(0) { Q_UNUSED(args) setComponentData(DolphinPartFactory::componentData(), false); @@ -65,27 +75,17 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL // 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); - if (parentWidget) { - m_dirLister->setMainWindow(parentWidget->window()); - } - m_dirLister->setDelayedMimeTypes(true); - - 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); - - m_proxyModel = new DolphinSortFilterProxyModel(this); - m_proxyModel->setSourceModel(m_dolphinModel); - - m_view = new DolphinView(parentWidget, KUrl(), m_proxyModel); + m_view = new DolphinView(KUrl(), parentWidget); m_view->setTabsForFilesEnabled(true); setWidget(m_view); + connect(&DolphinNewFileMenuObserver::instance(), SIGNAL(errorMessage(QString)), + this, SLOT(slotErrorMessage(QString))); + + connect(m_view, SIGNAL(directoryLoadingCompleted()), this, SIGNAL(completed())); + connect(m_view, SIGNAL(directoryLoadingProgress(int)), this, SLOT(updateProgress(int))); + connect(m_view, SIGNAL(errorMessage(QString)), this, SLOT(slotErrorMessage(QString))); + setXMLFile("dolphinpart.rc"); connect(m_view, SIGNAL(infoMessage(QString)), @@ -94,31 +94,29 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL 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(itemActivated(KFileItem)), + this, SLOT(slotItemActivated(KFileItem))); + connect(m_view, SIGNAL(itemsActivated(KFileItemList)), + this, SLOT(slotItemsActivated(KFileItemList))); connect(m_view, SIGNAL(tabRequested(KUrl)), this, SLOT(createNewWindow(KUrl))); - connect(m_view, SIGNAL(requestContextMenu(KFileItem,KUrl,QList)), - this, SLOT(slotOpenContextMenu(KFileItem,KUrl,QList))); + connect(m_view, SIGNAL(requestContextMenu(QPoint,KFileItem,KUrl,QList)), + this, SLOT(slotOpenContextMenu(QPoint,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(modeChanged()), + connect(m_view, SIGNAL(modeChanged(DolphinView::Mode,DolphinView::Mode)), this, SIGNAL(viewModeChanged())); // relay signal - connect(m_view, SIGNAL(redirection(KUrl, KUrl)), - this, SLOT(slotRedirection(KUrl, KUrl))); + connect(m_view, SIGNAL(redirection(KUrl,KUrl)), + this, SLOT(slotDirectoryRedirection(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())); + connect(m_view, SIGNAL(itemCountChanged()), this, SLOT(updateStatusBar())); + connect(m_view, SIGNAL(selectionChanged(KFileItemList)), this, SLOT(updateStatusBar())); m_actionHandler = new DolphinViewActionHandler(actionCollection(), this); m_actionHandler->setCurrentView(m_view); @@ -132,32 +130,48 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL connect(clipboard, SIGNAL(dataChanged()), this, SLOT(updatePasteAction())); + // Create file info and listing filter extensions. + // NOTE: Listing filter needs to be instantiated after the creation of the view. + new DolphinPartFileInfoExtension(this); + +#if KDE_IS_VERSION(4, 9, 2) + new DolphinPartListingFilterExtension(this); + + KDirLister* lister = m_view->m_model->m_dirLister; + if (lister) { + DolphinPartListingNotificationExtension* notifyExt = new DolphinPartListingNotificationExtension(this); + connect(lister, SIGNAL(newItems(KFileItemList)), notifyExt, SLOT(slotNewItems(KFileItemList))); + connect(lister, SIGNAL(itemsDeleted(KFileItemList)), notifyExt, SLOT(slotItemsDeleted(KFileItemList))); + } else { + kWarning() << "NULL KDirLister object! KParts::ListingNotificationExtension will NOT be supported"; + } +#endif + createActions(); m_actionHandler->updateViewActions(); slotSelectionChanged(KFileItemList()); // initially disable selection-dependent actions + // Listen to events from the app so we can update the remove key by + // checking for a Shift key press. + qApp->installEventFilter(this); + // 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 KNewFileMenu(actionCollection(), "new_menu", this); - m_newMenu->setParentWidget(widget()); - DolphinNewMenuObserver::instance().attach(m_newMenu); - connect(m_newMenu->menu(), SIGNAL(aboutToShow()), + m_newFileMenu = new DolphinNewFileMenu(actionCollection(), this); + m_newFileMenu->setParentWidget(widget()); + connect(m_newFileMenu->menu(), SIGNAL(aboutToShow()), this, SLOT(updateNewMenu())); KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" ); @@ -209,14 +223,19 @@ void DolphinPart::createActions() goActionGroup); // Tools menu + m_findFileAction = actionCollection()->addAction("find_file"); + m_findFileAction->setText(i18nc("@action:inmenu Tools", "Find File...")); + m_findFileAction->setShortcut(Qt::CTRL | Qt::Key_F); + m_findFileAction->setIcon(KIcon("edit-find")); + connect(m_findFileAction, SIGNAL(triggered()), this, SLOT(slotFindFile())); + 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); + m_openTerminalAction = actionCollection()->addAction("open_terminal"); + m_openTerminalAction->setIcon(KIcon("utilities-terminal")); + m_openTerminalAction->setText(i18nc("@action:inmenu Tools", "Open &Terminal")); + connect(m_openTerminalAction, SIGNAL(triggered()), SLOT(slotOpenTerminal())); + m_openTerminalAction->setShortcut(Qt::Key_F4); } - } void DolphinPart::createGoAction(const char* name, const char* iconName, @@ -290,7 +309,7 @@ bool DolphinPart::openUrl(const KUrl& url) bool reload = arguments().reload(); // A bit of a workaround so that changing the namefilter works: force reload. // Otherwise DolphinView wouldn't relist the URL, so nothing would happen. - if (m_nameFilter != m_dirLister->nameFilter()) + if (m_nameFilter != m_view->nameFilter()) reload = true; if (m_view->url() == url && !reload) { // DolphinView won't do anything in that case, so don't emit started return true; @@ -304,26 +323,22 @@ bool DolphinPart::openUrl(const KUrl& url) emit setWindowCaption(prettyUrl); emit m_extension->setLocationBarUrl(prettyUrl); emit started(0); // get the wheel to spin - m_dirLister->setNameFilter(m_nameFilter); + m_view->setNameFilter(m_nameFilter); m_view->setUrl(url); updatePasteAction(); emit aboutToOpenURL(); if (reload) m_view->reload(); + // Disable "Find File" and "Open Terminal" actions for non-file URLs, + // e.g. ftp, smb, etc. #279283 + const bool isLocalUrl = url.isLocalFile(); + m_findFileAction->setEnabled(isLocalUrl); + if (m_openTerminalAction) { + m_openTerminalAction->setEnabled(isLocalUrl); + } return true; } -void DolphinPart::slotCompleted(const KUrl& url) -{ - Q_UNUSED(url) - emit completed(); -} - -void DolphinPart::slotCanceled(const KUrl& url) -{ - slotCompleted(url); -} - void DolphinPart::slotMessage(const QString& msg) { emit setStatusBarText(msg); @@ -331,7 +346,9 @@ void DolphinPart::slotMessage(const QString& msg) void DolphinPart::slotErrorMessage(const QString& msg) { - KMessageBox::error(m_view, msg); + kDebug() << msg; + emit canceled(msg); + //KMessageBox::error(m_view, msg); } void DolphinPart::slotRequestItemInfo(const KFileItem& item) @@ -340,11 +357,12 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item) if (item.isNull()) { updateStatusBar(); } else { - ReadOnlyPart::setStatusBarText(item.getStatusBarInfo()); + const QString escapedText = Qt::convertFromPlainText(item.getStatusBarInfo()); + ReadOnlyPart::setStatusBarText(QString("%1").arg(escapedText)); } } -void DolphinPart::slotItemTriggered(const KFileItem& item) +void DolphinPart::slotItemActivated(const KFileItem& item) { KParts::OpenUrlArguments args; // Forget about the known mimetype if a target URL is used. @@ -360,14 +378,22 @@ void DolphinPart::slotItemTriggered(const KFileItem& item) emit m_extension->openUrlRequest(item.targetUrl(), args, browserArgs); } +void DolphinPart::slotItemsActivated(const KFileItemList& items) +{ + foreach (const KFileItem& item, items) { + slotItemActivated(item); + } +} + 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() + // should be moved into DolphinPart::slotItemActivated() emit m_extension->createNewWindow(url); } -void DolphinPart::slotOpenContextMenu(const KFileItem& _item, +void DolphinPart::slotOpenContextMenu(const QPoint& pos, + const KFileItem& _item, const KUrl&, const QList& customActions) { @@ -379,7 +405,7 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, if (item.isNull()) { // viewport context menu popupFlags |= KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp; - item = m_dirLister->rootItem(); + item = m_view->rootItem(); if (item.isNull()) item = KFileItem( S_IFDIR, (mode_t)-1, url() ); else @@ -403,10 +429,27 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, editActions += customActions; if (!_item.isNull()) { // only for context menu on one or more items - bool supportsDeleting = capabilities.supportsDeleting(); - bool supportsMoving = capabilities.supportsMoving(); - - if (!supportsDeleting) { + const bool supportsMoving = capabilities.supportsMoving(); + + if (capabilities.supportsDeleting()) { + const bool showDeleteAction = (KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false) || + !item.isLocalFile()); + const bool showMoveToTrashAction = capabilities.isLocal() && supportsMoving; + + if (showDeleteAction && showMoveToTrashAction) { + delete m_removeAction; + m_removeAction = 0; + editActions.append(actionCollection()->action("move_to_trash")); + editActions.append(actionCollection()->action("delete")); + } else if (showDeleteAction && !showMoveToTrashAction) { + editActions.append(actionCollection()->action("delete")); + } else { + if (!m_removeAction) + m_removeAction = new DolphinRemoveAction(this, actionCollection()); + editActions.append(m_removeAction); + m_removeAction->update(); + } + } else { popupFlags |= KParts::BrowserExtension::NoDeletion; } @@ -414,27 +457,6 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, editActions.append(actionCollection()->action("rename")); } - bool addTrash = capabilities.isLocal() && supportsMoving; - bool addDel = false; - if (supportsDeleting) { - if ( !item.isLocalFile() ) - addDel = true; - else if (QApplication::keyboardModifiers() & Qt::ShiftModifier) { - addTrash = false; - addDel = true; - } - else { - KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals); - KConfigGroup configGroup(globalConfig, "KDE"); - addDel = configGroup.readEntry("ShowDeleteCommand", false); - } - } - - if (addTrash) - editActions.append(actionCollection()->action("move_to_trash")); - if (addDel) - editActions.append(actionCollection()->action("delete")); - // 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. @@ -445,7 +467,7 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, actionGroups.insert("editactions", editActions); - emit m_extension->popupMenu(QCursor::pos(), + emit m_extension->popupMenu(pos, items, KParts::OpenUrlArguments(), KParts::BrowserArguments(), @@ -453,7 +475,7 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, actionGroups); } -void DolphinPart::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) +void DolphinPart::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl) { //kDebug() << oldUrl << newUrl << "currentUrl=" << url(); if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash /* #207572 */)) { @@ -463,46 +485,6 @@ void DolphinPart::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) } } -//// - -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(); -} - -void DolphinPartBrowserExtension::copy() -{ - m_part->view()->copySelectedItems(); -} - -void DolphinPartBrowserExtension::paste() -{ - m_part->view()->paste(); -} - -void DolphinPartBrowserExtension::pasteTo(const KUrl&) -{ - m_part->view()->pasteIntoFolder(); -} - -void DolphinPartBrowserExtension::reparseConfiguration() -{ - m_part->view()->refresh(); -} - -//// void DolphinPart::slotEditMimeType() { @@ -516,47 +498,25 @@ void DolphinPart::slotSelectItemsMatchingPattern() { openSelectionDialog(i18nc("@title:window", "Select"), i18n("Select all items matching this pattern:"), - QItemSelectionModel::Select); + true); } void DolphinPart::slotUnselectItemsMatchingPattern() { openSelectionDialog(i18nc("@title:window", "Unselect"), i18n("Unselect all items matching this pattern:"), - QItemSelectionModel::Deselect); + false); } -void DolphinPart::openSelectionDialog(const QString& title, const QString& text, QItemSelectionModel::SelectionFlags command) +void DolphinPart::openSelectionDialog(const QString& title, const QString& text, bool selectItems) { bool okClicked; QString pattern = KInputDialog::getText(title, text, "*", &okClicked, m_view); if (okClicked && !pattern.isEmpty()) { QRegExp patternRegExp(pattern, Qt::CaseSensitive, QRegExp::Wildcard); - QItemSelection matchingIndexes = childrenMatchingPattern(QModelIndex(), patternRegExp); - m_view->selectionModel()->select(matchingIndexes, command); - } -} - -QItemSelection DolphinPart::childrenMatchingPattern(const QModelIndex& parent, const QRegExp& patternRegExp) -{ - QItemSelection matchingIndexes; - int numRows = m_proxyModel->rowCount(parent); - - for (int row = 0; row < numRows; row++) { - QModelIndex index = m_proxyModel->index(row, 0, parent); - QModelIndex sourceIndex = m_proxyModel->mapToSource(index); - - if (sourceIndex.isValid() && patternRegExp.exactMatch(m_dolphinModel->data(sourceIndex).toString())) { - matchingIndexes += QItemSelectionRange(index); - } - - if (m_proxyModel->hasChildren(index)) { - matchingIndexes += childrenMatchingPattern(index, patternRegExp); - } + m_view->selectItems(patternRegExp, selectItems); } - - return matchingIndexes; } void DolphinPart::setCurrentViewMode(const QString& viewModeName) @@ -597,18 +557,24 @@ void DolphinPart::slotOpenTerminal() KToolInvocation::invokeTerminal(QString(), dir); } +void DolphinPart::slotFindFile() +{ + KRun::run("kfind", url(), widget()); +} + void DolphinPart::updateNewMenu() { // As requested by KNewFileMenu : - m_newMenu->checkUpToDate(); - m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles()); + m_newFileMenu->checkUpToDate(); + m_newFileMenu->setViewShowsHiddenFiles(m_view->hiddenFilesShown()); // And set the files that the menu apply on : - m_newMenu->setPopupFiles(url()); + m_newFileMenu->setPopupFiles(url()); } void DolphinPart::updateStatusBar() { - emit ReadOnlyPart::setStatusBarText(m_view->statusBarText()); + const QString escapedText = Qt::convertFromPlainText(m_view->statusBarText()); + emit ReadOnlyPart::setStatusBarText(QString("%1").arg(escapedText)); } void DolphinPart::updateProgress(int percent) @@ -618,14 +584,36 @@ void DolphinPart::updateProgress(int percent) void DolphinPart::createDirectory() { - m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles()); - m_newMenu->setPopupFiles(url()); - m_newMenu->createDirectory(); + m_newFileMenu->setViewShowsHiddenFiles(m_view->hiddenFilesShown()); + m_newFileMenu->setPopupFiles(url()); + m_newFileMenu->createDirectory(); } void DolphinPart::setFilesToSelect(const KUrl::List& files) { + if (files.isEmpty()) { + return; + } + m_view->markUrlsAsSelected(files); + m_view->markUrlAsCurrent(files.at(0)); +} + +bool DolphinPart::eventFilter(QObject* obj, QEvent* event) +{ + const int type = event->type(); + + if ((type == QEvent::KeyPress || type == QEvent::KeyRelease) && m_removeAction) { + QMenu* menu = qobject_cast(obj); + if (menu && menu->parent() == m_view) { + QKeyEvent* ev = static_cast(event); + if (ev->key() == Qt::Key_Shift) { + m_removeAction->update(); + } + } + } + + return KParts::ReadOnlyPart::eventFilter(obj, event); } #include "dolphinpart.moc"