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

Timestamp:

Jul 30, 2020 11:39:56 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9722: VirtualBox Manager: A bit of cleanup for default cloud console connect action on Windows/macOS platforms, disabling on X11 for now, s.a. r139596.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp (modified) (4 diffs)

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

@@ -1278 +1278 @@
     const CCloudMachine comMachine = pCloudItem->machine();
 
-#if defined(VBOX_WS_WIN)
-    /* Gather arguments: */
-    QStringList arguments;
-    arguments << strArguments;
-    arguments << comMachine.GetSerialConsoleCommandWindows();
-
-    /* Execute console application finally: */
-    QProcess::startDetached(QString("%1 %2").arg(strPath, arguments.join(' ')));
-#elif defined(VBOX_WS_MAC)
+#if defined(VBOX_WS_MAC)
     /* Gather arguments: */
     QStringList arguments;
@@ -1313 +1305 @@
     /* Execute console application finally: */
     QProcess::startDetached(strPath, arguments);
-#else /* !VBOX_WS_WIN && !VBOX_WS_MAC */
+#elif defined(VBOX_WS_WIN)
+    /* Gather arguments: */
+    QStringList arguments;
+    arguments << strArguments;
+    arguments << comMachine.GetSerialConsoleCommandWindows();
+
+    /* Execute console application finally: */
+    QProcess::startDetached(QString("%1 %2").arg(strPath, arguments.join(' ')));
+#elif defined(VBOX_WS_X11)
     /* Gather arguments: */
     QStringList arguments;
@@ -1321 +1321 @@
     /* Execute console application finally: */
     QProcess::startDetached(strPath, arguments);
-#endif /* !VBOX_WS_WIN && !VBOX_WS_MAC */
+#endif /* VBOX_WS_X11 */
 }
 
@@ -2808 +2808 @@
         pMenu->addSeparator();
 
+#if defined(VBOX_WS_MAC)
         /* Default Connect action: */
         QAction *pDefaultAction = pMenu->addAction(QApplication::translate("UIActionPool", "Connect", "to cloud VM"),
                                                    this, &UIVirtualBoxManager::sltExecuteExternalApplication);
-#if defined(VBOX_WS_MAC)
         pDefaultAction->setProperty("path", "open");
 #elif defined(VBOX_WS_WIN)
+        /* Default Connect action: */
+        QAction *pDefaultAction = pMenu->addAction(QApplication::translate("UIActionPool", "Connect", "to cloud VM"),
+                                                   this, &UIVirtualBoxManager::sltExecuteExternalApplication);
         pDefaultAction->setProperty("path", "powershell");
 #elif defined(VBOX_WS_X11)
-        Q_UNUSED(pDefaultAction);
+        /// @todo invent something?
 #endif