Removed some unnecessary includes

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 652274d63b6a979daf5cf26791c722ef8c4b00a6..1a33668e01dec3167dbfd747834478a40be82ae5 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -100,8 +100,11 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
             this, SLOT(updateCutItems()));
 
     m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this);
-    m_urlNavigator->setUrlEditable(DolphinSettings::instance().generalSettings()->editableUrl());
-    m_urlNavigator->setHomeUrl(DolphinSettings::instance().generalSettings()->homeUrl());
+
+    const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    m_urlNavigator->setUrlEditable(settings->editableUrl());
+    m_urlNavigator->setHomeUrl(settings->homeUrl());
+
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(changeDirectory(const KUrl&)));
     connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
@@ -168,7 +171,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_iconSize = K3Icon::SizeMedium;
 
     m_filterBar = new FilterBar(this);
-    m_filterBar->hide();
+    m_filterBar->setVisible(settings->filterBar());
     connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
             this, SLOT(changeNameFilter(const QString&)));
     connect(m_filterBar, SIGNAL(closeRequest()),
@@ -197,6 +200,11 @@ const KUrl& DolphinView::url() const
     return m_urlNavigator->url();
 }
 
+KUrl DolphinView::rootUrl() const
+{
+    return isColumnViewActive() ? m_dirLister->url() : url();
+}
+
 bool DolphinView::isActive() const
 {
     return m_mainWindow->activeView() == this;
@@ -401,11 +409,6 @@ int DolphinView::contentsY() const
     return itemView()->verticalScrollBar()->value();
 }
 
-void DolphinView::emitRequestItemInfo(const KUrl& url)
-{
-    emit requestItemInfo(url);
-}
-
 bool DolphinView::isFilterBarVisible() const
 {
     return m_filterBar->isVisible();
@@ -728,6 +731,8 @@ void DolphinView::changeDirectory(const KUrl& url)
 void DolphinView::triggerItem(const QModelIndex& index)
 {
     if (!isValidNameIndex(index)) {
+        clearSelection();
+        showHoverInformation(index);
         return;
     }
 
@@ -1214,6 +1219,7 @@ void DolphinView::showHoverInformation(const QModelIndex& index)
 void DolphinView::clearHoverInformation()
 {
     m_statusBar->clear();
+    emit requestItemInfo(KUrl());
 }