Use capitalized KDE includes

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

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 73f2626c470f8b8d2b0911f1cc28be3eb1da3642..04e13060d23501afd2675a49a3743469256ca093 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -19,17 +19,18 @@
 
 #include "informationpanelcontent.h"
 
 
 #include "informationpanelcontent.h"
 

-#include <kdialog.h>
-#include <kfileitem.h>
+#include <KDialog>
+#include <KFileItem>

 #include <kfilemetadatawidget.h>
 #include <kfilemetadatawidget.h>

-#include <kfileplacesmodel.h>
-#include <kglobalsettings.h>
-#include <kio/previewjob.h>
-#include <kiconeffect.h>
-#include <kiconloader.h>
-#include <klocale.h>
-#include <kmenu.h>
+#include <KFilePlacesModel>
+#include <KGlobalSettings>
+#include <KIO/PreviewJob>
+#include <KIconEffect>
+#include <KIconLoader>
+#include <KLocale>
+#include <KMenu>

 #include <kseparator.h>
 #include <kseparator.h>

+#include <KStringHandler>

 
 #include <Phonon/BackendCapabilities>
 #include <Phonon/MediaObject>
 
 #include <Phonon/BackendCapabilities>
 #include <Phonon/MediaObject>


@@ -41,19 +42,20 @@
 #include <QPointer>
 #include <QResizeEvent>
 #include <QScrollArea>
 #include <QPointer>
 #include <QResizeEvent>
 #include <QScrollArea>

+#include <QTextDocument>

 #include <QTextLayout>
 #include <QTextLine>
 #include <QTimer>
 #include <QVBoxLayout>
 
 #include "dolphin_informationpanelsettings.h"
 #include <QTextLayout>
 #include <QTextLine>
 #include <QTimer>
 #include <QVBoxLayout>
 
 #include "dolphin_informationpanelsettings.h"

+#include "filemetadataconfigurationdialog.h"

 #include "settings/dolphinsettings.h"
 #include "settings/dolphinsettings.h"

-#include "settings/filemetadataconfigurationdialog.h"

 #include "phononwidget.h"
 #include "pixmapviewer.h"
 
 InformationPanelContent::InformationPanelContent(QWidget* parent) :
 #include "phononwidget.h"
 #include "pixmapviewer.h"
 
 InformationPanelContent::InformationPanelContent(QWidget* parent) :

-    Panel(parent),
+    QWidget(parent),

     m_item(),
     m_pendingPreview(false),
     m_outdatedPreviewTimer(0),
     m_item(),
     m_pendingPreview(false),
     m_outdatedPreviewTimer(0),


@@ -61,7 +63,8 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_phononWidget(0),
     m_nameLabel(0),
     m_metaDataWidget(0),
     m_phononWidget(0),
     m_nameLabel(0),
     m_metaDataWidget(0),

-    m_metaDataArea(0)
+    m_metaDataArea(0),
+    m_enabledPlugins()

 {
     parent->installEventFilter(this);
 
 {
     parent->installEventFilter(this);
 


@@ -85,6 +88,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_preview->setMinimumHeight(KIconLoader::SizeEnormous);
 
     m_phononWidget = new PhononWidget(parent);
     m_preview->setMinimumHeight(KIconLoader::SizeEnormous);
 
     m_phononWidget = new PhononWidget(parent);

+    m_phononWidget->hide();

     m_phononWidget->setMinimumWidth(minPreviewWidth);
     connect(m_phononWidget, SIGNAL(playingStarted()),
             this, SLOT(slotPlayingStarted()));
     m_phononWidget->setMinimumWidth(minPreviewWidth);
     connect(m_phononWidget, SIGNAL(playingStarted()),
             this, SLOT(slotPlayingStarted()));


@@ -146,17 +150,17 @@ void InformationPanelContent::showItem(const KFileItem& item)
     m_pendingPreview = false;
 
     const KUrl itemUrl = item.url();
     m_pendingPreview = false;
 
     const KUrl itemUrl = item.url();

-    const bool isNepomukSearchUrl = itemUrl.protocol().startsWith("nepomuk") && item.nepomukUri().isEmpty();
+    const bool isSearchUrl = itemUrl.protocol().contains("search") && item.nepomukUri().isEmpty();

     if (!applyPlace(itemUrl)) {
     if (!applyPlace(itemUrl)) {

-        if (isNepomukSearchUrl) {
-            // in the case of a Nepomuk query-URL the URL is not readable for humans
+        setNameLabelText(item.text());
+        if (isSearchUrl) {
+            // in the case of a search-URL the URL is not readable for humans

             // (at least not useful to show in the Information Panel)
             KIconLoader iconLoader;
             QPixmap icon = iconLoader.loadIcon("nepomuk",
                                                KIconLoader::NoGroup,
                                                KIconLoader::SizeEnormous);
             m_preview->setPixmap(icon);
             // (at least not useful to show in the Information Panel)
             KIconLoader iconLoader;
             QPixmap icon = iconLoader.loadIcon("nepomuk",
                                                KIconLoader::NoGroup,
                                                KIconLoader::SizeEnormous);
             m_preview->setPixmap(icon);

-            setNameLabelText(QString());

         } else {
             // try to get a preview pixmap from the item...
             m_pendingPreview = true;
         } else {
             // try to get a preview pixmap from the item...
             m_pendingPreview = true;


@@ -170,30 +174,27 @@ void InformationPanelContent::showItem(const KFileItem& item)
                 m_outdatedPreviewTimer->start();
             }
 
                 m_outdatedPreviewTimer->start();
             }
 

-            KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << item,
-                                                    m_preview->width(),
-                                                    m_preview->height(),
-                                                    0,
-                                                    0,
-                                                    false,
-                                                    true);
+            if (m_enabledPlugins.isEmpty()) {
+                const KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
+                m_enabledPlugins = globalConfig.readEntry("Plugins", QStringList()
+                                                                     << "directorythumbnail"
+                                                                     << "imagethumbnail"
+                                                                     << "jpegthumbnail");
+            }
+
+            KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << item, m_preview->width(), m_preview->height(),
+                                                    0, 0, false, true, &m_enabledPlugins);

 
             connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
                     this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
             connect(job, SIGNAL(failed(const KFileItem&)),
                     this, SLOT(showIcon(const KFileItem&)));
 
             connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
                     this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
             connect(job, SIGNAL(failed(const KFileItem&)),
                     this, SLOT(showIcon(const KFileItem&)));

-
-            setNameLabelText(item.text());

         }
     }
 
     if (m_metaDataWidget != 0) {
         }
     }
 
     if (m_metaDataWidget != 0) {

-        if (isNepomukSearchUrl) {
-            m_metaDataWidget->hide();
-        } else {
-            m_metaDataWidget->show();
-            m_metaDataWidget->setItems(KFileItemList() << item);
-        }
+        m_metaDataWidget->show();
+        m_metaDataWidget->setItems(KFileItemList() << item);

     }
 
     if (InformationPanelSettings::showPreview()) {
     }
 
     if (InformationPanelSettings::showPreview()) {


@@ -207,7 +208,7 @@ void InformationPanelContent::showItem(const KFileItem& item)
                                       ? PhononWidget::Video
                                       : PhononWidget::Audio;
             m_phononWidget->setMode(mode);
                                       ? PhononWidget::Video
                                       : PhononWidget::Audio;
             m_phononWidget->setMode(mode);

-            m_phononWidget->setUrl(item.url());
+            m_phononWidget->setUrl(item.targetUrl());

             if ((mode == PhononWidget::Video) && m_preview->isVisible()) {
                 m_phononWidget->setVideoSize(m_preview->size());
             }
             if ((mode == PhononWidget::Video) && m_preview->isVisible()) {
                 m_phononWidget->setVideoSize(m_preview->size());
             }


@@ -265,10 +266,10 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
         break;
     }
 
         break;
     }
 

-    return Panel::eventFilter(obj, event);
+    return QWidget::eventFilter(obj, event);

 }
 
 }
 

-void InformationPanelContent::configureSettings()
+void InformationPanelContent::configureSettings(const QList<QAction*>& customContextMenuActions)

 {
     KMenu popup(this);
 
 {
     KMenu popup(this);
 


@@ -280,6 +281,11 @@ void InformationPanelContent::configureSettings()
     QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));
     configureAction->setIcon(KIcon("configure"));
 
     QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));
     configureAction->setIcon(KIcon("configure"));
 

+    popup.addSeparator();
+    foreach (QAction* action, customContextMenuActions) {
+        popup.addAction(action);
+    }
+

     // Open the popup and adjust the settings for the
     // selected action.
     QAction* action = popup.exec(QCursor::pos());
     // Open the popup and adjust the settings for the
     // selected action.
     QAction* action = popup.exec(QCursor::pos());


@@ -294,7 +300,7 @@ void InformationPanelContent::configureSettings()
     } else if (action == configureAction) {
         FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog();
         dialog->setDescription(i18nc("@label::textbox",
     } else if (action == configureAction) {
         FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog();
         dialog->setDescription(i18nc("@label::textbox",

-                                     "Select which data should be shown in the information panel."));
+                                     "Select which data should be shown in the information panel:"));

         dialog->setItems(m_metaDataWidget->items());
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
         dialog->setItems(m_metaDataWidget->items());
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();


@@ -308,7 +314,7 @@ void InformationPanelContent::showIcon(const KFileItem& item)
 {
     m_outdatedPreviewTimer->stop();
     m_pendingPreview = false;
 {
     m_outdatedPreviewTimer->stop();
     m_pendingPreview = false;

-    if (!applyPlace(item.url())) {
+    if (!applyPlace(item.targetUrl())) {

         m_preview->setPixmap(item.pixmap(KIconLoader::SizeEnormous));
     }
 }
         m_preview->setPixmap(item.pixmap(KIconLoader::SizeEnormous));
     }
 }


@@ -327,10 +333,10 @@ void InformationPanelContent::showPreview(const KFileItem& item,
 
 void InformationPanelContent::markOutdatedPreview()
 {
 
 void InformationPanelContent::markOutdatedPreview()
 {

-    KIconEffect iconEffect;
-    QPixmap disabledPixmap = iconEffect.apply(m_preview->pixmap(),
-                                              KIconLoader::Desktop,
-                                              KIconLoader::DisabledState);
+    KIconEffect *iconEffect = KIconLoader::global()->iconEffect();
+    QPixmap disabledPixmap = iconEffect->apply(m_preview->pixmap(),
+                                               KIconLoader::Desktop,
+                                               KIconLoader::DisabledState);

     m_preview->setPixmap(disabledPixmap);
 }
 
     m_preview->setPixmap(disabledPixmap);
 }
 


@@ -374,19 +380,21 @@ void InformationPanelContent::setNameLabelText(const QString& text)
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
 
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
 

-    QTextLayout textLayout(text);
+    const QString processedText = Qt::mightBeRichText(text) ? text : KStringHandler::preProcessWrap(text);
+
+    QTextLayout textLayout(processedText);

     textLayout.setFont(m_nameLabel->font());
     textLayout.setTextOption(textOption);
 
     QString wrappedText;
     textLayout.setFont(m_nameLabel->font());
     textLayout.setTextOption(textOption);
 
     QString wrappedText;

-    wrappedText.reserve(text.length());
+    wrappedText.reserve(processedText.length());

 
     // wrap the text to fit into the width of m_nameLabel
     textLayout.beginLayout();
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_nameLabel->width());
 
     // wrap the text to fit into the width of m_nameLabel
     textLayout.beginLayout();
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_nameLabel->width());

-        wrappedText += text.mid(line.textStart(), line.textLength());
+        wrappedText += processedText.mid(line.textStart(), line.textLength());

 
         line = textLayout.createLine();
         if (line.isValid()) {
 
         line = textLayout.createLine();
         if (line.isValid()) {