Changeset 28810 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 27, 2010 11:56:37 AM (15 years ago)

Author:

vboxsync

Message:

partly reverted r60437 -- renable chm on Linux hosts

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• VBoxGlobal.cpp (modified) (1 diff)
• VBoxProblemReporter.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -3402 +3402 @@
     const QString suffix = "pdf";
 #elif defined (Q_WS_X11)
+# if defined VBOX_OSE
     const QString name = "UserManual";
     const QString suffix = "pdf";
+# else
+    const QString name = "VirtualBox";
+    const QString suffix = "chm";
+# endif
 #endif
     /* Where are the docs located? */

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.cpp

@@ -2605 +2605 @@
 #if defined (Q_WS_WIN32)
     HtmlHelp(GetDesktopWindow(), strLocation.utf16(), HH_DISPLAY_TOPIC, NULL);
-#elif defined (Q_WS_X11) || defined (Q_WS_MAC)
+#elif defined (Q_WS_X11)
+# ifndef VBOX_OSE
+    char szViewerPath[RTPATH_MAX];
+    int rc;
+    rc = RTPathAppPrivateArch(szViewerPath, sizeof(szViewerPath));
+    AssertRC(rc);
+    QProcess::startDetached(QString(szViewerPath) + "/kchmviewer", QStringList(strLocation));
+# else /* #ifndef VBOX_OSE */
+    vboxGlobal().openURL("file://" + strLocation);
+# endif /* #ifdef VBOX_OSE */
+#elif defined (Q_WS_MAC)
     vboxGlobal().openURL("file://" + strLocation);
 #endif