Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting http://91.221.70.94:3000/MOS/OpenBoard/commit/387f754092fbf0942b24b93942582f8cf8857751?style=unified&whitespace=ignore-eol
You should set ROOT_URL correctly, otherwise the web may not work correctly.
7 changed files with
64 additions and
40 deletions
src/core/UBApplicationController.cpp
src/core/UBPersistenceManager.cpp
src/gui/UBMainWindow.cpp
src/gui/UBMainWindow.h
src/gui/UBUpdateDlg.cpp
src/network/UBNetworkAccessManager.cpp
src/web/browser/WBWebView.cpp
@ -563,9 +563,7 @@ void UBApplicationController::downloadJsonFinished(QString currentJson)
}
else {
if ( isNoUpdateDisplayed ) {
QMessageBox msgBox ;
msgBox . setText ( tr ( " No update available " ) ) ;
msgBox . exec ( ) ;
mMainWindow - > information ( tr ( " Update " ) , tr ( " No update available " ) ) ;
}
}
}
@ -14,6 +14,7 @@
*/
# include "UBPersistenceManager.h"
# include "gui/UBMainWindow.h"
# include <QtXml>
@ -1005,11 +1006,7 @@ void UBPersistenceManager::checkIfDocumentRepositoryExists()
QString humanPath = QDir : : cleanPath ( mDocumentRepositoryPath ) ;
humanPath = QDir : : toNativeSeparators ( humanPath ) ;
QMessageBox : : question (
QApplication : : activeWindow ( ) ,
tr ( " Document Repository Loss " ) ,
tr ( " Sankore has lost access to the document repository '%1'. Unfortunately the application must shut down to avoid data corruption. Latest changes may be lost as well. " ) . arg ( humanPath ) ,
QMessageBox : : Yes ) ;
UBApplication : : mainWindow - > warning ( tr ( " Document Repository Loss " ) , tr ( " Sankore has lost access to the document repository '%1'. Unfortunately the application must shut down to avoid data corruption. Latest changes may be lost as well. " ) . arg ( humanPath ) ) ;
UBApplication : : quit ( ) ;
}
@ -16,7 +16,6 @@
# include <QtGui>
# include "UBMainWindow.h"
# include "core/UBApplication.h"
# include "core/UBApplicationController.h"
# include "board/UBBoardController.h"
@ -160,3 +159,26 @@ bool UBMainWindow::yesNoQuestion(QString windowTitle, QString text)
return messageBox . clickedButton ( ) = = yesButton ;
}
void UBMainWindow : : oneButtonMessageBox ( QString windowTitle , QString text , QMessageBox : : Icon type )
{
QMessageBox messageBox ;
messageBox . setParent ( this ) ;
messageBox . setWindowFlags ( Qt : : Dialog ) ;
messageBox . setWindowTitle ( windowTitle ) ;
messageBox . setText ( text ) ;
messageBox . addButton ( tr ( " Ok " ) , QMessageBox : : YesRole ) ;
messageBox . setIcon ( type ) ;
messageBox . exec ( ) ;
}
void UBMainWindow : : warning ( QString windowTitle , QString text )
{
oneButtonMessageBox ( windowTitle , text , QMessageBox : : Warning ) ;
}
void UBMainWindow : : information ( QString windowTitle , QString text )
{
oneButtonMessageBox ( windowTitle , text , QMessageBox : : Information ) ;
}
@ -20,6 +20,7 @@
# include <QMainWindow>
# include <QWidget>
# include <QWebView>
# include <QMessageBox>
class QStackedLayout ;
@ -41,7 +42,10 @@ class UBMainWindow : public QMainWindow, public Ui::MainWindow
void addDocumentsWidget ( QWidget * pWidget ) ;
void switchToDocumentsWidget ( ) ;
bool yesNoQuestion ( QString windowTitle , QString text ) ;
void warning ( QString windowTitle , QString text ) ;
void information ( QString windowTitle , QString text ) ;
signals :
void closeEvent_Signal ( QCloseEvent * event ) ;
@ -50,6 +54,7 @@ class UBMainWindow : public QMainWindow, public Ui::MainWindow
void onExportDone ( ) ;
protected :
void oneButtonMessageBox ( QString windowTitle , QString text , QMessageBox : : Icon type ) ;
virtual void keyPressEvent ( QKeyEvent * event ) ;
virtual void closeEvent ( QCloseEvent * event ) ;
@ -12,28 +12,29 @@
* You should have received a copy of the GNU General Public License
* along with this program . If not , see < http : //www.gnu.org/licenses/>.
*/
# include <QMessageBox>
# include <QFileDialog>
# include "UBUpdateDlg.h"
# include "core/UBApplication.h"
# include "UBMainWindow.h"
# include "core/memcheck.h"
UBUpdateDlg : : UBUpdateDlg ( QWidget * parent , int nbFiles , const QString & bkpPath )
: QDialog ( parent )
, mMainLayout ( NULL )
, mNbFilesLabel ( NULL )
, mBkpLabel ( NULL )
, mBkpPath ( NULL )
, mBrowseBttn ( NULL )
, mpDlgBttn ( NULL )
, mLayout ( NULL )
, mHLayout ( NULL )
, mStackedWidget ( NULL )
, mDialogWidget ( NULL )
, mProgressWidget ( NULL )
, mProgressLayout ( NULL )
, mProgressLabel ( NULL )
: QDialog ( parent )
, mMainLayout ( NULL )
, mNbFilesLabel ( NULL )
, mBkpLabel ( NULL )
, mBkpPath ( NULL )
, mBrowseBttn ( NULL )
, mpDlgBttn ( NULL )
, mLayout ( NULL )
, mHLayout ( NULL )
, mStackedWidget ( NULL )
, mDialogWidget ( NULL )
, mProgressWidget ( NULL )
, mProgressLayout ( NULL )
, mProgressLabel ( NULL )
{
mDialogWidget = new QWidget ( this ) ;
@ -178,18 +179,16 @@ void UBUpdateDlg::onUpdate()
void UBUpdateDlg : : onFilesUpdated ( bool bResult )
{
this - > hide ( ) ;
this - > hide ( ) ;
QString qsMsg ;
if ( bResult )
{
if ( bResult ) {
qsMsg = tr ( " Files update successful! \n Please reboot the application to access the updated documents. " ) ;
}
else
{
else {
qsMsg = tr ( " An error occured during the update. The files have not been affected. " ) ;
}
QMessageBox : : information ( this , tr ( " Files update results " ) , qsMsg , QMessageBox : : Ok ) ;
UBApplication : : mainWindow - > information ( tr ( " Files update results " ) , qsMsg ) ;
}
QString UBUpdateDlg : : backupPath ( )
@ -160,14 +160,18 @@ void UBNetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslErr
QString errors = errorStrings . join ( QLatin1String ( " \n " ) ) ;
int ret = QMessageBox : : warning ( mainWindow , QCoreApplication : : applicationName ( ) ,
tr ( " SSL Errors: \n \n %1 \n \n %2 \n \n "
" Do you want to ignore these errors for this host? " ) . arg ( reply - > url ( ) . toString ( ) ) . arg ( errors ) ,
QMessageBox : : Yes | QMessageBox : : No ,
QMessageBox : : No ) ;
if ( ret = = QMessageBox : : Yes )
{
QMessageBox messageBox ;
messageBox . setParent ( mainWindow ) ;
messageBox . setWindowFlags ( Qt : : Dialog ) ;
messageBox . setWindowTitle ( QCoreApplication : : applicationName ( ) ) ;
messageBox . setText ( tr ( " SSL Errors: \n \n %1 \n \n %2 \n \n "
" Do you want to ignore these errors for this host? " ) . arg ( reply - > url ( ) . toString ( ) ) . arg ( errors ) ) ;
QPushButton * yesButton = messageBox . addButton ( tr ( " Yes " ) , QMessageBox : : YesRole ) ;
messageBox . addButton ( tr ( " No " ) , QMessageBox : : NoRole ) ;
messageBox . setIcon ( QMessageBox : : Question ) ;
messageBox . exec ( ) ;
if ( messageBox . clickedButton ( ) = = yesButton ) {
reply - > ignoreSslErrors ( ) ;
sslTrustedHostList . append ( replyHost ) ;
}
@ -168,8 +168,7 @@ void WBWebPage::handleUnsupportedContent(QNetworkReply *reply)
messageBox . setText ( tr ( " Download PDF Document: would you prefer to download the PDF file or add it to the current Sankore document? " ) ) ;
messageBox . addButton ( tr ( " Download " ) , QMessageBox : : AcceptRole ) ;
QAbstractButton * addButton =
messageBox . addButton ( tr ( " Add to Current Document " ) , QMessageBox : : AcceptRole ) ;
QAbstractButton * addButton = messageBox . addButton ( tr ( " Add to Current Document " ) , QMessageBox : : AcceptRole ) ;
messageBox . exec ( ) ;
if ( messageBox . clickedButton ( ) = = addButton )