#include <konq_fileitemcapabilities.h>
#include <konq_operations.h>
#include <kurl.h>
+#include <krun.h>
#include "dolphinmodel.h"
#include "dolphincolumnview.h"
#include "dolphincontroller.h"
-#include "dolphindropcontroller.h"
#include "dolphinstatusbar.h"
#include "dolphinmainwindow.h"
#include "dolphindirlister.h"
#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,
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,
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&)));
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_mainWindow->newMenu()->menu()->setEnabled(false);
+ }
}
const KUrl& DolphinViewContainer::url() 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();
}
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.
{
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
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)
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::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"
projects / dolphin.git / blobdiff