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

Timestamp:

Jul 9, 2020 2:41:38 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9722: VirtualBox Manager: Implement action to copy existing console connection key fingerprint.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (6 diffs)
• manager/UIVirtualBoxManager.h (modified) (2 diffs)

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

@@ -3460 +3460 @@
     pMenu->clear();
 
-    /* Populate 'Group' / 'Console' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_Console_S_CreateConnection));
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_Console_S_DeleteConnection));
-
-    /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_Group_M_Console);
+    /* This menu always remains invalid.. */
 }
 
@@ -3476 +3471 @@
     pMenu->clear();
 
-    /* Populate 'Machine' / 'Console' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Console_S_CreateConnection));
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Console_S_DeleteConnection));
-
-    /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_Machine_M_Console);
+    /* This menu always remains invalid.. */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QClipboard>
 #include <QFile>
+#include <QGuiApplication>
 #include <QMenuBar>
 #include <QPushButton>
@@ -34 +36 @@
 #include "UIExtraDataManager.h"
 #include "UIHostNetworkManager.h"
+#include "UIIconPool.h"
 #include "UIMedium.h"
 #include "UIMediumManager.h"
@@ -1072 +1075 @@
 }
 
+void UIVirtualBoxManager::sltCopyConsoleConnectionFingerprint()
+{
+    QAction *pAction = qobject_cast<QAction*>(sender());
+    AssertPtrReturnVoid(pAction);
+    QClipboard *pClipboard = QGuiApplication::clipboard();
+    AssertPtrReturnVoid(pClipboard);
+    pClipboard->setText(pAction->property("fingerprint").toString());
+}
+
 void UIVirtualBoxManager::sltPerformDiscardMachineState()
 {
@@ -1717 +1729 @@
     m_menuUpdateHandlers[UIActionIndexST_M_Machine] = &UIVirtualBoxManager::updateMenuMachine;
     m_menuUpdateHandlers[UIActionIndexST_M_Group_M_MoveToGroup] = &UIVirtualBoxManager::updateMenuGroupMoveToGroup;
+    m_menuUpdateHandlers[UIActionIndexST_M_Group_M_Console] = &UIVirtualBoxManager::updateMenuGroupConsole;
     m_menuUpdateHandlers[UIActionIndexST_M_Group_M_Close] = &UIVirtualBoxManager::updateMenuGroupClose;
     m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_MoveToGroup] = &UIVirtualBoxManager::updateMenuMachineMoveToGroup;
+    m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_Console] = &UIVirtualBoxManager::updateMenuMachineConsole;
     m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_Close] = &UIVirtualBoxManager::updateMenuMachineClose;
 
@@ -2319 +2333 @@
 }
 
+void UIVirtualBoxManager::updateMenuGroupConsole(QMenu *pMenu)
+{
+    /* Get current item: */
+    UIVirtualMachineItem *pItem = currentItem();
+    AssertMsgReturnVoid(pItem, ("Current item should be selected!\n"));
+    UIVirtualMachineItemCloud *pCloudItem = pItem->toCloud();
+    AssertPtrReturnVoid(pCloudItem);
+
+    /* Acquire current cloud machine: */
+    CCloudMachine comMachine = pCloudItem->machine();
+    const QString strFingerprint = comMachine.GetConsoleConnectionFingerprint();
+
+    /* Populate 'Group' / 'Console' menu: */
+    if (strFingerprint.isEmpty())
+        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_Console_S_CreateConnection));
+    else
+    {
+        QAction *pAction = pMenu->addAction(UIIconPool::iconSet(":/file_manager_copy_16px.png"),
+                                            QApplication::translate("UIActionPool", "Copy Key Fingerprint (%1)").arg(strFingerprint),
+                                            this, &UIVirtualBoxManager::sltCopyConsoleConnectionFingerprint);
+        pAction->setProperty("fingerprint", strFingerprint);
+        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_Console_S_DeleteConnection));
+    }
+}
+
 void UIVirtualBoxManager::updateMenuGroupClose(QMenu *)
 {
@@ -2346 +2385 @@
         QAction *pAction = pMenu->addAction(strVisibleGroupName, this, &UIVirtualBoxManager::sltPerformMachineMoveToSpecificGroup);
         pAction->setProperty("actual_group_name", strGroupName);
+    }
+}
+
+void UIVirtualBoxManager::updateMenuMachineConsole(QMenu *pMenu)
+{
+    /* Get current item: */
+    UIVirtualMachineItem *pItem = currentItem();
+    AssertMsgReturnVoid(pItem, ("Current item should be selected!\n"));
+    UIVirtualMachineItemCloud *pCloudItem = pItem->toCloud();
+    AssertPtrReturnVoid(pCloudItem);
+
+    /* Acquire current cloud machine: */
+    CCloudMachine comMachine = pCloudItem->machine();
+    const QString strFingerprint = comMachine.GetConsoleConnectionFingerprint();
+
+    /* Populate 'Group' / 'Console' menu: */
+    if (strFingerprint.isEmpty())
+        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CreateConnection));
+    else
+    {
+        QAction *pAction = pMenu->addAction(UIIconPool::iconSet(":/file_manager_copy_16px.png"),
+                                            QApplication::translate("UIActionPool", "Copy Key Fingerprint (%1)").arg(strFingerprint),
+                                            this, &UIVirtualBoxManager::sltCopyConsoleConnectionFingerprint);
+        pAction->setProperty("fingerprint", strFingerprint);
+        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_DeleteConnection));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -242 +242 @@
         /** Handles call to delete console connection. */
         void sltPerformDeleteConsoleConnection();
+        /** Handles call to copy console connection key fingerprint. */
+        void sltCopyConsoleConnectionFingerprint();
 
         /** Handles call to discard machine state. */
@@ -359 +361 @@
         /** Updates 'Group' : 'Move to Group' menu. */
         void updateMenuGroupMoveToGroup(QMenu *pMenu);
+        /** Updates 'Group' : 'Console' menu. */
+        void updateMenuGroupConsole(QMenu *pMenu);
         /** Updates 'Group' : 'Close' menu. */
         void updateMenuGroupClose(QMenu *pMenu);
         /** Updates 'Machine' : 'Move to Group' menu. */
         void updateMenuMachineMoveToGroup(QMenu *pMenu);
+        /** Updates 'Machine' : 'Console' menu. */
+        void updateMenuMachineConsole(QMenu *pMenu);
         /** Updates 'Machine' : 'Close' menu. */
         void updateMenuMachineClose(QMenu *pMenu);