[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml
From:       Maks Orlovich <maksim () kde ! org>
Date:       2010-08-29 17:35:43
Message-ID: 20100829173543.6B74DAC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1169565 by orlovich:

Merged revision:r1169563 | orlovich | 2010-08-29 13:33:49 -0400 (Sun, 29 Aug 2010) | 8 lines

Create a StatusBarExtension and make sure to propagate the statusbar set on it to the child khtmlpart 
so if a plugin (e.g. adblock helper) tries to do statusbar stuff we use the konqueror statusbar and 
don't end up creating a second/kmainwindow one 

First part of fix for #234624

CCBUG:234624

 M  +6 -0      khtmlimage.cpp  
 M  +2 -0      khtmlimage.h  


--- trunk/KDE/kdelibs/khtml/khtmlimage.cpp #1169564:1169565
@@ -93,6 +93,9 @@
     m_ext = new KHTMLImageBrowserExtension( this );
     m_ext->setObjectName( "be" );
 
+    m_sbExt = new KParts::StatusBarExtension( this );
+    m_sbExt->setObjectName( "sbe" );
+
     // Remove unnecessary actions.
     delete actionCollection()->action( "setEncoding" );
     delete actionCollection()->action( "viewDocumentSource" );
@@ -134,6 +137,9 @@
 {
     static const QString &html = KGlobal::staticQString( "<html><body><img src=\"%1\"></body></html>" );
 
+    // Propagate statusbar to our kid part.
+    KParts::StatusBarExtension::childObject( m_khtml )->setStatusBar( m_sbExt->statusBar() );
+
     disposeImage();
 
     setUrl(url);
--- trunk/KDE/kdelibs/khtml/khtmlimage.h #1169564:1169565
@@ -23,6 +23,7 @@
 #include "khtml_part.h"
 #include <kparts/factory.h>
 #include <kparts/browserextension.h>
+#include <kparts/statusbarextension.h>
 
 #include "misc/loader_client.h"
 
@@ -96,6 +97,7 @@
 
     QPointer<KHTMLPart> m_khtml;
     KParts::BrowserExtension *m_ext;
+    KParts::StatusBarExtension *m_sbExt;
     QString m_mimeType;
     khtml::CachedImage *m_image;
     int m_xOffset, m_yOffset;
[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic