Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
763a4fcf
Commit
763a4fcf
authored
May 19, 2011
by
shibakaneki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed the issue SANKORE-19: a crash occured while opening a page containing an application
parent
fdd20200
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
16 deletions
+22
-16
UBBoardController.cpp
src/board/UBBoardController.cpp
+3
-3
UBGraphicsTextItemDelegate.cpp
src/domain/UBGraphicsTextItemDelegate.cpp
+2
-1
UBDocumentNavigator.cpp
src/gui/UBDocumentNavigator.cpp
+3
-3
UniboardSankoreTransition.cpp
src/transition/UniboardSankoreTransition.cpp
+14
-9
No files found.
src/board/UBBoardController.cpp
View file @
763a4fcf
...
...
@@ -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
();
}
...
...
src/domain/UBGraphicsTextItemDelegate.cpp
View file @
763a4fcf
...
...
@@ -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
);
...
...
src/gui/UBDocumentNavigator.cpp
View file @
763a4fcf
...
...
@@ -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
);
}
}
}
...
...
src/transition/UniboardSankoreTransition.cpp
View file @
763a4fcf
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment