Changeset 86275 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 24, 2020 8:04:03 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: UIDetailsElement & UIDetailsGenerator: Rework cloud VM details element & generator to be able to use IStringFormValue::getClipboardString to acquire full value name for tool-tip and copy needs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (2 diffs)
• globals/UIDetailsGenerator.h (modified) (1 diff)
• manager/details/UIDetailsElement.cpp (modified) (1 diff)

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

@@ -177 +177 @@
 }
 
-QString UIDetailsGenerator::generateFormValueInformation(const CFormValue &comFormValue)
+QString UIDetailsGenerator::generateFormValueInformation(const CFormValue &comFormValue, bool fFull /* = false */)
 {
     /* Handle possible form value types: */
@@ -194 +194 @@
         {
             CStringFormValue comValue(comFormValue);
-            strResult = comValue.GetString();
+            const QString strValue = comValue.GetString();
+            const QString strClipboardValue = comValue.GetClipboardString();
+            strResult = fFull && !strClipboardValue.isEmpty() ? strClipboardValue : strValue;
             break;
         }

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

@@ -39 +39 @@
     SHARED_LIBRARY_STUFF UITextTable generateMachineInformationGeneral(CCloudMachine &comCloudMachine,
                                                                        const UIExtraDataMetaDefs::DetailsElementOptionTypeGeneral &fOptions);
-    SHARED_LIBRARY_STUFF QString generateFormValueInformation(const CFormValue &comFormValue);
+    SHARED_LIBRARY_STUFF QString generateFormValueInformation(const CFormValue &comFormValue, bool fFull = false);
 
     SHARED_LIBRARY_STUFF UITextTable generateMachineInformationSystem(CMachine &comMachine,

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

@@ -1404 +1404 @@
                 continue;
 
-            /* Acquire resulting value in full and compressed form: */
-            const QString strIteratedResultFull = UIDetailsGenerator::generateFormValueInformation(comIteratedValue);
-            const QString strIteratedResultShort =    strIteratedResultFull.size() > 10
-                                                   && strIteratedResultFull.startsWith("ocid1.")
-                                                 ? QString("...%1").arg(strIteratedResultFull.right(10))
-                                                 : strIteratedResultFull;
+            /* Acquire resulting value in short and full form: */
+            const QString strIteratedResultShort = UIDetailsGenerator::generateFormValueInformation(comIteratedValue);
+            const QString strIteratedResultFull = UIDetailsGenerator::generateFormValueInformation(comIteratedValue, true /* full */);
 
             /* Add 'Copy' action: */