assure that the Dolphin KPart inside Konqueror gets updated when the settings are...

[dolphin.git] / src / infosidebarpage.cpp

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 785d650d1d09d7adbecd02776104f70991958d67..331720bce04aa2a9cb4f490f8cf6260ff131dec0 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -35,8 +35,10 @@
 #include <QEvent>
 #include <QInputDialog>
 #include <QLabel>
+#include <QPainter>
 #include <QPixmap>
 #include <QResizeEvent>
+#include <QStyleOptionMenuItem>
 #include <QTimer>
 #include <QVBoxLayout>
 
@@ -45,6 +47,37 @@
 #include "metatextlabel.h"
 #include "pixmapviewer.h"
 
+class InfoSeparator : public QWidget
+{
+public:
+    InfoSeparator(QWidget* parent);
+    virtual ~InfoSeparator();
+
+protected:
+    virtual void paintEvent(QPaintEvent* event);
+};
+
+InfoSeparator::InfoSeparator(QWidget* parent) :
+    QWidget(parent)
+{
+    setMinimumSize(0, 8);
+}
+
+InfoSeparator::~InfoSeparator()
+{
+}
+
+void InfoSeparator::paintEvent(QPaintEvent* event)
+{
+    Q_UNUSED(event);
+    QPainter painter(this);
+
+    QStyleOptionMenuItem option;
+    option.initFrom(this);
+    option.menuItemType = QStyleOptionMenuItem::Separator;
+    style()->drawControl(QStyle::CE_MenuItem, &option, &painter, this);
+}
+
 InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
     SidebarPage(parent),
     m_pendingPreview(false),
@@ -89,9 +122,12 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
     m_metaTextLabel->setMinimumWidth(spacing);
 
     layout->addWidget(m_nameLabel);
+    layout->addWidget(new InfoSeparator(this));
     layout->addWidget(m_preview);
+    layout->addWidget(new InfoSeparator(this));
     if (m_metaDataWidget != 0) {
         layout->addWidget(m_metaDataWidget);
+        layout->addWidget(new InfoSeparator(this));
     }
     layout->addWidget(m_metaTextLabel);
 
@@ -113,6 +149,7 @@ QSize InfoSidebarPage::sizeHint() const
 
 void InfoSidebarPage::setUrl(const KUrl& url)
 {
+    SidebarPage::setUrl(url);
     if (url.isValid() && !m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
         cancelRequest();
         m_shownUrl = url;
@@ -123,13 +160,17 @@ void InfoSidebarPage::setUrl(const KUrl& url)
 void InfoSidebarPage::setSelection(const KFileItemList& selection)
 {
     SidebarPage::setSelection(selection);
-    if (selection.size() == 1) {
-        const KUrl url = selection.first().url();
-        if (!url.isEmpty()) {
-            m_urlCandidate = url;
+
+    const int count = selection.count();
+    if (count == 0) {
+        m_shownUrl = url();
+        showItemInfo();
+    } else {
+        if ((count == 1) && !selection.first().url().isEmpty()) {
+            m_urlCandidate = selection.first().url();
         }
+        m_timer->start(TimerDelay);
     }
-    m_timer->start(TimerDelay);
 }
 
 void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item)
@@ -137,24 +178,25 @@ void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item)
     cancelRequest();
 
     m_fileItem = KFileItem();
-
-    if (!item.isNull() && (selection().size() <= 1)) {
-        const KUrl url = item.url();
-        if (!url.isEmpty()) {
-            m_urlCandidate = url;
-            m_fileItem = item;
+    if (item.isNull()) {
+        // The cursor is above the viewport. If files are selected,
+        // show information regarding the selection.
+        if (selection().size() > 0) {
             m_timer->start(TimerDelay);
         }
+    } else if (!item.url().isEmpty()) {
+        m_urlCandidate = item.url();
+        m_fileItem = item;
+        m_timer->start(TimerDelay);
     }
 }
 
 void InfoSidebarPage::showEvent(QShowEvent* event)
 {
     SidebarPage::showEvent(event);
-    if (event->spontaneous()) {
-        return;
+    if (!event->spontaneous()) {
+        showItemInfo();
     }
-    showItemInfo();
 }
 
 void InfoSidebarPage::resizeEvent(QResizeEvent* event)
@@ -184,24 +226,19 @@ void InfoSidebarPage::showItemInfo()
     cancelRequest();
 
     const KFileItemList& selectedItems = selection();
-
-    KUrl file;
-    if (selectedItems.isEmpty()) {
-        file = m_shownUrl;
-    } else {
-        file = selectedItems[0].url();
-    }
+    const KUrl file = (!m_fileItem.isNull() || selectedItems.isEmpty()) ? m_shownUrl : selectedItems[0].url();
     if (!file.isValid()) {
         return;
     }
-    const int itemCount = selectedItems.count();
-    if (itemCount > 1) {
+
+    const int selectionCount = selectedItems.count();
+    if (m_fileItem.isNull() && (selectionCount > 1)) {
         KIconLoader iconLoader;
-        QPixmap icon = iconLoader.loadIcon("system-run",
+        QPixmap icon = iconLoader.loadIcon("dialog-information",
                                            KIconLoader::NoGroup,
-                                           m_preview->width());
+                                           KIconLoader::SizeEnormous);
         m_preview->setPixmap(icon);
-        m_nameLabel->setText(i18ncp("@info", "%1 item selected", "%1 items selected", selectedItems.count()));
+        m_nameLabel->setText(i18ncp("@info", "%1 item selected", "%1 items selected", selectionCount));
     } else if (!applyPlace(file)) {
         // try to get a preview pixmap from the item...
         KUrl::List list;
@@ -275,7 +312,6 @@ bool InfoSidebarPage::applyPlace(const KUrl& url)
 void InfoSidebarPage::cancelRequest()
 {
     m_timer->stop();
-    m_pendingPreview = false;
 }
 
 void InfoSidebarPage::showMetaInfo()
@@ -283,7 +319,7 @@ void InfoSidebarPage::showMetaInfo()
     m_metaTextLabel->clear();
 
     const KFileItemList& selectedItems = selection();
-    if (selectedItems.size() <= 1) {
+    if ((selectedItems.size() <= 1) || !m_fileItem.isNull()) {
         KFileItem fileItem;
         if (m_fileItem.isNull()) {
             // no pending request is ongoing
@@ -295,6 +331,7 @@ void InfoSidebarPage::showMetaInfo()
 
         if (fileItem.isDir()) {
             m_metaTextLabel->add(i18nc("@label", "Type:"), i18nc("@label", "Folder"));
+            m_metaTextLabel->add(i18nc("@label", "Modified:"), fileItem.timeString());
         } else {
             m_metaTextLabel->add(i18nc("@label", "Type:"), fileItem.mimeComment());