removed transition file

Sankore_3.1.pro

@@ -9,9 +9,9 @@ CONFIG += debug_and_release \
 
 
 VERSION_MAJ = 2
-VERSION_MIN = 00 
+VERSION_MIN = 00
 VERSION_TYPE = r # a = alpha, b = beta, r = release, other => error
-VERSION_PATCH = 03 
+VERSION_PATCH = 03
 
 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
 VERSION = $$replace(VERSION, "\\.r", "")
@@ -49,7 +49,6 @@ include(src/podcast/podcast.pri)
 include(src/tools/tools.pri)
 include(src/desktop/desktop.pri)
 include(src/web/web.pri)
-include(src/transition/transition.pri)
 include(src/interfaces/interfaces.pri)
 include(src/customWidgets/customWidgets.pri)
 
@@ -129,10 +128,10 @@ win32 {
 }
 
 macx {
-   LIBS += -framework Foundation 
+   LIBS += -framework Foundation
    LIBS += -lcrypto
    #commented because Sankore crashes on Java Script. It seems to backends dependencies.
-   #LIBS += -framework AppKit 
+   #LIBS += -framework AppKit
    #LIBS += -framework WebKit
 
    CONFIG(release, debug|release):CONFIG += x86
@@ -352,7 +351,7 @@ macx {
        TRANSLATION_mg.path = "$$RESOURCES_DIR/mg.lproj"
        QMAKE_BUNDLE_DATA += TRANSLATION_mg
    }
-   
+
    QMAKE_BUNDLE_DATA += UB_ETC \
        UB_LIBRARY \
        UB_FONTS \

resources/forms/mainWindow.ui

@@ -1623,14 +1623,6 @@
     <string>Ctrl+H</string>
    </property>
   </action>
-  <action name="actionImportUniboardDocuments">
-   <property name="text">
-    <string>Import Uniboard Documents</string>
-   </property>
-   <property name="toolTip">
-    <string>Import old Sankore or Uniboard documents</string>
-   </property>
-  </action>
   <action name="actionGroupItems">
    <property name="checkable">
     <bool>true</bool>

src/adaptors/UBExportDocument.cpp

@@ -37,8 +37,6 @@ THIRD_PARTY_WARNINGS_DISABLE
 #include "quazipfile.h"
 THIRD_PARTY_WARNINGS_ENABLE
 
-#include "transition/UniboardSankoreTransition.h"
-
 #include "core/memcheck.h"
 
 UBExportDocument::UBExportDocument(QObject *parent)
@@ -78,10 +76,6 @@ void UBExportDocument::persist(UBDocumentProxy* pDocumentProxy)
 
 void UBExportDocument::persistsDocument(UBDocumentProxy* pDocumentProxy, QString filename)
 {
-    UniboardSankoreTransition document;
-    QString documentPath(pDocumentProxy->persistencePath());
-    document.checkDocumentDirectory(documentPath);
-
     QuaZip zip(filename);
     zip.setFileNameCodec("UTF-8");
     if(!zip.open(QuaZip::mdCreate))

src/adaptors/UBWebPublisher.cpp

@@ -27,8 +27,6 @@
 
 #include "adaptors/publishing/UBDocumentPublisher.h"
 
-#include "transition/UniboardSankoreTransition.h"
-
 #include "core/memcheck.h"
 
 UBWebPublisher::UBWebPublisher(QObject *parent)
@@ -55,10 +53,6 @@ void UBWebPublisher::persist(UBDocumentProxy* pDocumentProxy)
     if (!pDocumentProxy)
         return;
 
-    UniboardSankoreTransition document;
-    QString documentPath(pDocumentProxy->persistencePath());
-    document.checkDocumentDirectory(documentPath);
-
     UBDocumentPublisher* publisher = new UBDocumentPublisher(pDocumentProxy, this); // the publisher will self delete when publication finishes
     publisher->publish();
 

src/core/UBApplication.cpp

@@ -72,7 +72,6 @@ UBApplicationController* UBApplication::applicationController = 0;
 UBBoardController* UBApplication::boardController = 0;
 UBWebController* UBApplication::webController = 0;
 UBDocumentController* UBApplication::documentController = 0;
-UniboardSankoreTransition* UBApplication::mUniboardSankoreTransition = 0;
 
 UBMainWindow* UBApplication::mainWindow = 0;
 
@@ -180,9 +179,6 @@ UBApplication::~UBApplication()
     delete mainWindow;
     mainWindow = 0;
 
-    delete mUniboardSankoreTransition;
-    mUniboardSankoreTransition = 0;
-
     UBPersistenceManager::destroy();
 
     UBDownloadManager::destroy();
@@ -325,9 +321,9 @@ int UBApplication::exec(const QString& pFileToImport)
 
     UBDrawingController::drawingController()->setStylusTool((int)UBStylusTool::Pen);
 
-    applicationController = new UBApplicationController(boardController->controlView(), 
-                                                        boardController->displayView(), 
-                                                        mainWindow, 
+    applicationController = new UBApplicationController(boardController->controlView(),
+                                                        boardController->displayView(),
+                                                        mainWindow,
                                                         staticMemoryCleaner,
                                                         boardController->paletteManager()->rightPalette());
 
@@ -365,7 +361,6 @@ int UBApplication::exec(const QString& pFileToImport)
     connect(mainWindow->actionMultiScreen, SIGNAL(triggered(bool)), applicationController, SLOT(useMultiScreen(bool)));
     connect(mainWindow->actionWidePageSize, SIGNAL(triggered(bool)), boardController, SLOT(setWidePageSize(bool)));
     connect(mainWindow->actionRegularPageSize, SIGNAL(triggered(bool)), boardController, SLOT(setRegularPageSize(bool)));
-    connect(mainWindow->actionImportUniboardDocuments, SIGNAL(triggered()), this, SLOT(importUniboardFiles()));
 
     connect(mainWindow->actionCut, SIGNAL(triggered()), applicationController, SLOT(actionCut()));
     connect(mainWindow->actionCopy, SIGNAL(triggered()), applicationController, SLOT(actionCopy()));
@@ -399,12 +394,6 @@ void UBApplication::onScreenCountChanged(int newCount)
     mainWindow->actionMultiScreen->setEnabled(displayManager.numScreens() > 1);
 }
 
-void UBApplication::importUniboardFiles()
-{
-    mUniboardSankoreTransition = new UniboardSankoreTransition();
-    mUniboardSankoreTransition->documentTransition();
-}
-
 #ifdef Q_WS_MAC
 void UBApplication::showMinimized()
 {
@@ -662,14 +651,13 @@ void UBApplication::cleanup()
     if (boardController) delete boardController;
     if (webController) delete webController;
     if (documentController) delete documentController;
-    if (mUniboardSankoreTransition) delete mUniboardSankoreTransition;
 
 
     applicationController = NULL;
     boardController = NULL;
     webController = NULL;
     documentController = NULL;
-    mUniboardSankoreTransition = NULL;
+
 }
 
 void UBStyle::drawItemText(QPainter *painter, const QRect &rect, int alignment, const QPalette &pal,

src/core/UBApplication.h

@@ -28,8 +28,6 @@
 
 #include "qtsingleapplication.h"
 
-#include "transition/UniboardSankoreTransition.h"
-
 namespace Ui
 {
     class MainWindow;
@@ -66,7 +64,6 @@ class UBApplication : public QtSingleApplication
         static UBBoardController* boardController;
         static UBWebController* webController;
         static UBDocumentController* documentController;
-        static UniboardSankoreTransition* mUniboardSankoreTransition;
 
         static UBMainWindow* mainWindow;
 
@@ -123,8 +120,6 @@ class UBApplication : public QtSingleApplication
 #ifdef Q_WS_MAC
         void showMinimized();
 #endif
-        void importUniboardFiles();
-
         void onScreenCountChanged(int newCount);
 
     private:

src/domain/UBGraphicsItemDelegate.cpp

@@ -450,7 +450,9 @@ void UBGraphicsItemDelegate::positionHandles()
         foreach(DelegateButton* button, mButtons)
             button->hide();
 
-        mFrame->hide();
+        if(mFrame)
+            mFrame->hide();
+
         if (mToolBarItem)
             mToolBarItem->hide();
     }

src/domain/UBGraphicsScene.cpp

@@ -1099,9 +1099,6 @@ void UBGraphicsScene::clearContent(clearCase pCase)
     case clearAnnotations :
         foreach(QGraphicsItem* item, items()) {
 
-            bool isGroup = item->type() == UBGraphicsGroupContainerItem::Type;
-            bool isStrokesGroup = item->type() == UBGraphicsStrokesGroup::Type;
-
             UBGraphicsGroupContainerItem *itemGroup = item->parentItem()
                                                       ? qgraphicsitem_cast<UBGraphicsGroupContainerItem*>(item->parentItem())
                                                       : 0;
@@ -1110,6 +1107,9 @@ void UBGraphicsScene::clearContent(clearCase pCase)
                 continue;
             }
 
+            bool isGroup = item->type() == UBGraphicsGroupContainerItem::Type;
+            bool isStrokesGroup = item->type() == UBGraphicsStrokesGroup::Type;
+
             bool shouldDelete = false;
             switch (static_cast<int>(pCase)) {
             case clearAnnotations :

src/frameworks/UBCoreGraphicsScene.cpp

@@ -47,6 +47,7 @@ UBCoreGraphicsScene::~UBCoreGraphicsScene()
             if (item->scene() == NULL || item->scene() == this)
             {
                 delete item;
+                item = NULL;
             }
         }
     }
@@ -62,7 +63,7 @@ void UBCoreGraphicsScene::addItem(QGraphicsItem* item)
             removeItemFromDeletion(curItem);
         }
     }
- 
+
     if (item->scene() != this)
         QGraphicsScene::addItem(item);
 

src/transition/UniboardSankoreTransition.h

-/*
- * Copyright (C) 2012 Webdoc SA
- *
- * This file is part of Open-Sankoré.
- *
- * Open-Sankoré 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, version 3 of the License,
- * with a specific linking exception for the OpenSSL project's
- * "OpenSSL" library (or with modified versions of it that use the
- * same license as the "OpenSSL" library).
- *
- * Open-Sankoré 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 Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-
-#ifndef UNIBOARDSANKORETRANSITION_H
-#define UNIBOARDSANKORETRANSITION_H
-
-#include <QObject>
-#include <QFileInfo>
-#include <QThread>
-#include "gui/UBUpdateDlg.h"
-#include "document/UBDocumentProxy.h"
-
-class UniboardSankoreThread : public QThread
-{
-    Q_OBJECT
-public:
-    UniboardSankoreThread(QObject* parent = 0);
-    ~UniboardSankoreThread();
-
-    void run();
-
-};
-
-class UniboardSankoreTransition : public QObject
-{
-    Q_OBJECT
-public:
-    explicit UniboardSankoreTransition(QObject *parent = 0);
-    ~UniboardSankoreTransition();
-
-    bool checkDocumentDirectory(QString& documentDirectoryPath);
-
-    void documentTransition();
-    bool checkPage(QString& sankorePagePath);
-    bool updateSankoreHRef(QString &sankoreDocumentPath);
-    bool checkWidget(QString& sankoreWidgetPath);
-    bool updateIndexWidget(QString& sankoreWidgetPath);
-    void executeTransition();
-
-
-private:
-    void rollbackDocumentsTransition(QFileInfoList& fileInfoList);
-    UBUpdateDlg* mTransitionDlg;
-
-protected:
-    QString mUniboardSourceDirectory;
-    QString mOldSankoreDirectory;
-    UniboardSankoreThread* mThread;
-
-signals:
-    void transitionFinished(bool result);
-    void docAdded(UBDocumentProxy* doc);
-    void transitioningFile(QString documentName);
-
-private slots:
-    void startDocumentTransition();
-
-};
-
-#endif // UNIBOARDSANKORETRANSITION_H

src/transition/transition.pri

-
-HEADERS      += src/transition/UniboardSankoreTransition.h
-
-                
-SOURCES      += src/transition/UniboardSankoreTransition.cpp