X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4b0dc69070af505e2bc620dd1be8fd3e7dff7718..ca5d3fde114dfdb280e46995e8a425d3ec558596:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 6deb7b846..67ea84d1b 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -162,7 +162,7 @@ DolphinViewContainer::~DolphinViewContainer() KUrl DolphinViewContainer::url() const { - return m_urlNavigator->locationUrl(); + return m_view->url(); } void DolphinViewContainer::setActive(bool active) @@ -177,6 +177,46 @@ bool DolphinViewContainer::isActive() const return m_view->isActive(); } +const DolphinStatusBar* DolphinViewContainer::statusBar() const +{ + return m_statusBar; +} + +DolphinStatusBar* DolphinViewContainer::statusBar() +{ + return m_statusBar; +} + +const KUrlNavigator* DolphinViewContainer::urlNavigator() const +{ + return m_urlNavigator; +} + +KUrlNavigator* DolphinViewContainer::urlNavigator() +{ + return m_urlNavigator; +} + +const DolphinView* DolphinViewContainer::view() const +{ + return m_view; +} + +DolphinView* DolphinViewContainer::view() +{ + return m_view; +} + +const DolphinSearchBox* DolphinViewContainer::searchBox() const +{ + return m_searchBox; +} + +DolphinSearchBox* DolphinViewContainer::searchBox() +{ + return m_searchBox; +} + void DolphinViewContainer::refresh() { GeneralSettings* settings = DolphinSettings::instance().generalSettings(); @@ -214,7 +254,7 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled) if (enabled) { KUrl url = m_urlNavigator->locationUrl(); m_searchBox->setText(QString()); - m_searchBox->setReadOnly(isSearchUrl(url)); + m_searchBox->setReadOnly(isSearchUrl(url), url); // Remember the most recent non-search URL as search path // of the search-box, so that it can be restored