Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting http://91.221.70.94:3000/MOS/OpenBoard/commit/8123279bdd61be242320affb2485430291e75bfd?style=split&whitespace=ignore-eol
You should set ROOT_URL correctly, otherwise the web may not work correctly.
2 changed files with
15 additions and
3 deletions
src/desktop/UBDesktopPalette.cpp
src/desktop/UBDesktopPalette.h
@ -101,6 +101,15 @@ UBDesktopPalette::~UBDesktopPalette()
}
}
void UBDesktopPalette : : adjustPosition ( )
{
QPoint pos = this - > pos ( ) ;
if ( this - > pos ( ) . y ( ) < 30 ) {
pos . setY ( 30 ) ;
moveInsideParent ( pos ) ;
}
}
void UBDesktopPalette : : disappearForCapture ( )
void UBDesktopPalette : : disappearForCapture ( )
{
{
setWindowOpacity ( 0.0 ) ;
setWindowOpacity ( 0.0 ) ;
@ -209,6 +218,7 @@ void UBDesktopPalette::showEvent(QShowEvent *event)
eraserIcon . addPixmap ( QPixmap ( " :images/stylusPalette/eraserOnArrow.png " ) , QIcon : : Normal , QIcon : : On ) ;
eraserIcon . addPixmap ( QPixmap ( " :images/stylusPalette/eraserOnArrow.png " ) , QIcon : : Normal , QIcon : : On ) ;
UBApplication : : mainWindow - > actionEraser - > setIcon ( eraserIcon ) ;
UBApplication : : mainWindow - > actionEraser - > setIcon ( eraserIcon ) ;
adjustPosition ( ) ;
}
}
void UBDesktopPalette : : hideEvent ( QHideEvent * event )
void UBDesktopPalette : : hideEvent ( QHideEvent * event )
@ -35,7 +35,7 @@
*/
*/
class UBDesktopPalette : public UBActionPalette
class UBDesktopPalette : public UBActionPalette
{
{
Q_OBJECT ;
Q_OBJECT
public :
public :
UBDesktopPalette ( QWidget * parent , UBRightPalette * rightPalette ) ;
UBDesktopPalette ( QWidget * parent , UBRightPalette * rightPalette ) ;
@ -71,7 +71,7 @@ protected:
virtual int getParentRightOffset ( ) ;
virtual int getParentRightOffset ( ) ;
private :
private :
QAction * mShowHideAction ;
QAction * mShowHideAction ;
QAction * mDisplaySelectAction ;
QAction * mDisplaySelectAction ;
QAction * mMaximizeAction ;
QAction * mMaximizeAction ;
@ -81,8 +81,10 @@ protected:
UBRightPalette * rightPalette ;
UBRightPalette * rightPalette ;
void adjustPosition ( ) ;
signals :
signals :
void stylusToolChanged ( int tool ) ;
void stylusToolChanged ( int tool ) ;
} ;
} ;