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

Timestamp:

Jul 30, 2020 4:02:42 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9722: VirtualBox Manager: A bit of heuristics for default cloud console Connect action on X11.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (2 diffs)
• UIVirtualBoxManager.h (modified) (1 diff)

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

@@ -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)
-        /// @todo invent something?
+        pDefaultAction->setProperty("path", defaultTerminalApplication());
+        pDefaultAction->setProperty("arguments", "-e sh -c");
 #endif
 
@@ -3499 +3497 @@
 }
 
+#ifdef VBOX_WS_X11
+/* static */
+QString UIVirtualBoxManager::defaultTerminalApplication()
+{
+    /* List terminals supporting -e argument: */
+    QStringList knownTerminalNames;
+    knownTerminalNames << "konsole"
+                       << "gnome-terminal"
+                       << "xfce4-terminal"
+                       << "terminator"
+                       << "xterm"
+                       << "aterm"
+                       << "wterm"
+                       << "guake"
+                       << "evilvte"
+                       << "mrxvt"
+                       << "rxvt"
+                       << "rxvt-unicode";
+    /* Search for a first one suitable through shell command -v test: */
+    foreach (const QString &strTerminalName, knownTerminalNames)
+    {
+        const QString strPath = "sh";
+        const QStringList arguments = QStringList() << "-c" << QString("command -v '%1'").arg(strTerminalName);
+        QProcess process;
+        process.start(strPath, arguments, QIODevice::ReadOnly);
+        process.waitForFinished(3000);
+        if (process.exitCode() == 0)
+        {
+            const QString strResult = process.readAllStandardOutput();
+            if (strResult.startsWith('/'))
+                return strResult.trimmed();
+        }
+    }
+    return QString();
+}
+#endif
+
 
 #include "UIVirtualBoxManager.moc"

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

@@ -435 +435 @@
         /** Returns whether at least one of passed @a items is running. */
         static bool isAtLeastOneItemRunning(const QList<UIVirtualMachineItem*> &items);
+
+#ifdef VBOX_WS_X11
+        /** Tries to guess default X11 terminal emulator. */
+        static QString defaultTerminalApplication();
+#endif
     /** @} */