Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting http://91.221.70.94:3000/MOS/OpenBoard/commit/383fd02a70af876069291f74d80b182f722429cc?style=split&whitespace=ignore-all
You should set ROOT_URL correctly, otherwise the web may not work correctly.
12 changed files with
269 additions and
274 deletions
src/adaptors/publishing/UBDocumentPublisher.h
src/board/UBDrawingController.cpp
src/core/UBApplicationController.cpp
src/core/UBApplicationController.h
src/core/UBSceneCache.h
src/frameworks/UBPlatformUtils_linux.cpp
src/gui/UBFloatingPalette.cpp
src/gui/UBKeyboardPalette.cpp
src/gui/UBKeyboardPalette_linux.cpp
src/gui/UBLibNavigatorWidget.cpp
@ -42,6 +42,8 @@ private slots:
private :
private :
UBDocumentProxy * mSourceDocument ;
UBDocumentProxy * mPublishingDocument ;
void init ( ) ;
void init ( ) ;
void sendUbw ( ) ;
void sendUbw ( ) ;
QString getBase64Of ( QString stringToEncode ) ;
QString getBase64Of ( QString stringToEncode ) ;
@ -58,8 +60,5 @@ private:
void buildUbwFile ( ) ;
void buildUbwFile ( ) ;
QString mTmpZipFile ;
QString mTmpZipFile ;
UBDocumentProxy * mSourceDocument ;
UBDocumentProxy * mPublishingDocument ;
} ;
} ;
# endif // UBDOCUMENTPUBLISHER_H
# endif // UBDOCUMENTPUBLISHER_H
@ -27,9 +27,10 @@ UBDrawingController* UBDrawingController::drawingController()
UBDrawingController : : UBDrawingController ( QObject * parent )
UBDrawingController : : UBDrawingController ( QObject * parent )
: QObject ( parent )
: QObject ( parent )
, mActiveRuler ( NULL )
, mStylusTool ( ( UBStylusTool : : Enum ) - 1 )
, mStylusTool ( ( UBStylusTool : : Enum ) - 1 )
, mLatestDrawingTool ( ( UBStylusTool : : Enum ) - 1 )
, mLatestDrawingTool ( ( UBStylusTool : : Enum ) - 1 )
, mActiveRuler ( NULL )
{
{
connect ( UBSettings : : settings ( ) , SIGNAL ( colorContextChanged ( ) ) , this , SIGNAL ( colorPaletteChanged ( ) ) ) ;
connect ( UBSettings : : settings ( ) , SIGNAL ( colorContextChanged ( ) ) , this , SIGNAL ( colorPaletteChanged ( ) ) ) ;
@ -50,12 +50,13 @@ UBApplicationController::UBApplicationController(UBBoardView *pControlView, UBBo
, mControlView ( pControlView )
, mControlView ( pControlView )
, mDisplayView ( pDisplayView )
, mDisplayView ( pDisplayView )
, mMirror ( 0 )
, mMirror ( 0 )
, mFtp ( 0 )
, mMainMode ( Board )
, mMainMode ( Board )
, mDisplayManager ( 0 )
, mDisplayManager ( 0 )
, mAutomaticCheckForUpdates ( false )
, mAutomaticCheckForUpdates ( false )
, mCheckingForUpdates ( false )
, mCheckingForUpdates ( false )
, mIsShowingDesktop ( false )
, mIsShowingDesktop ( false )
, mFtp ( 0 )
{
{
mDisplayManager = new UBDisplayManager ( this ) ;
mDisplayManager = new UBDisplayManager ( this ) ;
@ -24,8 +24,7 @@ class UBApplicationController : public QObject
public :
public :
UBApplicationController ( UBBoardView * pControlView , UBBoardView * pDisplayView ,
UBApplicationController ( UBBoardView * pControlView , UBBoardView * pDisplayView , UBMainWindow * pMainWindow , QObject * parent = 0 ) ;
UBMainWindow * pMainWindow , QObject * parent = 0 ) ;
virtual ~ UBApplicationController ( ) ;
virtual ~ UBApplicationController ( ) ;
int initialHScroll ( ) { return mInitialHScroll ; }
int initialHScroll ( ) { return mInitialHScroll ; }
@ -7,7 +7,7 @@
class UBDocumentProxy ;
class UBDocumentProxy ;
class UBGraphicsScene ;
class UBGraphicsScene ;
class UBGraphicsScene : : SceneViewState ;
class UBGraphicsScene ;
class UBSceneCacheID
class UBSceneCacheID
{
{
@ -56,6 +56,8 @@ QString UBPlatformUtils::preferredLanguage()
void UBPlatformUtils : : runInstaller ( const QString & installerFilePath )
void UBPlatformUtils : : runInstaller ( const QString & installerFilePath )
{
{
// TODO UB 4.x - auto update & installer are deactivated on Linux
// TODO UB 4.x - auto update & installer are deactivated on Linux
Q_UNUSED ( installerFilePath ) ;
}
}
void UBPlatformUtils : : bringPreviousProcessToFront ( )
void UBPlatformUtils : : bringPreviousProcessToFront ( )
@ -77,6 +79,8 @@ QString UBPlatformUtils::computerName()
void UBPlatformUtils : : setWindowNonActivableFlag ( QWidget * widget , bool nonAcivable )
void UBPlatformUtils : : setWindowNonActivableFlag ( QWidget * widget , bool nonAcivable )
{
{
Q_UNUSED ( widget ) ;
Q_UNUSED ( nonAcivable ) ;
}
}
@ -84,6 +88,7 @@ void UBPlatformUtils::setWindowNonActivableFlag(QWidget* widget, bool nonAcivabl
void UBPlatformUtils : : setDesktopMode ( bool desktop )
void UBPlatformUtils : : setDesktopMode ( bool desktop )
{
{
// NOOP
// NOOP
Q_UNUSED ( desktop ) ;
}
}
const KEYBT ENGLISH_LOCALE [ ] = {
const KEYBT ENGLISH_LOCALE [ ] = {
@ -12,8 +12,8 @@
UBFloatingPalette : : UBFloatingPalette ( Qt : : Corner position , QWidget * parent )
UBFloatingPalette : : UBFloatingPalette ( Qt : : Corner position , QWidget * parent )
: QWidget ( parent , parent ? Qt : : Widget : Qt : : Tool | ( Qt : : FramelessWindowHint | Qt : : WindowStaysOnTopHint | Qt : : X11BypassWindowManagerHint ) )
: QWidget ( parent , parent ? Qt : : Widget : Qt : : Tool | ( Qt : : FramelessWindowHint | Qt : : WindowStaysOnTopHint | Qt : : X11BypassWindowManagerHint ) )
, mIsMoving ( false )
, mCustomPosition ( false )
, mCustomPosition ( false )
, mIsMoving ( false )
, mCanBeMinimized ( false )
, mCanBeMinimized ( false )
, mMinimizedLocation ( eMinimizedLocation_None )
, mMinimizedLocation ( eMinimizedLocation_None )
, mDefaultPosition ( position )
, mDefaultPosition ( position )
@ -309,9 +309,9 @@ void UBKeyboardPalette::paintEvent( QPaintEvent* event)
UBKeyboardButton : : UBKeyboardButton ( UBKeyboardPalette * parent )
UBKeyboardButton : : UBKeyboardButton ( UBKeyboardPalette * parent )
: QWidget ( parent ) ,
: QWidget ( parent ) ,
keyboard ( parent ) ,
bFocused ( false ) ,
bFocused ( false ) ,
bPressed ( false ) ,
bPressed ( false )
keyboard ( parent )
{
{
setCursor ( Qt : : PointingHandCursor ) ;
setCursor ( Qt : : PointingHandCursor ) ;
}
}
@ -41,7 +41,7 @@ void x11SendKey(Display *display, int keyCode, int modifiers)
// Get the root window for the current display.
// Get the root window for the current display.
Window winRoot = XDefaultRootWindow ( display ) ;
Window winRoot = XDefaultRootWindow ( display ) ;
if ( winRoot = = NULL )
if ( winRoot = = 0 )
return ;
return ;
// Find the window which has the current keyboard focus.
// Find the window which has the current keyboard focus.
@ -69,16 +69,6 @@ UBLibNavigatorWidget::UBLibNavigatorWidget(QWidget *parent, const char *name):QW
*/
*/
UBLibNavigatorWidget : : ~ UBLibNavigatorWidget ( )
UBLibNavigatorWidget : : ~ UBLibNavigatorWidget ( )
{
{
//if(NULL != mLayout)
//{
// delete mLayout;
// mLayout = NULL;
//}
//if(NULL != mLibWidget)
//{
// delete mLibWidget;
// mLibWidget = NULL;
//}
if ( NULL ! = mPathViewer )
if ( NULL ! = mPathViewer )
{
{
delete mPathViewer ;
delete mPathViewer ;
@ -99,7 +89,7 @@ UBLibNavigatorWidget::~UBLibNavigatorWidget()
void UBLibNavigatorWidget : : dropMe ( const QMimeData * _data )
void UBLibNavigatorWidget : : dropMe ( const QMimeData * _data )
{
{
// Forward the mime data to the library widget
// Forward the mime data to the library widget
Q_UNUSED ( _data ) ;
}
}
/**
/**