Changeset 12553 in vbox for trunk/src

Timestamp:

Sep 18, 2008 10:04:01 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Use translated manual of the current selected language if it exists.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (1 diff)
• src/VBoxProblemReporter.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h

@@ -566 +566 @@
     static QString languageId();
     static void loadLanguage (const QString &aLangId = QString::null);
+    QString helpFile() const;
 
     static QIcon iconSet (const char *aNormal,

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -2916 +2916 @@
 }
 
+QString VBoxGlobal::helpFile() const
+{
+#if defined (Q_WS_WIN32) || defined (Q_WS_X11)
+    const QString name = "VirtualBox";
+    const QString suffix = "chm";
+#elif defined (Q_WS_MAC)
+    const QString name = "UserManual";
+    const QString suffix = "pdf";
+#endif 
+    /* Where are the docs located? */
+    char szDocsPath[RTPATH_MAX];
+    int rc = RTPathAppDocs (szDocsPath, sizeof (szDocsPath));
+    Assert (RT_SUCCESS (rc));
+
+    /* Construct the path and the filename */
+    QString manual = QString ("%1/%2_%3.%4").arg (szDocsPath)
+                                            .arg (name)
+                                            .arg (vboxGlobal().languageId())
+                                            .arg (suffix);
+    /* Check if a help file with that name exists */
+    QFileInfo fi (manual);
+    if (fi.exists())
+        return manual;
+
+    /* Fall back to the standard */
+    manual = QString ("%1/%2.%4").arg (szDocsPath)
+                                 .arg (name)
+                                 .arg (suffix);
+    return manual;
+}
+
 /* static */
 QIcon VBoxGlobal::iconSet (const char *aNormal,

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxProblemReporter.cpp

@@ -2257 +2257 @@
 {
 #ifndef VBOX_OSE
+    QString manual = vboxGlobal().helpFile();
 #if defined (Q_WS_WIN32)
-    QString fullHelpFilePath = qApp->applicationDirPath() + "/VirtualBox.chm";
-
-    HtmlHelp (GetDesktopWindow(), fullHelpFilePath.utf16(),
+    HtmlHelp (GetDesktopWindow(), manual.utf16(),
               HH_DISPLAY_TOPIC, NULL);
 #elif defined (Q_WS_X11)
-    char szDocsPath[RTPATH_MAX];
     char szViewerPath[RTPATH_MAX];
     int rc;
 
-    rc = RTPathAppDocs (szDocsPath, sizeof (szDocsPath));
-    Assert(RT_SUCCESS(rc));
     rc = RTPathAppPrivateArch (szViewerPath, sizeof (szViewerPath));
     Assert(RT_SUCCESS(rc));
 
     QProcess::startDetached (QString(szViewerPath) + "/kchmviewer",
-                             QStringList (QString(szDocsPath) + "/VirtualBox.chm"));
+                             QStringList (manual));
 #elif defined (Q_WS_MAC)
     QProcess::startDetached ("/usr/bin/open",
-                             QStringList (qApp->applicationDirPath() + "/UserManual.pdf"));
+                             QStringList (manual));
 #endif
 #endif /* VBOX_OSE */