Changeset 85577 in vbox

Timestamp:

Jul 31, 2020 12:51:37 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9722: VirtualBox Manager: A bit of fixes for r139633; First of all, most popular terminals are now goes first; Besides that, proper execute option is now used for each of mentioned app.

Location:

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

Files:

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

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

@@ -2816 +2816 @@
         pDefaultAction->setProperty("path", "powershell");
 #elif defined(VBOX_WS_X11)
-        pDefaultAction->setProperty("path", defaultTerminalApplication());
-        pDefaultAction->setProperty("arguments", "-e sh -c");
+        const QPair<QString, QString> terminalData = defaultTerminalData();
+        pDefaultAction->setProperty("path", terminalData.first);
+        pDefaultAction->setProperty("arguments", QString("%1 sh -c").arg(terminalData.second));
 #endif
 
@@ -3499 +3500 @@
 #ifdef VBOX_WS_X11
 /* static */
-QString UIVirtualBoxManager::defaultTerminalApplication()
-{
-    /* List terminals supporting -e argument: */
+QPair<QString, QString> UIVirtualBoxManager::defaultTerminalData()
+{
+    /* List known terminals: */
     QStringList knownTerminalNames;
-    knownTerminalNames << "konsole"
-                       << "gnome-terminal"
+    knownTerminalNames << "gnome-terminal"
+                       << "terminator"
+                       << "konsole"
                        << "xfce4-terminal"
-                       << "terminator"
+                       << "mate-terminal"
+                       << "lxterminal"
+                       << "tilda"
                        << "xterm"
                        << "aterm"
-                       << "wterm"
-                       << "guake"
-                       << "evilvte"
-                       << "mrxvt"
-                       << "rxvt"
-                       << "rxvt-unicode";
+                       << "rxvt-unicode"
+                       << "rxvt";
+
+    /* Fill map of known terminal --execute argument exceptions,
+     * keep in mind, terminals doesn't mentioned here will be
+     * used with default `-e` argument: */
+    QMap<QString, QString> knownTerminalArguments;
+    knownTerminalArguments["gnome-terminal"] = "--";
+    knownTerminalArguments["terminator"] = "-x";
+    knownTerminalArguments["xfce4-terminal"] = "-x";
+    knownTerminalArguments["mate-terminal"] = "-x";
+    knownTerminalArguments["tilda"] = "-c";
+
     /* Search for a first one suitable through shell command -v test: */
     foreach (const QString &strTerminalName, knownTerminalNames)
@@ -3527 +3538 @@
             const QString strResult = process.readAllStandardOutput();
             if (strResult.startsWith('/'))
-                return strResult.trimmed();
-        }
-    }
-    return QString();
+                return qMakePair(strResult.trimmed(), knownTerminalArguments.value(strTerminalName, "-e"));
+        }
+    }
+    return QPair<QString, QString>();
 }
 #endif

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

@@ -437 +437 @@
 
 #ifdef VBOX_WS_X11
-        /** Tries to guess default X11 terminal emulator. */
-        static QString defaultTerminalApplication();
+        /** Tries to guess default X11 terminal emulator.
+          * @returns Data packed into Qt pair of QString(s),
+          *          which is `name` and `--execute argument`. */
+        static QPair<QString, QString> defaultTerminalData();
 #endif
     /** @} */