fixed issue 505

preferencesAboutTextFull
Claudio Valerio 12 years ago
parent ce160bf39c
commit e38b24544e
  1. 10
      src/core/UBApplicationController.cpp
  2. 4
      src/web/UBWebController.cpp

@ -473,9 +473,13 @@ void UBApplicationController::showTutorial()
UBApplication::boardController->hide(); UBApplication::boardController->hide();
} }
// it's needed not to duplicate webbrowser search in web mode. If I've breaked smbd's code let Ivan know if (UBSettings::settings()->webUseExternalBrowser->get().toBool())
{
showDesktop(true);
UBApplication::webController->show(UBWebController::Tutorial); UBApplication::webController->show(UBWebController::Tutorial);
}
else{
mMainWindow->webToolBar->hide(); mMainWindow->webToolBar->hide();
mMainWindow->boardToolBar->hide(); mMainWindow->boardToolBar->hide();
mMainWindow->documentToolBar->hide(); mMainWindow->documentToolBar->hide();
@ -488,8 +492,11 @@ void UBApplicationController::showTutorial()
mUninoteController->hideWindow(); mUninoteController->hideWindow();
UBApplication::webController->show(UBWebController::Tutorial);
mirroringEnabled(false); mirroringEnabled(false);
emit mainModeChanged(mMainMode); emit mainModeChanged(mMainMode);
}
} }
@ -539,7 +546,6 @@ void UBApplicationController::updateRequestFinished(int id, bool error)
} }
else{ else{
QString responseString = QString(mHttp->readAll()); QString responseString = QString(mHttp->readAll());
qDebug() << responseString;
if (!responseString.isEmpty() && responseString.contains("version") && responseString.contains("url")){ if (!responseString.isEmpty() && responseString.contains("version") && responseString.contains("url")){
mHttp->close(); mHttp->close();
downloadJsonFinished(responseString); downloadJsonFinished(responseString);

@ -177,10 +177,8 @@ void UBWebController::tutorialWebInstance()
QString tutorialPath = "/etc/Tutorial/tutorial" + language + "/index.html"; QString tutorialPath = "/etc/Tutorial/tutorial" + language + "/index.html";
#if defined(Q_WS_MAC) #if defined(Q_WS_MAC)
tutorialHtmlIndexFile = QApplication::applicationDirPath()+ "/../Resources" + tutorialPath; tutorialHtmlIndexFile = QApplication::applicationDirPath()+ "/../Resources" + tutorialPath;
#elif defined(Q_WS_WIN)
tutorialHtmlIndexFile = QApplication::applicationDirPath()+ tutorialPath;
#else #else
tutorialHtmlIndexFile = QApplication::applicationDirPath()+ tutorialPath; tutorialHtmlIndexFile = QApplication::applicationDirPath() + tutorialPath;
#endif #endif
QUrl currentUrl = QUrl::fromLocalFile(tutorialHtmlIndexFile); QUrl currentUrl = QUrl::fromLocalFile(tutorialHtmlIndexFile);

Loading…
Cancel
Save