Merged widget_fix into master.

Conflicts:
	src/board/UBBoardController.cpp
	src/board/UBFeaturesController.cpp
	src/domain/UBAbstractWidget.cpp
	src/domain/UBGraphicsWidgetItem.cpp
	src/domain/UBGraphicsWidgetItem.h
	src/domain/UBW3CWidget.cpp
	src/domain/UBW3CWidget.h

src/adaptors/UBCFFSubsetAdaptor.cpp

@@ -31,7 +31,7 @@
 #include "domain/UBGraphicsWidgetItem.h"
 #include "domain/UBGraphicsTextItem.h"
 #include "domain/UBGraphicsTextItemDelegate.h"
-#include "domain/UBW3CWidget.h"
+#include "domain/UBGraphicsWidgetItem.h"
 
 #include "frameworks/UBFileSystemUtils.h"
 
@@ -776,7 +776,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgFlash(const QDomElement &ele
         return false;
     }
 
-    QString flashUrl = UBW3CWidget::createNPAPIWrapperInDir(flashPath, tmpFlashDir, "application/x-shockwave-flash"
+    QString flashUrl = UBGraphicsW3CWidgetItem::createNPAPIWrapperInDir(flashPath, tmpFlashDir, "application/x-shockwave-flash"
                                                             ,QSize(mCurrentSceneRect.width(), mCurrentSceneRect.height()));
     UBGraphicsWidgetItem *flashItem = mCurrentScene->addW3CWidget(QUrl::fromLocalFile(flashUrl));
     flashItem->setSourceUrl(urlPath);

src/adaptors/UBSvgSubsetAdaptor.cpp

@@ -27,7 +27,6 @@
 #include "domain/UBGraphicsPDFItem.h"
 #include "domain/UBGraphicsTextItem.h"
 #include "domain/UBGraphicsTextItemDelegate.h"
-#include "domain/UBAbstractWidget.h"
 #include "domain/UBGraphicsStroke.h"
 #include "domain/UBGraphicsStrokesGroup.h"
 #include "domain/UBGraphicsGroupContainerItem.h"
@@ -2488,7 +2487,7 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::graphicsW3CWidgetToSvg(UBGraphicsW3C
 
 void UBSvgSubsetAdaptor::UBSvgSubsetWriter::graphicsWidgetToSvg(UBGraphicsWidgetItem* item)
 {
-    QUrl widgetRootUrl = item->widgetWebView()->widgetUrl();
+    QUrl widgetRootUrl = item->widgetUrl();
     QString uuid = UBStringUtils::toCanonicalUuid(item->uuid());
     QString widgetDirectoryPath = UBPersistenceManager::widgetDirectory;
     if (widgetRootUrl.toString().startsWith("file://"))
@@ -2517,13 +2516,13 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::graphicsWidgetToSvg(UBGraphicsWidget
 
     graphicsItemToSvg(item);
 
-    if (item->widgetWebView()->isFrozen())
+    if (item->isFrozen())
     {
         mXmlWriter.writeAttribute(UBSettings::uniboardDocumentNamespaceUri, "frozen", xmlTrue);
     }
 
     QString snapshotPath = mDocumentPath + "/" + UBPersistenceManager::widgetDirectory + "/" + uuid + ".png";
-    item->widgetWebView()->takeSnapshot().save(snapshotPath, "PNG");
+    item->takeSnapshot().save(snapshotPath, "PNG");
 
     mXmlWriter.writeStartElement(nsXHtml, "iframe");
 
@@ -2532,10 +2531,10 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::graphicsWidgetToSvg(UBGraphicsWidget
     mXmlWriter.writeAttribute("height", QString("%1").arg(item->boundingRect().height()));
 
     QString startFileUrl;
-    if (item->widgetWebView()->mainHtmlFileName().startsWith("http://"))
-        startFileUrl = item->widgetWebView()->mainHtmlFileName();
+    if (item->mainHtmlFileName().startsWith("http://"))
+        startFileUrl = item->mainHtmlFileName();
     else
-        startFileUrl = widgetRootUrl.toString() + "/" + item->widgetWebView()->mainHtmlFileName();
+        startFileUrl = widgetRootUrl.toString() + "/" + item->mainHtmlFileName();
 
     mXmlWriter.writeAttribute("src", startFileUrl);
     mXmlWriter.writeEndElement(); //iFrame
@@ -2626,13 +2625,13 @@ UBGraphicsW3CWidgetItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::graphicsW3CWidge
 
     QPixmap snapshot(pixPath);
     if (!snapshot.isNull())
-        widgetItem->w3cWidget()->setSnapshot(snapshot);
+        widgetItem->setSnapshot(snapshot);
 
     QStringRef frozen = mXmlReader.attributes().value(mNamespaceUri, "frozen");
 
     if (!frozen.isNull() && frozen.toString() == xmlTrue && !snapshot.isNull())
     {
-        widgetItem->w3cWidget()->freeze();
+        widgetItem->freeze();
     }
 
     graphicsItemFromSvg(widgetItem);

src/adaptors/publishing/UBDocumentPublisher.cpp

@@ -281,12 +281,12 @@ void UBDocumentPublisher::upgradeDocumentForPublishing()
                 jsonFile.write(QString("      \"uuid\": \"%1\",\n").arg(UBStringUtils::toCanonicalUuid(widget->uuid())).toUtf8());
                 jsonFile.write(QString("      \"id\": \"%1\",\n").arg(widget->metadatas().id).toUtf8());
 
-                jsonFile.write(QString("      \"name\": \"%1\",\n").arg(widget->w3cWidget()->metadatas().name).toUtf8());
-                jsonFile.write(QString("      \"description\": \"%1\",\n").arg(widget->w3cWidget()->metadatas().description).toUtf8());
-                jsonFile.write(QString("      \"author\": \"%1\",\n").arg(widget->w3cWidget()->metadatas().author).toUtf8());
-                jsonFile.write(QString("      \"authorEmail\": \"%1\",\n").arg(widget->w3cWidget()->metadatas().authorEmail).toUtf8());
-                jsonFile.write(QString("      \"authorHref\": \"%1\",\n").arg(widget->w3cWidget()->metadatas().authorHref).toUtf8());
-                jsonFile.write(QString("      \"version\": \"%1\",\n").arg(widget->w3cWidget()->metadatas().authorHref).toUtf8());
+                jsonFile.write(QString("      \"name\": \"%1\",\n").arg(widget->metadatas().name).toUtf8());
+                jsonFile.write(QString("      \"description\": \"%1\",\n").arg(widget->metadatas().description).toUtf8());
+                jsonFile.write(QString("      \"author\": \"%1\",\n").arg(widget->metadatas().author).toUtf8());
+                jsonFile.write(QString("      \"authorEmail\": \"%1\",\n").arg(widget->metadatas().authorEmail).toUtf8());
+                jsonFile.write(QString("      \"authorHref\": \"%1\",\n").arg(widget->metadatas().authorHref).toUtf8());
+                jsonFile.write(QString("      \"version\": \"%1\",\n").arg(widget->metadatas().authorHref).toUtf8());
 
                 jsonFile.write(QString("      \"x\": %1,\n").arg(widget->sceneBoundingRect().x()).toUtf8());
                 jsonFile.write(QString("      \"y\": %1,\n").arg(widget->sceneBoundingRect().y()).toUtf8());
@@ -298,10 +298,10 @@ void UBDocumentPublisher::upgradeDocumentForPublishing()
 
                 QString url = UBPersistenceManager::widgetDirectory + "/" + widget->uuid().toString() + ".wgt";
                 jsonFile.write(QString("      \"src\": \"%1\",\n").arg(url).toUtf8());
-                QString startFile = widget->w3cWidget()->mainHtmlFileName();
+                QString startFile = widget->mainHtmlFileName();
                 jsonFile.write(QString("      \"startFile\": \"%1\",\n").arg(startFile).toUtf8());
 
-                QMap<QString, QString> preferences = widget->preferences();
+                QMap<QString, QString> preferences = widget->UBGraphicsWidgetItem::preferences();
 
                 jsonFile.write(QString("      \"preferences\": {\n").toUtf8());
 
@@ -360,10 +360,10 @@ void UBDocumentPublisher::upgradeDocumentForPublishing()
 void UBDocumentPublisher::generateWidgetPropertyScript(UBGraphicsW3CWidgetItem *widgetItem, int pageNumber)
 {
 
-    QMap<QString, QString> preferences = widgetItem->preferences();
+    QMap<QString, QString> preferences = widgetItem->UBGraphicsWidgetItem::preferences();
     QMap<QString, QString> datastoreEntries = widgetItem->datastoreEntries();
 
-    QString startFileName = widgetItem->w3cWidget()->mainHtmlFileName();
+    QString startFileName = widgetItem->mainHtmlFileName();
 
     if (!startFileName.startsWith("http://"))
     {
@@ -394,18 +394,18 @@ void UBDocumentPublisher::generateWidgetPropertyScript(UBGraphicsW3CWidgetItem *
                             lines << "  <script type=\"text/javascript\">";
 
                             lines << "    var widget = {};";
-                            lines << "    widget.id = '" + widgetItem->w3cWidget()->metadatas().id + "';";
-                            lines << "    widget.name = '" + widgetItem->w3cWidget()->metadatas().name + "';";
-                            lines << "    widget.description = '" + widgetItem->w3cWidget()->metadatas().description + "';";
-                            lines << "    widget.author = '" + widgetItem->w3cWidget()->metadatas().author + "';";
-                            lines << "    widget.authorEmail = '" + widgetItem->w3cWidget()->metadatas().authorEmail + "';";
-                            lines << "    widget.authorHref = '" + widgetItem->w3cWidget()->metadatas().authorHref + "';";
-                            lines << "    widget.version = '" + widgetItem->w3cWidget()->metadatas().version + "';";
+                            lines << "    widget.id = '" + widgetItem->metadatas().id + "';";
+                            lines << "    widget.name = '" + widgetItem->metadatas().name + "';";
+                            lines << "    widget.description = '" + widgetItem->metadatas().description + "';";
+                            lines << "    widget.author = '" + widgetItem->metadatas().author + "';";
+                            lines << "    widget.authorEmail = '" + widgetItem->metadatas().authorEmail + "';";
+                            lines << "    widget.authorHref = '" + widgetItem->metadatas().authorHref + "';";
+                            lines << "    widget.version = '" + widgetItem->metadatas().version + "';";
 
                             lines << "    widget.uuid = '" + UBStringUtils::toCanonicalUuid(widgetItem->uuid()) + "';";
 
-                            lines << "    widget.width = " + QString("%1").arg(widgetItem->w3cWidget()->width()) + ";";
-                            lines << "    widget.height = " + QString("%1").arg(widgetItem->w3cWidget()->height()) + ";";
+                            lines << "    widget.width = " + QString("%1").arg(widgetItem->nominalSize().width()) + ";";
+                            lines << "    widget.height = " + QString("%1").arg(widgetItem->nominalSize().height()) + ";";
                             lines << "    widget.openUrl = function(url) { window.open(url); }";
                             lines << "    widget.preferences = new Array()";
 

src/api/UBW3CWidgetAPI.cpp

@@ -30,25 +30,14 @@
 
 #include "core/memcheck.h"
 
-UBW3CWidgetAPI::UBW3CWidgetAPI(UBGraphicsW3CWidgetItem *graphicsWidget)
-    : QObject(graphicsWidget)
+UBW3CWidgetAPI::UBW3CWidgetAPI(UBGraphicsW3CWidgetItem *graphicsWidget, QObject *parent)
+    : QObject(parent)
     , mGraphicsW3CWidget(graphicsWidget)
-    , mW3CWidget(mGraphicsW3CWidget->w3cWidget())
 {
-    mPreferencesAPI = new UBW3CWidgetPreferenceAPI(graphicsWidget);
+    mPreferencesAPI = new UBW3CWidgetPreferenceAPI(graphicsWidget, parent);
 
 }
 
-
-UBW3CWidgetAPI::UBW3CWidgetAPI(UBW3CWidget *widget)
-    : QObject(widget)
-    , mGraphicsW3CWidget(0)
-    , mW3CWidget(widget)
-{
-    mPreferencesAPI = new UBW3CWidgetPreferenceAPI(widget);
-}
-
-
 UBW3CWidgetAPI::~UBW3CWidgetAPI()
 {
     // NOOP
@@ -66,55 +55,55 @@ QString UBW3CWidgetAPI::uuid()
 
 int UBW3CWidgetAPI::width()
 {
-    return mW3CWidget->geometry().width();
+    return mGraphicsW3CWidget->nominalSize().width();
 }
 
 
 int UBW3CWidgetAPI::height()
 {
-    return mW3CWidget->geometry().height();
+    return mGraphicsW3CWidget->nominalSize().height();
 }
 
 
 QString UBW3CWidgetAPI::id()
 {
-    return mW3CWidget->metadatas().id;
+    return mGraphicsW3CWidget->metadatas().id;
 }
 
 
 QString UBW3CWidgetAPI::name()
 {
-    return mW3CWidget->metadatas().name;
+    return mGraphicsW3CWidget->metadatas().name;
 }
 
 
 QString UBW3CWidgetAPI::description()
 {
-    return mW3CWidget->metadatas().description;
+    return mGraphicsW3CWidget->metadatas().description;
 }
 
 
 QString UBW3CWidgetAPI::author()
 {
-    return mW3CWidget->metadatas().author;
+    return mGraphicsW3CWidget->metadatas().author;
 }
 
 
 QString UBW3CWidgetAPI::authorEmail()
 {
-    return mW3CWidget->metadatas().authorEmail;
+    return mGraphicsW3CWidget->metadatas().authorEmail;
 }
 
 
 QString UBW3CWidgetAPI::authorHref()
 {
-    return mW3CWidget->metadatas().authorHref;
+    return mGraphicsW3CWidget->metadatas().authorHref;
 }
 
 
 QString UBW3CWidgetAPI::version()
 {
-    return mW3CWidget->metadatas().version;
+    return mGraphicsW3CWidget->metadatas().version;
 }
 
 QObject* UBW3CWidgetAPI::preferences()
@@ -129,24 +118,13 @@ void UBW3CWidgetAPI::openURL(const QString& url)
 }
 
 
-UBW3CWidgetPreferenceAPI::UBW3CWidgetPreferenceAPI(UBGraphicsW3CWidgetItem *graphicsWidget)
-    : UBW3CWebStorage(graphicsWidget)
+UBW3CWidgetPreferenceAPI::UBW3CWidgetPreferenceAPI(UBGraphicsW3CWidgetItem *graphicsWidget, QObject *parent)
+    : UBW3CWebStorage(parent)
     , mGraphicsW3CWidget(graphicsWidget)
-    , mW3CWidget(graphicsWidget->w3cWidget())
 {
     // NOOP
 }
 
-UBW3CWidgetPreferenceAPI::UBW3CWidgetPreferenceAPI(UBW3CWidget *widget)
-    : UBW3CWebStorage(widget)
-    , mGraphicsW3CWidget(0)
-    , mW3CWidget(widget)
-{
-    // NOOP
-}
-
-
-
 UBW3CWidgetPreferenceAPI::~UBW3CWidgetPreferenceAPI()
 {
     // NOOP
@@ -155,45 +133,36 @@ UBW3CWidgetPreferenceAPI::~UBW3CWidgetPreferenceAPI()
 
 QString UBW3CWidgetPreferenceAPI::key(int index)
 {
-   QMap<QString, UBW3CWidget::PreferenceValue> w3CPrefs = mW3CWidget->preferences();
-
-   if (index < w3CPrefs.size())
-       return w3CPrefs.keys().at(index);
-   else
-       return "";
+  QMap<QString, UBGraphicsW3CWidgetItem::PreferenceValue> w3CPrefs = mGraphicsW3CWidget->preferences();
 
+  if (index < w3CPrefs.size())
+    return w3CPrefs.keys().at(index);
+  else
+    return "";
 }
 
-
 QString UBW3CWidgetPreferenceAPI::getItem(const QString& key)
 {
-   if (mGraphicsW3CWidget)
-   {
-       QMap<QString, QString> docPref = mGraphicsW3CWidget->preferences();
-
-       if (docPref.contains(key))
-           return docPref.value(key);
-   }
-
-   QMap<QString, UBW3CWidget::PreferenceValue> w3cPrefs = mW3CWidget->preferences();
+  if (mGraphicsW3CWidget) {
+    QMap<QString, QString> docPref = mGraphicsW3CWidget->UBGraphicsWidgetItem::preferences();
+    if (docPref.contains(key))
+      return docPref.value(key);
+  }
 
-   if (w3cPrefs.contains(key))
-   {
-       UBW3CWidget::PreferenceValue pref = w3cPrefs.value(key);
+  QMap<QString, UBGraphicsW3CWidgetItem::PreferenceValue> w3cPrefs = mGraphicsW3CWidget->preferences();
 
-       return pref.value;
-   }
-   else
-   {
-       return "";
-   }
+  if (w3cPrefs.contains(key)) {
+    UBGraphicsW3CWidgetItem::PreferenceValue pref = w3cPrefs.value(key);
+    return pref.value;
+  }
 
+  else
+    return "";
 }
 
-
 int UBW3CWidgetPreferenceAPI::length()
 {
-   QMap<QString, UBW3CWidget::PreferenceValue> w3cPrefs = mW3CWidget->preferences();
+   QMap<QString, UBGraphicsW3CWidgetItem::PreferenceValue> w3cPrefs = mGraphicsW3CWidget->preferences();
 
    return w3cPrefs.size();
 }
@@ -201,39 +170,28 @@ int UBW3CWidgetPreferenceAPI::length()
 
 void UBW3CWidgetPreferenceAPI::setItem(const QString& key, const QString& value)
 {
-   if (mGraphicsW3CWidget)
-   {
-       QMap<QString, UBW3CWidget::PreferenceValue> w3cPrefs = mW3CWidget->preferences();
+  if (mGraphicsW3CWidget) {
+    QMap<QString, UBGraphicsW3CWidgetItem::PreferenceValue> w3cPrefs = mGraphicsW3CWidget->preferences();
 
-       if (w3cPrefs.contains(key) && !w3cPrefs.value(key).readonly)
-           mGraphicsW3CWidget->setPreference(key, value);
-   }
-   else
-   {
-       // No state for non graphics widget (aka tool widget)
-   }
+    if (w3cPrefs.contains(key) && !w3cPrefs.value(key).readonly)
+      mGraphicsW3CWidget->setPreference(key, value);
+  }
 }
 
 
+
+
 void UBW3CWidgetPreferenceAPI::removeItem(const QString& key)
 {
-   if (mGraphicsW3CWidget)
-       mGraphicsW3CWidget->removePreference(key);
-   else
-   {
-       // No state for non graphics widget (aka tool widget)
-   }
+  if (mGraphicsW3CWidget)
+    mGraphicsW3CWidget->removePreference(key);
 }
 
 
 void UBW3CWidgetPreferenceAPI::clear()
 {
-    if (mGraphicsW3CWidget)
-        mGraphicsW3CWidget->removeAllPreferences();
-    else
-    {
-       // No state for non graphics widget (aka tool widget)
-    }
+  if (mGraphicsW3CWidget)
+    mGraphicsW3CWidget->removeAllPreferences();
 }
 
 

src/api/UBW3CWidgetAPI.h

@@ -47,8 +47,7 @@ class UBW3CWidgetAPI : public QObject
 
     public:
 
-        UBW3CWidgetAPI(UBGraphicsW3CWidgetItem *graphicsWidget);
-        UBW3CWidgetAPI(UBW3CWidget *widget);
+        UBW3CWidgetAPI(UBGraphicsW3CWidgetItem *graphicsWidget, QObject *parent = 0);
 
         virtual ~UBW3CWidgetAPI();
 
@@ -72,7 +71,6 @@ class UBW3CWidgetAPI : public QObject
     private:
 
         UBGraphicsW3CWidgetItem* mGraphicsW3CWidget;
-        UBW3CWidget *mW3CWidget;
 
         UBW3CWidgetPreferenceAPI* mPreferencesAPI;
 
@@ -88,8 +86,8 @@ class UBW3CWebStorage : public QObject
 
     public:
         UBW3CWebStorage(QObject *parent = 0)
-        : QObject(parent){}
-        virtual ~UBW3CWebStorage(){}
+        : QObject(parent){/* NOOP */}
+        virtual ~UBW3CWebStorage(){/* NOOP */}
 
     public slots:
 
@@ -110,8 +108,7 @@ class UBW3CWidgetPreferenceAPI : public UBW3CWebStorage
     Q_OBJECT;
 
     public:
-        UBW3CWidgetPreferenceAPI(UBGraphicsW3CWidgetItem *graphicsWidget);
-        UBW3CWidgetPreferenceAPI(UBW3CWidget *widget);
+        UBW3CWidgetPreferenceAPI(UBGraphicsW3CWidgetItem *graphicsWidget, QObject *parent = 0);
 
         virtual ~UBW3CWidgetPreferenceAPI();
 
@@ -129,7 +126,6 @@ class UBW3CWidgetPreferenceAPI : public UBW3CWebStorage
     private:
 
         UBGraphicsW3CWidgetItem* mGraphicsW3CWidget;
-        UBW3CWidget* mW3CWidget;
 
 };
 

src/api/UBWidgetMessageAPI.cpp

@@ -17,16 +17,15 @@
 
 #include "core/UBApplication.h"
 
-#include "domain/UBAbstractWidget.h"
+#include "domain/UBGraphicsWebView.h"
 
 #include "core/memcheck.h"
 
-UBWidgetMessageAPI::UBWidgetMessageAPI(UBW3CWidget *widget)
-    : QObject(widget)
-    , mWebWidget(widget)
+UBWidgetMessageAPI::UBWidgetMessageAPI(UBGraphicsWidgetItem *graphicsWidgetItem, QObject *parent)
+    : QObject(parent)
+    , mGraphicsWidgetItem(graphicsWidgetItem)
 {
-    connect(UBWidgetAPIMessageBroker::instance(), SIGNAL(newMessage(const QString&, const QString&))
-            , this, SLOT(onNewMessage(const QString&, const QString&)), Qt::QueuedConnection);
+    connect(UBWidgetAPIMessageBroker::instance(), SIGNAL(newMessage(const QString&, const QString&)), this, SLOT(onNewMessage(const QString&, const QString&)), Qt::QueuedConnection);
 }
 
 UBWidgetMessageAPI::~UBWidgetMessageAPI()
@@ -45,9 +44,7 @@ void UBWidgetMessageAPI::onNewMessage(const QString& pTopicName, const QString&
 {
     if (mSubscribedTopics.contains(pTopicName))
     {
-        if (mWebWidget
-                && mWebWidget->page()
-                && mWebWidget->page()->mainFrame())
+        if (mGraphicsWidgetItem && mGraphicsWidgetItem->page() && mGraphicsWidgetItem->page()->mainFrame())
         {
 
             QString js;
@@ -55,7 +52,7 @@ void UBWidgetMessageAPI::onNewMessage(const QString& pTopicName, const QString&
             js += "{widget.messages.onmessage('";
             js += pMessage + "', '" + pTopicName + "')}";
 
-            mWebWidget->page()->
+            mGraphicsWidgetItem->page()->
                 mainFrame()->evaluateJavaScript(js);
 
         }

src/api/UBWidgetMessageAPI.h

@@ -25,7 +25,7 @@ class UBWidgetMessageAPI : public QObject
     Q_OBJECT;
 
     public:
-        UBWidgetMessageAPI(UBW3CWidget *widget);
+        UBWidgetMessageAPI(UBGraphicsWidgetItem *graphicsWidgetItem, QObject *parent = 0);
         virtual ~UBWidgetMessageAPI();
 
     public slots:
@@ -49,7 +49,7 @@ class UBWidgetMessageAPI : public QObject
     private:
 
         QSet<QString> mSubscribedTopics;
-        UBW3CWidget *mWebWidget;
+        UBGraphicsWidgetItem *mGraphicsWidgetItem;
 };
 
 

src/api/UBWidgetUniboardAPI.cpp

@@ -30,7 +30,6 @@
 
 #include "domain/UBGraphicsScene.h"
 #include "domain/UBGraphicsWidgetItem.h"
-#include "domain/UBAbstractWidget.h"
 
 #include "adaptors/UBThumbnailAdaptor.h"
 
@@ -79,7 +78,7 @@ UBWidgetUniboardAPI::UBWidgetUniboardAPI(UBGraphicsScene *pScene, UBGraphicsWidg
 
     if (w3CGraphicsWidget)
     {
-        mMessagesAPI = new UBWidgetMessageAPI(w3CGraphicsWidget->w3cWidget());
+        mMessagesAPI = new UBWidgetMessageAPI(w3CGraphicsWidget);
         mDatastoreAPI = new UBDatastoreAPI(w3CGraphicsWidget);
     }
 
@@ -547,7 +546,7 @@ void UBWidgetUniboardAPI::ProcessDropEvent(QDropEvent *event)
 
     QDropEvent readyEvent(dropPoint, dropActions, &dropMimeData, dropMouseButtons, dropModifiers);
     //sending event to destination either it had been downloaded or not
-    QApplication::sendEvent(mGraphicsWidget->widgetWebView(),&readyEvent);
+    QApplication::sendEvent(mGraphicsWidget,&readyEvent);
     readyEvent.acceptProposedAction();
 }
 
@@ -602,11 +601,11 @@ void UBWidgetUniboardAPI::onDownloadFinished(bool pSuccess, sDownloadFileDesc de
 
     //To make js interpreter accept drop event we need to generate move event first.
     QDragMoveEvent pseudoMove(dropPoint, desc.dropActions, &dropMimeData, desc.dropMouseButtons, desc.dropModifiers);
-    QApplication::sendEvent(mGraphicsWidget->widgetWebView(),&pseudoMove);
+    QApplication::sendEvent(mGraphicsWidget,&pseudoMove);
 
     QDropEvent readyEvent(dropPoint, desc.dropActions, &dropMimeData, desc.dropMouseButtons, desc.dropModifiers);
     //sending event to destination either it had been downloaded or not
-    QApplication::sendEvent(mGraphicsWidget->widgetWebView(),&readyEvent);
+    QApplication::sendEvent(mGraphicsWidget,&readyEvent);
     readyEvent.acceptProposedAction();
 }
 
@@ -736,9 +735,9 @@ void UBDocumentDatastoreAPI::removeItem(const QString& key)
 {
     mGraphicsW3CWidget->removeDatastoreEntry(key);
 }
+void
 
-
-void UBDocumentDatastoreAPI::clear()
+ UBDocumentDatastoreAPI::clear()
 {
     mGraphicsW3CWidget->removeAllDatastoreEntries();
 }

src/board/UBBoardController.cpp

@@ -49,7 +49,6 @@
 #include "domain/UBGraphicsWidgetItem.h"
 #include "domain/UBGraphicsMediaItem.h"
 #include "domain/UBGraphicsPDFItem.h"
-#include "domain/UBW3CWidget.h"
 #include "domain/UBGraphicsTextItem.h"
 #include "domain/UBPageSizeUndoCommand.h"
 #include "domain/UBGraphicsGroupContainerItem.h"
@@ -1151,7 +1150,7 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri
         else
             size = mActiveScene->nominalSize() * .8;
 
-        QString widgetUrl = UBW3CWidget::createNPAPIWrapper(sUrl, mimeType, size);
+        QString widgetUrl = UBGraphicsW3CWidgetItem::createNPAPIWrapper(sUrl, mimeType, size);
 
         if (widgetUrl.length() > 0)
         {
@@ -1274,7 +1273,7 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri
                         else
                             size = mActiveScene->nominalSize() * .8;
 
-                        QString widgetUrl = UBW3CWidget::createNPAPIWrapper(swfFile, "application/x-shockwave-flash", size);
+                        QString widgetUrl = UBGraphicsW3CWidgetItem::createNPAPIWrapper(swfFile, "application/x-shockwave-flash", size);
 
                         if (widgetUrl.length() > 0)
                         {
@@ -1655,52 +1654,15 @@ qreal UBBoardController::currentZoom()
         return 1.0;
 }
 
-
-UBToolWidget* UBBoardController::addTool(const QUrl& toolUrl)
-{
-    return addTool(toolUrl, mControlView->mapToScene(mControlView->rect().center()));
-}
-
-
-UBToolWidget* UBBoardController::addTool(const QUrl& toolUrl, QPointF scenePos)
-{
-    UBToolWidget *toolWidget = new UBToolWidget(toolUrl, mMainWindow); // Deleted in UBBoardController::removeTool
-    QPoint pos = mControlView->mapToGlobal(mControlView->mapFromScene(scenePos));
-    pos -= QPoint(toolWidget->width() / 2, toolWidget->height() / 2);
-
-    toolWidget->move(pos);
-
-    mTools.append(toolWidget);
-
-    toolWidget->show();
-
-    return toolWidget;
-}
-
-
-void UBBoardController::removeTool(UBToolWidget* toolWidget)
-{
-    toolWidget->hide();
-
-    mTools.removeAll(toolWidget);
-
-    delete toolWidget;
-}
-
-
 void UBBoardController::hide()
 {
     UBApplication::mainWindow->actionLibrary->setChecked(false);
-
-    controlViewHidden();
 }
 
 
 void UBBoardController::show()
 {
     UBApplication::mainWindow->actionLibrary->setChecked(false);
-
-    controlViewShown();
 }
 
 
@@ -1925,25 +1887,6 @@ void UBBoardController::grabScene(const QRectF& pSceneRect)
     }
 }
 
-
-void UBBoardController::controlViewHidden()
-{
-    foreach(UBToolWidget* tool, mTools)
-    {
-        tool->hide();
-    }
-}
-
-
-void UBBoardController::controlViewShown()
-{
-    foreach(UBToolWidget* tool, mTools)
-    {
-        tool->show();
-    }
-}
-
-
 UBGraphicsMediaItem* UBBoardController::addVideo(const QUrl& pSourceUrl, bool startPlay, const QPointF& pos)
 {
     QUuid uuid = QUuid::createUuid();
@@ -2003,7 +1946,7 @@ UBGraphicsWidgetItem *UBBoardController::addW3cWidget(const QUrl &pUrl, const QP
         w3cWidgetItem->setSnapshotPath(QUrl::fromLocalFile(snapshotPath));
         UBGraphicsWidgetItem *tmpItem = dynamic_cast<UBGraphicsWidgetItem*>(w3cWidgetItem);
         if (tmpItem)
-           tmpItem->widgetWebView()->takeSnapshot().save(snapshotPath, "PNG");
+           tmpItem->takeSnapshot().save(snapshotPath, "PNG");
 
     }
 
@@ -2208,56 +2151,24 @@ void UBBoardController::togglePodcast(bool checked)
 
 void UBBoardController::moveGraphicsWidgetToControlView(UBGraphicsWidgetItem* graphicsWidget)
 {
-    QPoint controlViewPos = mControlView->mapFromScene(graphicsWidget->sceneBoundingRect().center());
-
-    graphicsWidget->setSelected(false);
-
-    UBAbstractWidget *aw = graphicsWidget->widgetWebView();
-    graphicsWidget->setWidget(0);
-
-    UBToolWidget *toolWidget = new UBToolWidget(aw, mControlContainer);
-
-    graphicsWidget->scene()->removeItem(graphicsWidget); // TODO UB 4.6 probably leaking the frame
+    graphicsWidget->hide();
 
-    toolWidget->centerOn(mControlView->mapTo(mControlContainer, controlViewPos));
+    UBToolWidget *toolWidget = new UBToolWidget(graphicsWidget);
+    mActiveScene->addItem(toolWidget);
+    qreal ssf = 1 / UBApplication::boardController->systemScaleFactor();
 
-    toolWidget->show();
+    toolWidget->setScale(ssf);
+    toolWidget->setPos(graphicsWidget->scenePos());
 }
 
 
 void UBBoardController::moveToolWidgetToScene(UBToolWidget* toolWidget)
 {
-    int xIsOdd = toolWidget->width() % 2;
-    int yIsOdd = toolWidget->height() % 2;
-
-    QPoint mainWindowCenter = toolWidget->mapTo(mMainWindow, QPoint(toolWidget->width(), toolWidget->height()) / 2);
-
-    UBAbstractWidget* webWidget = toolWidget->webWidget();
-    webWidget->setParent(0);
-
-    UBGraphicsWidgetItem* graphicsWidget = 0;
-
-    UBW3CWidget* w3cWidget = qobject_cast<UBW3CWidget*>(webWidget);
-    if (w3cWidget)
-    {
-        graphicsWidget = new UBGraphicsW3CWidgetItem(w3cWidget);
-    }
-    else
-    {
-        UBAppleWidget* appleWidget = qobject_cast<UBAppleWidget*>(webWidget);
-        if (appleWidget)
-        {
-            graphicsWidget = new UBGraphicsAppleWidgetItem(appleWidget);
-        }
-    }
-
-    QPoint controlViewCenter = mControlView->mapFrom(mMainWindow, mainWindowCenter);
-    QPointF scenePos = mControlView->mapToScene(controlViewCenter) + QPointF(xIsOdd * 0.5, yIsOdd * 0.5);
-
-    mActiveScene->addGraphicsWidget(graphicsWidget, scenePos);
+    UBGraphicsWidgetItem *graphicsWidgetItem = toolWidget->graphicsWidgetItem();
 
     toolWidget->hide();
-    toolWidget->deleteLater();
+    graphicsWidgetItem->show();
+    graphicsWidgetItem->setSelected(true); 
 }
 
 
@@ -2343,8 +2254,8 @@ void UBBoardController::freezeW3CWidget(QGraphicsItem *item, bool freeze)
             return;
 
         if (freeze) {
-            item_casted->widgetWebView()->load(QUrl(item_casted->w3cWidget()->freezedWidgetFilePath()));
-        }else
-            item_casted->widgetWebView()->loadMainHtml();
+            item_casted->load(QUrl(UBGraphicsW3CWidgetItem::freezedWidgetFilePath()));
+        } else
+            item_casted->loadMainHtml();
     }
 }

src/board/UBBoardController.h

@@ -197,17 +197,12 @@ class UBBoardController : public UBDocumentContainer
         void hideMessage();
         void setDisabled(bool disable);
         void setColorIndex(int pColorIndex);
-        UBToolWidget* addTool(const QUrl& toolUrl, QPointF scenePos);
-        UBToolWidget* addTool(const QUrl& toolUrl);
-        void removeTool(UBToolWidget* toolWidget);
         void hide();
         void show();
         void setWidePageSize(bool checked);
         void setRegularPageSize(bool checked);
         void stylusToolChanged(int tool);
         void grabScene(const QRectF& pSceneRect);
-        void controlViewHidden();
-        void controlViewShown();
         UBGraphicsMediaItem* addVideo(const QUrl& pUrl, bool startPlay, const QPointF& pos);
         UBGraphicsMediaItem* addAudio(const QUrl& pUrl, bool startPlay, const QPointF& pos);
         UBGraphicsWidgetItem *addW3cWidget(const QUrl& pUrl, const QPointF& pos);
@@ -277,7 +272,6 @@ class UBBoardController : public UBDocumentContainer
         QColor mPenColorOnLightBackground;
         QColor mMarkerColorOnDarkBackground;
         QColor mMarkerColorOnLightBackground;
-        QList<UBToolWidget*> mTools;
         qreal mSystemScaleFactor;
         bool mCleanupDone;
         QMap<QAction*, QPair<QString, QString> > mActionTexts;

src/board/UBBoardPaletteManager.cpp

@@ -48,7 +48,6 @@
 #include "network/UBServerXMLHttpRequest.h"
 
 #include "domain/UBGraphicsScene.h"
-#include "domain/UBAbstractWidget.h"
 #include "domain/UBGraphicsPixmapItem.h"
 
 #include "document/UBDocumentProxy.h"

src/board/UBBoardPaletteManager.h

@@ -18,8 +18,7 @@
 
 #include <QtGui>
 #include <QtWebKit>
-
-#include "web/UBRoutedMouseEventWebView.h"
+ 
 #include "gui/UBLeftPalette.h"
 #include "gui/UBRightPalette.h"
 #include "gui/UBPageNavigationWidget.h"

src/board/UBBoardView.cpp

@@ -123,8 +123,6 @@ UBBoardView::init ()
   setHorizontalScrollBarPolicy (Qt::ScrollBarAlwaysOff);
   setAcceptDrops (true);
 
-  setOptimizationFlag (QGraphicsView::IndirectPainting); // enable UBBoardView::drawItems filter
-
   mTabletStylusIsPressed = false;
   mMouseButtonIsPressed = false;
   mPendingStylusReleaseEvent = false;
@@ -426,7 +424,7 @@ bool UBBoardView::itemShouldReceiveMousePressEvent(QGraphicsItem *item)
     UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
 
     if ((currentTool == UBStylusTool::Play) && UBGraphicsGroupContainerItem::Type == movingItem->type())
-        return movingItem = NULL;
+        return movingItem == NULL;
 
     switch(item->type())
     {
@@ -536,7 +534,7 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item)
         return !item->isSelected();
 
     default: 
-        false;
+        return false;
     }
 
     return false;
@@ -1182,7 +1180,7 @@ void UBBoardView::dragMoveEvent (QDragMoveEvent *event)
             }
             QPoint newPoint(graphicsWidget->mapFromScene(mapToScene(event->pos())).toPoint());
             QDragMoveEvent newEvent(newPoint, event->dropAction(), event->mimeData(), event->mouseButtons(), event->keyboardModifiers());
-            QApplication::sendEvent(graphicsWidget->widgetWebView(),&newEvent);
+            QApplication::sendEvent(graphicsWidget,&newEvent);
         } else {
             mOkOnWidget = false;
             event->ignore();

src/board/UBBoardView.h

@@ -21,7 +21,6 @@
 #include "domain/UBGraphicsDelegateFrame.h"
 
 class UBBoardController;
-class UBAppleWidget;
 class UBGraphicsScene;
 class UBGraphicsWidgetItem;
 class UBRubberBand;

src/board/UBFeaturesController.cpp

@@ -11,7 +11,6 @@
 #include "frameworks/UBPlatformUtils.h"
 
 #include "core/UBDownloadManager.h"
-#include "domain/UBAbstractWidget.h"
 #include "domain/UBGraphicsScene.h"
 #include "domain/UBGraphicsSvgItem.h"
 #include "domain/UBGraphicsPixmapItem.h"
@@ -26,6 +25,7 @@ const QString UBFeaturesController::virtualRootName = "root";
 
 void UBFeaturesComputingThread::scanFS(const QUrl & currentPath, const QString & currVirtualPath)
 {
+    
     Q_ASSERT(QFileInfo(currentPath.toLocalFile()).exists());
 
     QFileInfoList fileInfoList = UBFileSystemUtils::allElementsInDirectory(currentPath.toLocalFile());
@@ -558,7 +558,7 @@ QImage UBFeaturesController::getIcon(const QString &path, UBFeatureElementType p
         return QImage(":images/libpalette/folder.svg");
 
     } else if (pFType == FEATURE_INTERACTIVE) {
-        return QImage(UBAbstractWidget::iconFilePath(QUrl::fromLocalFile(path)));
+        return QImage(UBGraphicsWidgetItem::iconFilePath(QUrl::fromLocalFile(path)));
     }
 
 
@@ -566,7 +566,7 @@ QImage UBFeaturesController::getIcon(const QString &path, UBFeatureElementType p
         return QImage( UBToolsManager::manager()->iconFromToolId(path) );
 
     } if ( UBFileSystemUtils::mimeTypeFromFileName(path).contains("application"))  {
-        return QImage( UBAbstractWidget::iconFilePath( QUrl::fromLocalFile(path) ) );
+        return QImage( UBGraphicsWidgetItem::iconFilePath( QUrl::fromLocalFile(path) ) );
     }
 
     QImage thumb;

src/board/UBLibraryController.cpp

@@ -24,7 +24,6 @@
 #include "core/UBApplicationController.h"
 #include "core/UBDownloadManager.h"
 
-#include "domain/UBAbstractWidget.h"
 #include "domain/UBGraphicsScene.h"
 #include "domain/UBGraphicsSvgItem.h"
 #include "domain/UBGraphicsPixmapItem.h"
@@ -325,7 +324,7 @@ QImage UBLibraryController::thumbnailForFile(UBLibElement* pElement)
             return image;
     }
     if (pElement->type() == eUBLibElementType_InteractiveItem){
-        QImage image = QImage(UBAbstractWidget::iconFilePath(pElement->path()));
+        QImage image = QImage(UBGraphicsWidgetItem::iconFilePath(pElement->path()));
         return image;
     }
 
@@ -780,7 +779,7 @@ UBLibElement::UBLibElement(eUBLibElementType type, const QUrl &path, const QStri
         mThumbnail = QImage(":images/libpalette/folder.svg");
 
     if (type == eUBLibElementType_InteractiveItem)
-        mThumbnail = QImage(UBAbstractWidget::iconFilePath(path));
+        mThumbnail = QImage(UBGraphicsWidgetItem::iconFilePath(path));
 
     if (type == eUBLibElementType_Item)
         mExtension = QFileInfo(path.toLocalFile()).completeSuffix();

src/core/UBApplicationController.cpp

@@ -33,6 +33,8 @@
 #include "document/UBDocumentProxy.h"
 #include "document/UBDocumentController.h"
 
+#include "domain/UBGraphicsWidgetItem.h"
+
 #include "desktop/UBDesktopPalette.h"
 #include "desktop/UBDesktopAnnotationController.h"
 
@@ -44,7 +46,6 @@
 #include "gui/UBTeacherGuideWidget.h"
 
 #include "domain/UBGraphicsPixmapItem.h"
-#include "domain/UBW3CWidget.h"
 
 #include "podcast/UBPodcastController.h"
 
@@ -318,7 +319,7 @@ void UBApplicationController::addCapturedEmbedCode(const QString& embedCode)
         int width = 300;
         int height = 150;
 
-        QString widgetPath = UBW3CWidget::createHtmlWrapperInDir(embedCode, userWidgetDir,
+        QString widgetPath = UBGraphicsW3CWidgetItem::createHtmlWrapperInDir(embedCode, userWidgetDir,
                 QSize(width, height), UBStringUtils::toCanonicalUuid(QUuid::createUuid()));
 
         if (widgetPath.length() > 0)

src/domain/UBAbstractWidget.h

-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UBABSTRACTWIDGET_H_
-#define UBABSTRACTWIDGET_H_
-
-#include <QtGui>
-#include <QtWebKit>
-
-#include "web/UBRoutedMouseEventWebView.h"
-
-
-struct UBWidgetType
-{
-    enum Enum
-    {
-        W3C = 0, Apple, Other
-    };
-};
-
-
-class UBAbstractWidget : public UBRoutedMouseEventWebView
-{
-    Q_OBJECT;
-
-    public:
-        UBAbstractWidget(const QUrl& pWidgetUrl, QWidget *parent = 0);
-        virtual ~UBAbstractWidget();
-
-        void loadMainHtml();
-
-        QUrl mainHtml()
-        {
-            return mMainHtmlUrl;
-        }
-
-        QUrl widgetUrl()
-        {
-            return mWidgetUrl;
-        }
-
-        QString mainHtmlFileName()
-        {
-            return mMainHtmlFileName;
-        }
-
-        bool hasEmbededObjects();
-        bool hasEmbededFlash();
-
-        void resize(qreal width, qreal height);
-
-        QSize nominalSize() const
-        {
-            return mNominalSize;
-        }
-
-        bool canBeContent();
-        bool canBeTool();
-
-        bool hasLoadedSuccessfully() const
-        {
-            return (mInitialLoadDone && !mLoadIsErronous);
-        }
-
-        bool freezable() { return mIsFreezable;}
-        bool resizable() { return mIsResizable;}
-
-        static QString iconFilePath(const QUrl& pUrl);
-        static QString widgetName(const QUrl& pUrl);
-        static int widgetType(const QUrl& pUrl);
-
-        bool isFrozen(){ return mIsFrozen;}
-
-        QPixmap snapshot(){return mSnapshot;}
-        void setSnapshot(const QPixmap& pix);
-
-        QPixmap takeSnapshot();
-
-    public slots:
-        void freeze();
-        void unFreeze();
-
-    signals:
-
-        void geometryChangeRequested(const QRect & geom);
-
-    protected:
-
-        bool mMouseIsPressed;
-        bool mFirstReleaseAfterMove;
-
-        virtual bool event(QEvent *e);
-
-        virtual void mousePressEvent(QMouseEvent *event);
-        virtual void mouseMoveEvent(QMouseEvent *event);
-        virtual void mouseReleaseEvent(QMouseEvent *event);
-
-        virtual QWebView * createWindow(QWebPage::WebWindowType type);
-
-        QUrl mMainHtmlUrl;
-        QString mMainHtmlFileName;
-        QUrl mWidgetUrl;
-        QSize mNominalSize;
-        bool mIsResizable;
-        bool mInitialLoadDone;
-        bool mLoadIsErronous;
-
-        bool mIsFreezable;
-        int mCanBeContent;
-        int mCanBeTool;
-        enum OSType
-        {
-            type_NONE = 0, // 0000
-            type_WIN  = 1, // 0001
-            type_MAC  = 2, // 0010
-            type_UNIX = 4, // 0100
-            type_ALL  = 7, // 0111
-        };
-
-        virtual void injectInlineJavaScript();
-        virtual void paintEvent(QPaintEvent * event);
-        virtual void dropEvent(QDropEvent *);
-
-    protected slots:
-
-        void mainFrameLoadFinished(bool ok);
-
-    private:
-
-        static QStringList sInlineJavaScripts;
-        static bool sInlineJavaScriptLoaded;
-
-        bool mIsFrozen;
-        QPixmap mSnapshot;
-
-        bool mIsTakingSnapshot;
-
-    private slots:
-        void javaScriptWindowObjectCleared();
-
-};
-
-#endif /* UBABSTRACTWIDGET_H_ */

src/domain/UBAppleWidget.cpp

-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "UBAppleWidget.h"
-
-#include <QtNetwork>
-
-#include "web/UBWebKitUtils.h"
-
-#include "network/UBNetworkAccessManager.h"
-
-#include "core/memcheck.h"
-
-UBAppleWidget::UBAppleWidget(const QUrl& pWidgetUrl, QWidget *parent)
-    : UBAbstractWidget(pWidgetUrl, parent)
-{
-    QString path = pWidgetUrl.toLocalFile();
-
-    if (!path.endsWith(".wdgt") && !path.endsWith(".wdgt/"))
-    {
-        int lastSlashIndex = path.lastIndexOf("/");
-        if (lastSlashIndex > 0)
-        {
-            path = path.mid(0, lastSlashIndex + 1);
-        }
-    }
-
-    QFile plistFile(path + "/Info.plist");
-    plistFile.open(QFile::ReadOnly);
-
-    QByteArray plistBin = plistFile.readAll();
-    QString plist = QString::fromUtf8(plistBin);
-
-    int mainHtmlIndex = plist.indexOf("MainHTML");
-    int mainHtmlIndexStart = plist.indexOf("<string>", mainHtmlIndex);
-    int mainHtmlIndexEnd = plist.indexOf("</string>", mainHtmlIndexStart);
-
-    if (mainHtmlIndex > -1 && mainHtmlIndexStart > -1 && mainHtmlIndexEnd > -1)
-    {
-        mMainHtmlFileName = plist.mid(mainHtmlIndexStart + 8, mainHtmlIndexEnd - mainHtmlIndexStart - 8);
-    }
-
-    mMainHtmlUrl = pWidgetUrl;
-    mMainHtmlUrl.setPath(pWidgetUrl.path() + "/" + mMainHtmlFileName);
-
-    QWebView::load(mMainHtmlUrl);
-
-    QPixmap defaultPixmap(pWidgetUrl.toLocalFile() + "/Default.png");
-
-    setFixedSize(defaultPixmap.size());
-
-    mNominalSize = defaultPixmap.size();
-}
-
-UBAppleWidget::~UBAppleWidget()
-{
-    // NOOP
-}
-
-
-
-
-
-
-

src/domain/UBGraphicsItemDelegate.cpp

@@ -37,7 +37,6 @@
 
 #include "UBGraphicsWidgetItem.h"
 
-#include "domain/UBAbstractWidget.h"
 #include "domain/UBGraphicsTextItem.h"
 #include "domain/UBGraphicsMediaItem.h"
 #include "domain/UBGraphicsGroupContainerItem.h"
@@ -379,22 +378,13 @@ void UBGraphicsItemDelegate::setZOrderButtonsVisible(bool visible)
 
 void UBGraphicsItemDelegate::remove(bool canUndo)
 {
-//    QGraphicsScene* scene = mDelegated->scene();
     UBGraphicsScene* scene = dynamic_cast<UBGraphicsScene*>(mDelegated->scene());
-    if (scene)
+    if (scene && canUndo)
     {
-        foreach(DelegateButton* button, mButtons)
-            scene->removeItem(button);
-
-        scene->removeItem(mFrame);
-        scene->removeItem(mDelegated);
-
-        if (canUndo)
-        {
-            UBGraphicsItemUndoCommand *uc = new UBGraphicsItemUndoCommand((UBGraphicsScene*) scene, mDelegated, 0);
-            UBApplication::undoStack->push(uc);
-        }
+        UBGraphicsItemUndoCommand *uc = new UBGraphicsItemUndoCommand(scene, mDelegated, 0);
+        UBApplication::undoStack->push(uc);
     }
+    mDelegated->hide();  
 }
 
 

src/domain/UBGraphicsScene.cpp

@@ -31,6 +31,7 @@
 
 #include "gui/UBMagnifer.h"
 #include "gui/UBMainWindow.h"
+#include "gui/UBToolWidget.h"
 
 #include "tools/UBGraphicsRuler.h"
 #include "tools/UBGraphicsProtractor.h"
@@ -59,8 +60,6 @@
 
 #include "domain/UBGraphicsGroupContainerItem.h"
 
-#include "UBAppleWidget.h"
-#include "UBW3CWidget.h"
 #include "UBGraphicsStroke.h"
 
 #include "core/memcheck.h"
@@ -256,8 +255,8 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
     , mDocument(parent)
     , mDarkBackground(false)
     , mCrossedBackground(false)
-    , mZoomFactor(1)
     , mIsDesktopMode(false)
+    , mZoomFactor(1)
     , mIsModified(true)
     , mBackgroundObject(0)
     , mPreviousWidth(0)
@@ -1396,7 +1395,7 @@ UBGraphicsMediaItem* UBGraphicsScene::addAudio(const QUrl& pAudioFileUrl, bool s
 
 UBGraphicsWidgetItem* UBGraphicsScene::addWidget(const QUrl& pWidgetUrl, const QPointF& pPos)
 {
-    int widgetType = UBAbstractWidget::widgetType(pWidgetUrl);
+    int widgetType = UBGraphicsWidgetItem::widgetType(pWidgetUrl);
 
     if(widgetType == UBWidgetType::Apple)
     {
@@ -1422,9 +1421,9 @@ UBGraphicsAppleWidgetItem* UBGraphicsScene::addAppleWidget(const QUrl& pWidgetUr
     return appleWidget;
 }
 
-UBGraphicsW3CWidgetItem* UBGraphicsScene::addW3CWidget(const QUrl& pWidgetUrl, const QPointF& pPos, int widgetType)
+UBGraphicsW3CWidgetItem* UBGraphicsScene::addW3CWidget(const QUrl& pWidgetUrl, const QPointF& pPos)
 {
-    UBGraphicsW3CWidgetItem *w3CWidget = new UBGraphicsW3CWidgetItem(pWidgetUrl, 0, widgetType);
+    UBGraphicsW3CWidgetItem *w3CWidget = new UBGraphicsW3CWidgetItem(pWidgetUrl, 0);
 
     addGraphicsWidget(w3CWidget, pPos);
 
@@ -1444,7 +1443,7 @@ void UBGraphicsScene::addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, co
     graphicsWidget->setPos(QPointF(pPos.x() - graphicsWidget->boundingRect().width() / 2,
         pPos.y() - graphicsWidget->boundingRect().height() / 2));
 
-    if (graphicsWidget->widgetWebView()->canBeContent())
+    if (graphicsWidget->canBeContent())
     {
 //        graphicsWidget->widgetWebView()->loadMainHtml();
 
@@ -1464,6 +1463,8 @@ void UBGraphicsScene::addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, co
     UBApplication::boardController->controlView()->setFocus();
 }
 
+
+
 UBGraphicsW3CWidgetItem* UBGraphicsScene::addOEmbed(const QUrl& pContentUrl, const QPointF& pPos)
 {
     QStringList widgetPaths = UBPersistenceManager::persistenceManager()->allWidgets(UBSettings::settings()->applicationApplicationsLibraryDirectory());

src/domain/UBGraphicsScene.h

@@ -35,12 +35,12 @@ class UBGraphicsAudioItem;
 class UBGraphicsWidgetItem;
 class UBGraphicsW3CWidgetItem;
 class UBGraphicsAppleWidgetItem;
+class UBToolWidget;
 class UBGraphicsPDFItem;
 class UBGraphicsTextItem;
 class UBGraphicsRuler;
 class UBGraphicsProtractor;
 class UBGraphicsCompass;
-class UBAbstractWidget;
 class UBDocumentProxy;
 class UBGraphicsCurtainItem;
 class UBGraphicsStroke;
@@ -132,9 +132,11 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem
 
         UBGraphicsWidgetItem* addWidget(const QUrl& pWidgetUrl, const QPointF& pPos = QPointF(0, 0));
         UBGraphicsAppleWidgetItem* addAppleWidget(const QUrl& pWidgetUrl, const QPointF& pPos = QPointF(0, 0));
-        UBGraphicsW3CWidgetItem* addW3CWidget(const QUrl& pWidgetUrl, const QPointF& pPos = QPointF(0, 0),int widgetType = UBGraphicsItemType::W3CWidgetItemType);
+        UBGraphicsW3CWidgetItem* addW3CWidget(const QUrl& pWidgetUrl, const QPointF& pPos = QPointF(0, 0));
         void addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, const QPointF& pPos = QPointF(0, 0));
 
+        
+
         UBGraphicsMediaItem* addMedia(const QUrl& pMediaFileUrl, bool shouldPlayAsap, const QPointF& pPos = QPointF(0, 0));
         UBGraphicsMediaItem* addVideo(const QUrl& pVideoFileUrl, bool shouldPlayAsap, const QPointF& pPos = QPointF(0, 0));
         UBGraphicsMediaItem* addAudio(const QUrl& pAudioFileUrl, bool shouldPlayAsap, const QPointF& pPos = QPointF(0, 0));

src/domain/UBGraphicsWebView.cpp

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QtGui>
+#include <QtWebKit>
+
+#include "UBGraphicsWebView.h"
+#include "UBGraphicsScene.h"
+#include "UBGraphicsItemDelegate.h"
+#include "UBGraphicsDelegateFrame.h"
+
+#include "core/memcheck.h"
+
+UBGraphicsWebView::UBGraphicsWebView(QGraphicsItem* parent)
+    : QGraphicsWebView(parent)
+{
+    setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::Object);
+
+    mDelegate = new UBGraphicsItemDelegate(this, 0, true, false, false);
+    mDelegate->init();
+
+    setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
+
+    QGraphicsWebView::setAcceptHoverEvents(true);
+}
+
+
+UBGraphicsWebView::~UBGraphicsWebView()
+{
+    if (mDelegate)
+        delete mDelegate;
+}
+
+
+QVariant UBGraphicsWebView::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    if ((change == QGraphicsItem::ItemSelectedHasChanged) &&  scene()) {
+        if (isSelected())
+            scene()->setActiveWindow(this);
+        else
+            if(scene()->activeWindow() == this)
+                scene()->setActiveWindow(0);
+    }
+
+    QVariant newValue = mDelegate->itemChange(change, value);
+    return QGraphicsWebView::itemChange(change, newValue);
+}
+
+void UBGraphicsWebView::setUuid(const QUuid &pUuid)
+{
+    UBItem::setUuid(pUuid);
+    setData(UBGraphicsItemData::ItemUuid, QVariant(pUuid)); //store item uuid inside the QGraphicsItem to fast operations with Items on the scene
+}
+
+void UBGraphicsWebView::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (!mDelegate->mousePressEvent(event))
+        setSelected(true); /* forcing selection */
+
+    QGraphicsWebView::mousePressEvent(event);
+}
+
+
+void UBGraphicsWebView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (!mDelegate->mouseMoveEvent(event))
+        QGraphicsWebView::mouseMoveEvent(event);
+}
+
+
+void UBGraphicsWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    mDelegate->mouseReleaseEvent(event);
+    QGraphicsWebView::mouseReleaseEvent(event);
+}
+
+void UBGraphicsWebView::wheelEvent(QGraphicsSceneWheelEvent *event)
+{
+    if (mDelegate->weelEvent(event))
+    {
+        QGraphicsWebView::wheelEvent(event);
+        event->accept();
+    }
+}
+
+void UBGraphicsWebView::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+{
+    Q_UNUSED(event)
+    /* NOOP */
+}
+void UBGraphicsWebView::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+{
+    Q_UNUSED(event)
+    /* NOOP */
+}
+
+void UBGraphicsWebView::setDelegate(UBGraphicsItemDelegate* pDelegate)
+{
+    if (mDelegate)
+        delete mDelegate;
+
+    mDelegate = pDelegate;
+}
+
+
+void UBGraphicsWebView::resize(qreal w, qreal h)
+{
+    UBGraphicsWebView::resize(QSizeF(w, h));
+}
+
+
+void UBGraphicsWebView::resize(const QSizeF & pSize)
+{
+    if (pSize != size()) {
+        QGraphicsWebView::setMaximumSize(pSize.width(), pSize.height());
+        QGraphicsWebView::resize(pSize.width(), pSize.height());
+        if (mDelegate)
+            mDelegate->positionHandles();
+        if (scene())
+            scene()->setModified(true);
+    }
+}
+
+QSizeF UBGraphicsWebView::size() const
+{
+    return QGraphicsWebView::size();
+}
+
+
+UBGraphicsScene* UBGraphicsWebView::scene()
+{
+    return static_cast<UBGraphicsScene*>(QGraphicsItem::scene());
+}
+
+
+void UBGraphicsWebView::remove()
+{
+    if (mDelegate)
+        mDelegate->remove(true);
+}
+
+bool UBGraphicsWebView::event(QEvent *event)
+{
+    if (event->type() == QEvent::ShortcutOverride)
+        event->accept();
+
+    return QGraphicsWebView::event(event);
+}

src/domain/UBAppleWidget.h → src/domain/UBGraphicsWebView.h

@@ -13,24 +13,50 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UBAPPLEWIDGET_H_
-#define UBAPPLEWIDGET_H_
+#ifndef UBGRAPHICSWEBVIEW_H_
+#define UBGRAPHICSWEBVIEW_H_
 
 #include <QtGui>
 #include <QtWebKit>
 
-#include "UBAbstractWidget.h"
+#include "UBItem.h"
+#include "UBResizableGraphicsItem.h"
 
-class UBItem;
+class UBGraphicsItemDelegate;
 
-class UBAppleWidget : public UBAbstractWidget
+class UBGraphicsWebView: public QGraphicsWebView, public UBItem, public UBResizableGraphicsItem, public UBGraphicsItem
 {
-    Q_OBJECT;
-
     public:
-        UBAppleWidget(const QUrl& pWidgetUrl, QWidget *parent = 0);
-        virtual ~UBAppleWidget();
+        UBGraphicsWebView(QGraphicsItem* parent = 0);
+        virtual ~UBGraphicsWebView();
+
+        virtual void resize(qreal w, qreal h);
+        virtual void resize(const QSizeF & size);
+
+        virtual QSizeF size() const;
+
+        void setDelegate(UBGraphicsItemDelegate* pDelegate);
+
+        virtual UBGraphicsScene* scene();
+
+        virtual void remove();
+
+        virtual UBGraphicsItemDelegate* Delegate() const { return mDelegate;}
+
+        virtual void clearSource(){;}
+        virtual void setUuid(const QUuid &pUuid);
+
+    protected:
+
+        virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+        virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+        virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+        virtual void wheelEvent(QGraphicsSceneWheelEvent *event);
+        virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+        virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+        virtual bool event(QEvent *event);
+        virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
 
 };
 
-#endif /* UBAPPLEWIDGET_H_ */
+#endif /* UBGRAPHICSWEBVIEW_H_ */

src/domain/UBGraphicsWidgetItemDelegate.cpp

@@ -55,7 +55,7 @@ void UBGraphicsWidgetItemDelegate::updateMenuActionState()
     UBGraphicsItemDelegate::updateMenuActionState();
 
     if (freezeAction)
-        freezeAction->setChecked(delegated()->widgetWebView()->isFrozen());
+        freezeAction->setChecked(delegated()->isFrozen());
 }
 
 void UBGraphicsWidgetItemDelegate::decorateMenu(QMenu* menu)
@@ -71,7 +71,7 @@ void UBGraphicsWidgetItemDelegate::decorateMenu(QMenu* menu)
 
     freezeAction->setCheckable(true);
 
-    if (delegated()->widgetWebView()->canBeTool())
+    if (delegated()->canBeTool())
     {
         setAsToolAction = mMenu->addAction(tr("Transform as Tool "), this, SLOT(pin()));
         QIcon pinIcon;
@@ -86,11 +86,11 @@ void UBGraphicsWidgetItemDelegate::freeze(bool frozen)
 {
     if(frozen)
     {
-       delegated()->widgetWebView()->freeze();
+       delegated()->freeze();
     }
     else
     {
-       delegated()->widgetWebView()->unFreeze();
+       delegated()->unFreeze();
     }
 }
 

src/domain/UBW3CWidget.h

-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UBW3CWIDGET_H_
-#define UBW3CWIDGET_H_
-
-#include <QtGui>
-#include <QtWebKit>
-#include <QtXml>
-
-/*
- * wrapper for w3c widget 1.0 as define in http://www.w3.org/TR/widgets/
- */
-
-#include "UBAbstractWidget.h"
-
-class UBItem;
-
-class UBW3CWidget : public UBAbstractWidget
-{
-        Q_OBJECT;
-
-    public:
-        UBW3CWidget(const QUrl& pWidgetUrl, QWidget *parent = 0);
-
-        virtual ~UBW3CWidget();
-
-        static QString createNPAPIWrapper(const QString& url,
-            const QString& pMimeType = QString(), const QSize& sizeHint = QSize(300, 150),
-            const QString& pName = QString());
-
-        static QString createNPAPIWrapperInDir(const QString& url, const QDir& pDir,
-            const QString& pMimeType = QString(), const QSize& sizeHint = QSize(300, 150),
-            const QString& pName = QString());
-
-        static QString createHtmlWrapperInDir(const QString& html, const QDir& pDir,
-            const QSize& sizeHint,  const QString& pName);
-
-        static QString freezedWidgetPage();
-
-        static QString freezedWidgetFilePath();
-
-        static bool hasNPAPIWrapper(const QString& pMimeType);
-
-        class PreferenceValue
-        {
-            public:
-
-                PreferenceValue()
-                {
-                    // NOOP
-                }
-                
-
-                PreferenceValue(const QString& pValue, bool pReadonly)
-                {
-                    value = pValue;
-                    readonly = pReadonly;
-                }
-
-                QString value;
-                bool readonly;
-         };
-
-        class Metadata
-        {
-            public:
-                QString id;
-                QString name;
-                QString description;
-                QString author;
-                QString authorEmail;
-                QString authorHref;
-                QString version;
-        };
-
-
-        QMap<QString, PreferenceValue> preferences()
-        {
-            return mPreferences;
-        }
-
-        Metadata metadatas() const
-        {
-            return mMetadatas;
-        }
-
-    private:
-
-        QMap<QString, PreferenceValue> mPreferences;
-
-        static bool sTemplateLoaded;
-
-        static QMap<QString, QString> sNPAPIWrapperTemplates;
-
-        static QString sNPAPIWrappperConfigTemplate;
-
-        static void loadNPAPIWrappersTemplates();
-
-        static QString textForSubElementByLocale(QDomElement rootElement, QString subTagName, QLocale locale);
-
-        // w3c metadata widget attributes
-        //
-        // http://www.w3.org/TR/widgets/#widget0
-
-        Metadata mMetadatas;
-
-    private slots:
-
-        void javaScriptWindowObjectCleared();
-
-};
-
-#endif /* UBW3CWIDGET_H_ */

src/domain/domain.pri

@@ -7,26 +7,24 @@ HEADERS      += src/domain/UBGraphicsScene.h \
                 src/domain/UBDocumentUndoCommand.h \
                 src/domain/UBPageSizeUndoCommand.h \
                 src/domain/UBGraphicsProxyWidget.h \
+                src/domain/UBGraphicsWebView.h \
                 src/domain/UBGraphicsSvgItem.h \
                 src/domain/UBGraphicsPolygonItem.h \
                 src/domain/UBItem.h \
                 src/domain/UBGraphicsWidgetItem.h \
-                src/domain/UBAppleWidget.h \
                 src/domain/UBGraphicsPDFItem.h \
                 src/domain/UBGraphicsTextItem.h \
-                src/domain/UBAbstractWidget.h \
-                src/domain/UBW3CWidget.h \
                 src/domain/UBResizableGraphicsItem.h \
                 src/domain/UBGraphicsStroke.h \
-    src/domain/UBGraphicsMediaItem.h \
-    src/domain/UBAbstractUndoCommand.h\
-    src/domain/UBAngleWidget.h \
-    src/domain/UBGraphicsGroupContainerItem.h \
-    src/domain/UBGraphicsGroupContainerItemDelegate.h \
-    src/domain/UBGraphicsStrokesGroup.h
+                src/domain/UBGraphicsMediaItem.h \
+                src/domain/UBAbstractUndoCommand.h\
+                src/domain/UBAngleWidget.h \
+                src/domain/UBGraphicsGroupContainerItem.h \
+                src/domain/UBGraphicsGroupContainerItemDelegate.h \
+                src/domain/UBGraphicsStrokesGroup.h
                 
 HEADERS      += src/domain/UBGraphicsItemDelegate.h \
-				src/domain/UBGraphicsTextItemDelegate.h \
+                src/domain/UBGraphicsTextItemDelegate.h \
                 src/domain/UBGraphicsDelegateFrame.h \
                 src/domain/UBGraphicsWidgetItemDelegate.h \
                 src/domain/UBGraphicsMediaItemDelegate.h
@@ -40,27 +38,25 @@ SOURCES      += src/domain/UBGraphicsScene.cpp \
                 src/domain/UBDocumentUndoCommand.cpp \
                 src/domain/UBPageSizeUndoCommand.cpp \
                 src/domain/UBGraphicsProxyWidget.cpp \
+                src/domain/UBGraphicsWebView.cpp \
                 src/domain/UBGraphicsSvgItem.cpp \
                 src/domain/UBGraphicsPolygonItem.cpp \
                 src/domain/UBItem.cpp \
                 src/domain/UBGraphicsVideoItem.cpp \
                 src/domain/UBGraphicsWidgetItem.cpp \
-                src/domain/UBAppleWidget.cpp \
                 src/domain/UBGraphicsPDFItem.cpp \
                 src/domain/UBGraphicsTextItem.cpp \
-                src/domain/UBAbstractWidget.cpp \
-                src/domain/UBW3CWidget.cpp \
                 src/domain/UBResizableGraphicsItem.cpp \
                 src/domain/UBGraphicsStroke.cpp \
-    src/domain/UBGraphicsMediaItem.cpp \
-    src/domain/UBAbstractUndoCommand.cpp \
-    src/domain/UBAngleWidget.cpp \
-    src/domain/ubgraphicsgroupcontaineritem.cpp \
-    src/domain/ubgraphicsgroupcontaineritemdelegate.cpp \
-    src/domain/UBGraphicsStrokesGroup.cpp
+                src/domain/UBGraphicsMediaItem.cpp \
+                src/domain/UBAbstractUndoCommand.cpp \
+                src/domain/UBAngleWidget.cpp \
+                src/domain/ubgraphicsgroupcontaineritem.cpp \
+                src/domain/ubgraphicsgroupcontaineritemdelegate.cpp \
+                src/domain/UBGraphicsStrokesGroup.cpp
                 
 SOURCES      += src/domain/UBGraphicsItemDelegate.cpp \
-			src/domain/UBGraphicsTextItemDelegate.cpp \
+                src/domain/UBGraphicsTextItemDelegate.cpp \
                 src/domain/UBGraphicsMediaItemDelegate.cpp \
                 src/domain/UBGraphicsDelegateFrame.cpp \
                 src/domain/UBGraphicsWidgetItemDelegate.cpp \

src/frameworks/UBCoreGraphicsScene.cpp

@@ -32,7 +32,7 @@ UBCoreGraphicsScene::~UBCoreGraphicsScene()
     //we must delete removed items that are no more in any scene
     foreach (const QGraphicsItem* item, mItemsToDelete)
     {
-        if (item->scene()==NULL || item->scene() == this)
+        if (item->scene() == NULL || item->scene() == this)
         {
             delete item;
         }
@@ -61,6 +61,7 @@ void UBCoreGraphicsScene::removeItem(QGraphicsItem* item, bool forceDelete)
     {
         mItemsToDelete.remove(item);
         delete item;
+        item = 0;
     }
 }
 
@@ -84,6 +85,7 @@ bool UBCoreGraphicsScene::deleteItem(QGraphicsItem* item)
 
         mItemsToDelete.remove(item);
         delete item;
+        item = 0;
         return true;
     }
     else

src/gui/UBFavoriteToolPalette.cpp

@@ -18,11 +18,10 @@
 #include "core/UBSettings.h"
 
 #include "board/UBBoardController.h"
+#include "domain/UBGraphicsWidgetItem.h"
 
 #include "tools/UBToolsManager.h"
 
-#include "domain/UBAbstractWidget.h"
-
 #include "gui/UBMainWindow.h"
 
 #include "core/memcheck.h"
@@ -67,9 +66,9 @@ UBFavoriteToolPalette::UBFavoriteToolPalette(QWidget* parent)
 
     foreach(QString widgetPath, appPathes)
     {
-        QAction *action = new QAction(UBAbstractWidget::widgetName(QUrl::fromLocalFile(widgetPath)), this);
+        QAction *action = new QAction(UBGraphicsWidgetItem::widgetName(QUrl::fromLocalFile(widgetPath)), this);
         action->setData(QUrl::fromLocalFile(widgetPath));
-        action->setIcon(QIcon(UBAbstractWidget::iconFilePath(QUrl::fromLocalFile(widgetPath))));
+        action->setIcon(QIcon(UBGraphicsWidgetItem::iconFilePath(QUrl::fromLocalFile(widgetPath))));
         connect(action, SIGNAL(triggered()), this, SLOT(addFavorite()));
 
         toolsActions << action;

src/gui/UBFeaturesWidget.cpp

 #include <QDomDocument>
 
 #include "UBFeaturesWidget.h"
-#include "domain/UBAbstractWidget.h"
 #include "gui/UBThumbnailWidget.h"
 #include "frameworks/UBFileSystemUtils.h"
 #include "core/UBApplication.h"

src/gui/UBTeacherGuideWidgetsTools.cpp

@@ -22,6 +22,8 @@
 #include <QUrl>
 #include <QWebSettings>
 #include <QApplication>
+#include <QDomElement>
+#include <QWebFrame>
 
 #include "UBTeacherGuideWidgetsTools.h"
 
@@ -30,7 +32,7 @@
 
 #include "board/UBBoardController.h"
 
-#include "domain/UBW3CWidget.h"
+#include "domain/UBGraphicsWidgetItem.h"
 
 #include "globals/UBGlobals.h"
 
@@ -360,7 +362,7 @@ void UBTGMediaWidget::removeSource()
 void UBTGMediaWidget::hideEvent(QHideEvent* event)
 {
     if(mpWebView)
-        mpWebView->page()->mainFrame()->setContent(UBW3CWidget::freezedWidgetPage().toAscii());
+        mpWebView->page()->mainFrame()->setContent(UBGraphicsW3CWidgetItem::freezedWidgetPage().toAscii());
     QWidget::hideEvent(event);
 }
 
@@ -421,7 +423,7 @@ void UBTGMediaWidget::createWorkWidget()
         mMediaType = "w3c";
         if(!(mIsPresentationMode || mIsInitializationMode)){
             QDir baseW3CDirectory(UBPersistenceManager::persistenceManager()->teacherGuideAbsoluteObjectPath(proxyDocument));
-            mMediaPath = UBW3CWidget::createNPAPIWrapperInDir(mMediaPath,baseW3CDirectory,mimeType,QSize(100,100),QUuid::createUuid());
+            mMediaPath = UBGraphicsW3CWidgetItem::createNPAPIWrapperInDir(mMediaPath,baseW3CDirectory,mimeType,QSize(100,100),QUuid::createUuid());
         }
         mpWebView = new UBDraggableWeb(mMediaPath);
         mpWebView->setAcceptDrops(false);

src/gui/UBToolWidget.h

@@ -18,32 +18,35 @@
 
 #include <QtGui>
 
-class UBAbstractWidget;
+class UBGraphicsWidgetItem;
 class QWidget;
 class UBGraphicsScene;
 
-class UBToolWidget : public QWidget
+class UBToolWidget : public QGraphicsWidget
 {
-    Q_OBJECT;
+    Q_OBJECT
 
     public:
-        UBToolWidget(const QUrl& pUrl, QWidget* pParent = 0);
-        UBToolWidget(UBAbstractWidget* pWidget, QWidget* pParent = 0);
+        UBToolWidget(const QUrl& pUrl, QGraphicsItem *pParent = 0);
+        UBToolWidget(UBGraphicsWidgetItem* pGraphicsWidgetItem, QGraphicsItem *pParent = 0);
         virtual ~UBToolWidget();
 
-        void centerOn(const QPoint& pos);
+        void centerOn(const QPointF& pos);
 
-        QPoint naturalCenter() const;
+        QPointF naturalCenter() const;
 
-        UBAbstractWidget* webWidget() const;
+        UBGraphicsWidgetItem* graphicsWidgetItem() const;
+        virtual UBGraphicsScene* scene();
+        virtual void setPos(const QPointF &point);
+        virtual void setPos(qreal x, qreal y);
 
     protected:
         void initialize();
-        virtual void paintEvent(QPaintEvent *);
+        virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
 
-        virtual void mousePressEvent ( QMouseEvent * event );
-        virtual void mouseMoveEvent ( QMouseEvent * event );
-        virtual void mouseReleaseEvent ( QMouseEvent * event );
+        virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+        virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+        virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 
         virtual bool eventFilter(QObject *obj, QEvent *event);
 
@@ -55,9 +58,9 @@ class UBToolWidget : public QWidget
         static QPixmap *sClosePixmap;
         static QPixmap *sUnpinPixmap;
 
-        UBAbstractWidget *mToolWidget;
+        UBGraphicsWidgetItem *mGraphicsWidgetItem;
 
-        QPoint mMousePressPos;
+        QPointF mMousePressPos;
 
         bool mShouldMoveWidget;
 

src/web/UBRoutedMouseEventWebView.cpp

-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "UBRoutedMouseEventWebView.h"
-
-#include <QtCore>
-#include <QtWebKit>
-#include <QtGui>
-
-#include "core/memcheck.h"
-
-UBRoutedMouseEventWebView::UBRoutedMouseEventWebView(QWidget * parent)
-    : QWebView(parent)
-{
-    QWebView::setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform);
-}
-
-UBRoutedMouseEventWebView::~UBRoutedMouseEventWebView()
-{
-    // NOOP
-}
-
-
-void UBRoutedMouseEventWebView::mouseMoveEvent(QMouseEvent* ev)
-{
-    QWebPage* p = page();
-
-    if (p)
-    {
-        p->event(ev);
-    }
-}
-
-void UBRoutedMouseEventWebView::mousePressEvent(QMouseEvent* ev)
-{
-    QWebPage* p = page();
-
-    if (p)
-    {
-        p->event(ev);
-    }
-}
-
-void UBRoutedMouseEventWebView::mouseDoubleClickEvent(QMouseEvent* ev)
-{
-    QWebPage* p = page();
-
-    if (p)
-    {
-        p->event(ev);
-    }
-}
-
-void UBRoutedMouseEventWebView::mouseReleaseEvent(QMouseEvent* ev)
-{
-    QWebPage* p = page();
-
-    if (p)
-    {
-        p->event(ev);
-    }
-}
-
-void UBRoutedMouseEventWebView::contextMenuEvent(QContextMenuEvent* ev)
-{
-    QWebPage* p = page();
-
-    if (p)
-    {
-        p->event(ev);
-    }
-}
-
-
-void UBRoutedMouseEventWebView::wheelEvent(QWheelEvent* ev)
-{
-    QWebPage* p = page();
-
-    if (p)
-    {
-        p->event(ev);
-    }
-}
-//void UBRoutedMouseEventWebView::dropEvent(QDropEvent *event)
-//{
-////    QWebView::dropEvent(event);
-//    event->accept();
-//}

src/web/UBRoutedMouseEventWebView.h

-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UBROUTEDMOUSEEVENTWEBVIEW_H_
-#define UBROUTEDMOUSEEVENTWEBVIEW_H_
-
-#include <QtWebKit>
-
-/*
- * This class changes the routing of mouse events.
- * Qt 4.5.2 does not report back the "accepted" flag set
- * by WebKit, as we want to know if a mouse event has been
- * consumed by webKit, we override them without keeping the
- * accepted flag status
- */
-
-class UBRoutedMouseEventWebView : public QWebView
-{
-    public:
-        UBRoutedMouseEventWebView(QWidget * parent = 0 );
-        virtual ~UBRoutedMouseEventWebView();
-
-    protected:
-        virtual void mouseMoveEvent(QMouseEvent* ev);
-        virtual void mousePressEvent(QMouseEvent* ev);
-        virtual void mouseDoubleClickEvent(QMouseEvent* ev);
-        virtual void mouseReleaseEvent(QMouseEvent* ev);
-        virtual void contextMenuEvent(QContextMenuEvent* ev);
-        virtual void wheelEvent(QWheelEvent* ev);
-//        virtual void dropEvent(QDropEvent *);
-};
-
-#endif /* UBROUTEDMOUSEEVENTWEBVIEW_H_ */

src/web/web.pri

@@ -13,7 +13,6 @@ HEADERS      += src/web/UBWebController.h \
                 src/web/UBWebKitUtils.h \
                 src/web/UBWebPage.h \
                 src/web/UBWebPluginWidget.h \
-                src/web/UBRoutedMouseEventWebView.h \
                 src/web/UBOEmbedParser.h\
                 src/web/browser/WBBrowserWindow.h \
                 src/web/browser/WBChaseWidget.h \
@@ -35,7 +34,6 @@ SOURCES      += src/web/UBWebController.cpp \
                 src/web/UBWebKitUtils.cpp \
                 src/web/UBWebPage.cpp \
                 src/web/UBWebPluginWidget.cpp \
-                src/web/UBRoutedMouseEventWebView.cpp \
                 src/web/UBOEmbedParser.cpp\
                 src/web/browser/WBBrowserWindow.cpp \
                 src/web/browser/WBChaseWidget.cpp \