VirtualBox

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


Ignore:
Timestamp:
May 22, 2020 2:53:47 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
138174
Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane cleanup: Move new VM action trigger handling to proper place in UIVirtualBoxManager class.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/manager
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

    r84461 r84463  
    4848#include "UIWizardImportApp.h"
    4949#include "UIWizardNewCloudVM.h"
     50#include "UIWizardNewVM.h"
    5051#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    5152# include "UIUpdateManager.h"
    … …  
    564565}
    565566
     567void UIVirtualBoxManager::sltOpenNewMachineWizard()
     568{
     569    /* Lock the actions preventing cascade calls: */
     570    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexST_M_Welcome_S_New)
     571                                                         << actionPool()->action(UIActionIndexST_M_Machine_S_New)
     572                                                         << actionPool()->action(UIActionIndexST_M_Group_S_New),
     573                                       "opened", true);
     574    connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
     575            this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
     576    updateActionsAppearance();
     577
     578    /* Get first selected item: */
     579    UIVirtualMachineItem *pItem = currentItem();
     580
     581    /* For global item or local machine: */
     582    if (   !pItem
     583        || pItem->itemType() == UIVirtualMachineItemType_Local)
     584    {
     585        /* Use the "safe way" to open stack of Mac OS X Sheets: */
     586        QWidget *pWizardParent = windowManager().realParentWindow(this);
     587        UISafePointerWizardNewVM pWizard = new UIWizardNewVM(pWizardParent, m_pWidget->fullGroupName());
     588        windowManager().registerNewParent(pWizard, pWizardParent);
     589        pWizard->prepare();
     590
     591        /* Execute wizard: */
     592        pWizard->exec();
     593        delete pWizard;
     594    }
     595    /* For cloud machine: */
     596    else
     597    {
     598        /* Use the "safe way" to open stack of Mac OS X Sheets: */
     599        QWidget *pWizardParent = windowManager().realParentWindow(this);
     600        UISafePointerWizardNewCloudVM pWizard = new UIWizardNewCloudVM(pWizardParent);
     601        windowManager().registerNewParent(pWizard, pWizardParent);
     602        pWizard->prepare();
     603
     604        /* Execute wizard: */
     605        pWizard->exec();
     606        delete pWizard;
     607    }
     608}
     609
    566610void UIVirtualBoxManager::sltOpenAddMachineDialog()
    567611{
    … …  
    15121556
    15131557    /* 'Welcome' menu connections: */
     1558    connect(actionPool()->action(UIActionIndexST_M_Welcome_S_New), &UIAction::triggered,
     1559            this, &UIVirtualBoxManager::sltOpenNewMachineWizard);
    15141560    connect(actionPool()->action(UIActionIndexST_M_Welcome_S_Add), &UIAction::triggered,
    15151561            this, &UIVirtualBoxManager::sltOpenAddMachineDialog);
    15161562
    15171563    /* 'Group' menu connections: */
     1564    connect(actionPool()->action(UIActionIndexST_M_Group_S_New), &UIAction::triggered,
     1565            this, &UIVirtualBoxManager::sltOpenNewMachineWizard);
    15181566    connect(actionPool()->action(UIActionIndexST_M_Group_S_Add), &UIAction::triggered,
    15191567            this, &UIVirtualBoxManager::sltOpenAddMachineDialog);
    … …  
    15401588
    15411589    /* 'Machine' menu connections: */
     1590    connect(actionPool()->action(UIActionIndexST_M_Machine_S_New), &UIAction::triggered,
     1591            this, &UIVirtualBoxManager::sltOpenNewMachineWizard);
    15421592    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Add), &UIAction::triggered,
    15431593            this, &UIVirtualBoxManager::sltOpenAddMachineDialog);
    … …  
    18901940
    18911941    /* Enable/disable welcome actions: */
     1942    actionPool()->action(UIActionIndexST_M_Welcome_S_New)->setEnabled(isActionEnabled(UIActionIndexST_M_Welcome_S_New, items));
    18921943    actionPool()->action(UIActionIndexST_M_Welcome_S_Add)->setEnabled(isActionEnabled(UIActionIndexST_M_Welcome_S_Add, items));
    18931944
    … …  
    20552106        case UIActionIndexST_M_File_S_ImportAppliance:
    20562107        case UIActionIndexST_M_File_S_NewCloudVM:
     2108        case UIActionIndexST_M_Welcome_S_New:
    20572109        case UIActionIndexST_M_Welcome_S_Add:
    20582110            return true;

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

    r84461 r84463  
    185185    /** @name Machine menu stuff.
    186186      * @{ */
     187        /** Handles call to open new machine wizard. */
     188        void sltOpenNewMachineWizard();
    187189        /** Handles call to open add machine dialog. */
    188190        void sltOpenAddMachineDialog();

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

    r84461 r84463  
    104104{
    105105    return m_pPaneChooser->isAllItemsOfOneGroupSelected();
     106}
     107
     108QString UIVirtualBoxManagerWidget::fullGroupName() const
     109{
     110    return m_pPaneChooser->fullGroupName();
    106111}
    107112

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.h

    r84461 r84463  
    131131        /** Returns whether all items of one group are selected. */
    132132        bool isAllItemsOfOneGroupSelected() const;
     133
     134        /** Returns full name of currently selected group. */
     135        QString fullGroupName() const;
    133136
    134137        /** Returns whether group saving is in progress. */

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp

    r84461 r84463  
    9999    AssertPtrReturn(model(), false);
    100100    return model()->isAllItemsOfOneGroupSelected();
     101}
     102
     103QString UIChooser::fullGroupName() const
     104{
     105    AssertPtrReturn(model(), QString());
     106    return model()->fullGroupName();
    101107}
    102108

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.h

    r84461 r84463  
    119119        /** Returns whether all items of one group are selected. */
    120120        bool isAllItemsOfOneGroupSelected() const;
     121
     122        /** Returns full name of currently selected group. */
     123        QString fullGroupName() const;
    121124    /** @} */
    122125

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

    r84461 r84463  
    398398}
    399399
     400QString UIChooserModel::fullGroupName() const
     401{
     402    return isSingleGroupSelected() ? firstSelectedItem()->fullName() : firstSelectedItem()->parentItem()->fullName();
     403}
     404
    400405UIChooserItem *UIChooserModel::findClosestUnselectedItem() const
    401406{
    … …  
    912917}
    913918
    914 void UIChooserModel::sltCreateNewMachine()
    915 {
    916     /* Check if at least one of actions is enabled: */
    917     if (   !actionPool()->action(UIActionIndexST_M_Welcome_S_New)->isEnabled()
    918         && !actionPool()->action(UIActionIndexST_M_Machine_S_New)->isEnabled()
    919         && !actionPool()->action(UIActionIndexST_M_Group_S_New)->isEnabled())
    920         return;
    921 
    922     /* Lock the action preventing cascade calls: */
    923     actionPool()->action(UIActionIndexST_M_Welcome_S_New)->setEnabled(false);
    924     actionPool()->action(UIActionIndexST_M_Machine_S_New)->setEnabled(false);
    925     actionPool()->action(UIActionIndexST_M_Group_S_New)->setEnabled(false);
    926 
    927     /* What first item do we have? */
    928     if (  !firstSelectedMachineItem()
    929         ||firstSelectedMachineItem()->itemType() == UIVirtualMachineItemType_Local)
    930     {
    931         /* Select the parent: */
    932         UIChooserNode *pGroup = 0;
    933         if (isSingleGroupSelected())
    934             pGroup = firstSelectedItem()->node();
    935         else if (!selectedItems().isEmpty())
    936             pGroup = firstSelectedItem()->parentItem()->node();
    937         QString strGroupName;
    938         if (pGroup)
    939             strGroupName = pGroup->fullName();
    940 
    941         /* Use the "safe way" to open stack of Mac OS X Sheets: */
    942         QWidget *pWizardParent = windowManager().realParentWindow(chooser()->managerWidget());
    943         UISafePointerWizardNewVM pWizard = new UIWizardNewVM(pWizardParent, strGroupName);
    944         windowManager().registerNewParent(pWizard, pWizardParent);
    945         pWizard->prepare();
    946 
    947         /* Execute wizard: */
    948         pWizard->exec();
    949         delete pWizard;
    950     }
    951     else
    952     {
    953         /* Use the "safe way" to open stack of Mac OS X Sheets: */
    954         QWidget *pWizardParent = windowManager().realParentWindow(chooser()->managerWidget());
    955         UISafePointerWizardNewCloudVM pWizard = new UIWizardNewCloudVM(pWizardParent);
    956         windowManager().registerNewParent(pWizard, pWizardParent);
    957         pWizard->prepare();
    958 
    959         /* Execute wizard: */
    960         pWizard->exec();
    961         delete pWizard;
    962     }
    963 
    964     /* Unlock the action allowing further calls: */
    965     actionPool()->action(UIActionIndexST_M_Welcome_S_New)->setEnabled(true);
    966     actionPool()->action(UIActionIndexST_M_Machine_S_New)->setEnabled(true);
    967     actionPool()->action(UIActionIndexST_M_Group_S_New)->setEnabled(true);
    968 }
    969 
    970919void UIChooserModel::sltGroupSelectedMachines()
    971920{
    … …  
    13621311{
    13631312    /* Setup action connections: */
    1364     connect(actionPool()->action(UIActionIndexST_M_Welcome_S_New), &UIAction::triggered,
    1365             this, &UIChooserModel::sltCreateNewMachine);
    1366     connect(actionPool()->action(UIActionIndexST_M_Group_S_New), &UIAction::triggered,
    1367             this, &UIChooserModel::sltCreateNewMachine);
    1368     connect(actionPool()->action(UIActionIndexST_M_Machine_S_New), &UIAction::triggered,
    1369             this, &UIChooserModel::sltCreateNewMachine);
    13701313    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Remove), &UIAction::triggered,
    13711314            this, &UIChooserModel::sltRemoveSelectedMachine);

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

    r84461 r84463  
    175175        bool isAllItemsOfOneGroupSelected() const;
    176176
     177        /** Returns full name of currently selected group. */
     178        QString fullGroupName() const;
     179
    177180        /** Finds closest non-selected-item. */
    178181        UIChooserItem *findClosestUnselectedItem() const;
    … …  
    292295    /** @name Children stuff.
    293296      * @{ */
    294         /** Handles create new machine request. */
    295         void sltCreateNewMachine();
    296297        /** Handles group selected machines request. */
    297298        void sltGroupSelectedMachines();
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