Commit 763a4fcf authored by shibakaneki's avatar shibakaneki

Fixed the issue SANKORE-19: a crash occured while opening a page containing an application

parent fdd20200
......@@ -1132,11 +1132,11 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy,
UBGraphicsTextItem::lastUsedTextColor = QColor();
}
if (sceneChange)
emit activeSceneChanged();
// Notify the navigator palette that the document has changed
mPaletteManager->navigatorPalette()->setDocument(pDocumentProxy);
if (sceneChange)
emit activeSceneChanged();
}
......
......@@ -58,7 +58,8 @@ void UBGraphicsTextItemDelegate::contentsChanged()
delegated()->contentsChanged();
}
// This method is used to filter the available fonts. Only the web-compliant fonts
// will remain in the font list.
void UBGraphicsTextItemDelegate::customize(QFontDialog &fontDialog)
{
fontDialog.setOption(QFontDialog::DontUseNativeDialog);
......
......@@ -91,7 +91,7 @@ void UBDocumentNavigator::generateThumbnails()
QGraphicsPixmapItem* pixmapItem = new UBSceneThumbnailPixmap(pix, mCrntDoc, i);
// Get the selected item
if(UBApplication::boardController->activeSceneIndex() == i)
if(UBApplication::boardController->activeSceneIndex() == i)
{
selection = pixmapItem;
mCrntItem = dynamic_cast<UBSceneThumbnailPixmap*>(pixmapItem);
......@@ -152,10 +152,10 @@ void UBDocumentNavigator::addNewPage()
{
if(!bNavig)
{
generateThumbnails();
generateThumbnails();
if(NULL != mCrntItem)
{
mCrntItem->setSelected(true);
mCrntItem->setSelected(true);
}
}
}
......
......@@ -7,20 +7,25 @@
UniboardSankoreTransition::UniboardSankoreTransition(QObject *parent) :
QObject(parent)
, mTransitionDlg(NULL)
{
mOldSankoreDirectory = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation));
// mOldSankoreDirectory = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation));
mUniboardSourceDirectory = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation));
#if defined(Q_WS_MACX)
mUniboardSourceDirectory.replace("Sankore/Sankore 3.1", "Uniboard");
#else
mUniboardSourceDirectory.replace("Sankore/Sankore 3.1", "Mnemis/Uniboard");
#endif
connect(this, SIGNAL(docAdded(UBDocumentProxy*)), UBPersistenceManager::persistenceManager(), SIGNAL(documentCreated(UBDocumentProxy*)));
// mUniboardSourceDirectory = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation));
//#if defined(Q_WS_MACX)
// mUniboardSourceDirectory.replace("Sankore/Sankore 3.1", "Uniboard");
//#else
// mUniboardSourceDirectory.replace("Sankore/Sankore 3.1", "Mnemis/Uniboard");
//#endif
// connect(this, SIGNAL(docAdded(UBDocumentProxy*)), UBPersistenceManager::persistenceManager(), SIGNAL(documentCreated(UBDocumentProxy*)));
}
UniboardSankoreTransition::~UniboardSankoreTransition()
{
delete mTransitionDlg;
if(NULL != mTransitionDlg)
{
delete mTransitionDlg;
mTransitionDlg = NULL;
}
}
void UniboardSankoreTransition::rollbackDocumentsTransition(QFileInfoList& fileInfoList)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment