Changeset 86226 in vbox

Timestamp:

Sep 22, 2020 5:08:09 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: UIDetailsElement: Rework cloud VM details element to popup menu on mouse click for any detail independent on enabled state; This allows us to have Copy value action for any detail, while Edit action will present for details with enabled state only.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/details

Files:

• UIDetailsElement.cpp (modified) (4 diffs)
• UIDetailsElement.h (modified) (1 diff)

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

@@ -18 +18 @@
 /* Qt includes: */
 #include <QActionGroup>
+#include <QClipboard>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
@@ -37 +38 @@
 #include "UIConverter.h"
 #include "UIDetailsElement.h"
+#include "UIDetailsGenerator.h"
 #include "UIDetailsSet.h"
 #include "UIDetailsModel.h"
@@ -607 +609 @@
 }
 
+void UIDetailsElement::sltHandleCopyRequest()
+{
+    /* Acquire sender: */
+    QObject *pSender = sender();
+    AssertPtrReturnVoid(pSender);
+
+    /* Acquire clipboard: */
+    QClipboard *pClipboard = QGuiApplication::clipboard();
+    AssertPtrReturnVoid(pClipboard);
+    pClipboard->setText(pSender->property("contents").toString());
+}
+
+void UIDetailsElement::sltHandleEditRequest()
+{
+    /* Acquire sender: */
+    QObject *pSender = sender();
+    AssertPtrReturnVoid(pSender);
+
+    /* Prepare popup: */
+    QPointer<QIDialogContainer> pPopup = new QIDialogContainer(0, Qt::Tool);
+    if (pPopup)
+    {
+        /* Acquire cloud machine: */
+        CCloudMachine comCloudMachine = cloudMachine();
+
+        /* Prepare editor: */
+        UISafePointerCloudMachineSettingsDialogPage pEditor = new UICloudMachineSettingsDialogPage(pPopup,
+                                                                                                   false /* full-scale? */);
+        if (pEditor)
+        {
+            /* Configure editor: */
+            connect(pEditor.data(), &UICloudMachineSettingsDialogPage::sigValidChanged,
+                    pPopup.data(), &QIDialogContainer::setProgressBarHidden);
+            connect(pEditor.data(), &UICloudMachineSettingsDialogPage::sigValidChanged,
+                    pPopup.data(), &QIDialogContainer::setOkButtonEnabled);
+            pEditor->setFilter(pSender->property("filter").toString());
+            /* Create get settings form task: */
+            UITaskCloudGetSettingsForm *pTask = new UITaskCloudGetSettingsForm(comCloudMachine);
+            /* Create get settings form receiver: */
+            UIReceiverCloudGetSettingsForm *pReceiver = new UIReceiverCloudGetSettingsForm(pEditor);
+            if (pReceiver)
+            {
+                connect(pReceiver, &UIReceiverCloudGetSettingsForm::sigTaskComplete,
+                        pEditor.data(), &UICloudMachineSettingsDialogPage::setForm);
+                connect(pReceiver, &UIReceiverCloudGetSettingsForm::sigTaskFailed,
+                        pPopup.data(), &QIDialogContainer::close);
+            }
+            /* Start task: */
+            if (pTask && pReceiver)
+                uiCommon().threadPoolCloud()->enqueueTask(pTask);
+            /* Embed editor: */
+            pPopup->setWidget(pEditor);
+        }
+
+        /* Adjust popup geometry: */
+        pPopup->move(QCursor::pos());
+        pPopup->resize(pPopup->minimumSizeHint());
+
+        // WORKAROUND:
+        // On Windows, Tool dialogs aren't activated by default by some reason.
+        // So we have created sltActivateWindow wrapping actual activateWindow
+        // to fix that annoying issue.
+        QMetaObject::invokeMethod(pPopup, "sltActivateWindow", Qt::QueuedConnection);
+        /* Execute popup, change machine name if confirmed: */
+        if (pPopup->exec() == QDialog::Accepted)
+        {
+            /* Makes sure page data committed: */
+            if (pEditor)
+                pEditor->makeSureDataCommitted();
+
+            /* Apply form: */
+            CForm comForm = pEditor->form();
+            applyCloudMachineSettingsForm(comCloudMachine, comForm);
+        }
+
+        /* Delete popup: */
+        delete pPopup;
+    }
+}
+
 void UIDetailsElement::sltMountStorageMedium()
 {
@@ -1303 +1385 @@
 void UIDetailsElement::popupCloudEditor(const QString &strValue)
 {
-    /* Prepare popup: */
-    QPointer<QIDialogContainer> pPopup = new QIDialogContainer(0, Qt::Tool);
-    if (pPopup)
-    {
-        /* Acquire cloud machine: */
-        CCloudMachine comCloudMachine = cloudMachine();
-
-        /* Prepare editor: */
-        UISafePointerCloudMachineSettingsDialogPage pEditor = new UICloudMachineSettingsDialogPage(pPopup,
-                                                                                                   false /* full-scale? */);
-        if (pEditor)
-        {
-            /* Configure editor: */
-            connect(pEditor.data(), &UICloudMachineSettingsDialogPage::sigValidChanged,
-                    pPopup.data(), &QIDialogContainer::setProgressBarHidden);
-            connect(pEditor.data(), &UICloudMachineSettingsDialogPage::sigValidChanged,
-                    pPopup.data(), &QIDialogContainer::setOkButtonEnabled);
-            pEditor->setFilter(strValue);
-            /* Create get settings form task: */
-            UITaskCloudGetSettingsForm *pTask = new UITaskCloudGetSettingsForm(comCloudMachine);
-            /* Create get settings form receiver: */
-            UIReceiverCloudGetSettingsForm *pReceiver = new UIReceiverCloudGetSettingsForm(pEditor);
-            if (pReceiver)
+    /* Prepare cloud-menu: */
+    UIMenu menu;
+    menu.setShowToolTip(true);
+
+    /* Acquire cloud machine: */
+    CCloudMachine comCloudMachine = cloudMachine();
+    /* Acquire details form: */
+    CForm comForm = comCloudMachine.GetDetailsForm();
+    /* Ignore cloud machine errors: */
+    if (comCloudMachine.isOk())
+    {
+        /* For each form value: */
+        foreach (const CFormValue &comIteratedValue, comForm.GetValues())
+        {
+            /* Acquire label: */
+            const QString &strIteratedLabel = comIteratedValue.GetLabel();
+            if (strIteratedLabel != strValue)
+                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;
+
+            /* Add 'Copy' action: */
+            QAction *pAction = menu.addAction(tr("Copy value (%1)").arg(strIteratedResultShort),
+                                              this, &UIDetailsElement::sltHandleCopyRequest);
+            if (pAction)
             {
-                connect(pReceiver, &UIReceiverCloudGetSettingsForm::sigTaskComplete,
-                        pEditor.data(), &UICloudMachineSettingsDialogPage::setForm);
-                connect(pReceiver, &UIReceiverCloudGetSettingsForm::sigTaskFailed,
-                        pPopup.data(), &QIDialogContainer::close);
+                pAction->setToolTip(strIteratedResultFull);
+                pAction->setProperty("contents", strIteratedResultFull);
             }
-            /* Start task: */
-            if (pTask && pReceiver)
-                uiCommon().threadPoolCloud()->enqueueTask(pTask);
-            /* Embed editor: */
-            pPopup->setWidget(pEditor);
-        }
-
-        /* Adjust popup geometry: */
-        pPopup->move(QCursor::pos());
-        pPopup->resize(pPopup->minimumSizeHint());
-
-        // WORKAROUND:
-        // On Windows, Tool dialogs aren't activated by default by some reason.
-        // So we have created sltActivateWindow wrapping actual activateWindow
-        // to fix that annoying issue.
-        QMetaObject::invokeMethod(pPopup, "sltActivateWindow", Qt::QueuedConnection);
-        /* Execute popup, change machine name if confirmed: */
-        if (pPopup->exec() == QDialog::Accepted)
-        {
-            /* Makes sure page data committed: */
-            if (pEditor)
-                pEditor->makeSureDataCommitted();
-
-            /* Apply form: */
-            CForm comForm = pEditor->form();
-            applyCloudMachineSettingsForm(comCloudMachine, comForm);
-        }
-
-        /* Delete popup: */
-        delete pPopup;
-    }
+
+            /* Add 'Edit' action: */
+            if (comIteratedValue.GetEnabled())
+            {
+                QAction *pAction = menu.addAction(tr("Edit value..."),
+                                                  this, &UIDetailsElement::sltHandleEditRequest);
+                if (pAction)
+                    pAction->setProperty("filter", strIteratedLabel);
+            }
+
+            /* Quit prematurely: */
+            break;
+        }
+    }
+
+    /* Exec menu: */
+    menu.exec(QCursor::pos());
 }
 

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

@@ -223 +223 @@
         void sltElementToggleFinish(bool fToggled);
 
-        /** Handles children anchor clicks. */
+        /** Handles child anchor clicks. */
         void sltHandleAnchorClicked(const QString &strAnchor);
+        /** Handles child copy request. */
+        void sltHandleCopyRequest();
+        /** Handles child edit request. */
+        void sltHandleEditRequest();
     /** @} */