Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 74869)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 74870)
@@ -924,8 +924,10 @@
case ToolTypeGlobal_VirtualMedia: strResult = "VirtualMedia"; break;
case ToolTypeGlobal_HostNetwork: strResult = "HostNetwork"; break;
+ case ToolTypeGlobal_CloudProfile: strResult = "CloudProfile"; break;
#else /* VBOX_GUI_WITH_NEW_MANAGER */
case ToolTypeGlobal_Welcome: strResult = "Welcome"; break;
case ToolTypeGlobal_Media: strResult = "Media"; break;
case ToolTypeGlobal_Network: strResult = "Network"; break;
+ case ToolTypeGlobal_Cloud: strResult = "Cloud"; break;
#endif /* VBOX_GUI_WITH_NEW_MANAGER */
default:
@@ -947,8 +949,10 @@
keys << "VirtualMedia"; values << ToolTypeGlobal_VirtualMedia;
keys << "HostNetwork"; values << ToolTypeGlobal_HostNetwork;
+ keys << "CloudProfile"; values << ToolTypeGlobal_CloudProfile;
#else /* VBOX_GUI_WITH_NEW_MANAGER */
keys << "Welcome"; values << ToolTypeGlobal_Welcome;
keys << "Media"; values << ToolTypeGlobal_Media;
keys << "Network"; values << ToolTypeGlobal_Network;
+ keys << "Cloud"; values << ToolTypeGlobal_Cloud;
#endif /* VBOX_GUI_WITH_NEW_MANAGER */
/* Invalid type for unknown words: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 74869)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 74870)
@@ -674,4 +674,5 @@
ToolTypeGlobal_VirtualMedia,
ToolTypeGlobal_HostNetwork,
+ ToolTypeGlobal_CloudProfile,
};
Q_DECLARE_METATYPE(ToolTypeGlobal);
@@ -696,4 +697,5 @@
UIToolsType_Media,
UIToolsType_Network,
+ UIToolsType_Cloud,
/* Machine types: */
UIToolsType_Details,
@@ -710,4 +712,5 @@
ToolTypeGlobal_Media,
ToolTypeGlobal_Network,
+ ToolTypeGlobal_Cloud,
};
Q_DECLARE_METATYPE(ToolTypeGlobal);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.cpp (revision 74869)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.cpp (revision 74870)
@@ -29,4 +29,5 @@
/* GUI includes */
# include "UIActionPoolSelector.h"
+# include "UICloudProfileManager.h"
# include "UIHostNetworkManager.h"
# include "UIMediumManager.h"
@@ -47,4 +48,5 @@
, m_pPaneMedia(0)
, m_pPaneNetwork(0)
+ , m_pPaneCloud(0)
{
/* Prepare: */
@@ -144,4 +146,24 @@
m_pLayout->addWidget(m_pPaneNetwork);
m_pLayout->setCurrentWidget(m_pPaneNetwork);
+ }
+ break;
+ }
+ case ToolTypeGlobal_Cloud:
+ {
+ /* Create Cloud Profile Manager: */
+ m_pPaneCloud = new UICloudProfileManagerWidget(EmbedTo_Stack, m_pActionPool, false /* show toolbar */);
+ AssertPtrReturnVoid(m_pPaneCloud);
+ {
+#ifndef VBOX_WS_MAC
+ const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
+ m_pPaneCloud->setContentsMargins(iMargin, 0, iMargin, 0);
+#endif
+
+ /* Configure pane: */
+ m_pPaneCloud->setProperty("ToolType", QVariant::fromValue(ToolTypeGlobal_Cloud));
+
+ /* Add into layout: */
+ m_pLayout->addWidget(m_pPaneCloud);
+ m_pLayout->setCurrentWidget(m_pPaneCloud);
}
break;
@@ -170,4 +192,5 @@
case ToolTypeGlobal_Media: m_pPaneMedia = 0; break;
case ToolTypeGlobal_Network: m_pPaneNetwork = 0; break;
+ case ToolTypeGlobal_Cloud: m_pPaneCloud = 0; break;
default: break;
}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.h (revision 74869)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.h (revision 74870)
@@ -30,8 +30,9 @@
class QVBoxLayout;
class UIActionPool;
-class UIWelcomePane;
+class UICloudProfileManagerWidget;
class UIHostNetworkManagerWidget;
class UIMediumManagerWidget;
class UIVirtualMachineItem;
+class UIWelcomePane;
class CMachine;
@@ -71,11 +72,13 @@
/** Holds the stacked-layout instance. */
- QStackedLayout *m_pLayout;
+ QStackedLayout *m_pLayout;
/** Holds the Welcome pane instance. */
- UIWelcomePane *m_pPaneWelcome;
+ UIWelcomePane *m_pPaneWelcome;
/** Holds the Virtual Media Manager instance. */
- UIMediumManagerWidget *m_pPaneMedia;
+ UIMediumManagerWidget *m_pPaneMedia;
/** Holds the Host Network Manager instance. */
- UIHostNetworkManagerWidget *m_pPaneNetwork;
+ UIHostNetworkManagerWidget *m_pPaneNetwork;
+ /** Holds the Cloud Profile Manager instance. */
+ UICloudProfileManagerWidget *m_pPaneCloud;
};
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolbarTools.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolbarTools.cpp (revision 74869)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolbarTools.cpp (revision 74870)
@@ -232,4 +232,6 @@
connect(m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_CloudProfileManager), &UIAction::triggered,
this, &UIToolbarTools::sltHandleOpenToolGlobal);
+ m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_CloudProfileManager)
+ ->setProperty("ToolTypeGlobal", QVariant::fromValue(ToolTypeGlobal_Cloud));
}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp (revision 74869)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp (revision 74870)
@@ -450,4 +450,11 @@
void UIVirtualBoxManager::sltOpenCloudProfileManagerWindow()
{
+ /* First check if instance of widget opened the embedded way: */
+ if (m_pWidget->isToolOpened(ToolTypeGlobal_Cloud))
+ {
+ m_pWidget->switchToTool(ToolTypeGlobal_Cloud);
+ return;
+ }
+
/* Create instance if not yet created: */
if (!m_pManagerCloudProfile)
@@ -1278,6 +1285,6 @@
/* Prepare 'Cloud' menu: */
- //prepareMenuCloud(actionPool()->action(UIActionIndexST_M_Cloud)->menu());
- //m_pCloudProfileManagerMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndexST_M_Cloud)->menu());
+ prepareMenuCloud(actionPool()->action(UIActionIndexST_M_Cloud)->menu());
+ m_pCloudProfileManagerMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndexST_M_Cloud)->menu());
#ifdef VBOX_WS_MAC
@@ -2066,4 +2073,8 @@
m_pHostNetworkManagerMenuAction->setVisible(fNetworkMenuShown);
+ /* Determine whether Cloud menu should be visible: */
+ const bool fCloudMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == ToolTypeGlobal_Cloud;
+ m_pCloudProfileManagerMenuAction->setVisible(fCloudMenuShown);
+
/* Determine whether Snapshots menu should be visible: */
const bool fSnapshotMenuShown = (fMachineMenuShown || fGroupMenuShown) &&
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp (revision 74869)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp (revision 74870)
@@ -340,4 +340,5 @@
case UIToolsType_Media: enmType = ToolTypeGlobal_Media; break;
case UIToolsType_Network: enmType = ToolTypeGlobal_Network; break;
+ case UIToolsType_Cloud: enmType = ToolTypeGlobal_Cloud; break;
default: break;
}
@@ -637,4 +638,12 @@
break;
}
+ case ToolTypeGlobal_Cloud:
+ {
+ m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Create));
+ m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Remove));
+ m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_T_Details));
+ //m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Refresh));
+ break;
+ }
default:
break;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp (revision 74869)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp (revision 74870)
@@ -432,4 +432,5 @@
classes << UIToolsClass_Global;
classes << UIToolsClass_Global;
+ //classes << UIToolsClass_Global;
classes << UIToolsClass_Machine;
classes << UIToolsClass_Machine;
@@ -441,4 +442,5 @@
types << UIToolsType_Media;
types << UIToolsType_Network;
+ //types << UIToolsType_Cloud;
types << UIToolsType_Details;
types << UIToolsType_Snapshots;
@@ -450,4 +452,5 @@
icons << UIIconPool::iconSet(":/media_manager_24px.png");
icons << UIIconPool::iconSet(":/host_iface_manager_24px.png");
+ //icons << UIIconPool::iconSet(":/host_iface_manager_24px.png");
icons << UIIconPool::iconSet(":/machine_details_manager_24px.png");
icons << UIIconPool::iconSet(":/snapshot_manager_24px.png");
@@ -459,4 +462,5 @@
names << tr("Media");
names << tr("Network");
+ //names << tr("Cloud");
names << tr("Details");
names << tr("Snapshots");
@@ -581,4 +585,5 @@
values[UIToolsType_Media] = "Media";
values[UIToolsType_Network] = "Network";
+ values[UIToolsType_Cloud] = "Cloud";
/* Machine classes: */
values[UIToolsType_Details] = "Details";
@@ -597,4 +602,5 @@
values["Media"] = UIToolsType_Media;
values["Network"] = UIToolsType_Network;
+ values["Cloud"] = UIToolsType_Cloud;
/* Machine classes: */
values["Details"] = UIToolsType_Details;
@@ -617,4 +623,5 @@
case UIToolsType_Media:
case UIToolsType_Network:
+ case UIToolsType_Cloud:
return true;
default:
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 74869)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 74870)
@@ -506,4 +506,11 @@
void UISelectorWindow::sltOpenCloudProfileManagerWindow()
{
+ /* First check if instance of widget opened embedded: */
+ if (m_pPaneToolsGlobal->isToolOpened(ToolTypeGlobal_CloudProfile))
+ {
+ sltHandleToolOpenedGlobal(ToolTypeGlobal_CloudProfile);
+ return;
+ }
+
/* Create instance if not yet created: */
if (!m_pManagerCloudProfile)
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.cpp (revision 74869)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.cpp (revision 74870)
@@ -213,4 +213,8 @@
"and observe their properties. Allows to edit various "
"attributes for host-only interface and corresponding DHCP server."));
+ QAction *pAction3 = m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_CloudProfileManager);
+ m_pPaneDesktop->addToolDescription(pAction3,
+ QString("Tool to control cloud profiles. "
+ "To be explained more if necessary."));
}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsToolbar.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsToolbar.cpp (revision 74869)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsToolbar.cpp (revision 74870)
@@ -256,4 +256,6 @@
connect(m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_CloudProfileManager), &UIAction::triggered,
this, &UIToolsToolbar::sltHandleOpenToolGlobal);
+ m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_S_CloudProfileManager)
+ ->setProperty("ToolTypeGlobal", QVariant::fromValue(ToolTypeGlobal_CloudProfile));
}