Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / infosidebarpage.cpp

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index b7490625fb861deb97574bfa17b95e14020b09ed..bed20b1f5942905fade68b191947e43065634dad 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -66,8 +66,8 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
 
     // preview
     m_preview = new PixmapViewer(this);
 
     // preview
     m_preview = new PixmapViewer(this);

-    m_preview->setMinimumWidth(K3Icon::SizeEnormous);
-    m_preview->setFixedHeight(K3Icon::SizeEnormous);
+    m_preview->setMinimumWidth(KIconLoader::SizeEnormous);
+    m_preview->setFixedHeight(KIconLoader::SizeEnormous);

 
     // name
     m_nameLabel = new QLabel(this);
 
     // name
     m_nameLabel = new QLabel(this);


@@ -77,8 +77,10 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
 
     // general information
     m_infoLabel = new QLabel(this);
 
     // general information
     m_infoLabel = new QLabel(this);

-    m_infoLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    m_infoLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);

     m_infoLabel->setTextFormat(Qt::RichText);
     m_infoLabel->setTextFormat(Qt::RichText);

+    m_infoLabel->setWordWrap(true);
+    m_infoLabel->setFont(KGlobalSettings::smallestReadableFont());

 
     if (MetaDataWidget::metaDataAvailable()) {
         m_metadataWidget = new MetaDataWidget(this);
 
     if (MetaDataWidget::metaDataAvailable()) {
         m_metadataWidget = new MetaDataWidget(this);


@@ -89,8 +91,8 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
     layout->addWidget(m_nameLabel);
     layout->addWidget(new KSeparator(this));
     layout->addWidget(m_infoLabel);
     layout->addWidget(m_nameLabel);
     layout->addWidget(new KSeparator(this));
     layout->addWidget(m_infoLabel);

-    layout->addWidget(new KSeparator(this));
-    if (m_metadataWidget) {
+    if (m_metadataWidget != 0) {
+        layout->addWidget(new KSeparator(this));

         layout->addWidget(m_metadataWidget);
     }
     // ensure that widgets in the information side bar are aligned towards the top
         layout->addWidget(m_metadataWidget);
     }
     // ensure that widgets in the information side bar are aligned towards the top


@@ -102,6 +104,13 @@ InfoSidebarPage::~InfoSidebarPage()
 {
 }
 
 {
 }
 

+QSize InfoSidebarPage::sizeHint() const
+{
+    QSize size = SidebarPage::sizeHint();
+    size.setWidth(minimumSizeHint().width());
+    return size;
+}
+

 void InfoSidebarPage::setUrl(const KUrl& url)
 {
     if (url.isValid() && !m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
 void InfoSidebarPage::setUrl(const KUrl& url)
 {
     if (url.isValid() && !m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {


@@ -114,6 +123,12 @@ void InfoSidebarPage::setUrl(const KUrl& url)
 void InfoSidebarPage::setSelection(const KFileItemList& selection)
 {
     SidebarPage::setSelection(selection);
 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;
+        }
+    }

     m_timer->start(TimerDelay);
 }
 
     m_timer->start(TimerDelay);
 }
 


@@ -166,7 +181,7 @@ void InfoSidebarPage::showItemInfo()
     if (selectedItems.isEmpty()) {
         file = m_shownUrl;
     } else {
     if (selectedItems.isEmpty()) {
         file = m_shownUrl;
     } else {

-        file = selectedItems[0]->url();
+        file = selectedItems[0].url();

     }
     if (!file.isValid()) {
         return;
     }
     if (!file.isValid()) {
         return;


@@ -174,12 +189,12 @@ void InfoSidebarPage::showItemInfo()
     const int itemCount = selectedItems.count();
     if (itemCount > 1) {
         KIconLoader iconLoader;
     const int itemCount = selectedItems.count();
     if (itemCount > 1) {
         KIconLoader iconLoader;

-        QPixmap icon = iconLoader.loadIcon("exec",
-                                           K3Icon::NoGroup,
-                                           K3Icon::SizeEnormous);
+        QPixmap icon = iconLoader.loadIcon("system-run",
+                                           KIconLoader::NoGroup,
+                                           KIconLoader::SizeEnormous);

         m_preview->setPixmap(icon);
         m_nameLabel->setText(i18ncp("@info", "%1 item selected", "%1 items selected", selectedItems.count()));
         m_preview->setPixmap(icon);
         m_nameLabel->setText(i18ncp("@info", "%1 item selected", "%1 items selected", selectedItems.count()));

-    } else if (!applyBookmark(file)) {
+    } else if (!applyPlace(file)) {

         // try to get a preview pixmap from the item...
         KUrl::List list;
         list.append(file);
         // try to get a preview pixmap from the item...
         KUrl::List list;
         list.append(file);


@@ -189,7 +204,7 @@ void InfoSidebarPage::showItemInfo()
 
         KIO::PreviewJob* job = KIO::filePreview(list,
                                                 m_preview->width(),
 
         KIO::PreviewJob* job = KIO::filePreview(list,
                                                 m_preview->width(),

-                                                K3Icon::SizeEnormous,
+                                                KIconLoader::SizeEnormous,

                                                 0,
                                                 0,
                                                 true,
                                                 0,
                                                 0,
                                                 true,


@@ -219,8 +234,8 @@ void InfoSidebarPage::slotTimeout()
 void InfoSidebarPage::showIcon(const KFileItem& item)
 {
     m_pendingPreview = false;
 void InfoSidebarPage::showIcon(const KFileItem& item)
 {
     m_pendingPreview = false;

-    if (!applyBookmark(item.url())) {
-        m_preview->setPixmap(item.pixmap(K3Icon::SizeEnormous));
+    if (!applyPlace(item.url())) {
+        m_preview->setPixmap(item.pixmap(KIconLoader::SizeEnormous));

     }
 }
 
     }
 }
 


@@ -234,7 +249,7 @@ void InfoSidebarPage::showPreview(const KFileItem& item,
     }
 }
 
     }
 }
 

-bool InfoSidebarPage::applyBookmark(const KUrl& url)
+bool InfoSidebarPage::applyPlace(const KUrl& url)

 {
     KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
     int count = placesModel->rowCount();
 {
     KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
     int count = placesModel->rowCount();


@@ -272,7 +287,7 @@ void InfoSidebarPage::showMetaInfo()
         fileItem.refresh();
 
         if (fileItem.isDir()) {
         fileItem.refresh();
 
         if (fileItem.isDir()) {

-            addInfoLine(text, i18nc("@label", "Type:"), i18nc("@info", "Folder"));
+            addInfoLine(text, i18nc("@label", "Type:"), i18nc("@label", "Folder"));

         } else {
             addInfoLine(text, i18nc("@label", "Type:"), fileItem.mimeComment());
 
         } else {
             addInfoLine(text, i18nc("@label", "Type:"), fileItem.mimeComment());
 


@@ -282,7 +297,12 @@ void InfoSidebarPage::showMetaInfo()
 
             // TODO: See convertMetaInfo below, find a way to display only interesting information
             // in a readable way
 
             // TODO: See convertMetaInfo below, find a way to display only interesting information
             // in a readable way

-            const KFileMetaInfo metaInfo(fileItem.url());
+            const KFileMetaInfo::WhatFlags flags = KFileMetaInfo::Fastest |
+                                                   KFileMetaInfo::TechnicalInfo |
+                                                   KFileMetaInfo::ContentInfo |
+                                                   KFileMetaInfo::Thumbnail;
+            const QString path = fileItem.url().url();
+            const KFileMetaInfo metaInfo(path, QString(), flags);

             if (metaInfo.isValid()) {
                 const QHash<QString, KFileMetaInfoItem>& items = metaInfo.items();
                 QHash<QString, KFileMetaInfoItem>::const_iterator it = items.constBegin();
             if (metaInfo.isValid()) {
                 const QHash<QString, KFileMetaInfoItem>& items = metaInfo.items();
                 QHash<QString, KFileMetaInfoItem>::const_iterator it = items.constBegin();


@@ -304,14 +324,18 @@ void InfoSidebarPage::showMetaInfo()
         }
     } else {
         if (MetaDataWidget::metaDataAvailable()) {
         }
     } else {
         if (MetaDataWidget::metaDataAvailable()) {

-            m_metadataWidget->setFiles(selectedItems.urlList());
+            KUrl::List urls;
+            foreach (const KFileItem& item, selectedItems) {
+                urls.append(item.url());
+            }
+            m_metadataWidget->setFiles(urls);

         }
 
         unsigned long int totalSize = 0;
         }
 
         unsigned long int totalSize = 0;

-        foreach (KFileItem* item, selectedItems) {
+        foreach (const KFileItem& item, selectedItems) {

             // TODO: what to do with directories (same with the one-item-selected-code)?,
             // TODO: what to do with directories (same with the one-item-selected-code)?,

-            // item->size() does not return the size of the content : not very instinctive for users
-            totalSize += item->size();
+            // item.size() does not return the size of the content : not very instinctive for users
+            totalSize += item.size();

         }
         addInfoLine(text, i18nc("@label", "Total size:"), KIO::convertSize(totalSize));
     }
         }
         addInfoLine(text, i18nc("@label", "Total size:"), KIO::convertSize(totalSize));
     }


@@ -322,7 +346,7 @@ void InfoSidebarPage::addInfoLine(QString& text,
                                   const QString& labelText,
                                   const QString& infoText)
 {
                                   const QString& labelText,
                                   const QString& infoText)
 {

-    if (!infoText.isEmpty()) {
+    if (!text.isEmpty()) {

         text += "<br/>";
     }
     text += QString("<b>%1</b> %2").arg(labelText).arg(infoText);
         text += "<br/>";
     }
     text += QString("<b>%1</b> %2").arg(labelText).arg(infoText);