X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7b42d2d6cbff82dc8adefc8e05f42a015f59cb03..e53ce0959feaeec8340dfeb92ca410018240b95a:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index fbaa6fe49..f44ada304 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -18,12 +18,6 @@ */ #include "dolphinpart.h" -#include "dolphinviewactionhandler.h" -#include "dolphinsortfilterproxymodel.h" -#include "dolphinview.h" -#include "dolphinmodel.h" -#include "dolphinnewmenuobserver.h" -#include "dolphinremoteencoding.h" #include #include @@ -32,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -42,10 +35,18 @@ #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/dolphinnewfilemenuobserver.h" +#include "views/dolphinremoteencoding.h" +#include "views/dolphindirlister.h" #include #include @@ -64,7 +65,7 @@ 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 = new DolphinDirLister; m_dirLister->setAutoUpdate(true); if (parentWidget) { m_dirLister->setMainWindow(parentWidget->window()); @@ -74,6 +75,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL 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))); + connect(m_dirLister, SIGNAL(errorMessage(QString)), this, SLOT(slotErrorMessage(QString))); m_dolphinModel = new DolphinModel(this); m_dolphinModel->setDirLister(m_dirLister); @@ -105,8 +107,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)), @@ -147,7 +147,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL DolphinPart::~DolphinPart() { DolphinSettings::instance().save(); - DolphinNewMenuObserver::instance().detach(m_newMenu); + DolphinNewFileMenuObserver::instance().detach(m_newFileMenu); delete m_dirLister; } @@ -155,15 +155,36 @@ void DolphinPart::createActions() { // Edit menu - m_newMenu = new KNewMenu(actionCollection(), widget(), "new_menu"); - DolphinNewMenuObserver::instance().attach(m_newMenu); - connect(m_newMenu->menu(), SIGNAL(aboutToShow()), + m_newFileMenu = new KNewFileMenu(actionCollection(), "new_menu", this); + m_newFileMenu->setParentWidget(widget()); + DolphinNewFileMenuObserver::instance().attach(m_newFileMenu); + connect(m_newFileMenu->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* 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 @@ -311,7 +332,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) @@ -327,7 +350,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... @@ -358,17 +385,24 @@ 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); + 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 @@ -432,17 +466,19 @@ void DolphinPart::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) } } -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() { @@ -479,6 +515,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); @@ -519,10 +602,11 @@ void DolphinPart::slotOpenTerminal() void DolphinPart::updateNewMenu() { - // As requested by KNewMenu : - m_newMenu->slotCheckUpToDate(); + // As requested by KNewFileMenu : + m_newFileMenu->checkUpToDate(); + m_newFileMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles()); // And set the files that the menu apply on : - m_newMenu->setPopupFiles(url()); + m_newFileMenu->setPopupFiles(url()); } void DolphinPart::updateStatusBar() @@ -537,8 +621,14 @@ void DolphinPart::updateProgress(int percent) void DolphinPart::createDirectory() { - m_newMenu->setPopupFiles(url()); - m_newMenu->createDirectory(); + m_newFileMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles()); + m_newFileMenu->setPopupFiles(url()); + m_newFileMenu->createDirectory(); +} + +void DolphinPart::setFilesToSelect(const KUrl::List& files) +{ + m_view->markUrlsAsSelected(files); } #include "dolphinpart.moc"