Changeset 100737 in vbox

Timestamp:

Jul 30, 2023 9:48:13 AM (16 months ago)

Author:

vboxsync

Message:

API/FE/Qt: bugref:10466. bugref:10465. Adding a new event to signal successful uninstallation of extension pack. And GUI side of the code to handl this event.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/extensionpackmanager/UIExtensionPackManager.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/globals/UIMainEventListener.cpp (modified) (2 diffs)
• 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-all/ExtPackManagerImpl.cpp (modified) (1 diff)
• Main/src-server/VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -390 +390 @@
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigExtensionPackInstalled,
             this, &UIExtensionPackManagerWidget::sltHandleExtensionPackInstalled);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigExtensionPackUninstalled,
+            this, &UIExtensionPackManagerWidget::sltHandleExtensionPackUninstalled);
 
     /* Prepare stuff: */

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

@@ -52 +52 @@
 #include "CExtraDataChangedEvent.h"
 #include "CExtPackInstalledEvent.h"
+#include "CExtPackUninstalledEvent.h"
 #include "CGuestMonitorChangedEvent.h"
 #include "CGuestProcessIOEvent.h"
@@ -631 +632 @@
             CExtPackInstalledEvent comEventSpecific(pEvent);
             emit sigExtensionPackInstalled(comEventSpecific.GetName());
-        };
+            break;
+        }
+        case KVBoxEventType_OnExtPackUninstalled:
+        {
+            CExtPackInstalledEvent comEventSpecific(pEvent);
+            emit sigExtensionPackUninstalled(comEventSpecific.GetName());
+            break;
+        }
         default: break;
     }

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

@@ -125 +125 @@
         /** Notifies about ext.pack installation @a strname is the name of the installed ext. pack. */
         void sigExtensionPackInstalled(const QString &strName);
+        /** Notifies about ext.pack uninstallation @a strname is the name of the installed ext. pack. */
+        void sigExtensionPackUninstalled(const QString &strName);
     /** @} */
 

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

@@ -93 +93 @@
      *  @param  strName      Passes extension pack name. */
     void sigExtensionPackInstalled(const QString &strName);
+    /** Notifies extension pack. unnstall.
+     *  @param  strName      Passes extension pack name. */
+    void sigExtensionPackUninstalled(const QString &strName);
 
 public:
@@ -262 +265 @@
             this, SIGNAL(sigExtensionPackInstalled(QString)),
             Qt::DirectConnection);
+    connect(m_pQtListener->getWrapped(), SIGNAL(sigExtensionPackUninstalled(QString)),
+            this, SIGNAL(sigExtensionPackUninstalled(QString)),
+            Qt::DirectConnection);
 }
 
@@ -386 +392 @@
             this, SIGNAL(sigExtensionPackInstalled(QString)),
             Qt::QueuedConnection);
+    connect(m_pProxy, SIGNAL(sigExtensionPackUninstalled(QString)),
+            this, SIGNAL(sigExtensionPackUninstalled(QString)),
+            Qt::QueuedConnection);
 }
 

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

@@ -101 +101 @@
      *  @param  strName      Passes extension pack name. */
     void sigExtensionPackInstalled(const QString &strName);
+    /** Notifies extension pack. uninstall.
+     *  @param  strName      Passes extension pack name. */
+    void sigExtensionPackUninstalled(const QString &strName);
 
 public:

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

@@ -26922 +26922 @@
       </desc>
     </const>
+    <const name="OnExtPackUninstalled" value="124">
+      <desc>
+        See <link to="IExtPackUninstalledEvent">IExtPackUninstalledEvent</link>.
+      </desc>
+    </const>
     <!-- End event marker -->
-    <const name="End" value="124">
+    <const name="End" value="125">
       <desc>
         Must be last event, used for iterations and structures relying on numerical event values.
@@ -27286 +27291 @@
       </desc>
     </attribute>
-
+  </interface>
+
+  <interface
+    name="IExtPackUninstalledEvent" extends="IEvent"
+    uuid="31aab263-95ef-48a4-9ce7-eaf0d3ae150f"
+    wsmap="managed" autogen="VBoxEvent" id="OnExtPackUninstalled"
+    >
+    <desc>Extension pack uninstalled event.</desc>
+    <attribute name="name" readonly="yes" type="wstring">
+      <desc>
+        Name of the extension pack.
+      </desc>
+    </attribute>
   </interface>
 

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

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

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -3287 +3287 @@
                                 {
                                     if (!pExtPack)
+                                    {
                                         LogRel(("ExtPackManager: Successfully uninstalled extension pack '%s'.\n", a_pstrName->c_str()));
+                                        m->pVirtualBox->i_onExtPackInstalled(*a_pstrName);
+                                    }
                                     else
                                         hrc = setError(E_FAIL,

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

@@ -3796 +3796 @@
     ::FireExtPackInstalledEvent(m->pEventSource, aExtPackName);
 }
+
+void VirtualBox::i_onExtPackUninstalled(const Utf8Str &aExtPackName)
+{
+    ::FireExtPackUninstalledEvent(m->pEventSource, aExtPackName);
+}
 #endif