Changeset 74880 in vbox

Timestamp:

Oct 17, 2018 2:28:35 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

125863

Message:

FE/Qt: bugref:9230: Separate tree-widget items for providers and profiles.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/cloud

Files:

• UICloudProfileDetailsWidget.h (modified) (3 diffs)
• UICloudProfileManager.cpp (modified) (9 diffs)
• UICloudProfileManager.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileDetailsWidget.h

@@ -20 +20 @@
 
 /* Qt includes: */
+#include <QUuid>
 #include <QWidget>
 
@@ -31 +32 @@
 class QIDialogButtonBox;
 
+
+/** Cloud Provider data structure. */
+struct UIDataCloudProvider
+{
+    /** Constructs data. */
+    UIDataCloudProvider()
+        : m_strName(QString())
+    {}
+
+    /** Returns whether the @a other passed data is equal to this one. */
+    bool equal(const UIDataCloudProvider &other) const
+    {
+        return true
+               && (m_uuid == other.m_uuid)
+               && (m_strName == other.m_strName)
+               ;
+    }
+
+    /** Returns whether the @a other passed data is equal to this one. */
+    bool operator==(const UIDataCloudProvider &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_uuid;
+    /** Holds the provider name. */
+    QString  m_strName;
+};
 
 /** Cloud Profile data structure. */
@@ -53 +82 @@
     bool operator!=(const UIDataCloudProfile &other) const { return !equal(other); }
 
-    /** Holds the snapshot name. */
+    /** Holds the profile name. */
     QString  m_strName;
 };

trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.cpp

@@ -40 +40 @@
 /* COM includes: */
 #include "CCloudProfile.h"
+#include "CCloudProvider.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -53 +54 @@
 
 
-/** Cloud Profile Manager tree-widget item. */
-class UIItemCloudProfile : public QITreeWidgetItem, public UIDataCloudProfile
+/** Cloud Profile Manager provider's tree-widget item. */
+class UIItemCloudProvider : public QITreeWidgetItem, public UIDataCloudProvider
 {
 public:
 
-    /** Updates item fields from data. */
+    /** Updates item fields from base-class data. */
     void updateFields();
 
@@ -65 +66 @@
 };
 
+/** Cloud Profile Manager profile's tree-widget item. */
+class UIItemCloudProfile : public QITreeWidgetItem, public UIDataCloudProfile
+{
+public:
+
+    /** Updates item fields from base-class data. */
+    void updateFields();
+
+    /** Returns item name. */
+    QString name() const { return m_strName; }
+};
+
+
+/*********************************************************************************************************************************
+*   Class UIItemCloudProvider implementation.                                                                                    *
+*********************************************************************************************************************************/
+
+void UIItemCloudProvider::updateFields()
+{
+    /* Update item fields: */
+    setText(Column_Name, m_strName);
+    /// @todo assign rest of field values!
+
+    /* Compose item tool-tip: */
+    /// @todo assign tool-tips!
+}
+
 
 /*********************************************************************************************************************************
@@ -72 +100 @@
 void UIItemCloudProfile::updateFields()
 {
-    /* Compose item fields: */
+    /* Update item fields: */
     setText(Column_Name, m_strName);
     /// @todo assign rest of field values!
@@ -176 +204 @@
 void UICloudProfileManagerWidget::sltRefreshCloudProfiles()
 {
+    /// @todo refresh cloud profiles!
+
     // Not implemented.
     AssertMsgFailed(("Not implemented!"));
@@ -254 +284 @@
     retranslateUi();
 
-    /* Load cloud profiles: */
-    loadCloudProfiles();
+    /* Load cloud stuff: */
+    loadCloudStuff();
 }
 
@@ -384 +414 @@
 }
 
-void UICloudProfileManagerWidget::loadCloudProfiles()
+void UICloudProfileManagerWidget::loadCloudStuff()
 {
     /* Clear tree first of all: */
@@ -392 +422 @@
 }
 
+void UICloudProfileManagerWidget::loadCloudProvider(const CCloudProvider &comProvider, UIDataCloudProvider &data)
+{
+    Q_UNUSED(comProvider);
+    Q_UNUSED(data);
+
+    /// @todo load cloud profile!
+}
+
 void UICloudProfileManagerWidget::loadCloudProfile(const CCloudProfile &comProfile, UIDataCloudProfile &data)
 {
@@ -400 +438 @@
 }
 
-void UICloudProfileManagerWidget::createItemForCloudProfile(const UIDataCloudProfile &data, bool fChooseItem)
-{
-    /* Create new item: */
-    UIItemCloudProfile *pItem = new UIItemCloudProfile;
+void UICloudProfileManagerWidget::createItemForCloudProvider(const UIDataCloudProvider &data, bool fChooseItem)
+{
+    /* Create new provider item: */
+    UIItemCloudProvider *pItem = new UIItemCloudProvider;
     if (pItem)
     {
         /* Configure item: */
-        pItem->UIDataCloudProfile::operator=(data);
+        pItem->UIDataCloudProvider::operator=(data);
         pItem->updateFields();
         /* Add item to the tree: */
         m_pTreeWidget->addTopLevelItem(pItem);
+        /* And choose it as current if necessary: */
+        if (fChooseItem)
+            m_pTreeWidget->setCurrentItem(pItem);
+    }
+}
+
+void UICloudProfileManagerWidget::createItemForCloudProfile(QTreeWidgetItem *pParent, const UIDataCloudProfile &data, bool fChooseItem)
+{
+    /* Create new profile item: */
+    UIItemCloudProfile *pItem = new UIItemCloudProfile;
+    if (pItem)
+    {
+        /* Configure item: */
+        pItem->setFlags(pItem->flags() | Qt::ItemIsEditable);
+        pItem->UIDataCloudProfile::operator=(data);
+        pItem->updateFields();
+        /* Add item to the parent: */
+        pParent->addChild(pItem);
         /* And choose it as current if necessary: */
         if (fChooseItem)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.h

@@ -30 +30 @@
 class UICloudProfileDetailsWidget;
 class UIItemCloudProfile;
+class UIItemCloudProvider;
 class UIToolBar;
 struct UIDataCloudProfile;
+struct UIDataCloudProvider;
 class CCloudProfile;
+class CCloudProvider;
 
 
@@ -137 +140 @@
     /** @name Loading stuff.
       * @{ */
-        /** Loads cloud profiles. */
-        void loadCloudProfiles();
-        /** Loads host @a comInterface data to passed @a data container. */
-        void loadCloudProfile(const CCloudProfile &comInterface, UIDataCloudProfile &data);
+        /** Loads cloud stuff. */
+        void loadCloudStuff();
+        /** Loads cloud @a comProvider data to passed @a data container. */
+        void loadCloudProvider(const CCloudProvider &comProvider, UIDataCloudProvider &data);
+        /** Loads cloud @a comProfile data to passed @a data container. */
+        void loadCloudProfile(const CCloudProfile &comProfile, UIDataCloudProfile &data);
     /** @} */
 
@@ -146 +151 @@
       * @{ */
         /** Creates a new tree-widget item on the basis of passed @a data, @a fChooseItem if requested. */
-        void createItemForCloudProfile(const UIDataCloudProfile &data, bool fChooseItem);
+        void createItemForCloudProvider(const UIDataCloudProvider &data, bool fChooseItem);
+
+        /** Creates a new tree-widget item as a child of certain @a pParent, on the basis of passed @a data, @a fChooseItem if requested. */
+        void createItemForCloudProfile(QTreeWidgetItem *pParent, const UIDataCloudProfile &data, bool fChooseItem);
         /** Updates the passed tree-widget item on the basis of passed @a data, @a fChooseItem if requested. */
         void updateItemForCloudProfile(const UIDataCloudProfile &data, bool fChooseItem, UIItemCloudProfile *pItem);