VirtualBox

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


Ignore:
Timestamp:
Aug 16, 2011 1:25:17 PM (14 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
73530
Message:

FE/Qt: Rework new version notifier to be a part of new UIUpdateManager class. Implement Extension Pack updater (new version check + download + update).

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
19 edited
4 copied
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r38421 r38476  
    271271        src/VBoxSnapshotDetailsDlg.h \
    272272        src/VBoxTakeSnapshotDlg.h \
    273         src/VBoxUpdateDlg.h \
    274273        src/VBoxVMInformationDlg.h \
    275274        src/VBoxVMLogViewer.h \
    … …  
    353352        src/widgets/VBoxWarningPane.h \
    354353        src/net/UINetworkManager.h \
     354        src/net/UIUpdateManager.h \
    355355        src/net/UIDownloader.h \
    356356        src/net/UIDownloaderAdditions.h \
    357357        src/net/UIDownloaderUserManual.h \
     358        src/net/UIDownloaderExtensionPack.h \
    358359        src/selector/UIActionPoolSelector.h \
    359360        src/selector/UIVMDesktop.h \
    … …  
    440441        src/VBoxSnapshotDetailsDlg.cpp \
    441442        src/VBoxTakeSnapshotDlg.cpp \
    442         src/VBoxUpdateDlg.cpp \
    443443        src/VBoxVMInformationDlg.cpp \
    444444        src/VBoxVMLogViewer.cpp \
    … …  
    526526        src/widgets/VBoxWarningPane.cpp \
    527527        src/net/UINetworkManager.cpp \
     528        src/net/UIUpdateDefs.cpp \
     529        src/net/UIUpdateManager.cpp \
    528530        src/net/UIDownloader.cpp \
    529531        src/net/UIDownloaderAdditions.cpp \
    530532        src/net/UIDownloaderUserManual.cpp \
     533        src/net/UIDownloaderExtensionPack.cpp \
    531534        src/selector/UIActionPoolSelector.cpp \
    532535        src/selector/UISelectorShortcuts.cpp \

  • trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

    r38384 r38476  
    2626    src/VBoxSnapshotDetailsDlg.ui \
    2727    src/VBoxTakeSnapshotDlg.ui \
    28     src/VBoxUpdateDlg.ui \
    2928    src/VBoxVMLogViewer.ui \
    3029    src/settings/UISettingsDialog.ui \

  • trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts

    r38457 r38476  
    51215121    <message>
    51225122        <source>You are already running the most recent version of VirtualBox.</source>
    5123         <translation>Вы уже установили последнюю версию программы VirtualBox. Повторите проверку обновлений позже.</translation>
     5123        <translation>У Вас уже установлена последняя версия программы VirtualBox. Повторите проверку обновлений позже.</translation>
    51245124    </message>
    51255125    <message>

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

    r38337 r38476  
    17881788}
    17891789
     1790bool UIMessageCenter::proposeDownloadExtensionPack()
     1791{
     1792    return messageOkCancel(mainWindowShown(), Question,
     1793                           tr("<p>You have an old "
     1794                              "VirtualBox Extension Pack installed.</p>"
     1795                              "<p>Do you wish to download latest one from the Internet?</p>"),
     1796                           0, /* Auto-confirm Id */
     1797                           tr("Download", "extension pack"));
     1798}
     1799
     1800bool UIMessageCenter::confirmDownloadExtensionPack(const QString &strURL, ulong uSize)
     1801{
     1802    return messageOkCancel(mainWindowShown(), Question,
     1803                           tr("<p>Are you sure you want to download the "
     1804                              "VirtualBox Extension Pack from "
     1805                              "<nobr><a href=\"%1\">%2</a></nobr> "
     1806                              "(size %3 bytes)?</p>").arg(strURL).arg(strURL).arg(uSize),
     1807                           0, /* Auto-confirm Id */
     1808                           tr("Download", "extension pack"));
     1809}
     1810
     1811bool UIMessageCenter::proposeInstallExtentionPack(const QString &strFrom, const QString &strTo)
     1812{
     1813    return messageOkCancel(mainWindowShown(), Question,
     1814                           tr("<p>The VirtualBox Extension Pack has been "
     1815                              "successfully downloaded from "
     1816                              "<nobr><a href=\"%1\">%2</a></nobr> "
     1817                              "and saved locally as <nobr><b>%3</b>.</nobr></p>"
     1818                              "<p>Do you wish to install this extension pack?</p>")
     1819                              .arg(strFrom).arg(strFrom).arg(strTo),
     1820                           0, /* Auto-confirm Id */
     1821                           tr ("Install", "extension pack"));
     1822}
     1823
     1824void UIMessageCenter::warnAboutExtentionPackCantBeSaved(const QString &strFrom, const QString &strTo)
     1825{
     1826    message(mainWindowShown(), Error,
     1827            tr("<p>The VirtualBox Extension Pack has been "
     1828               "successfully downloaded from "
     1829               "<nobr><a href=\"%1\">%2</a></nobr> "
     1830               "but can't be saved locally as <nobr><b>%3</b>.</nobr></p>"
     1831               "<p>Please choose another location for that file.</p>")
     1832               .arg(strFrom).arg(strFrom).arg(strTo));
     1833}
     1834
     1835void UIMessageCenter::cannotDownloadExtensionPack(const QString &strFrom, const QString &strError)
     1836{
     1837    message(mainWindowShown(), Error,
     1838            tr("<p>Failed to download the VirtualBox Extension Pack "
     1839               "from <nobr><a href=\"%1\">%2</a>.</nobr></p><p>%3</p>")
     1840               .arg(strFrom).arg(strFrom).arg(strError));
     1841}
     1842
    17901843void UIMessageCenter::cannotConnectRegister(QWidget *pParent,
    17911844                                            const QString &strUrl,

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

    r38311 r38476  
    310310    void warnAboutUserManualCantBeSaved(const QString &strURL, const QString &strTarget);
    311311
     312    bool proposeDownloadExtensionPack();
     313    bool confirmDownloadExtensionPack(const QString &strURL, ulong uSize);
     314    bool proposeInstallExtentionPack(const QString &strFrom, const QString &strTo);
     315    void warnAboutExtentionPackCantBeSaved(const QString &strFrom, const QString &strTo);
     316    void cannotDownloadExtensionPack(const QString &strFrom, const QString &strError);
     317
    312318    void cannotConnectRegister(QWidget *pParent,
    313319                               const QString &strUrl,

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

    r38467 r38476  
    2929#include "QIDialogButtonBox.h"
    3030#include "UIIconPool.h"
     31#include "UIActionPoolSelector.h"
     32#include "UIActionPoolRuntime.h"
    3133#include "UIExtraDataEventHandler.h"
    3234#include "QIFileDialog.h"
    3335#include "UINetworkManager.h"
     36#include "UIUpdateManager.h"
    3437
    3538#include "UIMachine.h"
    … …  
    3841# include "UIRegistrationWzd.h"
    3942#endif
    40 #include "VBoxUpdateDlg.h"
    4143#ifdef VBOX_WITH_VIDEOHWACCEL
    4244# include "VBoxFBOverlay.h"
    … …  
    271273    , mRegDlg (NULL)
    272274#endif
    273     , mUpdDlg (NULL)
    274275#ifdef VBOX_GUI_WITH_SYSTRAY
    275276    , mIsTrayMenu (false)
    … …  
    46114612    }
    46124613#endif
    4613 }
    4614 
    4615 /**
    4616  * Shows the VirtualBox version check & update dialog.
    4617  *
    4618  * @note that this method is not part of UIMessageCenter (like e.g.
    4619  *       UIMessageCenter::sltShowHelpAboutDialog()) because it is tied to
    4620  *       VBoxCallback::OnExtraDataChange() handling performed by VBoxGlobal.
    4621  *
    4622  * @param aForce
    4623  */
    4624 void VBoxGlobal::showUpdateDialog (bool aForce)
    4625 {
    4626     /* Silently check in one day after current time-stamp */
    4627     QTimer::singleShot (24 /* hours */   * 60   /* minutes */ *
    4628                         60 /* seconds */ * 1000 /* milliseconds */,
    4629                         this, SLOT (perDayNewVersionNotifier()));
    4630 
    4631     bool isNecessary = VBoxUpdateDlg::isNecessary();
    4632 
    4633     if (!aForce && !isNecessary)
    4634         return;
    4635 
    4636     if (mUpdDlg)
    4637     {
    4638         if (!mUpdDlg->isHidden())
    4639         {
    4640             mUpdDlg->setWindowState (mUpdDlg->windowState() & ~Qt::WindowMinimized);
    4641             mUpdDlg->raise();
    4642             mUpdDlg->activateWindow();
    4643         }
    4644     }
    4645     else
    4646     {
    4647         /* Store the ID of the main window to ensure that only one
    4648          * update dialog is shown at a time. Due to manipulations with
    4649          * OnExtraDataCanChange() and OnExtraDataChange() signals, this extra
    4650          * data item acts like an inter-process mutex, so the first process
    4651          * that attempts to set it will win, the rest will get a failure from
    4652          * the SetExtraData() call. */
    4653         mVBox.SetExtraData (VBoxDefs::GUI_UpdateDlgWinID,
    4654                             QString ("%1").arg ((qulonglong) mMainWindow->winId()));
    4655 
    4656         if (mVBox.isOk())
    4657         {
    4658             /* We've got the "mutex", create a new update dialog */
    4659             VBoxUpdateDlg *dlg = new VBoxUpdateDlg (&mUpdDlg, aForce, 0);
    4660             dlg->setAttribute (Qt::WA_DeleteOnClose);
    4661             Assert (dlg == mUpdDlg);
    4662 
    4663             /* Update dialog always in background mode for now.
    4664              * if (!aForce && isAutomatic) */
    4665             mUpdDlg->search();
    4666             /* else mUpdDlg->show(); */
    4667         }
    4668     }
    4669 }
    4670 
    4671 void VBoxGlobal::perDayNewVersionNotifier()
    4672 {
    4673     showUpdateDialog (false /* force show? */);
    46744614}
    46754615
    … …  
    52445184    sltProcessGlobalSettingChange();
    52455185
     5186    /* Create action pool: */
     5187    if (isVMConsoleProcess())
     5188        UIActionPoolRuntime::create();
     5189    else
     5190        UIActionPoolSelector::create();
     5191
    52465192    /* Create network manager: */
    52475193    UINetworkManager::create();
     5194
     5195    /* Schedule update manager: */
     5196    UIUpdateManager::schedule();
    52485197}
    52495198
    … …  
    52565205void VBoxGlobal::cleanup()
    52575206{
     5207    /* Shutdown update manager: */
     5208    UIUpdateManager::shutdown();
     5209
    52585210    /* Destroy network manager: */
    52595211    UINetworkManager::destroy();
     5212
     5213    /* Destroy action pool: */
     5214    if (isVMConsoleProcess())
     5215        UIActionPoolRuntime::destroy();
     5216    else
     5217        UIActionPoolSelector::destroy();
    52605218
    52615219    /* sanity check */

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

    r38467 r38476  
    771771
    772772    void showRegistrationDialog (bool aForce = true);
    773     void showUpdateDialog (bool aForce = true);
    774     void perDayNewVersionNotifier();
    775773    void sltGUILanguageChange(QString strLang);
    776774    void sltProcessGlobalSettingChange();
    … …  
    806804    UIRegistrationWzd *mRegDlg;
    807805#endif
    808     VBoxUpdateDlg *mUpdDlg;
    809806
    810807    QString vmUuid;

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxUtils.h

    r37867 r38476  
    195195};
    196196
     197/**
     198 *  VBoxVersion represents VirtualBox version parser
     199 */
     200class VBoxVersion
     201{
     202public:
     203
     204    VBoxVersion(const QString &strVersion)
     205        : m_x(0), m_y(0), m_z(0)
     206    {
     207        QStringList versionStack = strVersion.split('.');
     208        if (versionStack.size() > 0)
     209            m_x = versionStack[0].toInt();
     210        if (versionStack.size() > 1)
     211            m_y = versionStack[1].toInt();
     212        if (versionStack.size() > 2)
     213            m_z = versionStack[2].toInt();
     214    }
     215
     216    bool equal(const VBoxVersion &other) const { return (m_x == other.m_x) && (m_y == other.m_y) && (m_z == other.m_z); }
     217    bool operator==(const VBoxVersion &other) const { return equal(other); }
     218    bool operator!=(const VBoxVersion &other) const { return !equal(other); }
     219
     220    bool operator<(const VBoxVersion &other) const
     221    {
     222        return (m_x <  other.m_x) ||
     223               (m_x == other.m_x && m_y <  other.m_y) ||
     224               (m_x == other.m_x && m_y == other.m_y && m_z <  other.m_z);
     225    }
     226    bool operator>(const VBoxVersion &other) const
     227    {
     228        return (m_x >  other.m_x) ||
     229               (m_x == other.m_x && m_y >  other.m_y) ||
     230               (m_x == other.m_x && m_y == other.m_y && m_z >  other.m_z);
     231    }
     232
     233    QString toString() const
     234    {
     235        return QString("%1.%2.%3").arg(m_x).arg(m_y).arg(m_z);
     236    }
     237
     238    int x() const { return m_x; }
     239    int y() const { return m_y; }
     240    int z() const { return m_z; }
     241
     242private:
     243
     244    int m_x;
     245    int m_y;
     246    int m_z;
     247};
     248
    197249#ifdef Q_WS_MAC
    198250# include "VBoxUtils-darwin.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

    r38324 r38476  
    526526                    vboxGlobal().showRegistrationDialog (false /* aForce */);
    527527#endif
    528 #ifdef VBOX_WITH_UPDATE_REQUEST
    529                     vboxGlobal().showUpdateDialog (false /* aForce */);
    530 #endif
    531528#ifdef VBOX_GUI_WITH_SYSTRAY
    532529                }

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp

    r38256 r38476  
    33 *
    44 * VBox frontends: Qt GUI ("VirtualBox"):
    5  * UIDownloaderAdditions class implementation
     5 * UIDownloader for extension pack
    66 */
    77
    88/*
    9  * Copyright (C) 2006-2011 Oracle Corporation
     9 * Copyright (C) 2011 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1919
    2020/* Global includes: */
    21 #include <QAction>
    2221#include <QDir>
    2322#include <QFile>
    … …  
    2524
    2625/* Local includes: */
    27 #include "UIDownloaderAdditions.h"
     26#include "UIDownloaderExtensionPack.h"
     27#include "VBoxGlobal.h"
     28#include "UIMessageCenter.h"
    2829#include "QIFileDialog.h"
    29 #include "VBoxProblemReporter.h"
    3030
    31 UIDownloaderAdditions *UIDownloaderAdditions::m_pInstance = 0;
    32 
    33 UIDownloaderAdditions *UIDownloaderAdditions::create()
     31/* UIMiniProgressWidget stuff: */
     32UIMiniProgressWidgetExtension::UIMiniProgressWidgetExtension(const QString &strSource, QWidget *pParent /* = 0 */)
     33    : QIWithRetranslateUI<UIMiniProgressWidget>(pParent)
    3434{
    35     if (!m_pInstance)
    36         m_pInstance = new UIDownloaderAdditions;
    37     return m_pInstance;
     35    sltSetSource(strSource);
     36    retranslateUi();
    3837}
    3938
    40 UIDownloaderAdditions *UIDownloaderAdditions::current()
     39void UIMiniProgressWidgetExtension::retranslateUi()
    4140{
    42     return m_pInstance;
     41    setCancelButtonToolTip(tr("Cancel the VirtualBox Extension Pack download"));
     42    setProgressBarToolTip(tr("Downloading the VirtualBox Extension Pack from <nobr><b>%1</b>...</nobr>")
     43                            .arg(source()));
    4344}
    4445
    45 void UIDownloaderAdditions::setAction(QAction *pAction)
     46/* UIDownloaderExtensionPack stuff: */
     47UIDownloaderExtensionPack* UIDownloaderExtensionPack::m_pInstance = 0;
     48
     49/* static */
     50void UIDownloaderExtensionPack::download(QObject *pListener)
    4651{
    47     m_pAction = pAction;
    48     if (m_pAction)
    49         m_pAction->setEnabled(false);
     52    /* Create downloader instance: */
     53    UIDownloaderExtensionPack *pDownloader = new UIDownloaderExtensionPack;
     54    pDownloader->setParentWidget(msgCenter().mainWindowShown());
     55
     56    /* Configure connections for the passed listener: */
     57    connect(pDownloader, SIGNAL(sigToStartAcknowledging()),
     58            pListener, SIGNAL(sigDownloaderCreatedForExtensionPack()));
     59    connect(pDownloader, SIGNAL(sigNotifyAboutExtensionPackDownloaded(const QString &, const QString &)),
     60            pListener, SLOT(sltHandleDownloadedExtensionPack(const QString &, const QString &)));
    5061}
    5162
    52 QAction *UIDownloaderAdditions::action() const
     63UIDownloaderExtensionPack::UIDownloaderExtensionPack()
    5364{
    54     return m_pAction;
     65    /* Prepare instance: */
     66    if (!m_pInstance)
     67        m_pInstance = this;
     68
     69    /* Prepare source/target: */
     70    QString strTemplateSourcePath("http://download.virtualbox.org/virtualbox/%1/");
     71    QString strTemplateSourceName("Oracle_VM_VirtualBox_Extension_Pack-%1.vbox-extpack");
     72    QString strSourcePath(strTemplateSourcePath.arg(vboxGlobal().virtualBox().GetVersion().remove("_OSE")));
     73    QString strSourceName(strTemplateSourceName.arg(vboxGlobal().virtualBox().GetVersion().remove("_OSE")));
     74    QString strSource(strSourcePath + strSourceName);
     75    QString strTargetPath(vboxGlobal().virtualBox().GetHomeFolder());
     76    QString strTargetName(strSourceName);
     77    QString strTarget(QDir(strTargetPath).absoluteFilePath(strTargetName));
     78
     79    /* Set source/target: */
     80    setSource(strSource);
     81    setTarget(strTarget);
     82
     83    /* Start downloading: */
     84    start();
    5585}
    5686
    57 UIDownloaderAdditions::UIDownloaderAdditions()
    58     : UIDownloader()
     87UIDownloaderExtensionPack::~UIDownloaderExtensionPack()
    5988{
    60 }
    61 
    62 UIDownloaderAdditions::~UIDownloaderAdditions()
    63 {
    64     if (m_pAction)
    65         m_pAction->setEnabled(true);
     89    /* Cleanup instance: */
    6690    if (m_pInstance == this)
    6791        m_pInstance = 0;
    6892}
    6993
    70 UIMiniProgressWidget* UIDownloaderAdditions::createProgressWidgetFor(QWidget *pParent) const
     94UIMiniProgressWidget* UIDownloaderExtensionPack::createProgressWidgetFor(QWidget *pParent) const
    7195{
    72     return new UIMiniProgressWidgetAdditions(source(), pParent);
     96    return new UIMiniProgressWidgetExtension(source(), pParent);
    7397}
    7498
    75 bool UIDownloaderAdditions::askForDownloadingConfirmation(QNetworkReply *pReply)
     99bool UIDownloaderExtensionPack::askForDownloadingConfirmation(QNetworkReply *pReply)
    76100{
    77     return vboxProblem().confirmDownloadAdditions(source(), pReply->header(QNetworkRequest::ContentLengthHeader).toInt());
     101    return msgCenter().confirmDownloadExtensionPack(source(), pReply->header(QNetworkRequest::ContentLengthHeader).toInt());
    78102}
    79103
    80 void UIDownloaderAdditions::handleDownloadedObject(QNetworkReply *pReply)
     104void UIDownloaderExtensionPack::handleDownloadedObject(QNetworkReply *pReply)
    81105{
    82     /* Read received data: */
     106    /* Read received data into buffer: */
    83107    QByteArray receivedData(pReply->readAll());
    84     /* Serialize the incoming buffer into the .iso image: */
     108    /* Serialize the incoming buffer into the file: */
    85109    while (true)
    86110    {
    87         /* Try to open file to save image: */
     111        /* Try to open file for writing: */
    88112        QFile file(target());
    89113        if (file.open(QIODevice::WriteOnly))
    90114        {
    91             /* Write received data into the file: */
     115            /* Write incoming buffer into the file: */
    92116            file.write(receivedData);
    93117            file.close();
    94             /* Warn user about additions image loaded and saved, propose to mount it: */
    95             if (vboxProblem().confirmMountAdditions(source(), QDir::toNativeSeparators(target())))
    96                 emit sigDownloadFinished(target());
     118            /* Notify listener about extension pack was downloaded: */
     119            emit sigNotifyAboutExtensionPackDownloaded(source(), target());
    97120            break;
    98121        }
    99122        else
    100123        {
    101             /* Warn user about additions image loaded but was not saved: */
    102             vboxProblem().warnAboutAdditionsCantBeSaved(target());
     124            /* Warn the user about extension pack was downloaded but was NOT saved, explain it: */
     125            msgCenter().warnAboutExtentionPackCantBeSaved(source(), QDir::toNativeSeparators(target()));
    103126        }
    104127
    105         /* Ask the user about additions image file save location: */
     128        /* Ask the user for another location for the extension pack file: */
    106129        QString strTarget = QIFileDialog::getExistingDirectory(QFileInfo(target()).absolutePath(), parentWidget(),
    107                                                                tr("Select folder to save Guest Additions image to"), true);
     130                                                               tr("Select folder to save VirtualBox Extension Pack to"), true);
    108131
    109         /* Check if user set new target: */
     132        /* Check if user had really set a new target: */
    110133        if (!strTarget.isNull())
    111134            setTarget(QDir(strTarget).absoluteFilePath(QFileInfo(target()).fileName()));
    … …  
    115138}
    116139
    117 void UIDownloaderAdditions::warnAboutNetworkError(const QString &strError)
     140void UIDownloaderExtensionPack::warnAboutNetworkError(const QString &strError)
    118141{
    119     return vboxProblem().cannotDownloadGuestAdditions(source(), strError);
     142    return msgCenter().cannotDownloadExtensionPack(source(), strError);
    120143}
    121144

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.h

    r38256 r38476  
    22 *
    33 * VBox frontends: Qt GUI ("VirtualBox"):
    4  * UIDownloaderAdditions class declaration
     4 * UIDownloader for extension pack
    55 */
    66
    77/*
    8  * Copyright (C) 2006-2011 Oracle Corporation
     8 * Copyright (C) 2011 Oracle Corporation
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1717 */
    1818
    19 #ifndef __UIDownloaderAdditions_h__
    20 #define __UIDownloaderAdditions_h__
     19#ifndef __UIDownloaderExtensionPack_h__
     20#define __UIDownloaderExtensionPack_h__
    2121
    2222/* Local includes: */
    … …  
    2424#include "UIDownloader.h"
    2525
    26 class UIMiniProgressWidgetAdditions : public QIWithRetranslateUI<UIMiniProgressWidget>
     26/* UIMiniProgressWidget reimplementation for the VirtualBox extension pack downloading: */
     27class UIMiniProgressWidgetExtension : public QIWithRetranslateUI<UIMiniProgressWidget>
    2728{
    2829    Q_OBJECT;
    … …  
    3031public:
    3132
    32     UIMiniProgressWidgetAdditions(const QString &strSource, QWidget *pParent = 0)
    33         : QIWithRetranslateUI<UIMiniProgressWidget>(pParent)
    34     {
    35         sltSetSource(strSource);
    36         retranslateUi();
    37     }
     33    /* Constructor: */
     34    UIMiniProgressWidgetExtension(const QString &strSource, QWidget *pParent = 0);
    3835
    39 protected:
     36private:
    4037
    41     void retranslateUi()
    42     {
    43         setCancelButtonToolTip(tr("Cancel the VirtualBox Guest Additions CD image download"));
    44         setProgressBarToolTip(tr("Downloading the VirtualBox Guest Additions CD image from <nobr><b>%1</b>...</nobr>")
    45                                 .arg(source()));
    46     }
     38    /* Translating stuff: */
     39    void retranslateUi();
    4740};
    4841
    49 class UIDownloaderAdditions : public UIDownloader
     42/* UIDownloader reimplementation for the VirtualBox Extension Pack updating: */
     43class UIDownloaderExtensionPack : public UIDownloader
    5044{
    5145    Q_OBJECT;
    … …  
    5347public:
    5448
    55     static UIDownloaderAdditions* create();
    56     static UIDownloaderAdditions* current();
    57 
    58     void setAction(QAction *pAction);
    59     QAction *action() const;
     49    /* Returns updater if exists: */
     50    static UIDownloaderExtensionPack* current() { return m_pInstance; }
     51    /* Start downloading: */
     52    static void download(QObject *pListener);
    6053
    6154signals:
    6255
    63     void sigDownloadFinished(const QString &strFile);
     56    /* Notify listeners about extension pack downloaded: */
     57    void sigNotifyAboutExtensionPackDownloaded(const QString &strSource, const QString &strTarget);
    6458
    6559private:
    6660
    67     UIDownloaderAdditions();
    68     ~UIDownloaderAdditions();
     61    /* Constructor/destructor: */
     62    UIDownloaderExtensionPack();
     63    ~UIDownloaderExtensionPack();
    6964
     65    /* Virtual methods reimplementations: */
    7066    UIMiniProgressWidget* createProgressWidgetFor(QWidget *pParent) const;
    7167    bool askForDownloadingConfirmation(QNetworkReply *pReply);
    … …  
    7369    void warnAboutNetworkError(const QString &strError);
    7470
    75     /* Private member variables: */
    76     static UIDownloaderAdditions *m_pInstance;
    77 
    78     /* Action to be blocked: */
    79     QPointer<QAction> m_pAction;
     71    /* Variables: */
     72    static UIDownloaderExtensionPack *m_pInstance;
    8073};
    8174
    82 #endif // __UIDownloaderAdditions_h__
    83 
     75#endif // __UIDownloaderExtensionPack_h__

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp

    r38457 r38476  
     1/* $Id$ */
    12/** @file
    23 *
    34 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxUpdateDlg class implementation
     5 * Update routine related implementations
    56 */
    67
    … …  
    1718 */
    1819
    19 #ifdef VBOX_WITH_PRECOMPILED_HEADERS
    20 #include "precomp.h"
    21 #else /* !VBOX_WITH_PRECOMPILED_HEADERS */
    22 /* Global includes */
    23 #include <QNetworkAccessManager>
    24 #include <QNetworkReply>
    25 /* Local includes */
    26 #include "VBoxUpdateDlg.h"
    27 #include "VBoxGlobal.h"
    28 #include "UIMessageCenter.h"
    29 #include "UIIconPool.h"
    30 #include "VBoxUtils.h"
    31 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
     20/* Global includes: */
     21#include <QCoreApplication>
     22#include <QStringList>
    3223
    33 /**
    34  *  This class is used to store VBox version data.
    35  */
    36 class VBoxVersion
    37 {
    38 public:
     24/* Local includes: */
     25#include "UIUpdateDefs.h"
    3926
    40     VBoxVersion(const QString &strVersion)
    41         : x(0), y(0), z(0)
    42     {
    43         QStringList versionStack = strVersion.split('.');
    44         if (versionStack.size() > 0)
    45             x = versionStack[0].toInt();
    46         if (versionStack.size() > 1)
    47             y = versionStack[1].toInt();
    48         if (versionStack.size() > 2)
    49             z = versionStack[2].toInt();
    50     }
     27/* static: */
     28VBoxUpdateDayList VBoxUpdateData::m_dayList = VBoxUpdateDayList();
    5129
    52     bool operator<(const VBoxVersion &other) const
    53     {
    54         return (x <  other.x) ||
    55                (x == other.x && y <  other.y) ||
    56                (x == other.x && y == other.y && z <  other.z);
    57     }
    58 
    59     QString toString() const
    60     {
    61         return QString("%1.%2.%3").arg(x).arg(y).arg(z);
    62     }
    63 
    64 private:
    65 
    66     int x;
    67     int y;
    68     int z;
    69 };
    70 
    71 /* VBoxUpdateData stuff: */
    72 QList<UpdateDay> VBoxUpdateData::m_dayList = QList<UpdateDay>();
    73 
     30/* static */
    7431void VBoxUpdateData::populate()
    7532{
     33    /* Clear list initially: */
    7634    m_dayList.clear();
    7735
    78     /* To avoid re-translation complexity all
    79      * have to be retranslated separately: */
     36    /* To avoid re-translation complexity
     37     * all values will be retranslated separately: */
    8038
    8139    /* Separately retranslate each day: */
    82     m_dayList << UpdateDay(VBoxUpdateDlg::tr("1 day"),  "1 d");
    83     m_dayList << UpdateDay(VBoxUpdateDlg::tr("2 days"), "2 d");
    84     m_dayList << UpdateDay(VBoxUpdateDlg::tr("3 days"), "3 d");
    85     m_dayList << UpdateDay(VBoxUpdateDlg::tr("4 days"), "4 d");
    86     m_dayList << UpdateDay(VBoxUpdateDlg::tr("5 days"), "5 d");
    87     m_dayList << UpdateDay(VBoxUpdateDlg::tr("6 days"), "6 d");
     40    m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "1 day"),  "1 d");
     41    m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "2 days"), "2 d");
     42    m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "3 days"), "3 d");
     43    m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "4 days"), "4 d");
     44    m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "5 days"), "5 d");
     45    m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "6 days"), "6 d");
    8846
    89     /* Separately retranslate each week */
    90     m_dayList << UpdateDay(VBoxUpdateDlg::tr("1 week"),  "1 w");
    91     m_dayList << UpdateDay(VBoxUpdateDlg::tr("2 weeks"), "2 w");
    92     m_dayList << UpdateDay(VBoxUpdateDlg::tr("3 weeks"), "3 w");
     47    /* Separately retranslate each week: */
     48    m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "1 week"),  "1 w");
     49    m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "2 weeks"), "2 w");
     50    m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "3 weeks"), "3 w");
    9351
    94     /* Separately retranslate each month */
    95     m_dayList << UpdateDay(VBoxUpdateDlg::tr("1 month"), "1 m");
     52    /* Separately retranslate each month: */
     53    m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "1 month"), "1 m");
    9654}
    9755
     56/* static */
    9857QStringList VBoxUpdateData::list()
    9958{
    … …  
    12079}
    12180
    122 bool VBoxUpdateData::isNecessary()
     81bool VBoxUpdateData::isNoNeedToCheck() const
    12382{
    124     return m_periodIndex != PeriodNever && QDate::currentDate() >= m_date;
     83    return m_periodIndex == PeriodNever;
    12584}
    12685
    127 bool VBoxUpdateData::isNoNeedToCheck()
     86bool VBoxUpdateData::isNeedToCheck() const
    12887{
    129     return m_periodIndex == PeriodNever;
     88    return !isNoNeedToCheck() && QDate::currentDate() >= m_date;
    13089}
    13190
    … …  
    142101QString VBoxUpdateData::date() const
    143102{
    144     return m_periodIndex == PeriodNever ? VBoxUpdateDlg::tr("Never")
    145                                         : m_date.toString(Qt::LocaleDate);
     103    return isNoNeedToCheck() ? QCoreApplication::translate("UIUpdateManager", "Never") : m_date.toString(Qt::LocaleDate);
    146104}
    147105
    … …  
    180138            if (m_dayList.isEmpty())
    181139                populate();
    182             PeriodType index = (PeriodType)m_dayList.indexOf(UpdateDay(QString(), parser[0]));
     140            PeriodType index = (PeriodType)m_dayList.indexOf(VBoxUpdateDay(QString(), parser[0]));
    183141            m_periodIndex = index == PeriodUndefined ? Period1Day : index;
    184142        }
    … …  
    234192}
    235193
    236 /* VBoxUpdateDlg stuff: */
    237 bool VBoxUpdateDlg::isNecessary()
    238 {
    239     VBoxUpdateData data(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate));
    240     return data.isNecessary();
    241 }
    242 
    243 VBoxUpdateDlg::VBoxUpdateDlg(VBoxUpdateDlg **ppSelf, bool fForceRun, QWidget *pParent)
    244     : QIWithRetranslateUI<QDialog>(pParent)
    245     , m_ppSelf(ppSelf)
    246     , m_pNetworkManager(new QNetworkAccessManager(this))
    247     , m_url("http://update.virtualbox.org/query.php")
    248     , m_fForceRun(fForceRun)
    249 {
    250     /* Store external pointer to this dialog: */
    251     *m_ppSelf = this;
    252 
    253     /* Apply UI decorations: */
    254     Ui::VBoxUpdateDlg::setupUi(this);
    255 
    256     /* Apply window icons: */
    257     setWindowIcon(UIIconPool::iconSetFull(QSize(32, 32), QSize(16, 16),
    258                                           ":/refresh_32px.png", ":/refresh_16px.png"));
    259 
    260     /* Setup other connections: */
    261     connect(mBtnCheck, SIGNAL(clicked()), this, SLOT(search()));
    262     connect(mBtnFinish, SIGNAL(clicked()), this, SLOT(accept()));
    263     connect(this, SIGNAL(sigDelayedAcception()), this, SLOT(accept()), Qt::QueuedConnection);
    264 
    265     /* Setup initial condition: */
    266     mPbCheck->setMinimumWidth(mLogoUpdate->width() + mLogoUpdate->frameWidth() * 2);
    267     mPbCheck->hide();
    268     mTextSuccessInfo->hide();
    269     mTextFailureInfo->hide();
    270     mTextNotFoundInfo->hide();
    271 
    272     /* Retranslate string constants: */
    273     retranslateUi();
    274 }
    275 
    276 VBoxUpdateDlg::~VBoxUpdateDlg()
    277 {
    278     /* Erase dialog handle in config file: */
    279     vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateDlgWinID, QString());
    280 
    281     /* Erase external pointer to this dialog: */
    282     *m_ppSelf = 0;
    283 }
    284 
    285 void VBoxUpdateDlg::retranslateUi()
    286 {
    287     /* Translate uic generated strings: */
    288     Ui::VBoxUpdateDlg::retranslateUi(this);
    289 
    290     /* For wizard update: */
    291     if (!isHidden())
    292     {
    293         setWindowTitle(tr("VirtualBox Update Wizard"));
    294 
    295         mPageUpdateHdr->setText(tr("Check for Updates"));
    296         mBtnCheck->setText(tr("Chec&k"));
    297         mBtnCancel->setText(tr("Cancel"));
    298 
    299         mPageFinishHdr->setText(tr("Summary"));
    300         mBtnFinish->setText(tr("&Close"));
    301 
    302         mTextUpdateInfo->setText(tr("<p>This wizard will connect to the VirtualBox "
    303                                     "web-site and check if a newer version of "
    304                                     "VirtualBox is available.</p><p>Use the "
    305                                     "<b>Check</b> button to check for a new version "
    306                                     "now or the <b>Cancel</b> button if you do not "
    307                                     "want to perform this check.</p><p>You can run "
    308                                     "this wizard at any time by choosing <b>Check "
    309                                     "for Updates...</b> from the <b>Help</b> menu.</p>"));
    310 
    311         mTextSuccessInfo->setText(tr("<p>A new version of VirtualBox has been released! "
    312                                      "Version <b>%1</b> is available at "
    313                                      "<a href=\"http://www.virtualbox.org/\">virtualbox.org</a>.</p>"
    314                                      "<p>You can download this version using the link:</p>"
    315                                      "<p><a href=%2>%3</a></p>"));
    316 
    317         mTextFailureInfo->setText(tr("<p>Unable to obtain the new version information "
    318                                      "due to the following network error:</p><p><b>%1</b></p>"));
    319 
    320         mTextNotFoundInfo->setText(tr("You are already running the most recent version of VirtualBox."));
    321     }
    322 }
    323 
    324 void VBoxUpdateDlg::accept()
    325 {
    326     /* Recalculate new update data: */
    327     VBoxUpdateData oldData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate));
    328     VBoxUpdateData newData(oldData.periodIndex(), oldData.branchIndex());
    329     vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateDate, newData.data());
    330     /* Call to base-class: */
    331     QDialog::accept();
    332 }
    333 
    334 void VBoxUpdateDlg::search()
    335 {
    336     /* Calculate the count of checks left: */
    337     int cCount = 1;
    338     QString strCount = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateCheckCount);
    339     if (!strCount.isEmpty())
    340     {
    341         bool ok = false;
    342         int c = strCount.toLongLong(&ok);
    343         if (ok) cCount = c;
    344     }
    345 
    346     /* Compose query: */
    347     QUrl url(m_url);
    348     url.addQueryItem("platform", vboxGlobal().virtualBox().GetPackageType());
    349     /* Branding: Check whether we have a local branding file which tells us our version suffix "FOO"
    350                  (e.g. 3.06.54321_FOO) to identify this installation */
    351     if (vboxGlobal().brandingIsActive())
    352     {
    353         url.addQueryItem("version", QString("%1_%2_%3").arg(vboxGlobal().virtualBox().GetVersion())
    354                                                        .arg(vboxGlobal().virtualBox().GetRevision())
    355                                                        .arg(vboxGlobal().brandingGetKey("VerSuffix")));
    356     }
    357     else
    358     {
    359         /* Use hard coded version set by VBOX_VERSION_STRING: */
    360         url.addQueryItem("version", QString("%1_%2").arg(vboxGlobal().virtualBox().GetVersion())
    361                                                     .arg(vboxGlobal().virtualBox().GetRevision()));
    362     }
    363     url.addQueryItem("count", QString::number(cCount));
    364     url.addQueryItem("branch", VBoxUpdateData(vboxGlobal().virtualBox().
    365                                               GetExtraData(VBoxDefs::GUI_UpdateDate)).branchName());
    366     QString strUserAgent(QString("VirtualBox %1 <%2>")
    367                             .arg(vboxGlobal().virtualBox().GetVersion())
    368                             .arg(vboxGlobal().platformInfo()));
    369 
    370     /* Show progress bar: */
    371     mPbCheck->show();
    372 
    373     /* Setup GET request: */
    374     QNetworkRequest request;
    375     request.setUrl(url);
    376     request.setRawHeader("User-Agent", strUserAgent.toAscii());
    377     QNetworkReply *pReply = m_pNetworkManager->get(request);
    378     connect(pReply, SIGNAL(finished()), this, SLOT(sltHandleReply()));
    379     connect(pReply, SIGNAL(sslErrors(QList<QSslError>)), pReply, SLOT(ignoreSslErrors()));
    380 }
    381 
    382 void VBoxUpdateDlg::sltHandleReply()
    383 {
    384     /* Get corresponding network reply object: */
    385     QNetworkReply *pReply = qobject_cast<QNetworkReply*>(sender());
    386     /* And ask it for suicide: */
    387     pReply->deleteLater();
    388 
    389     /* Hide progress bar: */
    390     mPbCheck->hide();
    391 
    392     /* Handle normal result: */
    393     if (pReply->error() == QNetworkReply::NoError)
    394     {
    395         /* Deserialize incoming data: */
    396         QString strResponseData(pReply->readAll());
    397 
    398         /* Newer version of necessary package found: */
    399         if (strResponseData.indexOf(QRegExp("^\\d+\\.\\d+\\.\\d+ \\S+$")) == 0)
    400         {
    401             QStringList response = strResponseData.split(" ", QString::SkipEmptyParts);
    402 
    403             /* For background update: */
    404             if (isHidden())
    405             {
    406                 msgCenter().showUpdateSuccess(vboxGlobal().mainWindow(), response[0], response[1]);
    407                 acceptLater();
    408             }
    409             /* For wizard update: */
    410             else
    411             {
    412                 mTextSuccessInfo->setText(mTextSuccessInfo->text().arg(response[0], response[1], response[1]));
    413                 mTextSuccessInfo->show();
    414                 mPageStack->setCurrentIndex(1);
    415             }
    416         }
    417         /* No newer version of necessary package found: */
    418         else
    419         {
    420             /* For background update: */
    421             if (isHidden())
    422             {
    423                 if (m_fForceRun)
    424                     msgCenter().showUpdateNotFound(vboxGlobal().mainWindow());
    425                 acceptLater();
    426             }
    427             /* For wizard update: */
    428             else
    429             {
    430                 mTextNotFoundInfo->show();
    431                 mPageStack->setCurrentIndex(1);
    432             }
    433         }
    434 
    435         /* Save left count of checks: */
    436         int cCount = 1;
    437         QString strCount = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateCheckCount);
    438         if (!strCount.isEmpty())
    439         {
    440             bool ok = false;
    441             int c = strCount.toLongLong(&ok);
    442             if (ok) cCount = c;
    443         }
    444         vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateCheckCount, QString("%1").arg((qulonglong)cCount + 1));
    445     }
    446     /* Handle errors: */
    447     else
    448     {
    449         /* For background update: */
    450         if (isHidden())
    451         {
    452             if (m_fForceRun)
    453                 msgCenter().showUpdateFailure(vboxGlobal().mainWindow(), pReply->errorString());
    454             acceptLater();
    455         }
    456         /* For wizard update: */
    457         else
    458         {
    459             mTextFailureInfo->setText(mTextFailureInfo->text().arg(pReply->errorString()));
    460             mTextFailureInfo->show();
    461             mPageStack->setCurrentIndex(1);
    462         }
    463     }
    464 }
    465 

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.h

    r38457 r38476  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxUpdateDlg class declaration
     4 * Update routine related declarations
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxUpdateDlg_h__
    20 #define __VBoxUpdateDlg_h__
     19#ifndef __UIUpdateDefs_h__
     20#define __UIUpdateDefs_h__
    2121
    2222/* Global includes: */
    2323#include <QDate>
    24 #include <QUrl>
    2524
    26 /* Local includes */
    27 #include "QIWithRetranslateUI.h"
    28 #include "VBoxUpdateDlg.gen.h"
    29 
    30 /* Forward declarations: */
    31 class QNetworkAccessManager;
    32 
    33 /**
    34  *  This structure is used to store retranslated reminder values.
    35  */
    36 struct UpdateDay
     25/* This structure is used to store retranslated reminder values. */
     26struct VBoxUpdateDay
    3727{
    38     UpdateDay(const QString &strVal, const QString &strKey)
     28    VBoxUpdateDay(const QString &strVal, const QString &strKey)
    3929        : val(strVal), key(strKey) {}
    4030
    41     bool operator==(const UpdateDay &other)
    42     {
    43         return val == other.val || key == other.key;
    44     }
     31    bool operator==(const VBoxUpdateDay &other) { return val == other.val || key == other.key; }
    4532
    4633    QString val;
    4734    QString key;
    4835};
     36typedef QList<VBoxUpdateDay> VBoxUpdateDayList;
    4937
    50 /**
    51  *  This class is used to encode/decode the registration data.
    52  */
     38/* This class is used to encode/decode update data. */
    5339class VBoxUpdateData
    5440{
    5541public:
    5642
     43    /* Period types: */
    5744    enum PeriodType
    5845    {
    … …  
    7158    };
    7259
     60    /* Branch types: */
    7361    enum BranchType
    7462    {
    … …  
    7866    };
    7967
     68    /* Public static helpers: */
    8069    static void populate();
    8170    static QStringList list();
    8271
     72    /* Constructors: */
    8373    VBoxUpdateData(const QString &strData);
    8474    VBoxUpdateData(PeriodType periodIndex, BranchType branchIndex);
    8575
    86     bool isNecessary();
    87     bool isNoNeedToCheck();
    88 
     76    /* Public helpers: */
     77    bool isNoNeedToCheck() const;
     78    bool isNeedToCheck() const;
    8979    QString data() const;
    9080    PeriodType periodIndex() const;
    … …  
    9585private:
    9686
    97     /* Private functions */
     87    /* Private helpers: */
    9888    void decode();
    9989    void encode();
    10090
    101     /* Private variables */
    102     static QList <UpdateDay> m_dayList;
    103 
     91    /* Private variables: */
     92    static VBoxUpdateDayList m_dayList;
    10493    QString m_strData;
    10594    PeriodType m_periodIndex;
    … …  
    10897};
    10998
    110 class VBoxUpdateDlg : public QIWithRetranslateUI<QDialog>, public Ui::VBoxUpdateDlg
    111 {
    112     Q_OBJECT;
    113 
    114 public:
    115 
    116     static bool isNecessary();
    117 
    118     VBoxUpdateDlg(VBoxUpdateDlg **ppSelf, bool fForceRun, QWidget *pParent = 0);
    119     ~VBoxUpdateDlg();
    120 
    121 signals:
    122 
    123     void sigDelayedAcception();
    124 
    125 public slots:
    126 
    127     void search();
    128 
    129 protected:
    130 
    131     void retranslateUi();
    132     void acceptLater() { emit sigDelayedAcception(); }
    133 
    134 private slots:
    135 
    136     void accept();
    137     void sltHandleReply();
    138 
    139 private:
    140 
    141     VBoxUpdateDlg         **m_ppSelf;
    142     QNetworkAccessManager  *m_pNetworkManager;
    143     QUrl                    m_url;
    144     bool                    m_fForceRun;
    145 };
    146 
    147 #endif // __VBoxUpdateDlg_h__
    148 
     99#endif // __UIUpdateDefs_h__

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

    r38457 r38476  
     1/* $Id$ */
    12/** @file
    23 *
    34 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxUpdateDlg class implementation
     5 * UIUpdateManager class implementation
    56 */
    67
    … …  
    1718 */
    1819
    19 #ifdef VBOX_WITH_PRECOMPILED_HEADERS
    20 #include "precomp.h"
    21 #else /* !VBOX_WITH_PRECOMPILED_HEADERS */
    22 /* Global includes */
    23 #include <QNetworkAccessManager>
     20/* Global includes: */
     21#include <QEventLoop>
    2422#include <QNetworkReply>
    25 /* Local includes */
    26 #include "VBoxUpdateDlg.h"
     23#include <QTimer>
     24#include <QDir>
     25
     26/* Local includes: */
     27#include "UIUpdateManager.h"
     28#include "UINetworkManager.h"
    2729#include "VBoxGlobal.h"
    2830#include "UIMessageCenter.h"
    29 #include "UIIconPool.h"
    3031#include "VBoxUtils.h"
    31 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    32 
    33 /**
    34  *  This class is used to store VBox version data.
    35  */
    36 class VBoxVersion
    37 {
    38 public:
    39 
    40     VBoxVersion(const QString &strVersion)
    41         : x(0), y(0), z(0)
    42     {
    43         QStringList versionStack = strVersion.split('.');
    44         if (versionStack.size() > 0)
    45             x = versionStack[0].toInt();
    46         if (versionStack.size() > 1)
    47             y = versionStack[1].toInt();
    48         if (versionStack.size() > 2)
    49             z = versionStack[2].toInt();
    50     }
    51 
    52     bool operator<(const VBoxVersion &other) const
    53     {
    54         return (x <  other.x) ||
    55                (x == other.x && y <  other.y) ||
    56                (x == other.x && y == other.y && z <  other.z);
    57     }
    58 
    59     QString toString() const
    60     {
    61         return QString("%1.%2.%3").arg(x).arg(y).arg(z);
    62     }
    63 
    64 private:
    65 
    66     int x;
    67     int y;
    68     int z;
    69 };
    70 
    71 /* VBoxUpdateData stuff: */
    72 QList<UpdateDay> VBoxUpdateData::m_dayList = QList<UpdateDay>();
    73 
    74 void VBoxUpdateData::populate()
    75 {
    76     m_dayList.clear();
    77 
    78     /* To avoid re-translation complexity all
    79      * have to be retranslated separately: */
    80 
    81     /* Separately retranslate each day: */
    82     m_dayList << UpdateDay(VBoxUpdateDlg::tr("1 day"),  "1 d");
    83     m_dayList << UpdateDay(VBoxUpdateDlg::tr("2 days"), "2 d");
    84     m_dayList << UpdateDay(VBoxUpdateDlg::tr("3 days"), "3 d");
    85     m_dayList << UpdateDay(VBoxUpdateDlg::tr("4 days"), "4 d");
    86     m_dayList << UpdateDay(VBoxUpdateDlg::tr("5 days"), "5 d");
    87     m_dayList << UpdateDay(VBoxUpdateDlg::tr("6 days"), "6 d");
    88 
    89     /* Separately retranslate each week */
    90     m_dayList << UpdateDay(VBoxUpdateDlg::tr("1 week"),  "1 w");
    91     m_dayList << UpdateDay(VBoxUpdateDlg::tr("2 weeks"), "2 w");
    92     m_dayList << UpdateDay(VBoxUpdateDlg::tr("3 weeks"), "3 w");
    93 
    94     /* Separately retranslate each month */
    95     m_dayList << UpdateDay(VBoxUpdateDlg::tr("1 month"), "1 m");
    96 }
    97 
    98 QStringList VBoxUpdateData::list()
    99 {
    100     QStringList result;
    101     for (int i = 0; i < m_dayList.size(); ++i)
    102         result << m_dayList[i].val;
    103     return result;
    104 }
    105 
    106 VBoxUpdateData::VBoxUpdateData(const QString &strData)
    107     : m_strData(strData)
    108     , m_periodIndex(Period1Day)
    109     , m_branchIndex(BranchStable)
    110 {
    111     decode();
    112 }
    113 
    114 VBoxUpdateData::VBoxUpdateData(PeriodType periodIndex, BranchType branchIndex)
    115     : m_strData(QString())
    116     , m_periodIndex(periodIndex)
    117     , m_branchIndex(branchIndex)
    118 {
    119     encode();
    120 }
    121 
    122 bool VBoxUpdateData::isNecessary()
    123 {
    124     return m_periodIndex != PeriodNever && QDate::currentDate() >= m_date;
    125 }
    126 
    127 bool VBoxUpdateData::isNoNeedToCheck()
    128 {
    129     return m_periodIndex == PeriodNever;
    130 }
    131 
    132 QString VBoxUpdateData::data() const
    133 {
    134     return m_strData;
    135 }
    136 
    137 VBoxUpdateData::PeriodType VBoxUpdateData::periodIndex() const
    138 {
    139     return m_periodIndex;
    140 }
    141 
    142 QString VBoxUpdateData::date() const
    143 {
    144     return m_periodIndex == PeriodNever ? VBoxUpdateDlg::tr("Never")
    145                                         : m_date.toString(Qt::LocaleDate);
    146 }
    147 
    148 VBoxUpdateData::BranchType VBoxUpdateData::branchIndex() const
    149 {
    150     return m_branchIndex;
    151 }
    152 
    153 QString VBoxUpdateData::branchName() const
    154 {
    155     switch (m_branchIndex)
    156     {
    157         case BranchStable:
    158             return "stable";
    159         case BranchAllRelease:
    160             return "allrelease";
    161         case BranchWithBetas:
    162             return "withbetas";
    163     }
    164     return QString();
    165 }
    166 
    167 void VBoxUpdateData::decode()
    168 {
    169     /* Parse standard values: */
    170     if (m_strData == "never")
    171         m_periodIndex = PeriodNever;
    172     /* Parse other values: */
    173     else
    174     {
    175         QStringList parser(m_strData.split(", ", QString::SkipEmptyParts));
    176 
    177         /* Parse 'period' value: */
    178         if (parser.size() > 0)
    179         {
    180             if (m_dayList.isEmpty())
    181                 populate();
    182             PeriodType index = (PeriodType)m_dayList.indexOf(UpdateDay(QString(), parser[0]));
    183             m_periodIndex = index == PeriodUndefined ? Period1Day : index;
    184         }
    185 
    186         /* Parse 'date' value: */
    187         if (parser.size() > 1)
    188         {
    189             QDate date = QDate::fromString(parser[1], Qt::ISODate);
    190             m_date = date.isValid() ? date : QDate::currentDate();
    191         }
    192 
    193         /* Parse 'branch' value: */
    194         if (parser.size() > 2)
    195         {
    196             QString branch(parser[2]);
    197             m_branchIndex = branch == "withbetas" ? BranchWithBetas :
    198                             branch == "allrelease" ? BranchAllRelease : BranchStable;
    199         }
    200     }
    201 }
    202 
    203 void VBoxUpdateData::encode()
    204 {
    205     /* Encode standard values: */
    206     if (m_periodIndex == PeriodNever)
    207         m_strData = "never";
    208     /* Encode other values: */
    209     else
    210     {
    211         /* Encode 'period' value: */
    212         if (m_dayList.isEmpty())
    213             populate();
    214         QString remindPeriod = m_dayList[m_periodIndex].key;
    215 
    216         /* Encode 'date' value: */
    217         m_date = QDate::currentDate();
    218         QStringList parser(remindPeriod.split(' '));
    219         if (parser[1] == "d")
    220             m_date = m_date.addDays(parser[0].toInt());
    221         else if (parser[1] == "w")
    222             m_date = m_date.addDays(parser[0].toInt() * 7);
    223         else if (parser[1] == "m")
    224             m_date = m_date.addMonths(parser[0].toInt());
    225         QString remindDate = m_date.toString(Qt::ISODate);
    226 
    227         /* Encode 'branch' value: */
    228         QString branchValue = m_branchIndex == BranchWithBetas ? "withbetas" :
    229                               m_branchIndex == BranchAllRelease ? "allrelease" : "stable";
    230 
    231         /* Composite m_strData: */
    232         m_strData = QString("%1, %2, %3").arg(remindPeriod, remindDate, branchValue);
    233     }
    234 }
    235 
    236 /* VBoxUpdateDlg stuff: */
    237 bool VBoxUpdateDlg::isNecessary()
    238 {
    239     VBoxUpdateData data(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate));
    240     return data.isNecessary();
    241 }
    242 
    243 VBoxUpdateDlg::VBoxUpdateDlg(VBoxUpdateDlg **ppSelf, bool fForceRun, QWidget *pParent)
    244     : QIWithRetranslateUI<QDialog>(pParent)
    245     , m_ppSelf(ppSelf)
    246     , m_pNetworkManager(new QNetworkAccessManager(this))
    247     , m_url("http://update.virtualbox.org/query.php")
    248     , m_fForceRun(fForceRun)
    249 {
    250     /* Store external pointer to this dialog: */
    251     *m_ppSelf = this;
    252 
    253     /* Apply UI decorations: */
    254     Ui::VBoxUpdateDlg::setupUi(this);
    255 
    256     /* Apply window icons: */
    257     setWindowIcon(UIIconPool::iconSetFull(QSize(32, 32), QSize(16, 16),
    258                                           ":/refresh_32px.png", ":/refresh_16px.png"));
    259 
    260     /* Setup other connections: */
    261     connect(mBtnCheck, SIGNAL(clicked()), this, SLOT(search()));
    262     connect(mBtnFinish, SIGNAL(clicked()), this, SLOT(accept()));
    263     connect(this, SIGNAL(sigDelayedAcception()), this, SLOT(accept()), Qt::QueuedConnection);
    264 
    265     /* Setup initial condition: */
    266     mPbCheck->setMinimumWidth(mLogoUpdate->width() + mLogoUpdate->frameWidth() * 2);
    267     mPbCheck->hide();
    268     mTextSuccessInfo->hide();
    269     mTextFailureInfo->hide();
    270     mTextNotFoundInfo->hide();
    271 
    272     /* Retranslate string constants: */
    273     retranslateUi();
    274 }
    275 
    276 VBoxUpdateDlg::~VBoxUpdateDlg()
    277 {
    278     /* Erase dialog handle in config file: */
    279     vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateDlgWinID, QString());
    280 
    281     /* Erase external pointer to this dialog: */
    282     *m_ppSelf = 0;
    283 }
    284 
    285 void VBoxUpdateDlg::retranslateUi()
    286 {
    287     /* Translate uic generated strings: */
    288     Ui::VBoxUpdateDlg::retranslateUi(this);
    289 
    290     /* For wizard update: */
    291     if (!isHidden())
    292     {
    293         setWindowTitle(tr("VirtualBox Update Wizard"));
    294 
    295         mPageUpdateHdr->setText(tr("Check for Updates"));
    296         mBtnCheck->setText(tr("Chec&k"));
    297         mBtnCancel->setText(tr("Cancel"));
    298 
    299         mPageFinishHdr->setText(tr("Summary"));
    300         mBtnFinish->setText(tr("&Close"));
    301 
    302         mTextUpdateInfo->setText(tr("<p>This wizard will connect to the VirtualBox "
    303                                     "web-site and check if a newer version of "
    304                                     "VirtualBox is available.</p><p>Use the "
    305                                     "<b>Check</b> button to check for a new version "
    306                                     "now or the <b>Cancel</b> button if you do not "
    307                                     "want to perform this check.</p><p>You can run "
    308                                     "this wizard at any time by choosing <b>Check "
    309                                     "for Updates...</b> from the <b>Help</b> menu.</p>"));
    310 
    311         mTextSuccessInfo->setText(tr("<p>A new version of VirtualBox has been released! "
    312                                      "Version <b>%1</b> is available at "
    313                                      "<a href=\"http://www.virtualbox.org/\">virtualbox.org</a>.</p>"
    314                                      "<p>You can download this version using the link:</p>"
    315                                      "<p><a href=%2>%3</a></p>"));
    316 
    317         mTextFailureInfo->setText(tr("<p>Unable to obtain the new version information "
    318                                      "due to the following network error:</p><p><b>%1</b></p>"));
    319 
    320         mTextNotFoundInfo->setText(tr("You are already running the most recent version of VirtualBox."));
    321     }
    322 }
    323 
    324 void VBoxUpdateDlg::accept()
    325 {
    326     /* Recalculate new update data: */
    327     VBoxUpdateData oldData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate));
    328     VBoxUpdateData newData(oldData.periodIndex(), oldData.branchIndex());
    329     vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateDate, newData.data());
    330     /* Call to base-class: */
    331     QDialog::accept();
    332 }
    333 
    334 void VBoxUpdateDlg::search()
     32#include "UIDownloaderExtensionPack.h"
     33#include "UIGlobalSettingsExtension.h"
     34
     35/* UIUpdateManager stuff: */
     36UIUpdateManager* UIUpdateManager::m_pInstance = 0;
     37
     38/* static */
     39void UIUpdateManager::schedule()
     40{
     41    /* Ensure instance is NOT created: */
     42    if (m_pInstance)
     43        return;
     44
     45    /* Create instance: */
     46    new UIUpdateManager;
     47}
     48
     49/* static */
     50void UIUpdateManager::shutdown()
     51{
     52    /* Ensure instance is created: */
     53    if (!m_pInstance)
     54        return;
     55
     56    /* Delete instance: */
     57    delete m_pInstance;
     58}
     59
     60void UIUpdateManager::sltForceCheck()
     61{
     62    /* Force call for new version check: */
     63    sltCheckIfUpdateIsNecessary(true);
     64}
     65
     66UIUpdateManager::UIUpdateManager()
     67    : m_uTime(1 /* day */ * 24 /* hours */ * 60 /* minutes */ * 60 /* seconds */ * 1000 /* ms */)
     68{
     69    /* Prepare instance: */
     70    if (m_pInstance != this)
     71        m_pInstance = this;
     72
     73#ifdef VBOX_WITH_UPDATE_REQUEST
     74    /* Ask updater to check for the first time: */
     75    QTimer::singleShot(0, this, SLOT(sltCheckIfUpdateIsNecessary()));
     76#endif /* VBOX_WITH_UPDATE_REQUEST */
     77}
     78
     79UIUpdateManager::~UIUpdateManager()
     80{
     81    /* Cleanup instance: */
     82    if (m_pInstance == this)
     83        m_pInstance = 0;
     84}
     85
     86void UIUpdateManager::sltCheckIfUpdateIsNecessary(bool fForceCall /* = false */)
     87{
     88    /* Load/decode curent update data: */
     89    VBoxUpdateData currentData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate));
     90
     91    /* Check if update is really neessary: */
     92    if (fForceCall || currentData.isNeedToCheck())
     93    {
     94        /* Check if update is necessary for VirtualBox itself: */
     95        checkIfUpdateIsNecessary(fForceCall);
     96
     97        /* Check if update is necessary for VirtualBox extension pack: */
     98        checkIfUpdateIsNecessaryForExtensionPack(fForceCall);
     99
     100        /* Encode/save new update data: */
     101        VBoxUpdateData newData(currentData.periodIndex(), currentData.branchIndex());
     102        vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateDate, newData.data());
     103    }
     104
     105#ifdef VBOX_WITH_UPDATE_REQUEST
     106    /* Ask updater to check for the next time: */
     107    QTimer::singleShot(m_uTime, this, SLOT(sltCheckIfUpdateIsNecessary()));
     108#endif /* VBOX_WITH_UPDATE_REQUEST */
     109}
     110
     111void UIUpdateManager::checkIfUpdateIsNecessary(bool fForceCall)
     112{
     113    /* Creating VirtualBox version checker: */
     114    UINewVersionChecker checker(fForceCall);
     115    /* Start synchronous check: */
     116    checker.checkForTheNewVersion();
     117}
     118
     119void UIUpdateManager::checkIfUpdateIsNecessaryForExtensionPack(bool /* fForceCall */)
     120{
     121    /* Check if updater instance already created: */
     122    if (UIDownloaderExtensionPack::current())
     123        return;
     124
     125    /* Get extension pack information: */
     126    QString strExtPackName = "Oracle VM VirtualBox Extension Pack";
     127    CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(strExtPackName);
     128    /* Check if extension pack is really installed: */
     129    if (extPack.isNull())
     130        return;
     131
     132    /* Get VirtualBox version: */
     133    VBoxVersion vboxVersion(vboxGlobal().virtualBox().GetVersion().remove("_OSE"));
     134    /* Get extension pack version: */
     135    VBoxVersion expackVersion(extPack.GetVersion().remove("_OSE"));
     136    /* Check if extension pack version less than required: */
     137    if ((vboxVersion.z() % 2 != 0) /* Skip unstable VBox version */ ||
     138        !(expackVersion < vboxVersion) /* Ext Pack version more or equal to VBox version */)
     139        return;
     140
     141    /* Ask the user about extension pack downloading: */
     142    if (!msgCenter().proposeDownloadExtensionPack())
     143        return;
     144
     145    /* Run downloader for VirtualBox extension pack: */
     146    UIDownloaderExtensionPack::download(this);
     147}
     148
     149void UIUpdateManager::sltHandleDownloadedExtensionPack(const QString &strSource, const QString &strTarget)
     150{
     151    /* Warn the user about extension pack was downloaded and saved, propose to install it: */
     152    if (msgCenter().proposeInstallExtentionPack(strSource, QDir::toNativeSeparators(strTarget)))
     153        UIGlobalSettingsExtension::doInstallation(strTarget, msgCenter().mainWindowShown(), NULL);
     154}
     155
     156/* UINewVersionChecker stuff: */
     157UINewVersionChecker::UINewVersionChecker(bool fForceCall)
     158    : m_url("http://update.virtualbox.org/query.php")
     159    , m_fForceCall(fForceCall)
     160    , m_pLoop(new QEventLoop(this))
     161{
     162}
     163
     164void UINewVersionChecker::checkForTheNewVersion()
    335165{
    336166    /* Calculate the count of checks left: */
    … …  
    347177    QUrl url(m_url);
    348178    url.addQueryItem("platform", vboxGlobal().virtualBox().GetPackageType());
    349     /* Branding: Check whether we have a local branding file which tells us our version suffix "FOO"
    350                  (e.g. 3.06.54321_FOO) to identify this installation */
     179    /* Check if branding is active: */
    351180    if (vboxGlobal().brandingIsActive())
    352181    {
     182        /* Branding: Check whether we have a local branding file which tells us our version suffix "FOO"
     183                     (e.g. 3.06.54321_FOO) to identify this installation: */
    353184        url.addQueryItem("version", QString("%1_%2_%3").arg(vboxGlobal().virtualBox().GetVersion())
    354185                                                       .arg(vboxGlobal().virtualBox().GetRevision())
    … …  
    368199                            .arg(vboxGlobal().platformInfo()));
    369200
    370     /* Show progress bar: */
    371     mPbCheck->show();
    372 
    373201    /* Setup GET request: */
    374202    QNetworkRequest request;
    375203    request.setUrl(url);
    376204    request.setRawHeader("User-Agent", strUserAgent.toAscii());
    377     QNetworkReply *pReply = m_pNetworkManager->get(request);
    378     connect(pReply, SIGNAL(finished()), this, SLOT(sltHandleReply()));
     205    QNetworkReply *pReply = gNetworkManager->get(request);
     206    connect(pReply, SIGNAL(finished()), this, SLOT(sltHandleCheckReply()));
    379207    connect(pReply, SIGNAL(sslErrors(QList<QSslError>)), pReply, SLOT(ignoreSslErrors()));
    380 }
    381 
    382 void VBoxUpdateDlg::sltHandleReply()
     208
     209    /* Lock event loop: */
     210    m_pLoop->exec();
     211}
     212
     213void UINewVersionChecker::sltHandleCheckReply()
    383214{
    384215    /* Get corresponding network reply object: */
    … …  
    387218    pReply->deleteLater();
    388219
    389     /* Hide progress bar: */
    390     mPbCheck->hide();
    391 
    392220    /* Handle normal result: */
    393221    if (pReply->error() == QNetworkReply::NoError)
    … …  
    400228        {
    401229            QStringList response = strResponseData.split(" ", QString::SkipEmptyParts);
    402 
    403             /* For background update: */
    404             if (isHidden())
    405             {
    406                 msgCenter().showUpdateSuccess(vboxGlobal().mainWindow(), response[0], response[1]);
    407                 acceptLater();
    408             }
    409             /* For wizard update: */
    410             else
    411             {
    412                 mTextSuccessInfo->setText(mTextSuccessInfo->text().arg(response[0], response[1], response[1]));
    413                 mTextSuccessInfo->show();
    414                 mPageStack->setCurrentIndex(1);
    415             }
     230            msgCenter().showUpdateSuccess(vboxGlobal().mainWindow(), response[0], response[1]);
    416231        }
    417232        /* No newer version of necessary package found: */
    418233        else
    419234        {
    420             /* For background update: */
    421             if (isHidden())
    422             {
    423                 if (m_fForceRun)
    424                     msgCenter().showUpdateNotFound(vboxGlobal().mainWindow());
    425                 acceptLater();
    426             }
    427             /* For wizard update: */
    428             else
    429             {
    430                 mTextNotFoundInfo->show();
    431                 mPageStack->setCurrentIndex(1);
    432             }
     235            if (m_fForceCall)
     236                msgCenter().showUpdateNotFound(vboxGlobal().mainWindow());
    433237        }
    434238
    … …  
    447251    else
    448252    {
    449         /* For background update: */
    450         if (isHidden())
    451         {
    452             if (m_fForceRun)
    453                 msgCenter().showUpdateFailure(vboxGlobal().mainWindow(), pReply->errorString());
    454             acceptLater();
    455         }
    456         /* For wizard update: */
    457         else
    458         {
    459             mTextFailureInfo->setText(mTextFailureInfo->text().arg(pReply->errorString()));
    460             mTextFailureInfo->show();
    461             mPageStack->setCurrentIndex(1);
    462         }
    463     }
    464 }
    465 
     253        if (m_fForceCall)
     254            msgCenter().showUpdateFailure(vboxGlobal().mainWindow(), pReply->errorString());
     255    }
     256
     257    /* Unlock event loop: */
     258    m_pLoop->exit();
     259}
     260

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.h

    r38457 r38476  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxUpdateDlg class declaration
     4 * UIUpdateManager class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxUpdateDlg_h__
    20 #define __VBoxUpdateDlg_h__
     19#ifndef __UIUpdateManager_h__
     20#define __UIUpdateManager_h__
    2121
    2222/* Global includes: */
    23 #include <QDate>
    2423#include <QUrl>
    2524
    26 /* Local includes */
    27 #include "QIWithRetranslateUI.h"
    28 #include "VBoxUpdateDlg.gen.h"
     25/* Local includes: */
     26#include "UIUpdateDefs.h"
    2927
    3028/* Forward declarations: */
    31 class QNetworkAccessManager;
     29class QEventLoop;
    3230
    33 /**
    34  *  This structure is used to store retranslated reminder values.
    35  */
    36 struct UpdateDay
    37 {
    38     UpdateDay(const QString &strVal, const QString &strKey)
    39         : val(strVal), key(strKey) {}
    40 
    41     bool operator==(const UpdateDay &other)
    42     {
    43         return val == other.val || key == other.key;
    44     }
    45 
    46     QString val;
    47     QString key;
    48 };
    49 
    50 /**
    51  *  This class is used to encode/decode the registration data.
    52  */
    53 class VBoxUpdateData
    54 {
    55 public:
    56 
    57     enum PeriodType
    58     {
    59         PeriodNever     = -2,
    60         PeriodUndefined = -1,
    61         Period1Day      =  0,
    62         Period2Days     =  1,
    63         Period3Days     =  2,
    64         Period4Days     =  3,
    65         Period5Days     =  4,
    66         Period6Days     =  5,
    67         Period1Week     =  6,
    68         Period2Weeks    =  7,
    69         Period3Weeks    =  8,
    70         Period1Month    =  9
    71     };
    72 
    73     enum BranchType
    74     {
    75         BranchStable     = 0,
    76         BranchAllRelease = 1,
    77         BranchWithBetas  = 2
    78     };
    79 
    80     static void populate();
    81     static QStringList list();
    82 
    83     VBoxUpdateData(const QString &strData);
    84     VBoxUpdateData(PeriodType periodIndex, BranchType branchIndex);
    85 
    86     bool isNecessary();
    87     bool isNoNeedToCheck();
    88 
    89     QString data() const;
    90     PeriodType periodIndex() const;
    91     QString date() const;
    92     BranchType branchIndex() const;
    93     QString branchName() const;
    94 
    95 private:
    96 
    97     /* Private functions */
    98     void decode();
    99     void encode();
    100 
    101     /* Private variables */
    102     static QList <UpdateDay> m_dayList;
    103 
    104     QString m_strData;
    105     PeriodType m_periodIndex;
    106     QDate m_date;
    107     BranchType m_branchIndex;
    108 };
    109 
    110 class VBoxUpdateDlg : public QIWithRetranslateUI<QDialog>, public Ui::VBoxUpdateDlg
     31/* Singleton to check for the new VirtualBox version.
     32 * Performs update of required parts if necessary. */
     33class UIUpdateManager : public QObject
    11134{
    11235    Q_OBJECT;
    … …  
    11437public:
    11538
    116     static bool isNecessary();
    117 
    118     VBoxUpdateDlg(VBoxUpdateDlg **ppSelf, bool fForceRun, QWidget *pParent = 0);
    119     ~VBoxUpdateDlg();
     39    /* Schedule manager: */
     40    static void schedule();
     41    /* Shutdown manager: */
     42    static void shutdown();
     43    /* Manager instance: */
     44    static UIUpdateManager* instance() { return m_pInstance; }
    12045
    12146signals:
    12247
    123     void sigDelayedAcception();
     48    /* Signal to notify listeners about downloading: */
     49    void sigDownloaderCreatedForExtensionPack();
    12450
    12551public slots:
    12652
    127     void search();
    128 
    129 protected:
    130 
    131     void retranslateUi();
    132     void acceptLater() { emit sigDelayedAcception(); }
     53    /* Force call for new version check: */
     54    void sltForceCheck();
    13355
    13456private slots:
    13557
    136     void accept();
    137     void sltHandleReply();
     58    /* Slot to check if update is necessary: */
     59    void sltCheckIfUpdateIsNecessary(bool fForceCall = false);
     60
     61    /* Handle downloaded extension pack: */
     62    void sltHandleDownloadedExtensionPack(const QString &strSource, const QString &strTarget);
    13863
    13964private:
    14065
    141     VBoxUpdateDlg         **m_ppSelf;
    142     QNetworkAccessManager  *m_pNetworkManager;
    143     QUrl                    m_url;
    144     bool                    m_fForceRun;
     66    /* Constructor/destructor: */
     67    UIUpdateManager();
     68    ~UIUpdateManager();
     69
     70    /* Helping stuff: */
     71    void checkIfUpdateIsNecessary(bool fForceCall);
     72    void checkIfUpdateIsNecessaryForExtensionPack(bool fForceCall);
     73
     74    /* Variables: */
     75    static UIUpdateManager* m_pInstance;
     76    quint64 m_uTime;
     77};
     78#define gUpdateManager UIUpdateManager::instance()
     79
     80/* Class to check for the new VirtualBox version: */
     81class UINewVersionChecker : public QObject
     82{
     83    Q_OBJECT;
     84
     85public:
     86
     87    /* Constructor: */
     88    UINewVersionChecker(bool fForceCall);
     89
     90    /* Function to check if new version is available: */
     91    void checkForTheNewVersion();
     92
     93private slots:
     94
     95    /* Slot to analyze new version check reply: */
     96    void sltHandleCheckReply();
     97
     98private:
     99
     100    /* Variables: */
     101    QUrl m_url;
     102    bool m_fForceCall;
     103    QEventLoop *m_pLoop;
    145104};
    146105
    147 #endif // __VBoxUpdateDlg_h__
    148 
     106#endif // __UIUpdateManager_h__

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

    r38348 r38476  
    386386        *m_ppThis = this;
    387387
    388     /* Create action pool: */
    389     UIActionPoolRuntime::create();
    390 
    391388    /* Create UISession object: */
    392389    m_pSession = new UISession(this, m_session);
    … …  
    418415    m_session.UnlockMachine();
    419416    m_session.detach();
    420     /* Destroy action pool: */
    421     UIActionPoolRuntime::destroy();
    422417    /* Quit application: */
    423418    QApplication::quit();

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp

    r38348 r38476  
    2626#include "UIExtraDataEventHandler.h"
    2727#include "UIImageTools.h"
     28#include "UIUpdateManager.h"
    2829
    2930/* Global includes */
    … …  
    295296                            &msgCenter(), SLOT(sltShowHelpAboutDialog()));
    296297        VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_Update), SIGNAL(triggered()),
    297                             &vboxGlobal(), SLOT(showUpdateDialog()));
     298                            gUpdateManager, SLOT(sltForceCheck()));
    298299#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
    299300    }

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

    r38348 r38476  
    10271027void UISession::preparePowerUp()
    10281028{
    1029 #ifdef VBOX_WITH_UPDATE_REQUEST
    1030     /* Check for updates if necessary: */
    1031     vboxGlobal().showUpdateDialog(false /* force request? */);
    1032 #endif
    1033 
    10341029    /* Notify user about mouse&keyboard auto-capturing: */
    10351030    if (vboxGlobal().settings().autoCapture())

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

    r38348 r38476  
    3131#include "UIMachineWindow.h"
    3232#include "UIDownloaderAdditions.h"
     33#include "UIDownloaderExtensionPack.h"
    3334
    3435#ifdef Q_WS_MAC
    … …  
    7778    prepareMachineWindows();
    7879
    79     /* If there is an Additions download running, update the parent window
    80      * information. */
     80    /* If there is an Additions download running, update the parent window information. */
    8181    if (UIDownloaderAdditions *pDl = UIDownloaderAdditions::current())
     82        pDl->setParentWidget(mainMachineWindow()->machineWindow());
     83
     84    /* If there is an Extension Pack download running, update the parent window information. */
     85    if (UIDownloaderExtensionPack *pDl = UIDownloaderExtensionPack::current())
    8286        pDl->setParentWidget(mainMachineWindow()->machineWindow());
    8387

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

    r38348 r38476  
    3737#include "UIMachineWindowNormal.h"
    3838#include "UIMachineView.h"
     39#include "UIUpdateManager.h"
    3940#include "UIDownloaderAdditions.h"
    4041#include "UIDownloaderUserManual.h"
     42#include "UIDownloaderExtensionPack.h"
    4143#ifdef Q_WS_MAC
    4244# include "UIImageTools.h"
    … …  
    168170}
    169171
    170 void UIMachineWindowNormal::sltDownloaderAdditionsEmbed()
     172void UIMachineWindowNormal::sltEmbedDownloaderForAdditions()
    171173{
    172174    /* If there is an additions download running show the process bar: */
    … …  
    175177}
    176178
    177 void UIMachineWindowNormal::sltDownloaderUserManualEmbed()
     179void UIMachineWindowNormal::sltEmbedDownloaderForUserManual()
    178180{
    179181    /* If there is an additions download running show the process bar: */
    180182    if (UIDownloaderUserManual *pDl = UIDownloaderUserManual::current())
     183        statusBar()->addWidget(pDl->progressWidget(this), 0);
     184}
     185
     186void UIMachineWindowNormal::sltEmbedDownloaderForExtensionPack()
     187{
     188    /* If there is an extension pack download running show the process bar: */
     189    if (UIDownloaderExtensionPack *pDl = UIDownloaderExtensionPack::current())
    181190        statusBar()->addWidget(pDl->progressWidget(this), 0);
    182191}
    … …  
    460469    /* Add the additions downloader progress bar to the status bar,
    461470     * if a download is actually running: */
    462     sltDownloaderAdditionsEmbed();
     471    sltEmbedDownloaderForAdditions();
    463472
    464473    /* Add the user manual progress bar to the status bar,
    465474     * if a download is actually running: */
    466     sltDownloaderUserManualEmbed();
     475    sltEmbedDownloaderForUserManual();
     476
     477    /* Add the extension pack progress bar to the status bar,
     478     * if a download is actually running: */
     479    sltEmbedDownloaderForExtensionPack();
    467480
    468481    /* Create & start timer to update LEDs: */
    … …  
    483496            this, SLOT(sltProcessGlobalSettingChange(const char *, const char *)));
    484497    /* Setup additions downloader listener: */
    485     connect(machineLogic(), SIGNAL(sigDownloaderAdditionsCreated()), this, SLOT(sltDownloaderAdditionsEmbed()));
     498    connect(machineLogic(), SIGNAL(sigDownloaderAdditionsCreated()), this, SLOT(sltEmbedDownloaderForAdditions()));
    486499    /* Setup user manual downloader listener: */
    487     connect(&msgCenter(), SIGNAL(sigDownloaderUserManualCreated()), this, SLOT(sltDownloaderUserManualEmbed()));
     500    connect(&msgCenter(), SIGNAL(sigDownloaderUserManualCreated()), this, SLOT(sltEmbedDownloaderForUserManual()));
     501    /* Setup extension pack downloader listener: */
     502    connect(gUpdateManager, SIGNAL(sigDownloaderCreatedForExtensionPack()), this, SLOT(sltEmbedDownloaderForExtensionPack()));
    488503}
    489504

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

    r37712 r38476  
    6363
    6464    /* Downloader listeners: */
    65     void sltDownloaderAdditionsEmbed();
    66     void sltDownloaderUserManualEmbed();
     65    void sltEmbedDownloaderForAdditions();
     66    void sltEmbedDownloaderForUserManual();
     67    void sltEmbedDownloaderForExtensionPack();
    6768
    6869private:

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp

    r38348 r38476  
    2828#include "UIMachineWindow.h"
    2929#include "UIDownloaderAdditions.h"
     30#include "UIDownloaderExtensionPack.h"
    3031
    3132#ifdef Q_WS_MAC
    … …  
    9798    prepareMachineWindows();
    9899
    99     /* If there is an Additions download running, update the parent window
    100      * information. */
     100    /* If there is an Additions download running, update the parent window information. */
    101101    if (UIDownloaderAdditions *pDl = UIDownloaderAdditions::current())
     102        pDl->setParentWidget(mainMachineWindow()->machineWindow());
     103
     104    /* If there is an Extension Pack download running, update the parent window information. */
     105    if (UIDownloaderExtensionPack *pDl = UIDownloaderExtensionPack::current())
    102106        pDl->setParentWidget(mainMachineWindow()->machineWindow());
    103107

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

    r38467 r38476  
    2222#include "QISplitter.h"
    2323#include "UIBar.h"
     24#include "UIUpdateManager.h"
    2425#include "UIDownloaderUserManual.h"
     26#include "UIDownloaderExtensionPack.h"
    2527#include "UIExportApplianceWzd.h"
    2628#include "UIIconPool.h"
    … …  
    4244#include "UIDesktopServices.h"
    4345#include "UIGlobalSettingsExtension.h" /* extension pack installation */
    44 #include "UIActionPoolSelector.h"
     46#include "UIActionPool.h"
    4547
    4648#ifdef VBOX_GUI_WITH_SYSTRAY
    … …  
    9496    , mDoneInaccessibleWarningOnce(false)
    9597{
    96     /* Create offline action pool: */
    97     UIActionPoolSelector::create();
    98 
    9998    VBoxGlobalSettings settings = vboxGlobal().settings();
    10099
    … …  
    494493
    495494    /* Listen to potential downloaders signals: */
    496     connect(&msgCenter(), SIGNAL(sigDownloaderUserManualCreated()), this, SLOT(sltDownloaderUserManualEmbed()));
     495    connect(&msgCenter(), SIGNAL(sigDownloaderUserManualCreated()), this, SLOT(sltEmbedDownloaderForUserManual()));
     496    connect(gUpdateManager, SIGNAL(sigDownloaderCreatedForExtensionPack()), this, SLOT(sltEmbedDownloaderForExtensionPack()));
    497497
    498498    /* bring the VM list to the focus */
    … …  
    563563    /* Delete the items from our model */
    564564    mVMModel->clear();
    565 
    566     /* Delete offline action pool: */
    567     UIActionPoolSelector::destroy();
    568565}
    569566
    … …  
    16631660#endif /* VBOX_GUI_WITH_SYSTRAY */
    16641661
    1665 void VBoxSelectorWnd::sltDownloaderUserManualEmbed()
     1662void VBoxSelectorWnd::sltEmbedDownloaderForUserManual()
    16661663{
    16671664    /* If there is User Manual downloader created => show the process bar: */
    16681665    if (UIDownloaderUserManual *pDl = UIDownloaderUserManual::current())
     1666        statusBar()->addWidget(pDl->progressWidget(this), 0);
     1667}
     1668
     1669void VBoxSelectorWnd::sltEmbedDownloaderForExtensionPack()
     1670{
     1671    /* If there is Extension Pack downloader created => show the process bar: */
     1672    if (UIDownloaderExtensionPack *pDl = UIDownloaderExtensionPack::current())
    16691673        statusBar()->addWidget(pDl->progressWidget(this), 0);
    16701674}
    … …  
    17701774#endif /* VBOX_WITH_REGISTRATION */
    17711775    VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_Update), SIGNAL(triggered()),
    1772                         &vboxGlobal(), SLOT(showUpdateDialog()));
     1776                        gUpdateManager, SLOT(sltForceCheck()));
    17731777    VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_About), SIGNAL(triggered()),
    17741778                        &msgCenter(), SLOT(sltShowHelpAboutDialog()));

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.h

    r38355 r38476  
    134134#endif
    135135
    136     void sltDownloaderUserManualEmbed();
     136    void sltEmbedDownloaderForUserManual();
     137    void sltEmbedDownloaderForExtensionPack();
    137138
    138139    void showViewContextMenu(const QPoint &pos);

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h

    r34166 r38476  
    2323#include "UISettingsPage.h"
    2424#include "UIGlobalSettingsUpdate.gen.h"
    25 #include "VBoxUpdateDlg.h"
     25#include "UIUpdateDefs.h"
    2626
    2727/* Global settings / Update page / Cache: */
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette