Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting http://91.221.70.94:3000/MOS/OpenBoard/commit/27b93bb24d3da34fcd0ea058e7654e93bf19c0d3?style=unified&whitespace=show-all
You should set ROOT_URL correctly, otherwise the web may not work correctly.
2 changed files with
19 additions and
1 deletions
src/core/UBApplication.cpp
src/core/UBApplication.h
@ -223,8 +223,12 @@ int UBApplication::exec(const QString& pFileToImport)
applicationController = new UBApplicationController ( boardController - > controlView ( ) , boardController - > displayView ( ) , mainWindow , staticMemoryCleaner ) ;
connect ( mainWindow - > actionDesktop , SIGNAL ( triggered ( bool ) ) , applicationController , SLOT ( showDesktop ( bool ) ) ) ;
# ifndef Q_WS_MAC
connect ( mainWindow - > actionHideApplication , SIGNAL ( triggered ( ) ) , mainWindow , SLOT ( showMinimized ( ) ) ) ;
# else
connect ( mainWindow - > actionHideApplication , SIGNAL ( triggered ( ) ) , this , SLOT ( showMinimized ( ) ) ) ;
# endif
mPreferencesController = new UBPreferencesController ( mainWindow ) ;
connect ( mainWindow - > actionPreferences , SIGNAL ( triggered ( ) ) , mPreferencesController , SLOT ( show ( ) ) ) ;
@ -300,7 +304,13 @@ int UBApplication::exec(const QString& pFileToImport)
return QApplication : : exec ( ) ;
}
# ifdef Q_WS_MAC
void UBApplication : : showMinimized ( )
{
mainWindow - > hide ( ) ;
}
# endif
void UBApplication : : showBoard ( )
{
@ -485,6 +495,11 @@ bool UBApplication::eventFilter(QObject *obj, QEvent *event)
boardController - > controlView ( ) - > forcedTabletRelease ( ) ;
}
# ifdef Q_WS_MAC
if ( event - > type ( ) = = QEvent : : ApplicationActivate ) {
if ( mainWindow - > isHidden ( ) ) mainWindow - > show ( ) ;
}
# endif
return result ;
}
@ -99,6 +99,9 @@ class UBApplication : public QtSingleApplication
private slots :
void closing ( ) ;
# ifdef Q_WS_MAC
void showMinimized ( ) ;
# endif
private :