The &-shortcut from another action is not set until the action has been shown at...

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index d11a4a9be94e8e7d36d7003a9f0134d70def34f6..da7466947ce2966a3a4c0221e9648329dc814dc1 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -48,21 +48,21 @@
 #include <krun.h>
 
 #include "dolphin_generalsettings.h"
 #include <krun.h>
 
 #include "dolphin_generalsettings.h"

-#include "dolphinmodel.h"
-#include "dolphincolumnview.h"
-#include "dolphinviewcontroller.h"

 #include "dolphinmainwindow.h"
 #include "dolphinmainwindow.h"

-#include "dolphindirlister.h"
-#include "dolphinsortfilterproxymodel.h"
-#include "dolphindetailsview.h"
-#include "dolphiniconsview.h"
-#include "draganddrophelper.h"
-#include "filterbar.h"
+#include "filterbar/filterbar.h"

 #include "search/dolphinsearchbox.h"
 #include "settings/dolphinsettings.h"
 #include "statusbar/dolphinstatusbar.h"
 #include "search/dolphinsearchbox.h"
 #include "settings/dolphinsettings.h"
 #include "statusbar/dolphinstatusbar.h"

-#include "viewmodecontroller.h"
-#include "viewproperties.h"
+#include "views/dolphincolumnview.h"
+#include "views/dolphindetailsview.h"
+#include "views/dolphindirlister.h"
+#include "views/dolphinsortfilterproxymodel.h"
+#include "views/draganddrophelper.h"
+#include "views/dolphiniconsview.h"
+#include "views/dolphinmodel.h"
+#include "views/dolphinviewcontroller.h"
+#include "views/viewmodecontroller.h"
+#include "views/viewproperties.h"

 
 DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     QWidget(parent),
 
 DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     QWidget(parent),


@@ -74,6 +74,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     m_filterBar(0),
     m_statusBar(0),
     m_statusBarTimer(0),
     m_filterBar(0),
     m_statusBar(0),
     m_statusBarTimer(0),

+    m_statusBarTimestamp(),

     m_dirLister(0),
     m_proxyModel(0)
 {
     m_dirLister(0),
     m_proxyModel(0)
 {


@@ -102,6 +103,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     m_searchBox->hide();
     connect(m_searchBox, SIGNAL(closeRequest()), this, SLOT(closeSearchBox()));
     connect(m_searchBox, SIGNAL(search(QString)), this, SLOT(startSearching(QString)));
     m_searchBox->hide();
     connect(m_searchBox, SIGNAL(closeRequest()), this, SLOT(closeSearchBox()));
     connect(m_searchBox, SIGNAL(search(QString)), this, SLOT(startSearching(QString)));

+    connect(m_searchBox, SIGNAL(returnPressed(QString)), this, SLOT(requestFocus()));

 
     m_dirLister = new DolphinDirLister();
     m_dirLister->setAutoUpdate(true);
 
     m_dirLister = new DolphinDirLister();
     m_dirLister->setAutoUpdate(true);


@@ -109,7 +111,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     m_dirLister->setDelayedMimeTypes(true);
 
     m_dolphinModel = new DolphinModel(this);
     m_dirLister->setDelayedMimeTypes(true);
 
     m_dolphinModel = new DolphinModel(this);

-    m_dolphinModel->setDirLister(m_dirLister);
+    m_dolphinModel->setDirLister(m_dirLister);  // m_dolphinModel takes ownership of m_dirLister

     m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory);
 
     m_proxyModel = new DolphinSortFilterProxyModel(this);
     m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory);
 
     m_proxyModel = new DolphinSortFilterProxyModel(this);


@@ -124,6 +126,8 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
             this, SLOT(updateProgress(int)));
     connect(m_dirLister, SIGNAL(itemsDeleted(const KFileItemList&)),
             this, SLOT(delayedStatusBarUpdate()));
             this, SLOT(updateProgress(int)));
     connect(m_dirLister, SIGNAL(itemsDeleted(const KFileItemList&)),
             this, SLOT(delayedStatusBarUpdate()));

+    connect(m_dirLister, SIGNAL(newItems(KFileItemList)),
+            this, SLOT(delayedStatusBarUpdate()));

     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(slotDirListerCompleted()));
     connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(slotDirListerCompleted()));
     connect(m_dirLister, SIGNAL(infoMessage(const QString&)),


@@ -191,13 +195,6 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
 
 DolphinViewContainer::~DolphinViewContainer()
 {
 
 DolphinViewContainer::~DolphinViewContainer()
 {

-    m_dirLister->disconnect();
-
-    delete m_proxyModel;
-    m_proxyModel = 0;
-    delete m_dolphinModel;
-    m_dolphinModel = 0;
-    m_dirLister = 0; // deleted by m_dolphinModel

 }
 
 KUrl DolphinViewContainer::url() const
 }
 
 KUrl DolphinViewContainer::url() const


@@ -245,10 +242,12 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
         // Restore the URL for the URL navigator. If Dolphin has been
         // started with a search-URL, the home URL is used as fallback.
         const KUrl url = m_searchBox->searchPath();
         // Restore the URL for the URL navigator. If Dolphin has been
         // started with a search-URL, the home URL is used as fallback.
         const KUrl url = m_searchBox->searchPath();

-        if (url.isValid() && !url.isEmpty() && !isSearchUrl(url)) {
-            m_urlNavigator->setLocationUrl(url);
-        } else {
-            m_urlNavigator->goHome();
+        if (url.isValid() && !url.isEmpty()) {
+            if (isSearchUrl(url)) {
+                m_urlNavigator->goHome();
+            } else {
+                m_urlNavigator->setLocationUrl(url);
+            }

         }
     }
 }
         }
     }
 }


@@ -284,32 +283,39 @@ void DolphinViewContainer::showFilterBar(bool show)
 
 void DolphinViewContainer::delayedStatusBarUpdate()
 {
 
 void DolphinViewContainer::delayedStatusBarUpdate()
 {

-    // Invoke updateStatusBar() with a small delay. This assures that
-    // when a lot of delayedStatusBarUpdates() are done in a short time,
-    // no bottleneck is given.
-    m_statusBarTimer->start();
+    if (m_statusBarTimer->isActive() && (m_statusBarTimestamp.elapsed() > 2000)) {
+        // No update of the statusbar has been done during the last 2 seconds,
+        // although an update has been requested. Trigger an immediate update.
+        m_statusBarTimer->stop();
+        updateStatusBar();
+    } else {
+        // Invoke updateStatusBar() with a small delay. This assures that
+        // when a lot of delayedStatusBarUpdates() are done in a short time,
+        // no bottleneck is given.
+        m_statusBarTimer->start();
+    }

 }
 
 void DolphinViewContainer::updateStatusBar()
 {
 }
 
 void DolphinViewContainer::updateStatusBar()
 {

+    m_statusBarTimestamp.start();
+

     // As the item count information is less important
     // in comparison with other messages, it should only
     // be shown if:
     // - the status bar is empty or
     // - shows already the item count information or
     // - shows only a not very important information
     // As the item count information is less important
     // in comparison with other messages, it should only
     // be shown if:
     // - the status bar is empty or
     // - shows already the item count information or
     // - shows only a not very important information

-    // - if any progress is given don't show the item count info at all
-    const QString msg = m_statusBar->message();
-    const bool updateStatusBarMsg = (msg.isEmpty()
-                                     || (msg == m_statusBar->defaultText())
-                                     || (m_statusBar->type() == DolphinStatusBar::Information))
-                                    && (m_statusBar->progress() == 100);
+    const QString newMessage = m_view->statusBarText();
+    const QString currentMessage = m_statusBar->message();
+    const bool updateStatusBarMsg = currentMessage.isEmpty()
+                                    || (currentMessage == m_statusBar->defaultText())
+                                    || (m_statusBar->type() == DolphinStatusBar::Information);

 
 

-    const QString text = m_view->statusBarText();
-    m_statusBar->setDefaultText(text);
+    m_statusBar->setDefaultText(newMessage);

 
     if (updateStatusBarMsg) {
 
     if (updateStatusBarMsg) {

-        m_statusBar->setMessage(text, DolphinStatusBar::Default);
+        m_statusBar->setMessage(newMessage, DolphinStatusBar::Default);

     }
 }
 
     }
 }
 


@@ -436,7 +442,7 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
         }
 
         m_view->setUrl(url);
         }
 
         m_view->setUrl(url);

-        if (isActive()) {
+        if (isActive() && !isSearchUrl(url)) {

             // 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.
             // 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.