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
2c1a2c95
Commit
2c1a2c95
authored
11 years ago
by
-f
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
object selection on board remain unchanged after an automatic saving
parent
92167aab
master
bugfix
1.5.4z3
1.5.4z2
1.5.4z
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
UBBoardController.cpp
src/board/UBBoardController.cpp
+3
-4
UBBoardController.h
src/board/UBBoardController.h
+1
-1
UBPersistenceManager.cpp
src/core/UBPersistenceManager.cpp
+3
-2
UBPersistenceManager.h
src/core/UBPersistenceManager.h
+1
-1
No files found.
src/board/UBBoardController.cpp
View file @
2c1a2c95
...
...
@@ -397,12 +397,11 @@ void UBBoardController::stopScript()
void
UBBoardController
::
saveData
(
SaveFlags
fls
)
{
bool
verbose
=
fls
|
sf_showProgress
;
if
(
verbose
)
{
UBApplication
::
showMessage
(
"Saving document..."
);
}
if
(
mActiveScene
&&
mActiveScene
->
isModified
())
{
persistCurrentScene
();
persistCurrentScene
(
true
);
}
if
(
verbose
)
{
UBApplication
::
showMessage
(
"Document has just been saved..."
);
...
...
@@ -1891,14 +1890,14 @@ void UBBoardController::show()
UBApplication
::
mainWindow
->
actionLibrary
->
setChecked
(
false
);
}
void
UBBoardController
::
persistCurrentScene
()
void
UBBoardController
::
persistCurrentScene
(
bool
isAnAutomaticBackup
)
{
if
(
UBPersistenceManager
::
persistenceManager
()
&&
selectedDocument
()
&&
mActiveScene
&&
mActiveSceneIndex
!=
mDeletingSceneIndex
&&
(
mActiveSceneIndex
>=
0
)
&&
mActiveSceneIndex
!=
mMovingSceneIndex
&&
(
mActiveScene
->
isModified
()))
{
UBPersistenceManager
::
persistenceManager
()
->
persistDocumentScene
(
selectedDocument
(),
mActiveScene
,
mActiveSceneIndex
);
UBPersistenceManager
::
persistenceManager
()
->
persistDocumentScene
(
selectedDocument
(),
mActiveScene
,
mActiveSceneIndex
,
isAnAutomaticBackup
);
updatePage
(
mActiveSceneIndex
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/board/UBBoardController.h
View file @
2c1a2c95
...
...
@@ -156,7 +156,7 @@ class UBBoardController : public UBDocumentContainer
return
mSystemScaleFactor
;
}
qreal
currentZoom
();
void
persistCurrentScene
();
void
persistCurrentScene
(
bool
isAnAutomaticBackup
=
false
);
void
showNewVersionAvailable
(
bool
automatic
,
const
UBVersion
&
installedVersion
,
const
UBSoftwareUpdate
&
softwareUpdate
);
void
setBoxing
(
QRect
displayRect
);
void
setToolbarTexts
();
...
...
This diff is collapsed.
Click to expand it.
src/core/UBPersistenceManager.cpp
View file @
2c1a2c95
...
...
@@ -665,10 +665,11 @@ UBGraphicsScene* UBPersistenceManager::loadDocumentScene(UBDocumentProxy* proxy,
}
}
void
UBPersistenceManager
::
persistDocumentScene
(
UBDocumentProxy
*
pDocumentProxy
,
UBGraphicsScene
*
pScene
,
const
int
pSceneIndex
)
void
UBPersistenceManager
::
persistDocumentScene
(
UBDocumentProxy
*
pDocumentProxy
,
UBGraphicsScene
*
pScene
,
const
int
pSceneIndex
,
bool
isAnAutomaticBackup
)
{
checkIfDocumentRepositoryExists
();
if
(
!
isAnAutomaticBackup
)
pScene
->
deselectAllItems
();
generatePathIfNeeded
(
pDocumentProxy
);
...
...
This diff is collapsed.
Click to expand it.
src/core/UBPersistenceManager.h
View file @
2c1a2c95
...
...
@@ -73,7 +73,7 @@ class UBPersistenceManager : public QObject
virtual
void
duplicateDocumentScene
(
UBDocumentProxy
*
pDocumentProxy
,
int
index
);
virtual
void
persistDocumentScene
(
UBDocumentProxy
*
pDocumentProxy
,
UBGraphicsScene
*
pScene
,
const
int
pSceneIndex
);
UBGraphicsScene
*
pScene
,
const
int
pSceneIndex
,
bool
isAnAutomaticBackup
=
false
);
virtual
UBGraphicsScene
*
createDocumentSceneAt
(
UBDocumentProxy
*
pDocumentProxy
,
int
index
,
bool
useUndoRedoStack
=
true
);
...
...
This diff is collapsed.
Click to expand it.
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