From e4c8f2d7e58e6a5d8216759f6f4cb129d29eedbf Mon Sep 17 00:00:00 2001
From: shibakaneki <didier@sente.ch>
Date: Mon, 6 Jun 2011 11:45:15 +0200
Subject: [PATCH] Implemented features SANKORE-47: Deactivate the transition
 from Uniboard files to Sankore files by putting EnableUniboardTransition to
 false in Uniboard.config

---
 src/core/UBApplication.cpp | 9 +++++++--
 src/core/UBSettings.cpp    | 2 +-
 src/core/UBSettings.h      | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp
index 87fc38b9..32d88dbf 100644
--- a/src/core/UBApplication.cpp
+++ b/src/core/UBApplication.cpp
@@ -298,8 +298,13 @@ int UBApplication::exec(const QString& pFileToImport)
         }
     }
 
-    mUniboardSankoreTransition = new UniboardSankoreTransition();
-    mUniboardSankoreTransition->documentTransition();
+    // SANKORE-47: Deactivate the Uniboard to Sankore transition if
+    // EnableUniboardTransition is set at false in Uniboard.config
+    if(UBSettings::settings()->appEnableUniboardTransition->get().toBool())
+    {
+        mUniboardSankoreTransition = new UniboardSankoreTransition();
+        mUniboardSankoreTransition->documentTransition();
+    }
 
     return QApplication::exec();
 }
diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp
index da6aeee1..277b87bc 100644
--- a/src/core/UBSettings.cpp
+++ b/src/core/UBSettings.cpp
@@ -170,7 +170,7 @@ void UBSettings::init()
     appToolBarOrientationVertical = new UBSetting(this, "App", "ToolBarOrientationVertical", false);
     navigPaletteWidth = new UBSetting(this, "Board", "NavigPaletteWidth", 300);
     libPaletteWidth = new UBSetting(this, "Board", "LibPaletteWidth", 300);
-
+    appEnableUniboardTransition = new UBSetting(this, "App", "EnableUniboardTransition", true);
 
     appIsInSoftwareUpdateProcess = new UBSetting(this, "App", "IsInSoftwareUpdateProcess", false);
     appLastSessionDocumentUUID = new UBSetting(this, "App", "LastSessionDocumentUUID", "");
diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h
index 6c9b7a14..3f240b53 100644
--- a/src/core/UBSettings.h
+++ b/src/core/UBSettings.h
@@ -201,6 +201,7 @@ class UBSettings : public QObject
         UBSetting* appEnableAutomaticSoftwareUpdates;
         UBSetting* appEnableSoftwareUpdates;
         UBSetting* appToolBarOrientationVertical;
+        UBSetting* appEnableUniboardTransition;
 
         UBSetting* appIsInSoftwareUpdateProcess;