VirtualBox

Changeset 91159 in vbox


Ignore:
Timestamp:
Sep 8, 2021 2:33:49 PM (3 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:10067: A bit more refactoring for UIMessageCenter cloud related stuff.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

    r91151 r91159  
    13881388}
    13891389
     1390void UIMessageCenter::cannotAcquireCloudClientParameter(const CCloudClient &comClient, QWidget *pParent /* = 0 */) const
     1391{
     1392    error(pParent, MessageType_Error,
     1393          tr("Failed to acquire cloud client parameter."),
     1394          UIErrorString::formatErrorInfo(comClient));
     1395}
     1396
     1397void UIMessageCenter::cannotAcquireCloudClientParameter(const CProgress &comProgress, QWidget *pParent /* = 0 */) const
     1398{
     1399    error(pParent, MessageType_Error,
     1400          tr("Failed to acquire cloud client parameter."),
     1401          UIErrorString::formatErrorInfo(comProgress));
     1402}
     1403
    13901404void UIMessageCenter::cannotCreateCloudClient(const CCloudProfile &comProfile, QWidget *pParent /* = 0 */) const
    13911405{
     
    14111425          UIErrorString::formatErrorInfo(progress));
    14121426    return false;
    1413 }
    1414 
    1415 void UIMessageCenter::cannotAcquireCloudClientParameter(const CCloudClient &comClient, QWidget *pParent /* = 0 */) const
    1416 {
    1417     error(pParent, MessageType_Error,
    1418           tr("Failed to acquire cloud client parameter."),
    1419           UIErrorString::formatErrorInfo(comClient));
    1420 }
    1421 
    1422 void UIMessageCenter::cannotAcquireCloudClientParameter(const CProgress &comProgress, QWidget *pParent /* = 0 */) const
    1423 {
    1424     error(pParent, MessageType_Error,
    1425           tr("Failed to acquire cloud client parameter."),
    1426           UIErrorString::formatErrorInfo(comProgress));
    14271427}
    14281428
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

    r91151 r91159  
    381381        void cannotAcquireCloudProviderParameter(const CCloudProvider &comProvider, QWidget *pParent = 0) const;
    382382        void cannotAcquireCloudProfileParameter(const CCloudProfile &comProfile, QWidget *pParent = 0) const;
     383        void cannotAcquireCloudClientParameter(const CCloudClient &comClient, QWidget *pParent = 0) const;
     384        void cannotAcquireCloudClientParameter(const CProgress &comProgress, QWidget *pParent = 0) const;
    383385
    384386        void cannotCreateCloudClient(const CCloudProfile &comProfile, QWidget *pParent = 0) const;
     
    391393    /** @} */
    392394
    393     void cannotAcquireCloudClientParameter(const CCloudClient &comClient, QWidget *pParent = 0) const;
    394     void cannotAcquireCloudClientParameter(const CProgress &comProgress, QWidget *pParent = 0) const;
    395395    void cannotAcquireCloudMachineParameter(const CCloudMachine &comMachine, QWidget *pParent = 0) const;
    396396    void cannotAcquireCloudMachineParameter(const CProgress &comProgress, QWidget *pParent = 0) const;
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp

    r91151 r91159  
    302302            /* Read Cloud Client Export description form: */
    303303            CVirtualSystemDescriptionForm comExportForm;
    304             CProgress comExportDescriptionFormProgress = m_comClient.GetExportDescriptionForm(m_comVSD, comExportForm);
    305             if (!m_comClient.isOk())
    306             {
    307                 msgCenter().cannotAcquireCloudClientParameter(m_comClient);
     304            bool fResult = exportDescriptionForm(m_comClient, m_comVSD, comExportForm, wizardImp());
     305            if (!fResult)
    308306                break;
    309             }
    310 
    311             /* Show "Acquire export form" progress: */
    312             msgCenter().showModalProgressDialog(comExportDescriptionFormProgress, UIWizardExportApp::tr("Acquire export form ..."),
    313                                                 ":/progress_refresh_90px.png", 0, 0);
    314             if (!comExportDescriptionFormProgress.isOk() || comExportDescriptionFormProgress.GetResultCode() != 0)
    315             {
    316                 msgCenter().cannotAcquireCloudClientParameter(comExportDescriptionFormProgress);
    317                 break;
    318             }
    319307
    320308            /* Remember description form: */
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp

    r91151 r91159  
    200200            /* Gather VM names, ids and states.
    201201             * Currently we are interested in Running and Stopped VMs only. */
    202             CStringArray comNames;
    203             CStringArray comIDs;
    204             const QVector<KCloudMachineState> cloudMachineStates  = QVector<KCloudMachineState>()
    205                                                                  << KCloudMachineState_Running
    206                                                                  << KCloudMachineState_Stopped;
    207 
    208             /* Ask for cloud VMs: */
    209             CProgress comProgress = m_comCloudClient.ListInstances(cloudMachineStates, comNames, comIDs);
    210             if (!m_comCloudClient.isOk())
    211             {
    212                 msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
    213                 break;
    214             }
    215 
    216             /* Show "Acquire cloud instances" progress: */
    217             msgCenter().showModalProgressDialog(comProgress, QString(),
    218                                                 ":/progress_reading_appliance_90px.png", 0, 0);
    219             if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
    220             {
    221                 msgCenter().cannotAcquireCloudClientParameter(comProgress);
    222                 break;
    223             }
     202            QString strErrorMessage;
     203            QMap<QString, QString> instances = listInstances(m_comCloudClient, strErrorMessage, wizardImp());
    224204
    225205            /* Push acquired names to list rows: */
    226             const QVector<QString> names = comNames.GetValues();
    227             const QVector<QString> ids = comIDs.GetValues();
    228             for (int i = 0; i < names.size(); ++i)
     206            foreach (const QString &strId, instances.keys())
    229207            {
    230208                /* Create list item: */
    231                 QListWidgetItem *pItem = new QListWidgetItem(names.at(i), m_pProfileInstanceList);
     209                QListWidgetItem *pItem = new QListWidgetItem(instances.value(strId), m_pProfileInstanceList);
    232210                if (pItem)
    233211                {
    234212                    pItem->setFlags(pItem->flags() & ~Qt::ItemIsEditable);
    235                     pItem->setData(Qt::UserRole, ids.at(i));
     213                    pItem->setData(Qt::UserRole, strId);
    236214                }
    237215            }
     
    304282            /* Read Cloud Client description form: */
    305283            CVirtualSystemDescriptionForm comForm;
    306             CProgress comImportDescriptionFormProgress = m_comCloudClient.GetImportDescriptionForm(comDescription, comForm);
    307             if (!m_comCloudClient.isOk())
    308             {
    309                 msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
     284            bool fSuccess = importDescriptionForm(m_comCloudClient, comDescription, comForm, wizardImp());
     285            if (!fSuccess)
    310286                break;
    311             }
    312 
    313             /* Show "Acquire import form" progress: */
    314             msgCenter().showModalProgressDialog(comImportDescriptionFormProgress, UIWizardImportApp::tr("Acquire import form ..."),
    315                                                 ":/progress_refresh_90px.png", 0, 0);
    316             if (!comImportDescriptionFormProgress.isOk() || comImportDescriptionFormProgress.GetResultCode() != 0)
    317             {
    318                 msgCenter().cannotAcquireCloudClientParameter(comImportDescriptionFormProgress);
    319                 break;
    320             }
    321287
    322288            /* Remember form: */
Note: See TracChangeset for help on using the changeset viewer.

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