Changeset 46976 in vbox

Timestamp:

Jul 4, 2013 10:26:22 AM (12 years ago)

Author:

vboxsync

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

86984

Message:

FE/Qt: Popup-center: Support for top-level popup-stacks, used in *seamless* mode.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -41 +41 @@
     /* Create instance: */
     new UIPopupCenter;
+    /* Prepare instance: */
+    m_spInstance->prepare();
 }
 
@@ -68 +70 @@
 }
 
+void UIPopupCenter::prepare()
+{
+    /* Embedded by default: */
+    m_type = UIPopupIntegrationType_Embedded;
+}
+
 void UIPopupCenter::cleanup()
 {
@@ -76 +84 @@
         m_stacks.remove(strPopupStackID);
     }
+}
+
+void UIPopupCenter::setStackIntegrationType(UIPopupIntegrationType type)
+{
+    /* Make sure type changed: */
+    if (m_type == type)
+        return;
+
+    /* Assign new type:  */
+    m_type = type;
 }
 
@@ -229 +247 @@
         return;
 
-    /* Install stack to passed parent: */
+    /* Assign stack with passed parent: */
     UIPopupStack *pPopupStack = m_stacks[strPopupStackID];
-    pParent->installEventFilter(pPopupStack);
-    pPopupStack->setParent(pParent);
+    assignPopupStackParent(pPopupStack, pParent);
     pPopupStack->show();
 }
@@ -250 +267 @@
         return;
 
-    /* Uninstall stack from passed parent: */
+    /* Unassign stack with passed parent: */
     UIPopupStack *pPopupStack = m_stacks[strPopupStackID];
     pPopupStack->hide();
+    unassignPopupStackParent(pPopupStack, pParent);
+}
+
+void UIPopupCenter::assignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent)
+{
+    /* Make sure parent is not NULL: */
+    AssertMsg(pParent, ("Invalid parent passed!"));
+
+    /* Assign event-filter: */
+    pParent->installEventFilter(pPopupStack);
+
+    /* Assign parent depending on *integration* type: */
+    switch (m_type)
+    {
+        case UIPopupIntegrationType_Embedded:
+        {
+            pPopupStack->setParent(pParent);
+            break;
+        }
+        case UIPopupIntegrationType_Toplevel:
+        {
+            pPopupStack->setParent(pParent, Qt::Window | Qt::FramelessWindowHint);
+            break;
+        }
+        default: break;
+    }
+}
+
+void UIPopupCenter::unassignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent)
+{
+    /* Make sure parent is not NULL: */
+    AssertMsg(pParent, ("Invalid parent passed!"));
+
+    /* Unassign parent: */
     pPopupStack->setParent(0);
+
+    /* Unassign event-filter: */
     pParent->removeEventFilter(pPopupStack);
 }

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

@@ -29 +29 @@
 class UIPopupStack;
 
+/* Popup integration types: */
+enum UIPopupIntegrationType
+{
+    UIPopupIntegrationType_Embedded,
+    UIPopupIntegrationType_Toplevel
+};
+
 /* Popup-center singleton: */
 class UIPopupCenter: public QObject
@@ -44 +51 @@
     static void create();
     static void destroy();
+
+    /* API: Stack layout stuff: */
+    void setStackIntegrationType(UIPopupIntegrationType type);
 
     /* API: Main message function.
@@ -104 +114 @@
     ~UIPopupCenter();
 
-    /* Helper: Cleanup stuff: */
+    /* Helpers: Prepare/cleanup stuff: */
+    void prepare();
     void cleanup();
 
@@ -117 +128 @@
     void showPopupStack(QWidget *pParent);
     void hidePopupStack(QWidget *pParent);
+    void assignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent);
+    void unassignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent);
 
     /* Static helper: Popup-stack stuff: */
@@ -122 +135 @@
 
     /* Variable: Popup-stack stuff: */
+    UIPopupIntegrationType m_type;
     QMap<QString, QPointer<UIPopupStack> > m_stacks;
 

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

@@ -535 +535 @@
 {
     /* Register popup-center connections: */
-    connect(this, SIGNAL(sigMachineWidnowsCreated()),
+    connect(this, SIGNAL(sigMachineWindowsCreated()),
             &popupCenter(), SLOT(sltShowPopupStack()));
-    connect(this, SIGNAL(sigMachineWidnowsDestroyed()),
+    connect(this, SIGNAL(sigMachineWindowsDestroyed()),
             &popupCenter(), SLOT(sltHidePopupStack()));
 }
@@ -544 +544 @@
 {
     /* Unregister popup-center connections: */
-    disconnect(this, SIGNAL(sigMachineWidnowsCreated()),
+    disconnect(this, SIGNAL(sigMachineWindowsCreated()),
                &popupCenter(), SLOT(sltShowPopupStack()));
-    disconnect(this, SIGNAL(sigMachineWidnowsDestroyed()),
+    disconnect(this, SIGNAL(sigMachineWindowsDestroyed()),
                &popupCenter(), SLOT(sltHidePopupStack()));
 }
@@ -561 +561 @@
         /* We emit this signal *before* the remembering new value
          * because we want UIMachineLogic::activeMachineWindow() to be yet alive. */
-        emit sigMachineWidnowsDestroyed();
+        emit sigMachineWindowsDestroyed();
     }
 
@@ -572 +572 @@
         /* We emit this signal *after* the remembering new value
          * because we want UIMachineLogic::activeMachineWindow() to be already alive. */
-        emit sigMachineWidnowsCreated();
+        emit sigMachineWindowsCreated();
     }
 }
@@ -649 +649 @@
 # 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

@@ -56 +56 @@
 
     /* Notifiers: Machine-window(s) stuff: */
-    void sigMachineWidnowsCreated();
-    void sigMachineWidnowsDestroyed();
+    void sigMachineWindowsCreated();
+    void sigMachineWindowsDestroyed();
 
 public:

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

@@ -24 +24 @@
 #include "VBoxGlobal.h"
 #include "UIMessageCenter.h"
+#include "UIPopupCenter.h"
 #include "UISession.h"
 #include "UIActionPoolRuntime.h"
@@ -112 +113 @@
 }
 
+void UIMachineLogicSeamless::prepareRequiredFeatures()
+{
+    /* Call to base-class: */
+    UIMachineLogic::prepareRequiredFeatures();
+
+    /* Switch popup-center into 'top-level' integration mode: */
+    popupCenter().setStackIntegrationType(UIPopupIntegrationType_Toplevel);
+}
+
 void UIMachineLogicSeamless::prepareActionGroups()
 {

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

@@ -52 +52 @@
 
     /* Prepare helpers: */
+    void prepareRequiredFeatures();
     void prepareActionGroups();
     void prepareMachineWindows();
@@ -60 +61 @@
     void cleanupMachineWindows();
     void cleanupActionGroups();
+    //void cleanupRequiredFeatures();
 
     /* Variables: */

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

@@ -34 +34 @@
     : m_iLayoutMargin(1), m_iLayoutSpacing(1)
 {
+#if defined(Q_WS_WIN) || defined (Q_WS_MAC)
+    /* Using Qt API to enable translucent background for the Win/Mac host.
+     * - Under x11 host Qt 4.8.3 has it broken wih KDE 4.9 for now: */
+    setAttribute(Qt::WA_TranslucentBackground);
+#endif /* Q_WS_WIN || Q_WS_MAC */
 }
 
@@ -109 +114 @@
 }
 
+void UIPopupStack::setParent(QWidget *pParent, Qt::WindowFlags flags)
+{
+    /* Call to base-class: */
+    QWidget::setParent(pParent, flags);
+    /* Recalculate parent status-bar height: */
+    m_iParentStatusBarHeight = parentStatusBarHeight(pParent);
+}
+
 void UIPopupStack::sltAdjustGeometry()
 {
@@ -119 +132 @@
     const int iHeight = minimumHeightHint();
 
-    /* Move according parent: */
-    move(0, parentWidget()->height() - iHeight - m_iParentStatusBarHeight);
-    /* Resize according parent: */
-    resize(iWidth, iHeight);
+    /* Move/resize according parent: */
+    setGeometry(0, parentWidget()->height() - iHeight - m_iParentStatusBarHeight,
+                iWidth, iHeight);
 
     /* Layout content: */

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

@@ -56 +56 @@
     /* API: Parent stuff: */
     void setParent(QWidget *pParent);
+    void setParent(QWidget *pParent, Qt::WindowFlags flags);
 
 private slots: