Use capitalized KDE includes

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

diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index 028f0ae0c82e04eb450eb7e994533799ee4fa551..81afc1487532b9f4160ce0655dda31effbbb821c 100644 (file)
--- a/src/panels/information/informationpanel.cpp
+++ b/src/panels/information/informationpanel.cpp
@@ -18,9 +18,13 @@
  ***************************************************************************/
 
 #include "informationpanel.h"
  ***************************************************************************/
 
 #include "informationpanel.h"

+
+#include "informationpanelcontent.h"
+#include <KIO/Job>

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

+#include <QApplication>

 #include <QShowEvent>
 #include <QShowEvent>

-#include "informationpanelcontent.h"
+#include <QVBoxLayout>

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


@@ -33,6 +37,7 @@ InformationPanel::InformationPanel(QWidget* parent) :
     m_invalidUrlCandidate(),
     m_fileItem(),
     m_selection(),
     m_invalidUrlCandidate(),
     m_fileItem(),
     m_selection(),

+    m_folderStatJob(0),

     m_content(0)
 {
 }
     m_content(0)
 {
 }


@@ -41,31 +46,6 @@ InformationPanel::~InformationPanel()
 {
 }
 
 {
 }
 

-QSize InformationPanel::sizeHint() const
-{
-    QSize size = Panel::sizeHint();
-    size.setWidth(minimumSizeHint().width());
-    return size;
-}
-
-void InformationPanel::setUrl(const KUrl& url)
-{
-    Panel::setUrl(url);
-    if (url.isValid() && !isEqualToShownUrl(url)) {
-        if (isVisible()) {
-            cancelRequest();
-            m_shownUrl = url;
-            // 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();
-        } else {
-            m_shownUrl = url;
-        }
-    }
-}
-

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


@@ -81,6 +61,7 @@ void InformationPanel::setSelection(const KFileItemList& selection)
     }
 
     m_selection = selection;
     }
 
     m_selection = selection;

+    m_fileItem = KFileItem();

 
     const int count = selection.count();
     if (count == 0) {
 
     const int count = selection.count();
     if (count == 0) {


@@ -98,29 +79,60 @@ void InformationPanel::setSelection(const KFileItemList& selection)
 
 void InformationPanel::requestDelayedItemInfo(const KFileItem& item)
 {
 
 void InformationPanel::requestDelayedItemInfo(const KFileItem& item)
 {

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

         return;
     }
 
     cancelRequest();
 
         return;
     }
 
     cancelRequest();
 

-    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) {

+            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
+        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);


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

+
+        m_shownUrl = url();

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


@@ -146,7 +160,8 @@ void InformationPanel::resizeEvent(QResizeEvent* event)
 
 void InformationPanel::contextMenuEvent(QContextMenuEvent* event)
 {
 
 void InformationPanel::contextMenuEvent(QContextMenuEvent* event)
 {

-    m_content->configureSettings();
+    // TODO: Move code from InformationPanelContent::configureSettings() here
+    m_content->configureSettings(customContextMenuActions());

     Panel::contextMenuEvent(event);
 }
 
     Panel::contextMenuEvent(event);
 }
 


@@ -158,31 +173,42 @@ 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;
         } else if (!m_selection.isEmpty()) {
             Q_ASSERT(m_selection.count() == 1);
             item = m_selection.first();
         KFileItem item;
         if (!m_fileItem.isNull()) {
             item = m_fileItem;
         } else if (!m_selection.isEmpty()) {
             Q_ASSERT(m_selection.count() == 1);
             item = m_selection.first();

-        } else {
-            // no item is hovered and no selection has been done: provide
-            // an item for the directory represented by m_shownUrl
-            m_fileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_shownUrl);
-            m_fileItem.refresh();
-            item = m_fileItem;

         }
 
         }
 

-        m_content->showItem(item);
+        if (item.isNull()) {
+            // 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 {
+            m_content->showItem(item);
+        }

     }
 }
 
     }
 }
 

+void InformationPanel::slotFolderStatFinished(KJob* job)
+{
+    m_folderStatJob = 0;
+    const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
+    m_content->showItem(KFileItem(entry, m_shownUrl));
+}
+

 void InformationPanel::slotInfoTimeout()
 {
     m_shownUrl = m_urlCandidate;
 void InformationPanel::slotInfoTimeout()
 {
     m_shownUrl = m_urlCandidate;

+    m_urlCandidate.clear();

     showItemInfo();
 }
 
     showItemInfo();
 }
 


@@ -205,6 +231,15 @@ void InformationPanel::slotFileRenamed(const QString& source, const QString& des
     if (m_shownUrl == KUrl(source)) {
         m_shownUrl = KUrl(dest);
         m_fileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_shownUrl);
     if (m_shownUrl == KUrl(source)) {
         m_shownUrl = KUrl(dest);
         m_fileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_shownUrl);

+
+        if ((m_selection.count() == 1) && (m_selection[0].url() == KUrl(source))) {
+            m_selection[0] = m_fileItem;
+            // Implementation note: Updating the selection is only required if exactly one
+            // item is selected, as the name of the item is shown. If this should change
+            // in future: Before parsing the whole selection take care to test possible
+            // performance bottlenecks when renaming several hundreds of files.
+        }
+

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


@@ -255,19 +290,24 @@ void InformationPanel::slotLeftDirectory(const QString& directory)
         // The signal 'leftDirectory' is also emitted when a media
         // has been unmounted. In this case no directory change will be
         // done in Dolphin, but the Information Panel must be updated to
         // The signal 'leftDirectory' is also emitted when a media
         // has been unmounted. In this case no directory change will be
         // done in Dolphin, but the Information Panel must be updated to

-        // indicate an invalid directory.       
+        // indicate an invalid directory.

         markUrlAsInvalid();
     }
 }
 
 void InformationPanel::cancelRequest()
 {
         markUrlAsInvalid();
     }
 }
 
 void InformationPanel::cancelRequest()
 {

+    delete m_folderStatJob;
+    m_folderStatJob = 0;
+

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

-}
+    m_resetUrlTimer->stop();
+    // Don't reset m_urlChangedTimer. As it is assured that the timeout of m_urlChangedTimer
+    // has the smallest interval (see init()), it is not possible that the exceeded timer
+    // would overwrite an information provided by a selection or hovering.

 
 

-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


@@ -283,26 +323,27 @@ void InformationPanel::markUrlAsInvalid()
 
 void InformationPanel::init()
 {
 
 void InformationPanel::init()
 {

-    const int defaultDelay = 300;
-

     m_infoTimer = new QTimer(this);
     m_infoTimer = new QTimer(this);

-    m_infoTimer->setInterval(defaultDelay);
+    m_infoTimer->setInterval(300);

     m_infoTimer->setSingleShot(true);
     connect(m_infoTimer, SIGNAL(timeout()),
             this, SLOT(slotInfoTimeout()));
 
     m_urlChangedTimer = new QTimer(this);
     m_infoTimer->setSingleShot(true);
     connect(m_infoTimer, SIGNAL(timeout()),
             this, SLOT(slotInfoTimeout()));
 
     m_urlChangedTimer = new QTimer(this);

-    m_urlChangedTimer->setInterval(defaultDelay);
+    m_urlChangedTimer->setInterval(200);

     m_urlChangedTimer->setSingleShot(true);
     connect(m_urlChangedTimer, SIGNAL(timeout()),
             this, SLOT(showItemInfo()));
 
     m_resetUrlTimer = new QTimer(this);
     m_urlChangedTimer->setSingleShot(true);
     connect(m_urlChangedTimer, SIGNAL(timeout()),
             this, SLOT(showItemInfo()));
 
     m_resetUrlTimer = new QTimer(this);

-    m_resetUrlTimer->setInterval(defaultDelay * 3);
+    m_resetUrlTimer->setInterval(1000);

     m_resetUrlTimer->setSingleShot(true);
     connect(m_resetUrlTimer, SIGNAL(timeout()),
             this, SLOT(reset()));
 
     m_resetUrlTimer->setSingleShot(true);
     connect(m_resetUrlTimer, SIGNAL(timeout()),
             this, SLOT(reset()));
 

+    Q_ASSERT(m_urlChangedTimer->interval() < m_infoTimer->interval());
+    Q_ASSERT(m_urlChangedTimer->interval() < m_resetUrlTimer->interval());
+

     org::kde::KDirNotify* dirNotify = new org::kde::KDirNotify(QString(), QString(),
                                                                QDBusConnection::sessionBus(), this);
     connect(dirNotify, SIGNAL(FileRenamed(QString, QString)), SLOT(slotFileRenamed(QString, QString)));
     org::kde::KDirNotify* dirNotify = new org::kde::KDirNotify(QString(), QString(),
                                                                QDBusConnection::sessionBus(), this);
     connect(dirNotify, SIGNAL(FileRenamed(QString, QString)), SLOT(slotFileRenamed(QString, QString)));


@@ -313,6 +354,10 @@ void InformationPanel::init()
     connect(dirNotify, SIGNAL(leftDirectory(QString)), SLOT(slotLeftDirectory(QString)));
 
     m_content = new InformationPanelContent(this);
     connect(dirNotify, SIGNAL(leftDirectory(QString)), SLOT(slotLeftDirectory(QString)));
 
     m_content = new InformationPanelContent(this);

+    connect(m_content, SIGNAL(urlActivated(KUrl)), this, SIGNAL(urlActivated(KUrl)));
+
+    QVBoxLayout* layout = new QVBoxLayout(this);
+    layout->addWidget(m_content);

 
     m_initialized = true;
 }
 
     m_initialized = true;
 }