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

[dolphin.git] / src / panels / information / informationpanel.cpp

diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index c18cc7fdb96f69bc3e835f6e3811f48f7dc23df2..86a7bb9990d7565433a26e2ab0925ecf296be38c 100644 (file)
--- a/src/panels/information/informationpanel.cpp
+++ b/src/panels/information/informationpanel.cpp
@@ -18,12 +18,13 @@
  ***************************************************************************/
 
 #include "informationpanel.h"
  ***************************************************************************/
 
 #include "informationpanel.h"

+
+#include "informationpanelcontent.h"
+#include <kio/job.h>

 #include <kdirnotify.h>
 #include <kdirnotify.h>

+#include <QApplication>

 #include <QShowEvent>
 #include <QVBoxLayout>
 #include <QShowEvent>
 #include <QVBoxLayout>

-#include "informationpanelcontent.h"
-
-#include <kio/job.h>

 
 InformationPanel::InformationPanel(QWidget* parent) :
     Panel(parent),
 
 InformationPanel::InformationPanel(QWidget* parent) :
     Panel(parent),


@@ -52,24 +53,6 @@ QSize InformationPanel::sizeHint() const
     return size;
 }
 
     return size;
 }
 

-void InformationPanel::setUrl(const KUrl& url)
-{
-    Panel::setUrl(url);
-    if (!url.isValid() || isEqualToShownUrl(url)) {
-        return;
-    }
-
-    m_shownUrl = url;
-    if (isVisible()) {
-        cancelRequest();
-        // Update the content with a delay. This gives
-        // the directory lister the chance to show the content
-        // before expensive operations are done to show
-        // meta information.
-        m_urlChangedTimer->start();
-    }
-}
-

 void InformationPanel::setSelection(const KFileItemList& selection)
 {
     if (!isVisible()) {
 void InformationPanel::setSelection(const KFileItemList& selection)
 {
     if (!isVisible()) {


@@ -107,25 +90,57 @@ void InformationPanel::requestDelayedItemInfo(const KFileItem& item)
         return;
     }
 
         return;
     }
 

-    cancelRequest();
+    if (QApplication::mouseButtons() & Qt::LeftButton) {
+        // Ignore the request of an item information when a rubberband
+        // selection is ongoing.
+        return;
+    }

 
 

-    m_fileItem = KFileItem();

     if (item.isNull()) {
         // The cursor is above the viewport. If files are selected,
         // show information regarding the selection.
         if (m_selection.size() > 0) {
     if (item.isNull()) {
         // The cursor is above the viewport. If files are selected,
         // show information regarding the selection.
         if (m_selection.size() > 0) {

+            cancelRequest();
+            m_fileItem = KFileItem();

             m_infoTimer->start();
         }
             m_infoTimer->start();
         }

-    } else {
-        const KUrl url = item.url();
-        if (url.isValid() && !isEqualToShownUrl(url)) {
-            m_urlCandidate = item.url();
-            m_fileItem = item;
-            m_infoTimer->start();
-        }
+    } else if (item.url().isValid() && !isEqualToShownUrl(item.url())) {
+        // The cursor is above an item that is not shown currently
+        cancelRequest();
+
+        m_urlCandidate = item.url();
+        m_fileItem = item;
+        m_infoTimer->start();

     }
 }
 
     }
 }
 

+bool InformationPanel::urlChanged()
+{
+    if (!url().isValid()) {
+        return false;
+    }
+
+    if (!isVisible()) {
+        return true;
+    }
+
+    cancelRequest();
+    m_selection.clear();
+
+    if (!isEqualToShownUrl(url())) {
+        m_shownUrl = url();
+        m_fileItem = KFileItem();
+
+        // Update the content with a delay. This gives
+        // the directory lister the chance to show the content
+        // before expensive operations are done to show
+        // meta information.
+        m_urlChangedTimer->start();
+    }
+
+    return true;
+}
+

 void InformationPanel::showEvent(QShowEvent* event)
 {
     Panel::showEvent(event);
 void InformationPanel::showEvent(QShowEvent* event)
 {
     Panel::showEvent(event);


@@ -136,6 +151,8 @@ void InformationPanel::showEvent(QShowEvent* event)
             // Information Panel
             init();
         }
             // Information Panel
             init();
         }

+
+        m_shownUrl = url();

         showItemInfo();
     }
 }
         showItemInfo();
     }
 }


@@ -163,10 +180,11 @@ void InformationPanel::showItemInfo()
 
     cancelRequest();
 
 
     cancelRequest();
 

-    if (showMultipleSelectionInfo()) {
+    if (m_fileItem.isNull() && (m_selection.count() > 1)) {
+        // The information for a selection of items should be shown

         m_content->showItems(m_selection);
         m_content->showItems(m_selection);

-        m_shownUrl = KUrl();

     } else {
     } else {

+        // The information for exactly one item should be shown

         KFileItem item;
         if (!m_fileItem.isNull()) {
             item = m_fileItem;
         KFileItem item;
         if (!m_fileItem.isNull()) {
             item = m_fileItem;


@@ -176,9 +194,9 @@ void InformationPanel::showItemInfo()
         }
 
         if (item.isNull()) {
         }
 
         if (item.isNull()) {

-            // no item is hovered and no selection has been done: provide
-            // an item for the directory represented by m_shownUrl
-            m_folderStatJob = KIO::stat(m_shownUrl, KIO::HideProgressInfo);
+            // No item is hovered and no selection has been done: provide
+            // an item for the currently shown directory.
+            m_folderStatJob = KIO::stat(url(), KIO::HideProgressInfo);

             connect(m_folderStatJob, SIGNAL(result(KJob*)),
                     this, SLOT(slotFolderStatFinished(KJob*)));
         } else {
             connect(m_folderStatJob, SIGNAL(result(KJob*)),
                     this, SLOT(slotFolderStatFinished(KJob*)));
         } else {


@@ -197,6 +215,7 @@ void InformationPanel::slotFolderStatFinished(KJob* job)
 void InformationPanel::slotInfoTimeout()
 {
     m_shownUrl = m_urlCandidate;
 void InformationPanel::slotInfoTimeout()
 {
     m_shownUrl = m_urlCandidate;

+    m_urlCandidate.clear();

     showItemInfo();
 }
 
     showItemInfo();
 }
 


@@ -287,12 +306,13 @@ void InformationPanel::cancelRequest()
 {
     delete m_folderStatJob;
     m_folderStatJob = 0;
 {
     delete m_folderStatJob;
     m_folderStatJob = 0;

+

     m_infoTimer->stop();
     m_infoTimer->stop();

-}
+    m_urlChangedTimer->stop();
+    m_resetUrlTimer->stop();

 
 

-bool InformationPanel::showMultipleSelectionInfo() const
-{
-    return m_fileItem.isNull() && (m_selection.count() > 1);
+    m_invalidUrlCandidate.clear();
+    m_urlCandidate.clear();

 }
 
 bool InformationPanel::isEqualToShownUrl(const KUrl& url) const
 }
 
 bool InformationPanel::isEqualToShownUrl(const KUrl& url) const