X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ed5b2e54736b04d551eae01d976038fb7d5aac35..2f47863c68bb0ac0417eed76f713ced651a4908a:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 6bc620ee2..bc2c44c07 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -35,10 +35,14 @@ #include #include #include +#include #include +#include #include +#include #include #include +#include #include "dolphinmodel.h" #include "dolphincolumnview.h" @@ -50,10 +54,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, @@ -61,6 +66,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), @@ -68,9 +74,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_filterBar(0), m_statusBar(0), m_dirLister(0), - m_proxyModel(0), - m_previousUrl(), - m_currentUrl() + m_proxyModel(0) { hide(); @@ -79,13 +83,14 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_topLayout->setMargin(0); m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this); - connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)), - m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&))); + connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl&, QDropEvent*)), + this, SLOT(dropUrls(const KUrl&, QDropEvent*))); connect(m_urlNavigator, SIGNAL(activated()), this, SLOT(activate())); const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); m_urlNavigator->setUrlEditable(settings->editableUrl()); + m_urlNavigator->setShowFullPath(settings->showFullPath()); m_urlNavigator->setHomeUrl(settings->homeUrl()); m_dirLister = new DolphinDirLister(); @@ -113,6 +118,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, @@ -121,8 +128,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)), @@ -137,13 +144,13 @@ 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&))); - m_statusBar = new DolphinStatusBar(this, url); - connect(m_view, SIGNAL(urlChanged(const KUrl&)), - m_statusBar, SLOT(updateSpaceInfoContent(const KUrl&))); + m_statusBar = new DolphinStatusBar(this, m_view); m_filterBar = new FilterBar(this); m_filterBar->setVisible(settings->filterBar()); @@ -171,22 +178,30 @@ DolphinViewContainer::~DolphinViewContainer() void DolphinViewContainer::setUrl(const KUrl& newUrl) { - if (newUrl != m_currentUrl) { - m_previousUrl = m_currentUrl; - m_currentUrl = newUrl; - m_urlNavigator->setUrl(newUrl); + m_urlNavigator->setUrl(newUrl); + 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 { - return m_currentUrl; + return m_urlNavigator->url(); } 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 @@ -195,11 +210,27 @@ bool DolphinViewContainer::isActive() const return m_view->isActive(); } +void DolphinViewContainer::refresh() +{ + m_view->refresh(); + m_statusBar->refresh(); +} + 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(); @@ -234,8 +265,22 @@ void DolphinViewContainer::slotDirListerCompleted() } updateStatusBar(); - m_view->setCurrentItem(m_previousUrl); - QTimer::singleShot(100, this, SLOT(restoreContentsPos())); + QMetaObject::invokeMethod(this, "restoreContentsPos", Qt::QueuedConnection); + + // Enable the 'File'->'Create New...' menu only if the directory + // supports writing. + KFileItem item = m_dirLister->rootItem(); + if (item.isNull()) { + // it is unclear whether writing is supported + m_isFolderWritable = true; + } else { + KonqFileItemCapabilities capabilities(KFileItemList() << item); + m_isFolderWritable = capabilities.supportsWriting(); + } + + if (isActive()) { + m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable); + } } void DolphinViewContainer::showItemInfo(const KFileItem& item) @@ -265,67 +310,11 @@ void DolphinViewContainer::showOperationCompletedMessage(const QString& msg) void DolphinViewContainer::closeFilterBar() { m_filterBar->hide(); + m_filterBar->clear(); + m_view->setFocus(); emit showFilterBarChanged(false); } -QString DolphinViewContainer::defaultStatusBarText() const -{ - int folderCount = 0; - int fileCount = 0; - m_view->calculateItemCount(fileCount, folderCount); - return KIO::itemsSummaryString(fileCount + folderCount, - fileCount, - folderCount, - 0, false); -} - -QString DolphinViewContainer::selectionStatusBarText() const -{ - QString text; - const KFileItemList list = m_view->selectedItems(); - if (list.isEmpty()) { - // when an item is triggered, it is temporary selected but selectedItems() - // will return an empty list - return QString(); - } - - int fileCount = 0; - int folderCount = 0; - KIO::filesize_t byteSize = 0; - KFileItemList::const_iterator it = list.begin(); - const KFileItemList::const_iterator end = list.end(); - while (it != end) { - const KFileItem& item = *it; - if (item.isDir()) { - ++folderCount; - } else { - ++fileCount; - byteSize += item.size(); - } - ++it; - } - - if (folderCount > 0) { - text = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount); - if (fileCount > 0) { - text += ", "; - } - } - - if (fileCount > 0) { - const QString sizeText(KIO::convertSize(byteSize)); - text += i18ncp("@info:status", "1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText); - } - - return text; -} - -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 @@ -341,7 +330,7 @@ void DolphinViewContainer::updateStatusBar() (m_statusBar->type() == DolphinStatusBar::Information)) && (m_statusBar->progress() == 100); - const QString text(m_view->hasSelection() ? selectionStatusBarText() : defaultStatusBarText()); + const QString text(m_view->statusBarText()); m_statusBar->setDefaultText(text); if (updateStatusBarMsg) { @@ -356,9 +345,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(); } @@ -382,7 +373,37 @@ void DolphinViewContainer::activate() void DolphinViewContainer::restoreView(const KUrl& url) { - m_view->updateView(url, m_urlNavigator->savedRootUrl()); + 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")); + } + const QString command = app + ' ' + url.pathOrUrl(); + KRun::runCommand(command, app, app, this); + } else { + showErrorMessage(i18nc("@info:status", "Invalid protocol")); + } } void DolphinViewContainer::saveRootUrl(const KUrl& url) @@ -391,6 +412,25 @@ void DolphinViewContainer::saveRootUrl(const KUrl& url) m_urlNavigator->saveRootUrl(m_view->rootUrl()); } +void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event) +{ + 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::slotItemTriggered(const KFileItem& item) { KUrl url = item.targetUrl(); @@ -419,4 +459,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"