%2

%3

%4

"; + +// some of the values we will replace %1...4 inside the former html +const QString g_percent1 = QCoreApplication::translate("HelpViewer", "Error 404..."); +const QString g_percent2 = QCoreApplication::translate("HelpViewer", "The page could not be found!"); +// percent3 will be the url of the page we got the error from +const QString g_percent4 = QCoreApplication::translate("HelpViewer", "Please make sure that you have all " + "documentation sets installed."); + + // -- HelpNetworkReply class HelpNetworkReply : public QNetworkReply @@ -148,8 +164,8 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation /*op*/, url = HelpViewer::fixupVirtualFolderForUrl(&engine, request.url(), &fileFound); const QString &mimeType = HelpViewer::mimeFromUrl(url); - const QByteArray &data = fileFound ? engine.fileData(url) - : HelpViewer::PageNotFoundMessage.arg(url).toUtf8(); + const QByteArray &data = fileFound ? engine.fileData(url) : QString::fromLatin1(g_htmlPage) + .arg(g_percent1, g_percent2, HelpViewer::tr("Error loading: %1").arg(url), g_percent4).toUtf8(); return new HelpNetworkReply(request, data, mimeType.isEmpty() ? QLatin1String("application/octet-stream") : mimeType); diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp index 4663a67..1c447af 100644 --- a/src/assistant/assistant/mainwindow.cpp +++ b/src/assistant/assistant/mainwindow.cpp @@ -223,6 +223,9 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) contentDock->raise(); const QRect screen = QApplication::desktop()->screenGeometry(); resize(4*screen.width()/5, 4*screen.height()/5); + + adjustSize(); // make sure we won't start outside of the screen + move(screen.center() - rect().center()); } if (!helpEngineWrapper.hasFontSettings()) { @@ -326,7 +329,7 @@ bool MainWindow::initHelpDB(bool registerInternalDoc) return true; } bool assistantInternalDocRegistered = false; - QString intern(QLatin1String("com.trolltech.com.assistantinternal-")); + QString intern(QLatin1String("org.qt-project.assistantinternal-")); foreach (const QString &ns, helpEngineWrapper.registeredDocumentations()) { if (ns.startsWith(intern)) { intern = ns; @@ -1016,7 +1019,7 @@ QString MainWindow::collectionFileDirectory(bool createDir, const QString &cache { TRACE_OBJ QString collectionPath = - QStandardPaths::writableLocation(QStandardPaths::DataLocation); + QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); if (collectionPath.isEmpty()) { if (cacheDir.isEmpty()) collectionPath = QDir::homePath() + QDir::separator() @@ -1025,7 +1028,7 @@ QString MainWindow::collectionFileDirectory(bool createDir, const QString &cache collectionPath = QDir::homePath() + QLatin1String("/.") + cacheDir; } else { if (cacheDir.isEmpty()) - collectionPath = collectionPath + QLatin1String("/Trolltech/Assistant"); + collectionPath = collectionPath + QLatin1String("/QtProject/Assistant"); else collectionPath = collectionPath + QDir::separator() + cacheDir; }