From e4c17c961d145bb6c4c945e1d7be4eea702abecf Mon Sep 17 00:00:00 2001 From: matgic78 Date: Sun, 22 Nov 2009 11:46:44 +0100 Subject: ClickToFlash : first step For now, no config and only working when there is only one flash in the page --- src/clicktoflash.cpp | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 src/clicktoflash.cpp (limited to 'src/clicktoflash.cpp') diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp new file mode 100644 index 00000000..d89c1ec5 --- /dev/null +++ b/src/clicktoflash.cpp @@ -0,0 +1,142 @@ +/** + * Copyright (c) 2009, Benjamin C. Meyer + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "clicktoflash.h" + +#include + +#include +#include +#include +#include +#include +#include + +#include + +ClickToFlash::ClickToFlash(const WebPluginFactory *factory, QWidget *parent) + : QWidget(parent) + , m_factory(factory) +{ + + kDebug() << "creating clicktoflash"; + QHBoxLayout *l = new QHBoxLayout(this); + setLayout(l); + + QToolButton *button = new QToolButton(this); + button->setPopupMode(QToolButton::InstantPopup); + button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + button->setText(i18n("Load animation")); + button->setAutoRaise(false); + layout()->addWidget(button); + connect(button, SIGNAL(clicked(bool)), this, SLOT(load(bool))); +} + +/*void ClickToFlash::showContextMenu() +{ + QMenu menu; + menu.addAction(tr("Load"), this, SLOT(load())); + menu.addAction(tr("Load All"), this, SLOT(loadAll())); + menu.addSeparator(); + QString host = url.host(); + QAction *add = menu.addAction(tr("Add %1 to Whitelist").arg(host), this, SLOT(addToWhitelist())); + QAction *remove = menu.addAction(tr("Remove from Whitelist"), this, SLOT(removeFromWhitelist())); + bool onWhitelist = m_plugin->onWhitelist(host); + add->setEnabled(!onWhitelist); + remove->setEnabled(onWhitelist); + menu.addSeparator(); + menu.addAction(tr("Settings"), this, SLOT(configure())); + menu.exec(QCursor::pos()); +} + +void ClickToFlash::addToWhitelist() +{ + m_plugin->addToWhitelist(url.host()); +} + +void ClickToFlash::removeFromWhitelist() +{ + m_plugin->removeFromWhitelist(url.host()); +} + +void ClickToFlash::configure() +{ + m_plugin->configure(); +} + +void ClickToFlash::loadAll() +{ + load(true); +} +*/ +void ClickToFlash::load(bool loadAll) +{ + QWidget *parent = parentWidget(); + QWebView *view = 0; + while (parent) + { + if (QWebView *aView = qobject_cast(parent)) + { + view = aView; + break; + } + parent = parent->parentWidget(); + } + if (!view) + return; + + const QString selector = QLatin1String("%1[type=\"application/x-shockwave-flash\"]"); + + hide(); + + QList frames; + frames.append(view->page()->mainFrame()); + while (!frames.isEmpty()) + { + QWebFrame *frame = frames.takeFirst(); + QWebElement docElement = frame->documentElement(); + + QWebElementCollection elements; + elements.append(docElement.findAll(selector.arg(QLatin1String("object")))); + elements.append(docElement.findAll(selector.arg(QLatin1String("embed")))); + + QWebElement element; + foreach (element, elements) + { + QWebElement substitute = element.clone(); + emit signalLoadClickToFlash(true); + element.replace(substitute); + } + + frames += frame->childFrames(); + } + + deleteLater(); +} + + -- cgit v1.2.1 From 19d7611101253c27a841480fca55f1bc5cd767b6 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Sun, 22 Nov 2009 14:53:33 +0100 Subject: clicktoflash : step 2 make it work when there are more than one plugin in the same page --- src/clicktoflash.cpp | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) (limited to 'src/clicktoflash.cpp') diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp index d89c1ec5..39d55e5a 100644 --- a/src/clicktoflash.cpp +++ b/src/clicktoflash.cpp @@ -39,9 +39,9 @@ #include -ClickToFlash::ClickToFlash(const WebPluginFactory *factory, QWidget *parent) +ClickToFlash::ClickToFlash(const WebPluginFactory *factory, QUrl pluginUrl, QWidget *parent) : QWidget(parent) - , m_factory(factory) + , m_url(pluginUrl) { kDebug() << "creating clicktoflash"; @@ -96,6 +96,7 @@ void ClickToFlash::loadAll() */ void ClickToFlash::load(bool loadAll) { + kDebug() << "called"; QWidget *parent = parentWidget(); QWebView *view = 0; while (parent) @@ -126,17 +127,37 @@ void ClickToFlash::load(bool loadAll) elements.append(docElement.findAll(selector.arg(QLatin1String("embed")))); QWebElement element; + kDebug() << m_url; + bool isRightElement = false; foreach (element, elements) { - QWebElement substitute = element.clone(); - emit signalLoadClickToFlash(true); - element.replace(substitute); + // TODO : find a proper solution to compare a QWebElement with a plugin + if(QUrl(element.attribute("data")) == m_url + || QUrl(element.attribute("src")) == m_url) + isRightElement = true; + + QWebElementCollection collec = element.findAll("param"); + int i = 0; + while(i < collec.count() && isRightElement == false) + { + if(QUrl(collec.at(i).attribute("value")) == m_url) + isRightElement = true; + i++; + } + + if(isRightElement) + { + QWebElement substitute = element.clone(); + emit signalLoadClickToFlash(true); + element.replace(substitute); + return; + } } frames += frame->childFrames(); } - deleteLater(); + //deleteLater(); } -- cgit v1.2.1 From 07270fd5b8331cc33a98ff43fbbc72d87a4431a1 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Wed, 25 Nov 2009 15:20:29 +0100 Subject: clicktoflash : cleanup --- src/clicktoflash.cpp | 73 +++++++++++++++------------------------------------- 1 file changed, 21 insertions(+), 52 deletions(-) (limited to 'src/clicktoflash.cpp') diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp index 39d55e5a..9c11dc57 100644 --- a/src/clicktoflash.cpp +++ b/src/clicktoflash.cpp @@ -36,10 +36,12 @@ #include #include #include +#include +#include #include -ClickToFlash::ClickToFlash(const WebPluginFactory *factory, QUrl pluginUrl, QWidget *parent) +ClickToFlash::ClickToFlash(QUrl pluginUrl, QWidget *parent) : QWidget(parent) , m_url(pluginUrl) { @@ -54,49 +56,14 @@ ClickToFlash::ClickToFlash(const WebPluginFactory *factory, QUrl pluginUrl, QWid button->setText(i18n("Load animation")); button->setAutoRaise(false); layout()->addWidget(button); - connect(button, SIGNAL(clicked(bool)), this, SLOT(load(bool))); + connect(button, SIGNAL(clicked(bool)), this, SLOT(load())); } -/*void ClickToFlash::showContextMenu() -{ - QMenu menu; - menu.addAction(tr("Load"), this, SLOT(load())); - menu.addAction(tr("Load All"), this, SLOT(loadAll())); - menu.addSeparator(); - QString host = url.host(); - QAction *add = menu.addAction(tr("Add %1 to Whitelist").arg(host), this, SLOT(addToWhitelist())); - QAction *remove = menu.addAction(tr("Remove from Whitelist"), this, SLOT(removeFromWhitelist())); - bool onWhitelist = m_plugin->onWhitelist(host); - add->setEnabled(!onWhitelist); - remove->setEnabled(onWhitelist); - menu.addSeparator(); - menu.addAction(tr("Settings"), this, SLOT(configure())); - menu.exec(QCursor::pos()); -} - -void ClickToFlash::addToWhitelist() -{ - m_plugin->addToWhitelist(url.host()); -} - -void ClickToFlash::removeFromWhitelist() -{ - m_plugin->removeFromWhitelist(url.host()); -} -void ClickToFlash::configure() +void ClickToFlash::load() { - m_plugin->configure(); -} - -void ClickToFlash::loadAll() -{ - load(true); -} -*/ -void ClickToFlash::load(bool loadAll) -{ - kDebug() << "called"; + //bool loadAll = true; + QWidget *parent = parentWidget(); QWebView *view = 0; while (parent) @@ -125,28 +92,30 @@ void ClickToFlash::load(bool loadAll) QWebElementCollection elements; elements.append(docElement.findAll(selector.arg(QLatin1String("object")))); elements.append(docElement.findAll(selector.arg(QLatin1String("embed")))); - - QWebElement element; - kDebug() << m_url; + bool isRightElement = false; - foreach (element, elements) + foreach (QWebElement element, elements) { // TODO : find a proper solution to compare a QWebElement with a plugin + // With this "manual" test, it's probably not working everywhere if(QUrl(element.attribute("data")) == m_url - || QUrl(element.attribute("src")) == m_url) + || QUrl(element.attribute("src")) == m_url) isRightElement = true; - - QWebElementCollection collec = element.findAll("param"); - int i = 0; - while(i < collec.count() && isRightElement == false) + else { - if(QUrl(collec.at(i).attribute("value")) == m_url) + QWebElementCollection collec = element.findAll("param"); + int i = 0; + while(i < collec.count() && isRightElement == false) + { + if(QUrl(collec.at(i).attribute("value")) == m_url) isRightElement = true; - i++; + i++; + } } if(isRightElement) { + kDebug() << "called"; QWebElement substitute = element.clone(); emit signalLoadClickToFlash(true); element.replace(substitute); @@ -157,7 +126,7 @@ void ClickToFlash::load(bool loadAll) frames += frame->childFrames(); } - //deleteLater(); + deleteLater(); } -- cgit v1.2.1 From fb6097991a4b5e166447150884d07667adba169b Mon Sep 17 00:00:00 2001 From: matgic78 Date: Wed, 25 Nov 2009 19:11:40 +0100 Subject: clicktoflash : more cleanup --- src/clicktoflash.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/clicktoflash.cpp') diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp index 9c11dc57..1fd36e4c 100644 --- a/src/clicktoflash.cpp +++ b/src/clicktoflash.cpp @@ -28,25 +28,19 @@ #include "clicktoflash.h" -#include - -#include -#include #include #include #include #include -#include +#include + +#include -#include -#include ClickToFlash::ClickToFlash(QUrl pluginUrl, QWidget *parent) : QWidget(parent) , m_url(pluginUrl) { - - kDebug() << "creating clicktoflash"; QHBoxLayout *l = new QHBoxLayout(this); setLayout(l); @@ -61,9 +55,7 @@ ClickToFlash::ClickToFlash(QUrl pluginUrl, QWidget *parent) void ClickToFlash::load() -{ - //bool loadAll = true; - +{ QWidget *parent = parentWidget(); QWebView *view = 0; while (parent) @@ -115,7 +107,6 @@ void ClickToFlash::load() if(isRightElement) { - kDebug() << "called"; QWebElement substitute = element.clone(); emit signalLoadClickToFlash(true); element.replace(substitute); -- cgit v1.2.1