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
1e774c6e
Commit
1e774c6e
authored
May 16, 2011
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
The beta Sankore documents are also recovered
parent
e665ad6b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
14 deletions
+13
-14
UniboardSankoreTransition.cpp
src/transition/UniboardSankoreTransition.cpp
+12
-14
UniboardSankoreTransition.h
src/transition/UniboardSankoreTransition.h
+1
-0
No files found.
src/transition/UniboardSankoreTransition.cpp
View file @
1e774c6e
...
@@ -8,6 +8,8 @@
...
@@ -8,6 +8,8 @@
UniboardSankoreTransition
::
UniboardSankoreTransition
(
QObject
*
parent
)
:
UniboardSankoreTransition
::
UniboardSankoreTransition
(
QObject
*
parent
)
:
QObject
(
parent
)
QObject
(
parent
)
{
{
mOldSankoreDirectory
=
UBFileSystemUtils
::
normalizeFilePath
(
UBDesktopServices
::
storageLocation
(
QDesktopServices
::
DataLocation
));
mUniboardSourceDirectory
=
UBFileSystemUtils
::
normalizeFilePath
(
UBDesktopServices
::
storageLocation
(
QDesktopServices
::
DataLocation
));
mUniboardSourceDirectory
=
UBFileSystemUtils
::
normalizeFilePath
(
UBDesktopServices
::
storageLocation
(
QDesktopServices
::
DataLocation
));
#if defined(Q_WS_MACX)
#if defined(Q_WS_MACX)
mUniboardSourceDirectory
.
replace
(
"Sankore/Sankore 3.1"
,
"Uniboard"
);
mUniboardSourceDirectory
.
replace
(
"Sankore/Sankore 3.1"
,
"Uniboard"
);
...
@@ -38,17 +40,20 @@ void UniboardSankoreTransition::rollbackDocumentsTransition(QFileInfoList& fileI
...
@@ -38,17 +40,20 @@ void UniboardSankoreTransition::rollbackDocumentsTransition(QFileInfoList& fileI
void
UniboardSankoreTransition
::
documentTransition
()
void
UniboardSankoreTransition
::
documentTransition
()
{
{
if
(
QFileInfo
(
mUniboardSourceDirectory
).
exists
()){
if
(
QFileInfo
(
mUniboardSourceDirectory
).
exists
()
||
QFileInfo
(
mOldSankoreDirectory
).
exists
()
){
QString
uniboardDocumentDirectory
=
mUniboardSourceDirectory
+
"/document"
;
QString
uniboardDocumentDirectory
=
mUniboardSourceDirectory
+
"/document"
;
QFileInfoList
fileInfoList
=
UBFileSystemUtils
::
allElementsInDirectory
(
uniboardDocumentDirectory
);
QFileInfoList
fileInfoList
=
UBFileSystemUtils
::
allElementsInDirectory
(
uniboardDocumentDirectory
);
fileInfoList
<<
UBFileSystemUtils
::
allElementsInDirectory
(
mOldSankoreDirectory
+
"/document"
);
QString
backupDirectoryPath
=
UBFileSystemUtils
::
normalizeFilePath
(
UBDesktopServices
::
storageLocation
(
QDesktopServices
::
DesktopLocation
));
QString
backupDirectoryPath
=
UBFileSystemUtils
::
normalizeFilePath
(
UBDesktopServices
::
storageLocation
(
QDesktopServices
::
DesktopLocation
));
mTransitionDlg
=
new
UBUpdateDlg
(
0
,
fileInfoList
.
count
(),
backupDirectoryPath
);
if
(
fileInfoList
.
count
()
!=
0
){
connect
(
mTransitionDlg
,
SIGNAL
(
updateFiles
()),
this
,
SLOT
(
startDocumentTransition
()));
mTransitionDlg
=
new
UBUpdateDlg
(
0
,
fileInfoList
.
count
(),
backupDirectoryPath
);
connect
(
this
,
SIGNAL
(
transitionFinished
(
bool
)),
mTransitionDlg
,
SLOT
(
onFilesUpdated
(
bool
)));
connect
(
mTransitionDlg
,
SIGNAL
(
updateFiles
()),
this
,
SLOT
(
startDocumentTransition
()));
mTransitionDlg
->
show
();
connect
(
this
,
SIGNAL
(
transitionFinished
(
bool
)),
mTransitionDlg
,
SLOT
(
onFilesUpdated
(
bool
)));
mTransitionDlg
->
show
();
}
}
}
}
}
...
@@ -80,16 +85,9 @@ void UniboardSankoreTransition::startDocumentTransition()
...
@@ -80,16 +85,9 @@ void UniboardSankoreTransition::startDocumentTransition()
rollbackDocumentsTransition
(
fileInfoList
);
rollbackDocumentsTransition
(
fileInfoList
);
UBFileSystemUtils
::
deleteDir
(
backupDestinationPath
);
UBFileSystemUtils
::
deleteDir
(
backupDestinationPath
);
}
}
else
else
{
{
UBFileSystemUtils
::
deleteDir
(
mOldSankoreDirectory
);
UBFileSystemUtils
::
deleteDir
(
mUniboardSourceDirectory
);
UBFileSystemUtils
::
deleteDir
(
mUniboardSourceDirectory
);
// Notify the application that new documents have been added
// foreach(QString qstr, qslNewDocs)
// {
// UBDocumentProxy* pDoc = new UBDocumentProxy();
// pDoc->setMetaData(UBSettings::documentName, qstr);
// emit docAdded(pDoc);
// }
}
}
emit
transitionFinished
(
result
);
emit
transitionFinished
(
result
);
...
...
src/transition/UniboardSankoreTransition.h
View file @
1e774c6e
...
@@ -21,6 +21,7 @@ private:
...
@@ -21,6 +21,7 @@ private:
protected
:
protected
:
QString
mUniboardSourceDirectory
;
QString
mUniboardSourceDirectory
;
QString
mOldSankoreDirectory
;
signals
:
signals
:
void
transitionFinished
(
bool
result
);
void
transitionFinished
(
bool
result
);
...
...
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