X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/18f99bf84e1d38ddd4c86d253ff81a178bc2fb22..1b15dd24e9c28cdc5ee5a16d7ce646d4618107b9:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index c6076cc37..a8254552e 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -18,18 +18,14 @@ */ #include "dolphinpart.h" -#include "dolphinviewactionhandler.h" -#include "dolphinsortfilterproxymodel.h" -#include "dolphinview.h" -#include "dolphinmodel.h" -#include "dolphinnewmenuobserver.h" -#include +#include #include #include #include #include +#include #include #include #include @@ -40,10 +36,17 @@ #include #include #include -#include +#include #include +#include #include "settings/dolphinsettings.h" +#include "views/dolphinview.h" +#include "views/dolphinviewactionhandler.h" +#include "views/dolphinsortfilterproxymodel.h" +#include "views/dolphinmodel.h" +#include "views/dolphinnewmenuobserver.h" +#include "views/dolphinremoteencoding.h" #include #include @@ -69,7 +72,6 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL } 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))); @@ -80,18 +82,16 @@ 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)), @@ -106,8 +106,6 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL this, SLOT(slotSelectionChanged(KFileItemList))); connect(m_view, SIGNAL(requestItemInfo(KFileItem)), this, SLOT(slotRequestItemInfo(KFileItem))); - 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)), @@ -115,7 +113,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL // Watch for changes that should result in updates to the // status bar text. - connect(m_dirLister, SIGNAL(deleteItem(const KFileItem&)), + connect(m_dirLister, SIGNAL(itemsDeleted(const KFileItemList&)), this, SLOT(updateStatusBar())); connect(m_dirLister, SIGNAL(clear()), this, SLOT(updateStatusBar())); @@ -124,6 +122,11 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL 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()), @@ -137,6 +140,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL // (sort of spacial navigation) loadPlugins(this, this, componentData()); + } DolphinPart::~DolphinPart() @@ -150,7 +154,8 @@ void DolphinPart::createActions() { // Edit menu - m_newMenu = new KNewMenu(actionCollection(), widget(), "new_menu"); + m_newMenu = new KNewFileMenu(actionCollection(), "new_menu", this); + m_newMenu->setParentWidget(widget()); DolphinNewMenuObserver::instance().attach(m_newMenu); connect(m_newMenu->menu(), SIGNAL(aboutToShow()), this, SLOT(updateNewMenu())); @@ -159,6 +164,26 @@ void DolphinPart::createActions() editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) ); connect(editMimeTypeAction, SIGNAL(triggered()), SLOT(slotEditMimeType())); + KAction* selectItemsMatching = actionCollection()->addAction("select_items_matching"); + selectItemsMatching->setText(i18nc("@action:inmenu Edit", "Select Items Matching...")); + selectItemsMatching->setShortcut(Qt::CTRL | Qt::Key_S); + connect(selectItemsMatching, SIGNAL(triggered()), this, SLOT(slotSelectItemsMatchingPattern())); + + KAction* unselectItemsMatching = actionCollection()->addAction("unselect_items_matching"); + unselectItemsMatching->setText(i18nc("@action:inmenu Edit", "Unselect Items Matching...")); + connect(unselectItemsMatching, SIGNAL(triggered()), this, SLOT(slotUnselectItemsMatchingPattern())); + + actionCollection()->addAction(KStandardAction::SelectAll, "select_all", m_view, SLOT(selectAll())); + + KAction* unselectAll = actionCollection()->addAction("unselect_all"); + unselectAll->setText(i18nc("@action:inmenu Edit", "Unselect All")); + connect(unselectAll, SIGNAL(triggered()), m_view, SLOT(clearSelection())); + + KAction* invertSelection = actionCollection()->addAction("invert_selection"); + invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection")); + invertSelection->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A); + connect(invertSelection, SIGNAL(triggered()), m_view, SLOT(invertSelection())); + // View menu: all done by DolphinViewActionHandler // Go menu @@ -234,7 +259,7 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection) // TODO share this code with DolphinMainWindow::updateEditActions (and the desktop code) // in libkonq - KonqFileItemCapabilities capabilities(selection); + KFileItemListProperties capabilities(selection); const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving(); renameAction->setEnabled(capabilities.supportsMoving()); @@ -299,7 +324,7 @@ void DolphinPart::slotCanceled(const KUrl& url) slotCompleted(url); } -void DolphinPart::slotInfoMessage(const QString& msg) +void DolphinPart::slotMessage(const QString& msg) { emit setStatusBarText(msg); } @@ -322,7 +347,11 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item) void DolphinPart::slotItemTriggered(const KFileItem& item) { KParts::OpenUrlArguments args; - args.setMimeType(item.mimetype()); + // Forget about the known mimetype if a target URL is used. + // Testcase: network:/ with a item (mimetype "inode/some-foo-service") pointing to a http URL (html) + if (item.targetUrl() == item.url()) { + 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... @@ -335,10 +364,7 @@ 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, @@ -356,38 +382,41 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, 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. + KFileItemList items; + if (m_view->selectedItems().isEmpty()) { + items.append(item); + } else { + items = m_view->selectedItems(); + } + + KFileItemListProperties capabilities(items); + KParts::BrowserExtension::ActionGroupMap actionGroups; QList editActions; - + editActions += m_view->versionControlActions(m_view->selectedItems()); 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.isNull() && !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 && item.isLocalFile() ) - addTrash = true; - - if ( sDeleting ) { + if (supportsDeleting) { if ( !item.isLocalFile() ) addDel = true; else if (QApplication::keyboardModifiers() & Qt::ShiftModifier) { @@ -397,8 +426,7 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, else { KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals); KConfigGroup configGroup(globalConfig, "KDE"); - if ( configGroup.readEntry("ShowDeleteCommand", false) ) - addDel = true; + addDel = configGroup.readEntry("ShowDeleteCommand", false); } } @@ -407,7 +435,7 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, if (addDel) editActions.append(actionCollection()->action("delete")); - // Normally KonqPopupMenu only shows the "Create new" subdir in the current view + // 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()) @@ -417,10 +445,6 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, actionGroups.insert("editactions", editActions); - // 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); emit m_extension->popupMenu(QCursor::pos(), items, KParts::OpenUrlArguments(), @@ -432,24 +456,26 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, void DolphinPart::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) { //kDebug() << oldUrl << newUrl << "currentUrl=" << url(); - if (oldUrl == 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) +//// + +void DolphinPartBrowserExtension::restoreState(QDataStream &stream) { - 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). - openUrl(url); - emit m_extension->openUrlNotify(); - } + 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() { @@ -466,6 +492,11 @@ void DolphinPartBrowserExtension::paste() m_part->view()->paste(); } +void DolphinPartBrowserExtension::pasteTo(const KUrl&) +{ + m_part->view()->pasteIntoFolder(); +} + void DolphinPartBrowserExtension::reparseConfiguration() { m_part->view()->refresh(); @@ -481,6 +512,53 @@ void DolphinPart::slotEditMimeType() } } +void DolphinPart::slotSelectItemsMatchingPattern() +{ + openSelectionDialog(i18nc("@title:window", "Select"), + i18n("Select all items matching this pattern:"), + QItemSelectionModel::Select); +} + +void DolphinPart::slotUnselectItemsMatchingPattern() +{ + openSelectionDialog(i18nc("@title:window", "Unselect"), + i18n("Unselect all items matching this pattern:"), + QItemSelectionModel::Deselect); +} + +void DolphinPart::openSelectionDialog(const QString& title, const QString& text, QItemSelectionModel::SelectionFlags command) +{ + 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); + } + } + + return matchingIndexes; +} + void DolphinPart::setCurrentViewMode(const QString& viewModeName) { QAction* action = actionCollection()->action(viewModeName); @@ -521,8 +599,9 @@ void DolphinPart::slotOpenTerminal() void DolphinPart::updateNewMenu() { - // As requested by KNewMenu : - m_newMenu->slotCheckUpToDate(); + // As requested by KNewFileMenu : + m_newMenu->checkUpToDate(); + m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles()); // And set the files that the menu apply on : m_newMenu->setPopupFiles(url()); } @@ -537,4 +616,16 @@ 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(); +} + +void DolphinPart::setFilesToSelect(const KUrl::List& files) +{ + m_view->markUrlsAsSelected(files); +} + #include "dolphinpart.moc"