X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ad85be955bc34f9ed9aa69f4453f26f57bf85e04..7e311509a4ac89ebe95f3d81928fe78a9f398aa9:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index c8db1c1e1..3d0748f84 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 @@ -45,8 +38,16 @@ #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 @@ -61,11 +62,12 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL Q_UNUSED(args) setComponentData(DolphinPartFactory::componentData(), false); m_extension = new DolphinPartBrowserExtension(this); + new DolphinPartFileInfoExtension(this); // 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()); @@ -75,9 +77,10 @@ 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); + m_dolphinModel->setDirLister(m_dirLister); // m_dolphinModel takes ownership of m_dirLister m_proxyModel = new DolphinSortFilterProxyModel(this); m_proxyModel->setSourceModel(m_dolphinModel); @@ -106,8 +109,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)), @@ -148,17 +149,17 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL DolphinPart::~DolphinPart() { DolphinSettings::instance().save(); - DolphinNewMenuObserver::instance().detach(m_newMenu); - delete m_dirLister; + DolphinNewFileMenuObserver::instance().detach(m_newFileMenu); } void DolphinPart::createActions() { // Edit menu - m_newMenu = new KNewFileMenu(actionCollection(), "new_menu", widget()); - 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" ); @@ -332,7 +333,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) @@ -348,7 +351,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... @@ -385,8 +392,13 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, // 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; @@ -455,56 +467,6 @@ void DolphinPart::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) } } -void DolphinPart::slotRequestUrlChange(const KUrl& url) -{ - 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(); - } -} - -//// - -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() { @@ -518,49 +480,27 @@ 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); + m_view->setItemSelectionEnabled(patternRegExp, selectItems); } } -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); @@ -602,10 +542,10 @@ void DolphinPart::slotOpenTerminal() void DolphinPart::updateNewMenu() { // As requested by KNewFileMenu : - m_newMenu->checkUpToDate(); - m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles()); + 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() @@ -620,9 +560,99 @@ 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->showHiddenFiles()); + m_newFileMenu->setPopupFiles(url()); + m_newFileMenu->createDirectory(); +} + +void DolphinPart::setFilesToSelect(const KUrl::List& files) +{ + m_view->markUrlsAsSelected(files); +} + +//// + +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(); +} + +//// + +DolphinPartFileInfoExtension::DolphinPartFileInfoExtension(DolphinPart* part) + : KParts::FileInfoExtension(part) +{ +} + +DolphinPart* DolphinPartFileInfoExtension::part() const +{ + return static_cast(parent()); +} + +bool DolphinPartFileInfoExtension::hasSelection() const +{ + return part()->view()->hasSelection(); +} + +KParts::FileInfoExtension::QueryModes DolphinPartFileInfoExtension::supportedQueryModes() const +{ + return (KParts::FileInfoExtension::AllItems | KParts::FileInfoExtension::SelectedItems); +} + +KFileItemList DolphinPartFileInfoExtension::queryFor(KParts::FileInfoExtension::QueryMode mode) const +{ + KFileItemList list; + + if (mode == KParts::FileInfoExtension::None) + return list; + + if (!(supportedQueryModes() & mode)) + return list; + + switch (mode) { + case KParts::FileInfoExtension::SelectedItems: + if (hasSelection()) + return part()->view()->selectedItems(); + break; + case KParts::FileInfoExtension::AllItems: + return part()->view()->items(); + default: + break; + } + + return list; } #include "dolphinpart.moc"