Changeset 85389 in vbox

Timestamp:

Jul 20, 2020 12:42:14 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9722: Cloud Console Manager: Initial implementation; A dialog which allows to configure external terminal applications and profiles.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (4 diffs)
• src/cloud/consolemanager (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager )
• src/cloud/consolemanager/UICloudConsoleDetailsWidget.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileDetailsWidget.cpp ) (14 diffs)
• src/cloud/consolemanager/UICloudConsoleDetailsWidget.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileDetailsWidget.h ) (10 diffs)
• src/cloud/consolemanager/UICloudConsoleManager.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.cpp ) (28 diffs)
• src/cloud/consolemanager/UICloudConsoleManager.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.h ) (13 diffs)
• src/cloud/consolemanager/UICloudProfileDetailsWidget.cpp (deleted)
• src/cloud/consolemanager/UICloudProfileDetailsWidget.h (deleted)
• src/cloud/consolemanager/UICloudProfileManager.cpp (deleted)
• src/cloud/consolemanager/UICloudProfileManager.h (deleted)
• src/extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• src/extradata/UIExtraDataDefs.h (modified) (1 diff)
• src/extradata/UIExtraDataManager.cpp (modified) (4 diffs)
• src/extradata/UIExtraDataManager.h (modified) (2 diffs)
• src/globals/UIActionPoolManager.cpp (modified) (4 diffs)
• src/globals/UIActionPoolManager.h (modified) (2 diffs)
• src/globals/UIMessageCenter.cpp (modified) (1 diff)
• src/globals/UIMessageCenter.h (modified) (1 diff)

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

@@ -257 +257 @@
 VBOX_GUI_INC_DIRS = \
         ./src \
+        ./src/cloud/consolemanager \
         ./src/cloud/machinesettings \
         ./src/cloud/profilemanager \
@@ -568 +569 @@
 #
 VirtualBox_QT_MOCHDRS = \
+        src/cloud/consolemanager/UICloudConsoleDetailsWidget.h \
+        src/cloud/consolemanager/UICloudConsoleManager.h \
         src/cloud/machinesettings/UICloudMachineSettingsDialog.h \
         src/cloud/machinesettings/UICloudMachineSettingsDialogPage.h \
@@ -924 +927 @@
 #
 VirtualBox_QT_MOCSRCS = \
+        src/cloud/consolemanager/UICloudConsoleManager.cpp \
         src/cloud/profilemanager/UICloudProfileManager.cpp \
         src/hostnetwork/UIHostNetworkManager.cpp \
@@ -1030 +1034 @@
 VirtualBox_SOURCES = \
         src/main.cpp \
+        src/cloud/consolemanager/UICloudConsoleDetailsWidget.cpp \
+        src/cloud/consolemanager/UICloudConsoleManager.cpp \
         src/cloud/machinesettings/UICloudMachineSettingsDialog.cpp \
         src/cloud/machinesettings/UICloudMachineSettingsDialogPage.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/cloud/consolemanager/UICloudConsoleDetailsWidget.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UICloudProfileDetailsWidget class implementation.
+ * VBox Qt GUI - UICloudConsoleDetailsWidget class implementation.
  */
 
@@ -18 +18 @@
 /* Qt includes: */
 #include <QGridLayout>
-#include <QHeaderView>
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
-#include <QTableWidget>
+#include <QStackedLayout>
+#include <QStyle>
 #include <QVBoxLayout>
 
 /* GUI includes: */
 #include "QIDialogButtonBox.h"
-#include "UICloudProfileDetailsWidget.h"
+#include "UICloudConsoleDetailsWidget.h"
 
 /* Other VBox includes: */
@@ -33 +33 @@
 
 
-UICloudProfileDetailsWidget::UICloudProfileDetailsWidget(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */)
+UICloudConsoleDetailsWidget::UICloudConsoleDetailsWidget(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_enmEmbedding(enmEmbedding)
-    , m_pLabelName(0)
-    , m_pEditorName(0)
-    , m_pLabelTableWidget(0)
-    , m_pTableWidget(0)
+    , m_pStackedLayout(0)
+    , m_pLabelApplicationName(0)
+    , m_pEditorApplicationName(0)
+    , m_pLabelApplicationPath(0)
+    , m_pEditorApplicationPath(0)
+    , m_pLabelProfileName(0)
+    , m_pEditorProfileName(0)
+    , m_pLabelProfileArgument(0)
+    , m_pEditorProfileArgument(0)
     , m_pButtonBox(0)
 {
@@ -45 +50 @@
 }
 
-void UICloudProfileDetailsWidget::setData(const UIDataCloudProfile &data)
-{
+void UICloudConsoleDetailsWidget::setApplicationData(const UIDataCloudConsoleApplication &data)
+{
+    /* Clear all data first: */
+    clearData();
+
     /* Cache old/new data: */
-    m_oldData = data;
-    m_newData = m_oldData;
+    m_oldApplicationData = data;
+    m_newApplicationData = m_oldApplicationData;
+
+    /* Switch to proper stack: */
+    m_pStackedLayout->setCurrentIndex(0);
 
     /* Load data: */
@@ -59 +70 @@
 }
 
-void UICloudProfileDetailsWidget::retranslateUi()
-{
-    /// @todo add description tool-tips
-
-    /* Translate name-editor label: */
-    m_pLabelName->setText(tr("Name:"));
+void UICloudConsoleDetailsWidget::setProfileData(const UIDataCloudConsoleProfile &data)
+{
+    /* Clear all data first: */
+    clearData();
+
+    /* Cache old/new data: */
+    m_oldProfileData = data;
+    m_newProfileData = m_oldProfileData;
+
+    /* Switch to proper stack: */
+    m_pStackedLayout->setCurrentIndex(1);
+
+    /* Load data: */
+    loadData();
+
+    /* Translate linked widgets: */
+    retranslateEditor();
+    retranslateButtons();
+}
+
+void UICloudConsoleDetailsWidget::clearData()
+{
+    /* Clear widgets: */
+    m_pEditorApplicationName->setText(QString());
+    m_pEditorApplicationPath->setText(QString());
+    m_pEditorProfileName->setText(QString());
+    m_pEditorProfileArgument->setText(QString());
+
+    /* Clear data: */
+    m_oldApplicationData = UIDataCloudConsoleApplication();
+    m_newApplicationData = m_oldApplicationData;
+    m_oldProfileData = UIDataCloudConsoleProfile();
+    m_newProfileData = m_oldProfileData;
+}
+
+void UICloudConsoleDetailsWidget::retranslateUi()
+{
+    /* Translate name-editor labels: */
+    m_pLabelApplicationName->setText(tr("Name:"));
+    m_pLabelApplicationPath->setText(tr("Path:"));
+    m_pLabelProfileName->setText(tr("Name:"));
+    m_pLabelProfileArgument->setText(tr("Argument:"));
     /* Translate name-editor: */
     retranslateEditor();
 
-    /* Translate table-widget label: */
-    m_pLabelTableWidget->setText(tr("Properties:"));
-    /* Translate table-widget: */
-    m_pTableWidget->setToolTip(tr("Contains cloud profile settings"));
-
     /* Translate buttons: */
     retranslateButtons();
@@ -78 +120 @@
     /* Retranslate validation: */
     retranslateValidation();
-
-    /* Update table tool-tips: */
-    updateTableToolTips();
-}
-
-void UICloudProfileDetailsWidget::retranslateEditor()
+}
+
+void UICloudConsoleDetailsWidget::retranslateEditor()
 {
     /* Translate placeholders: */
-    m_pEditorName->setPlaceholderText(  m_oldData.m_strName.isNull()
-                                      ? tr("Enter a name for the new profile...")
-                                      : tr("Enter a name for this profile..."));
-}
-
-void UICloudProfileDetailsWidget::retranslateButtons()
+    m_pEditorApplicationName->setPlaceholderText(tr("Enter a name for this console application..."));
+    m_pEditorApplicationPath->setPlaceholderText(tr("Enter a path for this console application..."));
+    m_pEditorProfileName->setPlaceholderText(tr("Enter a name for this console profile..."));
+    m_pEditorProfileArgument->setPlaceholderText(tr("Enter an argument for this console profile..."));
+}
+
+void UICloudConsoleDetailsWidget::retranslateButtons()
 {
     /* Translate button-box: */
@@ -98 +138 @@
         /* Common: 'Reset' button: */
         m_pButtonBox->button(QDialogButtonBox::Cancel)->setText(tr("Reset"));
-        m_pButtonBox->button(QDialogButtonBox::Cancel)->setStatusTip(tr("Reset changes in current profile details"));
+        m_pButtonBox->button(QDialogButtonBox::Cancel)->setStatusTip(tr("Reset changes in current console details"));
         m_pButtonBox->button(QDialogButtonBox::Cancel)->setShortcut(Qt::Key_Escape);
         m_pButtonBox->button(QDialogButtonBox::Cancel)->
             setToolTip(tr("Reset Changes (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Cancel)->shortcut().toString()));
 
-        if (m_oldData.m_strName.isNull())
-        {
-            /* Provider: 'Add' button: */
-            m_pButtonBox->button(QDialogButtonBox::Ok)->setText(tr("Add"));
-            m_pButtonBox->button(QDialogButtonBox::Ok)->setStatusTip(tr("Add a new profile with following name"));
-            m_pButtonBox->button(QDialogButtonBox::Ok)->setShortcut(QString("Ctrl+Return"));
-            m_pButtonBox->button(QDialogButtonBox::Ok)->
-                setToolTip(tr("Add Profile (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Ok)->shortcut().toString()));
-        }
-        else
-        {
-            /* Profile: 'Apply' button: */
-            m_pButtonBox->button(QDialogButtonBox::Ok)->setText(tr("Apply"));
-            m_pButtonBox->button(QDialogButtonBox::Ok)->setStatusTip(tr("Apply changes in current profile details"));
-            m_pButtonBox->button(QDialogButtonBox::Ok)->setShortcut(QString("Ctrl+Return"));
-            m_pButtonBox->button(QDialogButtonBox::Ok)->
-                setToolTip(tr("Apply Changes (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Ok)->shortcut().toString()));
-        }
-    }
-}
-
-void UICloudProfileDetailsWidget::sltNameChanged(const QString &strName)
+        /* Common: 'Apply' button: */
+        m_pButtonBox->button(QDialogButtonBox::Ok)->setText(tr("Apply"));
+        m_pButtonBox->button(QDialogButtonBox::Ok)->setStatusTip(tr("Apply changes in current console details"));
+        m_pButtonBox->button(QDialogButtonBox::Ok)->setShortcut(QString("Ctrl+Return"));
+        m_pButtonBox->button(QDialogButtonBox::Ok)->
+            setToolTip(tr("Apply Changes (%1)").arg(m_pButtonBox->button(QDialogButtonBox::Ok)->shortcut().toString()));
+    }
+}
+
+void UICloudConsoleDetailsWidget::sltApplicationNameChanged(const QString &strName)
 {
     /* Push changes back: */
-    m_newData.m_strName = strName;
+    m_newApplicationData.m_strName = strName;
 
     /* Revalidate: */
-    revalidate(m_pEditorName);
+    revalidate(m_pEditorApplicationName);
     /* Update button states: */
     updateButtonStates();
 }
 
-void UICloudProfileDetailsWidget::sltTableChanged(QTableWidgetItem *pItem)
-{
-    /* Make sure item is valid: */
-    AssertPtrReturnVoid(pItem);
-    const int iRow = pItem->row();
-    AssertReturnVoid(iRow >= 0);
-
-    /* Skip if one of items isn't yet created.
-     * This can happen when 1st is already while 2nd isn't yet. */
-    QTableWidgetItem *pItemK = m_pTableWidget->item(iRow, 0);
-    QTableWidgetItem *pItemV = m_pTableWidget->item(iRow, 1);
-    if (!pItemK || !pItemV)
-        return;
-
+void UICloudConsoleDetailsWidget::sltApplicationPathChanged(const QString &strPath)
+{
     /* Push changes back: */
-    const QString strKey = pItemK->text();
-    const QString strValue = pItemV->text();
-    m_newData.m_data[strKey] = qMakePair(strValue, m_newData.m_data.value(strKey).second);
+    m_newApplicationData.m_strPath = strPath;
 
     /* Revalidate: */
-    revalidate(m_pTableWidget);
+    revalidate(m_pEditorApplicationPath);
     /* Update button states: */
     updateButtonStates();
 }
 
-void UICloudProfileDetailsWidget::sltHandleButtonBoxClick(QAbstractButton *pButton)
+void UICloudConsoleDetailsWidget::sltProfileNameChanged(const QString &strName)
+{
+    /* Push changes back: */
+    m_newProfileData.m_strName = strName;
+
+    /* Revalidate: */
+    revalidate(m_pEditorProfileName);
+    /* Update button states: */
+    updateButtonStates();
+}
+
+void UICloudConsoleDetailsWidget::sltProfileArgumentChanged(const QString &strArgument)
+{
+    /* Push changes back: */
+    m_newProfileData.m_strArgument = strArgument;
+
+    /* Revalidate: */
+    revalidate(m_pEditorProfileArgument);
+    /* Update button states: */
+    updateButtonStates();
+}
+
+void UICloudConsoleDetailsWidget::sltHandleButtonBoxClick(QAbstractButton *pButton)
 {
     /* Make sure button-box exists: */
@@ -177 +213 @@
 }
 
-void UICloudProfileDetailsWidget::prepare()
+void UICloudConsoleDetailsWidget::prepare()
 {
     /* Prepare widgets: */
@@ -189 +225 @@
 }
 
-void UICloudProfileDetailsWidget::prepareWidgets()
-{
-    /* Create layout: */
-    QGridLayout *pLayout = new QGridLayout(this);
-    if (pLayout)
-    {
-        if (m_enmEmbedding == EmbedTo_Dialog)
+void UICloudConsoleDetailsWidget::prepareWidgets()
+{
+    /* Create main layout: */
+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+    if (pMainLayout)
+    {
+        pMainLayout->setContentsMargins(0, 0, 0, 0);
+
+        /* Create stacked layout: */
+        m_pStackedLayout = new QStackedLayout;
+        if (m_pStackedLayout)
         {
-            pLayout->setContentsMargins(0, 0, 0, 0);
+            /* Create application widget: */
+            QWidget *pWidgetApplication = new QWidget;
+            if (pWidgetApplication)
+            {
+                /* Create application layout: */
+                QGridLayout *pLayoutApplication = new QGridLayout(pWidgetApplication);
+                if (pLayoutApplication)
+                {
+                    pLayoutApplication->setContentsMargins(0, 0, 0, 0);
+                    pLayoutApplication->setRowStretch(2, 1);
+
+                    if (m_enmEmbedding == EmbedTo_Dialog)
+                    {
+                        pLayoutApplication->setContentsMargins(0, 0, 0, 0);
 #ifdef VBOX_WS_MAC
-            pLayout->setSpacing(10);
+                        pLayoutApplication->setSpacing(10);
 #else
-            pLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
+                        pLayoutApplication->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
 #endif
-        }
-        else
-        {
+                    }
+                    else
+                    {
 #ifdef VBOX_WS_MAC
-            pLayout->setContentsMargins(13, 0, 13, 13);
-            pLayout->setSpacing(10);
+                        pLayoutApplication->setContentsMargins(13, 0, 13, 13);
+                        pLayoutApplication->setSpacing(10);
 #else
-            const int iL = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) * 1.5;
-            const int iT = qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin) * 1.5;
-            const int iR = qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin) * 1.5;
-            const int iB = qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) * 1.5;
-            pLayout->setContentsMargins(iL, iT, iR, iB);
+                        const int iL = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) * 1.5;
+                        const int iT = qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin) * 1.5;
+                        const int iR = qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin) * 1.5;
+                        const int iB = qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) * 1.5;
+                        pLayoutApplication->setContentsMargins(iL, iT, iR, iB);
 #endif
-        }
-
-        /* Create name editor: */
-        m_pEditorName = new QLineEdit;
-        if (m_pEditorName)
-        {
-            connect(m_pEditorName, &QLineEdit::textChanged, this, &UICloudProfileDetailsWidget::sltNameChanged);
+                    }
+
+                    /* Create name editor: */
+                    m_pEditorApplicationName = new QLineEdit(pWidgetApplication);
+                    if (m_pEditorApplicationName)
+                    {
+                        connect(m_pEditorApplicationName, &QLineEdit::textChanged,
+                                this, &UICloudConsoleDetailsWidget::sltApplicationNameChanged);
+
+                        /* Add into layout: */
+                        pLayoutApplication->addWidget(m_pEditorApplicationName, 0, 1);
+                    }
+                    /* Create name label: */
+                    m_pLabelApplicationName = new QLabel(pWidgetApplication);
+                    if (m_pLabelApplicationName)
+                    {
+                        m_pLabelApplicationName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                        m_pLabelApplicationName->setBuddy(m_pEditorApplicationName);
+
+                        /* Add into layout: */
+                        pLayoutApplication->addWidget(m_pLabelApplicationName, 0, 0);
+                    }
+
+                    /* Create path editor: */
+                    m_pEditorApplicationPath = new QLineEdit(pWidgetApplication);
+                    if (m_pEditorApplicationPath)
+                    {
+                        connect(m_pEditorApplicationPath, &QLineEdit::textChanged,
+                                this, &UICloudConsoleDetailsWidget::sltApplicationPathChanged);
+
+                        /* Add into layout: */
+                        pLayoutApplication->addWidget(m_pEditorApplicationPath, 1, 1);
+                    }
+                    /* Create path label: */
+                    m_pLabelApplicationPath = new QLabel(pWidgetApplication);
+                    if (m_pLabelApplicationPath)
+                    {
+                        m_pLabelApplicationPath->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                        m_pLabelApplicationPath->setBuddy(m_pEditorApplicationPath);
+
+                        /* Add into layout: */
+                        pLayoutApplication->addWidget(m_pLabelApplicationPath, 1, 0);
+                    }
+                }
+
+                /* Add into layout: */
+                m_pStackedLayout->addWidget(pWidgetApplication);
+            }
+
+            /* Create profile widget: */
+            QWidget *pWidgetProfile = new QWidget;
+            if (pWidgetProfile)
+            {
+                /* Create profile layout: */
+                QGridLayout *pLayoutProfile = new QGridLayout(pWidgetProfile);
+                if (pLayoutProfile)
+                {
+                    pLayoutProfile->setContentsMargins(0, 0, 0, 0);
+                    pLayoutProfile->setRowStretch(2, 1);
+
+                    if (m_enmEmbedding == EmbedTo_Dialog)
+                    {
+                        pLayoutProfile->setContentsMargins(0, 0, 0, 0);
+#ifdef VBOX_WS_MAC
+                        pLayoutProfile->setSpacing(10);
+#else
+                        pLayoutProfile->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
+#endif
+                    }
+                    else
+                    {
+#ifdef VBOX_WS_MAC
+                        pLayoutProfile->setContentsMargins(13, 0, 13, 13);
+                        pLayoutProfile->setSpacing(10);
+#else
+                        const int iL = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) * 1.5;
+                        const int iT = qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin) * 1.5;
+                        const int iR = qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin) * 1.5;
+                        const int iB = qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) * 1.5;
+                        pLayoutProfile->setContentsMargins(iL, iT, iR, iB);
+#endif
+                    }
+
+                    /* Create name editor: */
+                    m_pEditorProfileName = new QLineEdit(pWidgetProfile);
+                    if (m_pEditorProfileName)
+                    {
+                        connect(m_pEditorProfileName, &QLineEdit::textChanged,
+                                this, &UICloudConsoleDetailsWidget::sltProfileNameChanged);
+
+                        /* Add into layout: */
+                        pLayoutProfile->addWidget(m_pEditorProfileName, 0, 1);
+                    }
+                    /* Create name label: */
+                    m_pLabelProfileName = new QLabel(pWidgetProfile);
+                    if (m_pLabelProfileName)
+                    {
+                        m_pLabelProfileName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                        m_pLabelProfileName->setBuddy(m_pEditorProfileName);
+
+                        /* Add into layout: */
+                        pLayoutProfile->addWidget(m_pLabelProfileName, 0, 0);
+                    }
+
+                    /* Create argument editor: */
+                    m_pEditorProfileArgument = new QLineEdit(pWidgetProfile);
+                    if (m_pEditorProfileArgument)
+                    {
+                        connect(m_pEditorProfileArgument, &QLineEdit::textChanged,
+                                this, &UICloudConsoleDetailsWidget::sltProfileArgumentChanged);
+
+                        /* Add into layout: */
+                        pLayoutProfile->addWidget(m_pEditorProfileArgument, 1, 1);
+                    }
+                    /* Create name label: */
+                    m_pLabelProfileArgument = new QLabel(pWidgetProfile);
+                    if (m_pLabelProfileArgument)
+                    {
+                        m_pLabelProfileArgument->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                        m_pLabelProfileArgument->setBuddy(m_pEditorProfileArgument);
+
+                        /* Add into layout: */
+                        pLayoutProfile->addWidget(m_pLabelProfileArgument, 1, 0);
+                    }
+                }
+
+                /* Add into layout: */
+                m_pStackedLayout->addWidget(pWidgetProfile);
+            }
 
             /* Add into layout: */
-            pLayout->addWidget(m_pEditorName, 0, 1);
-        }
-        /* Create name label: */
-        m_pLabelName = new QLabel;
-        if (m_pLabelName)
-        {
-            m_pLabelName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-            m_pLabelName->setBuddy(m_pEditorName);
-
-            /* Add into layout: */
-            pLayout->addWidget(m_pLabelName, 0, 0);
-        }
-
-        /* Create tab-widget: */
-        m_pTableWidget = new QTableWidget;
-        if (m_pTableWidget)
-        {
-            m_pTableWidget->setAlternatingRowColors(true);
-            m_pTableWidget->horizontalHeader()->setVisible(false);
-            m_pTableWidget->verticalHeader()->setVisible(false);
-            m_pTableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
-            connect(m_pTableWidget, &QTableWidget::itemChanged, this, &UICloudProfileDetailsWidget::sltTableChanged);
-
-            /* Add into layout: */
-            pLayout->addWidget(m_pTableWidget, 1, 1);
-        }
-        /* Create tab-widget label: */
-        m_pLabelTableWidget = new QLabel;
-        if (m_pLabelTableWidget)
-        {
-            m_pLabelTableWidget->setAlignment(Qt::AlignRight | Qt::AlignTop);
-            m_pLabelTableWidget->setBuddy(m_pTableWidget);
-
-            /* Add into layout: */
-            pLayout->addWidget(m_pLabelTableWidget, 1, 0);
+            pMainLayout->addLayout(m_pStackedLayout);
         }
 
@@ -270 +411 @@
             {
                 m_pButtonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
-                connect(m_pButtonBox, &QIDialogButtonBox::clicked, this, &UICloudProfileDetailsWidget::sltHandleButtonBoxClick);
+                connect(m_pButtonBox, &QIDialogButtonBox::clicked, this, &UICloudConsoleDetailsWidget::sltHandleButtonBoxClick);
 
                 /* Add into layout: */
-                pLayout->addWidget(m_pButtonBox, 2, 0, 1, 2);
+                pMainLayout->addWidget(m_pButtonBox);
             }
         }
@@ -279 +420 @@
 }
 
-void UICloudProfileDetailsWidget::loadData()
-{
-    /* Clear table initially: */
-    m_pTableWidget->clear();
-
-    /* Fill name editor: */
-    m_pEditorName->setText(m_oldData.m_strName);
-
-    /* Configure table: */
-    m_pTableWidget->setRowCount(m_oldData.m_data.keys().size());
-    m_pTableWidget->setColumnCount(2);
-
-    /* Push acquired keys/values to data fields: */
-    for (int i = 0; i < m_pTableWidget->rowCount(); ++i)
-    {
-        /* Gather values: */
-        const QString strKey = m_oldData.m_data.keys().at(i);
-        const QString strValue = m_oldData.m_data.value(strKey).first;
-        const QString strToolTip = m_oldData.m_data.value(strKey).second;
-
-        /* Create key item: */
-        QTableWidgetItem *pItemK = new QTableWidgetItem(strKey);
-        if (pItemK)
-        {
-            /* Non-editable for sure, but non-selectable? */
-            pItemK->setFlags(pItemK->flags() & ~Qt::ItemIsEditable);
-            /* Use non-translated description as tool-tip: */
-            pItemK->setData(Qt::UserRole, strToolTip);
-
-            /* Insert into table: */
-            m_pTableWidget->setItem(i, 0, pItemK);
-        }
-
-        /* Create value item: */
-        QTableWidgetItem *pItemV = new QTableWidgetItem(strValue);
-        if (pItemV)
-        {
-            /* Use the value as tool-tip, there can be quite long values: */
-            pItemV->setToolTip(strValue);
-
-            /* Insert into table: */
-            m_pTableWidget->setItem(i, 1, pItemV);
-        }
-    }
-
-    /* Update table tooltips: */
-    updateTableToolTips();
-    /* Adjust table contents: */
-    adjustTableContents();
-}
-
-void UICloudProfileDetailsWidget::revalidate(QWidget *pWidget /* = 0 */)
-{
-    /// @todo validate profile settings table!
+void UICloudConsoleDetailsWidget::loadData()
+{
+    /* If application pane is selected: */
+    if (m_pStackedLayout->currentIndex() == 0)
+    {
+        m_pEditorApplicationName->setText(m_oldApplicationData.m_strName);
+        m_pEditorApplicationPath->setText(m_oldApplicationData.m_strPath);
+    }
+    /* If profile pane is selected: */
+    else
+    {
+        m_pEditorProfileName->setText(m_oldProfileData.m_strName);
+        m_pEditorProfileArgument->setText(m_oldProfileData.m_strArgument);
+    }
+}
+
+void UICloudConsoleDetailsWidget::revalidate(QWidget *pWidget /* = 0 */)
+{
+    /// @todo validate application/profile details!
 
     /* Retranslate validation: */
@@ -338 +444 @@
 }
 
-void UICloudProfileDetailsWidget::retranslateValidation(QWidget *pWidget /* = 0 */)
+void UICloudConsoleDetailsWidget::retranslateValidation(QWidget *pWidget /* = 0 */)
 {
     Q_UNUSED(pWidget);
@@ -345 +451 @@
 }
 
-void UICloudProfileDetailsWidget::updateTableToolTips()
-{
-    /* Iterate through all the key items: */
-    for (int i = 0; i < m_pTableWidget->rowCount(); ++i)
-    {
-        /* Acquire current key item: */
-        QTableWidgetItem *pItemK = m_pTableWidget->item(i, 0);
-        if (pItemK)
-        {
-            const QString strToolTip = pItemK->data(Qt::UserRole).toString();
-            pItemK->setToolTip(tr(strToolTip.toUtf8().constData()));
-        }
-    }
-}
-
-void UICloudProfileDetailsWidget::adjustTableContents()
-{
-    /* Disable last column stretching temporary: */
-    m_pTableWidget->horizontalHeader()->setStretchLastSection(false);
-
-    /* Resize both columns to contents: */
-    m_pTableWidget->resizeColumnsToContents();
-    /* Then acquire full available width: */
-    const int iFullWidth = m_pTableWidget->viewport()->width();
-    /* First column should not be less than it's minimum size, last gets the rest: */
-    const int iMinimumWidth0 = qMin(m_pTableWidget->horizontalHeader()->sectionSize(0), iFullWidth / 2);
-    m_pTableWidget->horizontalHeader()->resizeSection(0, iMinimumWidth0);
-
-    /* Enable last column stretching again: */
-    m_pTableWidget->horizontalHeader()->setStretchLastSection(true);
-}
-
-void UICloudProfileDetailsWidget::updateButtonStates()
+void UICloudConsoleDetailsWidget::updateButtonStates()
 {
 #if 0
@@ -400 +474 @@
 #endif
 
-    /* Update 'Apply' / 'Reset' button states: */
-    if (m_pButtonBox)
-    {
-        m_pButtonBox->button(QDialogButtonBox::Cancel)->setEnabled(m_oldData != m_newData);
-        m_pButtonBox->button(QDialogButtonBox::Ok)->setEnabled(m_oldData != m_newData);
-    }
-
-    /* Notify listeners as well: */
-    emit sigDataChanged(m_oldData != m_newData);
-}
+    /* If application pane is selected: */
+    if (m_pStackedLayout->currentIndex() == 0)
+    {
+        /* Update 'Apply' / 'Reset' button states: */
+        if (m_pButtonBox)
+        {
+            m_pButtonBox->button(QDialogButtonBox::Cancel)->setEnabled(m_oldApplicationData != m_newApplicationData);
+            m_pButtonBox->button(QDialogButtonBox::Ok)->setEnabled(m_oldApplicationData != m_newApplicationData);
+        }
+
+        /* Notify listeners as well: */
+        emit sigDataChanged(m_oldApplicationData != m_newApplicationData);
+    }
+    /* If profile pane is selected: */
+    else
+    {
+        /* Update 'Apply' / 'Reset' button states: */
+        if (m_pButtonBox)
+        {
+            m_pButtonBox->button(QDialogButtonBox::Cancel)->setEnabled(m_oldProfileData != m_newProfileData);
+            m_pButtonBox->button(QDialogButtonBox::Ok)->setEnabled(m_oldProfileData != m_newProfileData);
+        }
+
+        /* Notify listeners as well: */
+        emit sigDataChanged(m_oldProfileData != m_newProfileData);
+    }
+}

trunk/src/VBox/Frontends/VirtualBox/src/cloud/consolemanager/UICloudConsoleDetailsWidget.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UICloudProfileDetailsWidget class declaration.
+ * VBox Qt GUI - UICloudConsoleDetailsWidget class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_cloud_profilemanager_UICloudProfileDetailsWidget_h
-#define FEQT_INCLUDED_SRC_cloud_profilemanager_UICloudProfileDetailsWidget_h
+#ifndef FEQT_INCLUDED_SRC_cloud_consolemanager_UICloudConsoleDetailsWidget_h
+#define FEQT_INCLUDED_SRC_cloud_consolemanager_UICloudConsoleDetailsWidget_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -24 +24 @@
 /* Qt includes: */
 #include <QMap>
-#include <QUuid>
 #include <QWidget>
 
@@ -35 +34 @@
 class QLabel;
 class QLineEdit;
-class QTableWidget;
-class QTableWidgetItem;
+class QStackedLayout;
 class QIDialogButtonBox;
 
 
-/** Cloud Provider data structure. */
-struct UIDataCloudProvider
+/** Cloud Console Application data structure. */
+struct UIDataCloudConsoleApplication
 {
     /** Constructs data. */
-    UIDataCloudProvider()
+    UIDataCloudConsoleApplication()
         : m_fRestricted(false)
     {}
 
     /** Returns whether the @a other passed data is equal to this one. */
-    bool equal(const UIDataCloudProvider &other) const
+    bool equal(const UIDataCloudConsoleApplication &other) const
     {
         return true
-               && (m_uId == other.m_uId)
-               && (m_strShortName == other.m_strShortName)
+               && (m_strId == other.m_strId)
                && (m_strName == other.m_strName)
+               && (m_strPath == other.m_strPath)
                && (m_fRestricted == other.m_fRestricted)
                ;
@@ -60 +58 @@
 
     /** Returns whether the @a other passed data is equal to this one. */
-    bool operator==(const UIDataCloudProvider &other) const { return equal(other); }
+    bool operator==(const UIDataCloudConsoleApplication &other) const { return equal(other); }
     /** Returns whether the @a other passed data is different from this one. */
-    bool operator!=(const UIDataCloudProvider &other) const { return !equal(other); }
-
-    /** Holds the provider ID. */
-    QUuid    m_uId;
-    /** Holds the provider short name. */
-    QString  m_strShortName;
-    /** Holds the provider name. */
+    bool operator!=(const UIDataCloudConsoleApplication &other) const { return !equal(other); }
+
+    /** Holds the console application ID. */
+    QString  m_strId;
+    /** Holds the console application name. */
     QString  m_strName;
-    /** Holds whether provider is restricted. */
+    /** Holds the console application path. */
+    QString  m_strPath;
+    /** Holds whether console application is restricted. */
     bool     m_fRestricted;
-
-    /** Holds the profile supported property descriptions. */
-    QMap<QString, QString>  m_propertyDescriptions;
 };
 
-/** Cloud Profile data structure. */
-struct UIDataCloudProfile
+/** Cloud Console Profile data structure. */
+struct UIDataCloudConsoleProfile
 {
     /** Constructs data. */
-    UIDataCloudProfile()
+    UIDataCloudConsoleProfile()
         : m_fRestricted(false)
     {}
 
     /** Returns whether the @a other passed data is equal to this one. */
-    bool equal(const UIDataCloudProfile &other) const
+    bool equal(const UIDataCloudConsoleProfile &other) const
     {
         return true
-               && (m_strProviderShortName == other.m_strProviderShortName)
+               && (m_strApplicationId == other.m_strApplicationId)
+               && (m_strId == other.m_strId)
                && (m_strName == other.m_strName)
+               && (m_strArgument == other.m_strArgument)
                && (m_fRestricted == other.m_fRestricted)
-               && (m_data == other.m_data)
                ;
     }
 
     /** Returns whether the @a other passed data is equal to this one. */
-    bool operator==(const UIDataCloudProfile &other) const { return equal(other); }
+    bool operator==(const UIDataCloudConsoleProfile &other) const { return equal(other); }
     /** Returns whether the @a other passed data is different from this one. */
-    bool operator!=(const UIDataCloudProfile &other) const { return !equal(other); }
-
-    /** Holds the provider short name. */
-    QString  m_strProviderShortName;
-    /** Holds the profile name. */
+    bool operator!=(const UIDataCloudConsoleProfile &other) const { return !equal(other); }
+
+    /** Holds the console profile application ID. */
+    QString  m_strApplicationId;
+    /** Holds the console profile ID. */
+    QString  m_strId;
+    /** Holds the console profile name. */
     QString  m_strName;
-    /** Holds whether profile is restricted. */
+    /** Holds the console profile argument. */
+    QString  m_strArgument;
+    /** Holds whether console profile is restricted. */
     bool     m_fRestricted;
-
-    /** Holds the profile data. */
-    QMap<QString, QPair<QString, QString> >  m_data;
 };
 
 
-/** Cloud Profile details widget. */
-class UICloudProfileDetailsWidget : public QIWithRetranslateUI<QWidget>
+/** Cloud Console details widget. */
+class UICloudConsoleDetailsWidget : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -130 +127 @@
 public:
 
-    /** Constructs cloud profile details widget passing @a pParent to the base-class.
+    /** Constructs cloud console details widget passing @a pParent to the base-class.
       * @param  enmEmbedding  Brings embedding type. */
-    UICloudProfileDetailsWidget(EmbedTo enmEmbedding, QWidget *pParent = 0);
-
-    /** Returns the cloud profile data. */
-    const UIDataCloudProfile &data() const { return m_newData; }
-    /** Defines the cloud profile @a data. */
-    void setData(const UIDataCloudProfile &data);
+    UICloudConsoleDetailsWidget(EmbedTo enmEmbedding, QWidget *pParent = 0);
+
+    /** Returns the cloud console application data. */
+    const UIDataCloudConsoleApplication &applicationData() const { return m_newApplicationData; }
+    /** Returns the cloud console profile data. */
+    const UIDataCloudConsoleProfile &profileData() const { return m_newProfileData; }
+    /** Defines the cloud console application @a data. */
+    void setApplicationData(const UIDataCloudConsoleApplication &data);
+    /** Defines the cloud console profile @a data. */
+    void setProfileData(const UIDataCloudConsoleProfile &data);
+    /** Clears all the console data. */
+    void clearData();
 
 protected:
@@ -152 +155 @@
     /** @name Change handling stuff.
       * @{ */
-        /** Handles name change. */
-        void sltNameChanged(const QString &strName);
-        /** Handles table change. */
-        void sltTableChanged(QTableWidgetItem *pItem);
+        /** Handles console application name change. */
+        void sltApplicationNameChanged(const QString &strName);
+        /** Handles console application path change. */
+        void sltApplicationPathChanged(const QString &strPath);
+        /** Handles console profile name change. */
+        void sltProfileNameChanged(const QString &strName);
+        /** Handles console profile argument change. */
+        void sltProfileArgumentChanged(const QString &strArgument);
 
         /** Handles button-box button click. */
@@ -185 +192 @@
         void retranslateValidation(QWidget *pWidget = 0);
 
-        /** Updates table tooltips. */
-        void updateTableToolTips();
-        /** Adjusts table contents. */
-        void adjustTableContents();
-
         /** Updates button states. */
         void updateButtonStates();
@@ -199 +201 @@
         const EmbedTo  m_enmEmbedding;
 
-        /** Holds the old data copy. */
-        UIDataCloudProfile  m_oldData;
-        /** Holds the new data copy. */
-        UIDataCloudProfile  m_newData;
+        /** Holds the old console application data copy. */
+        UIDataCloudConsoleApplication  m_oldApplicationData;
+        /** Holds the new console application data copy. */
+        UIDataCloudConsoleApplication  m_newApplicationData;
+
+        /** Holds the old console profile data copy. */
+        UIDataCloudConsoleProfile  m_oldProfileData;
+        /** Holds the new console profile data copy. */
+        UIDataCloudConsoleProfile  m_newProfileData;
     /** @} */
 
     /** @name Widget variables.
       * @{ */
-        /** Holds the name label instance. */
-        QLabel    *m_pLabelName;
-        /** Holds the name editor instance. */
-        QLineEdit *m_pEditorName;
-
-        /** Holds the table-widget label instance. */
-        QLabel       *m_pLabelTableWidget;
-        /** Holds the table-widget instance. */
-        QTableWidget *m_pTableWidget;
+        /** Holds the stacked layout isntance. */
+        QStackedLayout *m_pStackedLayout;
+
+        /** Holds the application name label instance. */
+        QLabel    *m_pLabelApplicationName;
+        /** Holds the application name editor instance. */
+        QLineEdit *m_pEditorApplicationName;
+        /** Holds the application path label instance. */
+        QLabel    *m_pLabelApplicationPath;
+        /** Holds the application path editor instance. */
+        QLineEdit *m_pEditorApplicationPath;
+
+        /** Holds the profile name label instance. */
+        QLabel    *m_pLabelProfileName;
+        /** Holds the profile name editor instance. */
+        QLineEdit *m_pEditorProfileName;
+        /** Holds the profile argument label instance. */
+        QLabel    *m_pLabelProfileArgument;
+        /** Holds the profile argument editor instance. */
+        QLineEdit *m_pEditorProfileArgument;
 
         /** Holds the button-box instance. */
@@ -223 +241 @@
 
 
-#endif /* !FEQT_INCLUDED_SRC_cloud_profilemanager_UICloudProfileDetailsWidget_h */
+#endif /* !FEQT_INCLUDED_SRC_cloud_consolemanager_UICloudConsoleDetailsWidget_h */

trunk/src/VBox/Frontends/VirtualBox/src/cloud/consolemanager/UICloudConsoleManager.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UICloudProfileManager class implementation.
+ * VBox Qt GUI - UICloudConsoleManager class implementation.
  */
 
@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QDialog>
+#include <QGridLayout>
 #include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
 #include <QPushButton>
+#include <QUuid>
 #include <QVBoxLayout>
 
 /* GUI includes: */
 #include "QIDialogButtonBox.h"
-#include "QIInputDialog.h"
 #include "QITreeWidget.h"
 #include "UICommon.h"
 #include "UIActionPoolManager.h"
-#include "UICloudNetworkingStuff.h"
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
-#include "UICloudProfileDetailsWidget.h"
-#include "UICloudProfileManager.h"
+#include "UICloudConsoleDetailsWidget.h"
+#include "UICloudConsoleManager.h"
 #include "UIMessageCenter.h"
 #include "UIToolBar.h"
 
-/* COM includes: */
-#include "CCloudProfile.h"
-#include "CCloudProvider.h"
-#include "CCloudProviderManager.h"
-
 
 /** Tree-widget item types. */
-enum CloudItemType
-{
-    CloudItemType_Invalid  = 0,
-    CloudItemType_Provider = 1,
-    CloudItemType_Profile  = 2
+enum CloudConsoleItemType
+{
+    CloudConsoleItemType_Invalid     = 0,
+    CloudConsoleItemType_Application = 1,
+    CloudConsoleItemType_Profile     = 2
 };
-Q_DECLARE_METATYPE(CloudItemType);
+Q_DECLARE_METATYPE(CloudConsoleItemType);
 
 /** Tree-widget data types. */
@@ -54 +52 @@
 {
     Data_ItemType   = Qt::UserRole + 1,
-    Data_ProviderID = Qt::UserRole + 2,
+    Data_ItemID     = Qt::UserRole + 2,
     Data_Definition = Qt::UserRole + 3,
 };
@@ -62 +60 @@
 {
     Column_Name,
-    Column_ListVMs,
+    Column_ListInMenu,
     Column_Max
 };
 
 
-/** Cloud Profile Manager provider's tree-widget item. */
-class UIItemCloudProvider : public QITreeWidgetItem, public UIDataCloudProvider
+/** Cloud Console Manager application's tree-widget item. */
+class UIItemCloudConsoleApplication : public QITreeWidgetItem, public UIDataCloudConsoleApplication
 {
     Q_OBJECT;
@@ -75 +73 @@
 
     /** Constructs item. */
-    UIItemCloudProvider();
+    UIItemCloudConsoleApplication();
 
     /** Updates item fields from base-class data. */
     void updateFields();
 
+    /** Returns item id. */
+    QString id() const { return m_strId; }
     /** Returns item name. */
     QString name() const { return m_strName; }
+    /** Returns item path. */
+    QString path() const { return m_strPath; }
 };
 
-/** Cloud Profile Manager profile's tree-widget item. */
-class UIItemCloudProfile : public QITreeWidgetItem, public UIDataCloudProfile
+/** Cloud Console Manager profile's tree-widget item. */
+class UIItemCloudConsoleProfile : public QITreeWidgetItem, public UIDataCloudConsoleProfile
 {
     Q_OBJECT;
@@ -92 +94 @@
 
     /** Constructs item. */
-    UIItemCloudProfile();
+    UIItemCloudConsoleProfile();
 
     /** Updates item fields from base-class data. */
     void updateFields();
 
+    /** Returns item application id. */
+    QString applicationId() const { return m_strApplicationId; }
+    /** Returns item id. */
+    QString id() const { return m_strId; }
     /** Returns item name. */
     QString name() const { return m_strName; }
+    /** Returns item argument. */
+    QString argument() const { return m_strArgument; }
 };
 
+/** QDialog extension used to acquire newly created console application parameters. */
+class UIInputDialogCloudConsoleApplication : public QIWithRetranslateUI<QDialog>
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs dialog passing @a pParent to the base-class. */
+    UIInputDialogCloudConsoleApplication(QWidget *pParent);
+
+    /** Returns application name. */
+    QString name() const;
+    /** Returns application path. */
+    QString path() const;
+
+protected:
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */;
+
+private:
+
+    /** Prepares all. */
+    void prepare();
+
+    /** Holds the name label instance. */
+    QLabel    *m_pLabelName;
+    /** Holds the name editor instance. */
+    QLineEdit *m_pEditorName;
+    /** Holds the path label instance. */
+    QLabel    *m_pLabelPath;
+    /** Holds the path editor instance. */
+    QLineEdit *m_pEditorPath;
+
+    /** Holds the button-box instance. */
+    QIDialogButtonBox *m_pButtonBox;
+};
+
+/** QDialog extension used to acquire newly created console profile parameters. */
+class UIInputDialogCloudConsoleProfile : public QIWithRetranslateUI<QDialog>
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs dialog passing @a pParent to the base-class. */
+    UIInputDialogCloudConsoleProfile(QWidget *pParent);
+
+    /** Returns profile name. */
+    QString name() const;
+    /** Returns profile argument. */
+    QString argument() const;
+
+protected:
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */;
+
+private:
+
+    /** Prepares all. */
+    void prepare();
+
+    /** Holds the name label instance. */
+    QLabel    *m_pLabelName;
+    /** Holds the name editor instance. */
+    QLineEdit *m_pEditorName;
+    /** Holds the argument label instance. */
+    QLabel    *m_pLabelArgument;
+    /** Holds the argument editor instance. */
+    QLineEdit *m_pEditorArgument;
+
+    /** Holds the button-box instance. */
+    QIDialogButtonBox *m_pButtonBox;
+};
+
 
 /*********************************************************************************************************************************
-*   Class UIItemCloudProvider implementation.                                                                                    *
+*   Class UIItemCloudConsoleApplication implementation.                                                                          *
 *********************************************************************************************************************************/
 
-UIItemCloudProvider::UIItemCloudProvider()
+UIItemCloudConsoleApplication::UIItemCloudConsoleApplication()
 {
     /* Assign icon: */
-    setIcon(Column_Name, UIIconPool::iconSet(":/provider_oracle_16px.png"));
-    /* Assign item type: */
-    setData(Column_Name, Data_ItemType, QVariant::fromValue(CloudItemType_Provider));
-}
-
-void UIItemCloudProvider::updateFields()
+    setIcon(Column_Name, UIIconPool::iconSet(":/cloud_console_application_16px.png")); /// @todo use proper icon
+    /* Assign item data: */
+    setData(Column_Name, Data_ItemType, QVariant::fromValue(CloudConsoleItemType_Application));
+}
+
+void UIItemCloudConsoleApplication::updateFields()
 {
     /* Update item fields: */
     setText(Column_Name, m_strName);
-    setData(Column_Name, Data_ProviderID, m_uId);
-    setData(Column_Name, Data_Definition, QVariant::fromValue(QString("/%1").arg(m_strShortName)));
-    setCheckState(Column_ListVMs, m_fRestricted ? Qt::Unchecked : Qt::Checked);
+    setData(Column_Name, Data_ItemID, m_strId);
+    setData(Column_Name, Data_Definition, QVariant::fromValue(QString("/%1").arg(m_strId)));
+    setCheckState(Column_ListInMenu, m_fRestricted ? Qt::Unchecked : Qt::Checked);
 }
 
 
 /*********************************************************************************************************************************
-*   Class UIItemCloudProfile implementation.                                                                                     *
+*   Class UIItemCloudConsoleProfile implementation.                                                                              *
 *********************************************************************************************************************************/
 
-UIItemCloudProfile::UIItemCloudProfile()
+UIItemCloudConsoleProfile::UIItemCloudConsoleProfile()
 {
     /* Assign icon: */
-    setIcon(Column_Name, UIIconPool::iconSet(":/profile_16px.png"));
-    /* Assign item type: */
-    setData(Column_Name, Data_ItemType, QVariant::fromValue(CloudItemType_Profile));
-}
-
-void UIItemCloudProfile::updateFields()
+    setIcon(Column_Name, UIIconPool::iconSet(":/cloud_console_profile_16px.png")); /// @todo use proper icon
+    /* Assign item data: */
+    setData(Column_Name, Data_ItemType, QVariant::fromValue(CloudConsoleItemType_Profile));
+}
+
+void UIItemCloudConsoleProfile::updateFields()
 {
     /* Update item fields: */
     setText(Column_Name, m_strName);
-    setData(Column_Name, Data_Definition, QVariant::fromValue(QString("/%1/%2").arg(m_strProviderShortName, m_strName)));
-    setCheckState(Column_ListVMs, m_fRestricted ? Qt::Unchecked : Qt::Checked);
+    setData(Column_Name, Data_ItemID, m_strId);
+    setData(Column_Name, Data_Definition, QVariant::fromValue(QString("/%1/%2").arg(m_strApplicationId, m_strId)));
+    setCheckState(Column_ListInMenu, m_fRestricted ? Qt::Unchecked : Qt::Checked);
 }
 
 
 /*********************************************************************************************************************************
-*   Class UICloudProfileManagerWidget implementation.                                                                            *
+*   Class UIInputDialogCloudConsoleApplication implementation.                                                                   *
 *********************************************************************************************************************************/
 
-UICloudProfileManagerWidget::UICloudProfileManagerWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
+UIInputDialogCloudConsoleApplication::UIInputDialogCloudConsoleApplication(QWidget *pParent)
+    : QIWithRetranslateUI<QDialog>(pParent)
+    , m_pLabelName(0)
+    , m_pEditorName(0)
+    , m_pLabelPath(0)
+    , m_pEditorPath(0)
+    , m_pButtonBox(0)
+{
+    prepare();
+}
+
+QString UIInputDialogCloudConsoleApplication::name() const
+{
+    return m_pEditorName->text();
+}
+
+QString UIInputDialogCloudConsoleApplication::path() const
+{
+    return m_pEditorPath->text();
+}
+
+void UIInputDialogCloudConsoleApplication::retranslateUi()
+{
+    setWindowTitle(tr("Add Application"));
+    m_pLabelName->setText(tr("Name:"));
+    m_pLabelPath->setText(tr("Path:"));
+}
+
+void UIInputDialogCloudConsoleApplication::prepare()
+{
+    /* Configure self: */
+    setWindowIcon(UIIconPool::iconSet(":/cloud_console_application_add_16px.png")); /// @todo use proper icon
+
+    /* Prepare main layout: */
+    QGridLayout *pMainLayout = new QGridLayout(this);
+    if (pMainLayout)
+    {
+        pMainLayout->setRowStretch(0, 0);
+        pMainLayout->setRowStretch(1, 0);
+        pMainLayout->setRowStretch(2, 1);
+        pMainLayout->setRowStretch(3, 0);
+
+        /* Prepare name editor: */
+        m_pEditorName = new QLineEdit(this);
+        if (m_pEditorName)
+        {
+            pMainLayout->addWidget(m_pEditorName, 0, 1);
+        }
+        /* Prepare name editor label: */
+        m_pLabelName = new QLabel(this);
+        if (m_pLabelName)
+        {
+            m_pLabelName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            m_pLabelName->setBuddy(m_pEditorName);
+            pMainLayout->addWidget(m_pLabelName, 0, 0);
+        }
+
+        /* Prepare path editor: */
+        m_pEditorPath = new QLineEdit(this);
+        if (m_pEditorPath)
+        {
+            pMainLayout->addWidget(m_pEditorPath, 1, 1);
+        }
+        /* Prepare path editor label: */
+        m_pLabelPath = new QLabel(this);
+        if (m_pLabelPath)
+        {
+            m_pLabelPath->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            m_pLabelPath->setBuddy(m_pEditorPath);
+            pMainLayout->addWidget(m_pLabelPath, 1, 0);
+        }
+
+        /* Prepare button-box: */
+        m_pButtonBox = new QIDialogButtonBox(this);
+        if  (m_pButtonBox)
+        {
+            m_pButtonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+            connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIInputDialogCloudConsoleApplication::reject);
+            connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UIInputDialogCloudConsoleApplication::accept);
+            pMainLayout->addWidget(m_pButtonBox, 3, 0, 1, 2);
+        }
+    }
+
+    /* Apply language settings: */
+    retranslateUi();
+
+    /* Resize to suitable size: */
+    const int iMinimumHeightHint = minimumSizeHint().height();
+    resize(iMinimumHeightHint * 3, iMinimumHeightHint);
+}
+
+
+/*********************************************************************************************************************************
+*   Class UIInputDialogCloudConsoleProfile implementation.                                                                       *
+*********************************************************************************************************************************/
+
+UIInputDialogCloudConsoleProfile::UIInputDialogCloudConsoleProfile(QWidget *pParent)
+    : QIWithRetranslateUI<QDialog>(pParent)
+    , m_pLabelName(0)
+    , m_pEditorName(0)
+    , m_pLabelArgument(0)
+    , m_pEditorArgument(0)
+    , m_pButtonBox(0)
+{
+    prepare();
+}
+
+QString UIInputDialogCloudConsoleProfile::name() const
+{
+    return m_pEditorName->text();
+}
+
+QString UIInputDialogCloudConsoleProfile::argument() const
+{
+    return m_pEditorArgument->text();
+}
+
+void UIInputDialogCloudConsoleProfile::retranslateUi()
+{
+    setWindowTitle(tr("Add Profile"));
+    m_pLabelName->setText(tr("Name:"));
+    m_pLabelArgument->setText(tr("Argument:"));
+}
+
+void UIInputDialogCloudConsoleProfile::prepare()
+{
+    /* Configure self: */
+    setWindowIcon(UIIconPool::iconSet(":/cloud_console_profile_add_16px.png")); /// @todo use proper icon
+
+    /* Prepare main layout: */
+    QGridLayout *pMainLayout = new QGridLayout(this);
+    if (pMainLayout)
+    {
+        pMainLayout->setRowStretch(0, 0);
+        pMainLayout->setRowStretch(1, 0);
+        pMainLayout->setRowStretch(2, 1);
+        pMainLayout->setRowStretch(3, 0);
+
+        /* Prepare name editor: */
+        m_pEditorName = new QLineEdit(this);
+        if (m_pEditorName)
+        {
+            pMainLayout->addWidget(m_pEditorName, 0, 1);
+        }
+        /* Prepare name editor label: */
+        m_pLabelName = new QLabel(this);
+        if (m_pLabelName)
+        {
+            m_pLabelName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            m_pLabelName->setBuddy(m_pEditorName);
+            pMainLayout->addWidget(m_pLabelName, 0, 0);
+        }
+
+        /* Prepare argument editor: */
+        m_pEditorArgument = new QLineEdit(this);
+        if (m_pEditorArgument)
+        {
+            pMainLayout->addWidget(m_pEditorArgument, 1, 1);
+        }
+        /* Prepare argument editor label: */
+        m_pLabelArgument = new QLabel(this);
+        if (m_pLabelArgument)
+        {
+            m_pLabelArgument->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            m_pLabelArgument->setBuddy(m_pEditorArgument);
+            pMainLayout->addWidget(m_pLabelArgument, 1, 0);
+        }
+
+        /* Prepare button-box: */
+        m_pButtonBox = new QIDialogButtonBox(this);
+        if  (m_pButtonBox)
+        {
+            m_pButtonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+            connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIInputDialogCloudConsoleApplication::reject);
+            connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UIInputDialogCloudConsoleApplication::accept);
+            pMainLayout->addWidget(m_pButtonBox, 3, 0, 1, 2);
+        }
+    }
+
+    /* Apply language settings: */
+    retranslateUi();
+
+    /* Resize to suitable size: */
+    const int iMinimumHeightHint = minimumSizeHint().height();
+    resize(iMinimumHeightHint * 3, iMinimumHeightHint);
+}
+
+
+/*********************************************************************************************************************************
+*   Class UICloudConsoleManagerWidget implementation.                                                                            *
+*********************************************************************************************************************************/
+
+UICloudConsoleManagerWidget::UICloudConsoleManagerWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
                                                          bool fShowToolbar /* = true */, QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
@@ -162 +439 @@
 }
 
-QMenu *UICloudProfileManagerWidget::menu() const
-{
-    return m_pActionPool->action(UIActionIndexST_M_CloudWindow)->menu();
-}
-
-void UICloudProfileManagerWidget::retranslateUi()
+QMenu *UICloudConsoleManagerWidget::menu() const
+{
+    return m_pActionPool->action(UIActionIndexST_M_CloudConsoleWindow)->menu();
+}
+
+void UICloudConsoleManagerWidget::retranslateUi()
 {
     /* Adjust toolbar: */
@@ -182 +459 @@
     /* Translate tree-widget: */
     m_pTreeWidget->setHeaderLabels(   QStringList()
-                                   << tr("Source")
-                                   << tr("List VMs"));
-}
-
-void UICloudProfileManagerWidget::sltResetCloudProfileDetailsChanges()
+                                   << tr("Application")
+                                   << tr("List in Menu"));
+}
+
+void UICloudConsoleManagerWidget::sltResetCloudConsoleDetailsChanges()
 {
     /* Just push the current-item data there again: */
@@ -192 +469 @@
 }
 
-void UICloudProfileManagerWidget::sltApplyCloudProfileDetailsChanges()
-{
-    /* It can be that there is provider item, not profile item currently selected.
-     * In such case we are not applying parameters, we are creating new one profile. */
+void UICloudConsoleManagerWidget::sltApplyCloudConsoleDetailsChanges()
+{
+    /* Check current-item type: */
     QITreeWidgetItem *pItem = QITreeWidgetItem::toItem(m_pTreeWidget->currentItem());
-    UIItemCloudProvider *pMaybeProviderItem = qobject_cast<UIItemCloudProvider*>(pItem);
-    if (pMaybeProviderItem)
-        return sltAddCloudProfile();
-
-    /* Get profile item: */
-    UIItemCloudProfile *pProfileItem = qobject_cast<UIItemCloudProfile*>(pItem);
-    AssertMsgReturnVoid(pProfileItem, ("Current item must not be null!\n"));
-
-    /* Get item data: */
-    UIDataCloudProfile oldData = *pProfileItem;
-    UIDataCloudProfile newData = m_pDetailsWidget->data();
-
-    /* Get VirtualBox for further activities: */
-    const CVirtualBox comVBox = uiCommon().virtualBox();
-
-    /* Get CloudProviderManager for further activities: */
-    CCloudProviderManager comCloudProviderManager = comVBox.GetCloudProviderManager();
-    /* Show error message if necessary: */
-    if (!comVBox.isOk())
-        msgCenter().cannotAcquireCloudProviderManager(comVBox, this);
-    else
-    {
-        /* Get provider item: */
-        UIItemCloudProvider *pProviderItem = qobject_cast<UIItemCloudProvider*>(pProfileItem->parentItem());
-        /* Acquire provider ID: */
-        const QUuid uId = pProviderItem->data(Column_Name, Data_ProviderID).toUuid();
-
-        /* Look for corresponding provider: */
-        CCloudProvider comCloudProvider = comCloudProviderManager.GetProviderById(uId);
-        /* Show error message if necessary: */
-        if (!comCloudProviderManager.isOk())
-            msgCenter().cannotFindCloudProvider(comCloudProviderManager, uId, this);
-        else
-        {
-            /* Look for corresponding profile: */
-            CCloudProfile comCloudProfile = comCloudProvider.GetProfileByName(oldData.m_strName);
-            /* Show error message if necessary: */
-            if (!comCloudProvider.isOk())
-                msgCenter().cannotFindCloudProfile(comCloudProvider, oldData.m_strName, this);
-            else
-            {
-                /* Set profile name, if necessary: */
-                if (newData.m_strName != oldData.m_strName)
-                    comCloudProfile.SetName(newData.m_strName);
-                /* Show error message if necessary: */
-                if (!comCloudProfile.isOk())
-                    msgCenter().cannotAssignCloudProfileParameter(comCloudProfile, this);
-                else
-                {
-                    /* Iterate through old/new data: */
-                    foreach (const QString &strKey, oldData.m_data.keys())
-                    {
-                        /* Get values: */
-                        const QString strOldValue = oldData.m_data.value(strKey).first;
-                        const QString strNewValue = newData.m_data.value(strKey).first;
-                        if (strNewValue != strOldValue)
-                        {
-                            /* Apply property: */
-                            comCloudProfile.SetProperty(strKey, strNewValue);
-                            /* Show error message if necessary: */
-                            if (!comCloudProfile.isOk())
-                            {
-                                msgCenter().cannotAssignCloudProfileParameter(comCloudProfile, this);
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                /* If profile is Ok finally: */
-                if (comCloudProfile.isOk())
-                {
-                    /* Update profile in the tree: */
-                    UIDataCloudProfile data;
-                    loadCloudProfile(comCloudProfile, *pProviderItem, data);
-                    updateItemForCloudProfile(data, true, pProfileItem);
-
-                    /* Make sure current-item fetched: */
-                    sltHandleCurrentItemChange();
-
-                    /* Save profile changes: */
-                    comCloudProvider.SaveProfiles();
-                    /* Show error message if necessary: */
-                    if (!comCloudProvider.isOk())
-                        msgCenter().cannotSaveCloudProfiles(comCloudProvider, this);
-                }
-            }
-        }
-    }
-
-    /* Notify listeners: */
-    emit sigChange();
-}
-
-void UICloudProfileManagerWidget::sltAddCloudProfile()
-{
-    /* Get provider item: */
+    AssertMsgReturnVoid(pItem, ("Current item must not be null!\n"));
+    switch (pItem->data(Column_Name, Data_ItemType).value<CloudConsoleItemType>())
+    {
+        case CloudConsoleItemType_Application:
+        {
+            /* Save application changes: */
+            UIItemCloudConsoleApplication *pItemApplication = qobject_cast<UIItemCloudConsoleApplication*>(pItem);
+            AssertPtrReturnVoid(pItemApplication);
+            const UIDataCloudConsoleApplication oldData = *pItemApplication;
+            const UIDataCloudConsoleApplication newData = m_pDetailsWidget->applicationData();
+            /* Save application settings if changed: */
+            if (newData != oldData)
+                gEDataManager->setCloudConsoleManagerApplication(newData.m_strId,
+                                                                 QString("%1,%2").arg(newData.m_strName, newData.m_strPath));
+            break;
+        }
+        case CloudConsoleItemType_Profile:
+        {
+            /* Save profile changes: */
+            UIItemCloudConsoleProfile *pItemProfile = qobject_cast<UIItemCloudConsoleProfile*>(pItem);
+            AssertPtrReturnVoid(pItemProfile);
+            const UIDataCloudConsoleProfile oldData = *pItemProfile;
+            const UIDataCloudConsoleProfile newData = m_pDetailsWidget->profileData();
+            /* Save profile settings if changed: */
+            if (newData != oldData)
+                gEDataManager->setCloudConsoleManagerProfile(newData.m_strApplicationId,
+                                                             newData.m_strId,
+                                                             QString("%1,%2").arg(newData.m_strName, newData.m_strArgument));
+            break;
+        }
+        case CloudConsoleItemType_Invalid:
+            break;
+    }
+}
+
+void UICloudConsoleManagerWidget::sltAddCloudConsoleApplication()
+{
+    /* Acquire application attributes: */
+    QString strId;
+    QString strApplicationName;
+    QString strApplicationPath;
+    bool fCancelled = true;
+    QPointer<UIInputDialogCloudConsoleApplication> pDialog = new UIInputDialogCloudConsoleApplication(this);
+    if (pDialog)
+    {
+        if (pDialog->exec() == QDialog::Accepted)
+        {
+            strId = QUuid::createUuid().toString().remove(QRegExp("[{}]"));
+            strApplicationName = pDialog->name();
+            strApplicationPath = pDialog->path();
+            fCancelled = false;
+        }
+        delete pDialog;
+    }
+    if (fCancelled)
+        return;
+
+    /* Update current-item definition: */
+    m_strDefinition = QString("/%1").arg(strId);
+    /* Compose extra-data superset: */
+    const QString strValue = QString("%1,%2").arg(strApplicationName, strApplicationPath);
+
+    /* Save new console application to extra-data: */
+    gEDataManager->setCloudConsoleManagerApplication(strId, strValue);
+}
+
+void UICloudConsoleManagerWidget::sltRemoveCloudConsoleApplication()
+{
+    /* Get console application item: */
     QITreeWidgetItem *pItem = QITreeWidgetItem::toItem(m_pTreeWidget->currentItem());
-    UIItemCloudProvider *pProviderItem = qobject_cast<UIItemCloudProvider*>(pItem);
-    AssertMsgReturnVoid(pProviderItem, ("Current item must not be null!\n"));
-
-    /* Acquire profile name if not proposed by details widget: */
-    QString strProfileName = m_pDetailsWidget->data().m_strName;
-    if (strProfileName.isEmpty())
-    {
-        bool fCancelled = true;
-        QISafePointerInputDialog pDialog = new QIInputDialog(this);
-        if (pDialog)
-        {
-            pDialog->setWindowIcon(UIIconPool::iconSet(":/cloud_profile_add_16px.png"));
-            pDialog->setWindowTitle(UICloudProfileManager::tr("Add Profile"));
-            if (pDialog->exec() == QDialog::Accepted)
-            {
-                strProfileName = pDialog->textValue();
-                fCancelled = false;
-            }
-            delete pDialog;
-        }
-        if (fCancelled)
-            return;
-    }
-
-    /* Get VirtualBox for further activities: */
-    const CVirtualBox comVBox = uiCommon().virtualBox();
-
-    /* Get CloudProviderManager for further activities: */
-    CCloudProviderManager comCloudProviderManager = comVBox.GetCloudProviderManager();
-    /* Show error message if necessary: */
-    if (!comVBox.isOk())
-        msgCenter().cannotAcquireCloudProviderManager(comVBox, this);
-    else
-    {
-        /* Acquire provider ID: */
-        const QUuid uId = pProviderItem->data(Column_Name, Data_ProviderID).toUuid();
-
-        /* Look for corresponding provider: */
-        CCloudProvider comCloudProvider = comCloudProviderManager.GetProviderById(uId);
-        /* Show error message if necessary: */
-        if (!comCloudProviderManager.isOk())
-            msgCenter().cannotFindCloudProvider(comCloudProviderManager, uId, this);
-        else
-        {
-            /* Create new profile: */
-            const QVector<QString> keys = pProviderItem->m_propertyDescriptions.keys().toVector();
-            const QVector<QString> values(keys.size());
-            comCloudProvider.CreateProfile(strProfileName, keys, values);
-
-            /* Show error message if necessary: */
-            if (!comCloudProvider.isOk())
-                msgCenter().cannotCreateCloudProfle(comCloudProvider, this);
-            else
-            {
-                /* Look for corresponding profile: */
-                CCloudProfile comCloudProfile = comCloudProvider.GetProfileByName(strProfileName);
-                /* Show error message if necessary: */
-                if (!comCloudProvider.isOk())
-                    msgCenter().cannotFindCloudProfile(comCloudProvider, strProfileName, this);
-                else
-                {
-                    /* Add profile to the tree: */
-                    UIDataCloudProfile data;
-                    loadCloudProfile(comCloudProfile, *pProviderItem, data);
-                    createItemForCloudProfile(pProviderItem, data, true);
-
-                    /* Save profile changes: */
-                    comCloudProvider.SaveProfiles();
-                    /* Show error message if necessary: */
-                    if (!comCloudProvider.isOk())
-                        msgCenter().cannotSaveCloudProfiles(comCloudProvider, this);
-                }
-            }
-        }
-    }
-
-    /* Notify listeners: */
-    emit sigChange();
-}
-
-void UICloudProfileManagerWidget::sltImportCloudProfiles()
-{
-    /* Get provider item: */
+    UIItemCloudConsoleApplication *pItemApplication = qobject_cast<UIItemCloudConsoleApplication*>(pItem);
+    AssertMsgReturnVoid(pItemApplication, ("Application item must not be null!\n"));
+    const QString strApplicationId = pItemApplication->id();
+
+    /* Confirm cloud console application removal: */
+    if (!msgCenter().confirmCloudConsoleApplicationRemoval(pItemApplication->name(), this))
+        return;
+
+    /* Enumerate all the application profiles: */
+    for (int i = 0; i < pItemApplication->childCount(); ++i)
+    {
+        /* Get console profile item: */
+        QITreeWidgetItem *pItem = pItemApplication->childItem(i);
+        UIItemCloudConsoleProfile *pItemProfile = qobject_cast<UIItemCloudConsoleProfile*>(pItem);
+        AssertMsgReturnVoid(pItemProfile, ("Profile item must not be null!\n"));
+
+        /* Delete profile from extra-data: */
+        gEDataManager->setCloudConsoleManagerProfile(strApplicationId, pItemProfile->id(), QString());
+    }
+
+    /* Delete application from extra-data: */
+    gEDataManager->setCloudConsoleManagerApplication(strApplicationId, QString());
+}
+
+void UICloudConsoleManagerWidget::sltAddCloudConsoleProfile()
+{
+    /* Check current-item type: */
     QITreeWidgetItem *pItem = QITreeWidgetItem::toItem(m_pTreeWidget->currentItem());
-    UIItemCloudProvider *pProviderItem = qobject_cast<UIItemCloudProvider*>(pItem);
-    AssertMsgReturnVoid(pProviderItem, ("Current item must not be null!\n"));
-
-    /* If there are profiles exist => confirm cloud profile import. */
-    if (   pProviderItem->childCount() != 0
-        && !msgCenter().confirmCloudProfilesImport(this))
+    AssertMsgReturnVoid(pItem, ("Current item must not be null!\n"));
+    UIItemCloudConsoleApplication *pItemApplication = 0;
+    switch (pItem->data(Column_Name, Data_ItemType).value<CloudConsoleItemType>())
+    {
+        case CloudConsoleItemType_Application:
+            pItemApplication = qobject_cast<UIItemCloudConsoleApplication*>(pItem);
+            break;
+        case CloudConsoleItemType_Profile:
+            pItemApplication = qobject_cast<UIItemCloudConsoleApplication*>(pItem->parentItem());
+            break;
+        case CloudConsoleItemType_Invalid:
+            break;
+    }
+    AssertMsgReturnVoid(pItemApplication, ("Application item must not be null!\n"));
+    const QString strApplicationId = pItemApplication->id();
+
+    /* Acquire profile attributes: */
+    QString strId;
+    QString strProfileName;
+    QString strProfileArgument;
+    bool fCancelled = true;
+    QPointer<UIInputDialogCloudConsoleProfile> pDialog = new UIInputDialogCloudConsoleProfile(this);
+    if (pDialog)
+    {
+        if (pDialog->exec() == QDialog::Accepted)
+        {
+            strId = QUuid::createUuid().toString().remove(QRegExp("[{}]"));
+            strProfileName = pDialog->name();
+            strProfileArgument = pDialog->argument();
+            fCancelled = false;
+        }
+        delete pDialog;
+    }
+    if (fCancelled)
         return;
 
-    /* Get VirtualBox for further activities: */
-    const CVirtualBox comVBox = uiCommon().virtualBox();
-
-    /* Get CloudProviderManager for further activities: */
-    CCloudProviderManager comCloudProviderManager = comVBox.GetCloudProviderManager();
-    /* Show error message if necessary: */
-    if (!comVBox.isOk())
-        msgCenter().cannotAcquireCloudProviderManager(comVBox, this);
-    else
-    {
-        /* Acquire provider ID: */
-        const QUuid uId = pProviderItem->data(Column_Name, Data_ProviderID).toUuid();
-
-        /* Look for corresponding provider: */
-        CCloudProvider comCloudProvider = comCloudProviderManager.GetProviderById(uId);
-        /* Show error message if necessary: */
-        if (!comCloudProviderManager.isOk())
-            msgCenter().cannotFindCloudProvider(comCloudProviderManager, uId, this);
-        else
-        {
-            /* Import profiles: */
-            comCloudProvider.ImportProfiles();
-
-            /* Show error message if necessary: */
-            if (!comCloudProvider.isOk())
-                msgCenter().cannotImportCloudProfiles(comCloudProvider, this);
-            else
-                loadCloudStuff();
-        }
-    }
-
-    /* Notify listeners: */
-    emit sigChange();
-}
-
-void UICloudProfileManagerWidget::sltRemoveCloudProfile()
-{
-    /* Get profile item: */
+    /* Update current-item definition: */
+    m_strDefinition = QString("/%1/%2").arg(strApplicationId, strId);
+    /* Compose extra-data superset: */
+    const QString strValue = QString("%1,%2").arg(strProfileName, strProfileArgument);
+
+    /* Save new console profile to extra-data: */
+    gEDataManager->setCloudConsoleManagerProfile(strApplicationId, strId, strValue);
+}
+
+void UICloudConsoleManagerWidget::sltRemoveCloudConsoleProfile()
+{
+    /* Get console profile item: */
     QITreeWidgetItem *pItem = QITreeWidgetItem::toItem(m_pTreeWidget->currentItem());
-    UIItemCloudProfile *pProfileItem = qobject_cast<UIItemCloudProfile*>(pItem);
-    AssertMsgReturnVoid(pProfileItem, ("Current item must not be null!\n"));
-
-    /* Get profile name: */
-    const QString strProfileName(pProfileItem->name());
-
-    /* Confirm cloud profile removal: */
-    if (!msgCenter().confirmCloudProfileRemoval(strProfileName, this))
+    UIItemCloudConsoleProfile *pItemProfile = qobject_cast<UIItemCloudConsoleProfile*>(pItem);
+    AssertMsgReturnVoid(pItemProfile, ("Profile item must not be null!\n"));
+
+    /* Confirm cloud console profile removal: */
+    if (!msgCenter().confirmCloudConsoleProfileRemoval(pItemProfile->name(), this))
         return;
 
-    /* Get VirtualBox for further activities: */
-    const CVirtualBox comVBox = uiCommon().virtualBox();
-
-    /* Get CloudProviderManager for further activities: */
-    CCloudProviderManager comCloudProviderManager = comVBox.GetCloudProviderManager();
-    /* Show error message if necessary: */
-    if (!comVBox.isOk())
-        msgCenter().cannotAcquireCloudProviderManager(comVBox, this);
-    else
-    {
-        /* Get provider item: */
-        UIItemCloudProvider *pProviderItem = qobject_cast<UIItemCloudProvider*>(pProfileItem->parentItem());
-        /* Acquire provider ID: */
-        const QUuid uId = pProviderItem->data(Column_Name, Data_ProviderID).toUuid();
-
-        /* Look for corresponding provider: */
-        CCloudProvider comCloudProvider = comCloudProviderManager.GetProviderById(uId);
-        /* Show error message if necessary: */
-        if (!comCloudProviderManager.isOk())
-            msgCenter().cannotFindCloudProvider(comCloudProviderManager, uId, this);
-        else
-        {
-            /* Look for corresponding profile: */
-            CCloudProfile comCloudProfile = comCloudProvider.GetProfileByName(strProfileName);
-            /* Show error message if necessary: */
-            if (!comCloudProvider.isOk())
-                msgCenter().cannotFindCloudProfile(comCloudProvider, strProfileName, this);
-            else
-            {
-                /* Remove current profile: */
-                comCloudProfile.Remove();
-                /// @todo how do we check that?
-
-                /* Remove interface from the tree: */
-                delete pProfileItem;
-
-                /* Save profile changes: */
-                comCloudProvider.SaveProfiles();
-                /* Show error message if necessary: */
-                if (!comCloudProvider.isOk())
-                    msgCenter().cannotSaveCloudProfiles(comCloudProvider, this);
-            }
-        }
-    }
-
-    /* Notify listeners: */
-    emit sigChange();
-}
-
-void UICloudProfileManagerWidget::sltToggleCloudProfileDetailsVisibility(bool fVisible)
+    /* Delete profile from extra-data: */
+    gEDataManager->setCloudConsoleManagerProfile(pItemProfile->applicationId(), pItemProfile->id(), QString());
+}
+
+void UICloudConsoleManagerWidget::sltToggleCloudConsoleDetailsVisibility(bool fVisible)
 {
     /* Save the setting: */
-    gEDataManager->setCloudProfileManagerDetailsExpanded(fVisible);
+    gEDataManager->setCloudConsoleManagerDetailsExpanded(fVisible);
     /* Show/hide details area and Apply button: */
     m_pDetailsWidget->setVisible(fVisible);
     /* Notify external lsiteners: */
-    emit sigCloudProfileDetailsVisibilityChanged(fVisible);
-}
-
-void UICloudProfileManagerWidget::sltShowCloudProfileTryPage()
-{
-    uiCommon().openURL("https://myservices.us.oraclecloud.com/mycloud/signup");
-}
-
-void UICloudProfileManagerWidget::sltShowCloudProfileHelp()
-{
-    uiCommon().openURL("https://docs.cloud.oracle.com/iaas/Content/API/Concepts/sdkconfig.htm");
-}
-
-void UICloudProfileManagerWidget::sltPerformTableAdjustment()
+    emit sigCloudConsoleDetailsVisibilityChanged(fVisible);
+}
+
+void UICloudConsoleManagerWidget::sltPerformTableAdjustment()
 {
     AssertPtrReturnVoid(m_pTreeWidget);
@@ -513 +649 @@
 }
 
-void UICloudProfileManagerWidget::sltHandleCurrentItemChange()
+void UICloudConsoleManagerWidget::sltHandleCurrentItemChange()
 {
     /* Check current-item type: */
     QITreeWidgetItem *pItem = QITreeWidgetItem::toItem(m_pTreeWidget->currentItem());
-    UIItemCloudProvider *pItemProvider = qobject_cast<UIItemCloudProvider*>(pItem);
-    UIItemCloudProfile *pItemProfile = qobject_cast<UIItemCloudProfile*>(pItem);
+    UIItemCloudConsoleApplication *pItemApplication = qobject_cast<UIItemCloudConsoleApplication*>(pItem);
+    UIItemCloudConsoleProfile *pItemProfile = qobject_cast<UIItemCloudConsoleProfile*>(pItem);
 
     /* Update actions availability: */
-    m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add)->setEnabled(!pItem || pItemProvider);
-    m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import)->setEnabled(!pItem || pItemProvider);
-    m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove)->setEnabled(pItemProfile);
-    m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)->setEnabled(pItemProfile || pItemProvider);
-
-    /* If there is an item => update details data: */
-    if (pItemProfile)
-        m_pDetailsWidget->setData(*pItemProfile);
-    /* Otherwise => clear details data: */
+    m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationAdd)->setEnabled(!pItem || pItemApplication);
+    m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationRemove)->setEnabled(pItemApplication);
+    m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileAdd)->setEnabled(pItemApplication || pItemProfile);
+    m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileRemove)->setEnabled(pItemProfile);
+    m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details)->setEnabled(pItemApplication || pItemProfile);
+
+    /* Update current-item definition: */
+    if (pItem)
+        m_strDefinition = pItem->data(Column_Name, Data_Definition).toString();
+
+    /* Update details data: */
+    if (pItemApplication)
+        m_pDetailsWidget->setApplicationData(*pItemApplication);
+    else if (pItemProfile)
+        m_pDetailsWidget->setProfileData(*pItemProfile);
     else
-        m_pDetailsWidget->setData(UIDataCloudProfile());
+        m_pDetailsWidget->clearData();
 
     /* Update details area visibility: */
-    sltToggleCloudProfileDetailsVisibility(pItem && m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)->isChecked());
-}
-
-void UICloudProfileManagerWidget::sltHandleContextMenuRequest(const QPoint &position)
-{
-    /* Check clicked-item type: */
+    sltToggleCloudConsoleDetailsVisibility(pItem && m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details)->isChecked());
+}
+
+void UICloudConsoleManagerWidget::sltHandleContextMenuRequest(const QPoint &position)
+{
+    /* Check item type: */
     QITreeWidgetItem *pItem = QITreeWidgetItem::toItem(m_pTreeWidget->itemAt(position));
-    UIItemCloudProvider *pItemProvider = qobject_cast<UIItemCloudProvider*>(pItem);
-    UIItemCloudProfile *pItemProfile = qobject_cast<UIItemCloudProfile*>(pItem);
+    UIItemCloudConsoleApplication *pItemApplication = qobject_cast<UIItemCloudConsoleApplication*>(pItem);
+    UIItemCloudConsoleProfile *pItemProfile = qobject_cast<UIItemCloudConsoleProfile*>(pItem);
 
     /* Compose temporary context-menu: */
     QMenu menu;
-    if (pItemProfile)
-    {
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details));
-    }
-    else if (pItemProvider)
-    {
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details));
-    }
+    if (pItemApplication)
+    {
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationRemove));
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileAdd));
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details));
+    }
+    else if (pItemProfile)
+    {
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileRemove));
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details));
+    }
+    else
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationAdd));
 
     /* And show it: */
@@ -562 +706 @@
 }
 
-void UICloudProfileManagerWidget::sltHandleItemChange(QTreeWidgetItem *pItem)
+void UICloudConsoleManagerWidget::sltHandleItemChange(QTreeWidgetItem *pItem)
 {
     /* Check item type: */
     QITreeWidgetItem *pChangedItem = QITreeWidgetItem::toItem(pItem);
-    UIItemCloudProvider *pProviderItem = qobject_cast<UIItemCloudProvider*>(pChangedItem);
-    UIItemCloudProfile *pProfileItem = qobject_cast<UIItemCloudProfile*>(pChangedItem);
-
-    /* Check whether item is of provider or profile type, then check whether it changed: */
+    UIItemCloudConsoleApplication *pItemApplication = qobject_cast<UIItemCloudConsoleApplication*>(pChangedItem);
+    UIItemCloudConsoleProfile *pItemProfile = qobject_cast<UIItemCloudConsoleProfile*>(pChangedItem);
+
+    /* Check whether item is of application or profile type, then check whether it changed: */
     bool fChanged = false;
-    if (pProviderItem)
-    {
-        const UIDataCloudProvider oldData = *pProviderItem;
-        if (   (oldData.m_fRestricted && pProviderItem->checkState(Column_ListVMs) == Qt::Checked)
-            || (!oldData.m_fRestricted && pProviderItem->checkState(Column_ListVMs) == Qt::Unchecked))
+    if (pItemApplication)
+    {
+        const UIDataCloudConsoleApplication oldData = *pItemApplication;
+        if (   (oldData.m_fRestricted && pItemApplication->checkState(Column_ListInMenu) == Qt::Checked)
+            || (!oldData.m_fRestricted && pItemApplication->checkState(Column_ListInMenu) == Qt::Unchecked))
             fChanged = true;
     }
-    else if (pProfileItem)
-    {
-        const UIDataCloudProfile oldData = *pProfileItem;
-        if (   (oldData.m_fRestricted && pProfileItem->checkState(Column_ListVMs) == Qt::Checked)
-            || (!oldData.m_fRestricted && pProfileItem->checkState(Column_ListVMs) == Qt::Unchecked))
+    else if (pItemProfile)
+    {
+        const UIDataCloudConsoleProfile oldData = *pItemProfile;
+        if (   (oldData.m_fRestricted && pItemProfile->checkState(Column_ListInMenu) == Qt::Checked)
+            || (!oldData.m_fRestricted && pItemProfile->checkState(Column_ListInMenu) == Qt::Unchecked))
             fChanged = true;
     }
 
-    /* Gather Cloud Profile Manager restrictions and save them to extra-data: */
+    /* Gather Cloud Console Manager restrictions and save them to extra-data: */
     if (fChanged)
-        gEDataManager->setCloudProfileManagerRestrictions(gatherCloudProfileManagerRestrictions(m_pTreeWidget->invisibleRootItem()));
-}
-
-void UICloudProfileManagerWidget::prepare()
+        gEDataManager->setCloudConsoleManagerRestrictions(gatherCloudConsoleManagerRestrictions(m_pTreeWidget->invisibleRootItem()));
+}
+
+void UICloudConsoleManagerWidget::prepare()
 {
     /* Prepare actions: */
@@ -604 +748 @@
     retranslateUi();
 
-    /* Load cloud stuff: */
-    loadCloudStuff();
-}
-
-void UICloudProfileManagerWidget::prepareActions()
+    /* Load cloud console stuff: */
+    loadCloudConsoleStuff();
+}
+
+void UICloudConsoleManagerWidget::prepareActions()
 {
     /* First of all, add actions which has smaller shortcut scope: */
-    addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_TryPage));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Help));
-}
-
-void UICloudProfileManagerWidget::prepareWidgets()
+    addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationAdd));
+    addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationRemove));
+    addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileAdd));
+    addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileRemove));
+    addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details));
+}
+
+void UICloudConsoleManagerWidget::prepareWidgets()
 {
     /* Create main-layout: */
@@ -645 +788 @@
 }
 
-void UICloudProfileManagerWidget::prepareToolBar()
+void UICloudConsoleManagerWidget::prepareToolBar()
 {
     /* Create toolbar: */
@@ -657 +800 @@
 
         /* Add toolbar actions: */
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationAdd));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationRemove));
         m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileAdd));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileRemove));
         m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_TryPage));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Help));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details));
 
 #ifdef VBOX_WS_MAC
@@ -680 +822 @@
 }
 
-void UICloudProfileManagerWidget::prepareTreeWidget()
+void UICloudConsoleManagerWidget::prepareTreeWidget()
 {
     /* Create tree-widget: */
@@ -702 +844 @@
 }
 
-void UICloudProfileManagerWidget::prepareDetailsWidget()
+void UICloudConsoleManagerWidget::prepareDetailsWidget()
 {
     /* Create details-widget: */
-    m_pDetailsWidget = new UICloudProfileDetailsWidget(m_enmEmbedding);
+    m_pDetailsWidget = new UICloudConsoleDetailsWidget(m_enmEmbedding);
     if (m_pDetailsWidget)
     {
@@ -717 +859 @@
 }
 
-void UICloudProfileManagerWidget::prepareConnections()
+void UICloudConsoleManagerWidget::prepareConnections()
 {
     /* Action connections: */
-    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add), &QAction::triggered,
-            this, &UICloudProfileManagerWidget::sltAddCloudProfile);
-    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import), &QAction::triggered,
-            this, &UICloudProfileManagerWidget::sltImportCloudProfiles);
-    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove), &QAction::triggered,
-            this, &UICloudProfileManagerWidget::sltRemoveCloudProfile);
-    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details), &QAction::toggled,
-            this, &UICloudProfileManagerWidget::sltToggleCloudProfileDetailsVisibility);
-    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_TryPage), &QAction::triggered,
-            this, &UICloudProfileManagerWidget::sltShowCloudProfileTryPage);
-    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Help), &QAction::triggered,
-            this, &UICloudProfileManagerWidget::sltShowCloudProfileHelp);
+    connect(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationAdd), &QAction::triggered,
+            this, &UICloudConsoleManagerWidget::sltAddCloudConsoleApplication);
+    connect(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationRemove), &QAction::triggered,
+            this, &UICloudConsoleManagerWidget::sltRemoveCloudConsoleApplication);
+    connect(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileAdd), &QAction::triggered,
+            this, &UICloudConsoleManagerWidget::sltAddCloudConsoleProfile);
+    connect(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileRemove), &QAction::triggered,
+            this, &UICloudConsoleManagerWidget::sltRemoveCloudConsoleProfile);
+    connect(m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details), &QAction::toggled,
+            this, &UICloudConsoleManagerWidget::sltToggleCloudConsoleDetailsVisibility);
 
     /* Tree-widget connections: */
     connect(m_pTreeWidget, &QITreeWidget::resized,
-            this, &UICloudProfileManagerWidget::sltPerformTableAdjustment, Qt::QueuedConnection);
+            this, &UICloudConsoleManagerWidget::sltPerformTableAdjustment, Qt::QueuedConnection);
     connect(m_pTreeWidget->header(), &QHeaderView::sectionResized,
-            this, &UICloudProfileManagerWidget::sltPerformTableAdjustment, Qt::QueuedConnection);
+            this, &UICloudConsoleManagerWidget::sltPerformTableAdjustment, Qt::QueuedConnection);
     connect(m_pTreeWidget, &QITreeWidget::currentItemChanged,
-            this, &UICloudProfileManagerWidget::sltHandleCurrentItemChange);
+            this, &UICloudConsoleManagerWidget::sltHandleCurrentItemChange);
     connect(m_pTreeWidget, &QITreeWidget::customContextMenuRequested,
-            this, &UICloudProfileManagerWidget::sltHandleContextMenuRequest);
+            this, &UICloudConsoleManagerWidget::sltHandleContextMenuRequest);
     connect(m_pTreeWidget, &QITreeWidget::itemDoubleClicked,
-            m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details), &QAction::setChecked);
+            m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details), &QAction::setChecked);
     connect(m_pTreeWidget, &QITreeWidget::itemChanged,
-            this, &UICloudProfileManagerWidget::sltHandleItemChange);
+            this, &UICloudConsoleManagerWidget::sltHandleItemChange);
 
     /* Details-widget connections: */
-    connect(m_pDetailsWidget, &UICloudProfileDetailsWidget::sigDataChanged,
-            this, &UICloudProfileManagerWidget::sigCloudProfileDetailsDataChanged);
-    connect(m_pDetailsWidget, &UICloudProfileDetailsWidget::sigDataChangeRejected,
-            this, &UICloudProfileManagerWidget::sltResetCloudProfileDetailsChanges);
-    connect(m_pDetailsWidget, &UICloudProfileDetailsWidget::sigDataChangeAccepted,
-            this, &UICloudProfileManagerWidget::sltApplyCloudProfileDetailsChanges);
+    connect(m_pDetailsWidget, &UICloudConsoleDetailsWidget::sigDataChanged,
+            this, &UICloudConsoleManagerWidget::sigCloudConsoleDetailsDataChanged);
+    connect(m_pDetailsWidget, &UICloudConsoleDetailsWidget::sigDataChangeRejected,
+            this, &UICloudConsoleManagerWidget::sltResetCloudConsoleDetailsChanges);
+    connect(m_pDetailsWidget, &UICloudConsoleDetailsWidget::sigDataChangeAccepted,
+            this, &UICloudConsoleManagerWidget::sltApplyCloudConsoleDetailsChanges);
 
     /* Extra-data connections: */
-    connect(gEDataManager, &UIExtraDataManager::sigCloudProfileManagerRestrictionChange,
-            this, &UICloudProfileManagerWidget::sltLoadCloudStuff);
-}
-
-void UICloudProfileManagerWidget::loadSettings()
+    connect(gEDataManager, &UIExtraDataManager::sigCloudConsoleManagerDataChange,
+            this, &UICloudConsoleManagerWidget::sltLoadCloudConsoleStuff);
+    connect(gEDataManager, &UIExtraDataManager::sigCloudConsoleManagerRestrictionChange,
+            this, &UICloudConsoleManagerWidget::sltLoadCloudConsoleStuff);
+}
+
+void UICloudConsoleManagerWidget::loadSettings()
 {
     /* Details action/widget: */
-    m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)->setChecked(gEDataManager->cloudProfileManagerDetailsExpanded());
-    sltToggleCloudProfileDetailsVisibility(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)->isChecked());
-}
-
-void UICloudProfileManagerWidget::loadCloudStuff()
+    m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details)->setChecked(gEDataManager->cloudConsoleManagerDetailsExpanded());
+    sltToggleCloudConsoleDetailsVisibility(m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details)->isChecked());
+}
+
+void UICloudConsoleManagerWidget::loadCloudConsoleStuff()
 {
     /* Clear tree first of all: */
     m_pTreeWidget->clear();
 
-    /* Acquire cloud profile manager restrictions: */
-    const QStringList restrictions = gEDataManager->cloudProfileManagerRestrictions();
-
-    /* Iterate through existing providers: */
-    foreach (const CCloudProvider &comCloudProvider, listCloudProviders())
+    /* Acquire cloud console manager restrictions: */
+    const QStringList restrictions = gEDataManager->cloudConsoleManagerRestrictions();
+
+    /* Iterate through existing console applications: */
+    foreach (const QString &strApplicationId, gEDataManager->cloudConsoleManagerApplications())
     {
         /* Skip if we have nothing to populate: */
-        if (comCloudProvider.isNull())
+        if (strApplicationId.isEmpty())
             continue;
 
-        /* Load provider data: */
-        UIDataCloudProvider providerData;
-        loadCloudProvider(comCloudProvider, providerData);
-        const QString strProviderPath = QString("/%1").arg(providerData.m_strShortName);
-        providerData.m_fRestricted = restrictions.contains(strProviderPath);
-        createItemForCloudProvider(providerData, false);
-
-        /* Make sure provider item is properly inserted: */
-        UIItemCloudProvider *pItem = searchItem(providerData.m_uId);
-
-        /* Iterate through provider's profiles: */
-        foreach (const CCloudProfile &comCloudProfile, listCloudProfiles(comCloudProvider))
+        /* Compose extra-data superset: */
+        const QString strApplicationValue = gEDataManager->cloudConsoleManagerApplication(strApplicationId);
+        const QString strApplicationSuperset = QString("%1,%2").arg(strApplicationId, strApplicationValue);
+
+        /* Load console application data: */
+        UIDataCloudConsoleApplication applicationData;
+        loadCloudConsoleApplication(strApplicationSuperset, applicationData);
+        const QString strApplicationDefinition = QString("/%1").arg(applicationData.m_strId);
+        applicationData.m_fRestricted = restrictions.contains(strApplicationDefinition);
+        createItemForCloudConsoleApplication(applicationData, false);
+
+        /* Make sure console applications item is properly inserted: */
+        UIItemCloudConsoleApplication *pItem = searchApplicationItem(applicationData.m_strId);
+
+        /* Iterate through applications's profiles: */
+        foreach (const QString &strProfileId, gEDataManager->cloudConsoleManagerProfiles(strApplicationId))
         {
             /* Skip if we have nothing to populate: */
-            if (comCloudProfile.isNull())
+            if (strProfileId.isEmpty())
                 continue;
 
-            /* Load profile data: */
-            UIDataCloudProfile profileData;
-            loadCloudProfile(comCloudProfile, providerData, profileData);
-            const QString strProfilePath = QString("/%1/%2").arg(providerData.m_strShortName).arg(profileData.m_strName);
-            profileData.m_fRestricted = restrictions.contains(strProfilePath);
-            createItemForCloudProfile(pItem, profileData, false);
-        }
-
-        /* Expand provider item finally: */
+            /* Compose extra-data superset: */
+            const QString strProfileValue = gEDataManager->cloudConsoleManagerProfile(strApplicationId, strProfileId);
+            const QString strProfileSuperset = QString("%1,%2").arg(strProfileId, strProfileValue);
+
+            /* Load console profile data: */
+            UIDataCloudConsoleProfile profileData;
+            loadCloudConsoleProfile(strProfileSuperset, applicationData, profileData);
+            const QString strProfileDefinition = QString("/%1/%2").arg(applicationData.m_strId).arg(profileData.m_strId);
+            profileData.m_fRestricted = restrictions.contains(strProfileDefinition);
+            createItemForCloudConsoleProfile(pItem, profileData, false);
+        }
+
+        /* Expand console application item finally: */
         pItem->setExpanded(true);
     }
 
-    /* Choose the 1st item as current initially: */
-    m_pTreeWidget->setCurrentItem(m_pTreeWidget->topLevelItem(0));
+    /* Choose previous current-item if possible: */
+    if (!m_strDefinition.isEmpty())
+        m_pTreeWidget->setCurrentItem(searchItemByDefinition(m_strDefinition));
+    /* Choose the 1st item as current if nothing chosen: */
+    if (!m_pTreeWidget->currentItem())
+        m_pTreeWidget->setCurrentItem(m_pTreeWidget->childItem(0));
+    /* Make sure current-item is fetched: */
     sltHandleCurrentItemChange();
 }
 
-void UICloudProfileManagerWidget::loadCloudProvider(const CCloudProvider &comProvider,
-                                                    UIDataCloudProvider &providerData)
-{
-    /* Gather provider settings: */
-    if (comProvider.isOk())
-        providerData.m_uId = comProvider.GetId();
-    if (comProvider.isOk())
-        providerData.m_strShortName = comProvider.GetShortName();
-    if (comProvider.isOk())
-        providerData.m_strName = comProvider.GetName();
-    foreach (const QString &strSupportedPropertyName, comProvider.GetSupportedPropertyNames())
-        providerData.m_propertyDescriptions[strSupportedPropertyName] = comProvider.GetPropertyDescription(strSupportedPropertyName);
-
-    /* Show error message if necessary: */
-    if (!comProvider.isOk())
-        msgCenter().cannotAcquireCloudProviderParameter(comProvider, this);
-}
-
-void UICloudProfileManagerWidget::loadCloudProfile(const CCloudProfile &comProfile,
-                                                   const UIDataCloudProvider &providerData,
-                                                   UIDataCloudProfile &profileData)
-{
-    /* Gather provider settings: */
-    profileData.m_strProviderShortName = providerData.m_strShortName;
+void UICloudConsoleManagerWidget::loadCloudConsoleApplication(const QString &strSuperset,
+                                                              UIDataCloudConsoleApplication &applicationData)
+{
+    /* Parse superset: */
+    const QStringList values = strSuperset.split(',');
+
+    /* Gather application settings: */
+    applicationData.m_strId = values.value(0);
+    applicationData.m_strName = values.value(1);
+    applicationData.m_strPath = values.value(2);
+}
+
+void UICloudConsoleManagerWidget::loadCloudConsoleProfile(const QString &strSuperset,
+                                                          const UIDataCloudConsoleApplication &applicationData,
+                                                          UIDataCloudConsoleProfile &profileData)
+{
+    /* Gather application settings: */
+    profileData.m_strApplicationId = applicationData.m_strId;
+
+    /* Parse superset: */
+    const QStringList values = strSuperset.split(',');
 
     /* Gather profile settings: */
-    if (comProfile.isOk())
-        profileData.m_strName = comProfile.GetName();
-
-    if (comProfile.isOk())
-    {
-        /* Acquire properties: */
-        QVector<QString> keys;
-        QVector<QString> values;
-        QVector<QString> descriptions;
-        values = comProfile.GetProperties(QString(), keys);
-
-        /* Sync sizes: */
-        values.resize(keys.size());
-        descriptions.resize(keys.size());
-
-        if (comProfile.isOk())
-        {
-            /* Enumerate all the keys: */
-            for (int i = 0; i < keys.size(); ++i)
-                profileData.m_data[keys.at(i)] = qMakePair(values.at(i), providerData.m_propertyDescriptions.value(keys.at(i)));
-        }
-    }
-
-    /* Show error message if necessary: */
-    if (!comProfile.isOk())
-        msgCenter().cannotAcquireCloudProfileParameter(comProfile, this);
-}
-
-UIItemCloudProvider *UICloudProfileManagerWidget::searchItem(const QUuid &uId) const
+    profileData.m_strId = values.value(0);
+    profileData.m_strName = values.value(1);
+    profileData.m_strArgument = values.value(2);
+}
+
+UIItemCloudConsoleApplication *UICloudConsoleManagerWidget::searchApplicationItem(const QString &strApplicationId) const
 {
     /* Iterate through tree-widget children: */
     for (int i = 0; i < m_pTreeWidget->childCount(); ++i)
-        if (m_pTreeWidget->childItem(i)->data(Column_Name, Data_ProviderID).toUuid() == uId)
-            return qobject_cast<UIItemCloudProvider*>(m_pTreeWidget->childItem(i));
+        if (m_pTreeWidget->childItem(i)->data(Column_Name, Data_ItemID).toString() == strApplicationId)
+            return qobject_cast<UIItemCloudConsoleApplication*>(m_pTreeWidget->childItem(i));
     /* Null by default: */
     return 0;
 }
 
-void UICloudProfileManagerWidget::createItemForCloudProvider(const UIDataCloudProvider &providerData,
-                                                             bool fChooseItem)
-{
-    /* Create new provider item: */
-    UIItemCloudProvider *pItem = new UIItemCloudProvider;
+UIItemCloudConsoleProfile *UICloudConsoleManagerWidget::searchProfileItem(const QString &strApplicationId,
+                                                                          const QString &strProfileId) const
+{
+    /* Search for application item first: */
+    UIItemCloudConsoleApplication *pItemApplication = searchApplicationItem(strApplicationId);
+    /* Iterate through application children: */
+    for (int i = 0; i < pItemApplication->childCount(); ++i)
+        if (pItemApplication->childItem(i)->data(Column_Name, Data_ItemID).toString() == strProfileId)
+            return qobject_cast<UIItemCloudConsoleProfile*>(pItemApplication->childItem(i));
+    /* Null by default: */
+    return 0;
+}
+
+QITreeWidgetItem *UICloudConsoleManagerWidget::searchItemByDefinition(const QString &strDefinition) const
+{
+    /* Parse definition: */
+    const QStringList parts = strDefinition.split('/', QString::SkipEmptyParts);
+    /* Depending on parts amount: */
+    switch (parts.size())
+    {
+        case 1: return searchApplicationItem(parts.at(0));
+        case 2: return searchProfileItem(parts.at(0), parts.at(1));
+        default: break;
+    }
+    /* Null by default: */
+    return 0;
+}
+
+void UICloudConsoleManagerWidget::createItemForCloudConsoleApplication(const UIDataCloudConsoleApplication &applicationData,
+                                                                       bool fChooseItem)
+{
+    /* Create new console application item: */
+    UIItemCloudConsoleApplication *pItem = new UIItemCloudConsoleApplication;
     if (pItem)
     {
         /* Configure item: */
-        pItem->UIDataCloudProvider::operator=(providerData);
+        pItem->UIDataCloudConsoleApplication::operator=(applicationData);
         pItem->updateFields();
         /* Add item to the tree: */
@@ -898 +1055 @@
 }
 
-void UICloudProfileManagerWidget::createItemForCloudProfile(QTreeWidgetItem *pParent,
-                                                            const UIDataCloudProfile &profileData,
-                                                            bool fChooseItem)
-{
-    /* Create new profile item: */
-    UIItemCloudProfile *pItem = new UIItemCloudProfile;
+void UICloudConsoleManagerWidget::createItemForCloudConsoleProfile(QTreeWidgetItem *pParent,
+                                                                   const UIDataCloudConsoleProfile &profileData,
+                                                                   bool fChooseItem)
+{
+    /* Create new console profile item: */
+    UIItemCloudConsoleProfile *pItem = new UIItemCloudConsoleProfile;
     if (pItem)
     {
         /* Configure item: */
-        pItem->UIDataCloudProfile::operator=(profileData);
+        pItem->UIDataCloudConsoleProfile::operator=(profileData);
         pItem->updateFields();
         /* Add item to the parent: */
@@ -917 +1074 @@
 }
 
-void UICloudProfileManagerWidget::updateItemForCloudProfile(const UIDataCloudProfile &profileData, bool fChooseItem, UIItemCloudProfile *pItem)
-{
-    /* Update passed item: */
-    if (pItem)
-    {
-        /* Configure item: */
-        pItem->UIDataCloudProfile::operator=(profileData);
-        pItem->updateFields();
-        /* And choose it as current if necessary: */
-        if (fChooseItem)
-            m_pTreeWidget->setCurrentItem(pItem);
-    }
-}
-
-QStringList UICloudProfileManagerWidget::gatherCloudProfileManagerRestrictions(QTreeWidgetItem *pParentItem)
+QStringList UICloudConsoleManagerWidget::gatherCloudConsoleManagerRestrictions(QTreeWidgetItem *pParentItem)
 {
     /* Prepare result: */
@@ -940 +1083 @@
     QITreeWidgetItem *pChangedItem = QITreeWidgetItem::toItem(pParentItem);
     if (   pChangedItem
-        && pChangedItem->checkState(Column_ListVMs) == Qt::Unchecked)
+        && pChangedItem->checkState(Column_ListInMenu) == Qt::Unchecked)
         result << pChangedItem->data(Column_Name, Data_Definition).toString();
 
     /* Iterate through children recursively: */
     for (int i = 0; i < pParentItem->childCount(); ++i)
-        result << gatherCloudProfileManagerRestrictions(pParentItem->child(i));
+        result << gatherCloudConsoleManagerRestrictions(pParentItem->child(i));
 
     /* Return result: */
@@ -953 +1096 @@
 
 /*********************************************************************************************************************************
-*   Class UICloudProfileManagerFactory implementation.                                                                           *
+*   Class UICloudConsoleManagerFactory implementation.                                                                           *
 *********************************************************************************************************************************/
 
-UICloudProfileManagerFactory::UICloudProfileManagerFactory(UIActionPool *pActionPool /* = 0 */)
+UICloudConsoleManagerFactory::UICloudConsoleManagerFactory(UIActionPool *pActionPool /* = 0 */)
     : m_pActionPool(pActionPool)
 {
 }
 
-void UICloudProfileManagerFactory::create(QIManagerDialog *&pDialog, QWidget *pCenterWidget)
-{
-    pDialog = new UICloudProfileManager(pCenterWidget, m_pActionPool);
+void UICloudConsoleManagerFactory::create(QIManagerDialog *&pDialog, QWidget *pCenterWidget)
+{
+    pDialog = new UICloudConsoleManager(pCenterWidget, m_pActionPool);
 }
 
 
 /*********************************************************************************************************************************
-*   Class UICloudProfileManager implementation.                                                                                  *
+*   Class UICloudConsoleManager implementation.                                                                                  *
 *********************************************************************************************************************************/
 
-UICloudProfileManager::UICloudProfileManager(QWidget *pCenterWidget, UIActionPool *pActionPool)
+UICloudConsoleManager::UICloudConsoleManager(QWidget *pCenterWidget, UIActionPool *pActionPool)
     : QIWithRetranslateUI<QIManagerDialog>(pCenterWidget)
     , m_pActionPool(pActionPool)
@@ -977 +1120 @@
 }
 
-void UICloudProfileManager::sltHandleButtonBoxClick(QAbstractButton *pButton)
+void UICloudConsoleManager::sltHandleButtonBoxClick(QAbstractButton *pButton)
 {
     /* Disable buttons first of all: */
@@ -991 +1134 @@
 }
 
-void UICloudProfileManager::retranslateUi()
+void UICloudConsoleManager::retranslateUi()
 {
     /* Translate window title: */
-    setWindowTitle(tr("Cloud Profile Manager"));
+    setWindowTitle(tr("Cloud Console Manager"));
 
     /* Translate buttons: */
@@ -1000 +1143 @@
     button(ButtonType_Apply)->setText(tr("Apply"));
     button(ButtonType_Close)->setText(tr("Close"));
-    button(ButtonType_Reset)->setStatusTip(tr("Reset changes in current cloud profile details"));
-    button(ButtonType_Apply)->setStatusTip(tr("Apply changes in current cloud profile details"));
+    button(ButtonType_Reset)->setStatusTip(tr("Reset changes in current cloud console details"));
+    button(ButtonType_Apply)->setStatusTip(tr("Apply changes in current cloud console details"));
     button(ButtonType_Close)->setStatusTip(tr("Close dialog without saving"));
     button(ButtonType_Reset)->setShortcut(QString("Ctrl+Backspace"));
@@ -1011 +1154 @@
 }
 
-void UICloudProfileManager::configure()
+void UICloudConsoleManager::configure()
 {
     /* Apply window icons: */
-    setWindowIcon(UIIconPool::iconSetFull(":/cloud_profile_manager_32px.png", ":/cloud_profile_manager_16px.png"));
-}
-
-void UICloudProfileManager::configureCentralWidget()
+    setWindowIcon(UIIconPool::iconSetFull(":/cloud_console_manager_32px.png", ":/cloud_console_manager_16px.png")); /// @todo use proper icon
+}
+
+void UICloudConsoleManager::configureCentralWidget()
 {
     /* Create widget: */
-    UICloudProfileManagerWidget *pWidget = new UICloudProfileManagerWidget(EmbedTo_Dialog, m_pActionPool, true, this);
+    UICloudConsoleManagerWidget *pWidget = new UICloudConsoleManagerWidget(EmbedTo_Dialog, m_pActionPool, true, this);
     if (pWidget)
     {
@@ -1029 +1172 @@
         setWidgetToolbar(pWidget->toolbar());
 #endif
-        connect(pWidget, &UICloudProfileManagerWidget::sigChange,
-                this, &UICloudProfileManager::sigChange);
-        connect(this, &UICloudProfileManager::sigDataChangeRejected,
-                pWidget, &UICloudProfileManagerWidget::sltResetCloudProfileDetailsChanges);
-        connect(this, &UICloudProfileManager::sigDataChangeAccepted,
-                pWidget, &UICloudProfileManagerWidget::sltApplyCloudProfileDetailsChanges);
+        connect(this, &UICloudConsoleManager::sigDataChangeRejected,
+                pWidget, &UICloudConsoleManagerWidget::sltResetCloudConsoleDetailsChanges);
+        connect(this, &UICloudConsoleManager::sigDataChangeAccepted,
+                pWidget, &UICloudConsoleManagerWidget::sltApplyCloudConsoleDetailsChanges);
 
         /* Add into layout: */
@@ -1041 +1182 @@
 }
 
-void UICloudProfileManager::configureButtonBox()
+void UICloudConsoleManager::configureButtonBox()
 {
     /* Configure button-box: */
-    connect(widget(), &UICloudProfileManagerWidget::sigCloudProfileDetailsVisibilityChanged,
+    connect(widget(), &UICloudConsoleManagerWidget::sigCloudConsoleDetailsVisibilityChanged,
             button(ButtonType_Apply), &QPushButton::setVisible);
-    connect(widget(), &UICloudProfileManagerWidget::sigCloudProfileDetailsVisibilityChanged,
+    connect(widget(), &UICloudConsoleManagerWidget::sigCloudConsoleDetailsVisibilityChanged,
             button(ButtonType_Reset), &QPushButton::setVisible);
-    connect(widget(), &UICloudProfileManagerWidget::sigCloudProfileDetailsDataChanged,
+    connect(widget(), &UICloudConsoleManagerWidget::sigCloudConsoleDetailsDataChanged,
             button(ButtonType_Apply), &QPushButton::setEnabled);
-    connect(widget(), &UICloudProfileManagerWidget::sigCloudProfileDetailsDataChanged,
+    connect(widget(), &UICloudConsoleManagerWidget::sigCloudConsoleDetailsDataChanged,
             button(ButtonType_Reset), &QPushButton::setEnabled);
     connect(buttonBox(), &QIDialogButtonBox::clicked,
-            this, &UICloudProfileManager::sltHandleButtonBoxClick);
+            this, &UICloudConsoleManager::sltHandleButtonBoxClick);
     // WORKAROUND:
     // Since we connected signals later than extra-data loaded
     // for signals above, we should handle that stuff here again:
-    button(ButtonType_Apply)->setVisible(gEDataManager->cloudProfileManagerDetailsExpanded());
-    button(ButtonType_Reset)->setVisible(gEDataManager->cloudProfileManagerDetailsExpanded());
-}
-
-void UICloudProfileManager::finalize()
+    button(ButtonType_Apply)->setVisible(gEDataManager->cloudConsoleManagerDetailsExpanded());
+    button(ButtonType_Reset)->setVisible(gEDataManager->cloudConsoleManagerDetailsExpanded());
+}
+
+void UICloudConsoleManager::finalize()
 {
     /* Apply language settings: */
@@ -1067 +1208 @@
 }
 
-UICloudProfileManagerWidget *UICloudProfileManager::widget()
-{
-    return qobject_cast<UICloudProfileManagerWidget*>(QIManagerDialog::widget());
-}
-
-
-#include "UICloudProfileManager.moc"
+UICloudConsoleManagerWidget *UICloudConsoleManager::widget()
+{
+    return qobject_cast<UICloudConsoleManagerWidget*>(QIManagerDialog::widget());
+}
+
+
+#include "UICloudConsoleManager.moc"

trunk/src/VBox/Frontends/VirtualBox/src/cloud/consolemanager/UICloudConsoleManager.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UICloudProfileManager class declaration.
+ * VBox Qt GUI - UICloudConsoleManager class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_cloud_profilemanager_UICloudProfileManager_h
-#define FEQT_INCLUDED_SRC_cloud_profilemanager_UICloudProfileManager_h
+#ifndef FEQT_INCLUDED_SRC_cloud_consolemanager_UICloudConsoleManager_h
+#define FEQT_INCLUDED_SRC_cloud_consolemanager_UICloudConsoleManager_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -30 +30 @@
 class QTreeWidgetItem;
 class QITreeWidget;
+class QITreeWidgetItem;
 class UIActionPool;
-class UICloudProfileDetailsWidget;
-class UIItemCloudProfile;
-class UIItemCloudProvider;
+class UICloudConsoleDetailsWidget;
+class UIItemCloudConsoleApplication;
+class UIItemCloudConsoleProfile;
 class UIToolBar;
-struct UIDataCloudProfile;
-struct UIDataCloudProvider;
-class CCloudProfile;
-class CCloudProvider;
-
-
-/** QWidget extension providing GUI with the pane to control cloud profile related functionality. */
-class UICloudProfileManagerWidget : public QIWithRetranslateUI<QWidget>
+struct UIDataCloudConsoleApplication;
+struct UIDataCloudConsoleProfile;
+
+
+/** QWidget extension providing GUI with the pane to control cloud console related functionality. */
+class UICloudConsoleManagerWidget : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -48 +47 @@
 signals:
 
-    /** Notifies listeners about dialog change. */
-    void sigChange();
-
-    /** Notifies listeners about cloud profile details-widget @a fVisible. */
-    void sigCloudProfileDetailsVisibilityChanged(bool fVisible);
-    /** Notifies listeners about cloud profile details data @a fDiffers. */
-    void sigCloudProfileDetailsDataChanged(bool fDiffers);
+    /** Notifies listeners about cloud console details-widget @a fVisible. */
+    void sigCloudConsoleDetailsVisibilityChanged(bool fVisible);
+    /** Notifies listeners about cloud console details data @a fDiffers. */
+    void sigCloudConsoleDetailsDataChanged(bool fDiffers);
 
 public:
 
-    /** Constructs Cloud Profile Manager widget.
+    /** Constructs Cloud Console Manager widget.
       * @param  enmEmbedding  Brings the type of widget embedding.
       * @param  pActionPool   Brings the action-pool reference.
       * @param  fShowToolbar  Brings whether we should create/show toolbar. */
-    UICloudProfileManagerWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
+    UICloudConsoleManagerWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
                                 bool fShowToolbar = true, QWidget *pParent = 0);
 
@@ -85 +81 @@
     /** @name Details-widget stuff.
       * @{ */
-        /** Handles command to reset cloud profile details changes. */
-        void sltResetCloudProfileDetailsChanges();
-        /** Handles command to apply cloud profile details changes. */
-        void sltApplyCloudProfileDetailsChanges();
+        /** Handles command to reset cloud console details changes. */
+        void sltResetCloudConsoleDetailsChanges();
+        /** Handles command to apply cloud console details changes. */
+        void sltApplyCloudConsoleDetailsChanges();
     /** @} */
 
@@ -95 +91 @@
     /** @name Menu/action stuff.
       * @{ */
-        /** Handles command to add cloud profile. */
-        void sltAddCloudProfile();
-        /** Handles command to import cloud profiles. */
-        void sltImportCloudProfiles();
-        /** Handles command to remove cloud profile. */
-        void sltRemoveCloudProfile();
-        /** Handles command to make cloud profile details @a fVisible. */
-        void sltToggleCloudProfileDetailsVisibility(bool fVisible);
-        /** Handles command to show cloud profile try page. */
-        void sltShowCloudProfileTryPage();
-        /** Handles command to show cloud profile help. */
-        void sltShowCloudProfileHelp();
+        /** Handles command to add cloud console application. */
+        void sltAddCloudConsoleApplication();
+        /** Handles command to remove cloud console application. */
+        void sltRemoveCloudConsoleApplication();
+        /** Handles command to add cloud console profile. */
+        void sltAddCloudConsoleProfile();
+        /** Handles command to remove cloud console profile. */
+        void sltRemoveCloudConsoleProfile();
+        /** Handles command to make cloud console details @a fVisible. */
+        void sltToggleCloudConsoleDetailsVisibility(bool fVisible);
     /** @} */
 
     /** @name Tree-widget stuff.
       * @{ */
-        /** Handles request to load cloud stuff. */
-        void sltLoadCloudStuff() { loadCloudStuff(); }
+        /** Handles request to load cloud console stuff. */
+        void sltLoadCloudConsoleStuff() { loadCloudConsoleStuff(); }
         /** Adjusts tree-widget according content. */
         void sltPerformTableAdjustment();
@@ -147 +141 @@
     /** @name Loading stuff.
       * @{ */
-        /** Loads cloud stuff. */
-        void loadCloudStuff();
-        /** Loads cloud @a comProvider data to passed @a providerData container. */
-        void loadCloudProvider(const CCloudProvider &comProvider,
-                               UIDataCloudProvider &providerData);
-        /** Loads cloud @a comProfile data to passed @a profileData container, using @a providerData as hint. */
-        void loadCloudProfile(const CCloudProfile &comProfile,
-                              const UIDataCloudProvider &providerData,
-                              UIDataCloudProfile &profileData);
+        /** Loads cloud console stuff. */
+        void loadCloudConsoleStuff();
+        /** Loads cloud console @a strSuperset data to passed @a applicationData container. */
+        void loadCloudConsoleApplication(const QString &strSuperset,
+                                         UIDataCloudConsoleApplication &applicationData);
+        /** Loads cloud console @a strSuperset data to passed @a profileData container, using @a applicationData as hint. */
+        void loadCloudConsoleProfile(const QString &strSuperset,
+                                     const UIDataCloudConsoleApplication &applicationData,
+                                     UIDataCloudConsoleProfile &profileData);
     /** @} */
 
     /** @name Tree-widget stuff.
       * @{ */
-        /** Seearches a provider item with specified @a uId. */
-        UIItemCloudProvider *searchItem(const QUuid &uId) const;
+        /** Searches an application item with specified @a strApplicationId. */
+        UIItemCloudConsoleApplication *searchApplicationItem(const QString &strApplicationId) const;
+        /** Searches a profile child of application item with specified @a strApplicationId and @a strProfileId. */
+        UIItemCloudConsoleProfile *searchProfileItem(const QString &strApplicationId,
+                                                     const QString &strProfileId) const;
+        /** Searches an item with specified @a strDefinition. */
+        QITreeWidgetItem *searchItemByDefinition(const QString &strDefinition) const;
 
         /** Creates a new tree-widget item
-          * on the basis of passed @a providerData, @a fChooseItem if requested. */
-        void createItemForCloudProvider(const UIDataCloudProvider &providerData, bool fChooseItem);
+          * on the basis of passed @a applicationData, @a fChooseItem if requested. */
+        void createItemForCloudConsoleApplication(const UIDataCloudConsoleApplication &applicationData,
+                                                  bool fChooseItem);
 
         /** Creates a new tree-widget item as a child of certain @a pParent,
           * on the basis of passed @a profileData, @a fChooseItem if requested. */
-        void createItemForCloudProfile(QTreeWidgetItem *pParent, const UIDataCloudProfile &profileData, bool fChooseItem);
-        /** Updates the passed tree-widget item on the basis of passed @a profileData, @a fChooseItem if requested. */
-        void updateItemForCloudProfile(const UIDataCloudProfile &profileData, bool fChooseItem, UIItemCloudProfile *pItem);
-
-        /* Gathers a list of Cloud Profile Manager restrictions starting from @a pParentItem. */
-        QStringList gatherCloudProfileManagerRestrictions(QTreeWidgetItem *pParentItem);
+        void createItemForCloudConsoleProfile(QTreeWidgetItem *pParent,
+                                              const UIDataCloudConsoleProfile &profileData,
+                                              bool fChooseItem);
+
+        /* Gathers a list of Cloud Console Manager restrictions starting from @a pParentItem. */
+        QStringList gatherCloudConsoleManagerRestrictions(QTreeWidgetItem *pParentItem);
     /** @} */
 
@@ -185 +185 @@
         /** Holds whether we should create/show toolbar. */
         const bool    m_fShowToolbar;
+        /** Holds current item definition. */
+        QString       m_strDefinition;
     /** @} */
 
@@ -198 +200 @@
         QITreeWidget                *m_pTreeWidget;
         /** Holds the details-widget instance. */
-        UICloudProfileDetailsWidget *m_pDetailsWidget;
+        UICloudConsoleDetailsWidget *m_pDetailsWidget;
     /** @} */
 };
 
 
-/** QIManagerDialogFactory extension used as a factory for Cloud Profile Manager dialog. */
-class UICloudProfileManagerFactory : public QIManagerDialogFactory
+/** QIManagerDialogFactory extension used as a factory for Cloud Console Manager dialog. */
+class UICloudConsoleManagerFactory : public QIManagerDialogFactory
 {
 public:
 
-    /** Constructs Cloud Profile Manager factory acquiring additional arguments.
+    /** Constructs Cloud Console Manager actory acquiring additional arguments.
       * @param  pActionPool  Brings the action-pool reference. */
-    UICloudProfileManagerFactory(UIActionPool *pActionPool = 0);
+    UICloudConsoleManagerFactory(UIActionPool *pActionPool = 0);
 
 protected:
@@ -223 +225 @@
 
 
-/** QIManagerDialog extension providing GUI with the dialog to control cloud profile related functionality. */
-class UICloudProfileManager : public QIWithRetranslateUI<QIManagerDialog>
+/** QIManagerDialog extension providing GUI with the dialog to control cloud console related functionality. */
+class UICloudConsoleManager : public QIWithRetranslateUI<QIManagerDialog>
 {
     Q_OBJECT;
@@ -245 +247 @@
 private:
 
-    /** Constructs Cloud Profile Manager dialog.
+    /** Constructs Cloud Console Manager dialog.
       * @param  pCenterWidget  Brings the widget reference to center according to.
       * @param  pActionPool    Brings the action-pool reference. */
-    UICloudProfileManager(QWidget *pCenterWidget, UIActionPool *pActionPool);
+    UICloudConsoleManager(QWidget *pCenterWidget, UIActionPool *pActionPool);
 
     /** @name Event-handling stuff.
@@ -271 +273 @@
       * @{ */
         /** Returns the widget. */
-        virtual UICloudProfileManagerWidget *widget() /* override */;
+        virtual UICloudConsoleManagerWidget *widget() /* override */;
     /** @} */
 
@@ -281 +283 @@
 
     /** Allow factory access to private/protected members: */
-    friend class UICloudProfileManagerFactory;
+    friend class UICloudConsoleManagerFactory;
 };
 
-#endif /* !FEQT_INCLUDED_SRC_cloud_profilemanager_UICloudProfileManager_h */
+#endif /* !FEQT_INCLUDED_SRC_cloud_consolemanager_UICloudConsoleManager_h */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -113 +113 @@
 const char *UIExtraDataDefs::GUI_CloudProfileManager_Restrictions = "GUI/CloudProfileManager/Restrictions";
 const char *UIExtraDataDefs::GUI_CloudProfileManager_Details_Expanded = "GUI/CloudProfileManager/Details/Expanded";
+
+/* Cloud Console Manager: */
+const char *UIExtraDataDefs::GUI_CloudConsoleManager_Application = "GUI/CloudConsoleManager/Application";
+const char *UIExtraDataDefs::GUI_CloudConsoleManager_Restrictions = "GUI/CloudConsoleManager/Restrictions";
+const char *UIExtraDataDefs::GUI_CloudConsoleManager_Details_Expanded = "GUI/CloudConsoleManager/Details/Expanded";
 
 #ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI

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

@@ -220 +220 @@
         /** Holds whether Cloud Profile Manager details expanded. */
         SHARED_LIBRARY_STUFF extern const char *GUI_CloudProfileManager_Details_Expanded;
+    /** @} */
+
+    /** @name Cloud Console Manager
+      * @{ */
+        /** Holds Cloud Console Manager applications/profiles. */
+        SHARED_LIBRARY_STUFF extern const char *GUI_CloudConsoleManager_Application;
+        /** Holds Cloud Console Manager restrictions. */
+        SHARED_LIBRARY_STUFF extern const char *GUI_CloudConsoleManager_Restrictions;
+        /** Holds whether Cloud Console Manager details expanded. */
+        SHARED_LIBRARY_STUFF extern const char *GUI_CloudConsoleManager_Details_Expanded;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -578 +578 @@
     /** @name Actions
       * @{ */
-        /** */
+        /** Updates action availability. */
         void updateActionsAvailability();
     /** @} */
@@ -1931 +1931 @@
            << GUI_CloudProfileManager_Restrictions
            << GUI_CloudProfileManager_Details_Expanded
+           << GUI_CloudConsoleManager_Restrictions
+           << GUI_CloudConsoleManager_Details_Expanded
            << GUI_HideDescriptionForWizards
            << GUI_HideFromManager << GUI_HideDetails
@@ -2997 +2999 @@
 }
 
+QStringList UIExtraDataManager::cloudConsoleManagerApplications()
+{
+    /* Gather a list of keys matching required expression: */
+    QStringList result;
+    QRegExp re(QString("^%1/([^/]+)$").arg(GUI_CloudConsoleManager_Application));
+    foreach (const QString &strKey, m_data.value(GlobalID).keys())
+        if (re.indexIn(strKey) != -1)
+            result << re.cap(1);
+    return result;
+}
+
+QStringList UIExtraDataManager::cloudConsoleManagerProfiles(const QString &strId)
+{
+    /* Gather a list of keys matching required expression: */
+    QStringList result;
+    QRegExp re(QString("^%1/%2/([^/]+)$").arg(GUI_CloudConsoleManager_Application, strId));
+    foreach (const QString &strKey, m_data.value(GlobalID).keys())
+        if (re.indexIn(strKey) != -1)
+            result << re.cap(1);
+    return result;
+}
+
+QString UIExtraDataManager::cloudConsoleManagerApplication(const QString &strId)
+{
+    return extraDataString(QString("%1/%2").arg(GUI_CloudConsoleManager_Application, strId));
+}
+
+void UIExtraDataManager::setCloudConsoleManagerApplication(const QString &strId, const QString &strDefinition)
+{
+    setExtraDataString(QString("%1/%2").arg(GUI_CloudConsoleManager_Application, strId), strDefinition);
+}
+
+QString UIExtraDataManager::cloudConsoleManagerProfile(const QString &strApplicationId, const QString &strProfileId)
+{
+    return extraDataString(QString("%1/%2/%3").arg(GUI_CloudConsoleManager_Application, strApplicationId, strProfileId));
+}
+
+void UIExtraDataManager::setCloudConsoleManagerProfile(const QString &strApplicationId, const QString &strProfileId, const QString &strDefinition)
+{
+    setExtraDataString(QString("%1/%2/%3").arg(GUI_CloudConsoleManager_Application, strApplicationId, strProfileId), strDefinition);
+}
+
+QStringList UIExtraDataManager::cloudConsoleManagerRestrictions()
+{
+    return extraDataStringList(GUI_CloudConsoleManager_Restrictions);
+}
+
+void UIExtraDataManager::setCloudConsoleManagerRestrictions(const QStringList &restrictions)
+{
+    return setExtraDataStringList(GUI_CloudConsoleManager_Restrictions, restrictions);
+}
+
+bool UIExtraDataManager::cloudConsoleManagerDetailsExpanded()
+{
+    /* 'False' unless feature allowed: */
+    return isFeatureAllowed(GUI_CloudConsoleManager_Details_Expanded);
+}
+
+void UIExtraDataManager::setCloudConsoleManagerDetailsExpanded(bool fExpanded)
+{
+    /* 'True' if feature allowed, null-string otherwise: */
+    return setExtraDataString(GUI_CloudConsoleManager_Details_Expanded, toFeatureAllowed(fExpanded));
+}
+
 WizardMode UIExtraDataManager::modeForWizardType(WizardType type)
 {
@@ -4582 +4648 @@
             else if (strKey == GUI_CloudProfileManager_Restrictions)
                 emit sigCloudProfileManagerRestrictionChange();
+            /* Cloud Console Manager data changed: */
+            else if (strKey.startsWith(QString(GUI_CloudConsoleManager_Application) + '/'))
+                emit sigCloudConsoleManagerDataChange();
+            /* Cloud Console Manager restrictions changed: */
+            else if (strKey == GUI_CloudConsoleManager_Restrictions)
+                emit sigCloudConsoleManagerRestrictionChange();
             /* Details categories: */
             else if (strKey == GUI_Details_Elements)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -78 +78 @@
     /** Notifies about Cloud Profile Manager restriction change. */
     void sigCloudProfileManagerRestrictionChange();
+
+    /** Notifies about Cloud Console Manager data change. */
+    void sigCloudConsoleManagerDataChange();
+    /** Notifies about Cloud Console Manager restriction change. */
+    void sigCloudConsoleManagerRestrictionChange();
 
     /** Notifies about VirtualBox Manager / Details pane categories change. */
@@ -417 +422 @@
         /** Defines whether Cloud Profile Manager details @a fExpanded. */
         void setCloudProfileManagerDetailsExpanded(bool fExpanded);
+    /** @} */
+
+    /** @name Cloud Console Manager
+      * @{ */
+        /** Returns registered Cloud Console Manager applications. */
+        QStringList cloudConsoleManagerApplications();
+        /** Returns registered Cloud Console Manager profiles for application with @a strId. */
+        QStringList cloudConsoleManagerProfiles(const QString &strId);
+
+        /** Returns definition for Cloud Console Manager application with @a strId. */
+        QString cloudConsoleManagerApplication(const QString &strId);
+        /** Defines @a strDefinition for Cloud Console Manager application with @a strId. */
+        void setCloudConsoleManagerApplication(const QString &strId, const QString &strDefinition);
+
+        /** Returns definition for Cloud Console Manager profile with @a strProfileId for application with @a strApplicationId. */
+        QString cloudConsoleManagerProfile(const QString &strApplicationId, const QString &strProfileId);
+        /** Returns @a strDefinition for Cloud Console Manager profile with @a strProfileId for application with @a strApplicationId. */
+        void setCloudConsoleManagerProfile(const QString &strApplicationId, const QString &strProfileId, const QString &strDefinition);
+
+        /** Returns Cloud Console Manager restrictions. */
+        QStringList cloudConsoleManagerRestrictions();
+        /** Defines Cloud Console Manager @a restrictions. */
+        void setCloudConsoleManagerRestrictions(const QStringList &restrictions);
+
+        /** Returns whether Cloud Console Manager details expanded. */
+        bool cloudConsoleManagerDetailsExpanded();
+        /** Defines whether Cloud Console Manager details @a fExpanded. */
+        void setCloudConsoleManagerDetailsExpanded(bool fExpanded);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

@@ -2982 +2982 @@
     }
 };
+
+
+/** Menu action extension, used as 'Cloud Console' menu class. */
+class UIActionMenuSelectorCloudConsole : public UIActionMenu
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorCloudConsole(UIActionPool *pParent)
+        : UIActionMenu(pParent)
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("CloudConsoleMenu");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "&Console"));
+    }
+};
+
+/** Simple action extension, used as 'Perform Console Application Add' action class. */
+class UIActionMenuSelectorCloudConsolePerformApplicationAdd : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorCloudConsolePerformApplicationAdd(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/cloud_console_application_add_32px.png",          ":/cloud_console_application_add_16px.png",
+                         ":/cloud_console_application_add_disabled_32px.png", ":/cloud_console_application_add_disabled_16px.png") /// @todo use proper icons
+    {
+        setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("AddCloudConsoleApplication");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "&Add Application..."));
+        setShortcutScope(QApplication::translate("UIActionPool", "Cloud Console Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Add new cloud console application"));
+        setToolTip(  QApplication::translate("UIActionPool", "Add Cloud Console Application")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
+/** Simple action extension, used as 'Perform Console Application Remove' action class. */
+class UIActionMenuSelectorCloudConsolePerformApplicationRemove : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorCloudConsolePerformApplicationRemove(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/cloud_console_application_remove_32px.png",          ":/cloud_console_application_remove_16px.png",
+                         ":/cloud_console_application_remove_disabled_32px.png", ":/cloud_console_application_remove_disabled_16px.png") /// @todo use proper icons
+    {
+        setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("RemoveCloudConsoleApplication");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "&Remove Application..."));
+        setShortcutScope(QApplication::translate("UIActionPool", "Cloud Console Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Remove selected cloud console application"));
+        setToolTip(  QApplication::translate("UIActionPool", "Remove Cloud Console Application")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
+/** Simple action extension, used as 'Perform Console Profile Add' action class. */
+class UIActionMenuSelectorCloudConsolePerformProfileAdd : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorCloudConsolePerformProfileAdd(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/cloud_console_profile_add_32px.png",          ":/cloud_console_profile_add_16px.png",
+                         ":/cloud_console_profile_add_disabled_32px.png", ":/cloud_console_profile_add_disabled_16px.png") /// @todo use proper icons
+    {
+        setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("AddCloudConsoleProfile");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "&Add Profile..."));
+        setShortcutScope(QApplication::translate("UIActionPool", "Cloud Console Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Add new cloud console profile"));
+        setToolTip(  QApplication::translate("UIActionPool", "Add Cloud Console Profile")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
+/** Simple action extension, used as 'Perform Console Profile Remove' action class. */
+class UIActionMenuSelectorCloudConsolePerformProfileRemove : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorCloudConsolePerformProfileRemove(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/cloud_console_profile_remove_32px.png",          ":/cloud_console_profile_remove_16px.png",
+                         ":/cloud_console_profile_remove_disabled_32px.png", ":/cloud_console_profile_remove_disabled_16px.png") /// @todo use proper icons
+    {
+        setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("RemoveCloudConsoleProfile");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "&Remove Profile..."));
+        setShortcutScope(QApplication::translate("UIActionPool", "Cloud Console Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Remove selected cloud console profile"));
+        setToolTip(  QApplication::translate("UIActionPool", "Remove Cloud Console Profile")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
+/** Toggle action extension, used as 'Toggle Cloud Console Properties' action class. */
+class UIActionMenuSelectorCloudConsoleToggleProperties : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorCloudConsoleToggleProperties(UIActionPool *pParent)
+        : UIActionToggle(pParent)
+    {
+        setShortcutContext(Qt::WidgetWithChildrenShortcut);
+        setIcon(UIIconPool::iconSetFull(":/cloud_console_edit_32px.png",          ":/cloud_console_edit_16px.png",
+                                        ":/cloud_console_edit_disabled_32px.png", ":/cloud_console_edit_disabled_16px.png")); /// @todo use proper icons with check-boxes
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("ToggleCloudConsoleProperties");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence("Ctrl+Shift+P");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setIconText(QApplication::translate("UIActionPool", "Properties"));
+        setName(QApplication::translate("UIActionPool", "Console &Properties"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Cloud Console Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open pane with selected cloud console properties"));
+        setToolTip(  QApplication::translate("UIActionPool", "Open Cloud Console Properties")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
 
 /** Menu action extension, used as 'Resources' menu class. */
@@ -3183 +3394 @@
     m_pool[UIActionIndexST_M_Cloud_S_Help] = new UIActionMenuSelectorCloudShowHelp(this);
 
+    /* Cloud Console Manager actions: */
+    m_pool[UIActionIndexST_M_CloudConsoleWindow] = new UIActionMenuSelectorCloudConsole(this);
+    m_pool[UIActionIndexST_M_CloudConsole] = new UIActionMenuSelectorCloudConsole(this);
+    m_pool[UIActionIndexST_M_CloudConsole_S_ApplicationAdd] = new UIActionMenuSelectorCloudConsolePerformApplicationAdd(this);
+    m_pool[UIActionIndexST_M_CloudConsole_S_ApplicationRemove] = new UIActionMenuSelectorCloudConsolePerformApplicationRemove(this);
+    m_pool[UIActionIndexST_M_CloudConsole_S_ProfileAdd] = new UIActionMenuSelectorCloudConsolePerformProfileAdd(this);
+    m_pool[UIActionIndexST_M_CloudConsole_S_ProfileRemove] = new UIActionMenuSelectorCloudConsolePerformProfileRemove(this);
+    m_pool[UIActionIndexST_M_CloudConsole_T_Details] = new UIActionMenuSelectorCloudConsoleToggleProperties(this);
+
     /* VM resource Monitor actions: */
     m_pool[UIActionIndexST_M_VMResourceMonitor] = new UIActionMenuVMResourceMonitor(this);
@@ -3220 +3440 @@
     m_menuUpdateHandlers[UIActionIndexST_M_CloudWindow].ptfm =           &UIActionPoolManager::updateMenuCloudWindow;
     m_menuUpdateHandlers[UIActionIndexST_M_Cloud].ptfm =                 &UIActionPoolManager::updateMenuCloud;
+    m_menuUpdateHandlers[UIActionIndexST_M_CloudConsoleWindow].ptfm =    &UIActionPoolManager::updateMenuCloudConsoleWindow;
+    m_menuUpdateHandlers[UIActionIndexST_M_CloudConsole].ptfm =          &UIActionPoolManager::updateMenuCloudConsole;
     m_menuUpdateHandlers[UIActionIndexST_M_VMResourceMonitor].ptfm =     &UIActionPoolManager::updateMenuVMResourceMonitor;
     m_menuUpdateHandlers[UIActionIndexST_M_Snapshot].ptfm =              &UIActionPoolManager::updateMenuSnapshot;
@@ -3768 +3990 @@
     /* 'Help' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_Help)) || fSeparator;
+}
+
+void UIActionPoolManager::updateMenuCloudConsoleWindow()
+{
+    /* Update corresponding menu: */
+    updateMenuCloudConsoleWrapper(action(UIActionIndexST_M_CloudConsoleWindow)->menu());
+
+    /* Mark menu as valid: */
+    m_invalidations.remove(UIActionIndexST_M_CloudConsoleWindow);
+}
+
+void UIActionPoolManager::updateMenuCloudConsole()
+{
+    /* Update corresponding menu: */
+    updateMenuCloudConsoleWrapper(action(UIActionIndexST_M_CloudConsole)->menu());
+
+    /* Mark menu as valid: */
+    m_invalidations.remove(UIActionIndexST_M_CloudConsole);
+}
+
+void UIActionPoolManager::updateMenuCloudConsoleWrapper(UIMenu *pMenu)
+{
+    /* Clear contents: */
+    pMenu->clear();
+
+    /* Separator? */
+    bool fSeparator = false;
+
+    /* 'Add Application' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndexST_M_CloudConsole_S_ApplicationAdd)) || fSeparator;
+    /* 'Remove Application' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndexST_M_CloudConsole_S_ApplicationRemove)) || fSeparator;
+
+    /* Separator? */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
+
+    /* 'Add Profile' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndexST_M_CloudConsole_S_ProfileAdd)) || fSeparator;
+    /* 'Remove Profile' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndexST_M_CloudConsole_S_ProfileRemove)) || fSeparator;
+
+    /* Separator? */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
+
+    /* 'Properties' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndexST_M_CloudConsole_T_Details)) || fSeparator;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h

@@ -174 +174 @@
     UIActionIndexST_M_Cloud_S_Help,
 
+    /* Cloud Console Manager actions: */
+    UIActionIndexST_M_CloudConsoleWindow,
+    UIActionIndexST_M_CloudConsole,
+    UIActionIndexST_M_CloudConsole_S_ApplicationAdd,
+    UIActionIndexST_M_CloudConsole_S_ApplicationRemove,
+    UIActionIndexST_M_CloudConsole_S_ProfileAdd,
+    UIActionIndexST_M_CloudConsole_S_ProfileRemove,
+    UIActionIndexST_M_CloudConsole_T_Details,
+
     /* VM resource Monitor actions: */
     UIActionIndexST_M_VMResourceMonitor,
@@ -256 +265 @@
     void updateMenuCloudWrapper(UIMenu *pMenu);
 
+    /** Updates 'Cloud Console' window menu. */
+    void updateMenuCloudConsoleWindow();
+    /** Updates 'Cloud Console' menu. */
+    void updateMenuCloudConsole();
+    /** Updates 'Cloud Console' @a pMenu. */
+    void updateMenuCloudConsoleWrapper(UIMenu *pMenu);
+
    /** Updates 'VM Resource Monitor' menu. */
     void updateMenuVMResourceMonitor();

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

@@ -2022 +2022 @@
 }
 
+bool UIMessageCenter::confirmCloudConsoleApplicationRemoval(const QString &strName, QWidget *pParent /* = 0 */) const
+{
+    return questionBinary(pParent, MessageType_Question,
+                          tr("<p>Do you want to remove the cloud console application <nobr><b>%1</b>?</nobr></p>")
+                             .arg(strName),
+                          0 /* auto-confirm id */,
+                          tr("Remove") /* ok button text */,
+                          QString() /* cancel button text */,
+                          false /* ok button by default? */);
+}
+
+bool UIMessageCenter::confirmCloudConsoleProfileRemoval(const QString &strName, QWidget *pParent /* = 0 */) const
+{
+    return questionBinary(pParent, MessageType_Question,
+                          tr("<p>Do you want to remove the cloud console profile <nobr><b>%1</b>?</nobr></p>")
+                             .arg(strName),
+                          0 /* auto-confirm id */,
+                          tr("Remove") /* ok button text */,
+                          QString() /* cancel button text */,
+                          false /* ok button by default? */);
+}
+
 bool UIMessageCenter::confirmHardDisklessMachine(QWidget *pParent /* = 0*/) const
 {

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

@@ -417 +417 @@
     void cannotAssignFormValue(const CProgress &comProgress, QWidget *pParent = 0) const;
 
+    /* API: Cloud Console Manager warnings: */
+    bool confirmCloudConsoleApplicationRemoval(const QString &strName, QWidget *pParent = 0) const;
+    bool confirmCloudConsoleProfileRemoval(const QString &strName, QWidget *pParent = 0) const;
+
     /* API: Wizards warnings: */
     bool confirmHardDisklessMachine(QWidget *pParent = 0) const;