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

Timestamp:

Mar 26, 2010 5:13:33 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: 2643: Offer to download UserManual for OSE version - support for multiple links.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxProblemReporter.cpp (modified) (5 diffs)
• widgets/UIDownloaderUserManual.cpp (modified) (4 diffs)
• widgets/UIDownloaderUserManual.h (modified) (5 diffs)

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

@@ -3380 +3380 @@
 QString VBoxGlobal::helpFile() const
 {
-#if defined (Q_WS_WIN32) || defined (Q_WS_X11)
+#if defined (Q_WS_WIN32)
     const QString name = "VirtualBox";
     const QString suffix = "chm";
@@ -3386 +3386 @@
     const QString name = "UserManual";
     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

@@ -2566 +2566 @@
     /* For non-OSE version we just open it: */
     sltShowUserManual(vboxGlobal().helpFile());
-#else /* #endif for #ifndef VBOX_OSE */
+#else /* #ifndef VBOX_OSE */
     /* For OSE version we have to check if it present first: */
     QString strUserManualFileName1 = vboxGlobal().helpFile();
@@ -2581 +2581 @@
     else if (!UIDownloaderUserManual::current() && askAboutUserManualDownload(strUserManualFileName1))
     {
-        /* Initialize variables: */
-        CVirtualBox vbox = vboxGlobal().virtualBox();
-        // TODO: QString source = QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove("_OSE")) + strName;
-        QString source = QString("http://download.virtualbox.org/virtualbox/") + strShortFileName;
-
         /* Create User Manual downloader: */
         UIDownloaderUserManual *pDl = UIDownloaderUserManual::create();
         /* Configure User Manual downloader: */
-        pDl->setSource(source);
+        CVirtualBox vbox = vboxGlobal().virtualBox();
+        pDl->addSource(QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove("_OSE")) + strShortFileName);
+        pDl->addSource(QString("http://download.virtualbox.org/virtualbox/") + strShortFileName);
         pDl->setTarget(strUserManualFileName2);
         pDl->setParentWidget(mainWindowShown());
         /* After the download is finished => show the document: */
-        connect(pDl, SIGNAL(downloadFinished(const QString&)), this, SLOT(sltShowUserManual(const QString&)));
+        connect(pDl, SIGNAL(sigDownloadFinished(const QString&)), this, SLOT(sltShowUserManual(const QString&)));
         /* Notify listeners: */
         emit sigDownloaderUserManualCreated();
@@ -2599 +2596 @@
         pDl->startDownload();
     }
-#endif /* #endif for #ifdef VBOX_OSE */
+#endif /* #ifdef VBOX_OSE */
 }
 
@@ -2611 +2608 @@
 {
 #if defined (Q_WS_WIN32)
-    HtmlHelp (GetDesktopWindow(), strLocation.utf16(), HH_DISPLAY_TOPIC, NULL);
+    HtmlHelp(GetDesktopWindow(), strLocation.utf16(), HH_DISPLAY_TOPIC, NULL);
 #elif defined (Q_WS_X11)
+# ifndef VBOX_OSE
     char szViewerPath[RTPATH_MAX];
     int rc;
@@ -2618 +2616 @@
     AssertRC(rc);
     QProcess::startDetached(QString(szViewerPath) + "/kchmviewer", QStringList(strLocation));
+# else /* #ifndef VBOX_OSE */
+    /* In OSE case we do NOT know which of PDF viewers are installed,
+     * so we will just try few of them: */
+    QStringList viewers;
+    viewers << "evince" << "okular";
+    foreach (const QString &viewer, viewers)
+        if (QProcess::startDetached(viewer, QStringList(strLocation)))
+            break;
+# endif /* #ifdef VBOX_OSE */
 #elif defined (Q_WS_MAC)
-    vboxGlobal().openURL ("file://" + strLocation);
+    vboxGlobal().openURL("file://" + strLocation);
 #endif
 }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloaderUserManual.cpp

@@ -54 +54 @@
 }
 
+void UIDownloaderUserManual::setSource(const QString &strSource)
+{
+    /* Erase the list first: */
+    m_sourcesList.clear();
+    /* And add there passed value: */
+    addSource(strSource);
+}
+
+void UIDownloaderUserManual::addSource(const QString &strSource)
+{
+    /* Append passed value: */
+    m_sourcesList << strSource;
+}
+
 void UIDownloaderUserManual::setParentWidget(QWidget *pParent)
 {
@@ -66 +80 @@
 UIMiniProcessWidgetUserManual* UIDownloaderUserManual::processWidget(QWidget *pParent /* = 0 */) const
 {
-    UIMiniProcessWidgetUserManual *pWidget = new UIMiniProcessWidgetUserManual(m_source.toString(), pParent);
+    UIMiniProcessWidgetUserManual *pWidget = new UIMiniProcessWidgetUserManual(pParent);
 
     /* Connect the cancel signal: */
     connect(pWidget, SIGNAL(sigCancel()), this, SLOT(cancelDownloading()));
+    /* Connect the signal to notify about source changed: */
+    connect(this, SIGNAL(sigSourceChanged(const QString&)), pWidget, SLOT(sltSetSource(const QString&)));
     /* Connect the signal to notify about the download process: */
     connect(this, SIGNAL(sigDownloadProcess(int, int)), pWidget, SLOT(sltProcess(int, int)));
@@ -80 +96 @@
 void UIDownloaderUserManual::startDownload()
 {
-    acknowledgeStart();
+    /* If at least one source to try left: */
+    if (!m_sourcesList.isEmpty())
+    {
+        /* Set the first of left sources as current one: */
+        UIDownloader::setSource(m_sourcesList.takeFirst());
+        /* Warn process-bar(s) about source was changed: */
+        emit sigSourceChanged(source());
+        /* Try to download: */
+        acknowledgeStart();
+    }
+}
+
+void UIDownloaderUserManual::acknowledgeFinished(bool fError)
+{
+    /* If current source was wrong but other is present
+     * we will try other source else we should finish: */
+    if (fError && !m_sourcesList.isEmpty())
+        startDownload();
+    else
+        UIDownloader::acknowledgeFinished(fError);
 }
 
@@ -105 +140 @@
                 vboxProblem().warnAboutUserManualDownloaded(m_source.toString(), QDir::toNativeSeparators(m_strTarget));
                 /* Warn listener about User Manual was downloaded: */
-                emit downloadFinished(m_strTarget);
+                emit sigDownloadFinished(m_strTarget);
                 /* Close the downloader: */
                 QTimer::singleShot(0, this, SLOT(suicide()));

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloaderUserManual.h

@@ -37 +37 @@
 public:
 
-    UIMiniProcessWidgetUserManual(const QString &strSource, QWidget *pParent = 0)
+    UIMiniProcessWidgetUserManual(QWidget *pParent = 0)
         : QIWithRetranslateUI<UIMiniProcessWidget>(pParent)
+    {
+        retranslateUi();
+    }
+
+protected slots:
+
+    void sltSetSource(const QString &strSource)
     {
         setSource(strSource);
@@ -50 +57 @@
         setCancelButtonText(tr("Cancel"));
         setCancelButtonToolTip(tr("Cancel the VirtualBox User Manual download"));
-        setProgressBarToolTip((tr("Downloading the VirtualBox User Manual "
-                                  "<nobr><b>%1</b>...</nobr>")
-                               .arg(source())));
+        QString strProgressBarTip = source().isEmpty() ? tr("Downloading the VirtualBox User Manual") :
+            tr("Downloading the VirtualBox User Manual <nobr><b>%1</b>...</nobr>").arg(source());
+        setProgressBarToolTip(strProgressBarTip);
     }
 };
@@ -66 +73 @@
     static void destroy();
 
+    void setSource(const QString &strSource);
+    void addSource(const QString &strSource);
+
     void setParentWidget(QWidget *pParent);
     QWidget *parentWidget() const;
@@ -74 +84 @@
 signals:
 
-    void downloadFinished(const QString &strFile);
+    void sigSourceChanged(const QString &strSource);
+    void sigDownloadFinished(const QString &strFile);
 
 private slots:
 
+    void acknowledgeFinished(bool fError);
     void downloadFinished(bool fError);
     void suicide();
@@ -94 +106 @@
      * QPointer guarantees that the ptr itself is zero in that case. */
     QPointer<QWidget> m_pParent;
+
+    /* List of sources to try to download from: */
+    QList<QString> m_sourcesList;
 };