X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/0ee9ee0ea801c3d427b263153cfb20db041ec727..6c81158a2f0029a3b00554e4fa18388a3d52313d:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 89ed54aca..530055370 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -41,12 +41,14 @@ #include #include #include +#include #include +#include +#include #include "dolphinmodel.h" #include "dolphincolumnview.h" #include "dolphincontroller.h" -#include "dolphindropcontroller.h" #include "dolphinstatusbar.h" #include "dolphinmainwindow.h" #include "dolphindirlister.h" @@ -54,10 +56,11 @@ #include "dolphindetailsview.h" #include "dolphiniconsview.h" #include "dolphincontextmenu.h" +#include "draganddrophelper.h" #include "filterbar.h" #include "kurlnavigator.h" #include "viewproperties.h" -#include "dolphinsettings.h" +#include "settings/dolphinsettings.h" #include "dolphin_generalsettings.h" DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, @@ -65,6 +68,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, const KUrl& url) : QWidget(parent), m_showProgress(false), + m_isFolderWritable(false), m_mainWindow(mainWindow), m_topLayout(0), m_urlNavigator(0), @@ -85,11 +89,15 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, this, SLOT(dropUrls(const KUrl&, QDropEvent*))); connect(m_urlNavigator, SIGNAL(activated()), this, SLOT(activate())); + connect(m_urlNavigator->editor(), SIGNAL(completionModeChanged(KGlobalSettings::Completion)), + this, SLOT(saveUrlCompletionMode(KGlobalSettings::Completion))); const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); m_urlNavigator->setUrlEditable(settings->editableUrl()); m_urlNavigator->setShowFullPath(settings->showFullPath()); m_urlNavigator->setHomeUrl(settings->homeUrl()); + KUrlComboBox* editor = m_urlNavigator->editor(); + editor->setCompletionMode(KGlobalSettings::Completion(settings->urlCompletionMode())); m_dirLister = new DolphinDirLister(); m_dirLister->setAutoUpdate(true); @@ -116,6 +124,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, this, SLOT(showInfoMessage(const QString&))); connect(m_dirLister, SIGNAL(errorMessage(const QString&)), this, SLOT(showErrorMessage(const QString&))); + connect(m_dirLister, SIGNAL(urlIsFileError(const KUrl&)), + this, SLOT(openFile(const KUrl&))); m_view = new DolphinView(this, url, @@ -124,8 +134,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_proxyModel); connect(m_view, SIGNAL(urlChanged(const KUrl&)), m_urlNavigator, SLOT(setUrl(const KUrl&))); - connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&)), - this, SLOT(openContextMenu(KFileItem, const KUrl&))); + connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&, const QList&)), + this, SLOT(openContextMenu(KFileItem, const KUrl&, const QList&))); connect(m_view, SIGNAL(contentsMoved(int, int)), this, SLOT(saveContentsPos(int, int))); connect(m_view, SIGNAL(requestItemInfo(KFileItem)), @@ -140,6 +150,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, this, SLOT(slotItemTriggered(KFileItem))); connect(m_view, SIGNAL(startedPathLoading(const KUrl&)), this, SLOT(saveRootUrl(const KUrl&))); + connect(m_view, SIGNAL(redirection(KUrl, KUrl)), + this, SLOT(redirect(KUrl, KUrl))); connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), this, SLOT(restoreView(const KUrl&))); @@ -152,6 +164,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, this, SLOT(setNameFilter(const QString&))); connect(m_filterBar, SIGNAL(closeRequest()), this, SLOT(closeFilterBar())); + connect(m_view, SIGNAL(urlChanged(const KUrl&)), + m_filterBar, SLOT(clear())); m_topLayout->addWidget(m_urlNavigator); m_topLayout->addWidget(m_view); @@ -173,11 +187,15 @@ DolphinViewContainer::~DolphinViewContainer() void DolphinViewContainer::setUrl(const KUrl& newUrl) { m_urlNavigator->setUrl(newUrl); - - // Temporary disable the 'File'->'Create New...' menu until - // the write permissions can be checked in a fast way at - // DolphinViewContainer::slotDirListerCompleted(). - m_mainWindow->newMenu()->menu()->setEnabled(false); + if (newUrl != m_urlNavigator->url()) { + // Temporary disable the 'File'->'Create New...' menu until + // the write permissions can be checked in a fast way at + // DolphinViewContainer::slotDirListerCompleted(). + m_isFolderWritable = false; + if (isActive()) { + m_mainWindow->newMenu()->menu()->setEnabled(false); + } + } } const KUrl& DolphinViewContainer::url() const @@ -189,6 +207,9 @@ void DolphinViewContainer::setActive(bool active) { m_urlNavigator->setActive(active); m_view->setActive(active); + if (active) { + m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable); + } } bool DolphinViewContainer::isActive() const @@ -208,6 +229,16 @@ bool DolphinViewContainer::isFilterBarVisible() const return m_filterBar->isVisible(); } +void DolphinViewContainer::showFilterBar(bool show) +{ + Q_ASSERT(m_filterBar != 0); + if (show) { + m_filterBar->show(); + } else { + closeFilterBar(); + } +} + bool DolphinViewContainer::isUrlEditable() const { return m_urlNavigator->isUrlEditable(); @@ -242,18 +273,21 @@ void DolphinViewContainer::slotDirListerCompleted() } updateStatusBar(); - QTimer::singleShot(100, this, SLOT(restoreContentsPos())); + QMetaObject::invokeMethod(this, "restoreContentsPos", Qt::QueuedConnection); // Enable the 'File'->'Create New...' menu only if the directory // supports writing. - KMenu* createNew = m_mainWindow->newMenu()->menu(); KFileItem item = m_dirLister->rootItem(); if (item.isNull()) { // it is unclear whether writing is supported - createNew->setEnabled(true); + m_isFolderWritable = true; } else { KonqFileItemCapabilities capabilities(KFileItemList() << item); - createNew->setEnabled(capabilities.supportsWriting()); + m_isFolderWritable = capabilities.supportsWriting(); + } + + if (isActive()) { + m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable); } } @@ -285,15 +319,10 @@ void DolphinViewContainer::closeFilterBar() { m_filterBar->hide(); m_filterBar->clear(); + m_view->setFocus(); emit showFilterBarChanged(false); } -void DolphinViewContainer::showFilterBar(bool show) -{ - Q_ASSERT(m_filterBar != 0); - m_filterBar->setVisible(show); -} - void DolphinViewContainer::updateStatusBar() { // As the item count information is less important @@ -324,9 +353,11 @@ void DolphinViewContainer::setNameFilter(const QString& nameFilter) } void DolphinViewContainer::openContextMenu(const KFileItem& item, - const KUrl& url) + const KUrl& url, + const QList& customActions) { DolphinContextMenu contextMenu(m_mainWindow, item, url); + contextMenu.setCustomActions(customActions); contextMenu.open(); } @@ -350,12 +381,38 @@ void DolphinViewContainer::activate() void DolphinViewContainer::restoreView(const KUrl& url) { - if (url.protocol().isEmpty()) { - // The URL navigator only checks for validity, not - // if the URL can be listed. - showErrorMessage(i18nc("@info:status", "Protocol not supported")); - } else { + if (KProtocolManager::supportsListing(url)) { m_view->updateView(url, m_urlNavigator->savedRootUrl()); + if (isActive()) { + // When an URL has been entered, the view should get the focus. + // The focus must be requested asynchronously, as changing the URL might create + // a new view widget. Using QTimer::singleShow() works reliable, however + // QMetaObject::invokeMethod() with a queued connection does not work, which might + // indicate that we should pass a hint to DolphinView::updateView() + // regarding the focus instead. To test: Enter an URL and press CTRL+Enter. + // Expected result: The view should get the focus. + QTimer::singleShot(0, this, SLOT(requestFocus())); + } + } else if (KProtocolManager::isSourceProtocol(url)) { + QString app = "konqueror"; + if (url.protocol().startsWith(QLatin1String("http"))) { + showErrorMessage(i18nc("@info:status", + "Dolphin does not support web pages, the web browser has been launched")); + const KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "General"); + const QString browser = config.readEntry("BrowserApplication"); + if (!browser.isEmpty()) { + app = browser; + } + } else { + showErrorMessage(i18nc("@info:status", + "Protocol not supported by Dolphin, Konqueror has been launched")); + } + + QString secureUrl = KShell::quoteArg(url.pathOrUrl()); + const QString command = app + ' ' + secureUrl; + KRun::runCommand(command, app, app, this); + } else { + showErrorMessage(i18nc("@info:status", "Invalid protocol")); } } @@ -367,7 +424,28 @@ void DolphinViewContainer::saveRootUrl(const KUrl& url) void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event) { - DolphinDropController::dropUrls(KFileItem(), destination, event, this); + DragAndDropHelper::instance().dropUrls(KFileItem(), destination, event, this); +} + +void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl) +{ + Q_UNUSED(oldUrl); + const bool block = m_urlNavigator->signalsBlocked(); + m_urlNavigator->blockSignals(true); + m_urlNavigator->setUrl(newUrl); + m_urlNavigator->blockSignals(block); +} + +void DolphinViewContainer::requestFocus() +{ + m_view->setFocus(); +} + +void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion completion) +{ + DolphinSettings& settings = DolphinSettings::instance(); + settings.generalSettings()->setUrlCompletionMode(completion); + settings.save(); } void DolphinViewContainer::slotItemTriggered(const KFileItem& item) @@ -398,4 +476,13 @@ void DolphinViewContainer::slotItemTriggered(const KFileItem& item) item.run(); } +void DolphinViewContainer::openFile(const KUrl& url) +{ + // Using m_dolphinModel for getting the file item instance is not possible + // here: openFile() is triggered by an error of the directory lister + // job, so the file item must be received "manually". + const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + slotItemTriggered(item); +} + #include "dolphinviewcontainer.moc"