Changeset 100730 in vbox for trunk

Timestamp:

Jul 28, 2023 3:08:35 PM (17 months ago)

Author:

vboxsync

Message:

API/FE/Qt: bugref:10466. bugref:10465. Adding GUI side of the extension pack install event handling.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/extensionpackmanager/UIExtensionPackManager.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/globals/UIMainEventListener.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/globals/UIMainEventListener.h (modified) (1 diff)
• Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.h (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/VirtualBoxImpl.h (modified) (1 diff)
• Main/src-server/VirtualBoxImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensionpackmanager/UIExtensionPackManager.cpp

@@ -45 +45 @@
 #include "UIMessageCenter.h"
 #include "UINotificationCenter.h"
+#include "UIVirtualBoxEventHandler.h"
 
 /* COM includes: */
@@ -386 +387 @@
     uiCommon().setHelpKeyword(this, "ext-pack-manager");
     connect(&uiCommon(), &UICommon::sigExtensionPackInstalled,
+            this, &UIExtensionPackManagerWidget::sltHandleExtensionPackInstalled);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigExtensionPackInstalled,
             this, &UIExtensionPackManagerWidget::sltHandleExtensionPackInstalled);
 

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

@@ -630 +630 @@
         {
             CExtPackInstalledEvent comEventSpecific(pEvent);
-            //printf("Ext. pack installed from the file: %s\n", qPrintable(comEventSpecific.GetFilename()));
+            emit sigExtensionPackInstalled(comEventSpecific.GetName());
         };
         default: break;

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

@@ -123 +123 @@
         /** Notifies about cloud profile with specified @a strName of provider with specified @a uProviderId is changed. */
         void sigCloudProfileChanged(const QUuid &uProviderId, const QString &strName);
+        /** Notifies about ext.pack installation @a strname is the name of the installed ext. pack. */
+        void sigExtensionPackInstalled(const QString &strName);
     /** @} */
 

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

@@ -90 +90 @@
       * @param  fRegistered    Brings whether medium is registered or unregistered. */
     void sigMediumRegistered(const QUuid &uMediumId, KDeviceType enmMediumType, bool fRegistered);
+    /** Notifies extension pack. install.
+     *  @param  strName      Passes extension pack name. */
+    void sigExtensionPackInstalled(const QString &strName);
 
 public:
@@ -256 +259 @@
             this, SIGNAL(sigMediumRegistered(QUuid, KDeviceType, bool)),
             Qt::DirectConnection);
+    connect(m_pQtListener->getWrapped(), SIGNAL(sigExtensionPackInstalled(QString)),
+            this, SIGNAL(sigExtensionPackInstalled(QString)),
+            Qt::DirectConnection);
 }
 
@@ -377 +383 @@
             this, SIGNAL(sigMediumRegistered(QUuid, KDeviceType, bool)),
             Qt::QueuedConnection);
+    connect(m_pProxy, SIGNAL(sigExtensionPackInstalled(QString)),
+            this, SIGNAL(sigExtensionPackInstalled(QString)),
+            Qt::QueuedConnection);
 }
 

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

@@ -98 +98 @@
       * @param  fRegistered    Brings whether medium is registered or unregistered. */
     void sigMediumRegistered(const QUuid &uMediumId, KDeviceType enmMediumType, bool fRegistered);
+    /** Notifies extension pack. install.
+     *  @param  strName      Passes extension pack name. */
+    void sigExtensionPackInstalled(const QString &strName);
 
 public:

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -26919 +26919 @@
     <const name="OnExtPackInstalled" value="123">
       <desc>
-        See <link to="IClipboardErrorEvent">IClipboardErrorEvent</link>.
+        See <link to="IExtPackInstalledEvent">IExtPackInstalledEvent</link>.
       </desc>
     </const>
@@ -27281 +27281 @@
     >
     <desc>Extension pack installed event.</desc>
-    <attribute name="filename" readonly="yes" type="wstring">
-      <desc>
-        Name of the extension pack install file.
+    <attribute name="name" readonly="yes" type="wstring">
+      <desc>
+        Name of the extension pack.
       </desc>
     </attribute>

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -228 +228 @@
 
 #ifdef VBOX_WITH_EXTPACK
-    void i_onExtPackInstalled(const Utf8Str &aExtPackInstallFile);
+    void i_onExtPackInstalled(const Utf8Str &aExtPackName);
 #endif
 

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -3792 +3792 @@
 
 #ifdef VBOX_WITH_EXTPACK
-void VirtualBox::i_onExtPackInstalled(const Utf8Str &aExtPackInstallFile)
-{
-    ::FireExtPackInstalledEvent(m->pEventSource, aExtPackInstallFile);
+void VirtualBox::i_onExtPackInstalled(const Utf8Str &aExtPackName)
+{
+    ::FireExtPackInstalledEvent(m->pEventSource, aExtPackName);
 }
 #endif