Implemented features SANKORE-47: Deactivate the transition from Uniboard files to Sankore files by putting EnableUniboardTransition to false in Uniboard.config

preferencesAboutTextFull
shibakaneki 14 years ago
parent 92decee422
commit e4c8f2d7e5
  1. 5
      src/core/UBApplication.cpp
  2. 2
      src/core/UBSettings.cpp
  3. 1
      src/core/UBSettings.h

@ -298,8 +298,13 @@ int UBApplication::exec(const QString& pFileToImport)
} }
} }
// 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 = new UniboardSankoreTransition();
mUniboardSankoreTransition->documentTransition(); mUniboardSankoreTransition->documentTransition();
}
return QApplication::exec(); return QApplication::exec();
} }

@ -170,7 +170,7 @@ void UBSettings::init()
appToolBarOrientationVertical = new UBSetting(this, "App", "ToolBarOrientationVertical", false); appToolBarOrientationVertical = new UBSetting(this, "App", "ToolBarOrientationVertical", false);
navigPaletteWidth = new UBSetting(this, "Board", "NavigPaletteWidth", 300); navigPaletteWidth = new UBSetting(this, "Board", "NavigPaletteWidth", 300);
libPaletteWidth = new UBSetting(this, "Board", "LibPaletteWidth", 300); libPaletteWidth = new UBSetting(this, "Board", "LibPaletteWidth", 300);
appEnableUniboardTransition = new UBSetting(this, "App", "EnableUniboardTransition", true);
appIsInSoftwareUpdateProcess = new UBSetting(this, "App", "IsInSoftwareUpdateProcess", false); appIsInSoftwareUpdateProcess = new UBSetting(this, "App", "IsInSoftwareUpdateProcess", false);
appLastSessionDocumentUUID = new UBSetting(this, "App", "LastSessionDocumentUUID", ""); appLastSessionDocumentUUID = new UBSetting(this, "App", "LastSessionDocumentUUID", "");

@ -201,6 +201,7 @@ class UBSettings : public QObject
UBSetting* appEnableAutomaticSoftwareUpdates; UBSetting* appEnableAutomaticSoftwareUpdates;
UBSetting* appEnableSoftwareUpdates; UBSetting* appEnableSoftwareUpdates;
UBSetting* appToolBarOrientationVertical; UBSetting* appToolBarOrientationVertical;
UBSetting* appEnableUniboardTransition;
UBSetting* appIsInSoftwareUpdateProcess; UBSetting* appIsInSoftwareUpdateProcess;

Loading…
Cancel
Save