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

Timestamp:

Aug 27, 2021 7:53:10 PM (4 years ago)

Author:

vboxsync

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

146605

Message:

FE/Qt: bugref:10067: UICommon: A bit of rework for native and arguments stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICommon.cpp (modified) (4 diffs)
• UICommon.h (modified) (5 diffs)

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

@@ -544 +544 @@
             enmOptType = OptType_VMRunner;
             if (++i < argc)
-                m_strFloppyImage = arguments.at(i);
+                m_uFloppyImage = arguments.at(i);
         }
         else if (!::strcmp(arg, "--dvd") || !::strcmp(arg, "--cdrom"))
@@ -550 +550 @@
             enmOptType = OptType_VMRunner;
             if (++i < argc)
-                m_strDvdImage = arguments.at(i);
+                m_uDvdImage = arguments.at(i);
         }
         /* VMM Options: */
@@ -1038 +1038 @@
 }
 #endif /* VBOX_WS_MAC */
-
-bool UICommon::processArgs()
-{
-    /* Among those arguments: */
-    bool fResult = false;
-    const QStringList args = qApp->arguments();
-
-    /* We are looking for a list of file URLs passed to the executable: */
-    QList<QUrl> listArgUrls;
-    for (int i = 1; i < args.size(); ++i)
-    {
-        /* But we break out after the first parameter, cause there
-         * could be parameters with arguments (e.g. --comment comment). */
-        if (args.at(i).startsWith("-"))
-            break;
-
-#ifdef VBOX_WS_MAC
-        const QString strArg = ::darwinResolveAlias(args.at(i));
-#else
-        const QString strArg = args.at(i);
-#endif
-
-        /* So if the argument file exists, we add it to URL list: */
-        if (   !strArg.isEmpty()
-            && QFile::exists(strArg))
-            listArgUrls << QUrl::fromLocalFile(QFileInfo(strArg).absoluteFilePath());
-    }
-
-    /* If there are file URLs: */
-    if (!listArgUrls.isEmpty())
-    {
-        /* We enumerate them and: */
-        for (int i = 0; i < listArgUrls.size(); ++i)
-        {
-            /* Check which of them has allowed VM extensions: */
-            const QUrl url = listArgUrls.at(i);
-            const QString strFile = url.toLocalFile();
-            if (UICommon::hasAllowedExtension(strFile, VBoxFileExts))
-            {
-                /* So that we could run existing VMs: */
-                CVirtualBox comVBox = virtualBox();
-                CMachine comMachine = comVBox.FindMachine(strFile);
-                if (!comMachine.isNull())
-                {
-                    fResult = true;
-                    launchMachine(comMachine);
-                    /* And remove their URLs from the ULR list: */
-                    listArgUrls.removeAll(url);
-                }
-            }
-        }
-    }
-
-    /* And if there are *still* URLs: */
-    if (!listArgUrls.isEmpty())
-    {
-        /* We store them, they will be handled later: */
-        m_listArgUrls = listArgUrls;
-    }
-
-    return fResult;
-}
-
-bool UICommon::argumentUrlsPresent() const
-{
-    return !m_listArgUrls.isEmpty();
-}
-
-QList<QUrl> UICommon::takeArgumentUrls()
-{
-    const QList<QUrl> result = m_listArgUrls;
-    m_listArgUrls.clear();
-    return result;
-}
-
-#ifdef VBOX_WITH_DEBUGGER_GUI
-
-bool UICommon::isDebuggerEnabled() const
-{
-    return isDebuggerWorker(&m_fDbgEnabled, GUI_Dbg_Enabled);
-}
-
-bool UICommon::isDebuggerAutoShowEnabled() const
-{
-    return isDebuggerWorker(&m_fDbgAutoShow, GUI_Dbg_AutoShow);
-}
-
-bool UICommon::isDebuggerAutoShowCommandLineEnabled() const
-{
-    return isDebuggerWorker(&m_fDbgAutoShowCommandLine, GUI_Dbg_AutoShow);
-}
-
-bool UICommon::isDebuggerAutoShowStatisticsEnabled() const
-{
-    return isDebuggerWorker(&m_fDbgAutoShowStatistics, GUI_Dbg_AutoShow);
-}
-
-#endif /* VBOX_WITH_DEBUGGER_GUI */
-
-bool UICommon::shouldStartPaused() const
-{
-#ifdef VBOX_WITH_DEBUGGER_GUI
-    return m_enmLaunchRunning == LaunchRunning_Default ? isDebuggerAutoShowEnabled() : m_enmLaunchRunning == LaunchRunning_No;
-#else
-    return false;
-#endif
-}
-
-#ifdef VBOX_GUI_WITH_PIDFILE
-
-void UICommon::createPidfile()
-{
-    if (!m_strPidFile.isEmpty())
-    {
-        const qint64 iPid = qApp->applicationPid();
-        QFile file(m_strPidFile);
-        if (file.open(QIODevice::WriteOnly | QIODevice::Truncate))
-        {
-             QTextStream out(&file);
-             out << iPid << endl;
-        }
-        else
-            LogRel(("Failed to create pid file %s\n", m_strPidFile.toUtf8().constData()));
-    }
-}
-
-void UICommon::deletePidfile()
-{
-    if (   !m_strPidFile.isEmpty()
-        && QFile::exists(m_strPidFile))
-        QFile::remove(m_strPidFile);
-}
-
-#endif /* VBOX_GUI_WITH_PIDFILE */
 
 #ifdef VBOX_WS_WIN
@@ -1220 +1086 @@
 }
 #endif /* VBOX_WS_WIN */
+
+bool UICommon::processArgs()
+{
+    /* Among those arguments: */
+    bool fResult = false;
+    const QStringList args = qApp->arguments();
+
+    /* We are looking for a list of file URLs passed to the executable: */
+    QList<QUrl> listArgUrls;
+    for (int i = 1; i < args.size(); ++i)
+    {
+        /* But we break out after the first parameter, cause there
+         * could be parameters with arguments (e.g. --comment comment). */
+        if (args.at(i).startsWith("-"))
+            break;
+
+#ifdef VBOX_WS_MAC
+        const QString strArg = ::darwinResolveAlias(args.at(i));
+#else
+        const QString strArg = args.at(i);
+#endif
+
+        /* So if the argument file exists, we add it to URL list: */
+        if (   !strArg.isEmpty()
+            && QFile::exists(strArg))
+            listArgUrls << QUrl::fromLocalFile(QFileInfo(strArg).absoluteFilePath());
+    }
+
+    /* If there are file URLs: */
+    if (!listArgUrls.isEmpty())
+    {
+        /* We enumerate them and: */
+        for (int i = 0; i < listArgUrls.size(); ++i)
+        {
+            /* Check which of them has allowed VM extensions: */
+            const QUrl url = listArgUrls.at(i);
+            const QString strFile = url.toLocalFile();
+            if (UICommon::hasAllowedExtension(strFile, VBoxFileExts))
+            {
+                /* So that we could run existing VMs: */
+                CVirtualBox comVBox = virtualBox();
+                CMachine comMachine = comVBox.FindMachine(strFile);
+                if (!comMachine.isNull())
+                {
+                    fResult = true;
+                    launchMachine(comMachine);
+                    /* And remove their URLs from the ULR list: */
+                    listArgUrls.removeAll(url);
+                }
+            }
+        }
+    }
+
+    /* And if there are *still* URLs: */
+    if (!listArgUrls.isEmpty())
+    {
+        /* We store them, they will be handled later: */
+        m_listArgUrls = listArgUrls;
+    }
+
+    return fResult;
+}
+
+bool UICommon::argumentUrlsPresent() const
+{
+    return !m_listArgUrls.isEmpty();
+}
+
+QList<QUrl> UICommon::takeArgumentUrls()
+{
+    const QList<QUrl> result = m_listArgUrls;
+    m_listArgUrls.clear();
+    return result;
+}
+
+#ifdef VBOX_WITH_DEBUGGER_GUI
+
+bool UICommon::isDebuggerEnabled() const
+{
+    return isDebuggerWorker(&m_fDbgEnabled, GUI_Dbg_Enabled);
+}
+
+bool UICommon::isDebuggerAutoShowEnabled() const
+{
+    return isDebuggerWorker(&m_fDbgAutoShow, GUI_Dbg_AutoShow);
+}
+
+bool UICommon::isDebuggerAutoShowCommandLineEnabled() const
+{
+    return isDebuggerWorker(&m_fDbgAutoShowCommandLine, GUI_Dbg_AutoShow);
+}
+
+bool UICommon::isDebuggerAutoShowStatisticsEnabled() const
+{
+    return isDebuggerWorker(&m_fDbgAutoShowStatistics, GUI_Dbg_AutoShow);
+}
+
+#endif /* VBOX_WITH_DEBUGGER_GUI */
+
+bool UICommon::shouldStartPaused() const
+{
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    return m_enmLaunchRunning == LaunchRunning_Default ? isDebuggerAutoShowEnabled() : m_enmLaunchRunning == LaunchRunning_No;
+#else
+    return false;
+#endif
+}
+
+#ifdef VBOX_GUI_WITH_PIDFILE
+
+void UICommon::createPidfile()
+{
+    if (!m_strPidFile.isEmpty())
+    {
+        const qint64 iPid = qApp->applicationPid();
+        QFile file(m_strPidFile);
+        if (file.open(QIODevice::WriteOnly | QIODevice::Truncate))
+        {
+             QTextStream out(&file);
+             out << iPid << endl;
+        }
+        else
+            LogRel(("Failed to create pid file %s\n", m_strPidFile.toUtf8().constData()));
+    }
+}
+
+void UICommon::deletePidfile()
+{
+    if (   !m_strPidFile.isEmpty()
+        && QFile::exists(m_strPidFile))
+        QFile::remove(m_strPidFile);
+}
+
+#endif /* VBOX_GUI_WITH_PIDFILE */
 
 /* static */

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

@@ -212 +212 @@
 #endif
 
+#ifdef VBOX_WS_WIN
+        /** Loads the color theme. */
+        static void loadColorTheme();
+#endif
+
 #ifdef VBOX_WS_X11
         /** X11: Returns whether the Window Manager we are running under is composition one. */
@@ -246 +251 @@
 
         /** Returns the --fda option value (whether we have floppy image). */
-        bool hasFloppyImageToMount() const { return !m_strFloppyImage.isNull(); }
+        bool hasFloppyImageToMount() const { return !m_uFloppyImage.isNull(); }
         /** Returns the --dvd | --cdrom option value (whether we have DVD image). */
-        bool hasDvdImageToMount() const { return !m_strDvdImage.isNull(); }
+        bool hasDvdImageToMount() const { return !m_uDvdImage.isNull(); }
         /** Returns floppy image name. */
-        QUuid const &getFloppyImage() const { return m_strFloppyImage; }
+        QUuid getFloppyImage() const { return m_uFloppyImage; }
         /** Returns DVD image name. */
-        QUuid const &getDvdImage() const { return m_strDvdImage; }
+        QUuid getDvdImage() const { return m_uDvdImage; }
 
         /** Returns the --disable-patm option value. */
@@ -300 +305 @@
     /** @name Localization stuff.
      * @{ */
-#ifdef VBOX_WS_WIN
-        /** Loads the color theme. */
-        static void loadColorTheme();
-#endif
-
         /** Returns tr("%n year(s)"). */
         static QString yearsToString(uint32_t cVal);
@@ -890 +890 @@
 
         /** Holds the --fda option value (floppy image). */
-        QUuid  m_strFloppyImage;
+        QUuid  m_uFloppyImage;
         /** Holds the --dvd | --cdrom option value (DVD image). */
-        QUuid  m_strDvdImage;
+        QUuid  m_uDvdImage;
 
         /** Holds the --disable-patm option value. */
@@ -925 +925 @@
 
         /** Holds whether --start-running, --start-paused or nothing was given. */
-        enum LaunchRunning  m_enmLaunchRunning;
+        LaunchRunning  m_enmLaunchRunning;
 #endif