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

Timestamp:

Mar 3, 2020 12:32:40 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Details pane: Generate Storage details element, update it with information about image name and size.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (1 diff)
• globals/UIDetailsGenerator.h (modified) (1 diff)
• manager/details/UIDetailsElements.cpp (modified) (1 diff)
• manager/details/UIDetailsElements.h (modified) (1 diff)
• manager/details/UIDetailsSet.cpp (modified) (1 diff)

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

@@ -534 +534 @@
     if (table.isEmpty())
         table << UITextTableLine(QApplication::translate("UIDetails", "Not Attached", "details (storage)"), QString());
+
+    return table;
+}
+
+UITextTable UIDetailsGenerator::generateMachineInformationStorage(UICloudMachine &guiCloudMachine,
+                                                                  const UIExtraDataMetaDefs::DetailsElementOptionTypeStorage &fOptions)
+{
+    UITextTable table;
+
+    if (guiCloudMachine.isNull())
+        return table;
+
+    if (!guiCloudMachine.isAccessible())
+    {
+        table << UITextTableLine(QApplication::translate("UIDetails", "Information Inaccessible", "details"), QString());
+        return table;
+    }
+
+    /* Image: */
+    if (fOptions & UIExtraDataMetaDefs::DetailsElementOptionTypeStorage_HardDisks)
+    {
+        const QString strImageName = guiCloudMachine.imageName();
+        const QString strImageSize = guiCloudMachine.imageSize();
+        const QString strResult = !strImageName.isEmpty() && !strImageSize.isEmpty()
+                                ? QString("%1 (%2)").arg(strImageName, strImageSize)
+                                : QString();
+        table << UITextTableLine(QApplication::translate("UIDetails", "Image", "details (storage)"), strResult);
+    }
 
     return table;

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

@@ -52 +52 @@
                                                                        bool fLink = true);
 
+    SHARED_LIBRARY_STUFF UITextTable generateMachineInformationStorage(UICloudMachine &guiCloudMachine,
+                                                                       const UIExtraDataMetaDefs::DetailsElementOptionTypeStorage &fOptions);
+
     SHARED_LIBRARY_STUFF UITextTable generateMachineInformationAudio(CMachine &comMachine,
                                                                      const UIExtraDataMetaDefs::DetailsElementOptionTypeAudio &fOptions);

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.cpp

@@ -325 +325 @@
 }
 
+void UIDetailsUpdateTaskStorageCloud::run()
+{
+    /* Acquire corresponding machine: */
+    UICloudMachine guiCloudMachine = property("cloudMachine").value<UICloudMachine>();
+    if (guiCloudMachine.isNull())
+        return;
+
+    /* Generate details table: */
+    UITextTable table = UIDetailsGenerator::generateMachineInformationStorage(guiCloudMachine, m_fOptions);
+    setProperty("table", QVariant::fromValue(table));
+}
+
 UITask *UIDetailsElementStorage::createUpdateTask()
 {
-    return new UIDetailsUpdateTaskStorage(machine(), model()->optionsStorage());
+    return   isLocal()
+           ? static_cast<UITask*>(new UIDetailsUpdateTaskStorage(machine(), model()->optionsStorage()))
+           : static_cast<UITask*>(new UIDetailsUpdateTaskStorageCloud(cloudMachine(), model()->optionsStorage()));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.h

@@ -295 +295 @@
 };
 
+/** UITask extension used as update task for the details-element type 'Storage' of cloud VM. */
+class UIDetailsUpdateTaskStorageCloud : public UIDetailsUpdateTask
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs update task passing @a guiCloudMachine to the base-class. */
+    UIDetailsUpdateTaskStorageCloud(const UICloudMachine &guiCloudMachine, UIExtraDataMetaDefs::DetailsElementOptionTypeStorage fOptions)
+        : UIDetailsUpdateTask(guiCloudMachine), m_fOptions(fOptions) {}
+
+private:
+
+    /** Contains update task body. */
+    void run();
+
+    /** Holds the options. */
+    UIExtraDataMetaDefs::DetailsElementOptionTypeStorage m_fOptions;
+};
+
 /** UIDetailsElementInterface extension for the details-element type 'Storage'. */
 class UIDetailsElementStorage : public UIDetailsElementInterface

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp

@@ -108 +108 @@
 
                 /* Compose a list of types to build: */
-                types << DetailsElementType_General << DetailsElementType_System;
+                types << DetailsElementType_General << DetailsElementType_System << DetailsElementType_Storage;
 
                 break;