Changeset 47523 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 2, 2013 1:11:24 PM (12 years ago)

Author:

vboxsync

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

87713

Message:

FE/Qt: Popup-center: Make sure *every* popup-stack can have independent integration-type which persists through popup-stack recreation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIPopupCenter.cpp (modified) (6 diffs)
• globals/UIPopupCenter.h (modified) (4 diffs)
• runtime/UIMachineLogic.cpp (modified) (5 diffs)
• runtime/UIMachineLogic.h (modified) (2 diffs)
• runtime/seamless/UIMachineLogicSeamless.cpp (modified) (2 diffs)
• runtime/seamless/UIMachineLogicSeamless.h (modified) (2 diffs)
• widgets/UIPopupStack.cpp (modified) (3 diffs)
• widgets/UIPopupStack.h (modified) (3 diffs)
• widgets/UIPopupStackViewport.cpp (modified) (1 diff)
• widgets/UIPopupStackViewport.h (modified) (1 diff)

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

@@ -73 +73 @@
 void UIPopupCenter::prepare()
 {
-    /* Embedded by default: */
-    m_type = UIPopupIntegrationType_Embedded;
 }
 
 void UIPopupCenter::cleanup()
 {
+    /* Make sure all the popup-stack types destroyed: */
+    foreach (const QString &strPopupStackTypeID, m_stackTypes.keys())
+        m_stackTypes.remove(strPopupStackTypeID);
     /* Make sure all the popup-stacks destroyed: */
     foreach (const QString &strPopupStackID, m_stacks.keys())
@@ -87 +88 @@
 }
 
-void UIPopupCenter::setStackIntegrationType(UIPopupIntegrationType type)
-{
-    /* Make sure type changed: */
-    if (m_type == type)
-        return;
-
-    /* Assign new type:  */
-    m_type = type;
+void UIPopupCenter::showPopupStack(QWidget *pParent)
+{
+    /* Make sure parent is set! */
+    AssertMsg(pParent, ("Parent is NULL!"));
+    if (!pParent)
+        return;
+
+    /* Make sure corresponding popup-stack *exists*: */
+    const QString strPopupStackID(popupStackID(pParent));
+    if (!m_stacks.contains(strPopupStackID))
+        return;
+
+    /* Assign stack with passed parent: */
+    UIPopupStack *pPopupStack = m_stacks[strPopupStackID];
+    assignPopupStackParent(pPopupStack, pParent, m_stackTypes[strPopupStackID]);
+    pPopupStack->show();
+}
+
+void UIPopupCenter::hidePopupStack(QWidget *pParent)
+{
+    /* Make sure parent is set! */
+    AssertMsg(pParent, ("Parent is NULL!"));
+    if (!pParent)
+        return;
+
+    /* Make sure corresponding popup-stack *exists*: */
+    const QString strPopupStackID(popupStackID(pParent));
+    if (!m_stacks.contains(strPopupStackID))
+        return;
+
+    /* Unassign stack with passed parent: */
+    UIPopupStack *pPopupStack = m_stacks[strPopupStackID];
+    pPopupStack->hide();
+    unassignPopupStackParent(pPopupStack, pParent);
+}
+
+void UIPopupCenter::setPopupStackType(QWidget *pParent, UIPopupStackType newStackType)
+{
+    /* Make sure parent is set! */
+    AssertMsg(pParent, ("Parent is NULL!"));
+    if (!pParent)
+        return;
+
+    /* Composing corresponding popup-stack: */
+    const QString strPopupStackID(popupStackID(pParent));
+
+    /* Looking for current popup-stack type, create if it doesn't exists: */
+    UIPopupStackType &stackType = m_stackTypes[strPopupStackID];
+
+    /* Make sure stack-type has changed: */
+    if (stackType == newStackType)
+        return;
+
+    /* Remember new stack type: */
+    LogRelFlow(("UIPopupCenter::setPopupStackType: Changing type of popup-stack with ID = '%s' from '%s' to '%s'.\n",
+                strPopupStackID.toAscii().constData(),
+                stackType == UIPopupStackType_Separate ? "separate window" : "embedded widget",
+                newStackType == UIPopupStackType_Separate ? "separate window" : "embedded widget"));
+    stackType = newStackType;
 }
 
@@ -201 +253 @@
     }
 
-    /* Looking for the corresponding popup-stack: */
+    /* Looking for corresponding popup-stack: */
     const QString strPopupStackID(popupStackID(pParent));
     UIPopupStack *pPopupStack = 0;
-    /* Is there already popup-stack with the same ID? */
+    /* If there is already popup-stack with such ID: */
     if (m_stacks.contains(strPopupStackID))
     {
-        /* Get existing one: */
+        /* Just get existing one: */
         pPopupStack = m_stacks[strPopupStackID];
     }
-    /* There is no popup-stack with the same ID? */
+    /* If there is no popup-stack with such ID: */
     else
     {
         /* Create new one: */
-        pPopupStack = m_stacks[strPopupStackID] = new UIPopupStack;
+        pPopupStack = m_stacks[strPopupStackID] = new UIPopupStack(strPopupStackID);
         /* Attach popup-stack connections: */
         connect(pPopupStack, SIGNAL(sigPopupPaneDone(QString, int)), this, SLOT(sltPopupPaneDone(QString, int)));
-        connect(pPopupStack, SIGNAL(sigRemove()), this, SLOT(sltRemovePopupStack()));
+        connect(pPopupStack, SIGNAL(sigRemove(QString)), this, SLOT(sltRemovePopupStack(QString)));
         /* Show popup-stack: */
         showPopupStack(pParent);
     }
 
-    /* Looking for the corresponding popup-pane: */
+    /* If there is already popup-pane with such ID: */
     if (pPopupStack->exists(strPopupPaneID))
     {
-        /* Update existing one: */
+        /* Just update existing one: */
         pPopupStack->updatePopupPane(strPopupPaneID, strMessage, strDetails);
     }
+    /* If there is no popup-pane with such ID: */
     else
     {
@@ -263 +316 @@
 }
 
-void UIPopupCenter::showPopupStack(QWidget *pParent)
-{
-    /* Make sure passed parent is valid: */
-    if (!pParent)
-    {
-        AssertMsgFailed(("Passed parent is NULL"));
-        return;
-    }
-
-    /* Do we have a stack for passed parent? */
-    const QString strPopupStackID(popupStackID(pParent));
+void UIPopupCenter::sltPopupPaneDone(QString strPopupPaneID, int iResultCode)
+{
+    /* Was the result auto-confirmated? */
+    if (iResultCode & AlertOption_AutoConfirmed)
+    {
+        /* Remember auto-confirmation fact: */
+        QStringList confirmedPopupList = vboxGlobal().virtualBox().GetExtraData(GUI_SuppressMessages).split(',');
+        confirmedPopupList << strPopupPaneID;
+        vboxGlobal().virtualBox().SetExtraData(GUI_SuppressMessages, confirmedPopupList.join(","));
+    }
+
+    /* Notify listeners: */
+    emit sigPopupPaneDone(strPopupPaneID, iResultCode);
+}
+
+void UIPopupCenter::sltRemovePopupStack(QString strPopupStackID)
+{
+    /* Make sure corresponding popup-stack *exists*: */
     if (!m_stacks.contains(strPopupStackID))
-        return;
-
-    /* Assign stack with passed parent: */
-    UIPopupStack *pPopupStack = m_stacks[strPopupStackID];
-    assignPopupStackParent(pPopupStack, pParent);
-    pPopupStack->show();
-}
-
-void UIPopupCenter::hidePopupStack(QWidget *pParent)
-{
-    /* Make sure passed parent is valid: */
-    if (!pParent)
-    {
-        AssertMsgFailed(("Passed parent is NULL"));
-        return;
-    }
-
-    /* Do we have a stack for passed parent? */
-    const QString strPopupStackID(popupStackID(pParent));
-    if (!m_stacks.contains(strPopupStackID))
-        return;
-
-    /* Unassign stack with passed parent: */
-    UIPopupStack *pPopupStack = m_stacks[strPopupStackID];
-    pPopupStack->hide();
-    unassignPopupStackParent(pPopupStack, pParent);
-}
-
-void UIPopupCenter::reinstallPopupStack(QWidget *pParent, bool fAsTopLevel)
-{
-    /* Make sure passed parent is valid: */
-    if (!pParent)
-        return;
-
-    /* Do we have a stack for passed parent? */
-    const QString strPopupStackID(popupStackID(pParent));
-    if (!m_stacks.contains(strPopupStackID))
-        return;
-
-    /* Make sure we should really reinstall stack: */
-    if ((fAsTopLevel && m_type == UIPopupIntegrationType_Toplevel) ||
-        (!fAsTopLevel && m_type == UIPopupIntegrationType_Embedded))
-        return;
-
-    LogRelFlow(("UIPopupCenter::reinstallPopupStack: Reinstalling popup-stack as %s.\n",
-                fAsTopLevel ? "top level window" : "embedded widget"));
-
-    /* Remove stack: */
-    hidePopupStack(pParent);
-
-    /* Make sure integration type is correct: */
-    setStackIntegrationType(fAsTopLevel ? UIPopupIntegrationType_Toplevel : UIPopupIntegrationType_Embedded);
-
-    /* Return stack again: */
-    showPopupStack(pParent);
-}
-
-void UIPopupCenter::assignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent)
-{
-    /* Make sure parent is not NULL: */
-    AssertMsg(pParent, ("Invalid parent passed!"));
+    {
+        AssertMsgFailed(("Popup-stack already destroyed!"));
+        return;
+    }
+
+    /* Delete popup-stack: */
+    delete m_stacks[strPopupStackID];
+    m_stacks.remove(strPopupStackID);
+}
+
+/* static */
+QString UIPopupCenter::popupStackID(QWidget *pParent)
+{
+    /* Make sure parent is set! */
+    AssertMsg(pParent, ("Parent is NULL!"));
+    if (!pParent)
+        return QString();
+
+    /* Special handling for Runtime UI: */
+    if (qobject_cast<UIMachineWindow*>(pParent))
+        return QString("UIMachineWindow");
+
+    /* Common handling for other cases: */
+    return pParent->metaObject()->className();
+}
+
+/* static */
+void UIPopupCenter::assignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent, UIPopupStackType stackType)
+{
+    /* Make sure parent is set! */
+    AssertMsg(pParent, ("Parent is NULL!"));
+    if (!pParent)
+        return;
 
     /* Assign event-filter: */
     pParent->installEventFilter(pPopupStack);
 
-    /* Assign parent depending on *integration* type: */
-    switch (m_type)
-    {
-        case UIPopupIntegrationType_Embedded:
+    /* Assign parent depending on passed *stack* type: */
+    switch (stackType)
+    {
+        case UIPopupStackType_Embedded:
         {
             pPopupStack->setParent(pParent);
             break;
         }
-        case UIPopupIntegrationType_Toplevel:
+        case UIPopupStackType_Separate:
         {
             pPopupStack->setParent(pParent, Qt::Tool | Qt::FramelessWindowHint);
@@ -357 +389 @@
 }
 
+/* static */
 void UIPopupCenter::unassignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent)
 {
-    /* Make sure parent is not NULL: */
-    AssertMsg(pParent, ("Invalid parent passed!"));
+    /* Make sure parent is set! */
+    AssertMsg(pParent, ("Parent is NULL!"));
+    if (!pParent)
+        return;
 
     /* Unassign parent: */
@@ -367 +402 @@
     /* Unassign event-filter: */
     pParent->removeEventFilter(pPopupStack);
-}
-
-void UIPopupCenter::sltPopupPaneDone(QString strPopupPaneID, int iResultCode)
-{
-    /* Was the result auto-confirmated? */
-    if (iResultCode & AlertOption_AutoConfirmed)
-    {
-        /* Remember auto-confirmation fact: */
-        QStringList confirmedPopupList = vboxGlobal().virtualBox().GetExtraData(GUI_SuppressMessages).split(',');
-        confirmedPopupList << strPopupPaneID;
-        vboxGlobal().virtualBox().SetExtraData(GUI_SuppressMessages, confirmedPopupList.join(","));
-    }
-
-    /* Notify listeners: */
-    emit sigPopupPaneDone(strPopupPaneID, iResultCode);
-}
-
-void UIPopupCenter::sltShowPopupStack()
-{
-    showPopupStack(vboxGlobal().activeMachineWindow());
-}
-
-void UIPopupCenter::sltHidePopupStack()
-{
-    hidePopupStack(vboxGlobal().activeMachineWindow());
-}
-
-void UIPopupCenter::sltReinstallPopupStack(bool fAsTopLevel)
-{
-    reinstallPopupStack(vboxGlobal().activeMachineWindow(), fAsTopLevel);
-}
-
-void UIPopupCenter::sltRemovePopupStack()
-{
-    /* Make sure the sender is the popup-stack: */
-    UIPopupStack *pPopupStack = qobject_cast<UIPopupStack*>(sender());
-    if (!pPopupStack)
-    {
-        AssertMsgFailed(("Should be called by popup-stack only!"));
-        return;
-    }
-
-    /* Make sure the popup-stack still exists: */
-    const QString strPopupStackID(m_stacks.key(pPopupStack, QString()));
-    if (strPopupStackID.isNull())
-    {
-        AssertMsgFailed(("Popup-stack already destroyed!"));
-        return;
-    }
-
-    /* Cleanup the popup-stack: */
-    m_stacks.remove(strPopupStackID);
-    delete pPopupStack;
-}
-
-/* static */
-QString UIPopupCenter::popupStackID(QWidget *pParent)
-{
-    /* Make sure passed parent is always valid: */
-    if (!pParent)
-    {
-        AssertMsgFailed(("Passed parent is NULL"));
-        return QString();
-    }
-
-    /* Special handling for Runtime UI: */
-    if (qobject_cast<UIMachineWindow*>(pParent))
-        return QString("UIMachineWindow");
-
-    /* Common handling for other cases: */
-    return pParent->metaObject()->className();
 }
 

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

@@ -29 +29 @@
 class UIPopupStack;
 
-/* Popup integration types: */
-enum UIPopupIntegrationType
+/* Popup-stack types: */
+enum UIPopupStackType
 {
-    UIPopupIntegrationType_Embedded,
-    UIPopupIntegrationType_Toplevel
+    UIPopupStackType_Embedded,
+    UIPopupStackType_Separate
 };
 
@@ -52 +52 @@
     static void destroy();
 
-    /* API: Stack layout stuff: */
-    void setStackIntegrationType(UIPopupIntegrationType type);
+    /* API: Popup-stack stuff: */
+    void showPopupStack(QWidget *pParent);
+    void hidePopupStack(QWidget *pParent);
+    void setPopupStackType(QWidget *pParent, UIPopupStackType newStackType);
 
     /* API: Main message function.
@@ -113 +115 @@
     void sltPopupPaneDone(QString strPopupPaneID, int iResultCode);
 
-    /* Handlers: Popup-stack stuff: */
-    void sltShowPopupStack();
-    void sltHidePopupStack();
-    void sltReinstallPopupStack(bool fAsTopLevel);
-    void sltRemovePopupStack();
+    /* Handler: Popup-stack stuff: */
+    void sltRemovePopupStack(QString strPopupStackID);
 
 private:
@@ -137 +136 @@
     void hidePopupPane(QWidget *pParent, const QString &strPopupPaneID);
 
-    /* Helpers: Popup-stack stuff: */
-    void showPopupStack(QWidget *pParent);
-    void hidePopupStack(QWidget *pParent);
-    void reinstallPopupStack(QWidget *pParent, bool fAsTopLevel);
-    void assignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent);
-    void unassignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent);
-
     /* Static helper: Popup-stack stuff: */
     static QString popupStackID(QWidget *pParent);
+    static void assignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent, UIPopupStackType stackType);
+    static void unassignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent);
 
-    /* Variable: Popup-stack stuff: */
-    UIPopupIntegrationType m_type;
+    /* Variables: Popup-stack stuff: */
+    QMap<QString, UIPopupStackType> m_stackTypes;
     QMap<QString, QPointer<UIPopupStack> > m_stacks;
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -353 +353 @@
 void UIMachineLogic::notifyAbout3DOverlayVisibilityChange(bool fVisible)
 {
-    /* Notify listener about 3D overlay visibility change: */
-    emit sigNotifyAbout3DOverlayVisibilityChange(fVisible);
+    /* If active machine-window is defined now: */
+    if (activeMachineWindow())
+    {
+        /* Reinstall corresponding popup-stack according 3D overlay visibility status: */
+        popupCenter().hidePopupStack(activeMachineWindow());
+        popupCenter().setPopupStackType(activeMachineWindow(), fVisible ? UIPopupStackType_Separate : UIPopupStackType_Embedded);
+        popupCenter().showPopupStack(activeMachineWindow());
+    }
 }
 
@@ -544 +550 @@
 #endif /* Q_WS_MAC */
 {
-    /* Register popup-center connections: */
-    connect(this, SIGNAL(sigMachineWindowsCreated()),
-            &popupCenter(), SLOT(sltShowPopupStack()));
-    connect(this, SIGNAL(sigMachineWindowsDestroyed()),
-            &popupCenter(), SLOT(sltHidePopupStack()));
-    connect(this, SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
-            &popupCenter(), SLOT(sltReinstallPopupStack(bool)));
-}
-
-UIMachineLogic::~UIMachineLogic()
-{
-    /* Unregister popup-center connections: */
-    disconnect(this, SIGNAL(sigMachineWindowsCreated()),
-               &popupCenter(), SLOT(sltShowPopupStack()));
-    disconnect(this, SIGNAL(sigMachineWindowsDestroyed()),
-               &popupCenter(), SLOT(sltHidePopupStack()));
-    disconnect(this, SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
-               &popupCenter(), SLOT(sltReinstallPopupStack(bool)));
 }
 
@@ -573 +561 @@
     if (!fIsWindowsCreated)
     {
-        /* We emit this signal *before* the remembering new value
+        /* We ask popup-center to hide corresponding popup-stack *before* the remembering new value
          * because we want UIMachineLogic::activeMachineWindow() to be yet alive. */
-        emit sigMachineWindowsDestroyed();
+        popupCenter().hidePopupStack(activeMachineWindow());
     }
 
@@ -584 +572 @@
     if (fIsWindowsCreated)
     {
-        /* We emit this signal *after* the remembering new value
+        /* We ask popup-center to show corresponding popup-stack *after* the remembering new value
          * because we want UIMachineLogic::activeMachineWindow() to be already alive. */
-        emit sigMachineWindowsCreated();
+        popupCenter().setPopupStackType(activeMachineWindow(),
+                                        visualStateType() == UIVisualStateType_Seamless ?
+                                        UIPopupStackType_Separate : UIPopupStackType_Embedded);
+        popupCenter().showPopupStack(activeMachineWindow());
     }
 }
@@ -663 +654 @@
 # endif /* VBOX_WITH_ICHAT_THEATER */
 #endif /* Q_WS_MAC */
-
-    /* Switch popup-center into default integration mode: */
-    popupCenter().setStackIntegrationType(UIPopupIntegrationType_Embedded);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -53 +53 @@
     Q_OBJECT;
 
-signals:
-
-    /* Notifiers: Machine-window(s) stuff: */
-    void sigMachineWindowsCreated();
-    void sigMachineWindowsDestroyed();
-    void sigNotifyAbout3DOverlayVisibilityChange(bool fVisible);
-
 public:
 
@@ -122 +115 @@
 protected:
 
-    /* Constructor/destructor: */
+    /* Constructor: */
     UIMachineLogic(QObject *pParent, UISession *pSession, UIVisualStateType visualStateType);
-    ~UIMachineLogic();
 
     /* Protected getters/setters: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -91 +91 @@
 void UIMachineLogicSeamless::notifyAbout3DOverlayVisibilityChange(bool)
 {
-    /* Ignore this event in seamless mode.
-     * We have to keep popup-stack integration type 'top-level'.
-     * S.A. UIMachineLogicSeamless::prepareRequiredFeatures(). */
+    /* If active machine-window is defined now: */
+    if (activeMachineWindow())
+    {
+        /* Reinstall corresponding popup-stack and make sure it has proper type: */
+        popupCenter().hidePopupStack(activeMachineWindow());
+        popupCenter().setPopupStackType(activeMachineWindow(), UIPopupStackType_Separate);
+        popupCenter().showPopupStack(activeMachineWindow());
+    }
 }
 
@@ -118 +123 @@
     /* Call to base-class: */
     UIMachineLogic::sltHostScreenCountChanged(cScreenCount);
-}
-
-void UIMachineLogicSeamless::prepareRequiredFeatures()
-{
-    /* Call to base-class: */
-    UIMachineLogic::prepareRequiredFeatures();
-
-    /* Switch popup-center into 'top-level' integration mode: */
-    popupCenter().setStackIntegrationType(UIPopupIntegrationType_Toplevel);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.h

@@ -55 +55 @@
 
     /* Prepare helpers: */
-    void prepareRequiredFeatures();
     void prepareActionGroups();
     void prepareMachineWindows();
@@ -64 +63 @@
     void cleanupMachineWindows();
     void cleanupActionGroups();
-    //void cleanupRequiredFeatures();
 
     /* Variables: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp

@@ -30 +30 @@
 #include "UIPopupStackViewport.h"
 
-UIPopupStack::UIPopupStack()
-    : m_pScrollArea(0)
+UIPopupStack::UIPopupStack(const QString &strID)
+    : m_strID(strID)
+    , m_pScrollArea(0)
     , m_pScrollViewport(0)
     , m_iParentMenuBarHeight(0)
@@ -138 +139 @@
     if (parentWidget())
         parentWidget()->setFocus();
+}
+
+void UIPopupStack::sltPopupPanesRemoved()
+{
+    /* Ask popup-center to remove us: */
+    emit sigRemove(m_strID);
 }
 
@@ -194 +201 @@
                 connect(m_pScrollViewport, SIGNAL(sigPopupPaneRemoved(QString)),
                         this, SLOT(sltPopupPaneRemoved(QString)));
-                connect(m_pScrollViewport, SIGNAL(sigRemove()),
-                        this, SIGNAL(sigRemove()));
+                connect(m_pScrollViewport, SIGNAL(sigPopupPanesRemoved()),
+                        this, SLOT(sltPopupPanesRemoved()));
             }
             /* Assign scroll-viewport to scroll-area: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.h

@@ -43 +43 @@
 
     /* Notifier: Popup-stack stuff: */
-    void sigRemove();
+    void sigRemove(QString strID);
 
 public:
 
     /* Constructor: */
-    UIPopupStack();
+    UIPopupStack(const QString &strID);
 
     /* API: Popup-pane stuff: */
@@ -69 +69 @@
     void sltAdjustGeometry();
 
-    /* Handler: Popuyp-pane stuff: */
+    /* Handlers: Popup-pane stuff: */
     void sltPopupPaneRemoved(QString strPopupPaneID);
+    void sltPopupPanesRemoved();
 
 private:
@@ -91 +92 @@
     static int parentStatusBarHeight(QWidget *pParent);
 
+    /* Variable: General stuff: */
+    QString m_strID;
+
     /* Variables: Widget stuff: */
     QVBoxLayout *m_pMainLayout;

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStackViewport.cpp

@@ -155 +155 @@
 
     /* Notify listeners about popup-stack: */
-    emit sigRemove();
+    emit sigPopupPanesRemoved();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStackViewport.h

@@ -41 +41 @@
     void sigPopupPaneDone(QString strPopupPaneID, int iResultCode);
     void sigPopupPaneRemoved(QString strPopupPaneID);
-
-    /* Notifier: Popup-stack stuff: */
-    void sigRemove();
+    void sigPopupPanesRemoved();
 
 public: