http://188.165.53.52/jira/browse/SANKORE-284

src/core/UBApplication.cpp

@@ -237,8 +237,11 @@ int UBApplication::exec(const QString& pFileToImport)
     mainWindow->actionCut->setShortcuts(QKeySequence::Cut);
 
     connect(mainWindow->actionBoard, SIGNAL(triggered()), this, SLOT(showBoard()));
+    connect(mainWindow->actionBoard, SIGNAL(triggered()), this, SLOT(startScript()));
     connect(mainWindow->actionWeb, SIGNAL(triggered()), this, SLOT(showInternet()));
+    connect(mainWindow->actionWeb, SIGNAL(triggered()), this, SLOT(stopScript()));
     connect(mainWindow->actionDocument, SIGNAL(triggered()), this, SLOT(showDocument()));
+    connect(mainWindow->actionDocument, SIGNAL(triggered()), this, SLOT(stopScript()));
     connect(mainWindow->actionQuit, SIGNAL(triggered()), this, SLOT(closing()));
     connect(mainWindow, SIGNAL(closeEvent_Signal(QCloseEvent*)), this, SLOT(closeEvent(QCloseEvent*)));
 
@@ -262,6 +265,7 @@ int UBApplication::exec(const QString& pFileToImport)
 
 
     connect(mainWindow->actionDesktop, SIGNAL(triggered(bool)), applicationController, SLOT(showDesktop(bool)));
+    connect(mainWindow->actionDesktop, SIGNAL(triggered(bool)), this, SLOT(stopScript()));
 #ifndef Q_WS_MAC
     connect(mainWindow->actionHideApplication, SIGNAL(triggered()), mainWindow, SLOT(showMinimized()));
 #else
@@ -274,6 +278,7 @@ int UBApplication::exec(const QString& pFileToImport)
 
     connect(mainWindow->actionPreferences, SIGNAL(triggered()), mPreferencesController, SLOT(show()));
     connect(mainWindow->actionTutorial, SIGNAL(triggered()), applicationController, SLOT(showTutorial()));
+    connect(mainWindow->actionTutorial, SIGNAL(triggered()), this, SLOT(stopScript()));
     connect(mainWindow->actionSankoreEditor, SIGNAL(triggered()), applicationController, SLOT(showSankoreEditor()));
     connect(mainWindow->actionCheckUpdate, SIGNAL(triggered()), applicationController, SLOT(checkUpdateRequest()));
 
@@ -353,6 +358,16 @@ void UBApplication::showMinimized()
 
 #endif
 
+void UBApplication::startScript()
+{
+    this->boardController->freezeW3CWidgets(false);
+}
+
+void UBApplication::stopScript()
+{
+    this->boardController->freezeW3CWidgets(true);
+}
+
 void UBApplication::showBoard()
 {
     applicationController->showBoard();

src/core/UBApplication.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 3 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 UBAPPLICATION_H_
-#define UBAPPLICATION_H_
-
-#include <QtGui>
-
-#include "qtsingleapplication.h"
-
-#include "transition/UniboardSankoreTransition.h"
-
-namespace Ui
-{
-    class MainWindow;
-}
-
-
-class UBBoardController;
-class UBWebController;
-class UBControlView;
-class UBPreferencesController;
-class UBResources;
-class UBSettings;
-class UBPersistenceManager;
-class UBApplicationController;
-class UBDocumentController;
-class UBSoftwareUpdateController;
-class UBMainWindow;
-
-class UBApplication : public QtSingleApplication
-{
-    Q_OBJECT;
-
-    public:
-
-        UBApplication(const QString &id, int &argc, char **argv);
-        virtual ~UBApplication();
-
-        int exec(const QString& pFileToImport);
-
-		void cleanup();
-
-        static QPointer<QUndoStack> undoStack;
-
-        static UBApplicationController *applicationController;
-        static UBBoardController* boardController;
-        static UBWebController* webController;
-        static UBDocumentController* documentController;
-        static UBSoftwareUpdateController* softwareUpdateController;
-        static UniboardSankoreTransition* mUniboardSankoreTransition;
-
-        static UBMainWindow* mainWindow;
-
-        static UBApplication* app()
-        {
-            return static_cast<UBApplication*>qApp;
-        }
-
-        static const QString mimeTypeUniboardDocument;
-        static const QString mimeTypeUniboardPage;
-        static const QString mimeTypeUniboardPageItem;
-        static const QString mimeTypeUniboardPageThumbnail;
-
-        static void showMessage(const QString& message, bool showSpinningWheel = false);
-        static void setDisabled(bool disable);
-
-        static QObject* staticMemoryCleaner;
-        static QString globalStyleSheet();
-
-        void decorateActionMenu(QAction* action);
-        void insertSpaceToToolbarBeforeAction(QToolBar* toolbar, QAction* action, int width = -1);
-
-        int toolBarHeight();
-        bool eventFilter(QObject *obj, QEvent *event);
-
-        bool isVerbose() { return mIsVerbose;}
-        void setVerbose(bool verbose){mIsVerbose = verbose;}
-        static QString urlFromHtml(QString html);
-        static bool isFromWeb(QString url);
-
-    signals:
-
-    public slots:
-
-        void showBoard();
-        void showInternet();
-        void showDocument();
-
-        void toolBarPositionChanged(QVariant topOrBottom);
-        void toolBarDisplayTextChanged(QVariant display);
-
-        void closeEvent(QCloseEvent *event);
-
-        /**
-         * Used on Windows platform to open file in running application. On MacOS X opening file is done through the
-         * FileOpen event that is handle in eventFilter method.
-         */
-        bool handleOpenMessage(const QString& pMessage);
-
-    private slots:
-
-        void closing();
-#ifdef Q_WS_MAC
-        void showMinimized();
-#endif
-        void importUniboardFiles();
-    private:
-
-        void updateProtoActionsState();
-        QList<QMenu*> mProtoMenus;
-        bool mIsVerbose;
-
-    protected:
-
-#if defined(Q_WS_MACX) && !defined(QT_MAC_USE_COCOA)
-        bool macEventFilter(EventHandlerCallRef caller, EventRef event);
-#endif
-
-        UBPreferencesController* mPreferencesController;
-
-};
-
-
-class UBStyle : public QPlastiqueStyle
-{
-    public:
-
-        UBStyle()
-            : QPlastiqueStyle()
-        {
-            // NOOP
-        }
-
-        virtual ~UBStyle()
-        {
-           // NOOP
-        }
-
-        /*
-         * redefined to be more cocoa like on texts
-         */
-        virtual void drawItemText(QPainter *painter, const QRect &rect, int alignment, const QPalette &pal,
-                                  bool enabled, const QString& text, QPalette::ColorRole textRole) const;
-
-
-};
-
-#endif /* UBAPPLICATION_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 3 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 UBAPPLICATION_H_
+#define UBAPPLICATION_H_
+
+#include <QtGui>
+
+#include "qtsingleapplication.h"
+
+#include "transition/UniboardSankoreTransition.h"
+
+namespace Ui
+{
+    class MainWindow;
+}
+
+
+class UBBoardController;
+class UBWebController;
+class UBControlView;
+class UBPreferencesController;
+class UBResources;
+class UBSettings;
+class UBPersistenceManager;
+class UBApplicationController;
+class UBDocumentController;
+class UBSoftwareUpdateController;
+class UBMainWindow;
+
+class UBApplication : public QtSingleApplication
+{
+    Q_OBJECT;
+
+    public:
+
+        UBApplication(const QString &id, int &argc, char **argv);
+        virtual ~UBApplication();
+
+        int exec(const QString& pFileToImport);
+
+		void cleanup();
+
+        static QPointer<QUndoStack> undoStack;
+
+        static UBApplicationController *applicationController;
+        static UBBoardController* boardController;
+        static UBWebController* webController;
+        static UBDocumentController* documentController;
+        static UBSoftwareUpdateController* softwareUpdateController;
+        static UniboardSankoreTransition* mUniboardSankoreTransition;
+
+        static UBMainWindow* mainWindow;
+
+        static UBApplication* app()
+        {
+            return static_cast<UBApplication*>qApp;
+        }
+
+        static const QString mimeTypeUniboardDocument;
+        static const QString mimeTypeUniboardPage;
+        static const QString mimeTypeUniboardPageItem;
+        static const QString mimeTypeUniboardPageThumbnail;
+
+        static void showMessage(const QString& message, bool showSpinningWheel = false);
+        static void setDisabled(bool disable);
+
+        static QObject* staticMemoryCleaner;
+        static QString globalStyleSheet();
+
+        void decorateActionMenu(QAction* action);
+        void insertSpaceToToolbarBeforeAction(QToolBar* toolbar, QAction* action, int width = -1);
+
+        int toolBarHeight();
+        bool eventFilter(QObject *obj, QEvent *event);
+
+        bool isVerbose() { return mIsVerbose;}
+        void setVerbose(bool verbose){mIsVerbose = verbose;}
+        static QString urlFromHtml(QString html);
+        static bool isFromWeb(QString url);
+
+    signals:
+
+    public slots:
+
+        void showBoard();
+        void showInternet();
+        void showDocument();
+        void startScript();
+        void stopScript();
+
+        void toolBarPositionChanged(QVariant topOrBottom);
+        void toolBarDisplayTextChanged(QVariant display);
+
+        void closeEvent(QCloseEvent *event);
+
+        /**
+         * Used on Windows platform to open file in running application. On MacOS X opening file is done through the
+         * FileOpen event that is handle in eventFilter method.
+         */
+        bool handleOpenMessage(const QString& pMessage);
+
+    private slots:
+
+        void closing();
+#ifdef Q_WS_MAC
+        void showMinimized();
+#endif
+        void importUniboardFiles();
+    private:
+
+        void updateProtoActionsState();
+        QList<QMenu*> mProtoMenus;
+        bool mIsVerbose;
+
+    protected:
+
+#if defined(Q_WS_MACX) && !defined(QT_MAC_USE_COCOA)
+        bool macEventFilter(EventHandlerCallRef caller, EventRef event);
+#endif
+
+        UBPreferencesController* mPreferencesController;
+
+};
+
+
+class UBStyle : public QPlastiqueStyle
+{
+    public:
+
+        UBStyle()
+            : QPlastiqueStyle()
+        {
+            // NOOP
+        }
+
+        virtual ~UBStyle()
+        {
+           // NOOP
+        }
+
+        /*
+         * redefined to be more cocoa like on texts
+         */
+        virtual void drawItemText(QPainter *painter, const QRect &rect, int alignment, const QPalette &pal,
+                                  bool enabled, const QString& text, QPalette::ColorRole textRole) const;
+
+
+};
+
+#endif /* UBAPPLICATION_H_ */

src/domain/UBGraphicsItemUndoCommand.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 3 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 "UBGraphicsItemUndoCommand.h"
-
-#include <QtGui>
-
-#include "UBGraphicsScene.h"
-
-#include "core/memcheck.h"
-
-
-UBGraphicsItemUndoCommand::UBGraphicsItemUndoCommand(UBGraphicsScene* pScene, const QSet<QGraphicsItem*>& pRemovedItems,
-        const QSet<QGraphicsItem*>& pAddedItems)
-    : mScene(pScene)
-        , mRemovedItems(pRemovedItems - pAddedItems)
-        , mAddedItems(pAddedItems - pRemovedItems)
-{
-    mFirstRedo = true;
-}
-
-UBGraphicsItemUndoCommand::UBGraphicsItemUndoCommand(UBGraphicsScene* pScene, QGraphicsItem* pRemovedItem,
-               QGraphicsItem* pAddedItem) :
-    mScene(pScene)
-{
-
-    if (pRemovedItem)
-        mRemovedItems.insert(pRemovedItem);
-
-    if (pAddedItem)
-        mAddedItems.insert(pAddedItem);
-
-    mFirstRedo = true;
-
-}
-
-UBGraphicsItemUndoCommand::~UBGraphicsItemUndoCommand()
-{
-   //NOOP
-}
-
-void UBGraphicsItemUndoCommand::undo()
-{
-    if (!mScene){
-        return;
-    }
-
-    QSetIterator<QGraphicsItem*> itAdded(mAddedItems);
-    while (itAdded.hasNext())
-    {
-        QGraphicsItem* item = itAdded.next();
-        item->setSelected(false);
-        mScene->removeItem(item);
-    }
-
-    QSetIterator<QGraphicsItem*> itRemoved(mRemovedItems);
-    while (itRemoved.hasNext())
-    {
-        mScene->addItem(itRemoved.next());
-    }
-
-    // force refresh, QT is a bit lazy and take a lot of time (nb item ^2 ?) to trigger repaint
-    mScene->update(mScene->sceneRect());
-
-}
-
-void UBGraphicsItemUndoCommand::redo()
-{
-    // the Undo framework calls a redo while appending the undo command.
-    // as we have already plotted the elements, we do not want to do it twice
-    if (!mFirstRedo)
-    {
-        if (!mScene){
-            return;
-        }
-
-        QSetIterator<QGraphicsItem*> itRemoved(mRemovedItems);
-        while (itRemoved.hasNext())
-        {
-            QGraphicsItem* item = itRemoved.next();
-            item->setSelected(false);
-            mScene->removeItem(item);
-        }
-
-        QSetIterator<QGraphicsItem*> itAdded(mAddedItems);
-        while (itAdded.hasNext())
-        {
-            mScene->addItem(itAdded.next());
-        }
-
-        // force refresh, QT is a bit lazy and take a lot of time (nb item ^2) to trigger repaint
-        mScene->update(mScene->sceneRect());
-    }
-    else
-    {
-        mFirstRedo = false;
-    }
-}
+/*
+ * 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 3 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 "UBGraphicsItemUndoCommand.h"
+
+#include <QtGui>
+
+#include "UBGraphicsScene.h"
+
+#include "core/memcheck.h"
+
+#include "core/UBApplication.h"
+
+#include "board/UBBoardController.h"
+
+UBGraphicsItemUndoCommand::UBGraphicsItemUndoCommand(UBGraphicsScene* pScene, const QSet<QGraphicsItem*>& pRemovedItems,
+        const QSet<QGraphicsItem*>& pAddedItems)
+    : mScene(pScene)
+        , mRemovedItems(pRemovedItems - pAddedItems)
+        , mAddedItems(pAddedItems - pRemovedItems)
+{
+    mFirstRedo = true;
+
+    QSetIterator<QGraphicsItem*> itAdded(mAddedItems);
+    while (itAdded.hasNext())
+    {
+        UBApplication::boardController->freezeW3CWidget(itAdded.next(), true);
+    }
+
+    QSetIterator<QGraphicsItem*> itRemoved(mRemovedItems);
+    while (itRemoved.hasNext())
+    {
+        UBApplication::boardController->freezeW3CWidget(itRemoved.next(), false);
+    }
+}
+
+UBGraphicsItemUndoCommand::UBGraphicsItemUndoCommand(UBGraphicsScene* pScene, QGraphicsItem* pRemovedItem,
+               QGraphicsItem* pAddedItem) :
+    mScene(pScene)
+{
+
+    if (pRemovedItem)
+    {
+        mRemovedItems.insert(pRemovedItem);
+        UBApplication::boardController->freezeW3CWidget(pRemovedItem, true);
+    }
+
+    if (pAddedItem)
+    {
+        mAddedItems.insert(pAddedItem);
+        UBApplication::boardController->freezeW3CWidget(pAddedItem, false);
+    }
+
+    mFirstRedo = true;
+
+}
+
+UBGraphicsItemUndoCommand::~UBGraphicsItemUndoCommand()
+{
+   //NOOP
+}
+
+void UBGraphicsItemUndoCommand::undo()
+{
+    if (!mScene){
+        return;
+    }
+
+    QSetIterator<QGraphicsItem*> itAdded(mAddedItems);
+    while (itAdded.hasNext())
+    {
+        QGraphicsItem* item = itAdded.next();
+        item->setSelected(false);
+        mScene->removeItem(item);
+        UBApplication::boardController->freezeW3CWidget(item, true);
+    }
+
+    QSetIterator<QGraphicsItem*> itRemoved(mRemovedItems);
+    while (itRemoved.hasNext())
+    {
+        QGraphicsItem* item = itRemoved.next();
+        mScene->addItem(item);
+        UBApplication::boardController->freezeW3CWidget(item, false);
+    }
+
+    // force refresh, QT is a bit lazy and take a lot of time (nb item ^2 ?) to trigger repaint
+    mScene->update(mScene->sceneRect());
+
+}
+
+void UBGraphicsItemUndoCommand::redo()
+{
+    // the Undo framework calls a redo while appending the undo command.
+    // as we have already plotted the elements, we do not want to do it twice
+    if (!mFirstRedo)
+    {
+        if (!mScene){
+            return;
+        }
+
+        QSetIterator<QGraphicsItem*> itRemoved(mRemovedItems);
+        while (itRemoved.hasNext())
+        {
+            QGraphicsItem* item = itRemoved.next();
+            item->setSelected(false);
+            mScene->removeItem(item);
+            UBApplication::boardController->freezeW3CWidget(item, true);
+        }
+
+        QSetIterator<QGraphicsItem*> itAdded(mAddedItems);
+        while (itAdded.hasNext())
+        {
+            QGraphicsItem* item = itAdded.next();
+            mScene->addItem(item);
+            UBApplication::boardController->freezeW3CWidget(item, false);
+        }
+
+        // force refresh, QT is a bit lazy and take a lot of time (nb item ^2) to trigger repaint
+        mScene->update(mScene->sceneRect());
+    }
+    else
+    {
+        mFirstRedo = false;
+    }
+}