SVN_SILENT made messages (.desktop file)

[dolphin.git] / src / infosidebarpage.cpp

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index a9cc356d41c0b4fea31dc2e5101c84701ec179a3..002b1ffdddea3f6e6143921f043f2ad7a3eb41db 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -76,6 +76,7 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
     m_nameLabel->setFont(font);
     m_nameLabel->setAlignment(Qt::AlignHCenter);
     m_nameLabel->setWordWrap(true);
+    m_nameLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 
     // preview
     m_preview = new PixmapViewer(this);
@@ -85,11 +86,13 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
     if (MetaDataWidget::metaDataAvailable()) {
         // rating, comment and tags
         m_metaDataWidget = new MetaDataWidget(this);
+        m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     }
 
     // general meta text information
     m_metaTextLabel = new MetaTextLabel(this);
     m_metaTextLabel->setMinimumWidth(spacing);
+    m_metaTextLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 
     layout->addWidget(m_nameLabel);
     layout->addWidget(new KSeparator(this));
@@ -152,6 +155,7 @@ void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item)
         // The cursor is above the viewport. If files are selected,
         // show information regarding the selection.
         if (m_selection.size() > 0) {
+            m_pendingPreview = false;
             m_timer->start(TimerDelay);
         }
     } else if (!item.url().isEmpty()) {
@@ -346,7 +350,7 @@ void InfoSidebarPage::showMetaInfo()
             m_metaDataWidget->setFiles(urls);
         }
 
-        unsigned long int totalSize = 0;
+        quint64 totalSize = 0;
         foreach (const KFileItem& item, m_selection) {
             // Only count the size of files, not dirs to match what
             // DolphinViewContainer::selectionStatusBarText() does.