VirtualBox

Changeset 74870 in vbox


Ignore:
Timestamp:
Oct 16, 2018 4:59:07 PM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
125848
Message:

FE/Qt: bugref:9230: Integrating Cloud tool (hidden for now).

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

    r74740 r74870  
    924924        case ToolTypeGlobal_VirtualMedia: strResult = "VirtualMedia"; break;
    925925        case ToolTypeGlobal_HostNetwork:  strResult = "HostNetwork"; break;
     926        case ToolTypeGlobal_CloudProfile: strResult = "CloudProfile"; break;
    926927#else /* VBOX_GUI_WITH_NEW_MANAGER */
    927928        case ToolTypeGlobal_Welcome: strResult = "Welcome"; break;
    928929        case ToolTypeGlobal_Media:   strResult = "Media"; break;
    929930        case ToolTypeGlobal_Network: strResult = "Network"; break;
     931        case ToolTypeGlobal_Cloud:   strResult = "Cloud"; break;
    930932#endif /* VBOX_GUI_WITH_NEW_MANAGER */
    931933        default:
    … …  
    947949    keys << "VirtualMedia"; values << ToolTypeGlobal_VirtualMedia;
    948950    keys << "HostNetwork";  values << ToolTypeGlobal_HostNetwork;
     951    keys << "CloudProfile"; values << ToolTypeGlobal_CloudProfile;
    949952#else /* VBOX_GUI_WITH_NEW_MANAGER */
    950953    keys << "Welcome"; values << ToolTypeGlobal_Welcome;
    951954    keys << "Media";   values << ToolTypeGlobal_Media;
    952955    keys << "Network"; values << ToolTypeGlobal_Network;
     956    keys << "Cloud";   values << ToolTypeGlobal_Cloud;
    953957#endif /* VBOX_GUI_WITH_NEW_MANAGER */
    954958    /* Invalid type for unknown words: */

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

    r74556 r74870  
    674674    ToolTypeGlobal_VirtualMedia,
    675675    ToolTypeGlobal_HostNetwork,
     676    ToolTypeGlobal_CloudProfile,
    676677};
    677678Q_DECLARE_METATYPE(ToolTypeGlobal);
    … …  
    696697    UIToolsType_Media,
    697698    UIToolsType_Network,
     699    UIToolsType_Cloud,
    698700    /* Machine types: */
    699701    UIToolsType_Details,
    … …  
    710712    ToolTypeGlobal_Media,
    711713    ToolTypeGlobal_Network,
     714    ToolTypeGlobal_Cloud,
    712715};
    713716Q_DECLARE_METATYPE(ToolTypeGlobal);

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

    r74578 r74870  
    2929/* GUI includes */
    3030# include "UIActionPoolSelector.h"
     31# include "UICloudProfileManager.h"
    3132# include "UIHostNetworkManager.h"
    3233# include "UIMediumManager.h"
    … …  
    4748    , m_pPaneMedia(0)
    4849    , m_pPaneNetwork(0)
     50    , m_pPaneCloud(0)
    4951{
    5052    /* Prepare: */
    … …  
    144146                    m_pLayout->addWidget(m_pPaneNetwork);
    145147                    m_pLayout->setCurrentWidget(m_pPaneNetwork);
     148                }
     149                break;
     150            }
     151            case ToolTypeGlobal_Cloud:
     152            {
     153                /* Create Cloud Profile Manager: */
     154                m_pPaneCloud = new UICloudProfileManagerWidget(EmbedTo_Stack, m_pActionPool, false /* show toolbar */);
     155                AssertPtrReturnVoid(m_pPaneCloud);
     156                {
     157#ifndef VBOX_WS_MAC
     158                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
     159                    m_pPaneCloud->setContentsMargins(iMargin, 0, iMargin, 0);
     160#endif
     161
     162                    /* Configure pane: */
     163                    m_pPaneCloud->setProperty("ToolType", QVariant::fromValue(ToolTypeGlobal_Cloud));
     164
     165                    /* Add into layout: */
     166                    m_pLayout->addWidget(m_pPaneCloud);
     167                    m_pLayout->setCurrentWidget(m_pPaneCloud);
    146168                }
    147169                break;
    … …  
    170192            case ToolTypeGlobal_Media:   m_pPaneMedia = 0; break;
    171193            case ToolTypeGlobal_Network: m_pPaneNetwork = 0; break;
     194            case ToolTypeGlobal_Cloud:   m_pPaneCloud = 0; break;
    172195            default: break;
    173196        }

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

    r74561 r74870  
    3030class QVBoxLayout;
    3131class UIActionPool;
    32 class UIWelcomePane;
     32class UICloudProfileManagerWidget;
    3333class UIHostNetworkManagerWidget;
    3434class UIMediumManagerWidget;
    3535class UIVirtualMachineItem;
     36class UIWelcomePane;
    3637class CMachine;
    3738
    … …  
    7172
    7273    /** Holds the stacked-layout instance. */
    73     QStackedLayout             *m_pLayout;
     74    QStackedLayout              *m_pLayout;
    7475    /** Holds the Welcome pane instance. */
    75     UIWelcomePane              *m_pPaneWelcome;
     76    UIWelcomePane               *m_pPaneWelcome;
    7677    /** Holds the Virtual Media Manager instance. */
    77     UIMediumManagerWidget      *m_pPaneMedia;
     78    UIMediumManagerWidget       *m_pPaneMedia;
    7879    /** Holds the Host Network Manager instance. */
    79     UIHostNetworkManagerWidget *m_pPaneNetwork;
     80    UIHostNetworkManagerWidget  *m_pPaneNetwork;
     81    /** Holds the Cloud Profile Manager instance. */
     82    UICloudProfileManagerWidget *m_pPaneCloud;
    8083};
    8184

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

    r74868 r74870  
    232232        connect(m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_CloudProfileManager), &UIAction::triggered,
    233233                this, &UIToolbarTools::sltHandleOpenToolGlobal);
     234        m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_CloudProfileManager)
     235            ->setProperty("ToolTypeGlobal", QVariant::fromValue(ToolTypeGlobal_Cloud));
    234236    }
    235237

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

    r74868 r74870  
    450450void UIVirtualBoxManager::sltOpenCloudProfileManagerWindow()
    451451{
     452    /* First check if instance of widget opened the embedded way: */
     453    if (m_pWidget->isToolOpened(ToolTypeGlobal_Cloud))
     454    {
     455        m_pWidget->switchToTool(ToolTypeGlobal_Cloud);
     456        return;
     457    }
     458
    452459    /* Create instance if not yet created: */
    453460    if (!m_pManagerCloudProfile)
    … …  
    12781285
    12791286    /* Prepare 'Cloud' menu: */
    1280     //prepareMenuCloud(actionPool()->action(UIActionIndexST_M_Cloud)->menu());
    1281     //m_pCloudProfileManagerMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndexST_M_Cloud)->menu());
     1287    prepareMenuCloud(actionPool()->action(UIActionIndexST_M_Cloud)->menu());
     1288    m_pCloudProfileManagerMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndexST_M_Cloud)->menu());
    12821289
    12831290#ifdef VBOX_WS_MAC
    … …  
    20662073    m_pHostNetworkManagerMenuAction->setVisible(fNetworkMenuShown);
    20672074
     2075    /* Determine whether Cloud menu should be visible: */
     2076    const bool fCloudMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == ToolTypeGlobal_Cloud;
     2077    m_pCloudProfileManagerMenuAction->setVisible(fCloudMenuShown);
     2078
    20682079    /* Determine whether Snapshots menu should be visible: */
    20692080    const bool fSnapshotMenuShown = (fMachineMenuShown || fGroupMenuShown) &&

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

    r74827 r74870  
    340340                    case UIToolsType_Media:   enmType = ToolTypeGlobal_Media; break;
    341341                    case UIToolsType_Network: enmType = ToolTypeGlobal_Network; break;
     342                    case UIToolsType_Cloud:   enmType = ToolTypeGlobal_Cloud; break;
    342343                    default: break;
    343344                }
    … …  
    637638                    break;
    638639                }
     640                case ToolTypeGlobal_Cloud:
     641                {
     642                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Create));
     643                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Remove));
     644                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_T_Details));
     645                    //m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Refresh));
     646                    break;
     647                }
    639648                default:
    640649                    break;

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

    r74830 r74870  
    432432    classes << UIToolsClass_Global;
    433433    classes << UIToolsClass_Global;
     434    //classes << UIToolsClass_Global;
    434435    classes << UIToolsClass_Machine;
    435436    classes << UIToolsClass_Machine;
    … …  
    441442    types << UIToolsType_Media;
    442443    types << UIToolsType_Network;
     444    //types << UIToolsType_Cloud;
    443445    types << UIToolsType_Details;
    444446    types << UIToolsType_Snapshots;
    … …  
    450452    icons << UIIconPool::iconSet(":/media_manager_24px.png");
    451453    icons << UIIconPool::iconSet(":/host_iface_manager_24px.png");
     454    //icons << UIIconPool::iconSet(":/host_iface_manager_24px.png");
    452455    icons << UIIconPool::iconSet(":/machine_details_manager_24px.png");
    453456    icons << UIIconPool::iconSet(":/snapshot_manager_24px.png");
    … …  
    459462    names << tr("Media");
    460463    names << tr("Network");
     464    //names << tr("Cloud");
    461465    names << tr("Details");
    462466    names << tr("Snapshots");
    … …  
    581585    values[UIToolsType_Media]     = "Media";
    582586    values[UIToolsType_Network]   = "Network";
     587    values[UIToolsType_Cloud]     = "Cloud";
    583588    /* Machine classes: */
    584589    values[UIToolsType_Details]   = "Details";
    … …  
    597602    values["Media"]     = UIToolsType_Media;
    598603    values["Network"]   = UIToolsType_Network;
     604    values["Cloud"]     = UIToolsType_Cloud;
    599605    /* Machine classes: */
    600606    values["Details"]   = UIToolsType_Details;
    … …  
    617623                case UIToolsType_Media:
    618624                case UIToolsType_Network:
     625                case UIToolsType_Cloud:
    619626                    return true;
    620627                default:

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

    r74868 r74870  
    506506void UISelectorWindow::sltOpenCloudProfileManagerWindow()
    507507{
     508    /* First check if instance of widget opened embedded: */
     509    if (m_pPaneToolsGlobal->isToolOpened(ToolTypeGlobal_CloudProfile))
     510    {
     511        sltHandleToolOpenedGlobal(ToolTypeGlobal_CloudProfile);
     512        return;
     513    }
     514
    508515    /* Create instance if not yet created: */
    509516    if (!m_pManagerCloudProfile)

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

    r73735 r74870  
    213213                                          "and observe their properties. Allows to <u>edit</u> various "
    214214                                          "<u>attributes</u> for host-only interface and corresponding DHCP server."));
     215    QAction *pAction3 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_CloudProfileManager);
     216    m_pPaneDesktop->addToolDescription(pAction3,
     217                                       QString("Tool to control cloud profiles. "
     218                                               "To be explained more if necessary."));
    215219}
    216220

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

    r74868 r74870  
    256256        connect(m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_CloudProfileManager), &UIAction::triggered,
    257257                this, &UIToolsToolbar::sltHandleOpenToolGlobal);
     258        m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_CloudProfileManager)
     259            ->setProperty("ToolTypeGlobal", QVariant::fromValue(ToolTypeGlobal_CloudProfile));
    258260    }
    259261
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