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
1d354dd1
Commit
1d354dd1
authored
Mar 05, 2013
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed the uniboard import
parent
554ee877
Changes
9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
4 additions
and
416 deletions
+4
-416
Sankore_3.1.pro
Sankore_3.1.pro
+0
-1
UBExportDocument.cpp
src/adaptors/UBExportDocument.cpp
+0
-4
UBWebPublisher.cpp
src/adaptors/UBWebPublisher.cpp
+0
-4
UBApplication.cpp
src/core/UBApplication.cpp
+0
-15
UBApplication.h
src/core/UBApplication.h
+0
-5
UBDisplayManager.cpp
src/core/UBDisplayManager.cpp
+4
-2
UniboardSankoreTransition.cpp
src/transition/UniboardSankoreTransition.cpp
+0
-300
UniboardSankoreTransition.h
src/transition/UniboardSankoreTransition.h
+0
-80
transition.pri
src/transition/transition.pri
+0
-5
No files found.
Sankore_3.1.pro
View file @
1d354dd1
...
...
@@ -49,7 +49,6 @@ include(src/podcast/podcast.pri)
include
(
src
/
tools
/
tools
.
pri
)
include
(
src
/
desktop
/
desktop
.
pri
)
include
(
src
/
web
/
web
.
pri
)
include
(
src
/
transition
/
transition
.
pri
)
include
(
src
/
interfaces
/
interfaces
.
pri
)
include
(
src
/
customWidgets
/
customWidgets
.
pri
)
...
...
src/adaptors/UBExportDocument.cpp
View file @
1d354dd1
...
...
@@ -37,8 +37,6 @@ THIRD_PARTY_WARNINGS_DISABLE
#include "quazipfile.h"
THIRD_PARTY_WARNINGS_ENABLE
#include "transition/UniboardSankoreTransition.h"
#include "core/memcheck.h"
UBExportDocument
::
UBExportDocument
(
QObject
*
parent
)
...
...
@@ -78,9 +76,7 @@ void UBExportDocument::persist(UBDocumentProxy* pDocumentProxy)
void
UBExportDocument
::
persistsDocument
(
UBDocumentProxy
*
pDocumentProxy
,
QString
filename
)
{
UniboardSankoreTransition
document
;
QString
documentPath
(
pDocumentProxy
->
persistencePath
());
document
.
checkDocumentDirectory
(
documentPath
);
QuaZip
zip
(
filename
);
zip
.
setFileNameCodec
(
"UTF-8"
);
...
...
src/adaptors/UBWebPublisher.cpp
View file @
1d354dd1
...
...
@@ -27,8 +27,6 @@
#include "adaptors/publishing/UBDocumentPublisher.h"
#include "transition/UniboardSankoreTransition.h"
#include "core/memcheck.h"
UBWebPublisher
::
UBWebPublisher
(
QObject
*
parent
)
...
...
@@ -55,9 +53,7 @@ void UBWebPublisher::persist(UBDocumentProxy* pDocumentProxy)
if
(
!
pDocumentProxy
)
return
;
UniboardSankoreTransition
document
;
QString
documentPath
(
pDocumentProxy
->
persistencePath
());
document
.
checkDocumentDirectory
(
documentPath
);
UBDocumentPublisher
*
publisher
=
new
UBDocumentPublisher
(
pDocumentProxy
,
this
);
// the publisher will self delete when publication finishes
publisher
->
publish
();
...
...
src/core/UBApplication.cpp
View file @
1d354dd1
...
...
@@ -72,7 +72,6 @@ UBApplicationController* UBApplication::applicationController = 0;
UBBoardController
*
UBApplication
::
boardController
=
0
;
UBWebController
*
UBApplication
::
webController
=
0
;
UBDocumentController
*
UBApplication
::
documentController
=
0
;
UniboardSankoreTransition
*
UBApplication
::
mUniboardSankoreTransition
=
0
;
UBMainWindow
*
UBApplication
::
mainWindow
=
0
;
...
...
@@ -180,9 +179,6 @@ UBApplication::~UBApplication()
delete
mainWindow
;
mainWindow
=
0
;
delete
mUniboardSankoreTransition
;
mUniboardSankoreTransition
=
0
;
UBPersistenceManager
::
destroy
();
UBDownloadManager
::
destroy
();
...
...
@@ -365,7 +361,6 @@ int UBApplication::exec(const QString& pFileToImport)
connect
(
mainWindow
->
actionMultiScreen
,
SIGNAL
(
triggered
(
bool
)),
applicationController
,
SLOT
(
useMultiScreen
(
bool
)));
connect
(
mainWindow
->
actionWidePageSize
,
SIGNAL
(
triggered
(
bool
)),
boardController
,
SLOT
(
setWidePageSize
(
bool
)));
connect
(
mainWindow
->
actionRegularPageSize
,
SIGNAL
(
triggered
(
bool
)),
boardController
,
SLOT
(
setRegularPageSize
(
bool
)));
connect
(
mainWindow
->
actionImportUniboardDocuments
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
importUniboardFiles
()));
connect
(
mainWindow
->
actionCut
,
SIGNAL
(
triggered
()),
applicationController
,
SLOT
(
actionCut
()));
connect
(
mainWindow
->
actionCopy
,
SIGNAL
(
triggered
()),
applicationController
,
SLOT
(
actionCopy
()));
...
...
@@ -399,12 +394,6 @@ void UBApplication::onScreenCountChanged(int newCount)
mainWindow
->
actionMultiScreen
->
setEnabled
(
displayManager
.
numScreens
()
>
1
);
}
void
UBApplication
::
importUniboardFiles
()
{
mUniboardSankoreTransition
=
new
UniboardSankoreTransition
();
mUniboardSankoreTransition
->
documentTransition
();
}
#ifdef Q_WS_MAC
void
UBApplication
::
showMinimized
()
{
...
...
@@ -545,7 +534,6 @@ void UBApplication::decorateActionMenu(QAction* action)
menu
->
addSeparator
();
menu
->
addAction
(
mainWindow
->
actionPreferences
);
menu
->
addAction
(
mainWindow
->
actionMultiScreen
);
menu
->
addAction
(
mainWindow
->
actionImportUniboardDocuments
);
// SANKORE-48: Hide the check update action if the setting
// EnableAutomaticSoftwareUpdates is false in Uniboard.config
if
(
UBSettings
::
settings
()
->
appEnableAutomaticSoftwareUpdates
->
get
().
toBool
())
...
...
@@ -662,14 +650,11 @@ void UBApplication::cleanup()
if
(
boardController
)
delete
boardController
;
if
(
webController
)
delete
webController
;
if
(
documentController
)
delete
documentController
;
if
(
mUniboardSankoreTransition
)
delete
mUniboardSankoreTransition
;
applicationController
=
NULL
;
boardController
=
NULL
;
webController
=
NULL
;
documentController
=
NULL
;
mUniboardSankoreTransition
=
NULL
;
}
void
UBStyle
::
drawItemText
(
QPainter
*
painter
,
const
QRect
&
rect
,
int
alignment
,
const
QPalette
&
pal
,
...
...
src/core/UBApplication.h
View file @
1d354dd1
...
...
@@ -28,8 +28,6 @@
#include "qtsingleapplication.h"
#include "transition/UniboardSankoreTransition.h"
namespace
Ui
{
class
MainWindow
;
...
...
@@ -66,7 +64,6 @@ class UBApplication : public QtSingleApplication
static
UBBoardController
*
boardController
;
static
UBWebController
*
webController
;
static
UBDocumentController
*
documentController
;
static
UniboardSankoreTransition
*
mUniboardSankoreTransition
;
static
UBMainWindow
*
mainWindow
;
...
...
@@ -123,8 +120,6 @@ class UBApplication : public QtSingleApplication
#ifdef Q_WS_MAC
void
showMinimized
();
#endif
void
importUniboardFiles
();
void
onScreenCountChanged
(
int
newCount
);
private
:
...
...
src/core/UBDisplayManager.cpp
View file @
1d354dd1
...
...
@@ -25,8 +25,10 @@
#include "frameworks/UBPlatformUtils.h"
#include "core/UBApplication.h"
#include "core/UBApplicationController.h"
#include "UBApplication.h"
#include "UBApplicationController.h"
#include "UBSettings.h"
#include "board/UBBoardView.h"
...
...
src/transition/UniboardSankoreTransition.cpp
deleted
100644 → 0
View file @
554ee877
This diff is collapsed.
Click to expand it.
src/transition/UniboardSankoreTransition.h
deleted
100644 → 0
View file @
554ee877
/*
* Copyright (C) 2012 Webdoc SA
*
* This file is part of Open-Sankoré.
*
* Open-Sankoré is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3 of the License,
* with a specific linking exception for the OpenSSL project's
* "OpenSSL" library (or with modified versions of it that use the
* same license as the "OpenSSL" library).
*
* Open-Sankoré is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Open-Sankoré. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef UNIBOARDSANKORETRANSITION_H
#define UNIBOARDSANKORETRANSITION_H
#include <QObject>
#include <QFileInfo>
#include <QThread>
#include "gui/UBUpdateDlg.h"
#include "document/UBDocumentProxy.h"
class
UniboardSankoreThread
:
public
QThread
{
Q_OBJECT
public
:
UniboardSankoreThread
(
QObject
*
parent
=
0
);
~
UniboardSankoreThread
();
void
run
();
};
class
UniboardSankoreTransition
:
public
QObject
{
Q_OBJECT
public
:
explicit
UniboardSankoreTransition
(
QObject
*
parent
=
0
);
~
UniboardSankoreTransition
();
bool
checkDocumentDirectory
(
QString
&
documentDirectoryPath
);
void
documentTransition
();
bool
checkPage
(
QString
&
sankorePagePath
);
bool
updateSankoreHRef
(
QString
&
sankoreDocumentPath
);
bool
checkWidget
(
QString
&
sankoreWidgetPath
);
bool
updateIndexWidget
(
QString
&
sankoreWidgetPath
);
void
executeTransition
();
private
:
void
rollbackDocumentsTransition
(
QFileInfoList
&
fileInfoList
);
UBUpdateDlg
*
mTransitionDlg
;
protected
:
QString
mUniboardSourceDirectory
;
QString
mOldSankoreDirectory
;
UniboardSankoreThread
*
mThread
;
signals
:
void
transitionFinished
(
bool
result
);
void
docAdded
(
UBDocumentProxy
*
doc
);
void
transitioningFile
(
QString
documentName
);
private
slots
:
void
startDocumentTransition
();
};
#endif // UNIBOARDSANKORETRANSITION_H
src/transition/transition.pri
deleted
100644 → 0
View file @
554ee877
HEADERS += src/transition/UniboardSankoreTransition.h
SOURCES += src/transition/UniboardSankoreTransition.cpp
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