Changeset 85192 in vbox

Timestamp:

Jul 10, 2020 3:05:54 PM (5 years ago)

Author:

vboxsync

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

139164

Message:

FE/Qt: bugref:9722: VirtualBox Manager: Implement Copy console connection commands for Serial and VNC connections.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (3 diffs)
• globals/UIActionPoolManager.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (5 diffs)
• manager/UIVirtualBoxManager.h (modified) (1 diff)

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

@@ -1378 +1378 @@
         setStatusTip(QApplication::translate("UIActionPool", "Delete console connection to disconnect ssh/vnc clients"));
     }
+};
+
+/** Simple action extension, used as 'Copy Command' action class. */
+class UIActionSimpleSelectorConsolePerformCopyCommand : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionSimpleSelectorConsolePerformCopyCommand(UIActionPool *pParent, bool fSerial)
+        : UIActionSimple(pParent, ":/file_manager_copy_16px.png", ":/file_manager_copy_16px.png") /// @todo replace with proper icon
+        , m_fSerial(fSerial)
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return   m_fSerial
+               ? QString("CopyConsoleCommandSerial")
+               : QString("CopyConsoleCommandVNC");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        if (m_fSerial)
+        {
+            setName(QApplication::translate("UIActionPool", "&Copy Command (serial)"));
+            setStatusTip(QApplication::translate("UIActionPool", "Copy console command for serial connection"));
+        }
+        else
+        {
+            setName(QApplication::translate("UIActionPool", "&Copy Command (VNC)"));
+            setStatusTip(QApplication::translate("UIActionPool", "Copy console command for VNC connection"));
+        }
+    }
+
+private:
+
+    /** Holds whether this command is of serial type. */
+    bool  m_fSerial;
 };
 
@@ -3063 +3107 @@
     m_pool[UIActionIndexST_M_Machine_M_Console_S_CreateConnection] = new UIActionSimpleSelectorConsolePerformCreateConnection(this);
     m_pool[UIActionIndexST_M_Machine_M_Console_S_DeleteConnection] = new UIActionSimpleSelectorConsolePerformDeleteConnection(this);
+    m_pool[UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerial] = new UIActionSimpleSelectorConsolePerformCopyCommand(this, true);
+    m_pool[UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNC] = new UIActionSimpleSelectorConsolePerformCopyCommand(this, false);
     m_pool[UIActionIndexST_M_Machine_M_Close] = new UIActionMenuSelectorClose(this);
     m_pool[UIActionIndexST_M_Machine_M_Close_S_Detach] = new UIActionSimpleSelectorClosePerformDetach(this);
@@ -3826 +3872 @@
                     << action(UIActionIndexST_M_Machine_M_Console_S_CreateConnection)
                     << action(UIActionIndexST_M_Machine_M_Console_S_DeleteConnection)
+                    << action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerial)
+                    << action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNC)
                     // << action(UIActionIndexST_M_Machine_M_Close_S_Detach)
                     << action(UIActionIndexST_M_Machine_M_Close_S_SaveState)

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

@@ -109 +109 @@
     UIActionIndexST_M_Machine_M_Console_S_CreateConnection,
     UIActionIndexST_M_Machine_M_Console_S_DeleteConnection,
+    UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerial,
+    UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNC,
     UIActionIndexST_M_Machine_M_Close,
     UIActionIndexST_M_Machine_M_Close_S_Detach,

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

@@ -1195 +1195 @@
 }
 
+void UIVirtualBoxManager::sltPerformCopyCommandSerial()
+{
+    /* Get current item: */
+    UIVirtualMachineItem *pItem = currentItem();
+    AssertMsgReturnVoid(pItem, ("Current item should be selected!\n"));
+    UIVirtualMachineItemCloud *pCloudItem = pItem->toCloud();
+    AssertPtrReturnVoid(pCloudItem);
+
+    /* Acquire cloud machine: */
+    CCloudMachine comMachine = pCloudItem->machine();
+
+    /* Put copied serial command to clipboard: */
+    QClipboard *pClipboard = QGuiApplication::clipboard();
+    AssertPtrReturnVoid(pClipboard);
+    pClipboard->setText(comMachine.GetSerialConsoleCommand());
+}
+
+void UIVirtualBoxManager::sltPerformCopyCommandVNC()
+{
+    /* Get current item: */
+    UIVirtualMachineItem *pItem = currentItem();
+    AssertMsgReturnVoid(pItem, ("Current item should be selected!\n"));
+    UIVirtualMachineItemCloud *pCloudItem = pItem->toCloud();
+    AssertPtrReturnVoid(pCloudItem);
+
+    /* Acquire cloud machine: */
+    CCloudMachine comMachine = pCloudItem->machine();
+
+    /* Put copied VNC command to clipboard: */
+    QClipboard *pClipboard = QGuiApplication::clipboard();
+    AssertPtrReturnVoid(pClipboard);
+    pClipboard->setText(comMachine.GetVNCConsoleCommand());
+}
+
 void UIVirtualBoxManager::sltPerformDiscardMachineState()
 {
@@ -2044 +2078 @@
     connect(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_DeleteConnection), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformDeleteConsoleConnectionForMachine);
+    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerial), &UIAction::triggered,
+            this, &UIVirtualBoxManager::sltPerformCopyCommandSerial);
+    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNC), &UIAction::triggered,
+            this, &UIVirtualBoxManager::sltPerformCopyCommandVNC);
 
     /* 'Group/Close' menu connections: */
@@ -2504 +2542 @@
                                             this, &UIVirtualBoxManager::sltCopyConsoleConnectionFingerprint);
         pAction->setProperty("fingerprint", strFingerprint);
+        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerial));
+        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNC));
     }
 }
@@ -2636 +2676 @@
     actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CreateConnection)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Console_S_CreateConnection, items));
     actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_DeleteConnection)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Console_S_DeleteConnection, items));
+    actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerial)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerial, items));
+    actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNC)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNC, items));
 
     /* Enable/disable group-close actions: */
@@ -2906 +2948 @@
         case UIActionIndexST_M_Machine_M_Console_S_CreateConnection:
         case UIActionIndexST_M_Machine_M_Console_S_DeleteConnection:
+        case UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerial:
+        case UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNC:
         {
             return isAtLeastOneItemStarted(items);

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

@@ -248 +248 @@
         /** Handles call to copy console connection key fingerprint. */
         void sltCopyConsoleConnectionFingerprint();
+        /** Handles call to copy serial console command. */
+        void sltPerformCopyCommandSerial();
+        /** Handles call to copy VNC console command. */
+        void sltPerformCopyCommandVNC();
 
         /** Handles call to discard machine state. */