Old files from QWebView architecture deleted.

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"

src/api/UBWidgetUniboardAPI.cpp

@@ -30,7 +30,6 @@
 
 #include "domain/UBGraphicsScene.h"
 #include "domain/UBGraphicsWidgetItem.h"
-#include "domain/UBAbstractWidget.h"
 
 #include "adaptors/UBThumbnailAdaptor.h"
 

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"
@@ -1045,7 +1044,7 @@ void UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QString
         else
             size = mActiveScene->nominalSize() * .8;
 
-        QString widgetUrl = UBW3CWidget::createNPAPIWrapper(sUrl, mimeType, size);
+        QString widgetUrl = UBGraphicsW3CWidgetItem::createNPAPIWrapper(sUrl, mimeType, size);
 
         if (widgetUrl.length() > 0)
         {
@@ -1166,7 +1165,7 @@ void UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QString
                         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)
                         {
@@ -2160,7 +2159,7 @@ void UBBoardController::freezeW3CWidget(QGraphicsItem *item, bool freeze)
             return;
 
         if (freeze) {
-            item_casted->page()->mainFrame()->setContent(UBW3CWidget::freezedWidgetPage().toAscii());
+            item_casted->page()->mainFrame()->setContent(UBGraphicsW3CWidgetItem::freezedWidgetPage().toAscii());
         } else
             item_casted->loadMainHtml();
     }

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

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

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 "core/UBDownloadManager.h"
-#include "domain/UBAbstractWidget.h"
 #include "domain/UBGraphicsScene.h"
 #include "domain/UBGraphicsSvgItem.h"
 #include "domain/UBGraphicsPixmapItem.h"
@@ -326,7 +325,7 @@ QPixmap UBFeaturesController::getIcon(const QString &path, UBFeatureElementType
     }
     else if ( pFType == FEATURE_INTERACTIVE )
     {
-        return QPixmap( UBAbstractWidget::iconFilePath( QUrl::fromLocalFile(path) ) );
+        return QPixmap( UBGraphicsWidgetItem::iconFilePath( QUrl::fromLocalFile(path) ) );
     }
 
 
@@ -336,7 +335,7 @@ QPixmap UBFeaturesController::getIcon(const QString &path, UBFeatureElementType
     }
     if ( UBFileSystemUtils::mimeTypeFromFileName(path).contains("application") )
     {
-        return QPixmap( UBAbstractWidget::iconFilePath( QUrl::fromLocalFile(path) ) );
+        return QPixmap( UBGraphicsWidgetItem::iconFilePath( QUrl::fromLocalFile(path) ) );
     }
 
 	QPixmap 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/UBAppleWidget.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 UBAPPLEWIDGET_H_
-#define UBAPPLEWIDGET_H_
-
-#include <QtGui>
-#include <QtWebKit>
-
-#include "UBAbstractWidget.h"
-
-class UBItem;
-
-class UBAppleWidget : public UBAbstractWidget
-{
-    Q_OBJECT;
-
-    public:
-        UBAppleWidget(const QUrl& pWidgetUrl, QWidget *parent = 0);
-        virtual ~UBAppleWidget();
-
-};
-
-#endif /* UBAPPLEWIDGET_H_ */

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"

src/domain/UBGraphicsScene.cpp

@@ -60,8 +60,6 @@
 
 #include "domain/UBGraphicsGroupContainerItem.h"
 
-#include "UBAppleWidget.h"
-#include "UBW3CWidget.h"
 #include "UBGraphicsStroke.h"
 
 #include "core/memcheck.h"
@@ -257,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)
@@ -1397,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)
     {

src/domain/UBGraphicsScene.h

@@ -41,7 +41,6 @@ class UBGraphicsTextItem;
 class UBGraphicsRuler;
 class UBGraphicsProtractor;
 class UBGraphicsCompass;
-class UBAbstractWidget;
 class UBDocumentProxy;
 class UBGraphicsCurtainItem;
 class UBGraphicsStroke;

src/domain/UBGraphicsWidgetItem.cpp

@@ -24,9 +24,7 @@
 #include "UBGraphicsWidgetItemDelegate.h"
 #include "UBGraphicsDelegateFrame.h"
 
-#include "UBW3CWidget.h"
 #include "UBGraphicsScene.h"
-#include "UBAppleWidget.h"
 #include "frameworks/UBFileSystemUtils.h"
 #include "web/UBWebPage.h"
 #include "network/UBNetworkAccessManager.h"
@@ -51,14 +49,14 @@ QString UBGraphicsW3CWidgetItem::sNPAPIWrappperConfigTemplate;
 
 UBGraphicsWidgetItem::UBGraphicsWidgetItem(QGraphicsItem *parent, int widgetType)
     : UBGraphicsWebView(parent)
-    , mShouldMoveWidget(false)
-    , mUniboardAPI(0)
     , mIsResizable(false)
     , mInitialLoadDone(false)
     , mLoadIsErronous(false)
     , mIsFreezable(true)
     , mCanBeContent(0)
     , mCanBeTool(0)
+    , mShouldMoveWidget(false)
+    , mUniboardAPI(0)
     , mIsFrozen(false)
     , mIsTakingSnapshot(false)
 {

src/domain/UBGraphicsWidgetItem.h

@@ -17,21 +17,27 @@
 
 #include <QtGui>
 #include <QtWebKit>
+#include <QDomElement>
 
 #include "core/UB.h"
 
 #include "UBGraphicsWebView.h"
-#include "UBW3CWidget.h"
-#include "UBAppleWidget.h"
 
 class UBWidgetUniboardAPI;
 class UBGraphicsScene;
-class UBAbstractWidget;
 class UBW3CWidgetAPI;
 class UBW3CWidgetWebStorageAPI;
 class UBGraphiscItem;
 class UBGraphiscItemDelegate;
 
+struct UBWidgetType
+{
+    enum Enum
+    {
+        W3C = 0, Apple, Other
+    };
+};
+
 class UBGraphicsWidgetItem : public UBGraphicsWebView
 {
     Q_OBJECT
@@ -252,8 +258,6 @@ class UBGraphicsW3CWidgetItem : public UBGraphicsWidgetItem
 
         virtual UBItem* deepCopy() const;
 
-        UBW3CWidget* w3cWidget() const;
-
         virtual void paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget );
         virtual void setUuid(const QUuid &pUuid);
 

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 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

@@ -12,11 +12,8 @@ HEADERS      += src/domain/UBGraphicsScene.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 \
@@ -47,11 +44,8 @@ SOURCES      += src/domain/UBGraphicsScene.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/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/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 \