X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2df2d4ea7ee63a43a327b4ffb1c5cddd176aff91..a0d3cf4aa8ffa76ed22a67efa4ea156eb2ef9f68:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index b8a39cffc..5b9297f08 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -43,6 +44,7 @@ #include #include #include +#include #include "settings/dolphinsettings.h" @@ -70,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))); @@ -81,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)), @@ -166,6 +165,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 @@ -306,7 +325,7 @@ void DolphinPart::slotCanceled(const KUrl& url) slotCompleted(url); } -void DolphinPart::slotInfoMessage(const QString& msg) +void DolphinPart::slotMessage(const QString& msg) { emit setStatusBarText(msg); } @@ -360,38 +379,36 @@ 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. + const KFileItemList items = (m_view->selectedItems().count() ? m_view->selectedItems() + : KFileItemList() << item); + 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) { @@ -401,8 +418,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); } } @@ -411,7 +427,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()) @@ -421,10 +437,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(), @@ -436,7 +448,7 @@ 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); @@ -455,6 +467,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(); @@ -470,6 +494,11 @@ void DolphinPartBrowserExtension::paste() m_part->view()->paste(); } +void DolphinPartBrowserExtension::pasteTo(const KUrl&) +{ + m_part->view()->pasteIntoFolder(); +} + void DolphinPartBrowserExtension::reparseConfiguration() { m_part->view()->refresh(); @@ -485,6 +514,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); @@ -527,6 +603,7 @@ 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()); } @@ -543,6 +620,7 @@ void DolphinPart::updateProgress(int percent) void DolphinPart::createDirectory() { + m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles()); m_newMenu->setPopupFiles(url()); m_newMenu->createDirectory(); }