Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting https://git.osmesh.ru/MOS/OpenBoard/commit/1925add46054fb5ff3adb917832c952768827a98
You should set ROOT_URL correctly, otherwise the web may not work correctly.
3 changed files with
14 additions and
1 deletions
src/domain/UBGraphicsItemDelegate.h
src/domain/UBGraphicsMediaItemDelegate.cpp
src/domain/UBGraphicsMediaItemDelegate.h
@ -40,6 +40,7 @@
# include <QtGui>
# include <QtSvg>
# include <QMimeData>
# include <QGraphicsVideoItem>
# include "core/UB.h"
# include "core/UBSettings.h"
@ -320,6 +321,8 @@ class UBGraphicsItemDelegate : public QObject
virtual void decorateMenu ( QMenu * menu ) ;
virtual void updateMenuActionState ( ) ;
void showHideRecurs ( const QVariant & pShow , QGraphicsItem * pItem ) ;
QList < DelegateButton * > buttons ( ) { return mButtons ; }
QGraphicsItem * mDelegated ;
@ -352,7 +355,6 @@ protected slots:
private :
void updateFrame ( ) ;
void updateButtons ( bool showUpdated = false ) ;
inline void showHideRecurs ( const QVariant & pShow , QGraphicsItem * pItem ) ;
QPointF mOffset ;
QTransform mPreviousTransform ;
@ -310,3 +310,13 @@ void UBGraphicsMediaItemDelegate::totalTimeChanged(qint64 newTotalTime)
{
mMediaControl - > totalTimeChanged ( newTotalTime ) ;
}
void UBGraphicsMediaItemDelegate : : showHide ( bool show )
{
QVariant showFlag = QVariant ( show ? UBItemLayerType : : Object : UBItemLayerType : : Control ) ;
showHideRecurs ( showFlag , mDelegated ) ;
showHideRecurs ( showFlag , delegated ( ) - > videoItem ( ) ) ;
mDelegated - > update ( ) ;
emit showOnDisplayChanged ( show ) ;
}
@ -54,6 +54,7 @@ class UBGraphicsMediaItemDelegate : public UBGraphicsItemDelegate
void toggleMute ( ) ;
void updateTicker ( qint64 time ) ;
virtual void showHide ( bool show ) ;
protected slots :