Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting http://91.221.70.94:3000/MOS/OpenBoard/commit/2ac46095b581caf2783755f20b39c4f3f021e323?style=split&whitespace=ignore-change
You should set ROOT_URL correctly, otherwise the web may not work correctly.
4 changed files with
24 additions and
13 deletions
resources/forms/mainWindow.ui
src/core/UBApplication.cpp
src/web/UBWebController.cpp
src/web/UBWebController.h
@ -1537,18 +1537,6 @@
<string>Import eduMedia simulation</string>
<string>Import eduMedia simulation</string>
</property>
</property>
</action>
</action>
<action name="actionTutorial">
<property name="icon">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/tutorial.png</normaloff>:/images/toolbar/tutorial.png</iconset>
</property>
<property name="text">
<string>Tutorial</string>
</property>
<property name="toolTip">
<string>Open the tutorial</string>
</property>
</action>
<action name="actionCheckUpdate">
<action name="actionCheckUpdate">
<property name="icon">
<property name="icon">
<iconset resource="../OpenBoard.qrc">
<iconset resource="../OpenBoard.qrc">
@ -1620,6 +1608,18 @@
<string>Remove the backgound</string>
<string>Remove the backgound</string>
</property>
</property>
</action>
</action>
<action name="actionOpenTutorial">
<property name="icon">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/tutorial.png</normaloff>:/images/toolbar/tutorial.png</iconset>
</property>
<property name="text">
<string>Open Tutorial</string>
</property>
<property name="toolTip">
<string>Open the tutorial web page</string>
</property>
</action>
</widget>
</widget>
<resources>
<resources>
<include location="../OpenBoard.qrc"/>
<include location="../OpenBoard.qrc"/>
@ -523,6 +523,8 @@ void UBApplication::decorateActionMenu(QAction* action)
menu - > addAction ( mainWindow - > actionHideApplication ) ;
menu - > addAction ( mainWindow - > actionHideApplication ) ;
menu - > addAction ( mainWindow - > actionSleep ) ;
menu - > addAction ( mainWindow - > actionSleep ) ;
menu - > addSeparator ( ) ;
menu - > addAction ( mainWindow - > actionOpenTutorial ) ;
menu - > addSeparator ( ) ;
menu - > addSeparator ( ) ;
menu - > addAction ( mainWindow - > actionPreferences ) ;
menu - > addAction ( mainWindow - > actionPreferences ) ;
menu - > addAction ( mainWindow - > actionMultiScreen ) ;
menu - > addAction ( mainWindow - > actionMultiScreen ) ;
@ -74,6 +74,8 @@ UBWebController::UBWebController(UBMainWindow* mainWindow)
// TODO : Comment the next line to continue the Youtube button bugfix
// TODO : Comment the next line to continue the Youtube button bugfix
initialiazemOEmbedProviders ( ) ;
initialiazemOEmbedProviders ( ) ;
connect ( mMainWindow - > actionOpenTutorial , SIGNAL ( triggered ( ) ) , this , SLOT ( onOpenTutorial ( ) ) ) ;
}
}
@ -82,6 +84,11 @@ UBWebController::~UBWebController()
// NOOP
// NOOP
}
}
void UBWebController : : onOpenTutorial ( )
{
loadUrl ( QUrl ( " http://tutorial.openboard.org " ) ) ;
}
void UBWebController : : initialiazemOEmbedProviders ( )
void UBWebController : : initialiazemOEmbedProviders ( )
{
{
mOEmbedProviders < < " 5min.com " ;
mOEmbedProviders < < " 5min.com " ;
@ -40,7 +40,7 @@ class UBServerXMLHttpRequest;
class UBWebController : public QObject
class UBWebController : public QObject
{
{
Q_OBJECT ;
Q_OBJECT
public :
public :
UBWebController ( UBMainWindow * mainWindow ) ;
UBWebController ( UBMainWindow * mainWindow ) ;
@ -125,6 +125,8 @@ class UBWebController : public QObject
void toggleWebTrap ( bool checked ) ;
void toggleWebTrap ( bool checked ) ;
void onOEmbedParsed ( QVector < sOEmbedContent > contents ) ;
void onOEmbedParsed ( QVector < sOEmbedContent > contents ) ;
void onOpenTutorial ( ) ;
signals :
signals :
/**
/**