Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting http://91.221.70.94:3000/MOS/OpenBoard/commit/7f3760aab07d878670b0a889ccbd01193386614c?style=split&whitespace=ignore-change
You should set ROOT_URL correctly, otherwise the web may not work correctly.
8 changed files with
43 additions and
26 deletions
src/board/UBBoardPaletteManager.cpp
src/gui/UBCachePropertiesWidget.cpp
src/gui/UBDockDownloadWidget.cpp
src/gui/UBDockPalette.cpp
src/gui/UBDockPaletteWidget.h
src/gui/UBLibWidget.cpp
src/gui/UBPageNavigationWidget.cpp
src/gui/UBTeacherBarWidget.cpp
@ -1013,6 +1013,7 @@ void UBBoardPaletteManager::startDownloads()
if ( ! mDownloadInProgress )
if ( ! mDownloadInProgress )
{
{
mDownloadInProgress = true ;
mDownloadInProgress = true ;
mpDownloadWidget - > setVisibleState ( true ) ;
mRightPalette - > addTab ( mpDownloadWidget ) ;
mRightPalette - > addTab ( mpDownloadWidget ) ;
}
}
}
}
@ -1022,6 +1023,7 @@ void UBBoardPaletteManager::stopDownloads()
if ( mDownloadInProgress )
if ( mDownloadInProgress )
{
{
mDownloadInProgress = false ;
mDownloadInProgress = false ;
mpDownloadWidget - > setVisibleState ( false ) ;
mRightPalette - > removeTab ( mpDownloadWidget - > name ( ) ) ;
mRightPalette - > removeTab ( mpDownloadWidget - > name ( ) ) ;
}
}
}
}
@ -38,6 +38,7 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na
setStyleSheet ( UBApplication : : globalStyleSheet ( ) ) ;
setStyleSheet ( UBApplication : : globalStyleSheet ( ) ) ;
mName = " CachePropWidget " ;
mName = " CachePropWidget " ;
mVisibleState = false ;
mIconToLeft = QPixmap ( " :images/cache_open.png " ) ;
mIconToLeft = QPixmap ( " :images/cache_open.png " ) ;
mIconToRight = QPixmap ( " :images/cache_close.png " ) ;
mIconToRight = QPixmap ( " :images/cache_close.png " ) ;
setContentsMargins ( 10 , 10 , 10 , 10 ) ;
setContentsMargins ( 10 , 10 , 10 , 10 ) ;
@ -20,6 +20,7 @@ UBDockDownloadWidget::UBDockDownloadWidget(QWidget *parent, const char *name):UB
, mpDLWidget ( NULL )
, mpDLWidget ( NULL )
{
{
mName = " DownloadWidget " ;
mName = " DownloadWidget " ;
mVisibleState = false ;
setAttribute ( Qt : : WA_StyledBackground , true ) ;
setAttribute ( Qt : : WA_StyledBackground , true ) ;
setStyleSheet ( UBApplication : : globalStyleSheet ( ) ) ;
setStyleSheet ( UBApplication : : globalStyleSheet ( ) ) ;
@ -542,7 +542,7 @@ int UBDockPalette::customMargin()
*/
*/
void UBDockPalette : : addTab ( UBDockPaletteWidget * widget )
void UBDockPalette : : addTab ( UBDockPaletteWidget * widget )
{
{
if ( ! mTabWidgets . contains ( widget ) )
if ( ! mTabWidgets . contains ( widget ) & & widget - > visibleState ( ) )
{
{
widget - > setVisible ( true ) ;
widget - > setVisible ( true ) ;
mTabWidgets . append ( widget ) ;
mTabWidgets . append ( widget ) ;
@ -600,6 +600,7 @@ void UBDockPalette::onShowTabWidget(const QString &widgetName)
UBDockPaletteWidget * pCrntWidget = mRegisteredWidgets . at ( i ) ;
UBDockPaletteWidget * pCrntWidget = mRegisteredWidgets . at ( i ) ;
if ( NULL ! = pCrntWidget & & ( pCrntWidget - > name ( ) = = widgetName ) )
if ( NULL ! = pCrntWidget & & ( pCrntWidget - > name ( ) = = widgetName ) )
{
{
pCrntWidget - > setVisibleState ( true ) ;
addTab ( pCrntWidget ) ;
addTab ( pCrntWidget ) ;
break ;
break ;
}
}
@ -612,6 +613,13 @@ void UBDockPalette::onShowTabWidget(const QString &widgetName)
*/
*/
void UBDockPalette : : onHideTabWidget ( const QString & widgetName )
void UBDockPalette : : onHideTabWidget ( const QString & widgetName )
{
{
for ( int i = 0 ; i < mRegisteredWidgets . size ( ) ; i + + ) {
UBDockPaletteWidget * pCrntWidget = mRegisteredWidgets . at ( i ) ;
if ( NULL ! = pCrntWidget & & ( pCrntWidget - > name ( ) = = widgetName ) ) {
pCrntWidget - > setVisibleState ( false ) ;
break ;
}
}
removeTab ( widgetName ) ;
removeTab ( widgetName ) ;
}
}
@ -27,8 +27,9 @@ public:
void registerMode ( eUBDockPaletteWidgetMode mode ) ;
void registerMode ( eUBDockPaletteWidgetMode mode ) ;
QVector < eUBDockPaletteWidgetMode > GetRegisteredModes ( ) { return mRegisteredModes ; } ;
QVector < eUBDockPaletteWidgetMode > GetRegisteredModes ( ) { return mRegisteredModes ; }
bool visibleState ( ) { return mVisibleState ; }
void setVisibleState ( bool state ) { mVisibleState = state ; }
signals :
signals :
void hideTab ( const QString & widgetName ) ;
void hideTab ( const QString & widgetName ) ;
@ -46,6 +47,7 @@ protected:
/* The current widget available mode list */
/* The current widget available mode list */
QVector < eUBDockPaletteWidgetMode > mRegisteredModes ;
QVector < eUBDockPaletteWidgetMode > mRegisteredModes ;
bool mVisibleState ;
} ;
} ;
# endif // UBDOCKPALETTEWIDGET_H
# endif // UBDOCKPALETTEWIDGET_H
@ -35,6 +35,7 @@ UBLibWidget::UBLibWidget(QWidget *parent, const char *name):UBDockPaletteWidget(
{
{
setObjectName ( name ) ;
setObjectName ( name ) ;
mName = " LibWidget " ;
mName = " LibWidget " ;
mVisibleState = true ;
setAttribute ( Qt : : WA_StyledBackground , true ) ;
setAttribute ( Qt : : WA_StyledBackground , true ) ;
setStyleSheet ( UBApplication : : globalStyleSheet ( ) ) ;
setStyleSheet ( UBApplication : : globalStyleSheet ( ) ) ;
@ -31,6 +31,7 @@ UBPageNavigationWidget::UBPageNavigationWidget(QWidget *parent, const char *name
{
{
setObjectName ( name ) ;
setObjectName ( name ) ;
mName = " PageNavigator " ;
mName = " PageNavigator " ;
mVisibleState = true ;
setAttribute ( Qt : : WA_StyledBackground , true ) ;
setAttribute ( Qt : : WA_StyledBackground , true ) ;
setStyleSheet ( UBApplication : : globalStyleSheet ( ) ) ;
setStyleSheet ( UBApplication : : globalStyleSheet ( ) ) ;
@ -36,6 +36,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock
{
{
setObjectName ( name ) ;
setObjectName ( name ) ;
mName = " TeacherBarWidget " ;
mName = " TeacherBarWidget " ;
mVisibleState = true ;
setAttribute ( Qt : : WA_StyledBackground , true ) ;
setAttribute ( Qt : : WA_StyledBackground , true ) ;
setStyleSheet ( UBApplication : : globalStyleSheet ( ) ) ;
setStyleSheet ( UBApplication : : globalStyleSheet ( ) ) ;