The &-shortcut from another action is not set until the action has been shown at...

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

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index b18e6b26e53a1f1eb25cc4b829c89dba7557f0e0..b6a41ca3d211c12d13b4f36b1e9854e2c347d946 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -55,7 +55,7 @@
 #include "pixmapviewer.h"
 
 InformationPanelContent::InformationPanelContent(QWidget* parent) :
 #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),


@@ -87,6 +87,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()));


@@ -148,11 +149,11 @@ 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)) {
         setNameLabelText(item.text());
     if (!applyPlace(itemUrl)) {
         setNameLabelText(item.text());

-        if (isNepomukSearchUrl) {
-            // in the case of a Nepomuk query-URL the URL is not readable for humans
+        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",
             // (at least not useful to show in the Information Panel)
             KIconLoader iconLoader;
             QPixmap icon = iconLoader.loadIcon("nepomuk",


@@ -261,7 +262,7 @@ 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()


@@ -323,10 +324,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);
 }