Changeset 76835 in vbox

Timestamp:

Jan 16, 2019 11:54:21 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9361: Handle unhandled URL arguments later, when VirtualBox Manager UI is ready and shown, this prevents double manager creation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIStarter.cpp (modified) (3 diffs)
• globals/UIStarter.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)

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

@@ -80 +80 @@
     connect(&vboxGlobal(), &VBoxGlobal::sigAskToRestartUI,
             this, &UIStarter::sltRestartUI);
-    connect(&vboxGlobal(), &VBoxGlobal::sigAskToOpenURLs,
-            this, &UIStarter::sltOpenURLs);
     connect(&vboxGlobal(), &VBoxGlobal::sigAskToCommitData,
             this, &UIStarter::sltHandleCommitDataRequest);
@@ -91 +89 @@
     disconnect(&vboxGlobal(), &VBoxGlobal::sigAskToRestartUI,
                this, &UIStarter::sltRestartUI);
-    disconnect(&vboxGlobal(), &VBoxGlobal::sigAskToOpenURLs,
-               this, &UIStarter::sltOpenURLs);
     disconnect(&vboxGlobal(), &VBoxGlobal::sigAskToCommitData,
                this, &UIStarter::sltHandleCommitDataRequest);
@@ -173 +169 @@
 }
 
-void UIStarter::sltOpenURLs()
-{
-#ifndef VBOX_RUNTIME_UI
-    /* Create/show manager-window: */
-    UIVirtualBoxManager::create();
-
-    /* Ask the Manager UI to open URLs asynchronously: */
-    QMetaObject::invokeMethod(gpManager, "sltHandleOpenUrlCall", Qt::QueuedConnection);
-#endif
-}
-
 void UIStarter::sltHandleCommitDataRequest()
 {

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

@@ -64 +64 @@
     void cleanup();
 
-    /** Opens URLs in Selector UI. */
-    void sltOpenURLs();
-
     /** Handles commit data request. */
     void sltHandleCommitDataRequest();

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

@@ -496 +496 @@
     if (!listArgUrls.isEmpty())
     {
-        /* We store them: */
+        /* We store them, they will be handled later: */
         m_listArgUrls = listArgUrls;
-        /* And ask UIStarter to open them: */
-        emit sigAskToOpenURLs();
     }
 
     return fResult;
+}
+
+bool VBoxGlobal::argumentUrlsPresent() const
+{
+    return !m_listArgUrls.isEmpty();
 }
 

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

@@ -76 +76 @@
     /** @} */
 
-    /** @name Process arguments stuff.
-     * @{ */
-        /** Asks #UIStarter listener to open URLs. */
-        void sigAskToOpenURLs();
-    /** @} */
-
     /** @name COM stuff.
      * @{ */
@@ -201 +195 @@
         bool processArgs();
 
+        /** Returns whether there are unhandled URL arguments present. */
+        bool argumentUrlsPresent() const;
         /** Takes and returns the URL argument list while clearing the source. */
         QList<QUrl> takeArgumentUrls();

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

@@ -1240 +1240 @@
     }
 #endif /* VBOX_WS_MAC */
+
+    /* If there are unhandled URLs we should handle them after manager is shown: */
+    if (vboxGlobal().argumentUrlsPresent())
+        QMetaObject::invokeMethod(this, "sltHandleOpenUrlCall", Qt::QueuedConnection);
 }