Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting http://91.221.70.94:3000/MOS/OpenBoard/commit/d05e5f11396a517a212443fd2fa70672d09778ff?style=split&whitespace=ignore-all
You should set ROOT_URL correctly, otherwise the web may not work correctly.
18 changed files with
82 additions and
18 deletions
Sankore_3.1.pro
src/adaptors/UBExportDocument.cpp
src/adaptors/UBExportWeb.cpp
src/adaptors/UBImportCFF.cpp
src/adaptors/UBImportDocument.cpp
src/adaptors/publishing/UBDocumentPublisher.cpp
src/customWidgets/UBGlobals.h
src/customWidgets/UBMediaWidget.cpp
src/customWidgets/UBWidgetList.cpp
src/customWidgets/customWidgets.pri
src/globals/UBGlobals.h
src/gui/UBTBDocumentEditWidget.cpp
src/gui/UBTBDocumentPreviewWidget.cpp
src/gui/UBTBPageEditWidget.cpp
src/gui/UBTeacherBarDataMgr.cpp
src/gui/UBTeacherBarPreviewWidget.cpp
src/gui/UBTeacherBarWidget.cpp
src/pdf/XPDFRenderer.h
@ -35,6 +35,7 @@ QT += script
QT += xmlpatterns
QT += xmlpatterns
INCLUDEPATH += src
INCLUDEPATH += src
INCLUDEPATH += globals
include ( $ $ THIRD_PARTY_PATH / libs . pri )
include ( $ $ THIRD_PARTY_PATH / libs . pri )
include ( src / adaptors / adaptors . pri )
include ( src / adaptors / adaptors . pri )
@ -83,6 +84,7 @@ UB_LIBRARY.files = resources/library
UB_FONTS . files = resources / fonts
UB_FONTS . files = resources / fonts
UB_THIRDPARTY_INTERACTIVE . files = thirdparty / interactive
UB_THIRDPARTY_INTERACTIVE . files = thirdparty / interactive
DEFINES += NO_THIRD_PARTY_WARNINGS
DEFINES += UBVERSION =\ " \\\ " $ $ { LONG_VERSION } \ " \\\ " \
DEFINES += UBVERSION =\ " \\\ " $ $ { LONG_VERSION } \ " \\\ " \
UBVERSION_RC = $ $ VERSION_RC
UBVERSION_RC = $ $ VERSION_RC
ALPHA_BETA_STR = $ $ find ( VERSION , "[ab]" )
ALPHA_BETA_STR = $ $ find ( VERSION , "[ab]" )
@ -22,8 +22,12 @@
# include "document/UBDocumentProxy.h"
# include "document/UBDocumentProxy.h"
# include "globals/UBGlobals.h"
THIRD_PARTY_WARNINGS_DISABLE
# include "quazip.h"
# include "quazip.h"
# include "quazipfile.h"
# include "quazipfile.h"
THIRD_PARTY_WARNINGS_ENABLE
# include "transition/UniboardSankoreTransition.h"
# include "transition/UniboardSankoreTransition.h"
@ -23,8 +23,12 @@
# include "document/UBDocumentProxy.h"
# include "document/UBDocumentProxy.h"
# include "globals/UBGlobals.h"
THIRD_PARTY_WARNINGS_DISABLE
# include "quazip.h"
# include "quazip.h"
# include "quazipfile.h"
# include "quazipfile.h"
THIRD_PARTY_WARNINGS_ENABLE
# include "core/memcheck.h"
# include "core/memcheck.h"
@ -27,9 +27,13 @@
# include "UBCFFSubsetAdaptor.h"
# include "UBCFFSubsetAdaptor.h"
# include "UBImportCFF.h"
# include "UBImportCFF.h"
# include "globals/UBGlobals.h"
THIRD_PARTY_WARNINGS_DISABLE
# include "quazip.h"
# include "quazip.h"
# include "quazipfile.h"
# include "quazipfile.h"
# include "quazipfileinfo.h"
# include "quazipfileinfo.h"
THIRD_PARTY_WARNINGS_ENABLE
# include "core/memcheck.h"
# include "core/memcheck.h"
@ -22,9 +22,13 @@
# include "core/UBSettings.h"
# include "core/UBSettings.h"
# include "core/UBPersistenceManager.h"
# include "core/UBPersistenceManager.h"
# include "globals/UBGlobals.h"
THIRD_PARTY_WARNINGS_DISABLE
# include "quazip.h"
# include "quazip.h"
# include "quazipfile.h"
# include "quazipfile.h"
# include "quazipfileinfo.h"
# include "quazipfileinfo.h"
THIRD_PARTY_WARNINGS_ENABLE
# include "core/memcheck.h"
# include "core/memcheck.h"
@ -34,8 +34,12 @@
# include "domain/UBGraphicsWidgetItem.h"
# include "domain/UBGraphicsWidgetItem.h"
# include "globals/UBGlobals.h"
THIRD_PARTY_WARNINGS_DISABLE
# include "quazip.h"
# include "quazip.h"
# include "quazipfile.h"
# include "quazipfile.h"
THIRD_PARTY_WARNINGS_ENABLE
# include "adaptors/UBExportFullPDF.h"
# include "adaptors/UBExportFullPDF.h"
# include "adaptors/UBExportDocument.h"
# include "adaptors/UBExportDocument.h"
@ -1,9 +0,0 @@
# ifndef UBGLOBALS_H
# define UBGLOBALS_H
# define DELETEPTR(ptr) if(NULL != ptr){ \
delete ptr ; \
ptr = NULL ; \
}
# endif // UBGLOBALS_H
@ -13,7 +13,7 @@
* along with this program . If not , see < http : //www.gnu.org/licenses/>.
* along with this program . If not , see < http : //www.gnu.org/licenses/>.
*/
*/
# include "core/UBApplication.h"
# include "core/UBApplication.h"
# include "UBGlobals.h"
# include "globals/ UBGlobals.h"
# include "UBMediaWidget.h"
# include "UBMediaWidget.h"
/**
/**
@ -1,7 +1,7 @@
# include <QDebug>
# include <QDebug>
# include <QScrollBar>
# include <QScrollBar>
# include "UBGlobals.h"
# include "globals/ UBGlobals.h"
# include "UBWidgetList.h"
# include "UBWidgetList.h"
UBWidgetList : : UBWidgetList ( QWidget * parent , eWidgetListOrientation orientation , const char * name ) : QScrollArea ( parent )
UBWidgetList : : UBWidgetList ( QWidget * parent , eWidgetListOrientation orientation , const char * name ) : QScrollArea ( parent )
@ -2,7 +2,7 @@
HEADERS += src/customWidgets/UBWidgetList.h \
HEADERS += src/customWidgets/UBWidgetList.h \
src/customWidgets/UBDraggableLabel.h \
src/customWidgets/UBDraggableLabel.h \
src/customWidgets/UBMediaWidget.h \
src/customWidgets/UBMediaWidget.h \
src/customWidget s/UBGlobals.h \
src/global s/UBGlobals.h \
src/customWidgets/UBDraggableMedia.h
src/customWidgets/UBDraggableMedia.h
SOURCES += src/customWidgets/UBWidgetList.cpp \
SOURCES += src/customWidgets/UBWidgetList.cpp \
@ -0,0 +1,46 @@
# ifndef UBGLOBALS_H
# define UBGLOBALS_H
# define DELETEPTR(ptr) if(NULL != ptr){ \
delete ptr ; \
ptr = NULL ; \
}
# ifdef Q_WS_WIN
# define WARNINGS_DISABLE __pragma(warning(push, 0));
# define WARNINGS_ENABLE __pragma(warning(pop));
# ifdef NO_THIRD_PARTY_WARNINGS
// disabling warning level to 0 and save old state
# define THIRD_PARTY_WARNINGS_DISABLE WARNINGS_DISABLE
# else
// just save old state (needs for not empty define)
# define THIRD_PARTY_WARNINGS_DISABLE __pragma(warning(push));
# endif //#ifdef NO_THIRD_PARTY_WARNINGS
// anyway on WIN
# define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
# else //#ifdef Q_WS_WIN
# define WARNINGS_DISABLE _Pragma("GCC diagnostic push"); \
_Pragma ( " GCC diagnostic ignored \" -Wunused-parameter \" " ) ; \
_Pragma ( " GCC diagnostic ignored \" -Wunused-variable \" " ) ; \
_Pragma ( " GCC diagnostic ignored \" -Wsign-compare \" " ) ;
# define WARNINGS_ENABLE _Pragma("GCC diagnostic pop");
# ifdef NO_THIRD_PARTY_WARNINGS
//disabling some warnings
# define THIRD_PARTY_WARNINGS_DISABLE WARNINGS_DISABLE
# else
// just save old state (needs for not empty define)
# define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
# endif //#ifdef NO_THIRD_PARTY_WARNINGS
# endif //#ifdef Q_WS_WIN
# endif // UBGLOBALS_H
@ -1,7 +1,7 @@
# include <QDebug>
# include <QDebug>
# include "UBTBDocumentEditWidget.h"
# include "UBTBDocumentEditWidget.h"
# include "customWidget s/UBGlobals.h"
# include "global s/UBGlobals.h"
UBTBDocumentEditWidget : : UBTBDocumentEditWidget ( UBTeacherBarDataMgr * pDataMgr , QWidget * parent , const char * name ) : QWidget ( parent )
UBTBDocumentEditWidget : : UBTBDocumentEditWidget ( UBTeacherBarDataMgr * pDataMgr , QWidget * parent , const char * name ) : QWidget ( parent )
, mpPageViewButton ( NULL )
, mpPageViewButton ( NULL )
@ -1,4 +1,4 @@
# include "customWidget s/UBGlobals.h"
# include "global s/UBGlobals.h"
# include "UBTBDocumentPreviewWidget.h"
# include "UBTBDocumentPreviewWidget.h"
UBTBDocumentPreviewWidget : : UBTBDocumentPreviewWidget ( UBTeacherBarDataMgr * pDataMgr , QWidget * parent , const char * name ) : QWidget ( parent )
UBTBDocumentPreviewWidget : : UBTBDocumentPreviewWidget ( UBTeacherBarDataMgr * pDataMgr , QWidget * parent , const char * name ) : QWidget ( parent )
@ -1,4 +1,4 @@
# include "customWidget s/UBGlobals.h"
# include "global s/UBGlobals.h"
# include "core/UBApplication.h"
# include "core/UBApplication.h"
# include "frameworks/UBFileSystemUtils.h"
# include "frameworks/UBFileSystemUtils.h"
# include "gui/UBMediaPlayer.h"
# include "gui/UBMediaPlayer.h"
@ -7,7 +7,7 @@
# include "board/UBBoardController.h"
# include "board/UBBoardController.h"
# include "customWidget s/UBGlobals.h"
# include "global s/UBGlobals.h"
# include "adaptors/UBMetadataDcSubsetAdaptor.h"
# include "adaptors/UBMetadataDcSubsetAdaptor.h"
@ -1,5 +1,5 @@
# include "core/UBApplication.h"
# include "core/UBApplication.h"
# include "customWidget s/UBGlobals.h"
# include "global s/UBGlobals.h"
# include "board/UBBoardController.h"
# include "board/UBBoardController.h"
# include "frameworks/UBFileSystemUtils.h"
# include "frameworks/UBFileSystemUtils.h"
@ -15,7 +15,7 @@
# include "customWidgets/UBDraggableLabel.h"
# include "customWidgets/UBDraggableLabel.h"
# include "customWidgets/UBMediaWidget.h"
# include "customWidgets/UBMediaWidget.h"
# include "customWidget s/UBGlobals.h"
# include "global s/UBGlobals.h"
# include "core/memcheck.h"
# include "core/memcheck.h"
@ -18,10 +18,15 @@
# include <QImage>
# include <QImage>
# include "PDFRenderer.h"
# include "PDFRenderer.h"
# include <splash/SplashBitmap.h>
# include <splash/SplashBitmap.h>
# include "globals/UBGlobals.h"
THIRD_PARTY_WARNINGS_DISABLE
# include <xpdf/Object.h>
# include <xpdf/Object.h>
# include <xpdf/GlobalParams.h>
# include <xpdf/GlobalParams.h>
# include <xpdf/SplashOutputDev.h>
# include <xpdf/SplashOutputDev.h>
# include <xpdf/PDFDoc.h>
# include <xpdf/PDFDoc.h>
THIRD_PARTY_WARNINGS_ENABLE
class PDFDoc ;
class PDFDoc ;