Changeset 989 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 19, 2007 6:19:17 PM (18 years ago)

Author:

vboxsync

Message:

Made kchmviewer available from the Linux GUI

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxSelectorWnd.h (modified) (1 diff)
• src/VBoxSelectorWnd.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxSelectorWnd.h

@@ -34 +34 @@
 
 #include <qvaluelist.h>
+
+#include <iprt/param.h>
+#include <iprt/err.h>
+#include <iprt/path.h>
+#include <iprt/process.h>
+#include <iprt/thread.h>
 
 class VBoxVMListBox;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -747 +747 @@
 }
 
+#if defined (Q_WS_X11)
+DECLCALLBACK(int) showHelpContentsThread(RTTHREAD  /* ThreadSelf */, void *pvUser)
+{
+    char **papszArgs = reinterpret_cast<char **>(pvUser);
+    int rc;
+    RTPROCESS hProcess;
+
+    rc = RTProcCreate(papszArgs[0], papszArgs, 0, 0, &hProcess);
+    if (rc == VINF_SUCCESS)
+    {
+        RTPROCSTATUS ProcStatus;
+
+        return RTProcWait(hProcess, RTPROCWAIT_FLAGS_BLOCK, &ProcStatus);
+    }
+    return rc;
+}
+#endif
+
 void VBoxSelectorWnd::showHelpContents()
 {
@@ -754 +772 @@
     HtmlHelp (GetDesktopWindow(), fullHelpFilePath.ucs2(),
               HH_DISPLAY_TOPIC, NULL);
+#elif defined (Q_WS_X11)
+# ifndef VBOX_OSE
+    char szPathProg[RTPATH_MAX];
+    if (RTPathProgram(szPathProg, sizeof(szPathProg)) == VINF_SUCCESS)
+    {
+        const char szViewer[] = "/kchmviewer";
+        const char szHelpFile[] = "/VirtualBox.chm";
+        char szViewerPath[RTPATH_MAX], szFilePath[RTPATH_MAX];
+        char *papszArgs[3] = { szViewerPath, szFilePath, 0 };
+        RTTHREAD hThread;
+        int cPathLen;
+
+        cPathLen = strlen(szPathProg);
+        AssertReturn(cPathLen + sizeof(szHelpFile) < RTPATH_MAX, (void) 0);  /* is there a cleaner way? */
+        strcpy(szViewerPath, szPathProg);
+        strncpy(szViewerPath + cPathLen, szViewer, sizeof(szViewerPath) - cPathLen);
+        szViewerPath[sizeof(szViewerPath) - 1] = 0;
+        strcpy(szFilePath, szPathProg);
+        strncpy(szFilePath + cPathLen, szHelpFile, sizeof(szFilePath) - cPathLen);
+        szFilePath[sizeof(szFilePath) - 1] = 0;
+        /* For now we just start the process and do not worry about anything else. */
+        RTThreadCreate(&hThread, showHelpContentsThread, papszArgs, 0,
+                       RTTHREADTYPE_INFREQUENT_POLLER, 0, "HelpViewer");
+    }
+# endif
 #endif
 }